Chris Johnston has proposed merging lp:~chrisjohnston/loco-directory/bugfix-lp-621926 into lp:loco-directory.
Requested reviews: loco-directory-dev (loco-directory-dev) Related bugs: #621926 Page titles should be more uniform https://bugs.launchpad.net/bugs/621926 Makes page titles more uniform -- https://code.launchpad.net/~chrisjohnston/loco-directory/bugfix-lp-621926/+merge/33306 Your team loco-directory-dev is requested to review the proposed merge of lp:~chrisjohnston/loco-directory/bugfix-lp-621926 into lp:loco-directory.
=== modified file 'loco_directory/locale/loco-directory.pot' --- loco_directory/locale/loco-directory.pot 2010-08-20 16:29:46 +0000 +++ loco_directory/locale/loco-directory.pot 2010-08-21 21:10:58 +0000 @@ -8,10 +8,11 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-20 16:29+0000\n" +"POT-Creation-Date: 2010-08-21 21:07+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" @@ -308,7 +309,25 @@ #: templates/404.html:4 templates/500.html:4 templates/about.html:4 #: templates/about_loco.html:4 templates/base.html:4 #: templates/loco_council.html:4 templates/using_locodir.html:4 -#: templates/teams/team_reapprovals.html:4 +#: templates/events/event_history_list.html:4 +#: templates/events/event_list.html:4 +#: templates/events/global_event_delete_confirm.html:4 +#: templates/events/global_event_detail.html:9 +#: templates/events/global_event_new.html:4 +#: templates/events/global_event_update.html:4 +#: templates/events/team_event_comment_new.html:4 +#: templates/events/team_event_delete_confirm.html:4 +#: templates/events/team_event_detail.html:4 +#: templates/events/team_event_new.html:4 +#: templates/events/team_event_new_select.html:4 +#: templates/events/team_event_register.html:4 +#: templates/events/team_event_update.html:4 +#: templates/teams/team_detail.html:4 +#: templates/teams/team_event_history.html:4 +#: templates/teams/team_event_list.html:4 templates/teams/team_list.html:4 +#: templates/teams/team_reapprovals.html:4 templates/teams/team_update.html:4 +#: templates/venues/venue_detail.html:4 templates/venues/venue_list.html:4 +#: templates/venues/venue_update.html:4 msgid "Ubuntu LoCo Team Directory" msgstr "" === modified file 'loco_directory/templates/events/event_history_list.html' --- loco_directory/templates/events/event_history_list.html 2010-08-17 00:25:27 +0000 +++ loco_directory/templates/events/event_history_list.html 2010-08-21 21:10:58 +0000 @@ -1,7 +1,7 @@ {% extends "base.html" %} {% load i18n %} -{% block title %}{% trans "Ubuntu LoCo Events History" %}{% endblock %} +{% block title %}{% trans "Ubuntu LoCo Events History" %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %} {% block sub_nav_links %} <a class="sub-nav-item" href="{% url event-list %}">{% trans "Back to Events List" %}</a> === modified file 'loco_directory/templates/events/event_list.html' --- loco_directory/templates/events/event_list.html 2010-08-17 00:25:27 +0000 +++ loco_directory/templates/events/event_list.html 2010-08-21 21:10:58 +0000 @@ -1,7 +1,7 @@ {% extends "base.html" %} {% load i18n %} -{% block title %}{% trans "Ubuntu LoCo Events List" %}{% endblock %} +{% block title %}{% trans "Ubuntu LoCo Events List" %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %} {% block sub_nav_links %} <a class="sub-nav-item" title="{% trans "Show All Venues" %}" href="{% url venue-list %}">{% trans "Venues" %}</a> === modified file 'loco_directory/templates/events/global_event_delete_confirm.html' --- loco_directory/templates/events/global_event_delete_confirm.html 2010-06-30 13:38:53 +0000 +++ loco_directory/templates/events/global_event_delete_confirm.html 2010-08-21 21:10:58 +0000 @@ -1,7 +1,7 @@ {% extends "base.html" %} {% load i18n %} -{% block title %}{% trans "Delete Global Event" %}{% endblock %} +{% block title %}{% trans "Delete Global Event" %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %} {% block extrahead %}{{ block.super }} {{form.media}} === modified file 'loco_directory/templates/events/global_event_detail.html' --- loco_directory/templates/events/global_event_detail.html 2010-08-17 00:25:27 +0000 +++ loco_directory/templates/events/global_event_detail.html 2010-08-21 21:10:58 +0000 @@ -6,7 +6,7 @@ <link rel="stylesheet" type="text/css" href="{{MEDIA_URL}}/css/twidenash.css" /> {% endblock %} -{% block title %}{% trans global_event_object.name %}{% endblock %} +{% block title %}{% trans global_event_object.name %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %} {% block sub_nav_links %} <a class="sub-nav-item" href="{% url event-list %}">{% trans "Back to Events List" %}</a> === modified file 'loco_directory/templates/events/global_event_new.html' --- loco_directory/templates/events/global_event_new.html 2010-06-24 19:18:57 +0000 +++ loco_directory/templates/events/global_event_new.html 2010-08-21 21:10:58 +0000 @@ -1,7 +1,7 @@ {% extends "base.html" %} {% load i18n %} -{% block title %}{% trans "New Global Event" %}{% endblock %} +{% block title %}{% trans "New Global Event" %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %} {% block extrahead %}{{ block.super }} {{form.media}} === modified file 'loco_directory/templates/events/global_event_update.html' --- loco_directory/templates/events/global_event_update.html 2010-06-24 19:18:57 +0000 +++ loco_directory/templates/events/global_event_update.html 2010-08-21 21:10:58 +0000 @@ -1,7 +1,7 @@ {% extends "base.html" %} {% load i18n %} -{% block title %}{% trans "Update Global Event" %}{% endblock %} +{% block title %}{% trans "Update Global Event" %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %} {% block extrahead %}{{ block.super }} {{form.media}} === modified file 'loco_directory/templates/events/team_event_comment_new.html' --- loco_directory/templates/events/team_event_comment_new.html 2010-06-24 19:18:57 +0000 +++ loco_directory/templates/events/team_event_comment_new.html 2010-08-21 21:10:58 +0000 @@ -1,7 +1,7 @@ {% extends "base.html" %} {% load i18n %} -{% block title %}{% trans "Team Event Comment" %}{% endblock %} +{% block title %}{% trans "Team Event Comment" %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %} {% block extrahead %}{{ block.super }} {{form.media}} === modified file 'loco_directory/templates/events/team_event_delete_confirm.html' --- loco_directory/templates/events/team_event_delete_confirm.html 2010-07-01 06:26:23 +0000 +++ loco_directory/templates/events/team_event_delete_confirm.html 2010-08-21 21:10:58 +0000 @@ -1,7 +1,7 @@ {% extends "base.html" %} {% load i18n %} -{% block title %}{% trans "Delete Team Event" %}{% endblock %} +{% block title %}{% trans "Delete Team Event" %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %} {% block extrahead %}{{ block.super }} {{form.media}} === modified file 'loco_directory/templates/events/team_event_detail.html' --- loco_directory/templates/events/team_event_detail.html 2010-08-17 12:00:55 +0000 +++ loco_directory/templates/events/team_event_detail.html 2010-08-21 21:10:58 +0000 @@ -1,7 +1,7 @@ {% extends "base.html" %} {% load i18n %} -{% block title %}{% trans team_event_object.name %}{% endblock %} +{% block title %}{% trans team_event_object.name %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %} {% block sub_nav_links %} <a class="sub-nav-item" href="{% url event-list %}">{% trans "Back to Events List" %}</a> === modified file 'loco_directory/templates/events/team_event_new.html' --- loco_directory/templates/events/team_event_new.html 2010-08-04 12:09:42 +0000 +++ loco_directory/templates/events/team_event_new.html 2010-08-21 21:10:58 +0000 @@ -1,7 +1,7 @@ {% extends "base.html" %} {% load i18n %} -{% block title %}{% trans "New Team Event" %}{% endblock %} +{% block title %}{% trans "New Team Event" %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %} {% block extrahead %}{{ block.super }} {{form.media}} === modified file 'loco_directory/templates/events/team_event_new_select.html' --- loco_directory/templates/events/team_event_new_select.html 2010-06-24 19:18:57 +0000 +++ loco_directory/templates/events/team_event_new_select.html 2010-08-21 21:10:58 +0000 @@ -1,7 +1,7 @@ {% extends "base.html" %} {% load i18n %} -{% block title %}{% trans "New Team Event" %}{% endblock %} +{% block title %}{% trans "New Team Event" %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %} {% block sub_nav %} {% endblock %} === modified file 'loco_directory/templates/events/team_event_register.html' --- loco_directory/templates/events/team_event_register.html 2010-08-17 10:37:26 +0000 +++ loco_directory/templates/events/team_event_register.html 2010-08-21 21:10:58 +0000 @@ -1,7 +1,7 @@ {% extends "base.html" %} {% load i18n admin_modify adminmedia %} -{% block title %}{% trans "Team Event Registration" %}{% endblock %} +{% block title %}{% trans "Team Event Registration" %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %} {% block extrahead %}{{ block.super }} {{form.media}} === modified file 'loco_directory/templates/events/team_event_update.html' --- loco_directory/templates/events/team_event_update.html 2010-06-24 19:18:57 +0000 +++ loco_directory/templates/events/team_event_update.html 2010-08-21 21:10:58 +0000 @@ -1,7 +1,7 @@ {% extends "base.html" %} {% load i18n admin_modify adminmedia %} -{% block title %}{% trans "Update Team Event" %}{% endblock %} +{% block title %}{% trans "Update Team Event" %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %} {% block extrahead %}{{ block.super }} {{form.media}} === modified file 'loco_directory/templates/teams/team_detail.html' --- loco_directory/templates/teams/team_detail.html 2010-08-19 22:32:04 +0000 +++ loco_directory/templates/teams/team_detail.html 2010-08-21 21:10:58 +0000 @@ -1,7 +1,7 @@ {% extends "base.html" %} {% load i18n %} -{% block title %}{% trans team.name %}{% endblock %} +{% block title %}{% trans team.name %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %} {% block sub_nav_links %} <a class="sub-nav-item" href="{% url team-list %}" title="{% trans "Back to Teams List" %}">{% trans "Back to Teams List" %}</a> === modified file 'loco_directory/templates/teams/team_event_history.html' --- loco_directory/templates/teams/team_event_history.html 2010-08-17 00:25:27 +0000 +++ loco_directory/templates/teams/team_event_history.html 2010-08-21 21:10:58 +0000 @@ -1,7 +1,7 @@ {% extends "base.html" %} {% load i18n %} -{% block title %}{% blocktrans with team_object.lp_name as teamname %}{{teamname}} Events History{% endblocktrans %}{% endblock %} +{% block title %}{% blocktrans with team_object.lp_name as teamname %}{{teamname}} Events History{% endblocktrans %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %} {% block sub_nav_links %} <a class="sub-nav-item" href="{% url team-detail team_object.lp_name %}">{% trans "Back to Team Details" %}</a> === modified file 'loco_directory/templates/teams/team_event_list.html' --- loco_directory/templates/teams/team_event_list.html 2010-08-17 00:25:27 +0000 +++ loco_directory/templates/teams/team_event_list.html 2010-08-21 21:10:58 +0000 @@ -1,7 +1,7 @@ {% extends "base.html" %} {% load i18n %} -{% block title %}{% blocktrans with team_object.name as teamname %}{{teamname}} Events List{% endblocktrans %}{% endblock %} +{% block title %}{% blocktrans with team_object.name as teamname %}{{teamname}} Events List{% endblocktrans %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %} {% block sub_nav_links %} <a class="sub-nav-item" href="{% url team-detail team_object.lp_name %}">{% trans "Back to Team Details" %}</a> === modified file 'loco_directory/templates/teams/team_list.html' --- loco_directory/templates/teams/team_list.html 2010-08-17 15:09:14 +0000 +++ loco_directory/templates/teams/team_list.html 2010-08-21 21:10:58 +0000 @@ -1,7 +1,7 @@ {% extends "base.html" %} {% load i18n %} -{% block title %}{% trans "Ubuntu LoCo Teams List" %}{% endblock %} +{% block title %}{% trans "Ubuntu LoCo Teams List" %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %} {% block extrahead %}{{ block.super }} {{form.media}} === modified file 'loco_directory/templates/teams/team_update.html' --- loco_directory/templates/teams/team_update.html 2010-08-17 00:25:27 +0000 +++ loco_directory/templates/teams/team_update.html 2010-08-21 21:10:58 +0000 @@ -1,7 +1,7 @@ {% extends "base.html" %} {% load i18n %} -{% block title %}{{ team.name }}{% endblock %} +{% block title %}{{ team.name }} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %} {% block sub_nav_links %} <a class="sub-nav-item" href="/teams">{% trans "Back to Teams List" %}</a> === modified file 'loco_directory/templates/venues/venue_detail.html' --- loco_directory/templates/venues/venue_detail.html 2010-08-17 00:25:27 +0000 +++ loco_directory/templates/venues/venue_detail.html 2010-08-21 21:10:58 +0000 @@ -1,7 +1,7 @@ {% extends "base.html" %} {% load i18n %} -{% block title %}{% trans venue_object.name %}{% endblock %} +{% block title %}{% trans venue_object.name %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %} {% block extrahead %} {{block.super}} === modified file 'loco_directory/templates/venues/venue_list.html' --- loco_directory/templates/venues/venue_list.html 2010-08-17 00:25:27 +0000 +++ loco_directory/templates/venues/venue_list.html 2010-08-21 21:10:58 +0000 @@ -1,7 +1,7 @@ {% extends "base.html" %} {% load i18n %} -{% block title %}{% trans "Ubuntu LoCo Event Venues" %}{% endblock %} +{% block title %}{% trans "Ubuntu LoCo Event Venues" %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %} {% block sub_nav_links %} {% if user.is_authenticated %} === modified file 'loco_directory/templates/venues/venue_update.html' --- loco_directory/templates/venues/venue_update.html 2010-08-04 13:02:45 +0000 +++ loco_directory/templates/venues/venue_update.html 2010-08-21 21:10:58 +0000 @@ -1,7 +1,7 @@ {% extends "base.html" %} {% load i18n %} -{% block title %}{% if venue_object %}{% trans "Update Venue" %}{% else %}{% trans "New Venue" %}{% endif %}{% endblock %} +{% block title %}{% if venue_object %}{% trans "Update Venue" %}{% else %}{% trans "New Venue" %}{% endif %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %} {% block sub_nav %} {% 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
