Merge lp:~cjohnston/loco-team-portal/bugfix-lp-612047 into lp:loco-team-portal

[Chris Johnston]

Fixes bug #612047 and changes venues url to /events/venues

=== modified file 'loco_directory/locale/loco-directory.pot'
--- loco_directory/locale/loco-directory.pot	2010-08-16 18:57:47 +0000
+++ loco_directory/locale/loco-directory.pot	2010-08-17 00:32:40 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-16 18:57+0000\n"
+"POT-Creation-Date: 2010-08-16 19:38+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -25,7 +25,7 @@
 msgid "Please just set one tag."
 msgstr ""
 
-#: events/forms.py:129 teams/forms.py:22 templates/events/event_list.html:19
+#: events/forms.py:129 teams/forms.py:22 templates/events/event_list.html:20
 #: templates/teams/team_list.html:16 templates/venues/venue_list.html:15
 #: venues/forms.py:27
 msgid "Search"
@@ -445,8 +445,8 @@
 msgid "LoCo Team Directory"
 msgstr ""
 
-#: templates/base.html:13 templates/index.html:15
-msgid "Show all Teams"
+#: templates/base.html:13
+msgid "Show All Teams"
 msgstr ""
 
 #: templates/base.html:13 templates/index.html:15
@@ -454,8 +454,8 @@
 msgid "Teams"
 msgstr ""
 
-#: templates/base.html:14 templates/index.html:24
-msgid "Show all Events"
+#: templates/base.html:14
+msgid "Show All Events"
 msgstr ""
 
 #: templates/base.html:14 templates/index.html:24
@@ -463,41 +463,37 @@
 msgstr ""
 
 #: templates/base.html:15
-msgid "Show all Venues"
-msgstr ""
-
-#: templates/base.html:15
-msgid "Venues"
-msgstr ""
-
-#: templates/base.html:16
 msgid "LoCo Council"
 msgstr ""
 
-#: templates/base.html:17
+#: templates/base.html:16
 msgid "About LoCo Directory"
 msgstr ""
 
-#: templates/base.html:17
+#: templates/base.html:16
 msgid "About"
 msgstr ""
 
-#: templates/base.html:19
-msgid "Log out"
+#: templates/base.html:18
+msgid "Log Out"
 msgstr ""
 
-#: templates/base.html:21
+#: templates/base.html:20
 msgid "Log in"
 msgstr ""
 
-#: templates/base.html:44
+#: templates/base.html:43
 msgid "Logged in as"
 msgstr ""
 
-#: templates/base.html:57
+#: templates/base.html:56
 msgid "LoCo Directory"
 msgstr ""
 
+#: templates/index.html:15
+msgid "Show all Teams"
+msgstr ""
+
 #: templates/index.html:17
 msgid ""
 "List of all Ubuntu LoCo Teams, with full information such as contact, web "
@@ -510,6 +506,10 @@
 "team in the near future."
 msgstr ""
 
+#: templates/index.html:24
+msgid "Show all Events"
+msgstr ""
+
 #: templates/index.html:25
 msgid ""
 "List of all Ubuntu LoCo Events, with full information such as location, "
@@ -520,15 +520,15 @@
 msgid "Upcoming Global Events"
 msgstr ""
 
-#: templates/index.html:29 templates/events/event_list.html:28
+#: templates/index.html:29 templates/events/event_list.html:29
 msgid "Global Events as ical"
 msgstr ""
 
-#: templates/index.html:31 templates/events/event_list.html:30
+#: templates/index.html:31 templates/events/event_list.html:31
 msgid "Select a global event below to see more information about it:"
 msgstr ""
 
-#: templates/index.html:36
+#: templates/index.html:36 templates/events/event_list.html:36
 msgid "There are currently no LoCo Global Events"
 msgstr ""
 
@@ -536,11 +536,11 @@
 msgid "Upcoming Team Events"
 msgstr ""
 
-#: templates/index.html:43 templates/events/event_list.html:45
+#: templates/index.html:43 templates/events/event_list.html:46
 msgid "Team Events as ical"
 msgstr ""
 
-#: templates/index.html:45
+#: templates/index.html:45 templates/events/event_list.html:52
 msgid "There are currently no LoCo Team Events"
 msgstr ""
 
@@ -650,8 +650,9 @@
 msgstr ""
 
 #: templates/events/event_history_list.html:7
