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

Merge branch 'feature/workflows' into development

Browse Source 
Conflicts:
	apps/dynamic_search/__init__.py
	requirements/production.txt
This commit is contained in:
Roberto Rosario
2012-05-23 00:23:39 -04:00
parent a65031dab5 15156b326b
commit db13cd1702
65 changed files with 2531 additions and 843 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/common/templates/generic_list_subtemplate.html
+12 -8
View File
@@ -38,10 +38,12 @@
{% if multi_select_as_buttons %}
{% get_multi_item_links as multi_item_links %}
<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|capfirst }}
</button>
{% for object_reference, object_links in multi_item_links.items %}
{% for link in object_links %}
<button class="button" type="submit" name="action" value="{{ link.url }}">
{% if link.sprite and not disable_icons %}<span class="famfam active famfam-{{ link.sprite|default:'link' }}"></span>{% endif %}{{ link.text|capfirst }}
</button>
{% endfor %}
{% endfor %}
</div>
{% else %}
@@ -170,10 +172,12 @@
{% if multi_select_as_buttons %}
{% get_multi_item_links as multi_item_links %}
<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|capfirst }}
</button>
{% for object_reference, object_links in multi_item_links.items %}
{% for link in object_links %}
<button class="button" type="submit" name="action" value="{{ link.url }}">
{% if link.sprite and not disable_icons %}<span class="famfam active famfam-{{ link.sprite|default:'link' }}"></span>{% endif %}{{ link.text|capfirst }}
</button>
{% endfor %}
{% endfor %}
</div>
{% else %}