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

Added staging file previews support

Browse Source
This commit is contained in:
Roberto Rosario
2011-02-08 17:57:12 -04:00
parent 52843c3e98
commit 79d7932df0
73 changed files with 2279 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/common/templates/generic_navigation.html
View File

@@ -2,6 +2,6 @@
{% for link in object_navigation_links %}
{% if as_li %}<li>{% endif %}
<a href="{{ link.url }}">{% if link.famfam %}<span class="famfam active famfam-{{ link.famfam|default:'link' }}"></span>{% endif %}{{ link.text|capfirst }}{% if link.error %} - {{ link.error }}{% endif %}{% if link.active %}<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|capfirst }}{% if link.error %} - {{ link.error }}{% endif %}{% if link.active %}<span class="famfam active famfam-resultset_previous"></span>{% endif %}</a>{% if horizontal %}{% if not forloop.last %} | {% endif %}{% endif %}
{% if as_li %}</li>{% endif %}
{% endfor %}

23
apps/common/templatetags/navigation.py
View File

@@ -1,4 +1,5 @@
import types
import copy
from django.conf import settings
from django.core.urlresolvers import reverse, NoReverseMatch
@@ -137,26 +138,30 @@ def resolve_arguments(context, src_args):
def resolve_links(context, links, current_view, current_path):
context_links = []
for link in links:
new_link = copy.copy(link)
args, kwargs = resolve_arguments(context, link.get('args', {}))
if 'view' in link:
link['active'] = link['view'] == current_view
new_link['active'] = link['view'] == current_view
args, kwargs = resolve_arguments(context, link.get('args', {}))
try:
if kwargs:
link['url'] = reverse(link['view'], kwargs=kwargs)
new_link['url'] = reverse(link['view'], kwargs=kwargs)
else:
link['url'] = reverse(link['view'], args=args)
new_link['url'] = reverse(link['view'], args=args)
except NoReverseMatch, err:
link['url'] = '#'
link['error'] = err
new_link['url'] = '#'
new_link['error'] = err
elif 'url' in link:
link['active'] = link['url'] == current_path
new_link['active'] = link['url'] == current_path
if kwargs:
new_link['url'] = link['url'] % kwargs
else:
new_link['url'] = link['url'] % args
else:
link['active'] = False
context_links.append(link)
new_link['active'] = False
context_links.append(new_link)
return context_links
def _get_object_navigation_links(context, menu_name=None):