Merge lp:~daker/loco-team-portal/fix.venues into lp:loco-team-portal

[Adnane Belmadiaf]

Fixed the venues part

=== modified file 'loco_directory/media/css/styles.css'
--- loco_directory/media/css/styles.css	2013-02-18 21:27:39 +0000
+++ loco_directory/media/css/styles.css	2013-02-21 20:33:20 +0000
@@ -38,22 +38,6 @@
     white-space: nowrap;
 }
 
-/*
-label {
-    font-weight:    bold;
-    white-space:    nowrap;
-}
-*/
-
-.minor-content .venue-map {
-    min-height: 350px;
-    margin-top: 60px;
-}
-
-.venue-map {
-    min-height: 250px;
-}
-
 #main-content {
     margin-right:   20px;
 }
@@ -267,65 +251,111 @@
 
 
 
-/*#venue-list ul,*/
-.venue-list{
+/* Venue */
+.venues-list{
     overflow:auto;
 }
 
 
-.venue-list h3 {
+.venues-list h3 {
     color: #333;
-    padding: 10px 0px 10px 10px;
-    background: white url(/ubuntu-website/media/images/dotted.png) repeat scroll 0px 0px;
+    padding: 10px 0px 10px 0;
     margin-bottom: 0;
 }
 
-.venue-list ul {
+.venues-list ul {
     display: block;
-    float: left;
     list-style-image: none;
     list-style-type: none;
-    padding: 4px 0px 5px 5px;
+    padding: 4px 0px 5px 0;
     text-indent: 0px;
-    width: 915px;
-    background-color:#F7F7F7;
+    margin: 0;
+    margin-bottom: 10px;
 }
 
-.venue-list ul li {
+.venues-list ul li {
     list-style-image: none;
     list-style-type: none;
     text-indent: 0px;
-    width: 200px;
-    margin-right: 22px;
+    margin-right: 0;
     margin-bottom: 5px;
-    padding-left: 5px;
-    float: left;
-    font-size:12px;
-}
-
-.venue-list ul li h3{
-    padding: 0px;
-    background:#f7f6f5;
+    font-size: 12px;
+    overflow: auto;
+}
+
+.venues-list ul li .venue-d {
+    overflow: auto;
+    border: 1px solid #d2d2d2;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    position: relative;
+    margin-top: 20px;
+}
+
+.venues-list ul li .venue-d:first-child {
+    margin-top: 0;
+}
+
+.venues-list ul li h3{
     margin: 0px;
     color: #333;
     padding: 4px 0px;
 }
 
-
-.venue-list ul li p{
-    font-size: 12px;
-    line-height: 16px;
-    margin: 0px;
-    padding: 0px;
-}
-
-.venue-list ul li p a{
+.venues-list ul li p a{
    border-bottom: 1px dotted #333;
    clear: both;
    display: block;
+   padding: 5px 0px 3px;
+}
+
+.p {
+    font-family: 'EntypoRegular';
+    font-size: 90px;
+    position: relative;
+    color: #333;
+    margin: 4px 5px 0 0;
+    height: 20px;
+    display: block;
+    float: left;
+    line-height: 48px;
+    width: 67px;
+    text-align: center;
+}
+
+.p:after { content: "0"; padding-left: 4px;}
+
+#venue-map {
+    height: 200px;
+    margin-top: 5px;
+    margin-bottom: 10px;
+}
+
+.venue-map {
+    min-height: 250px;
+}
+
+.f {
+    float: left;
+}
+
+.f img {
+    width: 50px;
+    height: 50px;
+    margin-bottom: 5px;
+}
+
+.f0 {
    float: none;
-   padding: 5px 0px 3px;
-}
+   display: block;
+   margin-bottom: 5px;
+}
+
+.f0 img {
+   width: 200px;
+   height: 200px;
+}
+
 
 #site_search_form {
     width: auto;
 
=== modified file 'loco_directory/templates/teams/team_detail.html'
--- loco_directory/templates/teams/team_detail.html	2013-02-10 15:06:06 +0000
+++ loco_directory/templates/teams/team_detail.html	2013-02-21 20:33:20 +0000
@@ -75,12 +75,12 @@
                     <div style="display:block;">
                         <div id="loco-location">
                             <span title="{% trans "Location" %}" class="pictogram place"></span>
-                            <span class="value ellipsis small-ellipsis">
+                            <span class="value ellipsis medium-ellipsis">
                             {% if team.countries.all %}
                                 {% for country in team.countries.all %}
                                     {% if not forloop.first %}, {% endif %}{{ country.name }}
                                 {% endfor %}
-                                {% if team.spr %}, {% trans team.spr %}{% endif %}{% if team.city %}, {% trans team.city %}
+                                {% if team.spr %}, {{ team.spr }}{% endif %}{% if team.city %}, {{ team.city }}
                                 {% endif %}
                             {% else %}
                                 {% trans "None Specified" %}
@@ -100,17 +100,6 @@
                             {% endif %}
                             </span>
                         </div>
-
-                        <div id="loco-support">
-                            <span title="{% trans "Local Support" %}" class="pictogram support"></span>
-                            <span class="value ellipsis medium-ellipsis">
-                            {% if team.provides_support %}
-                                {% trans "This LoCo provides support :)" %}
-                            {% else %}
-                                {% trans "This LoCo doesn't provide support :(" %}
-                            {% endif %}
-                            </span>
-                        </div>
                     </div>
 
                     <div style="display:block;">
@@ -162,6 +151,17 @@
                             </span>
                         </div>
 
+                        <div id="loco-location">
+                            <span title="{% trans "Local Support" %}" class="pictogram support"></span>
+                            <span class="value ellipsis medium-ellipsis">
+                            {% if team.provides_support %}
+                                {% trans "This LoCo provides support :)" %}
+                            {% else %}
+                                {% trans "This LoCo doesn't provide support :(" %}
+                            {% endif %}
+                            </span>
+                        </div>
+
                     </div>
                 </div>
             </div>
 
=== modified file 'loco_directory/templates/venues/venue_detail.html'
--- loco_directory/templates/venues/venue_detail.html	2012-06-02 11:50:27 +0000
+++ loco_directory/templates/venues/venue_detail.html	2013-02-21 20:33:20 +0000
@@ -1,27 +1,126 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n markup %}
 
-{% block page_name %}{% trans venue_object.name %}{% endblock %}
+{% block page_name %}{% trans venue.name %}{% endblock %}
 
 {% block extrahead %}{{block.super}}
 <script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false&language={% trans 'en' %}&region={% trans 'US' %}"></script>
 <script type="text/javascript" src="http://google-maps-utility-library-v3.googlecode.com/svn/tags/markerclusterer/1.0/src/markerclusterer_packed.js"></script>
 <script type="text/javascript" src="{{ MEDIA_URL }}js/jquery-ubuntu-maps.js"></script>
+
+<script type="text/javascript">
+$(document).ready(function(){
+    var x = {{ venue.longitude }},
+        y = {{ venue.latitude }},
+        km = 0.0089930, // 1km
+        radius =  5,
+        minx = x-radius/2*km,
+        miny = y-radius/2*km,
+        maxx = x+radius/2*km,
+        maxy = y+radius/2*km;
+
+    $.getJSON("http://www.panoramio.com/map/get_panoramas.php?order=popularity&set=public&from=0&to=9&minx=" + minx + "&miny=" + miny + "&maxx=" + maxx + "&maxy=" + maxy +"&size=medium&format=json&callback=?", function(data){
+        $.each(data.photos, function(i,item){
+            $("#pamdiv").append('<span class="f f'+ i +'"><a href="http://www.panoramio.com/photo/' + $(this)[0].photo_id  + '"><img src="' + $(this)[0].photo_file_url + '" title="' + $(this)[0].photo_title + '" alt="' + $(this)[0].photo_title  + '"></a></span>');
+        });
+    });
+});
+</script>
 {% endblock %}
 <div class="row">
 <section class="span-6">
 
 {% block sub_nav_links %}
 <li><a class="sub-nav-item" href="{% url venue-list %}" >{% trans "Back to Venues List" %}</a></li>
-{% if venue_object.country %}
-<li><a class="sub-nav-item" href="{% url venue-update venue_object.country.slug venue_object.id %}">{% trans "Edit Venue Details" %}</a></li>
+{% if venue.country %}
+<li><a class="sub-nav-item" href="{% url venue-update venue.country.slug venue.id %}">{% trans "Edit Venue Details" %}</a></li>
 {% else %}
-<li><a class="sub-nav-item" href="{% url venue-update 'no_country' venue_object.id %}">{% trans "Edit Venue Details" %}</a></li>
+<li><a class="sub-nav-item" href="{% url venue-update 'no_country' venue.id %}">{% trans "Edit Venue Details" %}</a></li>
 {% endif %}
 {% endblock %}
 
 {% block content %}
-
-{% include "venues/venue_detail.inc.html" %}
-
+<div class="row">
+    <section class="span-9">
+        <div class="box_content">
+            <div class="pagelet">
+                <h2>{{ venue.name }}</h2>
+                <div id="loco-location">
+                    <div id="loco-location">
+                        <span title="{% trans "Location" %}" class="pictogram place"></span>
+                        <span class="value">
+                                {% if venue.address %}{{ venue.address }}{% endif %}
+                                {% if venue.country %}{{ venue.country }}{% endif %}
+                                {% if venue.spr %}, {{ venue.spr }}{% endif %}{% if venue.city %}, {{ venue.city }}{% endif %}
+                        </span>
+                    </div>
+
+                    {% if venue.tz %}
+                    <div>
+                        <span  title="{% trans "Timezone" %}"  class="pictogram calendar"></span>
+                        <span class="pictogram-l">
+                        {{ venue.tz }}
+                        </span>
+                    </div>
+                    {% endif %}
+
+                    {% if venue.venue_url %}
+                    <div>
+                        <span class="pictogram announcement"></span>
+                        <a class="pictogram-l" href="{{ venue.venue_url }}">{{ venue.venue_url }}</a>
+                    </div>
+                    {% endif %}
+                </div>
+
+                {% if venue.comment %}
+                    <div>
+                        <h3 style="margin-top: 10px; margin-bottom: 10px;">{% trans "Comment" %}</h3>
+                        {{ venue.comment|markdown:'safe' }}
+                    </div>
+                {% endif %}
+            </div>
+            {% if venue.longitude and venue.latitude %}
+                <div id="venue-map"></div>
+                <script>
+                    $(function(){
+                        $('#venue-map').showLocations({
+                            markers_list: [{ lat: {{ venue.latitude }}, lng: {{ venue.longitude }} }],
+                            marker_icon: '{{ MEDIA_URL }}img/marker.png'
+                        });
+                    });
+                </script>
+            {% endif %}
+
+
+            <div class="events-meetings-wrapper">
+                <div style="overflow: auto;">
+                    <h3 class="title">{% trans "Upcoming Events" %}</h3>
+                </div>
+                {% if events %}
+                    {% for team_event in events %}
+                    <a href="{{ team_event.get_absolute_url }}" title="{% if team_event.venue %}{% else %}{{team_event.date_begin|date:"M d"}}{% endif %}" class="event-meetings">
+                        <span class="title">{{ team_event.name }}</span>
+                        <small>{{ team_event.local_date_begin|date:"l, d N Y" }} {% trans "at " %}{{ team_event.local_date_begin|date:"H:i T" }}</small>
+                        <p>{{ team_event.description }}</p>
+                    </a>
+                    {% endfor %}
+                {% else %}
+                    <div class="no-results">
+                    {% trans "There are currently no upcoming events on this venue" %}
+                    </div>
+                {% endif %}
+            </div>
+
+        </div>
+    </section>
+    <section class="span-3 box_content last">
+        <div class="sidebar-inner">
+            <h3 class="title">{% trans "Photos" %}</h3>
+            <div id="pamdiv"></div>
+            {% if venue.address %}
+                <h3 class="attendees-title"><a href="https://maps.google.com/maps?saddr=&daddr={{ venue.address }}">{% trans "Get directions to this venue" %}</a></h3>
+            {% endif %}
+        </div>
+    </section>
+</div>
 {% endblock %}
 
=== removed file 'loco_directory/templates/venues/venue_detail.inc.html'
--- loco_directory/templates/venues/venue_detail.inc.html	2012-06-02 11:50:27 +0000
+++ loco_directory/templates/venues/venue_detail.inc.html	1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
-{% load i18n %}
-<div class="row">
-<section class="span-6">
-	<h2>{{venue_object.name}}</h2>
-	<p>{% include "venues/venue_detail_basic.inc.html" %}</p>
-</section>
-
-{% if venue_object.longitude and venue_object.latitude %}
-<section class="span-6 last alone venue-map" id="venue-map">
-</article>
-<script>
-    $(function(){
-        $('#venue-map').showLocations({
-            markers_list: [{ lat: {{ venue_object.latitude }}, lng: {{ venue_object.longitude }} }],
-            marker_icon: '{{ MEDIA_URL }}img/marker.png'
-        });
-    });
-</script>
-</setion>
-</div>
-{% endif %}
 
=== removed file 'loco_directory/templates/venues/venue_detail_basic.inc.html'
--- loco_directory/templates/venues/venue_detail_basic.inc.html	2012-02-07 14:36:29 +0000
+++ loco_directory/templates/venues/venue_detail_basic.inc.html	1970-01-01 00:00:00 +0000
@@ -1,67 +0,0 @@
-{% load i18n markup %}
-<table>
-{% if venue_object %}
-    {% if venue_object.name %}
-        <tr>
-            <th class="form-item-label" scope="row">{% trans "Location name:" %}</th>
-            <td>{{ venue_object.name }}</td>
-        </tr>
-    {% endif %}
-    {% if venue_object.address %}
-        <tr>
-            <th class="form-item-label" scope="row">{% trans "Address:" %}</th>
-            <td class="form-item-value">{{ venue_object.address }}</td>
-        </tr>
-    {% endif %}
-    {% if venue_object.city %}
-        <tr>
-            <th class="form-item-label" scope="row">{% trans "City:" %}</th>
-            <td class="form-item-value">{{ venue_object.city }}</td>
-        </tr>
-    {% endif %}
-    {% if venue_object.spr %}
-        <tr>
-            <th class="form-item-label" scope="row">{% trans "State/Province/Region:" %}</th>
-            <td class="form-item-value">{{ venue_object.spr }}</td>
-        </tr>
-    {% endif %}
-    {% if venue_object.country %}
-        <tr>
-            <th class="form-item-label" scope="row">{% trans "Country:" %}</th>
-            <td class="form-item-value">{{ venue_object.country }}</td>
-        </tr>
-    {% endif %}
-	{% if venue_object.tz %}
-	<tr>
-			<th class="form-item-label" scope="row">{% trans "Timezone:" %}</th>
-			<td class="form-item-value">{{ venue_object.tz }}</td>
-	</tr>
-	{% endif %}
-    {% if venue_object.venue_url %}
-        <tr>
-            <th class="form-item-label" scope="row">{% trans "Homepage:" %}</th>
-            <td class="form-item-value"><a href="{{ venue_object.venue_url }}">{{ venue_object.venue_url }}</a></td>
-        </tr>
-    {% endif %}
-    {% if venue_object.longitude %}
-        <tr>
-            <th class="form-item-label" scope="row">{% trans "Longitude:" %}</th>
-            <td class="form-item-value">{{ venue_object.longitude }}</td>
-        </tr>
-    {% endif %}
-    {% if venue_object.latitude %}
-        <tr>
-            <th class="form-item-label" scope="row">{% trans "Latitude:" %}</th>
-            <td class="form-item-value">{{ venue_object.latitude }}</td>
-        </tr>
-    {% endif %}
-    {% if venue_object.comment %}
-        <tr>
-            <th class="form-item-label" scope="row">{% trans "Comment:" %}</th>
-            <td class="form-item-value">{{ venue_object.comment|markdown:'safe' }}</td>
-        </tr>
-    {% endif %}
-{% endif %}
-</table>
-
-
 
=== modified file 'loco_directory/templates/venues/venue_list.html'
--- loco_directory/templates/venues/venue_list.html	2012-06-02 11:50:27 +0000
+++ loco_directory/templates/venues/venue_list.html	2013-02-21 20:33:20 +0000
@@ -3,66 +3,84 @@
 
 {% block page_name %}{% trans "Ubuntu LoCo Event Venues" %}{% endblock %}
 
-{% block sub_nav_links %}
-    <li><a class="sub-nav-item" href="{% url venue-new %}">{% trans "Add New Venue" %}</a></li>
-{% endblock %}
-
 {% block content %}
 <div class="row">
-<section class="span-12">
-    <h2>{% trans "Ubuntu LoCo Event Venues" %}</h2>
-
-    {% if continent_list or venues_with_country or venues_without_country %}
-        <p>{% trans "Select a Venue below to see more information about it:" %}</p>
-        {% if continent_list %}
-            {% for continent in continent_list %}
-                <div class="venue-list">
-                        <h3>{{ continent.name }}</h3>
-                        <ul>
+    <section class="span-9">
+        <div class="box_content">
+            <div class="pagelet">
+                <h2>{% trans "Ubuntu LoCo Event Venues" %}</h2>
+                {% if continent_list or venues_with_country or venues_without_country %}
+                    {% if continent_list %}
+                    {% for continent in continent_list %}
+                        <div class="venues-list">
+                            <h2>{{ continent.name }}</h2>
+                            <ul>
                             {% regroup continent.venue_list by country as country_list %}
                             {% for country in country_list %}
-                                <li><h3>{{ country.grouper }}</h3>
+                                <li>
+                                    <h3>{{ country.grouper }}</h3>
                                     {% for venue in country.list %}
-                                        <p><a title="{% trans "show venue details" %}" href="{{ venue.get_absolute_url }}">{{ venue.name }}{% if venue.city %}, {{ venue.city }}{% endif %}{% if venue.spr %}, {{ venue.spr }}{% endif %}</a></p>
+                                    <div class="venue-d">
+                                        <span class="p"></span>
+                                        <div style="float: left; padding: 10px; width:560px;">
+                                            <a href="{{ venue.get_absolute_url }}">{{ venue.name }}</a><br /><br />{% if venue.city %}{{ venue.city }}{% endif %}{% if venue.spr %}, {{ venue.spr }}{% endif %}
+                                            <br />{% if venue.address %}{{ venue.address }}{% else %}{{ venue.latitude }}, {{ venue.longitude }}{% endif %}
+                                        </div>
+                                    </div>
                                     {% endfor %}
                                 </li>
                             {% endfor %}
-                        </ul>
-                    </div>
-            {% endfor %}
-        {% endif %}
-        
-        {% if venues_with_country %}    
-                <div class="venue-list">
-                    <h3>{% trans "Countries without Continent" %}</h3>
-                    <ul>
-                        {% regroup venues_with_country by country as country_list %}
-                        {% for country in country_list %}
-                            <li><h3>{{ country.grouper }}</h3>
-                                {% for venue in country.list %}
-                                    <p><a title="{% trans "show venue details" %}" href="{{ venue.get_absolute_url }}">{{ venue.name }}{% if venue.city %}, {{ venue.city }}{% endif %}{% if venue.spr %}, {{ venue.spr }}{% endif %}</a></p>
+                            </ul>
+                        </div>
+                        {% endfor %}
+                    {% endif %}
+
+                    {% if venues_with_country %}
+                            <div class="venues-list">
+                                <h2>{% trans "Countries without Continent" %}</h2>
+                                <ul>
+                                    {% regroup venues_with_country by country as country_list %}
+                                    {% for country in country_list %}
+                                        <li>
+                                            <h3>{{ country.grouper }}</h3>
+                                            {% for venue in country.list %}
+                                            <div class="venue-d">
+                                                <span class="p"></span>
+                                                <div style="float: left; padding: 10px; width:560px;">
+                                                    <a href="{{ venue.get_absolute_url }}">{{ venue.name }}</a><br /><br />{% if venue.city %}{{ venue.city }}{% endif %}{% if venue.spr %}, {{ venue.spr }}{% endif %}
+                                                    <br />{% if venue.address %}{{ venue.address }}{% else %}{{ venue.latitude }}, {{ venue.longitude }}{% endif %}
+                                                </div>
+                                            </div>
+                                            {% endfor %}
+                                        </li>
+                                    {% endfor %}
+                                </ul>
+                            </div>
+                    {% endif %}
+
+                    {% if venues_without_country %}
+                        <div class="venues-list">
+                            <h2>{% trans "Venues without Country" %}</h2>
+                            <ul>
+                                {% for venue in venues_without_country %}
+                                <li>
+                                    <div class="venue-d">
+                                        <span class="p"></span>
+                                        <div style="float: left; padding: 10px; width:560px;">
+                                            <a href="{{ venue.get_absolute_url }}">{{ venue.name }}</a><br /><br />{% if venue.city %}{{ venue.city }}{% endif %}{% if venue.spr %}, {{ venue.spr }}{% endif %}
+                                            <br />{% if venue.address %}{{ venue.address }}{% else %}{{ venue.latitude }}, {{ venue.longitude }}{% endif %}
+                                        </div>
+                                    </div>
+                                </li>
                                 {% endfor %}
-                            </li>
-                        {% endfor %}
-                    </ul>
-                </div>
-        {% endif %}
-        
-        {% if venues_without_country %}
-            <div class="venue-list">
-                <h3>{% trans "Venues without Country" %}</h3>
-                <ul>
-                    {% for venue in venues_without_country %}
-                        <li>
-                            <p><a title="{% trans "show venue details" %}" href="{{ venue.get_absolute_url }}">{% if venue %}{{ venue.name }}{% else %}{% trans 'No Name' %}{% endif %}{% if venue.city %}, {{ venue.city }}{% endif %}{% if venue.spr %}, {{ venue.spr }}{% endif %}</a></p>
-                        </li>
-                    {% endfor %}
-                </ul>
+                            </ul>
+                        </div>
+                    {% endif %}
+                {% else %}
+                    <p>{% trans "There are currently no LoCo Venues :(" %}</p>
+                {% endif %}
             </div>
-        {% endif %}
-    {% else %}
-        <p>{% trans "There are currently no LoCo Venues :(" %}</p>
-    {% endif %}
-</section>
+        </div>
+    </section>
 </div>
 {% endblock %}
 
=== modified file 'loco_directory/templates/venues/venue_update.html'
--- loco_directory/templates/venues/venue_update.html	2012-12-26 17:23:50 +0000
+++ loco_directory/templates/venues/venue_update.html	2013-02-21 20:33:20 +0000
@@ -15,8 +15,6 @@
                                                  html_lat: $("#id_latitude"),
                                                  html_addr: $("#id_country, #id_spr, #id_city, #id_address, #id_continent"),
                                                  marker_icon: '{{ MEDIA_URL }}img/marker.png'});