-#: templates/teams/team_event_history.html:8
-msgid "Upcoming Events"
+#: templates/events/global_event_detail.html:12
+#: templates/events/team_event_detail.html:7
+msgid "Back to Events List"
 msgstr ""
 
 #: templates/events/event_history_list.html:12
@@ -682,43 +683,42 @@
 msgid "Ubuntu LoCo Events List"
 msgstr ""
 
-#: templates/events/event_list.html:8
+#: templates/events/event_list.html:7
+msgid "Show All Venues"
+msgstr ""
+
+#: templates/events/event_list.html:7
+msgid "Venues"
+msgstr ""
+
+#: templates/events/event_list.html:9
 msgid "Add Global Event"
 msgstr ""
 
-#: templates/events/event_list.html:11
+#: templates/events/event_list.html:12
 msgid "Add Team Event"
 msgstr ""
 
-#: templates/events/event_list.html:13 templates/teams/team_detail.html:108
+#: templates/events/event_list.html:14 templates/teams/team_detail.html:108
 #: templates/teams/team_event_list.html:8
 msgid "Past Events"
 msgstr ""
 
-#: templates/events/event_list.html:25
+#: templates/events/event_list.html:26
 msgid "Ubuntu LoCo Global Events"
 msgstr ""
 
-#: templates/events/event_list.html:35
-msgid "There are currently no  LoCo Global Events"
-msgstr ""
-
-#: templates/events/event_list.html:42
+#: templates/events/event_list.html:43
 msgid "Ubuntu LoCo Team Events"
 msgstr ""
 
-#: templates/events/event_list.html:46
+#: templates/events/event_list.html:47
 #: templates/teams/team_event_history.html:18
 #: templates/teams/team_event_list.html:25
 msgid "Select a team event below to see more information about it:"
 msgstr ""
 
-#: templates/events/event_list.html:51
-msgid "There are currently no  LoCo Team Events"
-msgstr ""
-
 #: templates/events/global_event_delete_confirm.html:4
-#: templates/events/global_event_detail.html:18
 msgid "Delete Global Event"
 msgstr ""
 
@@ -736,16 +736,19 @@
 msgid "Cancel"
 msgstr ""
 
-#: templates/events/global_event_detail.html:12
-msgid "Go back to Event list"
-msgstr ""
-
 #: templates/events/global_event_detail.html:14
-msgid "Add your Team's Event"
+msgid "Add Your Team's Event"
 msgstr ""
 
 #: templates/events/global_event_detail.html:17
-msgid "Edit details"
+#: templates/events/team_event_detail.html:11
+#: templates/teams/team_detail.html:9
+msgid "Edit Details"
+msgstr ""
+
+#: templates/events/global_event_detail.html:18
+#: templates/events/team_event_detail.html:12
+msgid "Delete Event"
 msgstr ""
 
 #: templates/events/global_event_detail.inc.html:20
@@ -782,7 +785,6 @@
 msgstr ""
 
 #: templates/events/global_event_list.inc.html:4
-#: templates/events/team_event_list.inc.html:4
 msgid "Event name"
 msgstr ""
 
@@ -825,7 +827,6 @@
 
 #: templates/events/team_event_delete_confirm.html:4
 #: templates/events/team_event_delete_confirm.html:15
-#: templates/events/team_event_detail.html:12
 msgid "Delete Team Event"
 msgstr ""
 
@@ -834,19 +835,11 @@
 msgid "Do you really want to delete the Team Event: %(eventname)s?"
 msgstr ""
 
-#: templates/events/team_event_detail.html:7
-msgid "Back to Events List"
-msgstr ""
-
 #: templates/events/team_event_detail.html:9
 #: templates/events/team_event_detail_comments.inc.html:7
 msgid "Add Comment"
 msgstr ""
 
-#: templates/events/team_event_detail.html:11
-msgid "Edit Details"
-msgstr ""
-
 #: templates/events/team_event_detail.html:13
 msgid "Copy Event"
 msgstr ""
@@ -947,6 +940,10 @@
 msgid "Comment:"
 msgstr ""
 
+#: templates/events/team_event_list.inc.html:4
+msgid "Event Name"
+msgstr ""
+
 #: templates/events/team_event_list.inc.html:7
 msgid "Global Event"
 msgstr ""
@@ -982,23 +979,15 @@
 msgstr ""
 
 #: templates/teams/team_detail.html:7 templates/teams/team_update.html:7
-msgid "Go back to Team list."
-msgstr ""
-
-#: templates/teams/team_detail.html:7
-msgid "Go back to Team list"
+msgid "Back to Teams List"
 msgstr ""
 
 #: templates/teams/team_detail.html:8
