Merge branch 'feature/workflows' into development

Conflicts:
	apps/dynamic_search/__init__.py
	requirements/production.txt

apps/common/__init__.py

@@ -8,7 +8,7 @@ from django.contrib.auth.management import create_superuser
 from django.dispatch import receiver
 from django.db.models.signals import post_syncdb
 
-from navigation.api import register_links, register_top_menu
+from navigation.api import bind_links, register_top_menu, Link
 
 from .conf.settings import (AUTO_CREATE_ADMIN, AUTO_ADMIN_USERNAME,
     AUTO_ADMIN_PASSWORD, TEMPORARY_DIRECTORY)
@@ -19,18 +19,16 @@ from .utils import validate_path
 def has_usable_password(context):
     return context['request'].user.has_usable_password
 
-password_change_view = {'text': _(u'change password'), 'view': 'password_change_view', 'famfam': 'computer_key', 'condition': has_usable_password}
-current_user_details = {'text': _(u'user details'), 'view': 'current_user_details', 'famfam': 'vcard'}
-current_user_edit = {'text': _(u'edit details'), 'view': 'current_user_edit', 'famfam': 'vcard_edit'}
+password_change_view = Link(text=_(u'change password'), view='password_change_view', sprite='computer_key', condition=has_usable_password)
+current_user_details = Link(text=_(u'user details'), view='current_user_details', sprite='vcard')
+current_user_edit = Link(text=_(u'edit details'), view='current_user_edit', sprite='vcard_edit')
+about_view = Link(text=_('about'), view='about_view', sprite='information')
+license_view = Link(text=_('license'), view='license_view', sprite='script')
 
-register_links(['current_user_details', 'current_user_edit', 'password_change_view'], [current_user_details, current_user_edit, password_change_view], menu_name='secondary_menu')
+bind_links(['about_view', 'license_view'], [about_view, license_view], menu_name='secondary_menu')
+bind_links(['current_user_details', 'current_user_edit', 'password_change_view'], [current_user_details, current_user_edit, password_change_view], menu_name='secondary_menu')
 
-about_view = {'text': _('about'), 'view': 'about_view', 'famfam': 'information'}
-license_view = {'text': _('license'), 'view': 'license_view', 'famfam': 'script'}
-
-register_links(['about_view', 'license_view'], [about_view, license_view], menu_name='secondary_menu')
-
-register_top_menu('about', link={'text': _(u'about'), 'view': 'about_view', 'famfam': 'information'}, position=-1)
+register_top_menu('about', link=Link(text=_(u'about'), view='about_view', sprite='information'), position=-1)
 
 
 @receiver(post_syncdb, dispatch_uid='create_superuser', sender=auth_models)

apps/common/templates/generic_list_horizontal_subtemplate.html

@@ -38,7 +38,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|capfirst }}
+                               {% if link.sprite and not disable_icons %}<span class="famfam active famfam-{{ link.sprite|default:'link' }}"></span>{% endif %}{{ link.text|capfirst }}
                             </button>
                         {% endfor %}
                         </div>
@@ -62,7 +62,11 @@
 
             <div class="group navform wat-cf">
                 {% for object in object_list %}
-                    {{ object }}
+                    {% if object %}
+                        {{ object }}
+                    {% endif %}
+                {% empty %}
+                    {% blocktrans with title|striptags as stripped_title %}There are no {{ stripped_title }}{% endblocktrans %}
                 {% endfor %}
             </div>
             
@@ -77,7 +81,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|capfirst }}
+                               {% if link.sprite and not disable_icons %}<span class="famfam active famfam-{{ link.sprite|default:'link' }}"></span>{% endif %}{{ link.text|capfirst }}
                             </button>
                         {% endfor %}
                         </div>

apps/common/templates/generic_list_subtemplate.html

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