LoCo Team Portal

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

  1. fix.global-event
  2. Merge into 0.2
Proposed by Adnane Belmadiaf
Status: Merged
Approved by: Adnane Belmadiaf
Approved revision: 584
Merged at revision: 585
Proposed branch: lp:~daker/loco-team-portal/fix.global-event
Merge into: lp:loco-team-portal
Diff against target: 489 lines (+131/-240)
8 files modified
loco_directory/events/admin.py (+6/-1)
loco_directory/events/urls.py (+3/-2)
loco_directory/events/views.py (+8/-5)
loco_directory/media/css/styles.css (+2/-3)
loco_directory/templates/events/global_event_detail.html (+47/-23)
loco_directory/templates/events/global_event_detail.inc.html (+62/-135)
loco_directory/templates/events/global_event_detail_attending_teamevents.inc.html (+3/-4)
loco_directory/templates/events/global_event_detail_basic.inc.html (+0/-67)
To merge this branch: bzr merge lp:~daker/loco-team-portal/fix.global-event
Reviewer Review Type Date Requested Status
LoCo Team Portal Developers Pending
Review via email: mp+141170@code.launchpad.net

Commit message

Fixed the global event layout

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'loco_directory/events/admin.py'
--- loco_directory/events/admin.py 2012-12-04 22:17:11 +0000
+++ loco_directory/events/admin.py 2012-12-22 23:25:26 +0000
@@ -2,7 +2,12 @@
2from django.contrib import admin2from django.contrib import admin
3from .models import *3from .models import *
44
5
6class TeamEventAdmin(admin.ModelAdmin):
7 list_filter = ('global_event',)
8 raw_id_fields = ('venue', 'contact', 'teams', 'global_event')
9
5admin.site.register(Venue)10admin.site.register(Venue)
6admin.site.register(GlobalEvent)11admin.site.register(GlobalEvent)
7admin.site.register(TeamEvent)12admin.site.register(TeamEvent, TeamEventAdmin)
8admin.site.register(Attendee)13admin.site.register(Attendee)
914
=== modified file 'loco_directory/events/urls.py'
--- loco_directory/events/urls.py 2012-12-04 22:17:11 +0000
+++ loco_directory/events/urls.py 2012-12-22 23:25:26 +0000
@@ -12,7 +12,8 @@
1212
13 #global events13 #global events
14 url(r'^global/ical/$', 'events.views.global_event_list_ical', name='global-event-list-ical'),14 url(r'^global/ical/$', 'events.views.global_event_list_ical', name='global-event-list-ical'),
15 url(r'^global/(?P<global_event_id>\d+)/detail/$', 'events.views.global_event_detail', name='global-event-detail'),15 url(r'^global/(?P<global_event_id>\d+)/$', 'events.views.global_event_detail', name='global-event-detail'),
16 url(r'^global/(?P<global_event_id>\d+)/detail/$', 'events.views.global_event_detail', name='global-event-detail-old'),
16 url(r'^global/(?P<global_event_id>\d+)/delete/$', 'events.views.global_event_delete', name='global-event-delete'),17 url(r'^global/(?P<global_event_id>\d+)/delete/$', 'events.views.global_event_delete', name='global-event-delete'),
17 url(r'^global/(?P<global_event_id>\d+)/update/$', 'events.views.global_event_update', name='global-event-update'),18 url(r'^global/(?P<global_event_id>\d+)/update/$', 'events.views.global_event_update', name='global-event-update'),
18 url(r'^global/(?P<global_event_id>\d+)/locations/$', 'events.views.global_event_locations', name='global-event-locations'),19 url(r'^global/(?P<global_event_id>\d+)/locations/$', 'events.views.global_event_locations', name='global-event-locations'),
@@ -21,7 +22,7 @@
21 #team events22 #team events
22 url(r'^locations/$', 'events.views.team_event_locations', name='team-event-locations'),23 url(r'^locations/$', 'events.views.team_event_locations', name='team-event-locations'),
23 url(r'^ical/$', 'events.views.teams_event_list_ical', name='teams-event-list-ical'),24 url(r'^ical/$', 'events.views.teams_event_list_ical', name='teams-event-list-ical'),
24 url(r'^(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/(?P<team_event_id>\d+)-(?P<event_slug>[a-zA-Z0-9\-\.\+?]+)/$', 'events.views.team_event_detail', name='team-event-detail'),25 url(r'^(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/(?P<team_event_id>\d+)-(?P<event_slug>[a-zA-Z0-9\-\_\.\+?]+)/$', 'events.views.team_event_detail', name='team-event-detail'),
25 url(r'^(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/(?P<team_event_id>\d+)/detail/ical/$', 'events.views.event_ical', name='event-ical'),26 url(r'^(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/(?P<team_event_id>\d+)/detail/ical/$', 'events.views.event_ical', name='event-ical'),
26 url(r'^(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/(?P<team_event_id>\d+)/register/$', 'events.views.team_event_register', name='team-event-register'),27 url(r'^(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/(?P<team_event_id>\d+)/register/$', 'events.views.team_event_register', name='team-event-register'),
27 url(r'^(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/(?P<team_event_id>\d+)/detail/$', 'events.views.team_event_detail', name='team-event-detail-old'),28 url(r'^(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/(?P<team_event_id>\d+)/detail/$', 'events.views.team_event_detail', name='team-event-detail-old'),
2829
=== modified file 'loco_directory/events/views.py'
--- loco_directory/events/views.py 2012-12-16 23:28:14 +0000
+++ loco_directory/events/views.py 2012-12-22 23:25:26 +0000
@@ -384,16 +384,18 @@
384 """384 """
385 detailed view for a global event385 detailed view for a global event
386 """386 """
387 global_event_object = get_object_or_404(GlobalEvent, pk=global_event_id)387 global_event = get_object_or_404(GlobalEvent, pk=global_event_id)
388 team_events = global_event.teamevent_set.all()
389
388 add_team_event = (request.user and request.user.is_authenticated() and \390 add_team_event = (request.user and request.user.is_authenticated() and \
389 request.user.groups.exclude(name__exact='ubuntu-lococouncil'))391 request.user.groups.exclude(name__exact='ubuntu-lococouncil'))
390 is_on_lc = launchpad.is_user_on_loco_council(request.user)392 is_on_lc = launchpad.is_user_on_loco_council(request.user)
391393
392 events_without_venue = global_event_object.teamevent_set.filter(venue__isnull=True)394 events_without_venue = team_events.filter(venue__isnull=True)
393 country_ids = [a.venue.country.id for a in global_event_object.teamevent_set.filter(venue__isnull=False,395 country_ids = [a.venue.country.id for a in team_events.filter(venue__isnull=False,
394 venue__country__continents__isnull=False)]396 venue__country__continents__isnull=False)]
395 country_without_continents_ids = [a.venue.country.id \397 country_without_continents_ids = [a.venue.country.id \
396 for a in global_event_object.teamevent_set.filter(venue__isnull=False,398 for a in team_events.filter(venue__isnull=False,
397 venue__country__isnull=False,399 venue__country__isnull=False,
398 venue__country__continents__isnull=True)]400 venue__country__continents__isnull=True)]
399401
@@ -405,7 +407,8 @@
405 continents = Continent.objects.filter(id__in=continent_ids).order_by('name')407 continents = Continent.objects.filter(id__in=continent_ids).order_by('name')
406408
407 context = {409 context = {
408 'global_event_object': global_event_object,410 'global_event': global_event,
411 'team_events': team_events,
409 'add_team_event': add_team_event,412 'add_team_event': add_team_event,
410 'events_without_venue': events_without_venue,413 'events_without_venue': events_without_venue,
411 'user_is_on_lc': is_on_lc,414 'user_is_on_lc': is_on_lc,
412415
=== modified file 'loco_directory/media/css/styles.css'
--- loco_directory/media/css/styles.css 2012-12-18 22:25:30 +0000
+++ loco_directory/media/css/styles.css 2012-12-22 23:25:26 +0000
@@ -45,14 +45,13 @@
45}45}
46*/46*/
4747
48.minor-content.venue-map {48.minor-content .venue-map {
49 min-height: 350px;49 min-height: 350px;
50 margin-top: 60px;50 margin-top: 60px;
51}51}
5252
53.side-content.venue-map {53.venue-map {
54 min-height: 250px;54 min-height: 250px;
55 margin-top: 60px;
56}55}
5756
58#main-content {57#main-content {
5958
=== modified file 'loco_directory/templates/events/global_event_detail.html'
--- loco_directory/templates/events/global_event_detail.html 2012-09-25 21:01:12 +0000
+++ loco_directory/templates/events/global_event_detail.html 2012-12-22 23:25:26 +0000
@@ -1,35 +1,59 @@
1{% extends "base.html" %}1{% extends "base.html" %}
2{% load i18n %}2{% load i18n %}
33
4{% block title %}{{ global_event.name }} | {% trans "Ubuntu LoCo Team Portal" %} {% endblock %}
5
4{% block extrahead %}{{ block.super }}6{% block extrahead %}{{ block.super }}
5 <link rel="stylesheet" type="text/css" href="{{MEDIA_URL}}css/twidenash.css" />7<meta property="fb:app_id" content="127188230723188"/>
6 <script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false&language={% trans 'en' %}&region={% trans 'US' %}"></script>8<meta property="og:title" content="{{ global_event.name }}" />
7 <script type="text/javascript" src="http://google-maps-utility-library-v3.googlecode.com/svn/tags/markerclusterer/1.0/src/markerclusterer_packed.js"></script>9{% if global_event.description %}
8 <script type="text/javascript" src="{{MEDIA_URL}}js/jquery-ubuntu-maps.js"></script>10<meta property="og:description" content="{{ global_event.description|linebreaks|striptags }}" />
9 <script type="text/javascript" src="{{MEDIA_URL}}js/twidenash/jquery-twidenash.js"></script>11{% endif %}
10 <script type="text/javascript"> 12<meta property="og:url" content="http://loco.ubuntu.com{{ global_event.get_absolute_url }}"/>
11 //<![CDATA[13<meta property="og:image" content="http://loco.ubuntu.com/media/images/cof_orange_hex1.png"/>
12 $(function(){14<meta property="og:site_name" content="Loco Team Portal"/>
13 $('.twidenash').twidenash({15<meta property="og:type" content="loco-team-portal:event"/>
14 sources: [16<link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/twidenash.css" />
15 'http://search.twitter.com/',17<script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false&language={% trans 'en' %}&region={% trans 'US' %}"></script>
16 ]18<script type="text/javascript" src="http://google-maps-utility-library-v3.googlecode.com/svn/tags/markerclusterer/1.0/src/markerclusterer_packed.js"></script>
17 });19<script type="text/javascript" src="{{ MEDIA_URL }}js/jquery-ubuntu-maps.js"></script>
18 $('#venue-map').showLocations({markers_url:'{% url global-event-locations global_event_id=global_event_object.id %}',20<script type="text/javascript" src="{{ MEDIA_URL }}js/twidenash/jquery-twidenash.js"></script>
19 marker_icon: '{{ MEDIA_URL }}/img/marker.png'});21<script type="text/javascript">
20 });22//<![CDATA[
21 //]]>23$(function(){
22 </script>24 $('.twidenash').twidenash({
25 sources: [
26 'http://search.twitter.com/',
27 ]
28 });
29 $('#venue-map').showLocations({
30 markers_url:'{% url global-event-locations global_event_id=global_event.id %}',
31 marker_icon: '{{ MEDIA_URL }}img/marker.png'});
32 });
33//]]>
34</script>
35{% if global_event.pictag %}
36<script type="text/javascript" src="{{ MEDIA_URL }}js/jquery.lightbox-0.5.min.js"></script>
37<link rel="stylesheet" href="{{ MEDIA_URL }}css/jquery.lightbox-0.5.css" type="text/css" media="screen" />
38<script type="text/javascript" src="{{ MEDIA_URL }}js/jquery-flickr.js"></script>
39<script type="text/javascript" src="{{ MEDIA_URL }}js/jquery-picasa.js"></script>
40<script type="text/javascript">
41$(function() {
42 var tag = '{{ global_event.pictag }}';
43 var perPage = '27';
44 $('#photo-feed').flickr({ key: "{{ flickr_api_key }}", id: tag, amount: perPage });
45 $('#photo-feed').picasa({ id: tag, amount: perPage });
46});
47</script>
48{% endif %}
23{% endblock %}49{% endblock %}
2450
25{% block title %}{% trans global_event_object.name %} | {% trans "Ubuntu LoCo Team Portal" %} {% endblock %}
26
27{% block sub_nav_links %}51{% block sub_nav_links %}
28<li><a class="sub-nav-item" href="{% url event-list %}">{% trans "Back to Events List" %}</a></li>52<li><a class="sub-nav-item" href="{% url event-list %}">{% trans "Back to Events List" %}</a></li>
29<li><a class="sub-nav-item" href="{% url team-event-select %}?global_event_id={{global_event_object.id}}">{% trans "Add Team Event" %}</a></li>53<li><a class="sub-nav-item" href="{% url team-event-select %}?global_event_id={{ global_event.id }}">{% trans "Add Team Event" %}</a></li>
30{% if user_is_on_lc %}54{% if user_is_on_lc %}
31<li><a class="sub-nav-item" href="{% url global-event-update global_event_object.id %}">{% trans "Edit Details" %}</a></li>55<li><a class="sub-nav-item" href="{% url global-event-update global_event.id %}">{% trans "Edit Details" %}</a></li>
32<li><a class="sub-nav-item" href="{% url global-event-delete global_event_object.id %}">{% trans "Delete Event" %}</a></li>56<li><a class="sub-nav-item" href="{% url global-event-delete global_event.id %}">{% trans "Delete Event" %}</a></li>
33{% endif %}57{% endif %}
34{% endblock %}58{% endblock %}
3559
3660
=== modified file 'loco_directory/templates/events/global_event_detail.inc.html'
--- loco_directory/templates/events/global_event_detail.inc.html 2012-06-04 22:19:53 +0000
+++ loco_directory/templates/events/global_event_detail.inc.html 2012-12-22 23:25:26 +0000
@@ -1,138 +1,65 @@
1{% load i18n teams_tags markup %}1{% load i18n teams_tags markup %}
2{% block extrahead %}{{ block.super }}
3
4{% if global_event_object.pictag %}
5<link rel="stylesheet" href="{{MEDIA_URL}}css/jquery.lightbox-0.5.css" type="text/css" media="screen" />
6<script type="text/javascript" src="{{MEDIA_URL}}js/jquery.lightbox-0.5.min.js"></script>
7<script type="text/javascript" src="{{MEDIA_URL}}js/jquery-flickr.js"></script>
8<script type="text/javascript">
9$(function() {
10 var tag = '{{ global_event_object.pictag }}';
11 var perPage = '27';
12
13{% if flickr_api_key %}
14 $('#photo-feed').flickr({ key: '{{ flickr_api_key }}', tag: tag, amount: 27 });
15{% endif %}
16
17 var PicasaFeedUrl = 'http://picasaweb.google.com/data/feed/api/all?v=2'+
18 '&tag=' + tag + '&alt=json-in-script&kind=photo&max-results=' + perPage + '&thumbsize=75c&callback=?';
19 $.getJSON(PicasaFeedUrl,
20 function(data) {
21 if(!(data.feed && data.feed.entry && data.feed.entry[0])) {
22 return;
23 }
24 $.each(data.feed.entry, function(i, item){
25 var altLink = "#";
26 if(item.media$group.media$content[0].url) {
27 altLink = item.media$group.media$content[0].url;
28 }
29 var title = "Untitled";
30 if(item.media$group.media$description.$t) {
31 title = item.media$group.media$description.$t;
32 }
33 title = title + " by " + item.author[0].name.$t;
34 $("<a/>").attr("class","lightbox").attr("href", altLink).attr("target","_blank").attr("rel","lightbox[picasa]").append(
35 $("<img/>").attr("src", item.media$group.media$thumbnail[0].url).attr("title", title)
36 ).appendTo("#photo-feed");
37 });
38 $("#photo-feed a.lightbox").lightBox();
39 });
40
41
42 $.getJSON('http://api.pix.ie/v0.81/tag/{{ global_event_object.pictag }}/photos.json?oauth_consumer_key=1dcc8233-a6da-46b0-acb0-4e29aa612b30&page=1&perpage='+perPage+'&sortby=recent&extras=items_item_owner,items_item_Description,items_item_sizes_all&jsonp=?',
43 function(data){
44 $.each(data.items, function(i, Photo){
45 var photoStringStart = '<a class="lightbox" rel="lightbox[flickr]" ';
46 var photoStringEnd = 'title="' + Photo.title + '" href="'+
47 Photo.sizes[4].url +'"><img width="75" height="75" src="' + Photo.sizes[1].url + '" alt="' +
48 Photo.title + '"/></a>';
49 var photoString = photoStringStart + photoStringEnd;
50
51 $(photoString).appendTo("#photo-feed");
52 });
53 $("#photo-feed a.lightbox").lightBox();
54 });
55});
56</script>
57
58<script type="text/javascript">
59
60
61</script>
62<style type="text/css">
63div#photo-feed a.lightbox img {
64 border: 5px solid #b3aaa4;
65 margin-left: 5px;
66 margin-right: 5px;
67}
68</style>
69{% endif %}
70{% endblock %}
712
72<div class="row">3<div class="row">
73<section class="span-6">4 <section class="span-9">
74 <h2>{{global_event_object.name}}</h2>5 <div class="box_content">
75 {% if global_event_object.description %}6 <div class="pagelet">
76 <table id="global-event-basic">7 <h2>{{ global_event.name }}</h2>
77 <tr>8 <div class="share">
78 <td class="form-item-value">{{ global_event_object.description|markdown }}</td>9 <div id="fb-root"></div>
79 </tr>10 <script>(function(d, s, id) {
80 </table>11 var js, fjs = d.getElementsByTagName(s)[0];
81 {% endif %}12 if (d.getElementById(id)) {return;}
8213 js = d.createElement(s); js.id = id;
83 <h3>{% trans "Details" %}</h3>14 js.src = "//connect.facebook.net/en_US/all.js#xfbml=1&appId=127188230723188";
84 {% include "events/global_event_detail_basic.inc.html" %}15 fjs.parentNode.insertBefore(js, fjs);
8516 }(document, 'script', 'facebook-jssdk'));</script>
86{% if global_event_object.pictag %}17 <script type="text/javascript" src="https://apis.google.com/js/plusone.js"></script>
87 <div id="photo-feed"></div>18 <script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
88{% endif %}19 <g:plusone size="medium"></g:plusone>
8920 <a href="http://twitter.com/share" class="twitter-share-button" data-lang="en">Tweet</a>
90</section>21 <div class="fb-like" data-href="http://loco.ubuntu.com{% url global-event-detail global_event.id %}" data-send="false" data-layout="button_count" data-width="40" data-show-faces="false" data-font="arial"></div>
9122 </div>
92<section class="span-6 last">23
93 <section id="venue-map" class="side-content alone venue-map"></section>24 <div>
9425 <span class="pictogram calendar"></span>
95 <div class="share">26 <span class="pictogram-l">
96 <a href="http://www.reddit.com/submit" onclick="window.location = 'http://www.reddit.com/submit?url=' + encodeURIComponent(window.location); return false"> <img style="padding-bottom: 4px;"src="http://www.reddit.com/static/spreddit7.gif" alt="submit to reddit" border="0" /></a><br />27 {% ifequal global_event.date_begin|date global_event.date_end|date %}
97 <div id="fb-root"></div>28 {{ global_event.date_begin|date:"D, d N Y H:i" }} - {{ global_event.date_end|date:"H:i T"}}
98 <script>(function(d, s, id) {29 {% else %}
99 var js, fjs = d.getElementsByTagName(s)[0];30 {{ global_event.date_begin|date:"D, d N Y H:i" }} - {{ global_event.date_end|date:"D, d N Y H:i T"}}
100 if (d.getElementById(id)) {return;}31 {% endifequal %}
101 js = d.createElement(s); js.id = id;32 </span>
102 js.src = "//connect.facebook.net/en_US/all.js#xfbml=1&appId=127188230723188";33 </div>
103 fjs.parentNode.insertBefore(js, fjs);34
104 }(document, 'script', 'facebook-jssdk'));</script>35 {% if global_event.announce %}
105 <div class="fb-like" data-href="http://loco.ubuntu.com{% url global-event-detail global_event_object.id %}" data-send="false" data-layout="box_count" data-width="40" data-show-faces="false" data-font="arial"></div>36 <div>
106 <script type="text/javascript" src="https://apis.google.com/js/plusone.js"></script>37 <span class="pictogram announcement"></span>
107 <g:plusone size="tall"></g:plusone>38 <a class="pictogram-l" href="{{ global_event.announce }}">{{ global_event.announce }}</a>
108 <a href="http://twitter.com/share" class="twitter-share-button" data-count="vertical" data-lang="en">Tweet</a>39 </div>
109 <script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>40 {% endif %}
110 <script src="http://www.stumbleupon.com/hostedbadge.php?s=5"></script>41
111 </div>42 {% if global_event.description %}
11243 <p>{{ global_event.description|markdown }}</p>
113{% if global_event_object.teamevent_set.all %}44 {% endif %}
114 {% include "events/global_event_detail_attending_teamevents.inc.html" %}45
115{% endif %}46 <p>{{ global_event.get_participating }}</p>
11647 </div>
117{% if global_event_object.microbloghashtag %}48 <div>
118 <article class="alone">49 <div id="venue-map" class="venue-map"></div>
119 <h2>{% trans "Microblogging" %} #{{global_event_object.microbloghashtag}}</h2>50
120 <div class="twidenash" id="{{ global_event_object.microbloghashtag }}"></div>51 {% if team_events %}
121 </article>52 {% include "events/global_event_detail_attending_teamevents.inc.html" %}
122{% endif %}53 {% endif %}
12354
12455 {% if global_event.pictag %}
125</section>56 <div id="photo-feed"></div>
126</div>57 {% endif %}
12758 </div>
128{% if global_event_object.channel %}59 </div>
129<div class="row " id="webchat">60 </section>
130<section class="span-12">61 <section class="span-3 box_content last">
131 {% if user.is_authenticated %}62 <div class="sidebar-inner">
132 <iframe src="http://webchat.freenode.net/?channels={{ global_event_object.channel }}&prompt=1&uio=OT10cnVlJjEwPXRydWUmMTE9MjM218&nick={{ user.username|irc }}" width="900" height="400"></iframe>63 </div>
133 {% else %}64 </section>
134 <iframe src="http://webchat.freenode.net/?channels={{ global_event_object.channel }}&prompt=1&uio=OT10cnVlJjEwPXRydWUmMTE9MjM218&nick=locodir-user" width="900" height="400"></iframe>65</div>
135 {% endif %}
136 </section>
137</div>
138{% endif %}
13966
=== modified file 'loco_directory/templates/events/global_event_detail_attending_teamevents.inc.html'
--- loco_directory/templates/events/global_event_detail_attending_teamevents.inc.html 2012-02-07 20:10:49 +0000
+++ loco_directory/templates/events/global_event_detail_attending_teamevents.inc.html 2012-12-22 23:25:26 +0000
@@ -1,11 +1,10 @@
1{% load i18n %}1{% load i18n %}
2{% if global_event_object.teamevent_set.all %}2{% if team_events %}
3<p>{{ global_event_object.get_participating }}</p>
4 <table class="basic wide">3 <table class="basic wide">
5 {% for continent in continents %}4 {% for continent in continents %}
6 <thead><tr><th colspan="3">{{ continent.name }}</th></tr></thead>5 <thead><tr><th colspan="3">{{ continent.name }}</th></tr></thead>
7 {% for country in countries %}{% for cont in country.continents.all %}{% ifequal cont continent %}6 {% for country in countries %}{% for cont in country.continents.all %}{% ifequal cont continent %}
8 {% for team_event in global_event_object.teamevent_set.all %}{% ifequal country team_event.venue.country %}7 {% for team_event in team_events %}{% ifequal country team_event.venue.country %}
9 <tr>8 <tr>
10 <td>9 <td>
11 <a title="{% trans 'More Information about Team Event' %}" href="{{ team_event.get_absolute_url }}">{{ team_event.name }}</a>10 <a title="{% trans 'More Information about Team Event' %}" href="{{ team_event.get_absolute_url }}">{{ team_event.name }}</a>
@@ -29,7 +28,7 @@
29 {% for country in countries_without_continents %}28 {% for country in countries_without_continents %}
30 <tr>29 <tr>
31 <td>30 <td>
32 <a title="{% trans 'More Information about Team Event' %}" href="{{ team_event.get_absolute_url }}">{{ team_event.name }}</a>31 <a title="{{ team_event.name }}" href="{{ team_event.get_absolute_url }}">{{ team_event.name }}</a>
33 </td>32 </td>
34 <td>33 <td>
35 {{ country.name }}34 {{ country.name }}
3635
=== removed file 'loco_directory/templates/events/global_event_detail_basic.inc.html'
--- loco_directory/templates/events/global_event_detail_basic.inc.html 2012-02-07 20:10:49 +0000
+++ loco_directory/templates/events/global_event_detail_basic.inc.html 1970-01-01 00:00:00 +0000
@@ -1,67 +0,0 @@
1{% load i18n %}
2{% if global_event_object %}
3 <table id="global-event-basic">
4 {% if global_event_object.date_begin %}
5 <tr>
6 <th class="form-item-label" scope="row">{% trans "When:" %}</th>
7 <td class="form-item-value">
8 {% ifequal global_event_object.date_begin|date global_event_object.date_end|date %}
9 {{ global_event_object.date_begin|date:"D, d N Y H:i" }} - {{ global_event_object.date_end|date:"H:i T"}}
10 {% else %}
11 {{ global_event_object.date_begin|date:"D, d N Y H:i" }} - {{ global_event_object.date_end|date:"D, d N Y H:i T"}}
12 {% endifequal %}
13 </td>
14 </tr>
15 {% endif %}
16
17 {% if global_event_object.announce %}
18 <tr>
19 <th class="form-item-label" scope="row">{% trans "Announcement:" %}</th>
20 <td class="form-item-value"><a href="{{ global_event_object.announce }}">{{global_event_object.announce }}</a></td>
21 </tr>
22 {% endif %}
23
24 {% if global_event_object.microbloghashtag %}
25 <tr>
26 <th class="form-item-label" scope="row">{% trans "Microblog Hashtag:" %}</th>
27 <td class="form-item-value">{{ global_event_object.microbloghashtag }}&nbsp;
28 <a href="http://identi.ca/tag/{{ global_event_object.microbloghashtag }}">
29 <img src="{{MEDIA_URL}}img/identica.ico" alt="{{ global_event_object.microbloghashtag }} on Identi.ca" />
30 </a>&nbsp;
31 <a href="http://twitter.com/#search?q=%23{{ global_event_object.microbloghashtag }}">
32 <img src="{{MEDIA_URL}}img/twitter.ico" alt="{{ global_event_object.microbloghashtag }} on Twitter" />
33 </a>
34 </td>
35 </tr>
36 {% endif %}
37
38 {% if global_event_object.pictag %}
39 <tr>
40 <th class="form-item-label" scope="row">{% trans "Pictag:" %}</th>
41 <td class="form-item-value">{{ global_event_object.pictag }}&nbsp;
42 <a href="http://www.flickr.com/search/?w=all&q={{ global_event_object.pictag }}&m=tags">
43 <img src="{{MEDIA_URL}}img/flickr.ico" alt="{{ global_event_object.pictag }} on Flickr" />
44 </a>&nbsp;
45 <a href="http://picasaweb.google.com/lh/view?tags=%22{{ global_event_object.pictag }}%22&psc=G#">
46 <img src="{{MEDIA_URL}}img/picasa.ico" alt="{{ global_event_object.pictag }} on Picasa" />
47 </a>&nbsp;
48 <a href="http://pix.ie/explore/tag/{{ global_event_object.pictag }}">
49 <img src="{{MEDIA_URL}}img/pixie.ico" alt="{{ global_event_object.pictag }} on Pix.ie" />
50 </a>
51 </td>
52 </tr>
53 {% endif %}
54
55 {% if global_event_object.channel %}
56 <tr>
57 <th class="form-item-label" scope="row">{% trans "Chat Channel:" %}</th>
58 <td class="form-item-value">
59 <a href="#" onclick="$('#webchat').show('fast', function() {$(window).scrollTop($('#webchat').position().top);} );" >{{ global_event_object.channel }}</a>
60 </td>
61 </tr>
62 {% endif %}
63
64 </table>
65
66{% endif %}
67

Subscribers

People subscribed via source and target branches