-
-        $('span[rel*=help]').colorTip({color:'orange'});
     });
 //]]>
 </script>
@@ -24,16 +22,18 @@
 
 {% block content %}
 <div class="row">
-<section class="span-9">
-    <form action="." method="post" style="width:auto;">{% csrf_token %}
-        <fieldset>
-            <h3>{% if venue_object %}{% trans "Update Venue" %}{% else %}{% trans "New Venue" %}{% endif %}</h3>
-            {{ form.as_template }}
-        </fieldset>
-		{% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %}
-		<input type="submit" name="submit" value="Submit" class="submit-button" /> 
-    </form>
-</section>
+    <section class="span-9">
+        <div class="box_content">
+            <div class="pagelet">
+                <form action="." method="post" class="form">{% csrf_token %}
+                    <h2>{% if venue_object %}{% trans "Update Venue" %}{% else %}{% trans "New Venue" %}{% endif %}</h2>
+                    {{ form.as_template }}
+                    {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %}
+                    <input type="submit" name="submit" value="Submit" class="submit-button" />
+                </form>
+            </div>
+        </div>
+    </section>
 </div>
 
 <section class="minor-content alone venue-map" id="venue-map-selector" title="{% trans "Select venue position" %}">&nbsp;</section>
 
=== modified file 'loco_directory/venues/forms.py'
--- loco_directory/venues/forms.py	2012-12-28 21:03:08 +0000
+++ loco_directory/venues/forms.py	2013-02-21 20:33:20 +0000
@@ -22,14 +22,10 @@
         model = Venue
 
     class Media:
