Merge lp:~cjohnston/loco-team-portal/front-page into lp:loco-team-portal

[Chris Johnston]

Makes UI changes to the front page, adds an "About LoCo Teams" page with information about LoCo Teams, adds a "Using LoCo Team Directory" page with info about LoCo Dir, fixes bug #620850 and bug #610498, plus updates translation file.

[Daniel Holbach (dholbach)]

 - LoCo's → LoCos
 - please let's not mention teams explicitly, it's unfair to those who are not listed. it's easier to say "we're spread across all continents, there's city teams, country teams, teams that work across country borders, etc. etc …"
 - is RSVP a verb?

review: Needs Fixing

[lp:~cjohnston/loco-team-portal/front-page]

251. By Chris Johnston on 2010-08-20

Addresses concerns in merge request.

=== modified file 'loco_directory/common/views.py'
--- loco_directory/common/views.py	2010-08-18 14:31:48 +0000
+++ loco_directory/common/views.py	2010-08-20 10:01:40 +0000
@@ -26,6 +26,16 @@
     return render_to_response('about.html', context,
         RequestContext(request))
 
+def about_loco(request):
+    context = {}
+    return render_to_response('about_loco.html', context,
+        RequestContext(request))
+        
+def using_locodir(request):
+    context = {}
+    return render_to_response('using_locodir.html', context,
+        RequestContext(request))
+        
 def site_logout(request):
     logout(request)
     return HttpResponseRedirect('/')

=== modified file 'loco_directory/locale/loco-directory.pot'
--- loco_directory/locale/loco-directory.pot	2010-08-17 15:11:07 +0000
+++ loco_directory/locale/loco-directory.pot	2010-08-20 10:01:40 +0000
@@ -8,10 +8,11 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-17 15:10+0000\n"
+"POT-Creation-Date: 2010-08-20 09:57+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"
@@ -306,7 +307,8 @@
 msgstr ""
 
 #: templates/404.html:4 templates/500.html:4 templates/about.html:4
-#: templates/base.html:4 templates/index.html:14 templates/loco_council.html:4
+#: templates/about_loco.html:4 templates/base.html:4
+#: templates/loco_council.html:4 templates/using_locodir.html:4
 msgid "Ubuntu LoCo Team Directory"
 msgstr ""
 
@@ -449,6 +451,72 @@
 msgid "Future additions to this site will include:"
 msgstr ""
 
+#: templates/about_loco.html:4 templates/about_loco.html.py:11
+#: templates/index.html:5
+msgid "About Local Community (LoCo) Teams"
+msgstr ""
+
+#: templates/about_loco.html:12
+msgid ""
+"With the incredible success of Ubuntu around the world, the LoCo project is "
+"here to help groups of Ubuntu fans and enthusiasts work together in regional "
+"teams to help advocate, promote, translate, develop and otherwise improve "
+"Ubuntu. Our worldwide network of LoCo teams is providing a strong backbone "
+"to our already vast and extensive Ubuntu community. Why not go and see the"
+msgstr ""
+
+#: templates/about_loco.html:12 templates/about_loco.html.py:18
+msgid "See All LoCo Teams"
+msgstr ""
+
+#: templates/about_loco.html:12
+msgid "full list of teams!"
+msgstr ""
+
+#: templates/about_loco.html:16
+msgid "Joining a LoCo Team"
+msgstr ""
+
+#: templates/about_loco.html:18
+msgid "Do you want to join a LoCo Team? It's easy! Just "
+msgstr ""
+
+#: templates/about_loco.html:18
+msgid "find a team"
+msgstr ""
+
+#: templates/about_loco.html:18
+msgid ""
+"in your area and click the 'Join This Team!' link at the top of their page."
+msgstr ""
+
+#: templates/about_loco.html:19
+msgid ""
+"If you are not able to find a LoCo Team in your area and want to create one, "
+"take a look at the "
+msgstr ""
+
+#: templates/about_loco.html:19
+msgid "LoCo Team HowTo"
+msgstr ""
+
+#: templates/about_loco.html:19
+msgid " for more information on setting up a LoCo Team."
+msgstr ""
+
+#: templates/about_loco.html:24
+msgid "Why Local Teams?"
+msgstr ""
+
+#: templates/about_loco.html:25
+msgid ""
+"Ever since the birth of computers, enthusiasts and fans around the world "
+"have collected together in garages, universities and pubs to talk about "
+"their interest, learn from each other and help promote their interest. "
+"Combine this with the huge popularity of Ubuntu, and you have the Ubuntu "
+"LoCo project."
+msgstr ""
+
 #: templates/base.html:6
 msgid "LoCo Team Directory"
 msgstr ""
