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

[Michael Hall]

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

[Michael Hall (mhall119)]

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.

[Daniel Holbach (dholbach)]

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

[Michael Hall (mhall119)]

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

[Michael Hall (mhall119)]

Added attribution to EXTERNALS in rev 242

[lp:~mhall119/loco-team-portal/mainpage-map]

242. By Michael Hall on 2010-08-17

Added attribution for map image and css to EXTERNALS

=== modified file 'EXTERNALS'
--- EXTERNALS	2010-02-17 15:32:25 +0000
+++ EXTERNALS	2010-08-17 18:02:39 +0000
@@ -3,3 +3,5 @@
 - 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.)
 
 - 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.
+
+- 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.

=== 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 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-17 14:36+0000\n"
+"POT-Creation-Date: 2010-08-17 15:10+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -136,71 +135,71 @@
 msgid "Additional Guests"
 msgstr ""
 
-#: events/views.py:139
+#: events/views.py:146
 msgid "Team Event removed."
 msgstr ""
 
-#: events/views.py:146
+#: events/views.py:153
 msgid ""
 "You can not remove this team event. You are not admin/owner of the Launchpad "
 "team or on the LoCo Council."
 msgstr ""
 
-#: events/views.py:153
+#: events/views.py:160
 msgid ""
 "You can not add a new team event. You are not member of any of the LoCo "
 "Teams."
 msgstr ""
 
-#: events/views.py:205 events/views.py:243
+#: events/views.py:212 events/views.py:250
 msgid "New event created."
 msgstr ""
 
-#: events/views.py:221 events/views.py:256
+#: events/views.py:228 events/views.py:263
 msgid ""
 "You can not add a new event for this team. You are not member of the team or "
 "on the LoCo Council."
 msgstr ""
 
-#: events/views.py:279
+#: events/views.py:286
 msgid "Team Event updated."
 msgstr ""
 
-#: events/views.py:290
+#: events/views.py:297
 msgid ""
 "You can not update this team event. You are not member of the team or on the "
 "LoCo Council."
 msgstr ""
 
-#: events/views.py:308
+#: events/views.py:315
 msgid "Your registration has been saved."
 msgstr ""
 
-#: events/views.py:339
+#: events/views.py:346
 msgid "Comment saved."
 msgstr ""
 
-#: events/views.py:407
+#: events/views.py:414
 msgid "Global Event removed."
 msgstr ""
 
-#: events/views.py:413
+#: events/views.py:420
 msgid "You can not remove this global event. You are not on the LoCo Council."
 msgstr ""
 
-#: events/views.py:427
+#: events/views.py:434
 msgid "New Global Event created."
 msgstr ""
 
-#: events/views.py:438
+#: events/views.py:445
 msgid "You can not add a new global event. You are not on the LoCo Council."
 msgstr ""
 
-#: events/views.py:454
+#: events/views.py:461
 msgid "Global Event updated."
 msgstr ""
 
-#: events/views.py:465
+#: events/views.py:472
 msgid "You can not update this global event. You are not on the LoCo Council."
 msgstr ""
 
@@ -307,7 +306,7 @@
 msgstr ""
 
 #: templates/404.html:4 templates/500.html:4 templates/about.html:4
-#: templates/base.html:4 templates/index.html:13 templates/loco_council.html:4
+#: templates/base.html:4 templates/index.html:14 templates/loco_council.html:4
 msgid "Ubuntu LoCo Team Directory"
 msgstr ""
 
@@ -458,7 +457,7 @@
 msgid "Show All Teams"
 msgstr ""
 
-#: templates/base.html:13 templates/index.html:15
+#: templates/base.html:13 templates/index.html:16
 #: templates/events/team_event_list.inc.html:8
 msgid "Teams"
 msgstr ""
@@ -467,7 +466,7 @@
 msgid "Show All Events"
 msgstr ""
 
