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
1=== modified file 'loco_directory/locale/loco-directory.pot'
2--- loco_directory/locale/loco-directory.pot 2010-08-20 16:29:46 +0000
3+++ loco_directory/locale/loco-directory.pot 2010-08-21 21:11:00 +0000
4@@ -8,10 +8,11 @@
5 msgstr ""
6 "Project-Id-Version: PACKAGE VERSION\n"
7 "Report-Msgid-Bugs-To: \n"
8-"POT-Creation-Date: 2010-08-20 16:29+0000\n"
9+"POT-Creation-Date: 2010-08-21 21:07+0000\n"
10 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
11 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12 "Language-Team: LANGUAGE <LL@li.org>\n"
13+"Language: \n"
14 "MIME-Version: 1.0\n"
15 "Content-Type: text/plain; charset=UTF-8\n"
16 "Content-Transfer-Encoding: 8bit\n"
17@@ -308,7 +309,25 @@
18 #: templates/404.html:4 templates/500.html:4 templates/about.html:4
19 #: templates/about_loco.html:4 templates/base.html:4
20 #: templates/loco_council.html:4 templates/using_locodir.html:4
21-#: templates/teams/team_reapprovals.html:4
22+#: templates/events/event_history_list.html:4
23+#: templates/events/event_list.html:4
24+#: templates/events/global_event_delete_confirm.html:4
25+#: templates/events/global_event_detail.html:9
26+#: templates/events/global_event_new.html:4
27+#: templates/events/global_event_update.html:4
28+#: templates/events/team_event_comment_new.html:4
29+#: templates/events/team_event_delete_confirm.html:4
30+#: templates/events/team_event_detail.html:4
31+#: templates/events/team_event_new.html:4
32+#: templates/events/team_event_new_select.html:4
33+#: templates/events/team_event_register.html:4
34+#: templates/events/team_event_update.html:4
35+#: templates/teams/team_detail.html:4
36+#: templates/teams/team_event_history.html:4
37+#: templates/teams/team_event_list.html:4 templates/teams/team_list.html:4
38+#: templates/teams/team_reapprovals.html:4 templates/teams/team_update.html:4
39+#: templates/venues/venue_detail.html:4 templates/venues/venue_list.html:4
40+#: templates/venues/venue_update.html:4
41 msgid "Ubuntu LoCo Team Directory"
42 msgstr ""
43
44
45=== modified file 'loco_directory/templates/events/event_history_list.html'
46--- loco_directory/templates/events/event_history_list.html 2010-08-17 00:25:27 +0000
47+++ loco_directory/templates/events/event_history_list.html 2010-08-21 21:11:00 +0000
48@@ -1,7 +1,7 @@
49 {% extends "base.html" %}
50 {% load i18n %}
51
52-{% block title %}{% trans "Ubuntu LoCo Events History" %}{% endblock %}
53+{% block title %}{% trans "Ubuntu LoCo Events History" %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %}
54
55 {% block sub_nav_links %}
56 <a class="sub-nav-item" href="{% url event-list %}">{% trans "Back to Events List" %}</a>
57
58=== modified file 'loco_directory/templates/events/event_list.html'
59--- loco_directory/templates/events/event_list.html 2010-08-17 00:25:27 +0000
60+++ loco_directory/templates/events/event_list.html 2010-08-21 21:11:00 +0000
61@@ -1,7 +1,7 @@
62 {% extends "base.html" %}
63 {% load i18n %}
64
65-{% block title %}{% trans "Ubuntu LoCo Events List" %}{% endblock %}
66+{% block title %}{% trans "Ubuntu LoCo Events List" %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %}
67
68 {% block sub_nav_links %}
69 <a class="sub-nav-item" title="{% trans "Show All Venues" %}" href="{% url venue-list %}">{% trans "Venues" %}</a>
70
71=== modified file 'loco_directory/templates/events/global_event_delete_confirm.html'
72--- loco_directory/templates/events/global_event_delete_confirm.html 2010-06-30 13:38:53 +0000
73+++ loco_directory/templates/events/global_event_delete_confirm.html 2010-08-21 21:11:00 +0000
74@@ -1,7 +1,7 @@
75 {% extends "base.html" %}
76 {% load i18n %}
77
78-{% block title %}{% trans "Delete Global Event" %}{% endblock %}
79+{% block title %}{% trans "Delete Global Event" %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %}
80
81 {% block extrahead %}{{ block.super }}
82 {{form.media}}
83
84=== modified file 'loco_directory/templates/events/global_event_detail.html'
85--- loco_directory/templates/events/global_event_detail.html 2010-08-17 00:25:27 +0000
86+++ loco_directory/templates/events/global_event_detail.html 2010-08-21 21:11:00 +0000
87@@ -6,7 +6,7 @@
88 <link rel="stylesheet" type="text/css" href="{{MEDIA_URL}}/css/twidenash.css" />
89 {% endblock %}
90
91-{% block title %}{% trans global_event_object.name %}{% endblock %}
92+{% block title %}{% trans global_event_object.name %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %}
93
94 {% block sub_nav_links %}
95 <a class="sub-nav-item" href="{% url event-list %}">{% trans "Back to Events List" %}</a>
96
97=== modified file 'loco_directory/templates/events/global_event_new.html'
98--- loco_directory/templates/events/global_event_new.html 2010-06-24 19:18:57 +0000
99+++ loco_directory/templates/events/global_event_new.html 2010-08-21 21:11:00 +0000
100@@ -1,7 +1,7 @@
101 {% extends "base.html" %}
102 {% load i18n %}
103
104-{% block title %}{% trans "New Global Event" %}{% endblock %}
105+{% block title %}{% trans "New Global Event" %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %}
106
107 {% block extrahead %}{{ block.super }}
108 {{form.media}}
109
110=== modified file 'loco_directory/templates/events/global_event_update.html'
111--- loco_directory/templates/events/global_event_update.html 2010-06-24 19:18:57 +0000
112+++ loco_directory/templates/events/global_event_update.html 2010-08-21 21:11:00 +0000
113@@ -1,7 +1,7 @@
114 {% extends "base.html" %}
115 {% load i18n %}
116
117-{% block title %}{% trans "Update Global Event" %}{% endblock %}
118+{% block title %}{% trans "Update Global Event" %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %}
119
120 {% block extrahead %}{{ block.super }}
121 {{form.media}}
122
123=== modified file 'loco_directory/templates/events/team_event_comment_new.html'
124--- loco_directory/templates/events/team_event_comment_new.html 2010-06-24 19:18:57 +0000
125+++ loco_directory/templates/events/team_event_comment_new.html 2010-08-21 21:11:00 +0000
126@@ -1,7 +1,7 @@
127 {% extends "base.html" %}
128 {% load i18n %}
129
130-{% block title %}{% trans "Team Event Comment" %}{% endblock %}
131+{% block title %}{% trans "Team Event Comment" %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %}
132
133 {% block extrahead %}{{ block.super }}
134 {{form.media}}
135
136=== modified file 'loco_directory/templates/events/team_event_delete_confirm.html'
137--- loco_directory/templates/events/team_event_delete_confirm.html 2010-07-01 06:26:23 +0000
138+++ loco_directory/templates/events/team_event_delete_confirm.html 2010-08-21 21:11:00 +0000
139@@ -1,7 +1,7 @@
140 {% extends "base.html" %}
141 {% load i18n %}
142
143-{% block title %}{% trans "Delete Team Event" %}{% endblock %}
144+{% block title %}{% trans "Delete Team Event" %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %}
145
146 {% block extrahead %}{{ block.super }}
147 {{form.media}}
148
149=== modified file 'loco_directory/templates/events/team_event_detail.html'
150--- loco_directory/templates/events/team_event_detail.html 2010-08-17 12:00:55 +0000
151+++ loco_directory/templates/events/team_event_detail.html 2010-08-21 21:11:00 +0000
152@@ -1,7 +1,7 @@
153 {% extends "base.html" %}
154 {% load i18n %}
155
156-{% block title %}{% trans team_event_object.name %}{% endblock %}
157+{% block title %}{% trans team_event_object.name %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %}
158
159 {% block sub_nav_links %}
160 <a class="sub-nav-item" href="{% url event-list %}">{% trans "Back to Events List" %}</a>
161
162=== modified file 'loco_directory/templates/events/team_event_new.html'
163--- loco_directory/templates/events/team_event_new.html 2010-08-04 12:09:42 +0000
164+++ loco_directory/templates/events/team_event_new.html 2010-08-21 21:11:00 +0000
165@@ -1,7 +1,7 @@
166 {% extends "base.html" %}
167 {% load i18n %}
168
169-{% block title %}{% trans "New Team Event" %}{% endblock %}
170+{% block title %}{% trans "New Team Event" %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %}
171
172 {% block extrahead %}{{ block.super }}
173 {{form.media}}
174
175=== modified file 'loco_directory/templates/events/team_event_new_select.html'
176--- loco_directory/templates/events/team_event_new_select.html 2010-06-24 19:18:57 +0000
177+++ loco_directory/templates/events/team_event_new_select.html 2010-08-21 21:11:00 +0000
178@@ -1,7 +1,7 @@
179 {% extends "base.html" %}
180 {% load i18n %}
181
182-{% block title %}{% trans "New Team Event" %}{% endblock %}
183+{% block title %}{% trans "New Team Event" %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %}
184
185 {% block sub_nav %}
186 {% endblock %}
187
188=== modified file 'loco_directory/templates/events/team_event_register.html'
189--- loco_directory/templates/events/team_event_register.html 2010-08-17 10:37:26 +0000
190+++ loco_directory/templates/events/team_event_register.html 2010-08-21 21:11:00 +0000
191@@ -1,7 +1,7 @@
192 {% extends "base.html" %}
193 {% load i18n admin_modify adminmedia %}
194
195-{% block title %}{% trans "Team Event Registration" %}{% endblock %}
196+{% block title %}{% trans "Team Event Registration" %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %}
197
198 {% block extrahead %}{{ block.super }}
199 {{form.media}}
200
201=== modified file 'loco_directory/templates/events/team_event_update.html'
202--- loco_directory/templates/events/team_event_update.html 2010-06-24 19:18:57 +0000
203+++ loco_directory/templates/events/team_event_update.html 2010-08-21 21:11:00 +0000
204@@ -1,7 +1,7 @@
205 {% extends "base.html" %}
206 {% load i18n admin_modify adminmedia %}
207
208-{% block title %}{% trans "Update Team Event" %}{% endblock %}
209+{% block title %}{% trans "Update Team Event" %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %}
210
211 {% block extrahead %}{{ block.super }}
212 {{form.media}}
213
214=== modified file 'loco_directory/templates/teams/team_detail.html'
215--- loco_directory/templates/teams/team_detail.html 2010-08-19 22:32:04 +0000
216+++ loco_directory/templates/teams/team_detail.html 2010-08-21 21:11:00 +0000
217@@ -1,7 +1,7 @@
218 {% extends "base.html" %}
219 {% load i18n %}
220
221-{% block title %}{% trans team.name %}{% endblock %}
222+{% block title %}{% trans team.name %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %}
223
224 {% block sub_nav_links %}
225 <a class="sub-nav-item" href="{% url team-list %}" title="{% trans "Back to Teams List" %}">{% trans "Back to Teams List" %}</a>
226
227=== modified file 'loco_directory/templates/teams/team_event_history.html'
228--- loco_directory/templates/teams/team_event_history.html 2010-08-17 00:25:27 +0000
229+++ loco_directory/templates/teams/team_event_history.html 2010-08-21 21:11:00 +0000
230@@ -1,7 +1,7 @@
231 {% extends "base.html" %}
232 {% load i18n %}
233
234-{% block title %}{% blocktrans with team_object.lp_name as teamname %}{{teamname}} Events History{% endblocktrans %}{% endblock %}
235+{% block title %}{% blocktrans with team_object.lp_name as teamname %}{{teamname}} Events History{% endblocktrans %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %}
236
237 {% block sub_nav_links %}
238 <a class="sub-nav-item" href="{% url team-detail team_object.lp_name %}">{% trans "Back to Team Details" %}</a>
239
240=== modified file 'loco_directory/templates/teams/team_event_list.html'
241--- loco_directory/templates/teams/team_event_list.html 2010-08-17 00:25:27 +0000
242+++ loco_directory/templates/teams/team_event_list.html 2010-08-21 21:11:00 +0000
243@@ -1,7 +1,7 @@
244 {% extends "base.html" %}
245 {% load i18n %}
246
247-{% block title %}{% blocktrans with team_object.name as teamname %}{{teamname}} Events List{% endblocktrans %}{% endblock %}
248+{% block title %}{% blocktrans with team_object.name as teamname %}{{teamname}} Events List{% endblocktrans %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %}
249
250 {% block sub_nav_links %}
251 <a class="sub-nav-item" href="{% url team-detail team_object.lp_name %}">{% trans "Back to Team Details" %}</a>
252
253=== modified file 'loco_directory/templates/teams/team_list.html'
254--- loco_directory/templates/teams/team_list.html 2010-08-17 15:09:14 +0000
255+++ loco_directory/templates/teams/team_list.html 2010-08-21 21:11:00 +0000
256@@ -1,7 +1,7 @@
257 {% extends "base.html" %}
258 {% load i18n %}
259
260-{% block title %}{% trans "Ubuntu LoCo Teams List" %}{% endblock %}
261+{% block title %}{% trans "Ubuntu LoCo Teams List" %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %}
262
263 {% block extrahead %}{{ block.super }}
264 {{form.media}}
265
266=== modified file 'loco_directory/templates/teams/team_update.html'
267--- loco_directory/templates/teams/team_update.html 2010-08-17 00:25:27 +0000
268+++ loco_directory/templates/teams/team_update.html 2010-08-21 21:11:00 +0000
269@@ -1,7 +1,7 @@
270 {% extends "base.html" %}
271 {% load i18n %}
272
273-{% block title %}{{ team.name }}{% endblock %}
274+{% block title %}{{ team.name }} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %}
275
276 {% block sub_nav_links %}
277 <a class="sub-nav-item" href="/teams">{% trans "Back to Teams List" %}</a>
278
279=== modified file 'loco_directory/templates/venues/venue_detail.html'
280--- loco_directory/templates/venues/venue_detail.html 2010-08-17 00:25:27 +0000
281+++ loco_directory/templates/venues/venue_detail.html 2010-08-21 21:11:00 +0000
282@@ -1,7 +1,7 @@
283 {% extends "base.html" %}
284 {% load i18n %}
285
286-{% block title %}{% trans venue_object.name %}{% endblock %}
287+{% block title %}{% trans venue_object.name %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %}
288
289 {% block extrahead %}
290 {{block.super}}
291
292=== modified file 'loco_directory/templates/venues/venue_list.html'
293--- loco_directory/templates/venues/venue_list.html 2010-08-17 00:25:27 +0000
294+++ loco_directory/templates/venues/venue_list.html 2010-08-21 21:11:00 +0000
295@@ -1,7 +1,7 @@
296 {% extends "base.html" %}
297 {% load i18n %}
298
299-{% block title %}{% trans "Ubuntu LoCo Event Venues" %}{% endblock %}
300+{% block title %}{% trans "Ubuntu LoCo Event Venues" %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %}
301
302 {% block sub_nav_links %}
303 {% if user.is_authenticated %}
304
305=== modified file 'loco_directory/templates/venues/venue_update.html'
306--- loco_directory/templates/venues/venue_update.html 2010-08-04 13:02:45 +0000
307+++ loco_directory/templates/venues/venue_update.html 2010-08-21 21:11:00 +0000
308@@ -1,7 +1,7 @@
309 {% extends "base.html" %}
310 {% load i18n %}
311
312-{% block title %}{% if venue_object %}{% trans "Update Venue" %}{% else %}{% trans "New Venue" %}{% endif %}{% endblock %}
313+{% block title %}{% if venue_object %}{% trans "Update Venue" %}{% else %}{% trans "New Venue" %}{% endif %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %}
314
315 {% block sub_nav %}
316 {% endblock %}

Subscribers

People subscribed via source and target branches