Chris Johnston has proposed merging lp:~chrisjohnston/loco-directory/bugfix-lp-612047 into lp:loco-directory.
Requested reviews: loco-directory-dev (loco-directory-dev) Related bugs: #612047 Menus are getting crowded https://bugs.launchpad.net/bugs/612047 Moves Venues menu item and other misc menu cleanup -- https://code.launchpad.net/~chrisjohnston/loco-directory/bugfix-lp-612047/+merge/32678 Your team loco-directory-dev is requested to review the proposed merge of lp:~chrisjohnston/loco-directory/bugfix-lp-612047 into lp:loco-directory.
=== modified file 'loco_directory/locale/loco-directory.pot' --- loco_directory/locale/loco-directory.pot 2010-08-06 14:30:38 +0000 +++ loco_directory/locale/loco-directory.pot 2010-08-14 20:15:53 +0000 @@ -8,10 +8,11 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-06 14:30+0000\n" +"POT-Creation-Date: 2010-08-14 20:11+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <em...@address>\n" "Language-Team: LANGUAGE <[email protected]>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -24,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" @@ -461,39 +462,31 @@ msgid "Events" msgstr "" -#: templates/base.html:15 templates/index.html:27 -msgid "Show all Venues" -msgstr "" - -#: templates/base.html:15 templates/index.html:27 -msgid "Venues" -msgstr "" - -#: templates/base.html:16 +#: templates/base.html:15 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 +#: 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 "" @@ -515,6 +508,14 @@ "attendees, teams, and more." msgstr "" +#: templates/index.html:27 templates/events/event_list.html:7 +msgid "Show all Venues" +msgstr "" + +#: templates/index.html:27 templates/events/event_list.html:7 +msgid "Venues" +msgstr "" + #: templates/index.html:28 msgid "List of all Ubuntu LoCo Venues." msgstr "" @@ -649,50 +650,50 @@ msgid "Ubuntu LoCo Events List" msgstr "" -#: templates/events/event_list.html:8 +#: 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:28 +#: templates/events/event_list.html:29 msgid "Global Events as ical" msgstr "" -#: templates/events/event_list.html:30 +#: templates/events/event_list.html:31 msgid "Select a global event below to see more information about it:" msgstr "" -#: templates/events/event_list.html:35 +#: templates/events/event_list.html:36 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:45 +#: templates/events/event_list.html:46 msgid "Team Events as ical" 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 +#: templates/events/event_list.html:52 msgid "There are currently no LoCo Team Events" msgstr "" @@ -717,16 +718,16 @@ #: templates/events/global_event_detail.html:7 #: templates/events/team_event_detail.html:7 -msgid "Go back to Event list" +msgid "Back to Events List" msgstr "" #: templates/events/global_event_detail.html:9 -msgid "Add your Team's Event" +msgid "Add Your Team's Event" msgstr "" #: templates/events/global_event_detail.html:12 #: templates/events/team_event_detail.html:18 -msgid "Edit details" +msgid "Edit Event Details" msgstr "" #: templates/events/global_event_detail.inc.html:12 @@ -810,6 +811,7 @@ #: templates/events/team_event_delete_confirm.html:4 #: templates/events/team_event_delete_confirm.html:15 +#: templates/events/team_event_detail.html:19 msgid "Delete Team Event" msgstr "" @@ -830,12 +832,8 @@ msgid "Register for this Event" msgstr "" -#: templates/events/team_event_detail.html:19 -msgid "Delete team event" -msgstr "" - #: templates/events/team_event_detail.html:20 -msgid "Copy event" +msgid "Copy Event" msgstr "" #: templates/events/team_event_detail.inc.html:8 @@ -950,23 +948,19 @@ 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!" +msgid "Join This Team!" msgstr "" #: templates/teams/team_detail.html:9 -msgid "Edit team details" +msgid "Edit Team Details" 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 @@ -1062,8 +1056,8 @@ 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:23 @@ -1123,10 +1117,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 "" @@ -1148,11 +1138,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 === 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-14 20:15:53 +0000 @@ -12,7 +12,6 @@ {% 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 %} === 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-14 20:15:53 +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 %} === modified file 'loco_directory/templates/events/global_event_detail.html' --- loco_directory/templates/events/global_event_detail.html 2010-06-24 19:18:57 +0000 +++ loco_directory/templates/events/global_event_detail.html 2010-08-14 20:15:53 +0000 @@ -4,12 +4,12 @@ {% 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-update global_event_object.id %}">{% trans "Edit Event Details" %}</a> <a class="sub-nav-item" href="{% url global-event-delete global_event_object.id %}">{% trans "Delete Global Event" %}</a> {% endif %} {% endblock %} === modified file 'loco_directory/templates/events/team_event_detail.html' --- loco_directory/templates/events/team_event_detail.html 2010-07-29 01:01:25 +0000 +++ loco_directory/templates/events/team_event_detail.html 2010-08-14 20:15:53 +0000 @@ -4,7 +4,7 @@ {% block title %}{% trans team_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 user.is_authenticated %} <a class="sub-nav-item" href="{% url team-event-comment-new team_event_object.id %}#comment">{% trans "Add Comment" %}</a> @@ -15,9 +15,9 @@ {% endif %} {% 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-copy team_event_object.id %}">{% trans "Copy event" %}</a> +<a class="sub-nav-item" href="{% url team-event-update team_event_object.id %}">{% trans "Edit Event 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-copy team_event_object.id %}">{% trans "Copy Event" %}</a> {% endif %} {% endif %} === 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-14 20:15:53 +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 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 %} {% 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-14 20:15:53 +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-14 20:15:53 +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-14 20:15:53 +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-14 20:15:53 +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 %}
_______________________________________________ Mailing list: https://launchpad.net/~loco-directory-dev Post to : [email protected] Unsubscribe : https://launchpad.net/~loco-directory-dev More help : https://help.launchpad.net/ListHelp
