From 2b225d684348362c9f998eb677073406a56b1bfb Mon Sep 17 00:00:00 2001
From: Ross Poulton <ross@rossp.org>
Date: Wed, 29 Jan 2014 22:37:36 +1100
Subject: [PATCH] settings.py cleanup (#200); remove HELPDESK_KB_ENABLED_STAFF
 and HELPDESK_NAVIGATION_STATS_ENABLED (now always on); removed
 HELPDESK_NAVIGATION_CUSTOM_EXTEND - just use custom template!

---
 helpdesk/settings.py                        |  9 ---------
 helpdesk/templates/helpdesk/navigation.html | 16 ++++------------
 2 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/helpdesk/settings.py b/helpdesk/settings.py
index 4be31409..050d0c03 100644
--- a/helpdesk/settings.py
+++ b/helpdesk/settings.py
@@ -31,18 +31,9 @@ HELPDESK_REDIRECT_TO_LOGIN_BY_DEFAULT = getattr(settings, 'HELPDESK_REDIRECT_TO_
 # show knowledgebase links?
 HELPDESK_KB_ENABLED = getattr(settings, 'HELPDESK_KB_ENABLED', True)
 
-# show knowledgebase links on staff view?
-HELPDESK_KB_ENABLED_STAFF = getattr(settings, 'HELPDESK_KB_ENABLED_STAFF', False)
-
 # show extended navigation by default, to all users, irrespective of staff status?
 HELPDESK_NAVIGATION_ENABLED = getattr(settings, 'HELPDESK_NAVIGATION_ENABLED', False)
 
-# allow local customisation, add the contents of a template file to the nav bar.
-HELPDESK_NAVIGATION_CUSTOM_EXTEND = getattr(settings, 'HELPDESK_NAVIGATION_CUSTOM_EXTEND', False)
-
-# show 'stats' link in navigation bar?
-HELPDESK_NAVIGATION_STATS_ENABLED = getattr(settings, 'HELPDESK_NAVIGATION_STATS_ENABLED', True)
-
 # show dropdown list of languages that ticket comments can be translated into?
 HELPDESK_TRANSLATE_TICKET_COMMENTS = getattr(settings, 'HELPDESK_TRANSLATE_TICKET_COMMENTS', False)
 
diff --git a/helpdesk/templates/helpdesk/navigation.html b/helpdesk/templates/helpdesk/navigation.html
index dc86a022..371babd3 100644
--- a/helpdesk/templates/helpdesk/navigation.html
+++ b/helpdesk/templates/helpdesk/navigation.html
@@ -16,12 +16,8 @@
                 <li><a href='{% url 'helpdesk_dashboard' %}'><span class="glyphicon glyphicon-dashboard"></span> <span class="nav-text">{% trans "Dashboard" %}</span></a></li>
                 <li><a href='{% url 'helpdesk_list' %}'><span class="glyphicon glyphicon-tags"></span> <span class="nav-text">{% trans "Tickets" %}</span></a></li>
                 <li><a href='{% url 'helpdesk_submit' %}'><span class="glyphicon glyphicon-plus"></span> <span class="nav-text">{% trans "New Ticket" %}</span></a></li>
-                {% if helpdesk_settings.HELPDESK_NAVIGATION_STATS_ENABLED %}
-                    <li><a href='{% url 'helpdesk_report_index' %}'><span class="glyphicon glyphicon-stats"></span><span class="nav-text"> {% trans "Stats" %}</span></a></li>
-                {% endif %}
-                {% if helpdesk_settings.HELPDESK_KB_ENABLED_STAFF %}
-                    <li><a href='{% url 'helpdesk_kb_index' %}'><span class="glyphicon glyphicon-tree-deciduous"></span><span class="nav-text">{% trans "Knowledgebase" %}</span></a></li>
-                {% endif %}
+                <li><a href='{% url 'helpdesk_report_index' %}'><span class="glyphicon glyphicon-stats"></span><span class="nav-text"> {% trans "Stats" %}</span></a></li>
+                <li><a href='{% url 'helpdesk_kb_index' %}'><span class="glyphicon glyphicon-tree-deciduous"></span><span class="nav-text">{% trans "Knowledgebase" %}</span></a></li>
                 {% if user_saved_queries_ %}
                     <li class="headerlink dropdown"><a class="dropdown-toggle" data-toggle="dropdown" href="#"><span class="glyphicon glyphicon-filter"></span><span class="nav-text"> {% trans "Saved Query" %} <b class="caret"></b></span></a>
                         <ul class="dropdown-menu">
@@ -34,9 +30,6 @@
                         </ul>
                     </li>
                 {% endif %}
-                {% if helpdesk_settings.HELPDESK_NAVIGATION_CUSTOM_EXTEND and user.is_superuser %}
-                    {% include helpdesk_settings.HELPDESK_NAVIGATION_CUSTOM_EXTEND %}
-                {% endif %}
                 <li><a href='{% url 'logout' %}'><span class="glyphicon glyphicon-log-out"></span><span class="nav-text">{% trans "Logout" %} ({{ user.username }})</span></a></li>
             </ul>
 
@@ -56,8 +49,7 @@
 
             {% endif %}
         {% else %}
-
-
+            {# Public menu #}
             <ul id="dropdown" class="nav navbar-nav">
                 {% if helpdesk_settings.HELPDESK_ALLOW_NON_STAFF_TICKET_UPDATE %}
                     <li><a href='{% url 'helpdesk_dashboard' %}'>{% trans "Dashboard" %}</a></li>
@@ -74,4 +66,4 @@
             </ul>
         {% endif %}
     </div>
-</nav>
\ No newline at end of file
+</nav>