@@ -457,7 +525,7 @@
 msgid "Show All Teams"
 msgstr ""
 
-#: templates/base.html:13 templates/index.html:16
+#: templates/base.html:13 templates/using_locodir.html:16
 #: templates/events/team_event_list.inc.html:8
 msgid "Teams"
 msgstr ""
@@ -466,7 +534,7 @@
 msgid "Show All Events"
 msgstr ""
 
-#: templates/base.html:14 templates/index.html:52
+#: templates/base.html:14 templates/using_locodir.html:21
 msgid "Events"
 msgstr ""
 
@@ -475,11 +543,11 @@
 msgstr ""
 
 #: templates/base.html:16
-msgid "About LoCo Directory"
+msgid "About LoCo Teams"
 msgstr ""
 
 #: templates/base.html:16
-msgid "About"
+msgid "About LoCos"
 msgstr ""
 
 #: templates/base.html:18
@@ -487,7 +555,7 @@
 msgstr ""
 
 #: templates/base.html:20
-msgid "Log in"
+msgid "Log In"
 msgstr ""
 
 #: templates/base.html:43
@@ -502,52 +570,39 @@
 msgid "LoCo Directory"
 msgstr ""
 
-#: templates/index.html:16
-msgid "Show all Teams"
-msgstr ""
-
-#: 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: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:20
-msgid "Select your continent below to find an Ubuntu LoCo Team near you."
-msgstr ""
-
-#: templates/index.html:52
+#: templates/index.html:6 templates/using_locodir.html:4
+#: templates/using_locodir.html.py:11
+msgid "Using the LoCo Team Directory"
+msgstr ""
+
+#: templates/index.html:17
+msgid "Ubuntu Local Community (LoCo) Team Directory"
+msgstr ""
+
+#: templates/index.html:46
+msgid "Click on your continent to find teams near you."
+msgstr ""
+
+#: templates/index.html:53
 msgid "Show all Events"
 msgstr ""
 
-#: 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:54
-msgid "Upcoming Global Events"
-msgstr ""
-
-#: templates/index.html:57 templates/events/event_list.html:29
+#: templates/index.html:53 templates/teams/team_event_history.html:8
+msgid "Upcoming Events"
+msgstr ""
+
+#: templates/index.html:56
+msgid "Global Events"
+msgstr ""
+
+#: templates/index.html:58 templates/events/event_list.html:29
 msgid "Global Events as ical"
 msgstr ""
 
-#: templates/index.html:59 templates/events/event_list.html:31
+#: templates/index.html:60 templates/events/event_list.html:31
 msgid "Select a global event below to see more information about it:"
 msgstr ""
 
-#: templates/index.html:64 templates/events/event_list.html:36
-msgid "There are currently no LoCo Global Events"
-msgstr ""
-
 #: templates/index.html:69
 msgid "Upcoming Team Events"
 msgstr ""
@@ -556,11 +611,7 @@
 msgid "Team Events as ical"
 msgstr ""
 
-#: templates/index.html:73 templates/events/event_list.html:52
-msgid "There are currently no LoCo Team Events"
-msgstr ""
-
-#: templates/index.html:78 templates/events/global_event_detail.inc.html:11
+#: templates/index.html:76 templates/events/global_event_detail.inc.html:11
 msgid "Microblogging"
 msgstr ""
 
@@ -649,6 +700,38 @@
 "You can reach the council via email at loco-council at lists.ubuntu.com."
 msgstr ""
 
+#: templates/using_locodir.html:12
+msgid ""
+"The LoCo Team Directory is an excellent resource for LoCo Teams to use when "
+"planning events. The LoCo Team Directory allows users to set up events and "
+"venues for their LoCo Team, and then allow users to register their "
+"attendance to the event. This makes planning and tracking much easier for "
+"users."
+msgstr ""
+
+#: templates/using_locodir.html:17
+msgid ""
+"All LoCo Teams registered in Launchpad are a part of the LoCo Team "
+"Directory. Team members can create events and venues for their LoCo Team."
+msgstr ""
+
+#: templates/using_locodir.html:22
+msgid ""
+"A LoCo Team member can create an event, and then other members can register "
+"their attendance to the event and make comments to the event."
+msgstr ""
+
+#: templates/using_locodir.html:26 templates/events/event_list.html:7
+msgid "Venues"
+msgstr ""
+
+#: templates/using_locodir.html:27
+msgid ""
+"Creating a venue in the LoCo Team Directory will provide other users with "
+"information about where an event is being held, and any other information "
+"that the users might need to know about the events location."
+msgstr ""
+
 #: templates/events/event_history_list.html:4
 msgid "Ubuntu LoCo Events History"
 msgstr ""
