LoCo Team Portal

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

  1. ltp-fix
  2. Merge into 0.2
Proposed by Adnane Belmadiaf
Status: Merged
Approved by: Chris Johnston
Approved revision: 471
Merged at revision: 472
Proposed branch: lp:~daker/loco-team-portal/ltp-fix
Merge into: lp:loco-team-portal
Diff against target: 137 lines (+17/-17)
6 files modified
loco_directory/templates/base.html (+2/-2)
loco_directory/templates/events/event_list.html (+2/-2)
loco_directory/templates/events/global_event_detail.html (+1/-1)
loco_directory/templates/events/global_event_detail_basic.inc.html (+5/-5)
loco_directory/templates/events/global_event_new.html (+2/-2)
loco_directory/templates/index.html (+5/-5)
To merge this branch: bzr merge lp:~daker/loco-team-portal/ltp-fix
Reviewer Review Type Date Requested Status
LoCo Team Portal Developers Pending
Review via email: mp+72317@code.launchpad.net

Commit message

Fixed media links

To post a comment you must log in.
Revision history for this message
Chris Johnston (cjohnston) wrote :

Approve. Thanks

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'loco_directory/templates/base.html'
2--- loco_directory/templates/base.html 2011-06-29 14:22:51 +0000
3+++ loco_directory/templates/base.html 2011-08-21 00:06:33 +0000
4@@ -6,8 +6,8 @@
5 {% block logo_text %}{% trans "LoCo Team Directory" %}{% endblock %}
6
7 {% block extrahead %}
8- <link rel="stylesheet" type="text/css" href="{{MEDIA_URL}}/css/newstyle.css" />
9- <script type="text/javascript" src="{{MEDIA_URL}}/jquery/jquery.js"></script>
10+ <link rel="stylesheet" type="text/css" href="{{MEDIA_URL}}css/newstyle.css" />
11+ <script type="text/javascript" src="{{MEDIA_URL}}jquery/jquery.js"></script>
12 {% endblock %}
13
14 {% block top_nav_login_links %}
15
16=== modified file 'loco_directory/templates/events/event_list.html'
17--- loco_directory/templates/events/event_list.html 2011-02-17 20:05:03 +0000
18+++ loco_directory/templates/events/event_list.html 2011-08-21 00:06:33 +0000
19@@ -32,7 +32,7 @@
20 <h2>{% trans "Ubuntu LoCo Global Events" %}
21 {% if global_event_list %}
22 <a class="global_event_ical" href="{% url global-event-list-ical %}">
23-<img src="/media/images/ical.png" title="{% trans "Global Events as ical" %}"/></a></h2>
24+<img src="{{MEDIA_URL}}images/ical.png" title="{% trans "Global Events as ical" %}"/></a></h2>
25
26 <p>{% trans "Select a global event below to see more information about it:" %}</p>
27
28@@ -51,7 +51,7 @@
29 <h2>{% trans "Ubuntu LoCo Team Events" %}
30 {% if team_event_list %}
31 <a class="teams_event_ical" href="{% url teams-event-list-ical %}">
32-<img src="/media/images/ical.png" title="{% trans "Team Events as ical" %}"/></a></h2>
33+<img src="{{MEDIA_URL}}images/ical.png" title="{% trans "Team Events as ical" %}"/></a></h2>
34 <p>{% trans "Select a team event below to see more information about it:" %}</p>
35
36 {% include "events/team_event_list.inc.html" %}
37
38=== modified file 'loco_directory/templates/events/global_event_detail.html'
39--- loco_directory/templates/events/global_event_detail.html 2011-03-18 15:06:54 +0000
40+++ loco_directory/templates/events/global_event_detail.html 2011-08-21 00:06:33 +0000
41@@ -2,7 +2,7 @@
42 {% load i18n %}
43
44 {% block extrahead %}{{ block.super }}
45- <link rel="stylesheet" type="text/css" href="{{MEDIA_URL}}/css/twidenash.css" />
46+ <link rel="stylesheet" type="text/css" href="{{MEDIA_URL}}css/twidenash.css" />
47 <script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false&language={% trans 'en' %}&region={% trans 'US' %}"></script>
48 <script type="text/javascript" src="http://google-maps-utility-library-v3.googlecode.com/svn/tags/markerclusterer/1.0/src/markerclusterer_packed.js"></script>
49 <script type="text/javascript" src="{{MEDIA_URL}}js/jquery-ubuntu-maps.js"></script>
50
51=== modified file 'loco_directory/templates/events/global_event_detail_basic.inc.html'
52--- loco_directory/templates/events/global_event_detail_basic.inc.html 2011-03-18 15:13:56 +0000
53+++ loco_directory/templates/events/global_event_detail_basic.inc.html 2011-08-21 00:06:33 +0000
54@@ -26,10 +26,10 @@
55 <th class="form-item-label" scope="row">{% trans "Microblog Hashtag:" %}</th>
56 <td class="form-item-value">{{ global_event_object.microbloghashtag }}&nbsp;
57 <a href="http://identi.ca/tag/{{ global_event_object.microbloghashtag }}">
58- <img src="/media/img/identica.ico" alt="{{ global_event_object.microbloghashtag }} on Identi.ca" />
59+ <img src="{{MEDIA_URL}}img/identica.ico" alt="{{ global_event_object.microbloghashtag }} on Identi.ca" />
60 </a>&nbsp;
61 <a href="http://twitter.com/#search?q=%23{{ global_event_object.microbloghashtag }}">
62- <img src="/media/img/twitter.ico" alt="{{ global_event_object.microbloghashtag }} on Twitter" />
63+ <img src="{{MEDIA_URL}}img/twitter.ico" alt="{{ global_event_object.microbloghashtag }} on Twitter" />
64 </a>
65 </td>
66 </tr>
67@@ -40,13 +40,13 @@
68 <th class="form-item-label" scope="row">{% trans "Pictag:" %}</th>
69 <td class="form-item-value">{{ global_event_object.pictag }}&nbsp;
70 <a href="http://www.flickr.com/search/?w=all&q={{ global_event_object.pictag }}&m=tags">
71- <img src="/media/img/flickr.ico" alt="{{ global_event_object.pictag }} on Flickr" />
72+ <img src="{{MEDIA_URL}}img/flickr.ico" alt="{{ global_event_object.pictag }} on Flickr" />
73 </a>&nbsp;
74 <a href="http://picasaweb.google.com/lh/view?tags=%22{{ global_event_object.pictag }}%22&psc=G#">
75- <img src="/media/img/picasa.ico" alt="{{ global_event_object.pictag }} on Picasa" />
76+ <img src="{{MEDIA_URL}}img/picasa.ico" alt="{{ global_event_object.pictag }} on Picasa" />
77 </a>&nbsp;
78 <a href="http://pix.ie/explore/tag/{{ global_event_object.pictag }}">
79- <img src="/media/img/pixie.ico" alt="{{ global_event_object.pictag }} on Pix.ie" />
80+ <img src="{{MEDIA_URL}}img/pixie.ico" alt="{{ global_event_object.pictag }} on Pix.ie" />
81 </a>
82 </td>
83 </tr>
84
85=== modified file 'loco_directory/templates/events/global_event_new.html'
86--- loco_directory/templates/events/global_event_new.html 2011-03-13 15:35:40 +0000
87+++ loco_directory/templates/events/global_event_new.html 2011-08-21 00:06:33 +0000
88@@ -5,8 +5,8 @@
89
90 {% block extrahead %}{{ block.super }}
91 {{form.media}}
92-<script type="text/javascript" src="{{MEDIA_URL}}/js/colortip-1.0-jquery.js"></script>
93-<link rel="stylesheet" type="text/css" href="{{MEDIA_URL}}/css/colortip-1.0-jquery.css"/>
94+<script type="text/javascript" src="{{MEDIA_URL}}js/colortip-1.0-jquery.js"></script>
95+<link rel="stylesheet" type="text/css" href="{{MEDIA_URL}}css/colortip-1.0-jquery.css"/>
96 {% endblock %}
97
98 {% block extrafooter %}
99
100=== modified file 'loco_directory/templates/index.html'
101--- loco_directory/templates/index.html 2011-03-18 15:06:54 +0000
102+++ loco_directory/templates/index.html 2011-08-21 00:06:33 +0000
103@@ -7,8 +7,8 @@
104 {% endblock %}
105
106 {% block extrahead %}{{block.super}}
107- <link rel="stylesheet" type="text/css" href="{{MEDIA_URL}}/css/twidenash.css" />
108- <link rel="stylesheet" type="text/css" href="{{MEDIA_URL}}/css/continents.css" />
109+ <link rel="stylesheet" type="text/css" href="{{MEDIA_URL}}css/twidenash.css" />
110+ <link rel="stylesheet" type="text/css" href="{{MEDIA_URL}}css/continents.css" />
111 <script type="text/javascript" src="{{MEDIA_URL}}js/twidenash/jquery-twidenash.js"></script>
112 <script type="text/javascript">
113 //<![CDATA[
114@@ -62,7 +62,7 @@
115 {% if global_event_list %}
116 <h3>{% trans "Global Events" %}
117 <a class="global_event_ical" href="{% url global-event-list-ical %}">
118- <img src="/media/images/ical.png" title="{% trans "Global Events as ical" %}"/></a></h3>
119+ <img src="{{MEDIA_URL}}images/ical.png" title="{% trans "Global Events as ical" %}"/></a></h3>
120
121 <p>{% trans "Select a global event below to see more information about it:" %}</p>
122
123@@ -75,13 +75,13 @@
124 {% if team_event_count %}
125 <h3><a href="{% url event-list %}">{{ team_event_count }} {% trans "Upcoming Team Events" %}</a>
126 <a class="teams_event_ical" href="{% url teams-event-list-ical %}">
127- <img src="/media/images/ical.png" title="{% trans "Team Events as ical" %}"/></a></h3>
128+ <img src="{{MEDIA_URL}}images/ical.png" title="{% trans "Team Events as ical" %}"/></a></h3>
129 {% endif %}
130
131 {% if team_meeting_count %}
132 <h3><a href="{% url meeting-list %}">{{ team_meeting_count }} {% trans "Upcoming Team Meetings" %}</a>
133 <a class="teams_meeting_ical" href="{% url teams-meeting-list-ical %}">
134- <img src="/media/images/ical.png" title="{% trans "Team Meetings as ical" %}"/></a></h3>
135+ <img src="{{MEDIA_URL}}images/ical.png" title="{% trans "Team Meetings as ical" %}"/></a></h3>
136 {% endif %}
137 </article>
138

Subscribers

People subscribed via source and target branches