-#: templates/base.html:14 templates/index.html:24
+#: templates/base.html:14 templates/index.html:52
 msgid "Events"
 msgstr ""
 
@@ -503,61 +502,65 @@
 msgid "LoCo Directory"
 msgstr ""
 
-#: templates/index.html:15
+#: templates/index.html:16
 msgid "Show all Teams"
 msgstr ""
 
-#: templates/index.html:17
+#: templates/index.html:18
 msgid ""
 "List of all Ubuntu LoCo Teams, with full information such as contact, web "
 "pages, mailing list, and more."
 msgstr ""
 
-#: templates/index.html:18
+#: templates/index.html:19
 msgid ""
 "If there are no teams in your country/region/area, you will be able to add a "
 "team in the near future."
 msgstr ""
 
-#: templates/index.html:24
+#: templates/index.html:20
+msgid "Select your continent below to find an Ubuntu LoCo Team near you."
+msgstr ""
+
+#: templates/index.html:52
 msgid "Show all Events"
 msgstr ""
 
-#: templates/index.html:25
+#: templates/index.html:53
 msgid ""
 "List of all Ubuntu LoCo Events, with full information such as location, "
 "attendees, teams, and more."
 msgstr ""
 
-#: templates/index.html:26
+#: templates/index.html:54
 msgid "Upcoming Global Events"
 msgstr ""
 
-#: templates/index.html:29 templates/events/event_list.html:29
+#: templates/index.html:57 templates/events/event_list.html:29
 msgid "Global Events as ical"
 msgstr ""
 
-#: templates/index.html:31 templates/events/event_list.html:31
+#: templates/index.html:59 templates/events/event_list.html:31
 msgid "Select a global event below to see more information about it:"
 msgstr ""
 
-#: templates/index.html:36 templates/events/event_list.html:36
+#: templates/index.html:64 templates/events/event_list.html:36
 msgid "There are currently no LoCo Global Events"
 msgstr ""
 
-#: templates/index.html:41
+#: templates/index.html:69
 msgid "Upcoming Team Events"
 msgstr ""
 
-#: templates/index.html:43 templates/events/event_list.html:46
+#: templates/index.html:71 templates/events/event_list.html:46
 msgid "Team Events as ical"
 msgstr ""
 
-#: templates/index.html:45 templates/events/event_list.html:52
+#: templates/index.html:73 templates/events/event_list.html:52
 msgid "There are currently no LoCo Team Events"
 msgstr ""
 
-#: templates/index.html:50 templates/events/global_event_detail.inc.html:11
+#: templates/index.html:78 templates/events/global_event_detail.inc.html:11
 msgid "Microblogging"
 msgstr ""
 
@@ -855,6 +858,11 @@
 msgid "Copy Event"
 msgstr ""
 
+#: templates/events/team_event_detail.html:17
+#: templates/teams/team_detail.html:110
+msgid "iCal Feed"
+msgstr ""
+
 #: templates/events/team_event_detail.inc.html:14
 msgid "Details"
 msgstr ""
@@ -1085,10 +1093,6 @@
 msgid "RSS Feed"
 msgstr ""
 
-#: templates/teams/team_detail.html:110
-msgid "iCal Feed"
-msgstr ""
-
 #: templates/teams/team_detail.html:117
 #, python-format
 msgid "%(start_date)s in %(city)s"

