Changeset 462

Timestamp:

06/30/10 09:52:10 (3 years ago)

Author:

rafael.soares

Message:

implemented changes to the navigation bar, refs #131

Location:

trunk/clinicaltrials/repository

Files:

• templates/repository/submission_step.html (modified) (4 diffs)
• views.py (modified) (1 diff)

trunk/clinicaltrials/repository/templates/repository/submission_step.html

@@ -1 +1 @@
 {% extends "base.html" %}
 {% load i18n %}
-{% block body_title %}{{ forms.form_main.title }}{% endblock %}
-
-{# Last <p > in http://docs.djangoproject.com/en/dev/topics/templates/#id1 #}
+{% block body_title %}{% trans forms.form_main.title %}{% endblock %}
 
 {% block extrahead %}
@@ -15 +13 @@
         <a href="{% url repository.edittrial trial_pk %}">{% trans "Summary" %}</a>
     </small>
-    {% for step,iscurrent in steps %}
+    {% for step in steps %}
     <span> / </span>
-    <small{% if iscurrent %} class="current"{% endif %}>
-        <a href="{{step}}">{% trans "Part" %} {{forloop.counter}}</a>
+    <small{% if step.is_current %} class="current"{% endif %}>
+        <a href="{{ step.link }}">{% trans step.name %}</a>
     </small>
     {% endfor %}
@@ -28 +26 @@
     <ul>
         <li><a href="{% url repository.edittrial trial_pk %}">{% trans "Summary" %}</a></li>
-        {% for step,iscurrent in steps %}
-        <li{% if iscurrent %} class="current"{% endif %}>
-            <a href="{{step}}">{% trans "Part" %} {{forloop.counter}}</a>
+        {% for step in steps %}
+        <li{% if step.is_current %} class="current"{% endif %}>
+            <a href="{{ step.link }}">{% trans step.name %}</a>
         </li>
         {% endfor %}
@@ -36 +34 @@
 </div>
 {% endblock %}
-

trunk/clinicaltrials/repository/views.py

@@ -123 +123 @@
     steps = []
     for i in range(1,10):
-        steps.append((reverse('step_%d'%i,args=[trial_pk]), i == current_step))
+        steps.append({'link': reverse('step_%d'%i,args=[trial_pk]), 
+                      'is_current': (i == current_step), 
+                      'name': TRIAL_FORMS[i-1]})
     return steps