Merge lp:~dholbach/loco-team-portal/loco-council into lp:~ltp-devs/loco-team-portal/0.1

Proposed by Daniel Holbach
Status: Merged
Merged at revision: not available
Proposed branch: lp:~dholbach/loco-team-portal/loco-council
Merge into: lp:~ltp-devs/loco-team-portal/0.1
Diff against target: None lines
To merge this branch: bzr merge lp:~dholbach/loco-team-portal/loco-council
Reviewer Review Type Date Requested Status
Efrain Valles Approve
Review via email: mp+7930@code.launchpad.net
To post a comment you must log in.
66. By Daniel Holbach

update installation instructions

Revision history for this message
Efrain Valles (effie-jayx) wrote :

All changes are good

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory 'loco_directory/locale/cs'
2=== added directory 'loco_directory/locale/cs/LC_MESSAGES'
3=== added file 'loco_directory/locale/cs/LC_MESSAGES/django.po'
4--- loco_directory/locale/cs/LC_MESSAGES/django.po 1970-01-01 00:00:00 +0000
5+++ loco_directory/locale/cs/LC_MESSAGES/django.po 2009-06-26 08:52:53 +0000
6@@ -0,0 +1,209 @@
7+# Czech translation for loco-directory
8+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
9+# This file is distributed under the same license as the loco-directory package.
10+# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
11+#
12+msgid ""
13+msgstr ""
14+"Project-Id-Version: loco-directory\n"
15+"Report-Msgid-Bugs-To: \n"
16+"POT-Creation-Date: 2009-06-26 08:42+0000\n"
17+"PO-Revision-Date: 2009-06-16 19:57+0000\n"
18+"Last-Translator: Vojtěch Trefný <vojtech.trefny@gmail.com>\n"
19+"Language-Team: Czech <cs@li.org>\n"
20+"MIME-Version: 1.0\n"
21+"Content-Type: text/plain; charset=UTF-8\n"
22+"Content-Transfer-Encoding: 8bit\n"
23+"X-Launchpad-Export-Date: 2009-06-26 08:12+0000\n"
24+"X-Generator: Launchpad (build Unknown)\n"
25+
26+#: teams/models.py:13
27+msgid "Launchpad ID"
28+msgstr "Launchpad ID"
29+
30+#: teams/models.py:38
31+msgid "Launchpad Team ID"
32+msgstr ""
33+
34+#: teams/models.py:40
35+msgid "Team Name"
36+msgstr "Název týmu"
37+
38+#: teams/models.py:41 templates/teams/team_detail.html:12
39+msgid "Country"
40+msgstr "Stát"
41+
42+#: teams/models.py:42 templates/teams/team_detail.html:14
43+msgid "State/Province/Region"
44+msgstr "Stát/Provincie/Region"
45+
46+#: teams/models.py:43 templates/teams/team_detail.html:17
47+msgid "City"
48+msgstr "Město"
49+
50+#: teams/models.py:44
51+msgid "Ubuntu Wiki Page"
52+msgstr "Stránka na Ubuntu Wiki"
53+
54+#: teams/models.py:45
55+msgid "Website"
56+msgstr "Webová stránka"
57+
58+#: teams/models.py:46 templates/teams/team_detail.html:29
59+msgid "Mailing List URL"
60+msgstr "Adresa poštovní konference"
61+
62+#: teams/models.py:47 templates/teams/team_detail.html:35
63+msgid "Forums URL"
64+msgstr "Adresa fóra"
65+
66+#: teams/models.py:48 templates/teams/team_detail.html:32
67+msgid "Email Address"
68+msgstr "Emailová adresa"
69+
70+#: teams/models.py:49 templates/teams/team_detail.html:26
71+msgid "IRC Channel"
72+msgstr "IRC kanál"
73+
74+#: teams/models.py:53
75+msgid "Provides local support"
76+msgstr "Poskytuje místní podporu"
77+
78+#: teams/models.py:55
79+msgid "Approved Team"
80+msgstr "Schválený tým"
81+
82+#: teams/models.py:56 templates/teams/team_detail.html:45
83+msgid "Date Approved"
84+msgstr "Datum schválení"
85+
86+#: teams/models.py:57 templates/teams/team_detail.html:46
87+msgid "Date Expires"
88+msgstr ""
89+
90+#: teams/views.py:48
91+msgid "Team details updated."
92+msgstr ""
93+
94+#: teams/views.py:50
95+msgid "Team details could not be saved."
96+msgstr ""
97+
98+#: templates/base.html:7 templates/index.html:4 templates/index.html.py:10
99+msgid "Ubuntu LoCo Team Directory"
100+msgstr "Adresář místních komunit Ubuntu"
101+
102+#: templates/base.html:41 templates/index.html:32
103+msgid "Translated by:"
104+msgstr "Přeložili:"
105+
106+#: templates/index.html:14
107+msgid "Teams"
108+msgstr "Týmy"
109+
110+#: templates/index.html:15
111+msgid ""
112+"List of all Ubuntu LoCo Teams, with full information such as contact, web "
113+"pages, mailing list, and more."
114+msgstr ""
115+"Seznam všech místních komunit Ubuntu se všemi potřebnými informacemi jako "
116+"kontakt, webové stránky, poštovní konference a další."
117+
118+#: templates/index.html:16
119+msgid ""
120+"If there are no teams in your country/region/area, you will be able to add a "
121+"team in the near future."
122+msgstr ""
123+"Pokud ve vaší zemi/regionu/oblasti nejsou žádné týmy, bude moci přidat nový "
124+"tým později."
125+
126+#: templates/index.html:20
127+msgid "Coming Soon!"
128+msgstr "Již brzy!"
129+
130+#: templates/index.html:21
131+msgid "Future additions to this site will include:"
132+msgstr ""
133+
134+#: templates/teams/team_detail.html:8 templates/teams/team_update.html:8
135+msgid "Go back to Team list."
136+msgstr ""
137+
138+#: templates/teams/team_detail.html:11
139+msgid "Location Information"
140+msgstr ""
141+
142+#: templates/teams/team_detail.html:19
143+msgid "Contact Information"
144+msgstr "Kontaktní informace"
145+
146+#: templates/teams/team_detail.html:23
147+msgid "Team Information"
148+msgstr ""
149+
150+#: templates/teams/team_detail.html:24
151+msgid "Wiki URL"
152+msgstr "Wiki URL"
153+
154+#: templates/teams/team_detail.html:38
155+msgid "Web Site URL"
156+msgstr ""
157+
158+#: templates/teams/team_detail.html:40
159+msgid "Provides Support"
160+msgstr ""
161+
162+#: templates/teams/team_detail.html:41 templates/teams/team_detail.html:43
163+msgid "Yes"
164+msgstr "Ano"
165+
166+#: templates/teams/team_detail.html:41 templates/teams/team_detail.html:43
167+msgid "No"
168+msgstr "Ne"
169+
170+#: templates/teams/team_detail.html:42
171+msgid "Approved"
172+msgstr "Schválený"
173+
174+#: templates/teams/team_list.html:4
175+msgid "Ubuntu LoCo Teams List"
176+msgstr ""
177+
178+#: templates/teams/team_list.html:9
179+msgid "Ubuntu LoCo Teams"
180+msgstr ""
181+
182+#: templates/teams/team_list.html:13
183+msgid "Select a team below to see more information about it:"
184+msgstr ""
185+
186+#: templates/teams/team_list.html:38
187+msgid "There are currently no teams in the Ubuntu LoCo Directory. :("
188+msgstr ""
189+
190+#: templates/teams/team_reapprovals.html:4
191+#: templates/teams/team_reapprovals.html:9
192+msgid "Ubuntu LoCo Team Approvals List"
193+msgstr ""
194+
195+#: templates/teams/team_reapprovals.html:25
196+msgid "There are currently no approved teams in the Ubuntu LoCo Directory. :("
197+msgstr ""
198+
199+#: templates/teams/team_update.html:16
200+msgid "Please correct the error"
201+msgstr ""
202+
203+#: templates/teams/team_update.html:21
204+msgid "Update the information below:"
205+msgstr ""
206+
207+#: templates/teams/team_update.html:26
208+msgid "Update Information Now!"
209+msgstr ""
210+
211+#~ msgid "Launchpad URL"
212+#~ msgstr "Launchpad URL"
213+
214+#~ msgid "You're not logged in."
215+#~ msgstr "Nejste přihlášen."
216
217=== added directory 'loco_directory/locale/de'
218=== added directory 'loco_directory/locale/de/LC_MESSAGES'
219=== added file 'loco_directory/locale/de/LC_MESSAGES/django.po'
220--- loco_directory/locale/de/LC_MESSAGES/django.po 1970-01-01 00:00:00 +0000
221+++ loco_directory/locale/de/LC_MESSAGES/django.po 2009-06-26 08:52:53 +0000
222@@ -0,0 +1,199 @@
223+# German translation for loco-directory
224+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
225+# This file is distributed under the same license as the loco-directory package.
226+# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
227+#
228+msgid ""
229+msgstr ""
230+"Project-Id-Version: loco-directory\n"
231+"Report-Msgid-Bugs-To: \n"
232+"POT-Creation-Date: 2009-06-26 08:42+0000\n"
233+"PO-Revision-Date: 2009-06-19 08:03+0000\n"
234+"Last-Translator: Daniel Holbach <daniel.holbach@ubuntu.com>\n"
235+"Language-Team: German <de@li.org>\n"
236+"MIME-Version: 1.0\n"
237+"Content-Type: text/plain; charset=UTF-8\n"
238+"Content-Transfer-Encoding: 8bit\n"
239+"X-Launchpad-Export-Date: 2009-06-26 08:12+0000\n"
240+"X-Generator: Launchpad (build Unknown)\n"
241+
242+#: teams/models.py:13
243+msgid "Launchpad ID"
244+msgstr ""
245+
246+#: teams/models.py:38
247+msgid "Launchpad Team ID"
248+msgstr ""
249+
250+#: teams/models.py:40
251+msgid "Team Name"
252+msgstr ""
253+
254+#: teams/models.py:41 templates/teams/team_detail.html:12
255+msgid "Country"
256+msgstr "Land"
257+
258+#: teams/models.py:42 templates/teams/team_detail.html:14
259+msgid "State/Province/Region"
260+msgstr "Bundesland/Provinz/Region"
261+
262+#: teams/models.py:43 templates/teams/team_detail.html:17
263+msgid "City"
264+msgstr "Stadt"
265+
266+#: teams/models.py:44
267+msgid "Ubuntu Wiki Page"
268+msgstr "Ubuntu Wiki Seite"
269+
270+#: teams/models.py:45
271+msgid "Website"
272+msgstr "Webseite"
273+
274+#: teams/models.py:46 templates/teams/team_detail.html:29
275+msgid "Mailing List URL"
276+msgstr "Mailinglisten-URL"
277+
278+#: teams/models.py:47 templates/teams/team_detail.html:35
279+msgid "Forums URL"
280+msgstr "Forum URL"
281+
282+#: teams/models.py:48 templates/teams/team_detail.html:32
283+msgid "Email Address"
284+msgstr "Email-Adresse"
285+
286+#: teams/models.py:49 templates/teams/team_detail.html:26
287+msgid "IRC Channel"
288+msgstr "IRC Kanal"
289+
290+#: teams/models.py:53
291+msgid "Provides local support"
292+msgstr "Bietet lokalen Support an"
293+
294+#: teams/models.py:55
295+msgid "Approved Team"
296+msgstr "Anerkanntes Team"
297+
298+#: teams/models.py:56 templates/teams/team_detail.html:45
299+msgid "Date Approved"
300+msgstr ""
301+
302+#: teams/models.py:57 templates/teams/team_detail.html:46
303+msgid "Date Expires"
304+msgstr ""
305+
306+#: teams/views.py:48
307+msgid "Team details updated."
308+msgstr ""
309+
310+#: teams/views.py:50
311+msgid "Team details could not be saved."
312+msgstr ""
313+
314+#: templates/base.html:7 templates/index.html:4 templates/index.html.py:10
315+msgid "Ubuntu LoCo Team Directory"
316+msgstr ""
317+
318+#: templates/base.html:41 templates/index.html:32
319+msgid "Translated by:"
320+msgstr ""
321+
322+#: templates/index.html:14
323+msgid "Teams"
324+msgstr ""
325+
326+#: templates/index.html:15
327+msgid ""
328+"List of all Ubuntu LoCo Teams, with full information such as contact, web "
329+"pages, mailing list, and more."
330+msgstr ""
331+
332+#: templates/index.html:16
333+msgid ""
334+"If there are no teams in your country/region/area, you will be able to add a "
335+"team in the near future."
336+msgstr ""
337+
338+#: templates/index.html:20
339+msgid "Coming Soon!"
340+msgstr ""
341+
342+#: templates/index.html:21
343+msgid "Future additions to this site will include:"
344+msgstr ""
345+
346+#: templates/teams/team_detail.html:8 templates/teams/team_update.html:8
347+msgid "Go back to Team list."
348+msgstr ""
349+
350+#: templates/teams/team_detail.html:11
351+msgid "Location Information"
352+msgstr "Standort-Information"
353+
354+#: templates/teams/team_detail.html:19
355+msgid "Contact Information"
356+msgstr ""
357+
358+#: templates/teams/team_detail.html:23
359+msgid "Team Information"
360+msgstr ""
361+
362+#: templates/teams/team_detail.html:24
363+msgid "Wiki URL"
364+msgstr ""
365+
366+#: templates/teams/team_detail.html:38
367+msgid "Web Site URL"
368+msgstr ""
369+
370+#: templates/teams/team_detail.html:40
371+msgid "Provides Support"
372+msgstr ""
373+
374+#: templates/teams/team_detail.html:41 templates/teams/team_detail.html:43
375+msgid "Yes"
376+msgstr "Ja"
377+
378+#: templates/teams/team_detail.html:41 templates/teams/team_detail.html:43
379+msgid "No"
380+msgstr "Nein"
381+
382+#: templates/teams/team_detail.html:42
383+msgid "Approved"
384+msgstr "Anerkannt"
385+
386+#: templates/teams/team_list.html:4
387+msgid "Ubuntu LoCo Teams List"
388+msgstr ""
389+
390+#: templates/teams/team_list.html:9
391+msgid "Ubuntu LoCo Teams"
392+msgstr ""
393+
394+#: templates/teams/team_list.html:13
395+msgid "Select a team below to see more information about it:"
396+msgstr ""
397+
398+#: templates/teams/team_list.html:38
399+msgid "There are currently no teams in the Ubuntu LoCo Directory. :("
400+msgstr ""
401+
402+#: templates/teams/team_reapprovals.html:4
403+#: templates/teams/team_reapprovals.html:9
404+msgid "Ubuntu LoCo Team Approvals List"
405+msgstr ""
406+
407+#: templates/teams/team_reapprovals.html:25
408+msgid "There are currently no approved teams in the Ubuntu LoCo Directory. :("
409+msgstr ""
410+
411+#: templates/teams/team_update.html:16
412+msgid "Please correct the error"
413+msgstr ""
414+
415+#: templates/teams/team_update.html:21
416+msgid "Update the information below:"
417+msgstr ""
418+
419+#: templates/teams/team_update.html:26
420+msgid "Update Information Now!"
421+msgstr ""
422
423=== modified file 'loco_directory/locale/loco-directory.pot'
424--- loco_directory/locale/loco-directory.pot 2009-06-24 09:48:57 +0000
425+++ loco_directory/locale/loco-directory.pot 2009-06-25 11:08:57 +0000
426@@ -8,7 +8,7 @@
427 msgstr ""
428 "Project-Id-Version: PACKAGE VERSION\n"
429 "Report-Msgid-Bugs-To: \n"
430-"POT-Creation-Date: 2009-06-24 09:47+0000\n"
431+"POT-Creation-Date: 2009-06-25 11:08+0000\n"
432 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
433 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
434 "Language-Team: LANGUAGE <LL@li.org>\n"
435@@ -28,15 +28,15 @@
436 msgid "Team Name"
437 msgstr ""
438
439-#: teams/models.py:41 templates/teams/team_detail.html:19
440+#: teams/models.py:41 templates/teams/team_detail.html:12
441 msgid "Country"
442 msgstr ""
443
444-#: teams/models.py:42 templates/teams/team_detail.html:21
445+#: teams/models.py:42 templates/teams/team_detail.html:14
446 msgid "State/Province/Region"
447 msgstr ""
448
449-#: teams/models.py:43 templates/teams/team_detail.html:24
450+#: teams/models.py:43 templates/teams/team_detail.html:17
451 msgid "City"
452 msgstr ""
453
454@@ -48,19 +48,19 @@
455 msgid "Website"
456 msgstr ""
457
458-#: teams/models.py:46 templates/teams/team_detail.html:37
459+#: teams/models.py:46 templates/teams/team_detail.html:29
460 msgid "Mailing List URL"
461 msgstr ""
462
463-#: teams/models.py:47 templates/teams/team_detail.html:43
464+#: teams/models.py:47 templates/teams/team_detail.html:35
465 msgid "Forums URL"
466 msgstr ""
467
468-#: teams/models.py:48 templates/teams/team_detail.html:40
469+#: teams/models.py:48 templates/teams/team_detail.html:32
470 msgid "Email Address"
471 msgstr ""
472
473-#: teams/models.py:49 templates/teams/team_detail.html:34
474+#: teams/models.py:49 templates/teams/team_detail.html:26
475 msgid "IRC Channel"
476 msgstr ""
477
478@@ -72,19 +72,19 @@
479 msgid "Approved Team"
480 msgstr ""
481
482-#: teams/models.py:56 templates/teams/team_detail.html:53
483+#: teams/models.py:56 templates/teams/team_detail.html:45
484 msgid "Date Approved"
485 msgstr ""
486
487-#: teams/models.py:57 templates/teams/team_detail.html:54
488+#: teams/models.py:57 templates/teams/team_detail.html:46
489 msgid "Date Expires"
490 msgstr ""
491
492-#: teams/views.py:44
493+#: teams/views.py:48
494 msgid "Team details updated."
495 msgstr ""
496
497-#: teams/views.py:46
498+#: teams/views.py:50
499 msgid "Team details could not be saved."
500 msgstr ""
501
502@@ -120,47 +120,43 @@
503 msgid "Future additions to this site will include:"
504 msgstr ""
505
506+#: templates/teams/team_detail.html:8 templates/teams/team_update.html:8
507+msgid "Go back to Team list."
508+msgstr ""
509+
510 #: templates/teams/team_detail.html:11
511-msgid "Update Team Information"
512-msgstr ""
513-
514-#: templates/teams/team_detail.html:18
515 msgid "Location Information"
516 msgstr ""
517
518-#: templates/teams/team_detail.html:26
519+#: templates/teams/team_detail.html:19
520 msgid "Contact Information"
521 msgstr ""
522
523-#: templates/teams/team_detail.html:30
524+#: templates/teams/team_detail.html:23
525 msgid "Team Information"
526 msgstr ""
527
528-#: templates/teams/team_detail.html:31
529-msgid "Launchpad URL"
530-msgstr ""
531-
532-#: templates/teams/team_detail.html:32
533+#: templates/teams/team_detail.html:24
534 msgid "Wiki URL"
535 msgstr ""
536
537-#: templates/teams/team_detail.html:46
538+#: templates/teams/team_detail.html:38
539 msgid "Web Site URL"
540 msgstr ""
541
542-#: templates/teams/team_detail.html:48
543+#: templates/teams/team_detail.html:40
544 msgid "Provides Support"
545 msgstr ""
546
547-#: templates/teams/team_detail.html:49 templates/teams/team_detail.html:51
548+#: templates/teams/team_detail.html:41 templates/teams/team_detail.html:43
549 msgid "Yes"
550 msgstr ""
551
552-#: templates/teams/team_detail.html:49 templates/teams/team_detail.html:51
553+#: templates/teams/team_detail.html:41 templates/teams/team_detail.html:43
554 msgid "No"
555 msgstr ""
556
557-#: templates/teams/team_detail.html:50
558+#: templates/teams/team_detail.html:42
559 msgid "Approved"
560 msgstr ""
561
562@@ -189,18 +185,14 @@
563 msgid "There are currently no approved teams in the Ubuntu LoCo Directory. :("
564 msgstr ""
565
566-#: templates/teams/team_update.html:17
567+#: templates/teams/team_update.html:16
568 msgid "Please correct the error"
569 msgstr ""
570
571-#: templates/teams/team_update.html:22
572+#: templates/teams/team_update.html:21
573 msgid "Update the information below:"
574 msgstr ""
575
576-#: templates/teams/team_update.html:27
577+#: templates/teams/team_update.html:26
578 msgid "Update Information Now!"
579 msgstr ""
580-
581-#: templates/teams/team_update.html:32
582-msgid "You're not logged in."
583-msgstr ""
584
585=== modified file 'loco_directory/settings.py'
586--- loco_directory/settings.py 2009-06-18 14:10:11 +0000
587+++ loco_directory/settings.py 2009-06-26 08:52:53 +0000
588@@ -9,7 +9,7 @@
589 STATIC_SERVE = True
590
591 ADMINS = (
592- ('Rich Johnson', 'nixternal@ubuntu.com'),
593+ ('Ubuntu LoCo Council', 'loco-council@lists.ubuntu.com'),
594 )
595
596 MANAGERS = ADMINS
597@@ -63,6 +63,7 @@
598
599 MIDDLEWARE_CLASSES = (
600 'django.middleware.common.CommonMiddleware',
601+ 'django.middleware.locale.LocaleMiddleware',
602 'django.contrib.sessions.middleware.SessionMiddleware',
603 'django.contrib.auth.middleware.AuthenticationMiddleware',
604 )
605
606=== modified file 'loco_directory/teams/forms.py'
607--- loco_directory/teams/forms.py 2009-06-24 09:36:05 +0000
608+++ loco_directory/teams/forms.py 2009-06-25 15:33:29 +0000
609@@ -11,9 +11,9 @@
610 class Meta:
611 model = TeamContact
612
613-class UpdateTeamForm(forms.ModelForm):
614+class TeamForm(forms.ModelForm):
615 def __init__(self, *args, **kwargs):
616- super(UpdateTeamForm, self).__init__(*args, **kwargs)
617+ super(TeamForm, self).__init__(*args, **kwargs)
618
619 team = self.instance
620
621@@ -35,4 +35,11 @@
622
623 class Meta:
624 model = Team
625- exclude = ('approved', 'approved_date', 'expires_date')
626+
627+class UpdateTeamForm(TeamForm):
628+ class Meta(TeamForm.Meta):
629+ exclude = ('approved', 'approved_date', 'expires_date', 'contact')
630+
631+class LoCoCouncilForm(TeamForm):
632+ class Meta(TeamForm.Meta):
633+ exclude = ('approved', 'expires_date')
634
635=== modified file 'loco_directory/teams/views.py'
636--- loco_directory/teams/views.py 2009-06-24 09:48:57 +0000
637+++ loco_directory/teams/views.py 2009-06-25 11:30:05 +0000
638@@ -37,6 +37,10 @@
639 'pageSection': 'teams',
640 'team': team,
641 }
642+ if request.user == 'AnonymousUser' or \
643+ not launchpad.is_user_team_admin(request.user, team.lp_name):
644+ return render('teams/team_detail.html', context, context_instance=RequestContext(request))
645+
646 if request.method == "POST":
647 updateForm = forms.UpdateTeamForm(data=request.POST,instance=team)
648 if updateForm.is_valid():
649@@ -49,9 +53,8 @@
650 'team':team,
651 'user':request.user,
652 'message':message })
653+ if launchpad.is_user_on_loco_council(request.user):
654+ form = forms.LoCoCouncilForm(instance=team)
655 else:
656- if request.path.endswith('team_update.html'):
657- if request.user != 'AnonymousUser' and \
658- launchpad.is_user_team_admin(request.user, team.lp_name):
659- return render('teams/team_update.html', {'form': forms.UpdateTeamForm(instance=team),'team':team, 'user':request.user })
660- return render('teams/team_detail.html', context, context_instance=RequestContext(request))
661+ form = forms.UpdateTeamForm(instance=team)
662+ return render('teams/team_update.html', {'form': form, 'team':team, 'user':request.user })
663
664=== modified file 'loco_directory/templates/teams/team_detail.html'
665--- loco_directory/templates/teams/team_detail.html 2009-06-19 12:32:22 +0000
666+++ loco_directory/templates/teams/team_detail.html 2009-06-25 11:08:57 +0000
667@@ -4,16 +4,9 @@
668 {% block title %}{% trans team.name %}{% endblock %}
669
670 {% block content %}
671-{% if user.is_authenticated %}
672-<p>Are you the owner or administrator of this team? If so and you would like to
673-update the information for {% trans team.name %}, press the update button.</p>
674-<form name="update">
675-<input type="button" value='{% trans "Update Team Information" %}' onclick="window.location='/teams/{{ team.name }}/team_update.html'">
676-</form>
677-{% endif %}
678 <div class="team_detail">
679-
680-<h2>{% trans team.name %}</h2>
681+<p><b><a href="/teams">{% trans "Go back to Team list." %}</a></b></p>
682+<h2><a href="https://launchpad.net/~{{ team.lp_name }}">{% trans team.name %}</a></h2>
683 <table cellpadding="0" cellspacing="0">
684 <tr><th colspan="2">{% trans "Location Information" %}</th></tr>
685 <tr><td width="35%"><strong>{% trans "Country" %}</strong></td><td>{% trans team.country %}</td></tr>
686@@ -28,7 +21,6 @@
687 <tr><td><strong>Contact</strong></td><td><a href="https://launchpad.net/~{{ contact.lpid }}">{{ contact.lpid }}</a></td></tr>
688 {% endfor %}
689 <tr><th colspan="2">{% trans "Team Information" %}</th></tr>
690-<tr><td><strong>{% trans "Launchpad URL" %}</strong></td><td><a href="{{ team.lp_url }}">{{ team.lp_url }}</a></td></tr>
691 <tr><td><strong>{% trans "Wiki URL" %}</strong></td><td><a href="{{ team.wiki_url }}">{{ team.wiki_url }}</a></td></tr>
692 {% if team.irc %}
693 <tr><td><strong>{% trans "IRC Channel" %}</strong></td><td>{{ team.irc }}</td></tr>
694
695=== modified file 'loco_directory/templates/teams/team_update.html'
696--- loco_directory/templates/teams/team_update.html 2009-06-22 04:25:03 +0000
697+++ loco_directory/templates/teams/team_update.html 2009-06-25 10:45:16 +0000
698@@ -5,9 +5,8 @@
699
700 {% block content %}
701
702-<!-- need different kind of test (user.is_team_admin or something) -->
703-{% if user.is_authenticated %}
704- <div id="form">
705+<p><b><a href="/teams">{% trans "Go back to Team list." %}</a></b></p>
706+<div id="form">
707 {% if message %}
708 <p> {{ message }}
709 {% endif %}
710@@ -26,11 +25,6 @@
711 <br />
712 <input type="submit" value='{% trans "Update Information Now!" %}' />
713 </form>
714- </div>
715-{% else %}
716- <div id="form">
717- <p>{% trans "You're not logged in." %}</p>
718- </div>
719-{% endif %}
720+</div>
721
722 {% endblock %}

Subscribers

People subscribed via source and target branches