LoCo Team Portal

Merge lp:~mhall119/loco-team-portal/mainpage-map into lp:loco-team-portal

  1. mainpage-map
  2. Merge into 0.2
Proposed by Michael Hall
Status: Merged
Merged at revision: 240
Proposed branch: lp:~mhall119/loco-team-portal/mainpage-map
Merge into: lp:loco-team-portal
Diff against target: 433 lines (+196/-38)
5 files modified
EXTERNALS (+2/-0)
loco_directory/locale/loco-directory.pot (+41/-37)
loco_directory/media/css/continents.css (+124/-0)
loco_directory/templates/index.html (+28/-0)
loco_directory/templates/teams/team_list.html (+1/-1)
To merge this branch: bzr merge lp:~mhall119/loco-team-portal/mainpage-map
Reviewer Review Type Date Requested Status
Daniel Holbach (community) Approve
Review via email: mp+32883@code.launchpad.net

Description of the change

Adds a clickable continent map to the mainpage that will take you to that continent's section of the teams list.

To post a comment you must log in.
Revision history for this message
Michael Hall (mhall119) wrote :

You can see what it looks like here: http://img842.imageshack.us/f/ldmap.png/

On hover it turns the continent gray and shows it's name.

Revision history for this message
Daniel Holbach (dholbach) wrote :

Can you add a note to EXTERNALS or somewhere else where we got the picture from? Once that's done, I'm happy to get it in

review: Approve
Revision history for this message
Michael Hall (mhall119) wrote :

I'll have to ask Daker where he got it from.

Revision history for this message
Michael Hall (mhall119) wrote :

Added attribution to EXTERNALS in rev 242

lp:~mhall119/loco-team-portal/mainpage-map updated
242. By Michael Hall

