Merge pull request #546 from benjaoming/account-handling-disabled

Do not display account-related links in menu when WIKI_ACCOUNT_HANDLING=False
django-wiki · May 10, 2016 · b4b674c · b4b674c
2 parents 6aecc8a + da080ed
commit b4b674c
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/wiki/templates/wiki/base_site.html b/wiki/templates/wiki/base_site.html
@@ -59,19 +59,19 @@
                   <b class="caret"></b>
                 </a>
                 <ul class="dropdown-menu">
-                  <li>
-                    <a href="{% url 'wiki:logout' %}">
-                      <i class="fa fa-power-off"></i>
-                      {% trans "Log out" %}
-                    </a>
-                  </li>
                   {% if "ACCOUNT_HANDLING"|wiki_settings %}
                   <li>
                     <a href="{% url 'wiki:profile_update' %}">
                       <i class="fa fa-gear"></i>
                       {% trans "Account Settings" %}
                     </a>
                   </li>
+                  <li>
+                    <a href="{% url 'wiki:logout' %}">
+                      <i class="fa fa-power-off"></i>
+                      {% trans "Log out" %}
+                    </a>
+                  </li>
                   {% endif %}
                   {% if user.is_superuser %}
                   <li>
@@ -92,9 +92,11 @@
               <li>
                 <a href="{% login_url as wiki_login_url %}{{ wiki_login_url }}">{% trans "Log in" %}</a>
               </li>
+              {% if "ACCOUNT_HANDLING"|wiki_settings %}
               <li>
                 <a href="{% url 'wiki:signup' %}">{% trans "Sign up" %}</a>
               </li>
+              {% endif %}
             </ul>
             {% endif %}
           </div>