changeset 2329:322841eed772

Fixes Issue#4, quicklinks now organised
author sharky93 <rishabhr123@gmail.com>
date Tue, 16 Jul 2013 22:59:35 +0530
parents 5d61b26cad7c
children 8a9261986b6a
files MoinMoin/themes/basic/templates/layout.html
diffstat 1 files changed, 9 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/themes/basic/templates/layout.html	Tue Jul 16 22:39:17 2013 +0530
+++ b/MoinMoin/themes/basic/templates/layout.html	Tue Jul 16 22:59:35 2013 +0530
@@ -80,9 +80,7 @@
 
                         <li class="nav-header">Site Navigation</li>
                         {% for cls, url, text, title in navibar_items %}
-                            {% if class == 'userlink' %}
-                                {% set quicklinks = 'true' %}
-                            {% endif %}
+                            {% if cls != 'userlink' %}
                             {% if url == index %}
                                 <li class="{{ cls }} active">
                             {% else %}
@@ -90,23 +88,19 @@
                             {% endif %}
                             <a href="{{ url }}" {% if title %}title="{{ title }}"{% endif %}>{{ text }}</a>
                             </li>
+                            {% endif %}
                         {% endfor %}
 
                         {% endif %}
                         
                         <li class="nav-header">Quick Links</li>
-                            {% if quicklinks == 'true' %}
-                                {% for cls, url, text, title in navibar_items %}
-                                {% if cls == 'userlink' %}
-                                    <li class="{{ cls }}">
-                                        <a href="{{ url }}" {% if title %}title="{{ title }}"{% endif %}>{{ text }}</a>
-                                    </li>
-                                {% endif %}
-                                {% endfor %}
-
-                            {% else %}
-                                <li> Empty </li>
-                            {% endif %}
+                        {% for cls, url, text, title in navibar_items if cls == 'userlink' %}
+                            <li class="{{ cls }}">
+                                <a href="{{ url }}" {% if title %}title="{{ title }}"{% endif %}>{{ text }}</a>
+                            </li>
+                        {% else %}
+                            <li> Empty </li>
+                        {% endfor %}
 
                     </ul>
                 </div><!--/.well -->