Merge remote-tracking branch 'origin/move-js-libs'

This commit is contained in:
OzzieIsaacs 2017-02-07 20:27:47 +01:00
commit ea305ff578
48 changed files with 31 additions and 29 deletions

2
.gitattributes vendored
View File

@ -1 +1,3 @@
web.py ident export-subst
cps/static/css/libs/* linguist-vendored
cps/static/js/libs/* linguist-vendored

View File

Before

Width:  |  Height:  |  Size: 9.4 KiB

After

Width:  |  Height:  |  Size: 9.4 KiB

View File

Before

Width:  |  Height:  |  Size: 62 KiB

After

Width:  |  Height:  |  Size: 62 KiB

View File

@ -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;
}

View File

@ -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}

0
cps/static/js/plugins.js → cps/static/js/libs/plugins.js vendored Executable file → Normal file
View File

0
cps/static/js/main.js Executable file → Normal file
View File

View File

@ -112,9 +112,9 @@
{% endblock %}
{% block js %}
<script src="{{ url_for('static', filename='js/typeahead.bundle.js') }}"></script>
<script src="{{ url_for('static', filename='js/libs/typeahead.bundle.js') }}"></script>
<script src="{{ url_for('static', filename='js/edit_books.js') }}"></script>
{% endblock %}
{% block header %}
<link href="{{ url_for('static', filename='css/typeahead.css') }}" rel="stylesheet" media="screen">
<link href="{{ url_for('static', filename='css/libs/typeahead.css') }}" rel="stylesheet" media="screen">
{% endblock %}

View File

@ -9,7 +9,7 @@
<!-- Bootstrap -->
<link rel="shortcut icon" href="{{ url_for('static', filename='favicon.ico') }}">
<link href="{{ url_for('static', filename='css/bootstrap.min.css') }}" rel="stylesheet" media="screen">
<link href="{{ url_for('static', filename='css/libs/bootstrap.min.css') }}" rel="stylesheet" media="screen">
<link href="{{ url_for('static', filename='css/style.css') }}" rel="stylesheet" media="screen">
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
@ -23,11 +23,11 @@
<!--script src="https://code.jquery.com/jquery.js"></script-->
<script src="{{ url_for('static', filename='js/libs/jquery.min.js') }}"></script>
<!-- Include all compiled plugins (below), or include individual files as needed -->
<script src="{{ url_for('static', filename='js/bootstrap.min.js') }}"></script>
<script src="{{ url_for('static', filename='js/underscore-min.js') }}"></script>
<script src="{{ url_for('static', filename='js/intention.js') }}"></script>
<script src="{{ url_for('static', filename='js/context.js') }}"></script>
<script src="{{ url_for('static', filename='js/plugins.js') }}"></script>
<script src="{{ url_for('static', filename='js/libs/bootstrap.min.js') }}"></script>
<script src="{{ url_for('static', filename='js/libs/underscore-min.js') }}"></script>
<script src="{{ url_for('static', filename='js/libs/intention.min.js') }}"></script>
<script src="{{ url_for('static', filename='js/libs/context.min.js') }}"></script>
<script src="{{ url_for('static', filename='js/libs/plugins.js') }}"></script>
<script src="{{ url_for('static', filename='js/main.js') }}"></script>
{% block header %}{% endblock %}

View File

@ -8,7 +8,7 @@
<meta name="viewport" content="width=device-width, user-scalable=no">
<meta name="apple-mobile-web-app-capable" content="yes">
<link rel="stylesheet" href="{{ url_for('static', filename='css/normalize.css') }}">
<link rel="stylesheet" href="{{ url_for('static', filename='css/libs/normalize.css') }}">
<link rel="stylesheet" href="{{ url_for('static', filename='css/main.css') }}">
<link rel="stylesheet" href="{{ url_for('static', filename='css/popup.css') }}">
<script src="{{ url_for('static', filename='js/libs/jquery.min.js') }}"></script>
@ -57,19 +57,19 @@
<!-- Full Screen -->
<!--<script src="js/libs/screenfull.min.js"></script>-->
<script src="{{ url_for('static', filename='js/screenfull.min.js') }}"></script>
<script src="{{ url_for('static', filename='js/libs/screenfull.min.js') }}"></script>
<!-- Render -->
<!--<script src="js/epub.min.js"></script>-->
<script src="{{ url_for('static', filename='js/epub.min.js') }}"></script>
<script src="{{ url_for('static', filename='js/libs/epub.min.js') }}"></script>
<!-- Hooks -->
<!--<script src="js/hooks.min.js"></script>-->
<script src="{{ url_for('static', filename='js/hooks.min.js') }}"></script>
<script src="{{ url_for('static', filename='js/libs/hooks.min.js') }}"></script>
<!-- Reader -->
<!--<script src="js/reader.min.js"></script>-->
<script src="{{ url_for('static', filename='js/reader.min.js') }}"></script>
<script src="{{ url_for('static', filename='js/libs/reader.min.js') }}"></script>
<!-- Plugins -->
<!-- <script src="js/plugins/search.js"></script> -->

View File

@ -29,10 +29,10 @@ See https://github.com/adobe-type-tools/cmap-resources
<title>{{_('PDF.js viewer')}}</title>
<link rel="stylesheet" href="{{ url_for('static', filename='css/viewer.css') }}">
<link rel="stylesheet" href="{{ url_for('static', filename='css/libs/viewer.css') }}">
<!--<link rel="stylesheet" href="viewer.css">-->
<script src="{{ url_for('static', filename='js/compatibility.js') }}"></script>
<script src="{{ url_for('static', filename='js/libs/compatibility.js') }}"></script>
<!--<script src="compatibility.js"></script>-->
@ -40,22 +40,22 @@ See https://github.com/adobe-type-tools/cmap-resources
<!-- This snippet is used in production (included from viewer.html) -->
<!--<link rel="resource" type="application/l10n" href="locale/locale.properties">-->
<link rel="resource" type="application/l10n" href="{{ url_for('static', filename='locale/locale.properties') }}">
<script src="{{ url_for('static', filename='js/l10n.js') }}"></script>
<script src="{{ url_for('static', filename='js/libs/l10n.js') }}"></script>
<!--<script src="l10n.js"></script>-->
<script src="{{ url_for('static', filename='js/pdf.js') }}"></script>
<script src="{{ url_for('static', filename='js/libs/pdf.js') }}"></script>
<!--<script src="pdf.js"></script>-->
<script src="{{ url_for('static', filename='js/debugger.js') }}"></script>
<script src="{{ url_for('static', filename='js/libs/debugger.js') }}"></script>
<!--<script src="debugger.js"></script>-->
<script type="text/javascript">
var DEFAULT_URL = "{{ url_for('static', filename=pdffile) }}";
var PDFWORKER_LOCATION="{{ url_for('static', filename='js/pdf.worker.js') }}";
var PDFWORKER_LOCATION_JS="{{ url_for('static', filename='js/pdf.worker') }}";
var PDFWORKER_LOCATION="{{ url_for('static', filename='js/libs/pdf.worker.js') }}";
var PDFWORKER_LOCATION_JS="{{ url_for('static', filename='js/libs/pdf.worker') }}";
</script>
<script src="{{ url_for('static', filename='js/viewer.js') }}"></script>
<script src="{{ url_for('static', filename='js/libs/viewer.js') }}"></script>
<!--<script src="viewer.js"></script>-->
</head>

View File

@ -78,11 +78,11 @@
{% endblock %}
{% block js %}
<script src="{{ url_for('static', filename='js/typeahead.bundle.js') }}"></script>
<script src="{{ url_for('static', filename='js/libs/typeahead.bundle.js') }}"></script>
<script src="{{ url_for('static', filename='js/edit_books.js') }}"></script>
<script>
</script>
{% endblock %}
{% block header %}
<link href="{{ url_for('static', filename='css/typeahead.css') }}" rel="stylesheet" media="screen">
<link href="{{ url_for('static', filename='css/libs/typeahead.css') }}" rel="stylesheet" media="screen">
{% endblock %}