Manual merge of the new document preview code from the unstable branch

2014-07-02 02:53:53 -04:00
parent 77ff0f7191
commit 0cda1148bb
139 changed files with 6330 additions and 2349 deletions
@@ -1,5 +1,5 @@
 <span class="nowrap">
    {% for link in object_navigation_links %}
-        {% include "generic_subnavigation.html" %}
+        {% include 'generic_subnavigation.html' %}
    {% endfor %}
 </span>
@@ -10,11 +10,11 @@
        {% if as_li %}
            <li class="{% if forloop.first and li_class_first %}{{ li_class_first }} {% endif %}{% if link.active and li_class_active %}{{ li_class_active }}{% endif %}">
        {% endif %}
-        
-            {% include "generic_link_instance.html" %}
-        
+
+            {% include 'generic_link_instance.html' %}
+
        {% if as_li %}
            </li>
-        {% endif %}    
+        {% endif %}
    {% endif %}
 {% endwith %}