mirrors/calibre-web
1
0
Fork 0
mirror of https://github.com/janeczku/calibre-web synced 2025-12-06 08:18:05 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'adv/modal-details'

Browse Source 
# Conflicts:
#	cps/static/js/main.js
#	cps/templates/detail.html
This commit is contained in:
OzzieIsaacs
2017-07-23 14:03:02 +02:00
parent 1e2edcf753 d85e0b96dc
commit cb5f196f4b
12 changed files with 69 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
cps/templates/layout.html
View File

@@ -28,6 +28,7 @@
<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/libs/jquery.form.js') }}"></script>
<script src="{{ url_for('static', filename='js/main.js') }}"></script>
{% block header %}{% endblock %}
@@ -200,6 +201,20 @@
</div>
</div>
</div>
<div class="modal fade" id="bookDetailsModal" tabindex="-1" role="dialog" aria-labelledby="bookDetailsModalLabel">
<div class="modal-dialog modal-lg" role="document">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title" id="bookDetailsModalLabel">{{_('Book Details')}}</h4>
</div>
<div class="modal-body">...</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">{{_('Close')}}</button>
</div>
</div>
</div>
</div>
{% block modal %}{% endblock %}
{% block js %}{% endblock %}
</body>