-msgid "Join this team!"
-msgstr ""
-
-#: templates/teams/team_detail.html:9
-msgid "Edit team details"
+msgid "Join This Team!"
 msgstr ""
 
 #: templates/teams/team_detail.html:10
-msgid "Add new Event"
+msgid "Add New Event"
 msgstr ""
 
 #: templates/teams/team_detail.html:16 templates/teams/team_event_list.html:9
@@ -1094,8 +1083,12 @@
 msgstr ""
 
 #: templates/teams/team_event_history.html:7
-#: templates/teams/team_event_list.html:7
-msgid "Go back to team details"
+#: templates/teams/team_event_list.html:7 templates/teams/team_update.html:8
+msgid "Back to Team Details"
+msgstr ""
+
+#: templates/teams/team_event_history.html:8
+msgid "Upcoming Events"
 msgstr ""
 
 #: templates/teams/team_event_history.html:23
@@ -1155,10 +1148,6 @@
 msgid "There are currently no approved teams in the Ubuntu LoCo Directory. :("
 msgstr ""
 
-#: templates/teams/team_update.html:8
-msgid "Go back to team details."
-msgstr ""
-
 #: templates/teams/team_update.html:16
 msgid "Please correct the error"
 msgstr ""
@@ -1180,11 +1169,11 @@
 msgstr ""
 
 #: templates/venues/venue_detail.html:15
-msgid "Go back to Venue list"
+msgid "Back to Venues List"
 msgstr ""
 
 #: templates/venues/venue_detail.html:17
-msgid "Edit venue details"
+msgid "Edit Venue Details"
 msgstr ""
 
 #: templates/venues/venue_detail_basic.inc.html:24
@@ -1208,7 +1197,7 @@
 msgstr ""
 
 #: templates/venues/venue_list.html:8
-msgid "Add new venue"
+msgid "Add New Venue"
 msgstr ""
 
 #: templates/venues/venue_list.html:25

=== modified file 'loco_directory/templates/base.html'
--- loco_directory/templates/base.html	2010-08-04 13:02:45 +0000
+++ loco_directory/templates/base.html	2010-08-17 00:32:40 +0000
@@ -6,20 +6,19 @@
 {% block logo_text %}{% trans "LoCo Team Directory" %}{% endblock %}
 
 {% block extrahead %}
-  <script type="text/javascript" src="{{MEDIA_URL}}/jquery/jquery.js"></script>
+    <script type="text/javascript" src="{{MEDIA_URL}}/jquery/jquery.js"></script>
 {% endblock %}
 
 {% block main_nav_links %}
-	<a class="main-nav-item {% ifequal url_base 'teams' %}current{% endifequal %}" title="{% trans "Show all Teams" %}" href="{% url team-list %}">{% trans "Teams" %}</a>
-	<a class="main-nav-item {% ifequal url_base 'events' %}current{% endifequal %}" title="{% trans "Show all Events" %}" href="{% url event-list %}">{% trans "Events" %}</a>
-	<a class="main-nav-item {% ifequal url_base 'venues' %}current{% endifequal %}" title="{% trans "Show all Venues" %}" href="{% url venue-list %}">{% trans "Venues" %}</a>
-	<a class="main-nav-item {% ifequal url_base 'loco-council' %}current{% endifequal %}" title="{% trans "LoCo Council" %}" href="{% url loco_council %}">{% trans "LoCo Council" %}</a>
-	<a class="main-nav-item {% ifequal url_base 'about' %}current{% endifequal %}" title="{% trans "About LoCo Directory" %}" href="/about">{% trans "About" %}</a></li>
-	  {% if user.is_authenticated %}
-	   <a class="main-nav-item" href="/logout" title="{% trans "Log out" %}: {{ user.username }}">{% trans "Log out" %}</a>
-	  {% else %}
-	    <a class="main-nav-item" href="/openid/login?next={{login_next}}">{% trans "Log in" %}</a>
-	  {% endif %}
+    <a class="main-nav-item {% ifequal url_base 'teams' %}current{% endifequal %}" title="{% trans "Show All Teams" %}" href="{% url team-list %}">{% trans "Teams" %}</a>
+    <a class="main-nav-item {% ifequal url_base 'events' %}current{% endifequal %}" title="{% trans "Show All Events" %}" href="{% url event-list %}">{% trans "Events" %}</a>
+    <a class="main-nav-item {% ifequal url_base 'loco-council' %}current{% endifequal %}" title="{% trans "LoCo Council" %}" href="{% url loco_council %}">{% trans "LoCo Council" %}</a>
+    <a class="main-nav-item {% ifequal url_base 'about' %}current{% endifequal %}" title="{% trans "About LoCo Directory" %}" href="/about">{% trans "About" %}</a></li>
+    {% if user.is_authenticated %}
+        <a class="main-nav-item" href="/logout" title="{% trans "Log Out" %}: {{ user.username }}">{% trans "Log Out" %}</a>
+    {% else %}
+        <a class="main-nav-item" href="/openid/login?next={{login_next}}">{% trans "Log in" %}</a>
+    {% endif %}
 {% endblock %}
 
 {% block sub_nav_links %}

