LoCo Team Portal

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

  1. bugfix-lp-621926
  2. Merge into 0.2
Proposed by Chris Johnston
Status: Merged
Merged at revision: 258
Proposed branch: lp:~cjohnston/loco-team-portal/bugfix-lp-621926
Merge into: lp:loco-team-portal
Diff against target: 316 lines (+42/-23)
22 files modified
loco_directory/locale/loco-directory.pot (+21/-2)
loco_directory/templates/events/event_history_list.html (+1/-1)
loco_directory/templates/events/event_list.html (+1/-1)
loco_directory/templates/events/global_event_delete_confirm.html (+1/-1)
loco_directory/templates/events/global_event_detail.html (+1/-1)
loco_directory/templates/events/global_event_new.html (+1/-1)
loco_directory/templates/events/global_event_update.html (+1/-1)
loco_directory/templates/events/team_event_comment_new.html (+1/-1)
loco_directory/templates/events/team_event_delete_confirm.html (+1/-1)
loco_directory/templates/events/team_event_detail.html (+1/-1)
loco_directory/templates/events/team_event_new.html (+1/-1)
loco_directory/templates/events/team_event_new_select.html (+1/-1)
loco_directory/templates/events/team_event_register.html (+1/-1)
loco_directory/templates/events/team_event_update.html (+1/-1)
loco_directory/templates/teams/team_detail.html (+1/-1)
loco_directory/templates/teams/team_event_history.html (+1/-1)
loco_directory/templates/teams/team_event_list.html (+1/-1)
loco_directory/templates/teams/team_list.html (+1/-1)
loco_directory/templates/teams/team_update.html (+1/-1)
loco_directory/templates/venues/venue_detail.html (+1/-1)
loco_directory/templates/venues/venue_list.html (+1/-1)
loco_directory/templates/venues/venue_update.html (+1/-1)
To merge this branch: bzr merge lp:~cjohnston/loco-team-portal/bugfix-lp-621926
Reviewer Review Type Date Requested Status
LoCo Team Portal Developers Pending
Review via email: mp+33306@code.launchpad.net

Description of the change

Makes page titles more uniform

To post a comment you must log in.
Revision history for this message
Daniel Holbach (dholbach) wrote :

