From 13919a1d23cd24eabfe5e121c5fad969ddc8e57f Mon Sep 17 00:00:00 2001 From: janeczku Date: Tue, 7 Feb 2017 19:11:18 +0100 Subject: [PATCH] Move vendored css/js to libs folders to fix language stats --- .gitattributes | 2 ++ .../{ => css}/fonts/GrandHotel-Regular.ttf | Bin cps/static/{ => css}/fonts/fontello.eot | Bin cps/static/{ => css}/fonts/fontello.svg | 0 cps/static/{ => css}/fonts/fontello.ttf | Bin cps/static/{ => css}/fonts/fontello.woff | Bin .../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 .../css/{ => libs}/bootstrap-theme.min.css | 0 .../css/{ => libs}/bootstrap-theme.min.css.map | 0 cps/static/css/{ => libs}/bootstrap.min.css | 0 cps/static/css/{ => libs}/bootstrap.min.css.map | 0 cps/static/css/{ => libs}/normalize.css | 0 cps/static/css/{ => libs}/typeahead.css | 0 cps/static/css/{ => libs}/viewer.css | 0 cps/static/css/main.css | 10 +++++----- cps/static/css/style.css | 2 +- cps/static/js/{ => libs}/bootstrap.min.js | 0 cps/static/js/{ => libs}/compatibility.js | 0 cps/static/js/{ => libs}/context.js | 0 cps/static/js/{ => libs}/context.min.js | 0 cps/static/js/{ => libs}/debugger.js | 0 cps/static/js/{ => libs}/epub.min.js | 0 cps/static/js/{ => libs}/epub.min.map | 0 cps/static/js/{ => libs}/hooks.min.js | 0 cps/static/js/{ => libs}/hooks.min.map | 0 cps/static/js/{ => libs}/intention.js | 0 cps/static/js/{ => libs}/intention.min.js | 0 cps/static/js/{ => libs}/l10n.js | 0 cps/static/js/{ => libs}/pdf.js | 0 cps/static/js/{ => libs}/pdf.worker.js | 0 cps/static/js/{ => libs}/plugins.js | 0 cps/static/js/{ => libs}/reader.min.js | 0 cps/static/js/{ => libs}/reader.min.map | 0 cps/static/js/{ => libs}/screenfull.min.js | 0 cps/static/js/{ => libs}/typeahead.bundle.js | 0 cps/static/js/{ => libs}/underscore-min.js | 0 cps/static/js/{ => libs}/underscore-min.map | 0 cps/static/js/{ => libs}/viewer.js | 0 cps/static/js/main.js | 0 cps/templates/book_edit.html | 4 ++-- cps/templates/layout.html | 12 ++++++------ cps/templates/read.html | 10 +++++----- cps/templates/readpdf.html | 16 ++++++++-------- cps/templates/search_form.html | 4 ++-- 48 files changed, 31 insertions(+), 29 deletions(-) rename cps/static/{ => css}/fonts/GrandHotel-Regular.ttf (100%) rename cps/static/{ => css}/fonts/fontello.eot (100%) rename cps/static/{ => css}/fonts/fontello.svg (100%) rename cps/static/{ => css}/fonts/fontello.ttf (100%) rename cps/static/{ => css}/fonts/fontello.woff (100%) rename cps/static/{ => css}/fonts/glyphicons-halflings-regular.eot (100%) rename cps/static/{ => css}/fonts/glyphicons-halflings-regular.svg (100%) rename cps/static/{ => css}/fonts/glyphicons-halflings-regular.ttf (100%) rename cps/static/{ => css}/fonts/glyphicons-halflings-regular.woff (100%) rename cps/static/{ => css}/fonts/glyphicons-halflings-regular.woff2 (100%) rename cps/static/css/{ => libs}/bootstrap-theme.min.css (100%) rename cps/static/css/{ => libs}/bootstrap-theme.min.css.map (100%) rename cps/static/css/{ => libs}/bootstrap.min.css (100%) rename cps/static/css/{ => libs}/bootstrap.min.css.map (100%) rename cps/static/css/{ => libs}/normalize.css (100%) rename cps/static/css/{ => libs}/typeahead.css (100%) rename cps/static/css/{ => libs}/viewer.css (100%) rename cps/static/js/{ => libs}/bootstrap.min.js (100%) rename cps/static/js/{ => libs}/compatibility.js (100%) rename cps/static/js/{ => libs}/context.js (100%) rename cps/static/js/{ => libs}/context.min.js (100%) rename cps/static/js/{ => libs}/debugger.js (100%) rename cps/static/js/{ => libs}/epub.min.js (100%) rename cps/static/js/{ => libs}/epub.min.map (100%) rename cps/static/js/{ => libs}/hooks.min.js (100%) rename cps/static/js/{ => libs}/hooks.min.map (100%) rename cps/static/js/{ => libs}/intention.js (100%) rename cps/static/js/{ => libs}/intention.min.js (100%) rename cps/static/js/{ => libs}/l10n.js (100%) rename cps/static/js/{ => libs}/pdf.js (100%) rename cps/static/js/{ => libs}/pdf.worker.js (100%) rename cps/static/js/{ => libs}/plugins.js (100%) mode change 100755 => 100644 rename cps/static/js/{ => libs}/reader.min.js (100%) rename cps/static/js/{ => libs}/reader.min.map (100%) rename cps/static/js/{ => libs}/screenfull.min.js (100%) rename cps/static/js/{ => libs}/typeahead.bundle.js (100%) rename cps/static/js/{ => libs}/underscore-min.js (100%) rename cps/static/js/{ => libs}/underscore-min.map (100%) rename cps/static/js/{ => libs}/viewer.js (100%) mode change 100755 => 100644 cps/static/js/main.js diff --git a/.gitattributes b/.gitattributes index 7d82586e..a55b8b50 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1,3 @@ web.py ident export-subst +cps/static/css/libs/* linguist-vendored +cps/static/js/libs/* linguist-vendored diff --git a/cps/static/fonts/GrandHotel-Regular.ttf b/cps/static/css/fonts/GrandHotel-Regular.ttf similarity index 100% rename from cps/static/fonts/GrandHotel-Regular.ttf rename to cps/static/css/fonts/GrandHotel-Regular.ttf diff --git a/cps/static/fonts/fontello.eot b/cps/static/css/fonts/fontello.eot similarity index 100% rename from cps/static/fonts/fontello.eot rename to cps/static/css/fonts/fontello.eot diff --git a/cps/static/fonts/fontello.svg b/cps/static/css/fonts/fontello.svg similarity index 100% rename from cps/static/fonts/fontello.svg rename to cps/static/css/fonts/fontello.svg diff --git a/cps/static/fonts/fontello.ttf b/cps/static/css/fonts/fontello.ttf similarity index 100% rename from cps/static/fonts/fontello.ttf rename to cps/static/css/fonts/fontello.ttf diff --git a/cps/static/fonts/fontello.woff b/cps/static/css/fonts/fontello.woff similarity index 100% rename from cps/static/fonts/fontello.woff rename to cps/static/css/fonts/fontello.woff diff --git a/cps/static/fonts/glyphicons-halflings-regular.eot b/cps/static/css/fonts/glyphicons-halflings-regular.eot similarity index 100% rename from cps/static/fonts/glyphicons-halflings-regular.eot rename to cps/static/css/fonts/glyphicons-halflings-regular.eot diff --git a/cps/static/fonts/glyphicons-halflings-regular.svg b/cps/static/css/fonts/glyphicons-halflings-regular.svg similarity index 100% rename from cps/static/fonts/glyphicons-halflings-regular.svg rename to cps/static/css/fonts/glyphicons-halflings-regular.svg diff --git a/cps/static/fonts/glyphicons-halflings-regular.ttf b/cps/static/css/fonts/glyphicons-halflings-regular.ttf similarity index 100% rename from cps/static/fonts/glyphicons-halflings-regular.ttf rename to cps/static/css/fonts/glyphicons-halflings-regular.ttf diff --git a/cps/static/fonts/glyphicons-halflings-regular.woff b/cps/static/css/fonts/glyphicons-halflings-regular.woff similarity index 100% rename from cps/static/fonts/glyphicons-halflings-regular.woff rename to cps/static/css/fonts/glyphicons-halflings-regular.woff diff --git a/cps/static/fonts/glyphicons-halflings-regular.woff2 b/cps/static/css/fonts/glyphicons-halflings-regular.woff2 similarity index 100% rename from cps/static/fonts/glyphicons-halflings-regular.woff2 rename to cps/static/css/fonts/glyphicons-halflings-regular.woff2 diff --git a/cps/static/css/bootstrap-theme.min.css b/cps/static/css/libs/bootstrap-theme.min.css similarity index 100% rename from cps/static/css/bootstrap-theme.min.css rename to cps/static/css/libs/bootstrap-theme.min.css diff --git a/cps/static/css/bootstrap-theme.min.css.map b/cps/static/css/libs/bootstrap-theme.min.css.map similarity index 100% rename from cps/static/css/bootstrap-theme.min.css.map rename to cps/static/css/libs/bootstrap-theme.min.css.map diff --git a/cps/static/css/bootstrap.min.css b/cps/static/css/libs/bootstrap.min.css similarity index 100% rename from cps/static/css/bootstrap.min.css rename to cps/static/css/libs/bootstrap.min.css diff --git a/cps/static/css/bootstrap.min.css.map b/cps/static/css/libs/bootstrap.min.css.map similarity index 100% rename from cps/static/css/bootstrap.min.css.map rename to cps/static/css/libs/bootstrap.min.css.map diff --git a/cps/static/css/normalize.css b/cps/static/css/libs/normalize.css similarity index 100% rename from cps/static/css/normalize.css rename to cps/static/css/libs/normalize.css diff --git a/cps/static/css/typeahead.css b/cps/static/css/libs/typeahead.css similarity index 100% rename from cps/static/css/typeahead.css rename to cps/static/css/libs/typeahead.css diff --git a/cps/static/css/viewer.css b/cps/static/css/libs/viewer.css similarity index 100% rename from cps/static/css/viewer.css rename to cps/static/css/libs/viewer.css diff --git a/cps/static/css/main.css b/cps/static/css/main.css index e4c93133..4e3ac86f 100644 --- a/cps/static/css/main.css +++ b/cps/static/css/main.css @@ -1,10 +1,10 @@ @font-face { font-family: 'fontello'; - src: url('../fonts/fontello.eot?60518104'); - src: url('../fonts/fontello.eot?60518104#iefix') format('embedded-opentype'), - url('../fonts/fontello.woff?60518104') format('woff'), - url('../fonts/fontello.ttf?60518104') format('truetype'), - url('../fonts/fontello.svg?60518104#fontello') format('svg'); + src: url('fonts/fontello.eot?60518104'); + src: url('fonts/fontello.eot?60518104#iefix') format('embedded-opentype'), + url('fonts/fontello.woff?60518104') format('woff'), + url('fonts/fontello.ttf?60518104') format('truetype'), + url('fonts/fontello.svg?60518104#fontello') format('svg'); font-weight: normal; font-style: normal; } diff --git a/cps/static/css/style.css b/cps/static/css/style.css index 5548739e..071980b3 100644 --- a/cps/static/css/style.css +++ b/cps/static/css/style.css @@ -2,7 +2,7 @@ font-family: 'Grand Hotel'; font-style: normal; font-weight: 400; - src: local('Grand Hotel'), local('GrandHotel-Regular'), url("../fonts/GrandHotel-Regular.ttf") format('truetype'); + src: local('Grand Hotel'), local('GrandHotel-Regular'), url("fonts/GrandHotel-Regular.ttf") format('truetype'); } body{background:#f2f2f2}body h2{font-weight:normal;color:#444} diff --git a/cps/static/js/bootstrap.min.js b/cps/static/js/libs/bootstrap.min.js similarity index 100% rename from cps/static/js/bootstrap.min.js rename to cps/static/js/libs/bootstrap.min.js diff --git a/cps/static/js/compatibility.js b/cps/static/js/libs/compatibility.js similarity index 100% rename from cps/static/js/compatibility.js rename to cps/static/js/libs/compatibility.js diff --git a/cps/static/js/context.js b/cps/static/js/libs/context.js similarity index 100% rename from cps/static/js/context.js rename to cps/static/js/libs/context.js diff --git a/cps/static/js/context.min.js b/cps/static/js/libs/context.min.js similarity index 100% rename from cps/static/js/context.min.js rename to cps/static/js/libs/context.min.js diff --git a/cps/static/js/debugger.js b/cps/static/js/libs/debugger.js similarity index 100% rename from cps/static/js/debugger.js rename to cps/static/js/libs/debugger.js diff --git a/cps/static/js/epub.min.js b/cps/static/js/libs/epub.min.js similarity index 100% rename from cps/static/js/epub.min.js rename to cps/static/js/libs/epub.min.js diff --git a/cps/static/js/epub.min.map b/cps/static/js/libs/epub.min.map similarity index 100% rename from cps/static/js/epub.min.map rename to cps/static/js/libs/epub.min.map diff --git a/cps/static/js/hooks.min.js b/cps/static/js/libs/hooks.min.js similarity index 100% rename from cps/static/js/hooks.min.js rename to cps/static/js/libs/hooks.min.js diff --git a/cps/static/js/hooks.min.map b/cps/static/js/libs/hooks.min.map similarity index 100% rename from cps/static/js/hooks.min.map rename to cps/static/js/libs/hooks.min.map diff --git a/cps/static/js/intention.js b/cps/static/js/libs/intention.js similarity index 100% rename from cps/static/js/intention.js rename to cps/static/js/libs/intention.js diff --git a/cps/static/js/intention.min.js b/cps/static/js/libs/intention.min.js similarity index 100% rename from cps/static/js/intention.min.js rename to cps/static/js/libs/intention.min.js diff --git a/cps/static/js/l10n.js b/cps/static/js/libs/l10n.js similarity index 100% rename from cps/static/js/l10n.js rename to cps/static/js/libs/l10n.js diff --git a/cps/static/js/pdf.js b/cps/static/js/libs/pdf.js similarity index 100% rename from cps/static/js/pdf.js rename to cps/static/js/libs/pdf.js diff --git a/cps/static/js/pdf.worker.js b/cps/static/js/libs/pdf.worker.js similarity index 100% rename from cps/static/js/pdf.worker.js rename to cps/static/js/libs/pdf.worker.js diff --git a/cps/static/js/plugins.js b/cps/static/js/libs/plugins.js old mode 100755 new mode 100644 similarity index 100% rename from cps/static/js/plugins.js rename to cps/static/js/libs/plugins.js diff --git a/cps/static/js/reader.min.js b/cps/static/js/libs/reader.min.js similarity index 100% rename from cps/static/js/reader.min.js rename to cps/static/js/libs/reader.min.js diff --git a/cps/static/js/reader.min.map b/cps/static/js/libs/reader.min.map similarity index 100% rename from cps/static/js/reader.min.map rename to cps/static/js/libs/reader.min.map diff --git a/cps/static/js/screenfull.min.js b/cps/static/js/libs/screenfull.min.js similarity index 100% rename from cps/static/js/screenfull.min.js rename to cps/static/js/libs/screenfull.min.js diff --git a/cps/static/js/typeahead.bundle.js b/cps/static/js/libs/typeahead.bundle.js similarity index 100% rename from cps/static/js/typeahead.bundle.js rename to cps/static/js/libs/typeahead.bundle.js diff --git a/cps/static/js/underscore-min.js b/cps/static/js/libs/underscore-min.js similarity index 100% rename from cps/static/js/underscore-min.js rename to cps/static/js/libs/underscore-min.js diff --git a/cps/static/js/underscore-min.map b/cps/static/js/libs/underscore-min.map similarity index 100% rename from cps/static/js/underscore-min.map rename to cps/static/js/libs/underscore-min.map diff --git a/cps/static/js/viewer.js b/cps/static/js/libs/viewer.js similarity index 100% rename from cps/static/js/viewer.js rename to cps/static/js/libs/viewer.js diff --git a/cps/static/js/main.js b/cps/static/js/main.js old mode 100755 new mode 100644 diff --git a/cps/templates/book_edit.html b/cps/templates/book_edit.html index bcc67e23..32452dd8 100644 --- a/cps/templates/book_edit.html +++ b/cps/templates/book_edit.html @@ -112,9 +112,9 @@ {% endblock %} {% block js %} - + {% endblock %} {% block header %} - + {% endblock %} diff --git a/cps/templates/layout.html b/cps/templates/layout.html index 54a95753..e9157b10 100644 --- a/cps/templates/layout.html +++ b/cps/templates/layout.html @@ -9,7 +9,7 @@ - + @@ -23,11 +23,11 @@ - - - - - + + + + + {% block header %}{% endblock %} diff --git a/cps/templates/read.html b/cps/templates/read.html index 718de1e8..f35b0e91 100644 --- a/cps/templates/read.html +++ b/cps/templates/read.html @@ -8,7 +8,7 @@ - + @@ -57,19 +57,19 @@ - + - + - + - + diff --git a/cps/templates/readpdf.html b/cps/templates/readpdf.html index 8318b0d1..03bbd6ae 100644 --- a/cps/templates/readpdf.html +++ b/cps/templates/readpdf.html @@ -29,10 +29,10 @@ See https://github.com/adobe-type-tools/cmap-resources {{_('PDF.js viewer')}} - + - + @@ -40,22 +40,22 @@ See https://github.com/adobe-type-tools/cmap-resources - + - + - + - + diff --git a/cps/templates/search_form.html b/cps/templates/search_form.html index 0961cf8c..2e9f4d3d 100644 --- a/cps/templates/search_form.html +++ b/cps/templates/search_form.html @@ -78,11 +78,11 @@ {% endblock %} {% block js %} - + {% endblock %} {% block header %} - + {% endblock %}