=== modified file 'loco_directory/templates/events/event_history_list.html'
--- loco_directory/templates/events/event_history_list.html	2010-07-29 15:41:01 +0000
+++ loco_directory/templates/events/event_history_list.html	2010-08-17 00:32:40 +0000
@@ -4,7 +4,7 @@
 {% block title %}{% trans "Ubuntu LoCo Events History" %}{% endblock %}
 
 {% block sub_nav_links %}
-<a class="sub-nav-item" href="{% url event-list %}">{% trans "Upcoming Events" %}</a>
+<a class="sub-nav-item" href="{% url event-list %}">{% trans "Back to Events List" %}</a>
 {% endblock %}
 
 {% block content %}

=== modified file 'loco_directory/templates/events/event_list.html'
--- loco_directory/templates/events/event_list.html	2010-07-31 05:23:47 +0000
+++ loco_directory/templates/events/event_list.html	2010-08-17 00:32:40 +0000
@@ -4,6 +4,7 @@
 {% block title %}{% trans "Ubuntu LoCo Events List" %}{% endblock %}
 
 {% block sub_nav_links %}
+<a class="sub-nav-item" title="{% trans "Show All Venues" %}" href="{% url venue-list %}">{% trans "Venues" %}</a>
 {% if user_is_on_lc %}
 <a class="sub-nav-item" href="{% url global-event-new %}">{% trans "Add Global Event" %}</a>
 {% endif %}
@@ -32,7 +33,7 @@
 {% include "events/global_event_list.inc.html" %}
 
 {% else %}
-</h2><p>{% trans "There are currently no  LoCo Global Events" %}</p>
+</h2><p>{% trans "There are currently no LoCo Global Events" %}</p>
 {% endif %}
 </article>
 
@@ -48,7 +49,7 @@
 {% include "events/team_event_list.inc.html" %}
 
 {% else %}
-</h2><p>{% trans "There are currently no  LoCo Team Events" %}</p>
+</h2><p>{% trans "There are currently no LoCo Team Events" %}</p>
 {% endif %}
 
 </article>

=== modified file 'loco_directory/templates/events/global_event_detail.html'
--- loco_directory/templates/events/global_event_detail.html	2010-08-15 20:35:13 +0000
+++ loco_directory/templates/events/global_event_detail.html	2010-08-17 00:32:40 +0000
@@ -9,13 +9,13 @@
 {% block title %}{% trans global_event_object.name %}{% endblock %}
 
 {% block sub_nav_links %}
-<a class="sub-nav-item" href="{% url event-list %}">{% trans "Go back to Event list" %}</a>
+<a class="sub-nav-item" href="{% url event-list %}">{% trans "Back to Events List" %}</a>
 {% if add_team_event %}
-<a class="sub-nav-item" href="{% url team-event-select %}?global_event_id={{global_event_object.id}}">{% trans "Add your Team's Event" %}</a>
+<a class="sub-nav-item" href="{% url team-event-select %}?global_event_id={{global_event_object.id}}">{% trans "Add Your Team's Event" %}</a>
 {% endif %}
 {% if user_is_on_lc %}
-<a class="sub-nav-item" href="{% url global-event-update global_event_object.id %}">{% trans "Edit details" %}</a>
-<a class="sub-nav-item" href="{% url global-event-delete global_event_object.id %}">{% trans "Delete Global Event" %}</a>
+<a class="sub-nav-item" href="{% url global-event-update global_event_object.id %}">{% trans "Edit Details" %}</a>
+<a class="sub-nav-item" href="{% url global-event-delete global_event_object.id %}">{% trans "Delete Event" %}</a>
 {% endif %}
 {% endblock %}
 

