some rifinement

volpino · Jun 5, 2011 · 9d1f511 · 9d1f511
1 parent 51a93db
commit 9d1f511
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/volunteers_management/urls.py b/volunteers_management/urls.py
@@ -31,6 +31,7 @@
     url(r'^emergencies/description/', emergency_desc), #template emergencies/desc.html  link 'join' ->!!!
     url(r'^emergencies/manage/', emergency_manage), # link a emergency_close
     url(r'^emergencies/overview/$', emergency_overview), #elenco delle emergencies, per tutti
+    url(r'^emergencies/myemergencies/$', my_emergencies), #elenco delle emergencies aperte da organization
 
     url(r'^events/create/$', new_event), #for the member
     url(r'^events/description/', event_desc), #for organization and the member and the volunteers; se sei member da qui lo puoi chiudere!

diff --git a/volunteers_management/volnet/templates/base.html b/volunteers_management/volnet/templates/base.html
@@ -56,7 +56,7 @@ <h3>{% block content_title %}{% endblock %}</h3>
         {% if organization%}
         <ul>
             <li><a href="/emergencies/overview">Emergencies</a></li>
-            <li><a href="/emergencies/open">Open Emergencies</a></li>
+            <li><a href="/emergencies/open">My Emergencies</a></li>
             <li><a href="/emergencies/create">Create Emergency</a></li>
             <li><a href="/emergencies/manage">Manage Emergencies</a></li>
             <li><a href="/members/manage">Manage Members</a></li>
@@ -65,8 +65,8 @@ <h3>{% block content_title %}{% endblock %}</h3>
         {% else %}{% if member %}
         <ul>
             <li><a href="/emergencies/overview">Emergencies</a></li>
-            <li><a href="/events/overview">Open Tasks</a></li>
-            <li><a href="/events/create">Create Tasks</a></li>
+            <li><a href="/events/overview">My events</a></li>
+            <li><a href="/events/create">Create event</a></li>
             <li><a href="/accounts/password/change">Change password</a></li>
         </ul>
         {% else %}{% if volunteer %}

diff --git a/volunteers_management/volnet/templates/events/mytask.html b/volunteers_management/volnet/templates/events/mytask.html
@@ -3,6 +3,5 @@
 My task
 {% endblock %}
 {% block content %}
-<p>Currently you have no task.</p>
+<p>You have currently no task assigned.</p>
 {% endblock %}
-
diff --git a/volunteers_management/volnet/templates/events/overview.html b/volunteers_management/volnet/templates/events/overview.html
@@ -4,7 +4,7 @@
 {% endblock %}
 {% block content %}
 <ul>
-    {% for eve in #### %}
+    {% for eve in ems_open %}
     <li><a href=/events/overview/?id={{eve.pk}}>{{eve.name}}</a></li>
     {% endfor %}
 </ul>