Summit

Merge lp:~cjohnston/summit/css-js-async-links into lp:summit

  1. css-js-async-links
  2. Merge into trunk
Proposed by Chris Johnston
Status: Merged
Approved by: Chris Johnston
Approved revision: 522
Merged at revision: 522
Proposed branch: lp:~cjohnston/summit/css-js-async-links
Merge into: lp:summit
Diff against target: 155 lines (+1/-45)
10 files modified
summit/schedule/forms.py (+0/-4)
summit/schedule/templates/schedule/attend.html (+0/-5)
summit/schedule/templates/schedule/create_meeting.html (+0/-5)
summit/schedule/templates/schedule/edit_hangout.html (+0/-5)
summit/schedule/templates/schedule/edit_meeting.html (+0/-5)
summit/schedule/templates/schedule/meeting_review.html (+0/-5)
summit/schedule/templates/schedule/org_attend.html (+0/-5)
summit/schedule/templates/schedule/org_edit_meeting.html (+0/-5)
summit/schedule/templates/schedule/propose_meeting.html (+0/-5)
summit/settings.py (+1/-1)
To merge this branch: bzr merge lp:~cjohnston/summit/css-js-async-links
Reviewer Review Type Date Requested Status
Adnane Belmadiaf Approve
Chris Johnston Needs Resubmitting
Review via email: mp+157573@code.launchpad.net

Commit message

Removes links to colortip CSS/JS in favor of loading it async

To post a comment you must log in.
Revision history for this message
Adnane Belmadiaf (daker) wrote :

+1

review: Approve
Revision history for this message
Tarmac WebDev (tarmac-webdev) wrote :

Attempt to merge into lp:summit failed due to conflicts:

text conflict in summit/settings.py

lp:~cjohnston/summit/css-js-async-links updated
522. By Chris Johnston

Cleanup conflict