=== modified file 'loco_directory/templates/events/team_event_detail.html'
--- loco_directory/templates/events/team_event_detail.html	2010-08-16 18:14:57 +0000
+++ loco_directory/templates/events/team_event_detail.html	2010-08-17 00:32:40 +0000
@@ -9,7 +9,7 @@
 <a class="sub-nav-item" href="{% url team-event-comment-new team_event_object.id %}#comment">{% trans "Add Comment" %}</a>
 {% if user_is_team_member %}
 <a class="sub-nav-item" href="{% url team-event-update team_event_object.id %}">{% trans "Edit Details" %}</a>
-<a class="sub-nav-item" href="{% url team-event-delete team_event_object.id %}">{% trans "Delete Team Event" %}</a>
+<a class="sub-nav-item" href="{% url team-event-delete team_event_object.id %}">{% trans "Delete Event" %}</a>
 <a class="sub-nav-item" href="{% url team-event-copy team_event_object.id %}">{% trans "Copy Event" %}</a>
 {% endif %}
 

=== modified file 'loco_directory/templates/events/team_event_list.inc.html'
--- loco_directory/templates/events/team_event_list.inc.html	2010-06-18 02:48:47 +0000
+++ loco_directory/templates/events/team_event_list.inc.html	2010-08-17 00:32:40 +0000
@@ -1,7 +1,7 @@
 {% load i18n %}
 <table id="team_event_list" class="data_table">
 <tr id="team_event_list_header">
-<th class="event_name">{% trans "Event name" %}</th>
+<th class="event_name">{% trans "Event Name" %}</th>
 <th class="event_begin">{% trans "Start" %}</th>
 <th class="event_end">{% trans "End" %}</th>
 <th class="event_global">{% trans "Global Event" %}</th>

=== modified file 'loco_directory/templates/teams/team_detail.html'
--- loco_directory/templates/teams/team_detail.html	2010-07-31 17:15:03 +0000
+++ loco_directory/templates/teams/team_detail.html	2010-08-17 00:32:40 +0000
@@ -4,10 +4,10 @@
 {% block title %}{% trans team.name %}{% endblock %}
 
 {% block sub_nav_links %}
-			<a class="sub-nav-item" href="{% url team-list %}" title="{% trans "Go back to Team list." %}">{% trans "Go back to Team list" %}</a>
-			{% if is_member %}{% else %} <a class="sub-nav-item" href="https://launchpad.net/~{{ team.lp_name }}/+join">{% trans "Join this team!" %}</a>{% endif %}
-        	{% if is_admin %}<a class="sub-nav-item" href="{% url team-edit team.lp_name %}" title="{% trans "Edit team details" %}">{% trans "Edit team details" %}</a>{% endif %}
-            {% if is_member %}<a class="sub-nav-item" href="{% url team-event-new team.lp_name %}" title="{% trans "Add new Event" %}">{% trans "Add new Event" %}</a>{% endif %}
+			<a class="sub-nav-item" href="{% url team-list %}" title="{% trans "Back to Teams List" %}">{% trans "Back to Teams List" %}</a>
+			{% if is_member %}{% else %} <a class="sub-nav-item" href="https://launchpad.net/~{{ team.lp_name }}/+join">{% trans "Join This Team!" %}</a>{% endif %}
+        	{% if is_admin %}<a class="sub-nav-item" href="{% url team-edit team.lp_name %}" title="{% trans "Edit Details" %}">{% trans "Edit Details" %}</a>{% endif %}
+            {% if is_member %}<a class="sub-nav-item" href="{% url team-event-new team.lp_name %}" title="{% trans "Add New Event" %}">{% trans "Add New Event" %}</a>{% endif %}
 {% endblock %}
 
 {% block search %}{% endblock %}

=== modified file 'loco_directory/templates/teams/team_event_history.html'
--- loco_directory/templates/teams/team_event_history.html	2010-07-29 15:41:01 +0000
+++ loco_directory/templates/teams/team_event_history.html	2010-08-17 00:32:40 +0000
@@ -4,7 +4,7 @@
 {% block title %}{% blocktrans with team_object.lp_name as teamname %}{{teamname}} Events History{% endblocktrans %}{% endblock %}
 
 {% block sub_nav_links %}
-<a class="sub-nav-item" href="{% url team-detail team_object.lp_name %}">{% trans "Go back to team details" %}</a>
+<a class="sub-nav-item" href="{% url team-detail team_object.lp_name %}">{% trans "Back to Team Details" %}</a>
 <a class="sub-nav-item" href="{% url team-event-list team_object.lp_name %}">{% trans "Upcoming Events" %}</a>
 {% endblock %}
 