=== 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 @@
+/* Continents */
+ul#continents {
+	list-style: none;
+	background: url(../images/map.png) no-repeat 0 0;
+	position: relative;
+	width: 580px;
+	height: 268px;	
+	margin: 0 auto;
+	padding: 0;
+}
+
+ul#continents li {
+	position: absolute;
+}
+
+ul#continents li a{
+	display: block;
+	height: 100%;
+	text-decoration: none;
+}
+
+#northamerica {
+	width: 227px;
+	height: 142px;
+	top: 2px;
+	left: 0px;
+}
+
+#southamerica {
+	width: 108px;
+	height: 130px;
+	top: 131px;
+	left: 76px;
+}
+
+#africa {
+	width: 120px;
+	height: 140px;
+	top: 83px;
+	left: 209px;
+}
+
+#europe {
+	width: 120px;
+	height: 84px;
+	top: 1px;
+	left: 211px;
+}
+
+#asia {
+	width: 215px;
+	height: 175px;
+	top: 1px;
+	left: 283px;
+}
+
+#australia {
+	width: 114px;
+	height: 95px;
+	top: 152px;
+	left: 432px;
+}
+
+ul#continents li a:hover {
+	background: url(../images/map.png) no-repeat 0 0;
+}
+
+ul#continents li#northamerica a:hover {
+	background-position: 0 -270px;
+}
+
+ul#continents li#southamerica a:hover {
+	background-position: -226px -273px;
+}
+
+ul#continents li#africa a:hover {
+	background-position: -209px -417px;
+}
+
+ul#continents li#europe a:hover {
+	background-position: -22px -427px;
+}
+
+ul#continents li#asia a:hover {
+	background-position: -363px -268px;
+}
+
+ul#continents li#australia a:hover {
+	background-position: -412px -455px;
+}
+
+ul#continents li a span {
+	display: none;
+        text-align:left;
+}
+
+ul#continents li a:hover span {
+	display: block;
+}
+
+ul#continents li a:hover span {
+	display: block;
+	padding: 5px;
+	width: 200px;
+	background: #000;
+	position: relative;
+	top: 68%;
+	font-size: 11px;
+	opacity: .75;
+	filter:alpha(opacity=75);
+	color: #FFF;
+        border-radius: 4px;
+        -moz-border-radius: 4px;
+        -webkit-border-radius: 4px;
+}
+
+ul#continents li a:hover span strong {
+	display: block;
+	margin-bottom: 2px;
+	font-size: 12px;
+        color:white;
+	text-decoration: underline;
+}
+

=== added file 'loco_directory/media/images/map.png'
Binary 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 @@
 {% block extrahead %}
 {{block.super}}
         <link rel="stylesheet" type="text/css" href="{{MEDIA_URL}}/css/twidenash.css" />
+        <link rel="stylesheet" type="text/css" href="{{MEDIA_URL}}/css/continents.css" />
 {% endblock %}
 
 {% block content %}
@@ -16,7 +17,34 @@
         <p>
           {% trans "List of all Ubuntu LoCo Teams, with full information such as contact, web pages, mailing list, and more." %}
           {% trans "If there are no teams in your country/region/area, you will be able to add a team in the near future." %}
+          {% trans "Select your continent below to find an Ubuntu LoCo Team near you." %}
         </p>
+	<ul id="continents">
+	    <li id="northamerica">
+		<a href="{% url team-list %}#North%20America">
+		</a>
+	    </li>
+	    <li id="southamerica">
+	   		<a href="{% url team-list %}#South%20America">
+		</a>
+	    </li>    
+	    <li id="asia">
+	    	<a href="{% url team-list %}#Asia">
+		</a>
+	    </li>
+	    <li id="australia">
+	    	<a href="{% url team-list %}#Australia">
+		</a>
+	    </li>
+	    <li id="africa">
+		<a href="{% url team-list %}#Africa">
+		</a>
+	    </li>
+	    <li id="europe">
+		<a href="{% url team-list %}#Europe">
+		</a>
+	    </li>    
+	</ul>
         </article>
 		<hr class="divide" />
 

=== 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 @@
 <article id="main-content" class="main-content">
 {% if team_list %}
   {% for continent in continents %}{% if continent.related_teams %}
-      <h2>{{continent.name}}</h2>
+      <h2><a name="{{continent.name}}">{{continent.name}}</a></h2>
           <ul>
           {{colcycle.reset}}
           {% for team in continent.related_teams %}