Revision history for this message
Chris Johnston (cjohnston) :
review: Needs Resubmitting
Revision history for this message
Adnane Belmadiaf (daker) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'summit/schedule/forms.py'
2--- summit/schedule/forms.py 2013-03-09 05:14:19 +0000
3+++ summit/schedule/forms.py 2013-04-08 16:58:21 +0000
4@@ -40,10 +40,6 @@
5 required=False
6 )
7
8- class Media:
9- css = {'all': ('/media/css/colortip-1.0-jquery.css',)}
10- js = ('/media/js/colortip-1.0-jquery.js',)
11-
12 def __init__(self, *args, **kwargs):
13 if 'instance' in kwargs:
14 if kwargs['instance'].pk is not None:
15
16=== modified file 'summit/schedule/templates/schedule/attend.html'
17--- summit/schedule/templates/schedule/attend.html 2013-03-07 22:33:12 +0000
18+++ summit/schedule/templates/schedule/attend.html 2013-04-08 16:58:21 +0000
19@@ -3,11 +3,6 @@
20 {% block page_name %}Attend {{ meeting }} - {{ summit.title }}{%endblock %}
21 {% block sub_nav %}{% endblock %}
22
23-{% block extrahead %}{{ block.super }}
24- <script type="text/javascript" src="{{MEDIA_URL}}js/colortip-1.0-jquery.js"></script>
25- <link rel="stylesheet" type="text/css" href="{{MEDIA_URL}}css/colortip-1.0-jquery.css"/>
26-{% endblock %}
27-
28 {% block closure %}
29 <script type="text/javascript"><!--
30 $(document).ready(function(){
31
32=== modified file 'summit/schedule/templates/schedule/create_meeting.html'
33--- summit/schedule/templates/schedule/create_meeting.html 2013-03-07 22:33:12 +0000
34+++ summit/schedule/templates/schedule/create_meeting.html 2013-04-08 16:58:21 +0000
35@@ -3,11 +3,6 @@
36 {% block page_name %}Create a Meeting - {{ summit.title }}{%endblock %}
37 {% block sub_nav %}{% endblock %}
38
39-{% block extrahead %}{{ block.super }}
40- <script type="text/javascript" src="{{MEDIA_URL}}js/colortip-1.0-jquery.js"></script>
41- <link rel="stylesheet" type="text/css" href="{{MEDIA_URL}}css/colortip-1.0-jquery.css"/>
42-{% endblock %}
43-
44 {% block closure %}
45 <script type="text/javascript"><!--
46 $(document).ready(function(){
47
48=== modified file 'summit/schedule/templates/schedule/edit_hangout.html'
49--- summit/schedule/templates/schedule/edit_hangout.html 2013-03-07 22:33:12 +0000
50+++ summit/schedule/templates/schedule/edit_hangout.html 2013-04-08 16:58:21 +0000
51@@ -3,11 +3,6 @@
52 {% block page_name %}Edit Hangout - {{ summit.title }}{%endblock %}
53 {% block sub_nav %}{% endblock %}
54
55-{% block extrahead %}{{ block.super }}
56- <script type="text/javascript" src="{{MEDIA_URL}}js/colortip-1.0-jquery.js"></script>
57- <link rel="stylesheet" type="text/css" href="{{MEDIA_URL}}css/colortip-1.0-jquery.css"/>
58-{% endblock %}
59-
60 {% block closure %}
61 <script type="text/javascript"><!--
62 $(document).ready(function(){
63
64=== modified file 'summit/schedule/templates/schedule/edit_meeting.html'
65--- summit/schedule/templates/schedule/edit_meeting.html 2013-03-07 22:33:12 +0000
66+++ summit/schedule/templates/schedule/edit_meeting.html 2013-04-08 16:58:21 +0000
67@@ -3,11 +3,6 @@
68 {% block page_name %}Edit Meeting - {{ summit.title }}{%endblock %}
69 {% block sub_nav %}{% endblock %}
70
71-{% block extrahead %}{{ block.super }}
72- <script type="text/javascript" src="{{MEDIA_URL}}js/colortip-1.0-jquery.js"></script>
73- <link rel="stylesheet" type="text/css" href="{{MEDIA_URL}}css/colortip-1.0-jquery.css"/>
74-{% endblock %}
75-
76 {% block closure %}
77 <script type="text/javascript"><!--
78 $(document).ready(function(){
79
80=== modified file 'summit/schedule/templates/schedule/meeting_review.html'
81--- summit/schedule/templates/schedule/meeting_review.html 2013-03-07 22:33:12 +0000
82+++ summit/schedule/templates/schedule/meeting_review.html 2013-04-08 16:58:21 +0000
83@@ -3,11 +3,6 @@
84 {% block page_name %}Review Meeting - {{ summit.title }}{%endblock %}
85 {% block sub_nav %}{% endblock %}
86
87-{% block extrahead %}{{ block.super }}
88- <script type="text/javascript" src="{{MEDIA_URL}}js/colortip-1.0-jquery.js"></script>
89- <link rel="stylesheet" type="text/css" href="{{MEDIA_URL}}css/colortip-1.0-jquery.css"/>
90-{% endblock %}
91-
92 {% block closure %}
93 <script type="text/javascript"><!--
94 $(document).ready(function(){
95
96=== modified file 'summit/schedule/templates/schedule/org_attend.html'
97--- summit/schedule/templates/schedule/org_attend.html 2013-03-07 22:33:12 +0000
98+++ summit/schedule/templates/schedule/org_attend.html 2013-04-08 16:58:21 +0000
99@@ -3,11 +3,6 @@
100 {% block page_name %}Change {{ attendee.name }}'s attendance to {{ meeting }} - {{ summit.title }}{%endblock %}
101 {% block sub_nav %}{% endblock %}
102
103-{% block extrahead %}{{ block.super }}
104- <script type="text/javascript" src="{{MEDIA_URL}}js/colortip-1.0-jquery.js"></script>
105- <link rel="stylesheet" type="text/css" href="{{MEDIA_URL}}css/colortip-1.0-jquery.css"/>
106-{% endblock %}
107-
108 {% block closure %}
109 <script type="text/javascript"><!--
110 $(document).ready(function(){
111
112=== modified file 'summit/schedule/templates/schedule/org_edit_meeting.html'
113--- summit/schedule/templates/schedule/org_edit_meeting.html 2013-03-07 22:33:12 +0000
114+++ summit/schedule/templates/schedule/org_edit_meeting.html 2013-04-08 16:58:21 +0000
115@@ -3,11 +3,6 @@
116 {% block page_name %}Edit Meeting - {{ summit.title }}{%endblock %}
117 {% block sub_nav %}{% endblock %}
118
119-{% block extrahead %}{{ block.super }}
120- <script type="text/javascript" src="{{MEDIA_URL}}js/colortip-1.0-jquery.js"></script>
121- <link rel="stylesheet" type="text/css" href="{{MEDIA_URL}}css/colortip-1.0-jquery.css"/>
122-{% endblock %}
123-
124 {% block closure %}
125 <script type="text/javascript"><!--
126 $(document).ready(function(){
127
128=== modified file 'summit/schedule/templates/schedule/propose_meeting.html'
129--- summit/schedule/templates/schedule/propose_meeting.html 2013-03-07 22:33:12 +0000
130+++ summit/schedule/templates/schedule/propose_meeting.html 2013-04-08 16:58:21 +0000
131@@ -3,11 +3,6 @@
132 {% block page_name %}Propse a Meeting - {{ summit.title }}{%endblock %}
133 {% block sub_nav %}{% endblock %}
134
135-{% block extrahead %}{{ block.super }}
136- <script type="text/javascript" src="{{MEDIA_URL}}js/colortip-1.0-jquery.js"></script>
137- <link rel="stylesheet" type="text/css" href="{{MEDIA_URL}}css/colortip-1.0-jquery.css"/>
138-{% endblock %}
139-
140 {% block closure %}
141 <script type="text/javascript"><!--
142 $(document).ready(function(){
143
144=== modified file 'summit/settings.py'
145--- summit/settings.py 2013-04-07 23:42:24 +0000
146+++ summit/settings.py 2013-04-08 16:58:21 +0000
147@@ -167,7 +167,7 @@
148 'bzr_apps': ('http://bazaar.launchpad.net/~django-foundations-dev/ubuntu-django-foundations/bzr_apps', '7'),
149
150 ## ubuntu-website supplied templates and styles
151- 'ubuntu_website': ('http://bazaar.launchpad.net/~ubuntu-community-webthemes/ubuntu-community-webthemes/light-django-theme', '64'),
152+ 'ubuntu_website': ('http://bazaar.launchpad.net/~ubuntu-community-webthemes/ubuntu-community-webthemes/light-django-theme', '65'),
153
154 ## linaro-website supplied templates and styles
155 'linaro_website': ('http://bazaar.launchpad.net/~linaro-connect-theme-devs/ubuntu-community-webthemes/light-django-linaro-theme', '52'),

Subscribers

People subscribed via source and target branches