diff --git a/docs/_static/mayan-login.png b/docs/_static/mayan-login.png deleted file mode 100644 index 65673aa303..0000000000 Binary files a/docs/_static/mayan-login.png and /dev/null differ diff --git a/docs/_static/no-icons.png b/docs/_static/no-icons.png deleted file mode 100644 index d00eec2d62..0000000000 Binary files a/docs/_static/no-icons.png and /dev/null differ diff --git a/docs/_static/themes.png b/docs/_static/themes.png deleted file mode 100644 index 47ef20d00d..0000000000 Binary files a/docs/_static/themes.png and /dev/null differ diff --git a/docs/topics/customization.rst b/docs/topics/customization.rst index e792d28f91..d542a81c7b 100644 --- a/docs/topics/customization.rst +++ b/docs/topics/customization.rst @@ -10,14 +10,4 @@ a home screen. For these kind of situations **Mayan EDMS** has the :setting:`MAIN_DISABLE_HOME_VIEW` configuration option, which will cause users to land on their ``recent document list`` as soon as they log in. ------ -Icons ------ -Some themes such as ``default`` might be more visually appealing to some -people without the menu icons, for this **Mayan EDMS** provides the -:setting:`MAIN_DISABLE_ICONS` configuration option. - -.. image:: ../_static/no-icons.png - :alt: mayan screens with out icons - .. _`Andrea Franz's excellent web app template`: https://github.com/pilu/web-app-theme diff --git a/docs/topics/settings.rst b/docs/topics/settings.rst index 45ff041cdd..55d288d1d1 100644 --- a/docs/topics/settings.rst +++ b/docs/topics/settings.rst @@ -471,15 +471,6 @@ Default: ``False`` Disable the home view and redirect users straight to the recent document list as soon as they log in. -.. setting:: MAIN_DISABLE_ICONS - -**MAIN_DISABLE_ICONS** - -Default: ``False`` - -Turns off navigation links' icons. - - User management =============== diff --git a/mayan/apps/main/settings.py b/mayan/apps/main/settings.py index fc2b3ad66b..907ddfbf5a 100644 --- a/mayan/apps/main/settings.py +++ b/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', diff --git a/mayan/apps/main/templates/main/generic_list_horizontal_subtemplate.html b/mayan/apps/main/templates/main/generic_list_horizontal_subtemplate.html index b2305305a7..d2fa87e9d3 100644 --- a/mayan/apps/main/templates/main/generic_list_horizontal_subtemplate.html +++ b/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 %}

@@ -37,7 +35,7 @@ @@ -75,7 +73,7 @@ diff --git a/mayan/apps/main/templates/main/generic_list_subtemplate.html b/mayan/apps/main/templates/main/generic_list_subtemplate.html index e97b4d048a..579d76737f 100644 --- a/mayan/apps/main/templates/main/generic_list_subtemplate.html +++ b/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 %}

@@ -40,7 +38,7 @@ @@ -160,7 +158,7 @@ diff --git a/mayan/apps/navigation/templates/generic_link_instance.html b/mayan/apps/navigation/templates/generic_link_instance.html index bb66d18751..10845def1d 100644 --- a/mayan/apps/navigation/templates/generic_link_instance.html +++ b/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 %} - {% if link.famfam and not disable_icons %}{% endif %}{{ link.text }}{% if link.error %} - {{ link.error }}{% endif %}{% if link.active and not hide_active_anchor %}{% endif %}{% if horizontal %}{% if not forloop.last %} | {% endif %}{% endif %} + {% if link.famfam %}{% endif %}{{ link.text }}{% if link.error %} - {{ link.error }}{% endif %}{% if link.active and not hide_active_anchor %}{% endif %}{% if horizontal %}{% if not forloop.last %} | {% endif %}{% endif %} {% else %} - {% if link.famfam and not disable_icons %}{% endif %}{{ link.text }}{% if link.error %} - {{ link.error }}{% endif %}{% if link.active and not hide_active_anchor %}{% endif %}{% if horizontal %}{% if not forloop.last %} | {% endif %}{% endif %} + {% if link.famfam %}{% endif %}{{ link.text }}{% if link.error %} - {{ link.error }}{% endif %}{% if link.active and not hide_active_anchor %}{% endif %}{% if horizontal %}{% if not forloop.last %} | {% endif %}{% endif %} {% endif %}