-        css = {'all': (
-                settings.MEDIA_URL + 'css/colortip-1.0-jquery.css',
-                )}
         js = (
                 'http://maps.google.com/maps/api/js?sensor=false&language=%(language)s&region=%(region)s' % {'language': _('en'), 'region': _('US')},
                 'http://google-maps-utility-library-v3.googlecode.com/svn/tags/markerclusterer/1.0/src/markerclusterer_packed.js',
-                settings.MEDIA_URL + 'js/jquery-ubuntu-maps.js',
-                settings.MEDIA_URL + 'js/colortip-1.0-jquery.js',
+                settings.MEDIA_URL + 'js/jquery-ubuntu-maps.js'
             )
 
     def clean(self):
 
=== modified file 'loco_directory/venues/models.py'
--- loco_directory/venues/models.py	2012-12-03 22:19:34 +0000
+++ loco_directory/venues/models.py	2013-02-21 20:33:20 +0000
@@ -7,13 +7,16 @@
 from common.mixins import LocalTimeMixin
 
 import pytz
+import datetime
 
 
 class VenueManager(models.Manager):
     """
     a manager class for Venues
     """
-    pass
+    def next_5_events(self):
+        """ a list with the next 5 events """
+        return self.filter(date_end__gt=datetime.datetime.now()).order_by('date_end')[:5]
 
 
 class Venue(models.Model, LocalTimeMixin):
 