@@ -691,10 +774,6 @@
 msgid "Show All Venues"
 msgstr ""
 
-#: templates/events/event_list.html:7
-msgid "Venues"
-msgstr ""
-
 #: templates/events/event_list.html:9
 msgid "Add Global Event"
 msgstr ""
@@ -712,6 +791,10 @@
 msgid "Ubuntu LoCo Global Events"
 msgstr ""
 
+#: templates/events/event_list.html:36
+msgid "There are currently no LoCo Global Events"
+msgstr ""
+
 #: templates/events/event_list.html:43
 msgid "Ubuntu LoCo Team Events"
 msgstr ""
@@ -722,6 +805,10 @@
 msgid "Select a team event below to see more information about it:"
 msgstr ""
 
+#: templates/events/event_list.html:52
+msgid "There are currently no LoCo Team Events"
+msgstr ""
+
 #: templates/events/global_event_delete_confirm.html:4
 msgid "Delete Global Event"
 msgstr ""
@@ -757,20 +844,20 @@
 
 #: templates/events/global_event_detail.inc.html:20
 #, python-format
-msgid "Attending Team Events (%(team_count)s)"
+msgid "Participating Team Events (%(team_count)s)"
 msgstr ""
 
 #: templates/events/global_event_detail_attending_teamevents.inc.html:11
-#: templates/events/global_event_detail_attending_teamevents.inc.html:26
-#: templates/events/global_event_detail_attending_teamevents.inc.html:39
+#: templates/events/global_event_detail_attending_teamevents.inc.html:27
+#: templates/events/global_event_detail_attending_teamevents.inc.html:41
 msgid "More Information about Team Event"
 msgstr ""
 
-#: templates/events/global_event_detail_attending_teamevents.inc.html:20
+#: templates/events/global_event_detail_attending_teamevents.inc.html:21
 msgid "Events in countries without continents"
 msgstr ""
 
-#: templates/events/global_event_detail_attending_teamevents.inc.html:35
+#: templates/events/global_event_detail_attending_teamevents.inc.html:37
 msgid "Events without venue"
 msgstr ""
 
@@ -1113,10 +1200,6 @@
 msgid "Back to Team Details"
 msgstr ""
 
-#: templates/teams/team_event_history.html:8
-msgid "Upcoming Events"
-msgstr ""
-
 #: templates/teams/team_event_history.html:23
 #, python-format
 msgid "There are no past events for LoCo Team %(teamname)s :("

=== added file 'loco_directory/templates/about_loco.html'
--- loco_directory/templates/about_loco.html	1970-01-01 00:00:00 +0000
+++ loco_directory/templates/about_loco.html	2010-08-20 10:01:40 +0000
@@ -0,0 +1,29 @@
+{% extends "base.html" %}
+{% load i18n %}
+
+{% block title %} {% trans "About Local Community (LoCo) Teams" %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %}
+
+{% block sub_nav %}{% endblock %}
+
+{% block content %}
+
+<article class="main-content">
+    <h2>{% trans "About Local Community (LoCo) Teams" %}</h2>
+    <p>{% trans "With the incredible success of Ubuntu around the world, the LoCo project is here to help groups of Ubuntu fans and enthusiasts work together in regional teams to help advocate, promote, translate, develop and otherwise improve Ubuntu. Our worldwide network of LoCo teams is providing a strong backbone to our already vast and extensive Ubuntu community. Why not go and see the" %} <a title="{% trans "See All LoCo Teams" %}" href="{% url team-list %}">{% trans "full list of teams!" %}</a></p>
+</article>
+
+<article class="main-content">
+    <h3>{% trans "Joining a LoCo Team" %}</h3>
+    <ul>
+	    <li>{% trans "Do you want to join a LoCo Team? It's easy! Just " %}<a title="{% trans "See All LoCo Teams" %}" href="{% url team-list %}">{% trans "find a team" %}</a> {% trans "in your area and click the 'Join This Team!' link at the top of their page." %}</ul>
+        <li>{% trans "If you are not able to find a LoCo Team in your area and want to create one, take a look at the " %}<a href="https://wiki.ubuntu.com/LoCoTeamHowto" title="{% trans "LoCo Team HowTo" %}">{% trans "LoCo Team HowTo" %}</a>{% trans " for more information on setting up a LoCo Team." %}</ul>
+    </ul>
+</article>
+
+<article class="main-content">
+    <h3>{% trans "Why Local Teams?" %}</h3>
+    <p>{% trans "Ever since the birth of computers, enthusiasts and fans around the world have collected together in garages, universities and pubs to talk about their interest, learn from each other and help promote their interest. Combine this with the huge popularity of Ubuntu, and you have the Ubuntu LoCo project." %}</p>
+</article>
+
+
+{% endblock %}

