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

Update the document indexing widgets to use the new icon class.

Browse Source 
Signed-off-by: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
This commit is contained in:
Roberto Rosario
2018-08-04 16:51:42 -04:00
parent ffa8a4c5e2
commit 7a4202b459
3 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mayan/apps/document_indexing/icons.py
View File

@@ -3,8 +3,11 @@ from __future__ import absolute_import, unicode_literals
from appearance.classes import Icon
icon_document_index_list = Icon(driver_name='fontawesome', symbol='list-ul')
icon_index_main_menu = Icon(driver_name='fontawesome', symbol='list-ul')
icon_index_setup = Icon(driver_name='fontawesome', symbol='list-ul')
icon_index_level_up = Icon(
driver_name='fontawesomecss', css_classes='fa-level-up-alt fa-rotate-90'
)
icon_index = Icon(driver_name='fontawesome', symbol='list-ul')
icon_node_with_documents = Icon(driver_name='fontawesome', symbol='folder')
icon_rebuild_index_instances = Icon(
driver_name='fontawesome', symbol='list-ul'
)

7
mayan/apps/document_indexing/links.py
View File

@@ -5,8 +5,7 @@ from django.utils.translation import ugettext_lazy as _
from navigation import Link
from .icons import (
icon_document_index_list, icon_index_main_menu, icon_index_setup,
icon_rebuild_index_instances
icon_document_index_list, icon_index, icon_rebuild_index_instances
)
from .permissions import (
permission_document_indexing_create, permission_document_indexing_edit,
@@ -23,11 +22,11 @@ link_document_index_list = Link(
text=_('Indexes'), view='indexing:document_index_list',
)
link_index_main_menu = Link(
icon_class=icon_index_main_menu, text=_('Indexes'),
icon_class=icon_index, text=_('Indexes'),
view='indexing:index_list'
)
link_index_setup = Link(
icon_class=icon_index_setup, text=_('Indexes'),
icon_class=icon_index, text=_('Indexes'),
view='indexing:index_setup_list'
)
link_index_setup_list = Link(

22
mayan/apps/document_indexing/widgets.py
View File

@@ -5,6 +5,8 @@ from django.apps import apps
from django.utils.encoding import force_text
from django.utils.html import mark_safe, escape
from .icons import icon_index, icon_index_level_up, icon_node_with_documents
def get_instance_link(index_instance_node):
"""
@@ -25,16 +27,16 @@ def index_instance_item_link(index_instance_item):
if isinstance(index_instance_item, IndexInstanceNode):
if index_instance_item.index_template_node.link_documents:
icon_template = '<i class="fa fa-folder"></i>'
icon = icon_node_with_documents
else:
icon_template = '<i class="fa fa-level-up-alt fa-rotate-90"></i>'
icon = icon_index_level_up
else:
icon_template = ''
return mark_safe(
'%(icon_template)s&nbsp;<a href="%(url)s">%(text)s</a>' % {
'%(icon)s&nbsp;<a href="%(url)s">%(text)s</a>' % {
'url': index_instance_item.get_absolute_url(),
'icon_template': icon_template,
'icon': icon.render(),
'text': index_instance_item
}
)
@@ -48,7 +50,7 @@ def node_level(node):
''.join(
[
'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;' * node.get_level(),
'' if node.is_root_node() else '<i class="fa fa-level-up-alt fa-rotate-90"></i> ',
'' if node.is_root_node() else icon_index_level_up.render(),
force_text(node)
]
)
@@ -63,20 +65,20 @@ def node_tree(node, user):
for ancestor in node.get_ancestors(include_self=True):
if ancestor.is_root_node():
element = node.index()
icon = 'fa fa-list-ul'
icon = icon_index
else:
element = ancestor
if element.index_template_node.link_documents:
icon = 'fa fa-folder'
icon = icon_node_with_documents
else:
icon = 'fa fa-level-up-alt fa-rotate-90'
icon = icon_index_level_up
result.append(
'<a href="{url}" class="list-group-item {active}"><span class="badge">{count}</span><i class="{icon}"></i> {text}</a>'.format(
'<a href="{url}" class="list-group-item {active}"><span class="badge">{count}</span>{icon} {text}</a>'.format(
url=element.get_absolute_url(),
active='active' if element == node or node.get_ancestors(include_self=True).count() == 1 else '',
count=element.get_item_count(user=user),
icon=icon,
icon=icon.render(),
text=escape(element)
)
)