=== modified file 'loco_directory/templates/teams/team_event_list.html'
--- loco_directory/templates/teams/team_event_list.html	2010-07-31 05:23:47 +0000
+++ loco_directory/templates/teams/team_event_list.html	2010-08-17 00:32:40 +0000
@@ -4,7 +4,7 @@
 {% block title %}{% blocktrans with team_object.name as teamname %}{{teamname}} Events List{% endblocktrans %}{% endblock %}
 
 {% block sub_nav_links %}
-<a class="sub-nav-item" href="{% url team-detail team_object.lp_name %}">{% trans "Go back to team details" %}</a>
+<a class="sub-nav-item" href="{% url team-detail team_object.lp_name %}">{% trans "Back to Team Details" %}</a>
 <a class="sub-nav-item" href="{% url team-event-history team_object.lp_name %}">{% trans "Past Events" %}</a>
 <a class="sub-nav-item" href="{% url team-events-rss team_object.lp_name %}" title="{% trans "Team Events (RSS)" %}"">{% trans "Team Events (RSS)" %}</a>
 {% endblock %}

=== modified file 'loco_directory/templates/teams/team_update.html'
--- loco_directory/templates/teams/team_update.html	2010-06-24 19:18:57 +0000
+++ loco_directory/templates/teams/team_update.html	2010-08-17 00:32:40 +0000
@@ -4,8 +4,8 @@
 {% block title %}{{ team.name }}{% endblock %}
 
 {% block sub_nav_links %}
-<a class="sub-nav-item" href="/teams">{% trans "Go back to Team list." %}</a>
-<a class="sub-nav-item" href="/teams/{{ team.lp_name }}">{% trans "Go back to team details." %}</a>
+<a class="sub-nav-item" href="/teams">{% trans "Back to Teams List" %}</a>
+<a class="sub-nav-item" href="/teams/{{ team.lp_name }}">{% trans "Back to Team Details" %}</a>
 {% endblock %}
 
 {% block content %}

=== modified file 'loco_directory/templates/venues/venue_detail.html'
--- loco_directory/templates/venues/venue_detail.html	2010-08-04 13:02:45 +0000
+++ loco_directory/templates/venues/venue_detail.html	2010-08-17 00:32:40 +0000
@@ -12,9 +12,9 @@
 {% endblock %}
 
 {% block sub_nav_links %}
-<a class="sub-nav-item" href="{% url venue-list %}" >{% trans "Go back to Venue list" %}</a>
+<a class="sub-nav-item" href="{% url venue-list %}" >{% trans "Back to Venues List" %}</a>
 {% if user.is_authenticated %}
-<a class="sub-nav-item" href="{% url venue-update venue_object.id %}">{% trans "Edit venue details" %}</a>
+<a class="sub-nav-item" href="{% url venue-update venue_object.id %}">{% trans "Edit Venue Details" %}</a>
 {% endif %}
 {% endblock %}
 

=== modified file 'loco_directory/templates/venues/venue_list.html'
--- loco_directory/templates/venues/venue_list.html	2010-08-02 12:43:32 +0000
+++ loco_directory/templates/venues/venue_list.html	2010-08-17 00:32:40 +0000
@@ -5,7 +5,7 @@
 
 {% block sub_nav_links %}
 {% if user.is_authenticated %}
-<a class="sub-nav-item" href="{% url venue-new %}">{% trans "Add new venue" %}</a>
+<a class="sub-nav-item" href="{% url venue-new %}">{% trans "Add New Venue" %}</a>
 {% endif %}
 {% endblock %}
 

=== modified file 'loco_directory/urls.py'
--- loco_directory/urls.py	2010-07-28 15:39:37 +0000
+++ loco_directory/urls.py	2010-08-17 00:32:40 +0000
@@ -13,8 +13,8 @@
     url(r'^admin/(.*)', admin.site.root),
     url(r'^data/xml', 'teams.views.xml_team_data', name='xml_team_data'),
     url(r'^teams/', include('teams.urls')),
+    url(r'^events/venues/', include('venues.urls')),
     url(r'^events/', include('events.urls')),
-    url(r'^venues/', include('venues.urls')),
     url(r'^loco-council/$', 'common.views.loco_council', name='loco_council'),
     url(r'^loco-council/reapprovals$', 'teams.views.reapprovals', name='reapprovals'),
     url(r'^logout$', 'common.views.site_logout'),