=== modified file 'loco_directory/templates/base.html'
--- loco_directory/templates/base.html	2010-08-18 14:54:25 +0000
+++ loco_directory/templates/base.html	2010-08-20 10:01:40 +0000
@@ -13,11 +13,11 @@
     <a class="main-nav-item {% ifequal url_base 'teams' %}current{% endifequal %}" title="{% trans "Show All Teams" %}" href="{% url team-list %}">{% trans "Teams" %}</a>
     <a class="main-nav-item {% ifequal url_base 'events' %}current{% endifequal %}" title="{% trans "Show All Events" %}" href="{% url event-list %}">{% trans "Events" %}</a>
     <a class="main-nav-item {% ifequal url_base 'loco-council' %}current{% endifequal %}" title="{% trans "LoCo Council" %}" href="{% url loco_council %}">{% trans "LoCo Council" %}</a>
-    <a class="main-nav-item {% ifequal url_base 'about' %}current{% endifequal %}" title="{% trans "About LoCo Directory" %}" href="/about">{% trans "About" %}</a></li>
+    <a class="main-nav-item {% ifequal url_base 'about-loco' %}current{% endifequal %}" title="{% trans "About LoCo Teams" %}" href="{% url about_loco %}">{% trans "About LoCos" %}</a></li>
     {% if user.is_authenticated %}
         <a class="main-nav-item" href="/logout" title="{% trans "Log Out" %}: {{ user.username }}">{% trans "Log Out" %}</a>
     {% else %}
-        <a class="main-nav-item" href="/openid/login?next={{login_next}}">{% trans "Log in" %}</a>
+        <a class="main-nav-item" href="/openid/login?next={{login_next}}" title="{% trans "Log In" %}">{% trans "Log In" %}</a>
     {% endif %}
 {% endblock %}
 

=== modified file 'loco_directory/templates/events/global_event_detail.inc.html'
--- loco_directory/templates/events/global_event_detail.inc.html	2010-08-17 01:55:04 +0000
+++ loco_directory/templates/events/global_event_detail.inc.html	2010-08-20 10:01:40 +0000
@@ -17,7 +17,7 @@
 
 {% if global_event_object.teamevent_set.all %}
 <article id="global-event-attending" class="main-content alone">
-<h2>{% blocktrans with global_event_object.teamevent_set.all.count as team_count %}Attending Team Events ({{team_count}}){% endblocktrans %}</h2>
+<h2>{% blocktrans with global_event_object.teamevent_set.all.count as team_count %}Participating Team Events ({{team_count}}){% endblocktrans %}</h2>
 <br />
 {% include "events/global_event_detail_attending_teamevents.inc.html" %}
 </article>

=== modified file 'loco_directory/templates/index.html'
--- loco_directory/templates/index.html	2010-08-18 14:31:48 +0000
+++ loco_directory/templates/index.html	2010-08-20 10:01:40 +0000
@@ -1,7 +1,10 @@
 {% extends "base.html" %}
 {% load i18n %}
 
-{% block sub_nav %}{% endblock %}
+{% block sub_nav_links %}
+<a class="sub-nav-item" href="{% url about_loco %}">{% trans "About Local Community (LoCo) Teams" %}</a>
+<a class="sub-nav-item" href="{% url using_locodir %}">{% trans "Using the LoCo Team Directory" %}</a>
+{% endblock %}
 
 {% block extrahead %}
 {{block.super}}
@@ -11,72 +14,67 @@
 
 {% block content %}
 
