Issue #56, Remove the MAIN_DISABLE_ICONS setting configuration option

mayan/apps/main/settings.py

@@ -11,14 +11,6 @@ register_setting(
     default=False,
 )
 
-register_setting(
-    namespace=u'main',
-    module=u'main.settings',
-    name=u'DISABLE_ICONS',
-    global_name=u'MAIN_DISABLE_ICONS',
-    default=False,
-)
-
 register_settings(
     namespace=u'main',
     module=u'main.settings',

mayan/apps/main/templates/main/generic_list_horizontal_subtemplate.html

@@ -7,8 +7,6 @@
 {% load variable_tags %}
 {% load main_settings_tags %}
 
-{% get_main_setting 'DISABLE_ICONS' as disable_icons %}
-
 {% if side_bar %}
     <div class="block">
     <h3>
@@ -37,7 +35,7 @@
                     <div class="group navform wat-cf">
                     {% for link in multi_item_links %}
                         <button class="button" type="submit" name="action" value="{{ link.url }}">
-                           {% if link.famfam and not disable_icons %}<span class="famfam active famfam-{{ link.famfam|default:'link' }}"></span>{% endif %}{{ link.text }}
+                           {% if link.famfam %}<span class="famfam active famfam-{{ link.famfam|default:'link' }}"></span>{% endif %}{{ link.text }}
                         </button>
                     {% endfor %}
                     </div>
@@ -75,7 +73,7 @@
                     <div class="group navform wat-cf">
                     {% for link in multi_item_links %}
                         <button class="button" type="submit" name="action" value="{{ link.url }}">
-                           {% if link.famfam and not disable_icons %}<span class="famfam active famfam-{{ link.famfam|default:'link' }}"></span>{% endif %}{{ link.text }}
+                           {% if link.famfam %}<span class="famfam active famfam-{{ link.famfam|default:'link' }}"></span>{% endif %}{{ link.text }}
                         </button>
                     {% endfor %}
                     </div>

mayan/apps/main/templates/main/generic_list_subtemplate.html

@@ -8,8 +8,6 @@
 {% load main_settings_tags %}
 {% load multiselect_tags %}
 
-{% get_main_setting 'DISABLE_ICONS' as disable_icons %}
-
 {% if side_bar %}
     <div class="block">
     <h3>
@@ -40,7 +38,7 @@
                         <div class="group navform wat-cf" style="margin-bottom: 0px;">
                         {% for link in multi_item_links %}
                             <button class="button" type="submit" name="action" value="{{ link.url }}" style="margin-bottom: 8px;">
-                               {% if link.famfam and not disable_icons %}<span class="famfam active famfam-{{ link.famfam|default:'link' }}"></span>{% endif %}{{ link.text }}
+                               {% if link.famfam %}<span class="famfam active famfam-{{ link.famfam|default:'link' }}"></span>{% endif %}{{ link.text }}
                             </button>
                         {% endfor %}
                         </div>
@@ -160,7 +158,7 @@
                         <div class="group navform wat-cf" style="margin-bottom: 0px;">
                         {% for link in multi_item_links %}
                             <button class="button" type="submit" name="action" value="{{ link.url }}" style="margin-bottom: 8px;">
-                               {% if link.famfam and not disable_icons %}<span class="famfam active famfam-{{ link.famfam|default:'link' }}"></span>{% endif %}{{ link.text }}
+                               {% if link.famfam %}<span class="famfam active famfam-{{ link.famfam|default:'link' }}"></span>{% endif %}{{ link.text }}
                             </button>
                         {% endfor %}
                         </div>

mayan/apps/navigation/templates/generic_link_instance.html

@@ -1,9 +1,7 @@
 {% load main_settings_tags %}
 
-{% get_main_setting "DISABLE_ICONS" as disable_icons %}
-
 {% if link.disabled %}
-    <a class="{{ link.class }}" style="cursor: default;" href="#">{% if link.famfam and not disable_icons %}<span class="famfam inactive famfam-{{ link.famfam|default:'link' }}"></span>{% endif %}{{ link.text }}{% if link.error %} - {{ link.error }}{% endif %}{% if link.active and not hide_active_anchor %}<span class="famfam active famfam-resultset_previous"></span>{% endif %}</a>{% if horizontal %}{% if not forloop.last %} | {% endif %}{% endif %}
+    <a class="{{ link.class }}" style="cursor: default;" href="#">{% if link.famfam %}<span class="famfam inactive famfam-{{ link.famfam|default:'link' }}"></span>{% endif %}{{ link.text }}{% if link.error %} - {{ link.error }}{% endif %}{% if link.active and not hide_active_anchor %}<span class="famfam active famfam-resultset_previous"></span>{% endif %}</a>{% if horizontal %}{% if not forloop.last %} | {% endif %}{% endif %}
 {% else %}
-    <a class="{{ link.class }}" href="{{ link.url }}">{% if link.famfam and not disable_icons %}<span class="famfam active famfam-{{ link.famfam|default:'link' }}"></span>{% endif %}{{ link.text }}{% if link.error %} - {{ link.error }}{% endif %}{% if link.active and not hide_active_anchor %}<span class="famfam active famfam-resultset_previous"></span>{% endif %}</a>{% if horizontal %}{% if not forloop.last %} | {% endif %}{% endif %}
+    <a class="{{ link.class }}" href="{{ link.url }}">{% if link.famfam %}<span class="famfam active famfam-{{ link.famfam|default:'link' }}"></span>{% endif %}{{ link.text }}{% if link.error %} - {{ link.error }}{% endif %}{% if link.active and not hide_active_anchor %}<span class="famfam active famfam-resultset_previous"></span>{% endif %}</a>{% if horizontal %}{% if not forloop.last %} | {% endif %}{% endif %}
 {% endif %}