From 7ae46c5aaf74966079772c0034bd994e5a3ca0aa Mon Sep 17 00:00:00 2001 From: Daniel James Date: Thu, 10 May 2018 14:14:22 +0100 Subject: [PATCH 1/2] BK-2052 Remove obsolete documentation Remove executable bit from files which are not executable --- .../static/core/css/HOWTO-CSS-templates.txt | 77 ------------------ .../bootstrap-3.3.7/css/bootstrap.min.css | 0 .../bootstrap-3.3.7/css/bootstrap.min.css.map | 0 .../fonts/glyphicons-halflings-regular.eot | Bin .../fonts/glyphicons-halflings-regular.svg | 0 .../fonts/glyphicons-halflings-regular.ttf | Bin .../fonts/glyphicons-halflings-regular.woff | Bin .../fonts/glyphicons-halflings-regular.woff2 | Bin .../static/vendor/bootstrap-3.3.7/js/affix.js | 0 .../static/vendor/bootstrap-3.3.7/js/alert.js | 0 .../vendor/bootstrap-3.3.7/js/button.js | 0 .../vendor/bootstrap-3.3.7/js/carousel.js | 0 .../vendor/bootstrap-3.3.7/js/collapse.js | 0 .../vendor/bootstrap-3.3.7/js/dropdown.js | 0 .../static/vendor/bootstrap-3.3.7/js/modal.js | 0 .../vendor/bootstrap-3.3.7/js/popover.js | 0 .../vendor/bootstrap-3.3.7/js/scrollspy.js | 0 .../static/vendor/bootstrap-3.3.7/js/tab.js | 0 .../vendor/bootstrap-3.3.7/js/tooltip.js | 0 .../vendor/bootstrap-3.3.7/js/transition.js | 0 .../clipboardjs-1.6.1/js/clipboard.min.js | 0 21 files changed, 77 deletions(-) delete mode 100644 lib/booktype/apps/core/static/core/css/HOWTO-CSS-templates.txt mode change 100755 => 100644 lib/booktype/apps/core/static/vendor/bootstrap-3.3.7/css/bootstrap.min.css mode change 100755 => 100644 lib/booktype/apps/core/static/vendor/bootstrap-3.3.7/css/bootstrap.min.css.map mode change 100755 => 100644 lib/booktype/apps/core/static/vendor/bootstrap-3.3.7/fonts/glyphicons-halflings-regular.eot mode change 100755 => 100644 lib/booktype/apps/core/static/vendor/bootstrap-3.3.7/fonts/glyphicons-halflings-regular.svg mode change 100755 => 100644 lib/booktype/apps/core/static/vendor/bootstrap-3.3.7/fonts/glyphicons-halflings-regular.ttf mode change 100755 => 100644 lib/booktype/apps/core/static/vendor/bootstrap-3.3.7/fonts/glyphicons-halflings-regular.woff mode change 100755 => 100644 lib/booktype/apps/core/static/vendor/bootstrap-3.3.7/fonts/glyphicons-halflings-regular.woff2 mode change 100755 => 100644 lib/booktype/apps/core/static/vendor/bootstrap-3.3.7/js/affix.js mode change 100755 => 100644 lib/booktype/apps/core/static/vendor/bootstrap-3.3.7/js/alert.js mode change 100755 => 100644 lib/booktype/apps/core/static/vendor/bootstrap-3.3.7/js/button.js mode change 100755 => 100644 lib/booktype/apps/core/static/vendor/bootstrap-3.3.7/js/carousel.js mode change 100755 => 100644 lib/booktype/apps/core/static/vendor/bootstrap-3.3.7/js/collapse.js mode change 100755 => 100644 lib/booktype/apps/core/static/vendor/bootstrap-3.3.7/js/dropdown.js mode change 100755 => 100644 lib/booktype/apps/core/static/vendor/bootstrap-3.3.7/js/modal.js mode change 100755 => 100644 lib/booktype/apps/core/static/vendor/bootstrap-3.3.7/js/popover.js mode change 100755 => 100644 lib/booktype/apps/core/static/vendor/bootstrap-3.3.7/js/scrollspy.js mode change 100755 => 100644 lib/booktype/apps/core/static/vendor/bootstrap-3.3.7/js/tab.js mode change 100755 => 100644 lib/booktype/apps/core/static/vendor/bootstrap-3.3.7/js/tooltip.js mode change 100755 => 100644 lib/booktype/apps/core/static/vendor/bootstrap-3.3.7/js/transition.js mode change 100755 => 100644 lib/booktype/apps/core/static/vendor/clipboardjs-1.6.1/js/clipboard.min.js diff --git a/lib/booktype/apps/core/static/core/css/HOWTO-CSS-templates.txt b/lib/booktype/apps/core/static/core/css/HOWTO-CSS-templates.txt deleted file mode 100644 index 8b8a034de..000000000 --- a/lib/booktype/apps/core/static/core/css/HOWTO-CSS-templates.txt +++ /dev/null @@ -1,77 +0,0 @@ -#!/bin/bash -# - -#How to make new CSS files from the templates -#============================================ -# -#This folder contains all the CSS files used by Booktype 2.*. -#The colour values have been replaced with placeholders. This -#allows to easily create new colour schemes for a new instance. -# -#If you are using a linux system, you can replace these -#placeholders in all CSS files by using the 'sed' command -#inside the CSS folder. Below you can see a list of such -#commands we used to create the orange theme of the current -#Booktype theme. - - -# Body general -# -sed -i 's/#body-bg-color/#ebebeb/g' *.css -sed -i 's/#nav-top-background-lighter/#333333/g' *.css -sed -i 's/#nav-top-background-darker/#222222/g' *.css -sed -i 's/#MSnav-top-background-lighter/#333333/g' *.css -sed -i 's/#MSnav-top-background-darker/#222222/g' *.css - -# Text and link color with dark orange -sed -i 's/#text-general/#E55B00/g' *.css -# background and border -sed -i 's/#button-background-lighter/#FF6600/g' *.css -sed -i 's/#button-background-darker/#E55B00/g' *.css -sed -i 's/#border-verydark/#232f3e/g' *.css -# blue background with light blue -sed -i 's/#button-alt-background/#146eb4/g' *.css - -# flat buttons -# btn-default d4d4d4 f8f8f8 dfdfdf -sed -i 's/#btn-default-border/#dfdfdf/g' *.css -sed -i 's/#btn-default-light/#dfdfdf/g' *.css -sed -i 's/#btn-default-dark/#dfdfdf/g' *.css -sed -i 's/#MSbtn-default-light/#ffdfdfdf/g' *.css -sed -i 's/#MSbtn-default-dark/#ffdfdfdf/g' *.css -# btn-success 569a3c 79c05d 5fa842 -sed -i 's/#btn-success-border/#5fa842/g' *.css -sed -i 's/#btn-success-light/#5fa842/g' *.css -sed -i 's/#btn-success-dark/#5fa842/g' *.css -sed -i 's/#MSbtn-success-light/#ff5fa842/g' *.css -sed -i 's/#MSbtn-success-dark/#ff5fa842/g' *.css -# btn-warning e38d13 f0ad4e ec971f -sed -i 's/#btn-warning-border/#ec971f/g' *.css -sed -i 's/#btn-warning-light/#ec971f/g' *.css -sed -i 's/#btn-warning-dark/#ec971f/g' *.css -sed -i 's/#MSbtn-warning-light/#ffec971f/g' *.css -sed -i 's/#MSbtn-warning-dark/#ffec971f/g' *.css -# btn-danger b92c28 d9534f c9302c -sed -i 's/#btn-warning-danger/#c9302c/g' *.css -sed -i 's/#btn-danger-light/#c9302c/g' *.css -sed -i 's/#btn-danger-dark/#c9302c/g' *.css -sed -i 's/#MSbtn-danger-light/#ffc9302c/g' *.css -sed -i 's/#MSbtn-danger-dark/#ffc9302c/g' *.css -# btn-info 28a4c9 5bc0de 31b0d5 -sed -i 's/#btn-info-danger/#5bc0de/g' *.css -sed -i 's/#btn-info-light/#5bc0de/g' *.css -sed -i 's/#btn-info-dark/#5bc0de/g' *.css -sed -i 's/#MSbtn-info-light/#ff5bc0de/g' *.css -sed -i 's/#MSbtn-info-dark/#ff5bc0de/g' *.css - -# button border radius -sed -i 's/#btn-border-radius-px/0/g' *.css - -# Colours on book editor -sed -i 's/#editor-tab-bg-color/#a1a1a1/g' *.css -sed -i 's/#editor-formattingbar-bg-color/rgba(245,245,245,0.9)/g' *.css -sed -i 's/#editor-formattingbar-border-bottom-color/#e0e0e0/g' *.css -sed -i 's/#editor-formattingbar-border-bottom-px/1/g' *.css -sed -i 's/#bookbar-bg-color/rgba(223,222,224,0.9)/g' *.css -sed -i 's/#bookbar-border-bottom-color/#bfbfbf/g' *.css -sed -i 's/#bookbar-border-bottom-px/1/g' *.css diff --git a/lib/booktype/apps/core/static/vendor/bootstrap-3.3.7/css/bootstrap.min.css b/lib/booktype/apps/core/static/vendor/bootstrap-3.3.7/css/bootstrap.min.css old mode 100755 new mode 100644 diff --git a/lib/booktype/apps/core/static/vendor/bootstrap-3.3.7/css/bootstrap.min.css.map b/lib/booktype/apps/core/static/vendor/bootstrap-3.3.7/css/bootstrap.min.css.map old mode 100755 new mode 100644 diff --git a/lib/booktype/apps/core/static/vendor/bootstrap-3.3.7/fonts/glyphicons-halflings-regular.eot b/lib/booktype/apps/core/static/vendor/bootstrap-3.3.7/fonts/glyphicons-halflings-regular.eot old mode 100755 new mode 100644 diff --git a/lib/booktype/apps/core/static/vendor/bootstrap-3.3.7/fonts/glyphicons-halflings-regular.svg b/lib/booktype/apps/core/static/vendor/bootstrap-3.3.7/fonts/glyphicons-halflings-regular.svg old mode 100755 new mode 100644 diff --git a/lib/booktype/apps/core/static/vendor/bootstrap-3.3.7/fonts/glyphicons-halflings-regular.ttf b/lib/booktype/apps/core/static/vendor/bootstrap-3.3.7/fonts/glyphicons-halflings-regular.ttf old mode 100755 new mode 100644 diff --git a/lib/booktype/apps/core/static/vendor/bootstrap-3.3.7/fonts/glyphicons-halflings-regular.woff b/lib/booktype/apps/core/static/vendor/bootstrap-3.3.7/fonts/glyphicons-halflings-regular.woff old mode 100755 new mode 100644 diff --git a/lib/booktype/apps/core/static/vendor/bootstrap-3.3.7/fonts/glyphicons-halflings-regular.woff2 b/lib/booktype/apps/core/static/vendor/bootstrap-3.3.7/fonts/glyphicons-halflings-regular.woff2 old mode 100755 new mode 100644 diff --git a/lib/booktype/apps/core/static/vendor/bootstrap-3.3.7/js/affix.js b/lib/booktype/apps/core/static/vendor/bootstrap-3.3.7/js/affix.js old mode 100755 new mode 100644 diff --git a/lib/booktype/apps/core/static/vendor/bootstrap-3.3.7/js/alert.js b/lib/booktype/apps/core/static/vendor/bootstrap-3.3.7/js/alert.js old mode 100755 new mode 100644 diff --git a/lib/booktype/apps/core/static/vendor/bootstrap-3.3.7/js/button.js b/lib/booktype/apps/core/static/vendor/bootstrap-3.3.7/js/button.js old mode 100755 new mode 100644 diff --git a/lib/booktype/apps/core/static/vendor/bootstrap-3.3.7/js/carousel.js b/lib/booktype/apps/core/static/vendor/bootstrap-3.3.7/js/carousel.js old mode 100755 new mode 100644 diff --git a/lib/booktype/apps/core/static/vendor/bootstrap-3.3.7/js/collapse.js b/lib/booktype/apps/core/static/vendor/bootstrap-3.3.7/js/collapse.js old mode 100755 new mode 100644 diff --git a/lib/booktype/apps/core/static/vendor/bootstrap-3.3.7/js/dropdown.js b/lib/booktype/apps/core/static/vendor/bootstrap-3.3.7/js/dropdown.js old mode 100755 new mode 100644 diff --git a/lib/booktype/apps/core/static/vendor/bootstrap-3.3.7/js/modal.js b/lib/booktype/apps/core/static/vendor/bootstrap-3.3.7/js/modal.js old mode 100755 new mode 100644 diff --git a/lib/booktype/apps/core/static/vendor/bootstrap-3.3.7/js/popover.js b/lib/booktype/apps/core/static/vendor/bootstrap-3.3.7/js/popover.js old mode 100755 new mode 100644 diff --git a/lib/booktype/apps/core/static/vendor/bootstrap-3.3.7/js/scrollspy.js b/lib/booktype/apps/core/static/vendor/bootstrap-3.3.7/js/scrollspy.js old mode 100755 new mode 100644 diff --git a/lib/booktype/apps/core/static/vendor/bootstrap-3.3.7/js/tab.js b/lib/booktype/apps/core/static/vendor/bootstrap-3.3.7/js/tab.js old mode 100755 new mode 100644 diff --git a/lib/booktype/apps/core/static/vendor/bootstrap-3.3.7/js/tooltip.js b/lib/booktype/apps/core/static/vendor/bootstrap-3.3.7/js/tooltip.js old mode 100755 new mode 100644 diff --git a/lib/booktype/apps/core/static/vendor/bootstrap-3.3.7/js/transition.js b/lib/booktype/apps/core/static/vendor/bootstrap-3.3.7/js/transition.js old mode 100755 new mode 100644 diff --git a/lib/booktype/apps/core/static/vendor/clipboardjs-1.6.1/js/clipboard.min.js b/lib/booktype/apps/core/static/vendor/clipboardjs-1.6.1/js/clipboard.min.js old mode 100755 new mode 100644 From 56567b046807f5f8d04cac5bb33c983cce9dc1d5 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Thu, 10 May 2018 15:37:34 +0100 Subject: [PATCH 2/2] BK-2052 Fix external links in demos to file no longer on the web --- .../Aloha Editor HTML5 technology class 16.png | Bin 0 -> 542 bytes .../draganddropfiles/demo/migration/index.html | 2 +- .../js/Aloha Editor HTML5 technology class 16.png | Bin 0 -> 542 bytes .../numerated-headers/demo/js/aloha-config.js | 4 ++-- 4 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 lib/booktype/apps/edit/static/edit/js/aloha/plugins/extra/draganddropfiles/demo/migration/Aloha Editor HTML5 technology class 16.png create mode 100644 lib/booktype/apps/edit/static/edit/js/aloha/plugins/extra/numerated-headers/demo/js/Aloha Editor HTML5 technology class 16.png diff --git a/lib/booktype/apps/edit/static/edit/js/aloha/plugins/extra/draganddropfiles/demo/migration/Aloha Editor HTML5 technology class 16.png b/lib/booktype/apps/edit/static/edit/js/aloha/plugins/extra/draganddropfiles/demo/migration/Aloha Editor HTML5 technology class 16.png new file mode 100644 index 0000000000000000000000000000000000000000..b8434428a400cab8c68f6877bc8abbba4791ddbc GIT binary patch literal 542 zcmV+(0^$9MP)7<5HgbVG7wVRUJ4ZXi@?ZDjy4F)lDNE;2ANF=Klu1poj6 zbV)=(R5*=olCM$%Q54312muotnNwJs5$8OBYcui&LbHj<==uiOXxOaKFab@&nYp|H zCa`TZ8uqNSUO6*&_U`%necwF|j+m;BfdQ~Kv;0_2WsRsX0mi^%%^iR%Gb>be24H5R zD%h+y5Rq5lHX70e4kGdmECKfW{k968M9Crg-}$!y`hK6QYUXJFQg9kGU#S)ztpYc2`g3Y z0nhI5IieY*xS5%4n&e^;oqdZ6FnqP>I-au7UE&)_(e~MOG8C z;tw#4SGn4Ou_M3>a&MAFbhB3ENc}tEzr|VwAjA#E4n2wdJ4$K*!OWhjz_C@nq1=Pu gNOoqnIf4j)AMj>wC?b&^j{pDw07*qoM6N<$f^lrvR{#J2 literal 0 HcmV?d00001 diff --git a/lib/booktype/apps/edit/static/edit/js/aloha/plugins/extra/draganddropfiles/demo/migration/index.html b/lib/booktype/apps/edit/static/edit/js/aloha/plugins/extra/draganddropfiles/demo/migration/index.html index c408ba6f5..62158415a 100644 --- a/lib/booktype/apps/edit/static/edit/js/aloha/plugins/extra/draganddropfiles/demo/migration/index.html +++ b/lib/booktype/apps/edit/static/edit/js/aloha/plugins/extra/draganddropfiles/demo/migration/index.html @@ -12,7 +12,7 @@ ribbon: false, "placeholder": { - '*': 'logo Placeholder All', + '*': 'logo Placeholder All', '#typo3span': 'Placeholder for span' }, "i18n": { diff --git a/lib/booktype/apps/edit/static/edit/js/aloha/plugins/extra/numerated-headers/demo/js/Aloha Editor HTML5 technology class 16.png b/lib/booktype/apps/edit/static/edit/js/aloha/plugins/extra/numerated-headers/demo/js/Aloha Editor HTML5 technology class 16.png new file mode 100644 index 0000000000000000000000000000000000000000..b8434428a400cab8c68f6877bc8abbba4791ddbc GIT binary patch literal 542 zcmV+(0^$9MP)7<5HgbVG7wVRUJ4ZXi@?ZDjy4F)lDNE;2ANF=Klu1poj6 zbV)=(R5*=olCM$%Q54312muotnNwJs5$8OBYcui&LbHj<==uiOXxOaKFab@&nYp|H zCa`TZ8uqNSUO6*&_U`%necwF|j+m;BfdQ~Kv;0_2WsRsX0mi^%%^iR%Gb>be24H5R zD%h+y5Rq5lHX70e4kGdmECKfW{k968M9Crg-}$!y`hK6QYUXJFQg9kGU#S)ztpYc2`g3Y z0nhI5IieY*xS5%4n&e^;oqdZ6FnqP>I-au7UE&)_(e~MOG8C z;tw#4SGn4Ou_M3>a&MAFbhB3ENc}tEzr|VwAjA#E4n2wdJ4$K*!OWhjz_C@nq1=Pu gNOoqnIf4j)AMj>wC?b&^j{pDw07*qoM6N<$f^lrvR{#J2 literal 0 HcmV?d00001 diff --git a/lib/booktype/apps/edit/static/edit/js/aloha/plugins/extra/numerated-headers/demo/js/aloha-config.js b/lib/booktype/apps/edit/static/edit/js/aloha/plugins/extra/numerated-headers/demo/js/aloha-config.js index 1a2fa48a9..77a4ef2de 100644 --- a/lib/booktype/apps/edit/static/edit/js/aloha/plugins/extra/numerated-headers/demo/js/aloha-config.js +++ b/lib/booktype/apps/edit/static/edit/js/aloha/plugins/extra/numerated-headers/demo/js/aloha-config.js @@ -9,7 +9,7 @@ ribbon: false, "placeholder": { - '*': 'logo Placeholder All', + '*': 'logo Placeholder All', '#typo3span': 'Placeholder for span' }, "i18n": { @@ -112,4 +112,4 @@ } } }; -})(window); \ No newline at end of file +})(window);