Good work.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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:11:00 +0000
@@ -8,10 +8,11 @@
8msgstr ""8msgstr ""
9"Project-Id-Version: PACKAGE VERSION\n"9"Project-Id-Version: PACKAGE VERSION\n"
10"Report-Msgid-Bugs-To: \n"10"Report-Msgid-Bugs-To: \n"
11"POT-Creation-Date: 2010-08-20 16:29+0000\n"11"POT-Creation-Date: 2010-08-21 21:07+0000\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"14"Language-Team: LANGUAGE <LL@li.org>\n"
15"Language: \n"
15"MIME-Version: 1.0\n"16"MIME-Version: 1.0\n"
16"Content-Type: text/plain; charset=UTF-8\n"17"Content-Type: text/plain; charset=UTF-8\n"
17"Content-Transfer-Encoding: 8bit\n"18"Content-Transfer-Encoding: 8bit\n"
@@ -308,7 +309,25 @@
308#: templates/404.html:4 templates/500.html:4 templates/about.html:4309#: templates/404.html:4 templates/500.html:4 templates/about.html:4
309#: templates/about_loco.html:4 templates/base.html:4310#: templates/about_loco.html:4 templates/base.html:4
310#: templates/loco_council.html:4 templates/using_locodir.html:4311#: templates/loco_council.html:4 templates/using_locodir.html:4
311#: templates/teams/team_reapprovals.html:4312#: templates/events/event_history_list.html:4
313#: templates/events/event_list.html:4
314#: templates/events/global_event_delete_confirm.html:4
315#: templates/events/global_event_detail.html:9
316#: templates/events/global_event_new.html:4
317#: templates/events/global_event_update.html:4
318#: templates/events/team_event_comment_new.html:4
319#: templates/events/team_event_delete_confirm.html:4
320#: templates/events/team_event_detail.html:4
321#: templates/events/team_event_new.html:4
322#: templates/events/team_event_new_select.html:4
323#: templates/events/team_event_register.html:4
324#: templates/events/team_event_update.html:4
325#: templates/teams/team_detail.html:4
326#: templates/teams/team_event_history.html:4
327#: templates/teams/team_event_list.html:4 templates/teams/team_list.html:4
328#: templates/teams/team_reapprovals.html:4 templates/teams/team_update.html:4
329#: templates/venues/venue_detail.html:4 templates/venues/venue_list.html:4
330#: templates/venues/venue_update.html:4
312msgid "Ubuntu LoCo Team Directory"331msgid "Ubuntu LoCo Team Directory"
313msgstr ""332msgstr ""
314333
315334
=== 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:11:00 +0000
@@ -1,7 +1,7 @@
1{% extends "base.html" %}1{% extends "base.html" %}
2{% load i18n %}2{% load i18n %}
33
4{% block title %}{% trans "Ubuntu LoCo Events History" %}{% endblock %}4{% block title %}{% trans "Ubuntu LoCo Events History" %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %}
55
6{% block sub_nav_links %}6{% block sub_nav_links %}
7<a class="sub-nav-item" href="{% url event-list %}">{% trans "Back to Events List" %}</a>7<a class="sub-nav-item" href="{% url event-list %}">{% trans "Back to Events List" %}</a>
88
=== 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:11:00 +0000
@@ -1,7 +1,7 @@
1{% extends "base.html" %}1{% extends "base.html" %}
2{% load i18n %}2{% load i18n %}
33
4{% block title %}{% trans "Ubuntu LoCo Events List" %}{% endblock %}4{% block title %}{% trans "Ubuntu LoCo Events List" %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %}
55
6{% block sub_nav_links %}6{% block sub_nav_links %}
7<a class="sub-nav-item" title="{% trans "Show All Venues" %}" href="{% url venue-list %}">{% trans "Venues" %}</a>7<a class="sub-nav-item" title="{% trans "Show All Venues" %}" href="{% url venue-list %}">{% trans "Venues" %}</a>
88
=== 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:11:00 +0000
@@ -1,7 +1,7 @@
1{% extends "base.html" %}1{% extends "base.html" %}
2{% load i18n %}2{% load i18n %}
33
4{% block title %}{% trans "Delete Global Event" %}{% endblock %}4{% block title %}{% trans "Delete Global Event" %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %}
55
6{% block extrahead %}{{ block.super }}6{% block extrahead %}{{ block.super }}
7{{form.media}}7{{form.media}}
88
=== 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:11:00 +0000
@@ -6,7 +6,7 @@
6 <link rel="stylesheet" type="text/css" href="{{MEDIA_URL}}/css/twidenash.css" />6 <link rel="stylesheet" type="text/css" href="{{MEDIA_URL}}/css/twidenash.css" />
7{% endblock %}7{% endblock %}
88
9{% block title %}{% trans global_event_object.name %}{% endblock %}9{% block title %}{% trans global_event_object.name %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %}
1010
11{% block sub_nav_links %}11{% block sub_nav_links %}
12<a class="sub-nav-item" href="{% url event-list %}">{% trans "Back to Events List" %}</a>12<a class="sub-nav-item" href="{% url event-list %}">{% trans "Back to Events List" %}</a>
1313
=== 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:11:00 +0000
@@ -1,7 +1,7 @@
1{% extends "base.html" %}1{% extends "base.html" %}
2{% load i18n %}2{% load i18n %}
33
4{% block title %}{% trans "New Global Event" %}{% endblock %}4{% block title %}{% trans "New Global Event" %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %}
55
6{% block extrahead %}{{ block.super }}6{% block extrahead %}{{ block.super }}
7{{form.media}}7{{form.media}}
88
=== 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:11:00 +0000
@@ -1,7 +1,7 @@
1{% extends "base.html" %}1{% extends "base.html" %}
2{% load i18n %}2{% load i18n %}
33
4{% block title %}{% trans "Update Global Event" %}{% endblock %}4{% block title %}{% trans "Update Global Event" %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %}
55
6{% block extrahead %}{{ block.super }}6{% block extrahead %}{{ block.super }}
7{{form.media}}7{{form.media}}
88
=== 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:11:00 +0000
@@ -1,7 +1,7 @@
1{% extends "base.html" %}1{% extends "base.html" %}
2{% load i18n %}2{% load i18n %}
33
4{% block title %}{% trans "Team Event Comment" %}{% endblock %}4{% block title %}{% trans "Team Event Comment" %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %}
55
6{% block extrahead %}{{ block.super }}6{% block extrahead %}{{ block.super }}
7{{form.media}}7{{form.media}}
88
=== 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:11:00 +0000
@@ -1,7 +1,7 @@
1{% extends "base.html" %}1{% extends "base.html" %}
2{% load i18n %}2{% load i18n %}
33
4{% block title %}{% trans "Delete Team Event" %}{% endblock %}4{% block title %}{% trans "Delete Team Event" %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %}
55
6{% block extrahead %}{{ block.super }}6{% block extrahead %}{{ block.super }}
7{{form.media}}7{{form.media}}
88
=== 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:11:00 +0000
@@ -1,7 +1,7 @@
1{% extends "base.html" %}1{% extends "base.html" %}
2{% load i18n %}2{% load i18n %}
33
4{% block title %}{% trans team_event_object.name %}{% endblock %}4{% block title %}{% trans team_event_object.name %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %}
55
6{% block sub_nav_links %}6{% block sub_nav_links %}
7<a class="sub-nav-item" href="{% url event-list %}">{% trans "Back to Events List" %}</a>7<a class="sub-nav-item" href="{% url event-list %}">{% trans "Back to Events List" %}</a>
88
=== 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:11:00 +0000
@@ -1,7 +1,7 @@
1{% extends "base.html" %}1{% extends "base.html" %}
2{% load i18n %}2{% load i18n %}
33
4{% block title %}{% trans "New Team Event" %}{% endblock %}4{% block title %}{% trans "New Team Event" %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %}
55
6{% block extrahead %}{{ block.super }}6{% block extrahead %}{{ block.super }}
7{{form.media}}7{{form.media}}
88
=== 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:11:00 +0000
@@ -1,7 +1,7 @@
1{% extends "base.html" %}1{% extends "base.html" %}
2{% load i18n %}2{% load i18n %}
33
4{% block title %}{% trans "New Team Event" %}{% endblock %}4{% block title %}{% trans "New Team Event" %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %}
55
6{% block sub_nav %}6{% block sub_nav %}
7{% endblock %}7{% endblock %}
88
=== 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:11:00 +0000
@@ -1,7 +1,7 @@
1{% extends "base.html" %}1{% extends "base.html" %}
2{% load i18n admin_modify adminmedia %}2{% load i18n admin_modify adminmedia %}
33
4{% block title %}{% trans "Team Event Registration" %}{% endblock %}4{% block title %}{% trans "Team Event Registration" %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %}
55
6{% block extrahead %}{{ block.super }}6{% block extrahead %}{{ block.super }}
7{{form.media}}7{{form.media}}
88
=== 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:11:00 +0000
@@ -1,7 +1,7 @@
1{% extends "base.html" %}1{% extends "base.html" %}
2{% load i18n admin_modify adminmedia %}2{% load i18n admin_modify adminmedia %}
33
4{% block title %}{% trans "Update Team Event" %}{% endblock %}4{% block title %}{% trans "Update Team Event" %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %}
55
6{% block extrahead %}{{ block.super }}6{% block extrahead %}{{ block.super }}
7{{form.media}}7{{form.media}}
88
=== 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:11:00 +0000
@@ -1,7 +1,7 @@
1{% extends "base.html" %}1{% extends "base.html" %}
2{% load i18n %}2{% load i18n %}
33
4{% block title %}{% trans team.name %}{% endblock %}4{% block title %}{% trans team.name %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %}
55
6{% block sub_nav_links %}6{% block sub_nav_links %}
7 <a class="sub-nav-item" href="{% url team-list %}" title="{% trans "Back to Teams List" %}">{% trans "Back to Teams List" %}</a>7 <a class="sub-nav-item" href="{% url team-list %}" title="{% trans "Back to Teams List" %}">{% trans "Back to Teams List" %}</a>
88
=== 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:11:00 +0000
@@ -1,7 +1,7 @@
1{% extends "base.html" %}1{% extends "base.html" %}
2{% load i18n %}2{% load i18n %}
33
4{% block title %}{% blocktrans with team_object.lp_name as teamname %}{{teamname}} Events History{% endblocktrans %}{% endblock %}4{% block title %}{% blocktrans with team_object.lp_name as teamname %}{{teamname}} Events History{% endblocktrans %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %}
55
6{% block sub_nav_links %}6{% block sub_nav_links %}
7<a class="sub-nav-item" href="{% url team-detail team_object.lp_name %}">{% trans "Back to Team Details" %}</a>7<a class="sub-nav-item" href="{% url team-detail team_object.lp_name %}">{% trans "Back to Team Details" %}</a>
88
=== 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:11:00 +0000
@@ -1,7 +1,7 @@
1{% extends "base.html" %}1{% extends "base.html" %}
2{% load i18n %}2{% load i18n %}
33
4{% block title %}{% blocktrans with team_object.name as teamname %}{{teamname}} Events List{% endblocktrans %}{% endblock %}4{% block title %}{% blocktrans with team_object.name as teamname %}{{teamname}} Events List{% endblocktrans %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %}
55
6{% block sub_nav_links %}6{% block sub_nav_links %}
7<a class="sub-nav-item" href="{% url team-detail team_object.lp_name %}">{% trans "Back to Team Details" %}</a>7<a class="sub-nav-item" href="{% url team-detail team_object.lp_name %}">{% trans "Back to Team Details" %}</a>
88
=== 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:11:00 +0000
@@ -1,7 +1,7 @@
1{% extends "base.html" %}1{% extends "base.html" %}
2{% load i18n %}2{% load i18n %}
33
4{% block title %}{% trans "Ubuntu LoCo Teams List" %}{% endblock %}4{% block title %}{% trans "Ubuntu LoCo Teams List" %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %}
55
6{% block extrahead %}{{ block.super }}6{% block extrahead %}{{ block.super }}
7{{form.media}}7{{form.media}}
88
=== 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:11:00 +0000
@@ -1,7 +1,7 @@
1{% extends "base.html" %}1{% extends "base.html" %}
2{% load i18n %}2{% load i18n %}
33
4{% block title %}{{ team.name }}{% endblock %}4{% block title %}{{ team.name }} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %}
55
6{% block sub_nav_links %}6{% block sub_nav_links %}
7<a class="sub-nav-item" href="/teams">{% trans "Back to Teams List" %}</a>7<a class="sub-nav-item" href="/teams">{% trans "Back to Teams List" %}</a>
88
=== 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:11:00 +0000
@@ -1,7 +1,7 @@
1{% extends "base.html" %}1{% extends "base.html" %}
2{% load i18n %}2{% load i18n %}
33
4{% block title %}{% trans venue_object.name %}{% endblock %}4{% block title %}{% trans venue_object.name %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %}
55
6{% block extrahead %}6{% block extrahead %}
7{{block.super}}7{{block.super}}
88
=== 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:11:00 +0000
@@ -1,7 +1,7 @@
1{% extends "base.html" %}1{% extends "base.html" %}
2{% load i18n %}2{% load i18n %}
33
4{% block title %}{% trans "Ubuntu LoCo Event Venues" %}{% endblock %}4{% block title %}{% trans "Ubuntu LoCo Event Venues" %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %}
55
6{% block sub_nav_links %}6{% block sub_nav_links %}
7{% if user.is_authenticated %}7{% if user.is_authenticated %}
88
=== 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:11:00 +0000
@@ -1,7 +1,7 @@
1{% extends "base.html" %}1{% extends "base.html" %}
2{% load i18n %}2{% load i18n %}
33
4{% block title %}{% if venue_object %}{% trans "Update Venue" %}{% else %}{% trans "New Venue" %}{% endif %}{% endblock %}4{% block title %}{% if venue_object %}{% trans "Update Venue" %}{% else %}{% trans "New Venue" %}{% endif %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %}
55
6{% block sub_nav %}6{% block sub_nav %}
7{% endblock %}7{% endblock %}

Subscribers

People subscribed via source and target branches