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

# Conflicts: # cps/static/js/main.js # cps/templates/detail.html
2017-07-23 14:03:02 +02:00
parent 1e2edcf753 d85e0b96dc
commit cb5f196f4b
12 changed files with 69 additions and 28 deletions
@@ -1,4 +1,4 @@
-{% extends "layout.html" %}
+{% extends is_xhr|yesno("fragment.html", "layout.html") %}
 {% block body %}
 <div class="single">
  <div class="row">
@@ -59,7 +59,6 @@
          {% endif %}
        </div>
      </div>
-
      <h2>{{entry.title}}</h2>
      <p class="author">
          {% for author in entry.authors %}
@@ -260,6 +259,5 @@
 {% endblock %}

 {% block js %}
-<script src="{{ url_for('static', filename='js/libs/jquery.form.js') }}"></script>
 <script src="{{ url_for('static', filename='js/details.js') }}"></script>
 {% endblock %}