=== modified file 'loco_directory/venues/urls.py'
--- loco_directory/venues/urls.py	2012-06-03 18:23:49 +0000
+++ loco_directory/venues/urls.py	2013-02-21 20:33:20 +0000
@@ -4,10 +4,10 @@
     #venues
     url(r'^$', 'venues.views.venue_list', name='venue-list'),
     url(r'^(?P<country>[\w\s]+)/(?P<venue_id>\d+)/detail/$', 'venues.views.venue_detail', name='venue-detail'),
-    url(r'^(?P<country>[\w\s]+)/(?P<venue_id>\d+)/update/$', 'venues.views.venue_update', name='venue-update'),
+    url(r'^(?P<country>[\w\s]+)/(?P<venue_id>\d+)/edit/$', 'venues.views.venue_update', name='venue-update'),
     url(r'add/$', 'venues.views.venue_new', name='venue-new'),
 
     # Old urls for compatibility
     url(r'^(?P<venue_id>\d+)/detail/$', 'venues.views.venue_detail', kwargs={'country': ''}),
-    url(r'^(?P<venue_id>\d+)/update/$', 'venues.views.venue_update', kwargs={'country': ''}),
+    url(r'^(?P<venue_id>\d+)/edit/$', 'venues.views.venue_update', kwargs={'country': ''}),
 )
 
=== modified file 'loco_directory/venues/views.py'
--- loco_directory/venues/views.py	2012-06-03 18:23:49 +0000
+++ loco_directory/venues/views.py	2013-02-21 20:33:20 +0000
@@ -42,9 +42,11 @@
     """
     detailed view for a venue
     """
-    venue_object = get_object_or_404(Venue, pk=venue_id)
+    venue = get_object_or_404(Venue, pk=venue_id)
+    events = venue.teamevent_set.next_5_events()
     context = {
-        'venue_object': venue_object,
+        'venue': venue,
+        'events': events,
     }
     return render_to_response('venues/venue_detail.html',
                                          context, RequestContext(request))