-  <h1>{% trans "Ubuntu LoCo Team Directory" %}</h1>
-	<article class="main-content">
-        <h2><a title="{% trans "Show all Teams" %}" href="{% url team-list %}">{% trans "Teams" %}</a></h2>
-        <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" />
-
-		<article class="minor-content">
-        <h2><a title="{% trans "Show all Events" %}" href="{% url event-list %}">{% trans "Events" %}</a></h2>
-            <p>{% trans "List of all Ubuntu LoCo Events, with full information such as location, attendees, teams, and more." %}</p>
-            <h3>{% trans "Upcoming Global Events" %}
-            {% if global_event_list %}
+<h1>{% trans "Ubuntu Local Community (LoCo) Team Directory" %}</h1>
+    <article class="main-content">
+    <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>
+    <br />
+    <p style="text-align: center; font-weight: bold;">{% trans "Click on your continent to find teams near you." %}</p>
+</article>
+
+<hr class="divide" />
+<br />
+
+<article class="minor-content">
+    <h2><a title="{% trans "Show all Events" %}" href="{% url event-list %}">{% trans "Upcoming Events" %}</a></h2>
+        <br />
+        {% if global_event_list %}
+            <h3>{% trans "Global Events" %}
             <a class="global_event_ical" href="{% url global-event-list-ical %}">
             <img src="/media/images/ical.png" title="{% trans "Global Events as ical" %}"/></a></h3>
 
             <p>{% trans "Select a global event below to see more information about it:" %}</p>
 
             {% include "events/global_event_list.inc.html" %}
-
-            {% else %}
-            </h3><p>{% trans "There are currently no LoCo Global Events" %}</p>
-            {% endif %}
-            
-            <br />
-            {% if team_event_count %}
+            
+        {% endif %}
+            
+        <br />
+        
+        {% if team_event_count %}
             <h3><a href="{% url event-list %}">{{ team_event_count }} {% trans "Upcoming Team Events" %}</a>
             <a class="teams_event_ical" href="{% url teams-event-list-ical %}">
             <img src="/media/images/ical.png" title="{% trans "Team Events as ical" %}"/></a></h3>
-            {% else %}
-            <p>{% trans "There are currently no LoCo Team Events" %}</p>
-            {% endif %}
-        </article>
+        {% endif %}
+</article>
 
-		<article class="minor-content alone">
-        <h2>{% trans "Microblogging" %} #locoteams</h2>
-        <p><script src="{{MEDIA_URL}}js/twidenash.js?locoteams"></script></p>
-        </article>
+<article class="minor-content alone">
+    <h2>{% trans "Microblogging" %} #locoteams</h2>
+    <p><script src="{{MEDIA_URL}}js/twidenash.js?locoteams"></script></p>
+</article>
 
 {% endblock %}

=== added file 'loco_directory/templates/using_locodir.html'
--- loco_directory/templates/using_locodir.html	1970-01-01 00:00:00 +0000
+++ loco_directory/templates/using_locodir.html	2010-08-20 10:01:40 +0000
@@ -0,0 +1,30 @@
+{% extends "base.html" %}
+{% load i18n %}
+
+{% block title %} {% trans "Using the LoCo Team Directory" %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %}
+
+{% block sub_nav %}{% endblock %}
+
+{% block content %}
+
+<article class="main-content">
+    <h2>{% trans "Using the LoCo Team Directory" %}</h2>
+    <p>{% trans "The LoCo Team Directory is an excellent resource for LoCo Teams to use when planning events. The LoCo Team Directory allows users to set up events and venues for their LoCo Team, and then allow users to register their attendance to the event. This makes planning and tracking much easier for users." %}</p>
+</article>
+
+<article class="main-content">
+    <h3>{% trans "Teams" %}</h3>
+    <p>{% trans "All LoCo Teams registered in Launchpad are a part of the LoCo Team Directory. Team members can create events and venues for their LoCo Team." %}</p>
+</article>
+
+<article class="main-content">
+    <h3>{% trans "Events" %}</h3>
+    <p>{% trans "A LoCo Team member can create an event, and then other members can register their attendance to the event and make comments to the event." %}</p>
+</article>
+
+<article class="main-content">
+    <h3>{% trans "Venues" %}</h3>
+    <p>{% trans "Creating a venue in the LoCo Team Directory will provide other users with information about where an event is being held, and any other information that the users might need to know about the events location." %}</p>
+</article>
+
+{% endblock %}

=== modified file 'loco_directory/urls.py'
--- loco_directory/urls.py	2010-08-17 00:30:44 +0000
+++ loco_directory/urls.py	2010-08-20 10:01:40 +0000
@@ -9,6 +9,8 @@
     url(r'^$', 'common.views.index', name='home'),
     url(r'^language/', 'common.views.set_language', name='set_language'),
     url(r'^about/$', 'common.views.about', name='about'),
+    url(r'^about-loco/$', 'common.views.about_loco', name='about_loco'),
+    url(r'^using-locodir/$', 'common.views.using_locodir', name='using_locodir'),
     url(r'^openid/', include('django_openid_auth.urls')),
     url(r'^admin/(.*)', admin.site.root),
     url(r'^data/xml', 'teams.views.xml_team_data', name='xml_team_data'),