Merge branch 'master' of github.com:mollyproject/mollyproject

mollyproject · Dec 16, 2010 · 683f125 · 683f125
2 parents b93a571 + 842a031
commit 683f125
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/molly/apps/home/templates/home/index.html b/molly/apps/home/templates/home/index.html
@@ -34,11 +34,11 @@
     <div class="bubble">
 	<div class="center">
     	<ol class="icon-menu">
-	      {% for application in applications %}
+	      {% for application in applications %}{% if application.display_to_user %}
 	          <li id="menu-{{ application.local_name }}">
-	              <a {% if forloop.counter < 10 %} accesskey="{{ forloop.counter }}"{% endif %} href="{{ application.url }}">{{ application.title }}</a>
+	              <a {% if application.accesskey %} accesskey="{{ application.accesskey }}"{% endif %} href="{{ application.url }}">{{ application.title }}</a>
 	          </li>
-	      {% endfor %}
+	      {% endif %}{% endfor %}
 	    </ol>
         {# Only necessary if using floating icons #}
         {# <div class="clearhidden"> </div> #}

diff --git a/molly/apps/home/views.py b/molly/apps/home/views.py
@@ -52,7 +52,12 @@ def handle_GET(self, request, context):
             'local_name': app.local_name,
             'title': app.title,
             'url': reverse('%s:index' % app.local_name) if app.has_urlconf else None,
-        } for app in conf.all_apps() if app.display_to_user]
+            'display_to_user': app.display_to_user,
+        } for app in conf.all_apps()]
+
+        # Add accesskeys to the first 9 apps to be displayed to the user
+        for i, app in enumerate([app for app in applications if app['display_to_user']][:9]):
+            app['accesskey'] = i + 1
 
         context = {
             'applications': applications,