matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Issue #56, Remove the MAIN_DISABLE_ICONS setting configuration option

Browse Source
This commit is contained in:
Roberto Rosario
2014-10-02 17:53:06 -04:00
parent 3d033c687d
commit 93a28fab2f
9 changed files with 6 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
docs/_static/mayan-login.png vendored
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 79 KiB

BIN
docs/_static/no-icons.png vendored
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 119 KiB

BIN
docs/_static/themes.png vendored
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 149 KiB

10
docs/topics/customization.rst
View File

@@ -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

9
docs/topics/settings.rst
View File

@@ -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
===============

8
mayan/apps/main/settings.py
View File

@@ -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',

6
mayan/apps/main/templates/main/generic_list_horizontal_subtemplate.html
View File

@@ -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>

6
mayan/apps/main/templates/main/generic_list_subtemplate.html
View File

@@ -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>

6
mayan/apps/navigation/templates/generic_link_instance.html
View File

@@ -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 %}