Added attribution for map image and css to EXTERNALS

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'EXTERNALS'
--- EXTERNALS 2010-02-17 15:32:25 +0000
+++ EXTERNALS 2010-08-17 18:02:39 +0000
@@ -3,3 +3,5 @@
3- the date picker is provided by the JQuery UI project. See http://jqueryui.com/ for more information about JQuery UI. (Use at least 1.7.2.)3- the date picker is provided by the JQuery UI project. See http://jqueryui.com/ for more information about JQuery UI. (Use at least 1.7.2.)
44
5- the time picker is provided by Maxime Haineault. See http://haineault.com/media/jquery/ui-timepickr/page/ for more information about the JQuery UI Timepicker.5- the time picker is provided by Maxime Haineault. See http://haineault.com/media/jquery/ui-timepickr/page/ for more information about the JQuery UI Timepicker.
6
7- the map image and corresponding CSS is provided by from http://www.noobcube.com/tutorials/html-css/css-image-maps-a-beginners-guide-/ under the GNU Free Documentation License.
68
=== modified file 'loco_directory/locale/loco-directory.pot'
--- loco_directory/locale/loco-directory.pot 2010-08-17 14:37:40 +0000
+++ loco_directory/locale/loco-directory.pot 2010-08-17 18:02:39 +0000
@@ -8,11 +8,10 @@
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-17 14:36+0000\n"11"POT-Creation-Date: 2010-08-17 15:10+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"
16"MIME-Version: 1.0\n"15"MIME-Version: 1.0\n"
17"Content-Type: text/plain; charset=UTF-8\n"16"Content-Type: text/plain; charset=UTF-8\n"
18"Content-Transfer-Encoding: 8bit\n"17"Content-Transfer-Encoding: 8bit\n"
@@ -136,71 +135,71 @@
136msgid "Additional Guests"135msgid "Additional Guests"
137msgstr ""136msgstr ""
138137
139#: events/views.py:139138#: events/views.py:146
140msgid "Team Event removed."139msgid "Team Event removed."
141msgstr ""140msgstr ""
142141
143#: events/views.py:146142#: events/views.py:153
144msgid ""143msgid ""
145"You can not remove this team event. You are not admin/owner of the Launchpad "144"You can not remove this team event. You are not admin/owner of the Launchpad "
146"team or on the LoCo Council."145"team or on the LoCo Council."
147msgstr ""146msgstr ""
148147
149#: events/views.py:153148#: events/views.py:160
150msgid ""149msgid ""
151"You can not add a new team event. You are not member of any of the LoCo "150"You can not add a new team event. You are not member of any of the LoCo "
152"Teams."151"Teams."
153msgstr ""152msgstr ""
154153
155#: events/views.py:205 events/views.py:243154#: events/views.py:212 events/views.py:250
156msgid "New event created."155msgid "New event created."
157msgstr ""156msgstr ""
158157
159#: events/views.py:221 events/views.py:256158#: events/views.py:228 events/views.py:263
160msgid ""159msgid ""
161"You can not add a new event for this team. You are not member of the team or "160"You can not add a new event for this team. You are not member of the team or "
162"on the LoCo Council."161"on the LoCo Council."
163msgstr ""162msgstr ""
164163
165#: events/views.py:279164#: events/views.py:286
166msgid "Team Event updated."165msgid "Team Event updated."
167msgstr ""166msgstr ""
168167
169#: events/views.py:290168#: events/views.py:297
170msgid ""169msgid ""
171"You can not update this team event. You are not member of the team or on the "170"You can not update this team event. You are not member of the team or on the "
172"LoCo Council."171"LoCo Council."
173msgstr ""172msgstr ""
174173
175#: events/views.py:308174#: events/views.py:315
176msgid "Your registration has been saved."175msgid "Your registration has been saved."
177msgstr ""176msgstr ""
178177
179#: events/views.py:339178#: events/views.py:346
180msgid "Comment saved."179msgid "Comment saved."
181msgstr ""180msgstr ""
182181
183#: events/views.py:407182#: events/views.py:414
184msgid "Global Event removed."183msgid "Global Event removed."
185msgstr ""184msgstr ""
186185
187#: events/views.py:413186#: events/views.py:420
188msgid "You can not remove this global event. You are not on the LoCo Council."187msgid "You can not remove this global event. You are not on the LoCo Council."
189msgstr ""188msgstr ""
190189
191#: events/views.py:427190#: events/views.py:434
192msgid "New Global Event created."191msgid "New Global Event created."
193msgstr ""192msgstr ""
194193
195#: events/views.py:438194#: events/views.py:445
196msgid "You can not add a new global event. You are not on the LoCo Council."195msgid "You can not add a new global event. You are not on the LoCo Council."
197msgstr ""196msgstr ""
198197
199#: events/views.py:454198#: events/views.py:461
200msgid "Global Event updated."199msgid "Global Event updated."
201msgstr ""200msgstr ""
202201
203#: events/views.py:465202#: events/views.py:472
204msgid "You can not update this global event. You are not on the LoCo Council."203msgid "You can not update this global event. You are not on the LoCo Council."
205msgstr ""204msgstr ""
206205
@@ -307,7 +306,7 @@
307msgstr ""306msgstr ""
308307
309#: templates/404.html:4 templates/500.html:4 templates/about.html:4308#: templates/404.html:4 templates/500.html:4 templates/about.html:4
310#: templates/base.html:4 templates/index.html:13 templates/loco_council.html:4309#: templates/base.html:4 templates/index.html:14 templates/loco_council.html:4
311msgid "Ubuntu LoCo Team Directory"310msgid "Ubuntu LoCo Team Directory"
312msgstr ""311msgstr ""
313312
@@ -458,7 +457,7 @@
458msgid "Show All Teams"457msgid "Show All Teams"
459msgstr ""458msgstr ""
460459
461#: templates/base.html:13 templates/index.html:15460#: templates/base.html:13 templates/index.html:16
462#: templates/events/team_event_list.inc.html:8461#: templates/events/team_event_list.inc.html:8
463msgid "Teams"462msgid "Teams"
464msgstr ""463msgstr ""
@@ -467,7 +466,7 @@
467msgid "Show All Events"466msgid "Show All Events"
468msgstr ""467msgstr ""
469468
470#: templates/base.html:14 templates/index.html:24469#: templates/base.html:14 templates/index.html:52
471msgid "Events"470msgid "Events"
472msgstr ""471msgstr ""
473472
@@ -503,61 +502,65 @@
503msgid "LoCo Directory"502msgid "LoCo Directory"
504msgstr ""503msgstr ""
505504
506#: templates/index.html:15505#: templates/index.html:16
507msgid "Show all Teams"506msgid "Show all Teams"
508msgstr ""507msgstr ""
509508
510#: templates/index.html:17509#: templates/index.html:18
511msgid ""510msgid ""
512"List of all Ubuntu LoCo Teams, with full information such as contact, web "511"List of all Ubuntu LoCo Teams, with full information such as contact, web "
513"pages, mailing list, and more."512"pages, mailing list, and more."
514msgstr ""513msgstr ""
515514
516#: templates/index.html:18515#: templates/index.html:19
517msgid ""516msgid ""
518"If there are no teams in your country/region/area, you will be able to add a "517"If there are no teams in your country/region/area, you will be able to add a "
519"team in the near future."518"team in the near future."
520msgstr ""519msgstr ""
521520
522#: templates/index.html:24521#: templates/index.html:20
522msgid "Select your continent below to find an Ubuntu LoCo Team near you."
523msgstr ""
524
525#: templates/index.html:52
523msgid "Show all Events"526msgid "Show all Events"
524msgstr ""527msgstr ""
525528
526#: templates/index.html:25529#: templates/index.html:53
527msgid ""530msgid ""
528"List of all Ubuntu LoCo Events, with full information such as location, "531"List of all Ubuntu LoCo Events, with full information such as location, "
529"attendees, teams, and more."532"attendees, teams, and more."
530msgstr ""533msgstr ""
531534
532#: templates/index.html:26535#: templates/index.html:54
533msgid "Upcoming Global Events"536msgid "Upcoming Global Events"
534msgstr ""537msgstr ""
535538
536#: templates/index.html:29 templates/events/event_list.html:29539#: templates/index.html:57 templates/events/event_list.html:29
537msgid "Global Events as ical"540msgid "Global Events as ical"
538msgstr ""541msgstr ""
539542
540#: templates/index.html:31 templates/events/event_list.html:31543#: templates/index.html:59 templates/events/event_list.html:31
541msgid "Select a global event below to see more information about it:"544msgid "Select a global event below to see more information about it:"
542msgstr ""545msgstr ""
543546
544#: templates/index.html:36 templates/events/event_list.html:36547#: templates/index.html:64 templates/events/event_list.html:36
545msgid "There are currently no LoCo Global Events"548msgid "There are currently no LoCo Global Events"
546msgstr ""549msgstr ""
547550
548#: templates/index.html:41551#: templates/index.html:69
549msgid "Upcoming Team Events"552msgid "Upcoming Team Events"
550msgstr ""553msgstr ""
551554
552#: templates/index.html:43 templates/events/event_list.html:46555#: templates/index.html:71 templates/events/event_list.html:46
553msgid "Team Events as ical"556msgid "Team Events as ical"
554msgstr ""557msgstr ""
555558
556#: templates/index.html:45 templates/events/event_list.html:52559#: templates/index.html:73 templates/events/event_list.html:52
557msgid "There are currently no LoCo Team Events"560msgid "There are currently no LoCo Team Events"
558msgstr ""561msgstr ""
559562
560#: templates/index.html:50 templates/events/global_event_detail.inc.html:11563#: templates/index.html:78 templates/events/global_event_detail.inc.html:11
561msgid "Microblogging"564msgid "Microblogging"
562msgstr ""565msgstr ""
563566
@@ -855,6 +858,11 @@
855msgid "Copy Event"858msgid "Copy Event"
856msgstr ""859msgstr ""
857860
861#: templates/events/team_event_detail.html:17
862#: templates/teams/team_detail.html:110
863msgid "iCal Feed"
864msgstr ""
865
858#: templates/events/team_event_detail.inc.html:14866#: templates/events/team_event_detail.inc.html:14
859msgid "Details"867msgid "Details"
860msgstr ""868msgstr ""
@@ -1085,10 +1093,6 @@
1085msgid "RSS Feed"1093msgid "RSS Feed"
1086msgstr ""1094msgstr ""
10871095
1088#: templates/teams/team_detail.html:110
1089msgid "iCal Feed"
1090msgstr ""
1091
1092#: templates/teams/team_detail.html:1171096#: templates/teams/team_detail.html:117
1093#, python-format1097#, python-format
1094msgid "%(start_date)s in %(city)s"1098msgid "%(start_date)s in %(city)s"
10951099
=== added file 'loco_directory/media/css/continents.css'
--- loco_directory/media/css/continents.css 1970-01-01 00:00:00 +0000
+++ loco_directory/media/css/continents.css 2010-08-17 18:02:39 +0000
@@ -0,0 +1,124 @@
1/* Continents */
2ul#continents {
3 list-style: none;
4 background: url(../images/map.png) no-repeat 0 0;
5 position: relative;
6 width: 580px;
7 height: 268px;
8 margin: 0 auto;
9 padding: 0;
10}
11
12ul#continents li {
13 position: absolute;
14}
15
16ul#continents li a{
17 display: block;
18 height: 100%;
19 text-decoration: none;
20}
21
22#northamerica {
23 width: 227px;
24 height: 142px;
25 top: 2px;
26 left: 0px;
27}
28
29#southamerica {
30 width: 108px;
31 height: 130px;
32 top: 131px;
33 left: 76px;
34}
35
36#africa {
37 width: 120px;
38 height: 140px;
39 top: 83px;
40 left: 209px;
41}
42
43#europe {
44 width: 120px;
45 height: 84px;
46 top: 1px;
47 left: 211px;
48}
49
50#asia {
51 width: 215px;
52 height: 175px;
53 top: 1px;
54 left: 283px;
55}
56
57#australia {
58 width: 114px;
59 height: 95px;
60 top: 152px;
61 left: 432px;
62}
63
64ul#continents li a:hover {
65 background: url(../images/map.png) no-repeat 0 0;
66}
67
68ul#continents li#northamerica a:hover {
69 background-position: 0 -270px;
70}
71
72ul#continents li#southamerica a:hover {
73 background-position: -226px -273px;
74}
75
76ul#continents li#africa a:hover {
77 background-position: -209px -417px;
78}
79
80ul#continents li#europe a:hover {
81 background-position: -22px -427px;
82}
83
84ul#continents li#asia a:hover {
85 background-position: -363px -268px;
86}
87
88ul#continents li#australia a:hover {
89 background-position: -412px -455px;
90}
91
92ul#continents li a span {
93 display: none;
94 text-align:left;
95}
96
97ul#continents li a:hover span {
98 display: block;
99}
100
101ul#continents li a:hover span {
102 display: block;
103 padding: 5px;
104 width: 200px;
105 background: #000;
106 position: relative;
107 top: 68%;
108 font-size: 11px;
109 opacity: .75;
110 filter:alpha(opacity=75);
111 color: #FFF;
112 border-radius: 4px;
113 -moz-border-radius: 4px;
114 -webkit-border-radius: 4px;
115}
116
117ul#continents li a:hover span strong {
118 display: block;
119 margin-bottom: 2px;
120 font-size: 12px;
121 color:white;
122 text-decoration: underline;
123}
124
0125
=== added file 'loco_directory/media/images/map.png'
1Binary files loco_directory/media/images/map.png 1970-01-01 00:00:00 +0000 and loco_directory/media/images/map.png 2010-08-17 18:02:39 +0000 differ126Binary files loco_directory/media/images/map.png 1970-01-01 00:00:00 +0000 and loco_directory/media/images/map.png 2010-08-17 18:02:39 +0000 differ
=== modified file 'loco_directory/templates/index.html'
--- loco_directory/templates/index.html 2010-08-17 00:33:22 +0000
+++ loco_directory/templates/index.html 2010-08-17 18:02:39 +0000
@@ -6,6 +6,7 @@
6{% block extrahead %}6{% block extrahead %}
7{{block.super}}7{{block.super}}
8 <link rel="stylesheet" type="text/css" href="{{MEDIA_URL}}/css/twidenash.css" />8 <link rel="stylesheet" type="text/css" href="{{MEDIA_URL}}/css/twidenash.css" />
9 <link rel="stylesheet" type="text/css" href="{{MEDIA_URL}}/css/continents.css" />
9{% endblock %}10{% endblock %}
1011
11{% block content %}12{% block content %}
@@ -16,7 +17,34 @@
16 <p>17 <p>
17 {% trans "List of all Ubuntu LoCo Teams, with full information such as contact, web pages, mailing list, and more." %}18 {% trans "List of all Ubuntu LoCo Teams, with full information such as contact, web pages, mailing list, and more." %}
18 {% trans "If there are no teams in your country/region/area, you will be able to add a team in the near future." %}19 {% trans "If there are no teams in your country/region/area, you will be able to add a team in the near future." %}
20 {% trans "Select your continent below to find an Ubuntu LoCo Team near you." %}
19 </p>21 </p>
22 <ul id="continents">
23 <li id="northamerica">
24 <a href="{% url team-list %}#North%20America">
25 </a>
26 </li>
27 <li id="southamerica">
28 <a href="{% url team-list %}#South%20America">
29 </a>
30 </li>
31 <li id="asia">
32 <a href="{% url team-list %}#Asia">
33 </a>
34 </li>
35 <li id="australia">
36 <a href="{% url team-list %}#Australia">
37 </a>
38 </li>
39 <li id="africa">
40 <a href="{% url team-list %}#Africa">
41 </a>
42 </li>
43 <li id="europe">
44 <a href="{% url team-list %}#Europe">
45 </a>
46 </li>
47 </ul>
20 </article>48 </article>
21 <hr class="divide" />49 <hr class="divide" />
2250
2351
=== modified file 'loco_directory/templates/teams/team_list.html'
--- loco_directory/templates/teams/team_list.html 2010-07-30 20:55:49 +0000
+++ loco_directory/templates/teams/team_list.html 2010-08-17 18:02:39 +0000
@@ -21,7 +21,7 @@
21<article id="main-content" class="main-content">21<article id="main-content" class="main-content">
22{% if team_list %}22{% if team_list %}
23 {% for continent in continents %}{% if continent.related_teams %}23 {% for continent in continents %}{% if continent.related_teams %}
24 <h2>{{continent.name}}</h2>24 <h2><a name="{{continent.name}}">{{continent.name}}</a></h2>
25 <ul>25 <ul>
26 {{colcycle.reset}}26 {{colcycle.reset}}
27 {% for team in continent.related_teams %}27 {% for team in continent.related_teams %}

Subscribers

People subscribed via source and target branches