Merge lp:~cjohnston/loco-team-portal/bugfix-lp-612047 into lp:loco-team-portal
- bugfix-lp-612047
- Merge into 0.2
Proposed by
Chris Johnston
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Michael Hall | ||||
Approved revision: | 233 | ||||
Merged at revision: | 232 | ||||
Proposed branch: | lp:~cjohnston/loco-team-portal/bugfix-lp-612047 | ||||
Merge into: | lp:loco-team-portal | ||||
Diff against target: |
588 lines (+100/-111) 14 files modified
loco_directory/locale/loco-directory.pot (+68/-79) loco_directory/templates/base.html (+10/-11) loco_directory/templates/events/event_history_list.html (+1/-1) loco_directory/templates/events/event_list.html (+3/-2) loco_directory/templates/events/global_event_detail.html (+4/-4) loco_directory/templates/events/team_event_detail.html (+1/-1) loco_directory/templates/events/team_event_list.inc.html (+1/-1) loco_directory/templates/teams/team_detail.html (+4/-4) 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_update.html (+2/-2) loco_directory/templates/venues/venue_detail.html (+2/-2) loco_directory/templates/venues/venue_list.html (+1/-1) loco_directory/urls.py (+1/-1) |
||||
To merge this branch: | bzr merge lp:~cjohnston/loco-team-portal/bugfix-lp-612047 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
LoCo Team Portal Developers | Pending | ||
Review via email:
|
Commit message
Description of the change
Fixes bug #612047 and changes venues url to /events/venues
To post a comment you must log in.
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-16 18:57:47 +0000 | |||
3 | +++ loco_directory/locale/loco-directory.pot 2010-08-17 00:32:40 +0000 | |||
4 | @@ -8,7 +8,7 @@ | |||
5 | 8 | msgstr "" | 8 | msgstr "" |
6 | 9 | "Project-Id-Version: PACKAGE VERSION\n" | 9 | "Project-Id-Version: PACKAGE VERSION\n" |
7 | 10 | "Report-Msgid-Bugs-To: \n" | 10 | "Report-Msgid-Bugs-To: \n" |
9 | 11 | "POT-Creation-Date: 2010-08-16 18:57+0000\n" | 11 | "POT-Creation-Date: 2010-08-16 19:38+0000\n" |
10 | 12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" | 12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
11 | 13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | 13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
12 | 14 | "Language-Team: LANGUAGE <LL@li.org>\n" | 14 | "Language-Team: LANGUAGE <LL@li.org>\n" |
13 | @@ -25,7 +25,7 @@ | |||
14 | 25 | msgid "Please just set one tag." | 25 | msgid "Please just set one tag." |
15 | 26 | msgstr "" | 26 | msgstr "" |
16 | 27 | 27 | ||
18 | 28 | #: events/forms.py:129 teams/forms.py:22 templates/events/event_list.html:19 | 28 | #: events/forms.py:129 teams/forms.py:22 templates/events/event_list.html:20 |
19 | 29 | #: templates/teams/team_list.html:16 templates/venues/venue_list.html:15 | 29 | #: templates/teams/team_list.html:16 templates/venues/venue_list.html:15 |
20 | 30 | #: venues/forms.py:27 | 30 | #: venues/forms.py:27 |
21 | 31 | msgid "Search" | 31 | msgid "Search" |
22 | @@ -445,8 +445,8 @@ | |||
23 | 445 | msgid "LoCo Team Directory" | 445 | msgid "LoCo Team Directory" |
24 | 446 | msgstr "" | 446 | msgstr "" |
25 | 447 | 447 | ||
28 | 448 | #: templates/base.html:13 templates/index.html:15 | 448 | #: templates/base.html:13 |
29 | 449 | msgid "Show all Teams" | 449 | msgid "Show All Teams" |
30 | 450 | msgstr "" | 450 | msgstr "" |
31 | 451 | 451 | ||
32 | 452 | #: templates/base.html:13 templates/index.html:15 | 452 | #: templates/base.html:13 templates/index.html:15 |
33 | @@ -454,8 +454,8 @@ | |||
34 | 454 | msgid "Teams" | 454 | msgid "Teams" |
35 | 455 | msgstr "" | 455 | msgstr "" |
36 | 456 | 456 | ||
39 | 457 | #: templates/base.html:14 templates/index.html:24 | 457 | #: templates/base.html:14 |
40 | 458 | msgid "Show all Events" | 458 | msgid "Show All Events" |
41 | 459 | msgstr "" | 459 | msgstr "" |
42 | 460 | 460 | ||
43 | 461 | #: templates/base.html:14 templates/index.html:24 | 461 | #: templates/base.html:14 templates/index.html:24 |
44 | @@ -463,41 +463,37 @@ | |||
45 | 463 | msgstr "" | 463 | msgstr "" |
46 | 464 | 464 | ||
47 | 465 | #: templates/base.html:15 | 465 | #: templates/base.html:15 |
48 | 466 | msgid "Show all Venues" | ||
49 | 467 | msgstr "" | ||
50 | 468 | |||
51 | 469 | #: templates/base.html:15 | ||
52 | 470 | msgid "Venues" | ||
53 | 471 | msgstr "" | ||
54 | 472 | |||
55 | 473 | #: templates/base.html:16 | ||
56 | 474 | msgid "LoCo Council" | 466 | msgid "LoCo Council" |
57 | 475 | msgstr "" | 467 | msgstr "" |
58 | 476 | 468 | ||
60 | 477 | #: templates/base.html:17 | 469 | #: templates/base.html:16 |
61 | 478 | msgid "About LoCo Directory" | 470 | msgid "About LoCo Directory" |
62 | 479 | msgstr "" | 471 | msgstr "" |
63 | 480 | 472 | ||
65 | 481 | #: templates/base.html:17 | 473 | #: templates/base.html:16 |
66 | 482 | msgid "About" | 474 | msgid "About" |
67 | 483 | msgstr "" | 475 | msgstr "" |
68 | 484 | 476 | ||
71 | 485 | #: templates/base.html:19 | 477 | #: templates/base.html:18 |
72 | 486 | msgid "Log out" | 478 | msgid "Log Out" |
73 | 487 | msgstr "" | 479 | msgstr "" |
74 | 488 | 480 | ||
76 | 489 | #: templates/base.html:21 | 481 | #: templates/base.html:20 |
77 | 490 | msgid "Log in" | 482 | msgid "Log in" |
78 | 491 | msgstr "" | 483 | msgstr "" |
79 | 492 | 484 | ||
81 | 493 | #: templates/base.html:44 | 485 | #: templates/base.html:43 |
82 | 494 | msgid "Logged in as" | 486 | msgid "Logged in as" |
83 | 495 | msgstr "" | 487 | msgstr "" |
84 | 496 | 488 | ||
86 | 497 | #: templates/base.html:57 | 489 | #: templates/base.html:56 |
87 | 498 | msgid "LoCo Directory" | 490 | msgid "LoCo Directory" |
88 | 499 | msgstr "" | 491 | msgstr "" |
89 | 500 | 492 | ||
90 | 493 | #: templates/index.html:15 | ||
91 | 494 | msgid "Show all Teams" | ||
92 | 495 | msgstr "" | ||
93 | 496 | |||
94 | 501 | #: templates/index.html:17 | 497 | #: templates/index.html:17 |
95 | 502 | msgid "" | 498 | msgid "" |
96 | 503 | "List of all Ubuntu LoCo Teams, with full information such as contact, web " | 499 | "List of all Ubuntu LoCo Teams, with full information such as contact, web " |
97 | @@ -510,6 +506,10 @@ | |||
98 | 510 | "team in the near future." | 506 | "team in the near future." |
99 | 511 | msgstr "" | 507 | msgstr "" |
100 | 512 | 508 | ||
101 | 509 | #: templates/index.html:24 | ||
102 | 510 | msgid "Show all Events" | ||
103 | 511 | msgstr "" | ||
104 | 512 | |||
105 | 513 | #: templates/index.html:25 | 513 | #: templates/index.html:25 |
106 | 514 | msgid "" | 514 | msgid "" |
107 | 515 | "List of all Ubuntu LoCo Events, with full information such as location, " | 515 | "List of all Ubuntu LoCo Events, with full information such as location, " |
108 | @@ -520,15 +520,15 @@ | |||
109 | 520 | msgid "Upcoming Global Events" | 520 | msgid "Upcoming Global Events" |
110 | 521 | msgstr "" | 521 | msgstr "" |
111 | 522 | 522 | ||
113 | 523 | #: templates/index.html:29 templates/events/event_list.html:28 | 523 | #: templates/index.html:29 templates/events/event_list.html:29 |
114 | 524 | msgid "Global Events as ical" | 524 | msgid "Global Events as ical" |
115 | 525 | msgstr "" | 525 | msgstr "" |
116 | 526 | 526 | ||
118 | 527 | #: templates/index.html:31 templates/events/event_list.html:30 | 527 | #: templates/index.html:31 templates/events/event_list.html:31 |
119 | 528 | msgid "Select a global event below to see more information about it:" | 528 | msgid "Select a global event below to see more information about it:" |
120 | 529 | msgstr "" | 529 | msgstr "" |
121 | 530 | 530 | ||
123 | 531 | #: templates/index.html:36 | 531 | #: templates/index.html:36 templates/events/event_list.html:36 |
124 | 532 | msgid "There are currently no LoCo Global Events" | 532 | msgid "There are currently no LoCo Global Events" |
125 | 533 | msgstr "" | 533 | msgstr "" |
126 | 534 | 534 | ||
127 | @@ -536,11 +536,11 @@ | |||
128 | 536 | msgid "Upcoming Team Events" | 536 | msgid "Upcoming Team Events" |
129 | 537 | msgstr "" | 537 | msgstr "" |
130 | 538 | 538 | ||
132 | 539 | #: templates/index.html:43 templates/events/event_list.html:45 | 539 | #: templates/index.html:43 templates/events/event_list.html:46 |
133 | 540 | msgid "Team Events as ical" | 540 | msgid "Team Events as ical" |
134 | 541 | msgstr "" | 541 | msgstr "" |
135 | 542 | 542 | ||
137 | 543 | #: templates/index.html:45 | 543 | #: templates/index.html:45 templates/events/event_list.html:52 |
138 | 544 | msgid "There are currently no LoCo Team Events" | 544 | msgid "There are currently no LoCo Team Events" |
139 | 545 | msgstr "" | 545 | msgstr "" |
140 | 546 | 546 | ||
141 | @@ -650,8 +650,9 @@ | |||
142 | 650 | msgstr "" | 650 | msgstr "" |
143 | 651 | 651 | ||
144 | 652 | #: templates/events/event_history_list.html:7 | 652 | #: templates/events/event_history_list.html:7 |
147 | 653 | #: templates/teams/team_event_history.html:8 | 653 | #: templates/events/global_event_detail.html:12 |
148 | 654 | msgid "Upcoming Events" | 654 | #: templates/events/team_event_detail.html:7 |
149 | 655 | msgid "Back to Events List" | ||
150 | 655 | msgstr "" | 656 | msgstr "" |
151 | 656 | 657 | ||
152 | 657 | #: templates/events/event_history_list.html:12 | 658 | #: templates/events/event_history_list.html:12 |
153 | @@ -682,43 +683,42 @@ | |||
154 | 682 | msgid "Ubuntu LoCo Events List" | 683 | msgid "Ubuntu LoCo Events List" |
155 | 683 | msgstr "" | 684 | msgstr "" |
156 | 684 | 685 | ||
158 | 685 | #: templates/events/event_list.html:8 | 686 | #: templates/events/event_list.html:7 |
159 | 687 | msgid "Show All Venues" | ||
160 | 688 | msgstr "" | ||
161 | 689 | |||
162 | 690 | #: templates/events/event_list.html:7 | ||
163 | 691 | msgid "Venues" | ||
164 | 692 | msgstr "" | ||
165 | 693 | |||
166 | 694 | #: templates/events/event_list.html:9 | ||
167 | 686 | msgid "Add Global Event" | 695 | msgid "Add Global Event" |
168 | 687 | msgstr "" | 696 | msgstr "" |
169 | 688 | 697 | ||
171 | 689 | #: templates/events/event_list.html:11 | 698 | #: templates/events/event_list.html:12 |
172 | 690 | msgid "Add Team Event" | 699 | msgid "Add Team Event" |
173 | 691 | msgstr "" | 700 | msgstr "" |
174 | 692 | 701 | ||
176 | 693 | #: templates/events/event_list.html:13 templates/teams/team_detail.html:108 | 702 | #: templates/events/event_list.html:14 templates/teams/team_detail.html:108 |
177 | 694 | #: templates/teams/team_event_list.html:8 | 703 | #: templates/teams/team_event_list.html:8 |
178 | 695 | msgid "Past Events" | 704 | msgid "Past Events" |
179 | 696 | msgstr "" | 705 | msgstr "" |
180 | 697 | 706 | ||
182 | 698 | #: templates/events/event_list.html:25 | 707 | #: templates/events/event_list.html:26 |
183 | 699 | msgid "Ubuntu LoCo Global Events" | 708 | msgid "Ubuntu LoCo Global Events" |
184 | 700 | msgstr "" | 709 | msgstr "" |
185 | 701 | 710 | ||
191 | 702 | #: templates/events/event_list.html:35 | 711 | #: templates/events/event_list.html:43 |
187 | 703 | msgid "There are currently no LoCo Global Events" | ||
188 | 704 | msgstr "" | ||
189 | 705 | |||
190 | 706 | #: templates/events/event_list.html:42 | ||
192 | 707 | msgid "Ubuntu LoCo Team Events" | 712 | msgid "Ubuntu LoCo Team Events" |
193 | 708 | msgstr "" | 713 | msgstr "" |
194 | 709 | 714 | ||
196 | 710 | #: templates/events/event_list.html:46 | 715 | #: templates/events/event_list.html:47 |
197 | 711 | #: templates/teams/team_event_history.html:18 | 716 | #: templates/teams/team_event_history.html:18 |
198 | 712 | #: templates/teams/team_event_list.html:25 | 717 | #: templates/teams/team_event_list.html:25 |
199 | 713 | msgid "Select a team event below to see more information about it:" | 718 | msgid "Select a team event below to see more information about it:" |
200 | 714 | msgstr "" | 719 | msgstr "" |
201 | 715 | 720 | ||
202 | 716 | #: templates/events/event_list.html:51 | ||
203 | 717 | msgid "There are currently no LoCo Team Events" | ||
204 | 718 | msgstr "" | ||
205 | 719 | |||
206 | 720 | #: templates/events/global_event_delete_confirm.html:4 | 721 | #: templates/events/global_event_delete_confirm.html:4 |
207 | 721 | #: templates/events/global_event_detail.html:18 | ||
208 | 722 | msgid "Delete Global Event" | 722 | msgid "Delete Global Event" |
209 | 723 | msgstr "" | 723 | msgstr "" |
210 | 724 | 724 | ||
211 | @@ -736,16 +736,19 @@ | |||
212 | 736 | msgid "Cancel" | 736 | msgid "Cancel" |
213 | 737 | msgstr "" | 737 | msgstr "" |
214 | 738 | 738 | ||
215 | 739 | #: templates/events/global_event_detail.html:12 | ||
216 | 740 | msgid "Go back to Event list" | ||
217 | 741 | msgstr "" | ||
218 | 742 | |||
219 | 743 | #: templates/events/global_event_detail.html:14 | 739 | #: templates/events/global_event_detail.html:14 |
221 | 744 | msgid "Add your Team's Event" | 740 | msgid "Add Your Team's Event" |
222 | 745 | msgstr "" | 741 | msgstr "" |
223 | 746 | 742 | ||
224 | 747 | #: templates/events/global_event_detail.html:17 | 743 | #: templates/events/global_event_detail.html:17 |
226 | 748 | msgid "Edit details" | 744 | #: templates/events/team_event_detail.html:11 |
227 | 745 | #: templates/teams/team_detail.html:9 | ||
228 | 746 | msgid "Edit Details" | ||
229 | 747 | msgstr "" | ||
230 | 748 | |||
231 | 749 | #: templates/events/global_event_detail.html:18 | ||
232 | 750 | #: templates/events/team_event_detail.html:12 | ||
233 | 751 | msgid "Delete Event" | ||
234 | 749 | msgstr "" | 752 | msgstr "" |
235 | 750 | 753 | ||
236 | 751 | #: templates/events/global_event_detail.inc.html:20 | 754 | #: templates/events/global_event_detail.inc.html:20 |
237 | @@ -782,7 +785,6 @@ | |||
238 | 782 | msgstr "" | 785 | msgstr "" |
239 | 783 | 786 | ||
240 | 784 | #: templates/events/global_event_list.inc.html:4 | 787 | #: templates/events/global_event_list.inc.html:4 |
241 | 785 | #: templates/events/team_event_list.inc.html:4 | ||
242 | 786 | msgid "Event name" | 788 | msgid "Event name" |
243 | 787 | msgstr "" | 789 | msgstr "" |
244 | 788 | 790 | ||
245 | @@ -825,7 +827,6 @@ | |||
246 | 825 | 827 | ||
247 | 826 | #: templates/events/team_event_delete_confirm.html:4 | 828 | #: templates/events/team_event_delete_confirm.html:4 |
248 | 827 | #: templates/events/team_event_delete_confirm.html:15 | 829 | #: templates/events/team_event_delete_confirm.html:15 |
249 | 828 | #: templates/events/team_event_detail.html:12 | ||
250 | 829 | msgid "Delete Team Event" | 830 | msgid "Delete Team Event" |
251 | 830 | msgstr "" | 831 | msgstr "" |
252 | 831 | 832 | ||
253 | @@ -834,19 +835,11 @@ | |||
254 | 834 | msgid "Do you really want to delete the Team Event: %(eventname)s?" | 835 | msgid "Do you really want to delete the Team Event: %(eventname)s?" |
255 | 835 | msgstr "" | 836 | msgstr "" |
256 | 836 | 837 | ||
257 | 837 | #: templates/events/team_event_detail.html:7 | ||
258 | 838 | msgid "Back to Events List" | ||
259 | 839 | msgstr "" | ||
260 | 840 | |||
261 | 841 | #: templates/events/team_event_detail.html:9 | 838 | #: templates/events/team_event_detail.html:9 |
262 | 842 | #: templates/events/team_event_detail_comments.inc.html:7 | 839 | #: templates/events/team_event_detail_comments.inc.html:7 |
263 | 843 | msgid "Add Comment" | 840 | msgid "Add Comment" |
264 | 844 | msgstr "" | 841 | msgstr "" |
265 | 845 | 842 | ||
266 | 846 | #: templates/events/team_event_detail.html:11 | ||
267 | 847 | msgid "Edit Details" | ||
268 | 848 | msgstr "" | ||
269 | 849 | |||
270 | 850 | #: templates/events/team_event_detail.html:13 | 843 | #: templates/events/team_event_detail.html:13 |
271 | 851 | msgid "Copy Event" | 844 | msgid "Copy Event" |
272 | 852 | msgstr "" | 845 | msgstr "" |
273 | @@ -947,6 +940,10 @@ | |||
274 | 947 | msgid "Comment:" | 940 | msgid "Comment:" |
275 | 948 | msgstr "" | 941 | msgstr "" |
276 | 949 | 942 | ||
277 | 943 | #: templates/events/team_event_list.inc.html:4 | ||
278 | 944 | msgid "Event Name" | ||
279 | 945 | msgstr "" | ||
280 | 946 | |||
281 | 950 | #: templates/events/team_event_list.inc.html:7 | 947 | #: templates/events/team_event_list.inc.html:7 |
282 | 951 | msgid "Global Event" | 948 | msgid "Global Event" |
283 | 952 | msgstr "" | 949 | msgstr "" |
284 | @@ -982,23 +979,15 @@ | |||
285 | 982 | msgstr "" | 979 | msgstr "" |
286 | 983 | 980 | ||
287 | 984 | #: templates/teams/team_detail.html:7 templates/teams/team_update.html:7 | 981 | #: templates/teams/team_detail.html:7 templates/teams/team_update.html:7 |
293 | 985 | msgid "Go back to Team list." | 982 | msgid "Back to Teams List" |
289 | 986 | msgstr "" | ||
290 | 987 | |||
291 | 988 | #: templates/teams/team_detail.html:7 | ||
292 | 989 | msgid "Go back to Team list" | ||
294 | 990 | msgstr "" | 983 | msgstr "" |
295 | 991 | 984 | ||
296 | 992 | #: templates/teams/team_detail.html:8 | 985 | #: templates/teams/team_detail.html:8 |
302 | 993 | msgid "Join this team!" | 986 | msgid "Join This Team!" |
298 | 994 | msgstr "" | ||
299 | 995 | |||
300 | 996 | #: templates/teams/team_detail.html:9 | ||
301 | 997 | msgid "Edit team details" | ||
303 | 998 | msgstr "" | 987 | msgstr "" |
304 | 999 | 988 | ||
305 | 1000 | #: templates/teams/team_detail.html:10 | 989 | #: templates/teams/team_detail.html:10 |
307 | 1001 | msgid "Add new Event" | 990 | msgid "Add New Event" |
308 | 1002 | msgstr "" | 991 | msgstr "" |
309 | 1003 | 992 | ||
310 | 1004 | #: templates/teams/team_detail.html:16 templates/teams/team_event_list.html:9 | 993 | #: templates/teams/team_detail.html:16 templates/teams/team_event_list.html:9 |
311 | @@ -1094,8 +1083,12 @@ | |||
312 | 1094 | msgstr "" | 1083 | msgstr "" |
313 | 1095 | 1084 | ||
314 | 1096 | #: templates/teams/team_event_history.html:7 | 1085 | #: templates/teams/team_event_history.html:7 |
317 | 1097 | #: templates/teams/team_event_list.html:7 | 1086 | #: templates/teams/team_event_list.html:7 templates/teams/team_update.html:8 |
318 | 1098 | msgid "Go back to team details" | 1087 | msgid "Back to Team Details" |
319 | 1088 | msgstr "" | ||
320 | 1089 | |||
321 | 1090 | #: templates/teams/team_event_history.html:8 | ||
322 | 1091 | msgid "Upcoming Events" | ||
323 | 1099 | msgstr "" | 1092 | msgstr "" |
324 | 1100 | 1093 | ||
325 | 1101 | #: templates/teams/team_event_history.html:23 | 1094 | #: templates/teams/team_event_history.html:23 |
326 | @@ -1155,10 +1148,6 @@ | |||
327 | 1155 | msgid "There are currently no approved teams in the Ubuntu LoCo Directory. :(" | 1148 | msgid "There are currently no approved teams in the Ubuntu LoCo Directory. :(" |
328 | 1156 | msgstr "" | 1149 | msgstr "" |
329 | 1157 | 1150 | ||
330 | 1158 | #: templates/teams/team_update.html:8 | ||
331 | 1159 | msgid "Go back to team details." | ||
332 | 1160 | msgstr "" | ||
333 | 1161 | |||
334 | 1162 | #: templates/teams/team_update.html:16 | 1151 | #: templates/teams/team_update.html:16 |
335 | 1163 | msgid "Please correct the error" | 1152 | msgid "Please correct the error" |
336 | 1164 | msgstr "" | 1153 | msgstr "" |
337 | @@ -1180,11 +1169,11 @@ | |||
338 | 1180 | msgstr "" | 1169 | msgstr "" |
339 | 1181 | 1170 | ||
340 | 1182 | #: templates/venues/venue_detail.html:15 | 1171 | #: templates/venues/venue_detail.html:15 |
342 | 1183 | msgid "Go back to Venue list" | 1172 | msgid "Back to Venues List" |
343 | 1184 | msgstr "" | 1173 | msgstr "" |
344 | 1185 | 1174 | ||
345 | 1186 | #: templates/venues/venue_detail.html:17 | 1175 | #: templates/venues/venue_detail.html:17 |
347 | 1187 | msgid "Edit venue details" | 1176 | msgid "Edit Venue Details" |
348 | 1188 | msgstr "" | 1177 | msgstr "" |
349 | 1189 | 1178 | ||
350 | 1190 | #: templates/venues/venue_detail_basic.inc.html:24 | 1179 | #: templates/venues/venue_detail_basic.inc.html:24 |
351 | @@ -1208,7 +1197,7 @@ | |||
352 | 1208 | msgstr "" | 1197 | msgstr "" |
353 | 1209 | 1198 | ||
354 | 1210 | #: templates/venues/venue_list.html:8 | 1199 | #: templates/venues/venue_list.html:8 |
356 | 1211 | msgid "Add new venue" | 1200 | msgid "Add New Venue" |
357 | 1212 | msgstr "" | 1201 | msgstr "" |
358 | 1213 | 1202 | ||
359 | 1214 | #: templates/venues/venue_list.html:25 | 1203 | #: templates/venues/venue_list.html:25 |
360 | 1215 | 1204 | ||
361 | === modified file 'loco_directory/templates/base.html' | |||
362 | --- loco_directory/templates/base.html 2010-08-04 13:02:45 +0000 | |||
363 | +++ loco_directory/templates/base.html 2010-08-17 00:32:40 +0000 | |||
364 | @@ -6,20 +6,19 @@ | |||
365 | 6 | {% block logo_text %}{% trans "LoCo Team Directory" %}{% endblock %} | 6 | {% block logo_text %}{% trans "LoCo Team Directory" %}{% endblock %} |
366 | 7 | 7 | ||
367 | 8 | {% block extrahead %} | 8 | {% block extrahead %} |
369 | 9 | <script type="text/javascript" src="{{MEDIA_URL}}/jquery/jquery.js"></script> | 9 | <script type="text/javascript" src="{{MEDIA_URL}}/jquery/jquery.js"></script> |
370 | 10 | {% endblock %} | 10 | {% endblock %} |
371 | 11 | 11 | ||
372 | 12 | {% block main_nav_links %} | 12 | {% block main_nav_links %} |
383 | 13 | <a class="main-nav-item {% ifequal url_base 'teams' %}current{% endifequal %}" title="{% trans "Show all Teams" %}" href="{% url team-list %}">{% trans "Teams" %}</a> | 13 | <a class="main-nav-item {% ifequal url_base 'teams' %}current{% endifequal %}" title="{% trans "Show All Teams" %}" href="{% url team-list %}">{% trans "Teams" %}</a> |
384 | 14 | <a class="main-nav-item {% ifequal url_base 'events' %}current{% endifequal %}" title="{% trans "Show all Events" %}" href="{% url event-list %}">{% trans "Events" %}</a> | 14 | <a class="main-nav-item {% ifequal url_base 'events' %}current{% endifequal %}" title="{% trans "Show All Events" %}" href="{% url event-list %}">{% trans "Events" %}</a> |
385 | 15 | <a class="main-nav-item {% ifequal url_base 'venues' %}current{% endifequal %}" title="{% trans "Show all Venues" %}" href="{% url venue-list %}">{% trans "Venues" %}</a> | 15 | <a class="main-nav-item {% ifequal url_base 'loco-council' %}current{% endifequal %}" title="{% trans "LoCo Council" %}" href="{% url loco_council %}">{% trans "LoCo Council" %}</a> |
386 | 16 | <a class="main-nav-item {% ifequal url_base 'loco-council' %}current{% endifequal %}" title="{% trans "LoCo Council" %}" href="{% url loco_council %}">{% trans "LoCo Council" %}</a> | 16 | <a class="main-nav-item {% ifequal url_base 'about' %}current{% endifequal %}" title="{% trans "About LoCo Directory" %}" href="/about">{% trans "About" %}</a></li> |
387 | 17 | <a class="main-nav-item {% ifequal url_base 'about' %}current{% endifequal %}" title="{% trans "About LoCo Directory" %}" href="/about">{% trans "About" %}</a></li> | 17 | {% if user.is_authenticated %} |
388 | 18 | {% if user.is_authenticated %} | 18 | <a class="main-nav-item" href="/logout" title="{% trans "Log Out" %}: {{ user.username }}">{% trans "Log Out" %}</a> |
389 | 19 | <a class="main-nav-item" href="/logout" title="{% trans "Log out" %}: {{ user.username }}">{% trans "Log out" %}</a> | 19 | {% else %} |
390 | 20 | {% else %} | 20 | <a class="main-nav-item" href="/openid/login?next={{login_next}}">{% trans "Log in" %}</a> |
391 | 21 | <a class="main-nav-item" href="/openid/login?next={{login_next}}">{% trans "Log in" %}</a> | 21 | {% endif %} |
382 | 22 | {% endif %} | ||
392 | 23 | {% endblock %} | 22 | {% endblock %} |
393 | 24 | 23 | ||
394 | 25 | {% block sub_nav_links %} | 24 | {% block sub_nav_links %} |
395 | 26 | 25 | ||
396 | === modified file 'loco_directory/templates/events/event_history_list.html' | |||
397 | --- loco_directory/templates/events/event_history_list.html 2010-07-29 15:41:01 +0000 | |||
398 | +++ loco_directory/templates/events/event_history_list.html 2010-08-17 00:32:40 +0000 | |||
399 | @@ -4,7 +4,7 @@ | |||
400 | 4 | {% block title %}{% trans "Ubuntu LoCo Events History" %}{% endblock %} | 4 | {% block title %}{% trans "Ubuntu LoCo Events History" %}{% endblock %} |
401 | 5 | 5 | ||
402 | 6 | {% block sub_nav_links %} | 6 | {% block sub_nav_links %} |
404 | 7 | <a class="sub-nav-item" href="{% url event-list %}">{% trans "Upcoming Events" %}</a> | 7 | <a class="sub-nav-item" href="{% url event-list %}">{% trans "Back to Events List" %}</a> |
405 | 8 | {% endblock %} | 8 | {% endblock %} |
406 | 9 | 9 | ||
407 | 10 | {% block content %} | 10 | {% block content %} |
408 | 11 | 11 | ||
409 | === modified file 'loco_directory/templates/events/event_list.html' | |||
410 | --- loco_directory/templates/events/event_list.html 2010-07-31 05:23:47 +0000 | |||
411 | +++ loco_directory/templates/events/event_list.html 2010-08-17 00:32:40 +0000 | |||
412 | @@ -4,6 +4,7 @@ | |||
413 | 4 | {% block title %}{% trans "Ubuntu LoCo Events List" %}{% endblock %} | 4 | {% block title %}{% trans "Ubuntu LoCo Events List" %}{% endblock %} |
414 | 5 | 5 | ||
415 | 6 | {% block sub_nav_links %} | 6 | {% block sub_nav_links %} |
416 | 7 | <a class="sub-nav-item" title="{% trans "Show All Venues" %}" href="{% url venue-list %}">{% trans "Venues" %}</a> | ||
417 | 7 | {% if user_is_on_lc %} | 8 | {% if user_is_on_lc %} |
418 | 8 | <a class="sub-nav-item" href="{% url global-event-new %}">{% trans "Add Global Event" %}</a> | 9 | <a class="sub-nav-item" href="{% url global-event-new %}">{% trans "Add Global Event" %}</a> |
419 | 9 | {% endif %} | 10 | {% endif %} |
420 | @@ -32,7 +33,7 @@ | |||
421 | 32 | {% include "events/global_event_list.inc.html" %} | 33 | {% include "events/global_event_list.inc.html" %} |
422 | 33 | 34 | ||
423 | 34 | {% else %} | 35 | {% else %} |
425 | 35 | </h2><p>{% trans "There are currently no LoCo Global Events" %}</p> | 36 | </h2><p>{% trans "There are currently no LoCo Global Events" %}</p> |
426 | 36 | {% endif %} | 37 | {% endif %} |
427 | 37 | </article> | 38 | </article> |
428 | 38 | 39 | ||
429 | @@ -48,7 +49,7 @@ | |||
430 | 48 | {% include "events/team_event_list.inc.html" %} | 49 | {% include "events/team_event_list.inc.html" %} |
431 | 49 | 50 | ||
432 | 50 | {% else %} | 51 | {% else %} |
434 | 51 | </h2><p>{% trans "There are currently no LoCo Team Events" %}</p> | 52 | </h2><p>{% trans "There are currently no LoCo Team Events" %}</p> |
435 | 52 | {% endif %} | 53 | {% endif %} |
436 | 53 | 54 | ||
437 | 54 | </article> | 55 | </article> |
438 | 55 | 56 | ||
439 | === modified file 'loco_directory/templates/events/global_event_detail.html' | |||
440 | --- loco_directory/templates/events/global_event_detail.html 2010-08-15 20:35:13 +0000 | |||
441 | +++ loco_directory/templates/events/global_event_detail.html 2010-08-17 00:32:40 +0000 | |||
442 | @@ -9,13 +9,13 @@ | |||
443 | 9 | {% block title %}{% trans global_event_object.name %}{% endblock %} | 9 | {% block title %}{% trans global_event_object.name %}{% endblock %} |
444 | 10 | 10 | ||
445 | 11 | {% block sub_nav_links %} | 11 | {% block sub_nav_links %} |
447 | 12 | <a class="sub-nav-item" href="{% url event-list %}">{% trans "Go back to Event list" %}</a> | 12 | <a class="sub-nav-item" href="{% url event-list %}">{% trans "Back to Events List" %}</a> |
448 | 13 | {% if add_team_event %} | 13 | {% if add_team_event %} |
450 | 14 | <a class="sub-nav-item" href="{% url team-event-select %}?global_event_id={{global_event_object.id}}">{% trans "Add your Team's Event" %}</a> | 14 | <a class="sub-nav-item" href="{% url team-event-select %}?global_event_id={{global_event_object.id}}">{% trans "Add Your Team's Event" %}</a> |
451 | 15 | {% endif %} | 15 | {% endif %} |
452 | 16 | {% if user_is_on_lc %} | 16 | {% if user_is_on_lc %} |
455 | 17 | <a class="sub-nav-item" href="{% url global-event-update global_event_object.id %}">{% trans "Edit details" %}</a> | 17 | <a class="sub-nav-item" href="{% url global-event-update global_event_object.id %}">{% trans "Edit Details" %}</a> |
456 | 18 | <a class="sub-nav-item" href="{% url global-event-delete global_event_object.id %}">{% trans "Delete Global Event" %}</a> | 18 | <a class="sub-nav-item" href="{% url global-event-delete global_event_object.id %}">{% trans "Delete Event" %}</a> |
457 | 19 | {% endif %} | 19 | {% endif %} |
458 | 20 | {% endblock %} | 20 | {% endblock %} |
459 | 21 | 21 | ||
460 | 22 | 22 | ||
461 | === modified file 'loco_directory/templates/events/team_event_detail.html' | |||
462 | --- loco_directory/templates/events/team_event_detail.html 2010-08-16 18:14:57 +0000 | |||
463 | +++ loco_directory/templates/events/team_event_detail.html 2010-08-17 00:32:40 +0000 | |||
464 | @@ -9,7 +9,7 @@ | |||
465 | 9 | <a class="sub-nav-item" href="{% url team-event-comment-new team_event_object.id %}#comment">{% trans "Add Comment" %}</a> | 9 | <a class="sub-nav-item" href="{% url team-event-comment-new team_event_object.id %}#comment">{% trans "Add Comment" %}</a> |
466 | 10 | {% if user_is_team_member %} | 10 | {% if user_is_team_member %} |
467 | 11 | <a class="sub-nav-item" href="{% url team-event-update team_event_object.id %}">{% trans "Edit Details" %}</a> | 11 | <a class="sub-nav-item" href="{% url team-event-update team_event_object.id %}">{% trans "Edit Details" %}</a> |
469 | 12 | <a class="sub-nav-item" href="{% url team-event-delete team_event_object.id %}">{% trans "Delete Team Event" %}</a> | 12 | <a class="sub-nav-item" href="{% url team-event-delete team_event_object.id %}">{% trans "Delete Event" %}</a> |
470 | 13 | <a class="sub-nav-item" href="{% url team-event-copy team_event_object.id %}">{% trans "Copy Event" %}</a> | 13 | <a class="sub-nav-item" href="{% url team-event-copy team_event_object.id %}">{% trans "Copy Event" %}</a> |
471 | 14 | {% endif %} | 14 | {% endif %} |
472 | 15 | 15 | ||
473 | 16 | 16 | ||
474 | === modified file 'loco_directory/templates/events/team_event_list.inc.html' | |||
475 | --- loco_directory/templates/events/team_event_list.inc.html 2010-06-18 02:48:47 +0000 | |||
476 | +++ loco_directory/templates/events/team_event_list.inc.html 2010-08-17 00:32:40 +0000 | |||
477 | @@ -1,7 +1,7 @@ | |||
478 | 1 | {% load i18n %} | 1 | {% load i18n %} |
479 | 2 | <table id="team_event_list" class="data_table"> | 2 | <table id="team_event_list" class="data_table"> |
480 | 3 | <tr id="team_event_list_header"> | 3 | <tr id="team_event_list_header"> |
482 | 4 | <th class="event_name">{% trans "Event name" %}</th> | 4 | <th class="event_name">{% trans "Event Name" %}</th> |
483 | 5 | <th class="event_begin">{% trans "Start" %}</th> | 5 | <th class="event_begin">{% trans "Start" %}</th> |
484 | 6 | <th class="event_end">{% trans "End" %}</th> | 6 | <th class="event_end">{% trans "End" %}</th> |
485 | 7 | <th class="event_global">{% trans "Global Event" %}</th> | 7 | <th class="event_global">{% trans "Global Event" %}</th> |
486 | 8 | 8 | ||
487 | === modified file 'loco_directory/templates/teams/team_detail.html' | |||
488 | --- loco_directory/templates/teams/team_detail.html 2010-07-31 17:15:03 +0000 | |||
489 | +++ loco_directory/templates/teams/team_detail.html 2010-08-17 00:32:40 +0000 | |||
490 | @@ -4,10 +4,10 @@ | |||
491 | 4 | {% block title %}{% trans team.name %}{% endblock %} | 4 | {% block title %}{% trans team.name %}{% endblock %} |
492 | 5 | 5 | ||
493 | 6 | {% block sub_nav_links %} | 6 | {% block sub_nav_links %} |
498 | 7 | <a class="sub-nav-item" href="{% url team-list %}" title="{% trans "Go back to Team list." %}">{% trans "Go back to Team list" %}</a> | 7 | <a class="sub-nav-item" href="{% url team-list %}" title="{% trans "Back to Teams List" %}">{% trans "Back to Teams List" %}</a> |
499 | 8 | {% if is_member %}{% else %} <a class="sub-nav-item" href="https://launchpad.net/~{{ team.lp_name }}/+join">{% trans "Join this team!" %}</a>{% endif %} | 8 | {% if is_member %}{% else %} <a class="sub-nav-item" href="https://launchpad.net/~{{ team.lp_name }}/+join">{% trans "Join This Team!" %}</a>{% endif %} |
500 | 9 | {% 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 %} | 9 | {% if is_admin %}<a class="sub-nav-item" href="{% url team-edit team.lp_name %}" title="{% trans "Edit Details" %}">{% trans "Edit Details" %}</a>{% endif %} |
501 | 10 | {% 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 %} | 10 | {% 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 %} |
502 | 11 | {% endblock %} | 11 | {% endblock %} |
503 | 12 | 12 | ||
504 | 13 | {% block search %}{% endblock %} | 13 | {% block search %}{% endblock %} |
505 | 14 | 14 | ||
506 | === modified file 'loco_directory/templates/teams/team_event_history.html' | |||
507 | --- loco_directory/templates/teams/team_event_history.html 2010-07-29 15:41:01 +0000 | |||
508 | +++ loco_directory/templates/teams/team_event_history.html 2010-08-17 00:32:40 +0000 | |||
509 | @@ -4,7 +4,7 @@ | |||
510 | 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 %}{% endblock %} |
511 | 5 | 5 | ||
512 | 6 | {% block sub_nav_links %} | 6 | {% block sub_nav_links %} |
514 | 7 | <a class="sub-nav-item" href="{% url team-detail team_object.lp_name %}">{% trans "Go 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> |
515 | 8 | <a class="sub-nav-item" href="{% url team-event-list team_object.lp_name %}">{% trans "Upcoming Events" %}</a> | 8 | <a class="sub-nav-item" href="{% url team-event-list team_object.lp_name %}">{% trans "Upcoming Events" %}</a> |
516 | 9 | {% endblock %} | 9 | {% endblock %} |
517 | 10 | 10 | ||
518 | 11 | 11 | ||
519 | === modified file 'loco_directory/templates/teams/team_event_list.html' | |||
520 | --- loco_directory/templates/teams/team_event_list.html 2010-07-31 05:23:47 +0000 | |||
521 | +++ loco_directory/templates/teams/team_event_list.html 2010-08-17 00:32:40 +0000 | |||
522 | @@ -4,7 +4,7 @@ | |||
523 | 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 %}{% endblock %} |
524 | 5 | 5 | ||
525 | 6 | {% block sub_nav_links %} | 6 | {% block sub_nav_links %} |
527 | 7 | <a class="sub-nav-item" href="{% url team-detail team_object.lp_name %}">{% trans "Go 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> |
528 | 8 | <a class="sub-nav-item" href="{% url team-event-history team_object.lp_name %}">{% trans "Past Events" %}</a> | 8 | <a class="sub-nav-item" href="{% url team-event-history team_object.lp_name %}">{% trans "Past Events" %}</a> |
529 | 9 | <a class="sub-nav-item" href="{% url team-events-rss team_object.lp_name %}" title="{% trans "Team Events (RSS)" %}"">{% trans "Team Events (RSS)" %}</a> | 9 | <a class="sub-nav-item" href="{% url team-events-rss team_object.lp_name %}" title="{% trans "Team Events (RSS)" %}"">{% trans "Team Events (RSS)" %}</a> |
530 | 10 | {% endblock %} | 10 | {% endblock %} |
531 | 11 | 11 | ||
532 | === modified file 'loco_directory/templates/teams/team_update.html' | |||
533 | --- loco_directory/templates/teams/team_update.html 2010-06-24 19:18:57 +0000 | |||
534 | +++ loco_directory/templates/teams/team_update.html 2010-08-17 00:32:40 +0000 | |||
535 | @@ -4,8 +4,8 @@ | |||
536 | 4 | {% block title %}{{ team.name }}{% endblock %} | 4 | {% block title %}{{ team.name }}{% endblock %} |
537 | 5 | 5 | ||
538 | 6 | {% block sub_nav_links %} | 6 | {% block sub_nav_links %} |
541 | 7 | <a class="sub-nav-item" href="/teams">{% trans "Go back to Team list." %}</a> | 7 | <a class="sub-nav-item" href="/teams">{% trans "Back to Teams List" %}</a> |
542 | 8 | <a class="sub-nav-item" href="/teams/{{ team.lp_name }}">{% trans "Go back to team details." %}</a> | 8 | <a class="sub-nav-item" href="/teams/{{ team.lp_name }}">{% trans "Back to Team Details" %}</a> |
543 | 9 | {% endblock %} | 9 | {% endblock %} |
544 | 10 | 10 | ||
545 | 11 | {% block content %} | 11 | {% block content %} |
546 | 12 | 12 | ||
547 | === modified file 'loco_directory/templates/venues/venue_detail.html' | |||
548 | --- loco_directory/templates/venues/venue_detail.html 2010-08-04 13:02:45 +0000 | |||
549 | +++ loco_directory/templates/venues/venue_detail.html 2010-08-17 00:32:40 +0000 | |||
550 | @@ -12,9 +12,9 @@ | |||
551 | 12 | {% endblock %} | 12 | {% endblock %} |
552 | 13 | 13 | ||
553 | 14 | {% block sub_nav_links %} | 14 | {% block sub_nav_links %} |
555 | 15 | <a class="sub-nav-item" href="{% url venue-list %}" >{% trans "Go back to Venue list" %}</a> | 15 | <a class="sub-nav-item" href="{% url venue-list %}" >{% trans "Back to Venues List" %}</a> |
556 | 16 | {% if user.is_authenticated %} | 16 | {% if user.is_authenticated %} |
558 | 17 | <a class="sub-nav-item" href="{% url venue-update venue_object.id %}">{% trans "Edit venue details" %}</a> | 17 | <a class="sub-nav-item" href="{% url venue-update venue_object.id %}">{% trans "Edit Venue Details" %}</a> |
559 | 18 | {% endif %} | 18 | {% endif %} |
560 | 19 | {% endblock %} | 19 | {% endblock %} |
561 | 20 | 20 | ||
562 | 21 | 21 | ||
563 | === modified file 'loco_directory/templates/venues/venue_list.html' | |||
564 | --- loco_directory/templates/venues/venue_list.html 2010-08-02 12:43:32 +0000 | |||
565 | +++ loco_directory/templates/venues/venue_list.html 2010-08-17 00:32:40 +0000 | |||
566 | @@ -5,7 +5,7 @@ | |||
567 | 5 | 5 | ||
568 | 6 | {% block sub_nav_links %} | 6 | {% block sub_nav_links %} |
569 | 7 | {% if user.is_authenticated %} | 7 | {% if user.is_authenticated %} |
571 | 8 | <a class="sub-nav-item" href="{% url venue-new %}">{% trans "Add new venue" %}</a> | 8 | <a class="sub-nav-item" href="{% url venue-new %}">{% trans "Add New Venue" %}</a> |
572 | 9 | {% endif %} | 9 | {% endif %} |
573 | 10 | {% endblock %} | 10 | {% endblock %} |
574 | 11 | 11 | ||
575 | 12 | 12 | ||
576 | === modified file 'loco_directory/urls.py' | |||
577 | --- loco_directory/urls.py 2010-07-28 15:39:37 +0000 | |||
578 | +++ loco_directory/urls.py 2010-08-17 00:32:40 +0000 | |||
579 | @@ -13,8 +13,8 @@ | |||
580 | 13 | url(r'^admin/(.*)', admin.site.root), | 13 | url(r'^admin/(.*)', admin.site.root), |
581 | 14 | url(r'^data/xml', 'teams.views.xml_team_data', name='xml_team_data'), | 14 | url(r'^data/xml', 'teams.views.xml_team_data', name='xml_team_data'), |
582 | 15 | url(r'^teams/', include('teams.urls')), | 15 | url(r'^teams/', include('teams.urls')), |
583 | 16 | url(r'^events/venues/', include('venues.urls')), | ||
584 | 16 | url(r'^events/', include('events.urls')), | 17 | url(r'^events/', include('events.urls')), |
585 | 17 | url(r'^venues/', include('venues.urls')), | ||
586 | 18 | url(r'^loco-council/$', 'common.views.loco_council', name='loco_council'), | 18 | url(r'^loco-council/$', 'common.views.loco_council', name='loco_council'), |
587 | 19 | url(r'^loco-council/reapprovals$', 'teams.views.reapprovals', name='reapprovals'), | 19 | url(r'^loco-council/reapprovals$', 'teams.views.reapprovals', name='reapprovals'), |
588 | 20 | url(r'^logout$', 'common.views.site_logout'), | 20 | url(r'^logout$', 'common.views.site_logout'), |