Merge lp:~cjohnston/summit/mobile-display into lp:~sil/summit/redo-mobile-summit

Proposed by Chris Johnston on 2012-03-31
Status: Needs review
Proposed branch: lp:~cjohnston/summit/mobile-display
Merge into: lp:~sil/summit/redo-mobile-summit
Diff against target: 1627 lines (+523/-464)
39 files modified
.bzrignore (+0/-2)
setup.py (+1/-1)
summit/common/templates/base.html (+10/-25)
summit/common/templates/common/index.html (+1/-22)
summit/media/css/layout.css (+0/-3)
summit/media/css/mobile.css (+31/-0)
summit/media/css/site.css (+132/-0)
summit/media/css/style.css (+0/-68)
summit/schedule/admin/agendaadmin.py (+1/-1)
summit/schedule/admin/meetingadmin.py (+1/-1)
summit/schedule/admin/summitadmin.py (+1/-1)
summit/schedule/forms.py (+6/-68)
summit/schedule/render.py (+1/-1)
summit/schedule/templates/schedule/actions.html (+3/-0)
summit/schedule/templates/schedule/create_meeting.html (+1/-1)
summit/schedule/templates/schedule/daily.html (+100/-163)
summit/schedule/templates/schedule/edit_meeting.html (+2/-3)
summit/schedule/templates/schedule/meeting.html (+7/-4)
summit/schedule/templates/schedule/meeting_review.html (+2/-2)
summit/schedule/templates/schedule/mine.html (+113/-0)
summit/schedule/templates/schedule/nextsession.html (+1/-1)
summit/schedule/templates/schedule/nosession.html (+1/-1)
summit/schedule/templates/schedule/org_edit_meeting.html (+2/-2)
summit/schedule/templates/schedule/past_summit.html (+1/-3)
summit/schedule/templates/schedule/propose_meeting.html (+2/-2)
summit/schedule/templates/schedule/review.html (+1/-1)
summit/schedule/templates/schedule/schedule.html (+23/-3)
summit/schedule/templates/schedule/schedule_list.html (+1/-1)
summit/schedule/templates/schedule/summit.html (+13/-70)
summit/schedule/templates/schedule/summit_info.html (+1/-1)
summit/schedule/views.py (+50/-1)
summit/settings.py (+5/-5)
summit/sponsor/templates/sponsor/nonlaunchpadstep0.html (+1/-1)
summit/sponsor/templates/sponsor/nonlaunchpadstep1.html (+1/-1)
summit/sponsor/templates/sponsor/suggeststep0.html (+1/-1)
summit/sponsor/templates/sponsor/suggeststep1.html (+1/-1)
summit/ubuntu_settings.py (+1/-1)
summit/urls.py (+2/-0)
summit/version (+2/-2)
To merge this branch: bzr merge lp:~cjohnston/summit/mobile-display
Reviewer Review Type Date Requested Status
Stuart Langridge 2012-03-31 Pending
Review via email: mp+100308@code.launchpad.net

Description of the change

Makes some changes to make some things work... Removes the logo, removes the header text.. Moves CSS/JS to the closure block at the bottom of the page.

To post a comment you must log in.
lp:~cjohnston/summit/mobile-display updated on 2012-04-05
330. By Chris Johnston on 2012-03-31

[r=chrisjohnston] Updates the revno for the Ubuntu theme again

331. By Chris Johnston on 2012-03-31

[r=chrisjohnston] Makes the table look a little better on the main Summit page

332. By Chris Johnston on 2012-04-02

[r=chrisjohnston] Makes changes to what is displayed in the admin view area

333. By Chris Johnston on 2012-04-02

[r=chrisjohnston] Fixes the traceback we are getting via email

334. By Chris Johnston on 2012-04-02

Version 1.0.9 release

335. By Chris Johnston on 2012-04-05

Moves mobile CSS out of template pages

336. By Chris Johnston on 2012-04-05

Further mobile changes

Unmerged revisions

336. By Chris Johnston on 2012-04-05

Further mobile changes

335. By Chris Johnston on 2012-04-05

Moves mobile CSS out of template pages

334. By Chris Johnston on 2012-04-02

Version 1.0.9 release

333. By Chris Johnston on 2012-04-02

[r=chrisjohnston] Fixes the traceback we are getting via email

332. By Chris Johnston on 2012-04-02

[r=chrisjohnston] Makes changes to what is displayed in the admin view area

331. By Chris Johnston on 2012-03-31

[r=chrisjohnston] Makes the table look a little better on the main Summit page

330. By Chris Johnston on 2012-03-31

[r=chrisjohnston] Updates the revno for the Ubuntu theme again

329. By Chris Johnston on 2012-03-31

[r=chrisjohnston] Fixes a couple of HTML issues that need to be cleaned up.

328. By Chris Johnston on 2012-03-31

[r=chrisjohnston] Allows a meeting to be copied and create a second duplicate meeting.

327. By Chris Johnston on 2012-03-31

[r=chrisjohnston] Updates Django version in setup.py

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file '.bzrignore'
--- .bzrignore 2012-03-13 18:44:45 +0000
+++ .bzrignore 2012-04-05 23:27:19 +0000
@@ -10,5 +10,3 @@
10www10www
11README11README
12env12env
13ubuntu_settings.py
14django.wsgi
1513
=== modified file 'setup.py'
--- setup.py 2011-05-13 07:46:55 +0000
+++ setup.py 2012-04-05 23:27:19 +0000
@@ -41,7 +41,7 @@
41 packages = packages,41 packages = packages,
42 zip_safe = False,42 zip_safe = False,
43 install_requires = [43 install_requires = [
44 "Django==1.1.1",44 "Django==1.3.1",
45 "psycopg2>=2.0.9",45 "psycopg2>=2.0.9",
46 "pytz",46 "pytz",
47 "BeautifulSoup",47 "BeautifulSoup",
4848
=== modified file 'summit/common/templates/base.html'
--- summit/common/templates/base.html 2012-03-23 16:28:03 +0000
+++ summit/common/templates/base.html 2012-04-05 23:27:19 +0000
@@ -6,26 +6,11 @@
6 Developer Summit6 Developer Summit
7{% endblock %}7{% endblock %}
88
9{% block extrahead %}9{% block extrastyles %}
10 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
11 <link rel="stylesheet" type="text/css" media="screen" href="/media/css/layout.css" /> 10 <link rel="stylesheet" type="text/css" media="screen" href="/media/css/layout.css" />
12 <link rel="stylesheet" type="text/css" media="screen" href="/media/css/style.css" /> 11 <link rel="stylesheet" type="text/css" media="screen" href="/media/css/twidenash.css" />
13 <link rel="stylesheet" type="text/css" media="screen" href="/media/css/twidenash.css" /> 12 <link rel="stylesheet" type="text/css" media="screen" href="/media/css/site.css" />
14 {% block 960css %}<!--<link rel="stylesheet" type="text/css" href="{{ubuntu_website_media}}/css/960.css" />-->{% endblock %}13 <link rel="stylesheet" type="text/css" media="handheld" href="/media/css/mobile.css" />
15{% block head %}
16 <script type="text/javascript">
17 var _gaq = _gaq || [];
18 _gaq.push(['_setAccount', 'UA-26810861-1']);
19 _gaq.push(['_trackPageview']);
20
21 (function() {
22 var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
23 ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
24 var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
25 })();
26 </script>
27{% endblock %}
28
29{% endblock %}14{% endblock %}
3015
31{% block top_nav_login_links %}16{% block top_nav_login_links %}
@@ -47,7 +32,7 @@
47 {% menu main_menu %}32 {% menu main_menu %}
48 <ul class="clearfix">33 <ul class="clearfix">
49 {% for item in menuitems %}34 {% for item in menuitems %}
50 <li{% if item.current %} class='active'{% endif %}><a class="main-nav-item" href="{{ item.url }}" title="{{ item.title|escape }}">{{ item.title }}</a></li>35 <li{% if item.current %} class='active'{% endif %} id="main-nav"><a class="main-nav-item" href="{{ item.url }}" title="{{ item.title|escape }}">{{ item.title }}</a></li>
51 {% endfor %}36 {% endfor %}
52 </ul>37 </ul>
53{% endblock %}38{% endblock %}
@@ -59,11 +44,11 @@
5944
6045
61{% block messages %}46{% block messages %}
62 {% if messages %}47 {% if messages %}
63 {% for message in messages %}48 {% for message in messages %}
64 <div class = 'message' ><div class = 'content-shim' >{{ message }}</div></div>49 <div class = 'message' ><div class = 'content-shim' >{{ message }}</div></div>
65 {% endfor %}50 {% endfor %}
66 {% endif %}51 {% endif %}
67{% endblock %}52{% endblock %}
6853
69{% block content %}54{% block content %}
7055
=== modified file 'summit/common/templates/common/index.html'
--- summit/common/templates/common/index.html 2012-03-23 23:51:49 +0000
+++ summit/common/templates/common/index.html 2012-04-05 23:27:19 +0000
@@ -2,26 +2,7 @@
2{% load datetime %}2{% load datetime %}
33
4{% block page_name %}Home{%endblock %}4{% block page_name %}Home{%endblock %}
5{% block head %}5{% block extrahead %}{{ block.super }}{% endblock %}
6<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
7{{ block.super }}
8<style>
9/* Mobile-friendly styles */
10@media screen and (max-width: 481px) {
11 aside#top-nav, header#page-header, aside#page-related, footer#page-footer, section#main-section .container, article.main-content, .container, #main-nav, .minor-content, #page-footer div.container, .wrapper, .inner-wrapper {
12 width: auto;
13 margin: 0; padding: 0;
14 }
15 #page-header { text-align: center; }
16 #page-header a { height: 24px; line-height: 1; float: none; display: inline; }
17 #top-logo { display: none; }
18 .minor-content {
19 text-align: center;
20 }
21}
22
23</style>
24{% endblock %}
256
26{% block sub_nav %}{% endblock %}7{% block sub_nav %}{% endblock %}
278
@@ -30,9 +11,7 @@
30<article class="span-12">11<article class="span-12">
31 {% if summit %}12 {% if summit %}
32 <h1><a href="/{{ summit.name }}">{{ summit.title }} &rsaquo;</a></h1>13 <h1><a href="/{{ summit.name }}">{{ summit.title }} &rsaquo;</a></h1>
33 <p>
34 {% include "schedule/summit_info.html" %}14 {% include "schedule/summit_info.html" %}
35 </p>
36 {% else %}15 {% else %}
37 <p>No summits registered.</p>16 <p>No summits registered.</p>
38 {% endif %}17 {% endif %}
3918
=== modified file 'summit/media/css/layout.css'
--- summit/media/css/layout.css 2012-03-02 22:03:57 +0000
+++ summit/media/css/layout.css 2012-04-05 23:27:19 +0000
@@ -32,6 +32,3 @@
32 float: left;32 float: left;
33 list-style-type: none;33 list-style-type: none;
34}34}
35
36
37
3835
=== added file 'summit/media/css/mobile.css'
--- summit/media/css/mobile.css 1970-01-01 00:00:00 +0000
+++ summit/media/css/mobile.css 2012-04-05 23:27:19 +0000
@@ -0,0 +1,31 @@
1 aside#top-nav, header#page-header, aside#page-related, article.main-content, .wrapper, .inner-wrapper article {
2 width: 100%;
3 margin: 0; padding: 0; margin-left: 3px; margin-right: 3px;
4 }
5 .span-4, footer, #main-nav, footer .logo-ubuntu, .nav-secondary { display: none; }
6 #page-header { text-align: center; }
7 #page-header a { height: 24px; line-height: 1; float: none; display: inline; }
8 .span-8, .span-9, .span-3, .span-12 { width: 100%; }
9 table.schedule { width: 100%; margin: 0; padding: 0; border-width: 0; }
10 table.column { width: 100%; margin: 0; padding: 0; border-width: 0; }
11 table.column td { display: block; width: 100%; margin: 0; padding: 0; border-width: 0; }
12 table.column td ul {
13 width: 100%;
14 margin: 0;
15 padding: 0;
16 }
17 table.column td ul li {
18 background: #efefef;
19 border-bottom: 1px solid black;
20 list-style: none;
21 text-align: center;
22 font-size: 24px;
23 line-height: 24px;
24 min-height: 24px;
25 width: 100%;
26 display: block;
27 padding: 4px 0;
28 margin: 0;
29 }
30 #fb-root * { width: auto; }
31
032
=== added file 'summit/media/css/site.css'
--- summit/media/css/site.css 1970-01-01 00:00:00 +0000
+++ summit/media/css/site.css 2012-04-05 23:27:19 +0000
@@ -0,0 +1,132 @@
1TABLE img.icon {
2 vertical-align: bottom;
3 width: 16px;
4 height: 16px;
5}
6
7table.basic span.main-agenda-item-tracks {
8 font-size: 0.8em;
9}
10
11table.schedule td {
12 border: 0;
13}
14
15table.schedule li {
16 margin-bottom: .2em;
17}
18
19div.agenda-details {
20 display: none;
21 padding: 5px;
22 position: absolute;
23 margin-left: 20px;
24 font-size: 0.9em;
25 color: #FFFFFF;
26 background-color: #101010;
27 border: #000000 1px solid;
28 border-radius: 5px;
29 min-width: 200px;
30 max-width: 500px;
31 z-index: 100;
32}
33
34div.meeting-description {
35 white-space: pre-wrap;
36}
37
38div.agenda-details LI {
39 font-size: 1.0em;
40}
41
42div.schedule-head {
43 position: relative;
44 overflow: visible;
45 z-index: 10;
46}
47
48div.schedule-head .schedule-qrcode {
49 height: 63px;
50 vertical-align: top;
51 margin-left: -3px;
52 margin-top: -3px;
53}
54
55div.schedule-head .schedule-date {
56 font-weight: normal;
57 font-size: 36px;
58 margin-left: 5px;
59}
60
61div.schedule-head .schedule-crew, .last-updated {
62 font-size: 0.7pc;
63}
64
65/* System messages */
66ul.messagelist {
67 margin-left: -30px;
68 font-size: 130%;
69
70 list-style: none;
71 padding-left: 0;
72
73 color: #c00000;
74}
75
76
77/* Error list inside a table data */
78td ul.errorlist {
79 border: 1px solid #c00000;
80 background-color: #ffc0c0;
81 padding: 4px;
82 padding-left: 2em;
83 margin-left: 0;
84 margin-bottom: 0;
85 font-size: 70%;
86}
87
88
89/* Don't make the first page list look like a list */
90ul.summit_list {
91 list-style: none;
92 padding-left: 0;
93 margin-left: 0;
94}
95
96/* Pad and bottom-align formsets */
97table.formset th {
98 padding: 4px;
99 vertical-align: bottom;
100}
101table.formset td {
102 padding: 4px;
103 vertical-align: bottom;
104}
105
106
107/* Launchpad links have no decoration, and a cute image which we don't
108 * border. */
109a.launchpad {
110 text-decoration: none;
111}
112a.launchpad img {
113 border: 0;
114}
115
116.double-side-content {
117 float: left;
118 margin: 5px 10px;
119 padding: 10px;
120 width: 600px;
121}
122
123.summit-columns { -webkit-box-shadow: 0px 1px 1px #CCC; -moz-box-shadow:0 1px 1px #CCC; }
124.summit-columns { clear: both; background-color: #F7F7F7; padding: 5px; margin-bottom: -3px; }
125.summit-columns h2 { color: #444; font-weight: normal; border-bottom: 1px solid #EDEDED; text-indent: 10px; margin-bottom: 0; }
126.summit-columns ul { list-style: none; margin: 0; border-top: 1px solid #FFF; }
127.summit-columns ul li { width: 23%; float: left; padding-left: 10px; }
128.summit-columns ul li h3,
129.summit-columns ul li h3 a { color: #DD4814; text-decoration: none; margin-bottom: 0; margin-top: 5px; }
130.summit-columns ul li h3 a:hover { text-decoration: underline; }
131.summit-columns ul li img { padding: 10px 0 5px; }
132.summit-columns p { margin-bottom: 5px; }
0133
=== removed file 'summit/media/css/style.css'
--- summit/media/css/style.css 2012-01-22 18:36:40 +0000
+++ summit/media/css/style.css 1970-01-01 00:00:00 +0000
@@ -1,68 +0,0 @@
1/* System messages */
2ul.messagelist {
3 margin-left: -30px;
4 font-size: 130%;
5
6 list-style: none;
7 padding-left: 0;
8
9 color: #c00000;
10}
11
12
13/* Error list inside a table data */
14td ul.errorlist {
15 border: 1px solid #c00000;
16 background-color: #ffc0c0;
17 padding: 4px;
18 padding-left: 2em;
19 margin-left: 0;
20 margin-bottom: 0;
21 font-size: 70%;
22}
23
24
25/* Don't make the first page list look like a list */
26ul.summit_list {
27 list-style: none;
28 padding-left: 0;
29 margin-left: 0;
30}
31
32/* Pad and bottom-align formsets */
33table.formset th {
34 padding: 4px;
35 vertical-align: bottom;
36}
37table.formset td {
38 padding: 4px;
39 vertical-align: bottom;
40}
41
42
43/* Launchpad links have no decoration, and a cute image which we don't
44 * border. */
45a.launchpad {
46 text-decoration: none;
47}
48a.launchpad img {
49 border: 0;
50}
51
52.double-side-content {
53 float: left;
54 margin: 5px 10px;
55 padding: 10px;
56 width: 600px;
57}
58
59.summit-columns { -webkit-box-shadow: 0px 1px 1px #CCC; -moz-box-shadow:0 1px 1px #CCC; }
60.summit-columns { clear: both; background-color: #F7F7F7; padding: 5px; margin-bottom: -3px; }
61.summit-columns h2 { color: #444; font-weight: normal; border-bottom: 1px solid #EDEDED; text-indent: 10px; margin-bottom: 0; }
62.summit-columns ul { list-style: none; margin: 0; border-top: 1px solid #FFF; }
63.summit-columns ul li { width: 23%; float: left; padding-left: 10px; }
64.summit-columns ul li h3,
65.summit-columns ul li h3 a { color: #DD4814; text-decoration: none; margin-bottom: 0; margin-top: 5px; }
66.summit-columns ul li h3 a:hover { text-decoration: underline; }
67.summit-columns ul li img { padding: 10px 0 5px; }
68.summit-columns p { margin-bottom: 5px; }
690
=== added file 'summit/media/js/site.js'
=== modified file 'summit/schedule/admin/agendaadmin.py'
--- summit/schedule/admin/agendaadmin.py 2012-01-23 01:18:55 +0000
+++ summit/schedule/admin/agendaadmin.py 2012-04-05 23:27:19 +0000
@@ -22,7 +22,7 @@
2222
2323
24class AgendaAdmin(admin.ModelAdmin):24class AgendaAdmin(admin.ModelAdmin):
25 list_display = ('slot', 'room', 'meeting')25 list_display = ('slot', 'room', 'meeting', 'auto')
26 list_display_links = ('meeting', )26 list_display_links = ('meeting', )
27 list_filter = ('room', )27 list_filter = ('room', )
28 search_fields = ('meeting__name', 'meeting__title')28 search_fields = ('meeting__name', 'meeting__title')
2929
=== modified file 'summit/schedule/admin/meetingadmin.py'
--- summit/schedule/admin/meetingadmin.py 2012-03-22 17:32:01 +0000
+++ summit/schedule/admin/meetingadmin.py 2012-04-05 23:27:19 +0000
@@ -132,7 +132,7 @@
132share.short_description = "Share Meetings (Private only)"132share.short_description = "Share Meetings (Private only)"
133133
134class MeetingAdmin(admin.ModelAdmin):134class MeetingAdmin(admin.ModelAdmin):
135 list_display = ('summit', 'name', 'title', 'type', 'approved')135 list_display = ('summit', 'slots', 'name', 'title', 'type', 'approved')
136 list_display_links = ('name', 'title')136 list_display_links = ('name', 'title')
137 list_filter = ('summit', 'type', 'tracks', 'topics', 'slots', 'private',137 list_filter = ('summit', 'type', 'tracks', 'topics', 'slots', 'private',
138 'status', 'priority')138 'status', 'priority')
139139
=== modified file 'summit/schedule/admin/summitadmin.py'
--- summit/schedule/admin/summitadmin.py 2012-03-19 16:06:37 +0000
+++ summit/schedule/admin/summitadmin.py 2012-04-05 23:27:19 +0000
@@ -71,7 +71,7 @@
7171
7272
73class SummitAdmin(admin.ModelAdmin):73class SummitAdmin(admin.ModelAdmin):
74 list_display = ('name', 'title', 'location')74 list_display = ('name', 'title', 'location', 'state')
75 search_fields = ('name', 'title', 'location')75 search_fields = ('name', 'title', 'location')
7676
77 inlines = (TrackInline, TopicInline, SprintInline)77 inlines = (TrackInline, TopicInline, SprintInline)
7878
=== modified file 'summit/schedule/forms.py'
--- summit/schedule/forms.py 2012-03-23 14:20:31 +0000
+++ summit/schedule/forms.py 2012-04-05 23:27:19 +0000
@@ -65,67 +65,7 @@
65 for attendee in kwargs['instance'].participants.all()]65 for attendee in kwargs['instance'].participants.all()]
6666
67 super(MeetingFormBase, self).__init__(*args, **kwargs)67 super(MeetingFormBase, self).__init__(*args, **kwargs)
6868 self.fields['tracks'].queryset = self.instance.summit.track_set.all()
69 summit = self.instance.summit
70 self.fields['participants'].queryset = Attendee.objects.filter(
71 summit=summit).order_by('user__first_name',
72 'user__last_name',
73 'user__username')
74
75 def save(self, commit=True):
76 instance = super(MeetingFormBase, self).save(commit)
77
78 # Prepare a 'save_m2m' method for the form,
79 if 'save_m2m' in dir(self):
80 old_save_m2m = self.save_m2m
81 else:
82 old_save_m2m = None
83 def save_m2m():
84 if old_save_m2m is not None:
85 old_save_m2m()
86 # This is where we actually link the pizza with toppings
87 instance.participants.clear()
88 for participant in self.cleaned_data['participants']:
89 record = Participant(meeting=instance, attendee=participant,
90 required=True)
91 record.save()
92 self.save_m2m = save_m2m
93
94 # Do we need to save all changes now?
95 if commit:
96 instance.save()
97 self.save_m2m()
98
99 return instance
100
101class MeetingFormBase(forms.ModelForm):
102 participants = MultipleAttendeeField(
103 queryset=Attendee.objects.all,
104 widget=forms.CheckboxSelectMultiple,
105 label='Participants',
106 required=False)
107
108 class Media:
109 css = {'all': (
110 '/media/css/colortip-1.0-jquery.css',
111 )}
112 js = (
113 '/media/js/colortip-1.0-jquery.js',
114 )
115
116 def __init__(self, *args, **kwargs):
117 if 'instance' in kwargs:
118 if kwargs['instance'].pk is not None:
119 # We get the 'initial' keyword argument or initialize it
120 # as a dict if it didn't exist.
121 initial = kwargs.setdefault('initial', {})
122 # The widget for a ModelMultipleChoiceField expects
123 # a list of primary key for the selected data.
124 initial['participants'] = [
125 attendee.pk
126 for attendee in kwargs['instance'].participants.all()]
127
128 super(MeetingFormBase, self).__init__(*args, **kwargs)
12969
130 summit = self.instance.summit70 summit = self.instance.summit
131 self.fields['participants'].queryset = Attendee.objects.filter(71 self.fields['participants'].queryset = Attendee.objects.filter(
@@ -162,28 +102,26 @@
162class CreateMeeting(MeetingFormBase, RenderableMixin):102class CreateMeeting(MeetingFormBase, RenderableMixin):
163 class Meta:103 class Meta:
164 model = Meeting104 model = Meeting
165 fields = ('title', 'description', 'tracks', 'type', 'spec_url', 'wiki_url',105 fields = ('title', 'description', 'tracks', 'type', 'spec_url', 'wiki_url', 'pad_url',
166 'pad_url', 'requires_dial_in', 'private')106 'requires_dial_in', 'private', 'slots', 'approved', 'video')
167107
168108
169class OrganizerEditMeeting(MeetingFormBase, RenderableMixin):109class OrganizerEditMeeting(MeetingFormBase, RenderableMixin):
170 class Meta:110 class Meta:
171 model = Meeting111 model = Meeting
172 fields = ('title', 'description', 'tracks', 'type', 'spec_url', 'wiki_url', 'pad_url',112 fields = ('title', 'description', 'tracks', 'type', 'spec_url', 'wiki_url', 'pad_url',
173 'requires_dial_in', 'private', 'slots', 'approved', 'video', )113 'requires_dial_in', 'private', 'slots', 'approved', 'video')
174114
175class ProposeMeeting(MeetingFormBase, RenderableMixin):115class ProposeMeeting(MeetingFormBase, RenderableMixin):
176 class Meta:116 class Meta:
177 model = Meeting117 model = Meeting
178 fields = ('title', 'description', 'tracks', 'spec_url', 'wiki_url',118 fields = ('title', 'description', 'tracks', 'spec_url', 'wiki_url', 'pad_url')
179 'pad_url', 'requires_dial_in')
180119
181120
182class EditMeeting(MeetingFormBase, RenderableMixin):121class EditMeeting(MeetingFormBase, RenderableMixin):
183 class Meta:122 class Meta:
184 model = Meeting123 model = Meeting
185 fields = ('title', 'description', 'tracks', 'spec_url', 'wiki_url', 'pad_url',124 fields = ('title', 'description', 'tracks', 'spec_url', 'wiki_url', 'pad_url')
186 'requires_dial_in')
187125
188class MeetingReview(forms.ModelForm, RenderableMixin):126class MeetingReview(forms.ModelForm, RenderableMixin):
189 class Meta:127 class Meta:
190128
=== modified file 'summit/schedule/render.py'
--- summit/schedule/render.py 2012-02-02 15:04:05 +0000
+++ summit/schedule/render.py 2012-04-05 23:27:19 +0000
@@ -1024,7 +1024,7 @@
1024END:VEVENT1024END:VEVENT
1025''' % {'id':meeting.id, 'dtstart':dtstart, 'dtend':dtend, 'category':categories,1025''' % {'id':meeting.id, 'dtstart':dtstart, 'dtend':dtend, 'category':categories,
1026 'eventname':meeting.title, 'eventplace': room.title, 'type': meeting.type,1026 'eventname':meeting.title, 'eventplace': room.title, 'type': meeting.type,
1027 'roomname':room.name, 'description': meeting.description.replace('\r', '').replace('\n', '\N'),1027 'roomname':room.name, 'description': getattr(meeting, 'description', '').replace('\r', '').replace('\n', '\N'),
1028 'meeting_url':meeting.meeting_page_url,1028 'meeting_url':meeting.meeting_page_url,
1029 'base_url':getattr(settings, 'SITE_ROOT', 'http://summit.ubuntu.com')}1029 'base_url':getattr(settings, 'SITE_ROOT', 'http://summit.ubuntu.com')}
1030 ical += 'END:VCALENDAR'1030 ical += 'END:VCALENDAR'
10311031
=== modified file 'summit/schedule/templates/schedule/actions.html'
--- summit/schedule/templates/schedule/actions.html 2012-03-23 16:28:03 +0000
+++ summit/schedule/templates/schedule/actions.html 2012-04-05 23:27:19 +0000
@@ -35,6 +35,9 @@
35 {% else %}35 {% else %}
36 <li><a href="/{{ summit.name }}/propose_meeting">Propose a meeting</a></li>36 <li><a href="/{{ summit.name }}/propose_meeting">Propose a meeting</a></li>
37 {% endif %}37 {% endif %}
38 {% if attendee %}
39 <li><a href="{% url summit.schedule.views.created_meetings summit.name attendee.user.username %}">My proposed meetings</a></li>
40 {% endif %}
38 </ul>41 </ul>
39 </div>42 </div>
40{% endifequal %}43{% endifequal %}
4144
=== modified file 'summit/schedule/templates/schedule/create_meeting.html'
--- summit/schedule/templates/schedule/create_meeting.html 2012-03-21 16:50:31 +0000
+++ summit/schedule/templates/schedule/create_meeting.html 2012-04-05 23:27:19 +0000
@@ -8,7 +8,7 @@
8 <link rel="stylesheet" type="text/css" href="{{MEDIA_URL}}css/colortip-1.0-jquery.css"/>8 <link rel="stylesheet" type="text/css" href="{{MEDIA_URL}}css/colortip-1.0-jquery.css"/>
9{% endblock %}9{% endblock %}
1010
11{% block extrafooter %}11{% block closure %}
12<script type="text/javascript"><!--12<script type="text/javascript"><!--
13$(document).ready(function(){13$(document).ready(function(){
14 $('span[rel*=help]').colorTip({color:'orange'});14 $('span[rel*=help]').colorTip({color:'orange'});
1515
=== modified file 'summit/schedule/templates/schedule/daily.html'
--- summit/schedule/templates/schedule/daily.html 2012-03-23 23:51:49 +0000
+++ summit/schedule/templates/schedule/daily.html 2012-04-05 23:27:19 +0000
@@ -5,180 +5,28 @@
5{{ viewdate|strftime:"%Y-%m-%d" }} Schedule - {{ summit.title }}5{{ viewdate|strftime:"%Y-%m-%d" }} Schedule - {{ summit.title }}
6{% endblock %}6{% endblock %}
77
8{% block head %}8{% block extrahead %}{% if linaro %}<base target="_blank" />{% endif %}{{ block.super }}{% endblock %}
9<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
10{% if linaro %}
11 <base target="_blank" />
12{% endif %}
13{{ block.super }}
14<script language="JavaScript">
15
16function show_agenda_details(agenda_id, index_id) {
17 var elem_id = 'agenda-'+agenda_id+'-'+index_id+'-details'
18 var details = document.getElementById(elem_id)
19 details.style.display='block';
20}
21
22function hide_agenda_details(agenda_id, index_id) {
23 var elem_id = 'agenda-'+agenda_id+'-'+index_id+'-details'
24 var details = document.getElementById(elem_id)
25 details.style.display='none';
26}
27
28</script>
29<style>
30TABLE img.icon {
31 vertical-align: bottom;
32 width: 16px;
33 height: 16px;
34}
35
36table.basic span.main-agenda-item-tracks {
37 font-size: 0.8em;
38}
39
40div.agenda-details {
41 display: none;
42 padding: 5px;
43 position: absolute;
44 margin-left: 20px;
45 font-size: 0.9em;
46 color: #FFFFFF;
47 background-color: #101010;
48 border: #000000 1px solid;
49 border-radius: 5px;
50 min-width: 200px;
51 max-width: 500px;
52 z-index: 100;
53}
54
55div.meeting-description {
56 white-space: pre-wrap;
57}
58
59div.agenda-details LI {
60 font-size: 1.0em;
61}
62
63div.schedule-head {
64 position: relative;
65 overflow: visible;
66 z-index: 10;
67}
68
69div.schedule-head .schedule-qrcode {
70 height: 63px;
71 vertical-align: top;
72 margin-left: -3px;
73 margin-top: -3px;
74}
75
76div.schedule-head .schedule-date {
77 font-weight: normal;
78 font-size: 36px;
79 margin-left: 5px;
80}
81
82div.schedule-head .schedule-crew, .last-updated {
83 font-size: 0.7pc;
84}
85
86/* Mobile view */
87@media screen and (max-width: 481px) {
88 /* turn off a bunch of stuff */
89 nav#top-related, header#page-header, aside#page-related, footer#page-footer { display: none; }
90 section#main-section .container, article.main-content, aside#top-nav, aside#top-nav .container, .wrapper, .inner-wrapper, .span-9 {
91 width: auto;
92 margin: 0; padding: 0;
93 }
94 #top-login { display: block; }
95 aside#top-nav {
96 display: block;
97 text-align: center;
98 font-size: 16px;
99 min-height: 24px;
100 }
101 .schedule-head > a { display: none; } /* qr code */
102 div.schedule-head .schedule-date {
103 display: block;
104 overflow: auto;
105 font-size: 16px;
106 text-align: center;
107 margin: 0;
108 }
109 div.schedule-head .schedule-qrcode { display: none; }
110 div.schedule-head .schedule-date a {
111 display: block;
112 float: right;
113 background: #eee;
114 width: 33%;
115 text-align: center;
116 }
117 div.schedule-head .schedule-date a:nth-child(1) {
118 float: left;
119 }
120 table.basic {
121 margin-top: 0;
122 width: 100%;
123 }
124 table.basic span.main-agenda-item-tracks {
125 display: none;
126 }
127 div.agenda-details {
128 background-color: #eee;
129 border-width: 0;
130 color: black;
131 font-size: 1em;
132 position: static;
133 max-width: 100%;
134 min-width: 100%;
135 width: 100%;
136 padding: 5px;
137 margin: 0;
138 border-radius: 0;
139 }
140 div.agenda-details ul {
141 background: #101010;
142 padding-left: 4px;
143 }
144 .main-agenda-item-name {
145 display: block;
146 min-height: 24px;
147 }
148 .main-agenda-item-name img.icon {
149 height: 24px;
150 width: 24px;
151 float: left;
152 margin-right: 4px;
153 }
154
155 header a.logo-ubuntu img { display: none; }
156
157}
158
159</style>
160{% endblock %}
1619
162{% block sub_nav_links %}10{% block sub_nav_links %}
163{% if ical %}11{% if ical %}
164<li><a class="sub-nav-item" href="{{ ical }}">iCal Feed</a></li>12<li><a class="sub-nav-item" href="{{ ical }}">iCal Feed</a></li>
165{% endif %}13{% endif %}
166<li><a class="sub-nav-item" href="{% url mobile %}">Mobile</a></li>14<li><a class="sub-nav-item" href="{% url mobile %}">Mobile</a></li>
167<li><a class="sub-nav-item" href="display">Wide Display</a></li>15<li><a class="sub-nav-item" href="display">Wide display</a></li>
168{% endblock %}16{% endblock %}
16917
170{% block content %}18{% block content %}
171<div class="row">19<div class="row">
172<article class="span-9">20<article class="span-8">
17321
174<div class="schedule-head">22<div class="schedule-head">
175{% if summit.qr %}23{% if summit.qr %}
176<img class="schedule-qrcode" src="{{summit.qr}}" />24<img class="schedule-qrcode" src="{{summit.qr}}" alt="QR" />
177{% endif %}25{% endif %}
178<span class="schedule-date"><a href="{% url summit.schedule.views.daily_schedule summit.name previousday|date:"Y-m-d" %}{% if is_popup %}?_popup=1{% endif %}" target="_self">&lt;</a> {{ viewdate.date|strftime:"%A" }} <a href="{% url summit.schedule.views.daily_schedule summit.name nextday|date:"Y-m-d" %}{% if is_popup %}?_popup=1{% endif %}" target="_self">&gt;</a></span>26<span class="schedule-date"><a href="{% url summit.schedule.views.daily_schedule summit.name previousday|date:"Y-m-d" %}{% if is_popup %}?_popup=1{% endif %}" target="_self">&lt;</a> {{ viewdate.date|strftime:"%A" }} <a href="{% url summit.schedule.views.daily_schedule summit.name nextday|date:"Y-m-d" %}{% if is_popup %}?_popup=1{% endif %}" target="_self">&gt;</a></span>
17927
180{% if schedule.crew %}28{% if schedule.crew %}
181<span class="schedule-crew">Crew: {% for c in crew %}<a href="https://launchpad.net/~{{crew.attendee.user}}">{{c.attendee.name}}</a>{% if forloop.last %}{% else %}, {% endif %}{% endfor %}29<span class="schedule-crew">Crew: {% for c in crew %}<a href="https://launchpad.net/~{{crew.attendee.user.username}}">{{c.attendee.name}}</a>{% if forloop.last %}{% else %}, {% endif %}{% endfor %}
182</span>30</span>
183{% endif %}31{% endif %}
184</div>32</div>
@@ -200,9 +48,9 @@
200 <span onMouseOver="show_agenda_details({{agenda.id}}, {{slot.id}});" onMouseOut="hide_agenda_details({{agenda.id}}, {{slot.id}});">48 <span onMouseOver="show_agenda_details({{agenda.id}}, {{slot.id}});" onMouseOut="hide_agenda_details({{agenda.id}}, {{slot.id}});">
201 <a href="{{agenda.meeting.meeting_page_url}}" style="color: #000000;" class="main-agenda-item-name">49 <a href="{{agenda.meeting.meeting_page_url}}" style="color: #000000;" class="main-agenda-item-name">
202 {% if attendee in agenda.meeting.attendees %}50 {% if attendee in agenda.meeting.attendees %}
203 <img class="icon" src="/media/img/attending.png">51 <img class="icon" src="/media/img/attending.png" alt="Attending">
204 {% else %}52 {% else %}
205 <img class="icon" src="/media/img/not_attending.png">53 <img class="icon" src="/media/img/not_attending.png" alt="Not Attending">
206 {% endif %}54 {% endif %}
207 {{agenda.meeting.title}}55 {{agenda.meeting.title}}
208 </a>56 </a>
@@ -220,7 +68,7 @@
220 {% if participant.required %}68 {% if participant.required %}
221 <img class="icon" src="/media/img/required.png" title="required" alt="(required)">69 <img class="icon" src="/media/img/required.png" title="required" alt="(required)">
222 {% else %}70 {% else %}
223 <img class="icon" src="/media/img/attending.png">71 <img class="icon" src="/media/img/attending.png" alt="attending">
224 {% endif %}{{ participant.attendee.user }}</div>72 {% endif %}{{ participant.attendee.user }}</div>
225 {% endfor %}</div>73 {% endfor %}</div>
226 {% endif %}74 {% endif %}
@@ -236,7 +84,7 @@
236<td width="25%">84<td width="25%">
237 {{agenda.room.title}}85 {{agenda.room.title}}
238 {% if agenda.room.icecast_url %}86 {% if agenda.room.icecast_url %}
239 <a href="{{agenda.room.icecast_url}}"><img class="icon" src="/media/img/audio.png" title="Audio Feed", alt="(Audio Feed)"></a>87 <a href="{{agenda.room.icecast_url}}"><img class="icon" src="/media/img/audio.png" title="Audio Feed" alt="(Audio Feed)"></a>
240 {% endif %}88 {% endif %}
241 {% if agenda.room.irc_channel %}89 {% if agenda.room.irc_channel %}
242 <a href="irc://irc.freenode.net:6667/#{{agenda.room.irc_channel}}"><img class="icon" src="/media/img/chat.png" title="IRC Channel" alt="(IRC Channel)" /></a>90 <a href="irc://irc.freenode.net:6667/#{{agenda.room.irc_channel}}"><img class="icon" src="/media/img/chat.png" title="IRC Channel" alt="(IRC Channel)" /></a>
@@ -250,10 +98,100 @@
250{% endfor %}98{% endfor %}
25199
252</article>100</article>
253<article class="span-3 last">101<article class="span-4 last">
254 {% include "schedule/actions.html" %}102 {% include "schedule/actions.html" %}
255</article>103</article>
256</div>104</div>
105{% endblock %}
106{% block closure %}
107<script language="JavaScript">
108
109function show_agenda_details(agenda_id, index_id) {
110 var elem_id = 'agenda-'+agenda_id+'-'+index_id+'-details'
111 var details = document.getElementById(elem_id)
112 details.style.display='block';
113}
114
115function hide_agenda_details(agenda_id, index_id) {
116 var elem_id = 'agenda-'+agenda_id+'-'+index_id+'-details'
117 var details = document.getElementById(elem_id)
118 details.style.display='none';
119}
120
121</script>
122<script>
123/* Mobile view */
124@media screen and (max-width: 481px) {
125 /* turn off a bunch of stuff */
126 footer { display: none; }
127 section#main-section .container, article.main-content, aside#top-nav, aside#top-nav .container, .wrapper, .inner-wrapper, .span-9 {
128 width: auto;
129 margin: 0; padding: 0;
130 }
131 #top-login { display: block; }
132 .header-text { display: none; }
133 aside#top-nav {
134 display: block;
135 text-align: center;
136 font-size: 16px;
137 min-height: 24px;
138 }
139 .schedule-head > a { display: none; } /* qr code */
140 div.schedule-head .schedule-date {
141 display: block;
142 overflow: auto;
143 font-size: 16px;
144 text-align: center;
145 margin: 0;
146 }
147 div.schedule-head .schedule-qrcode { display: none; }
148 div.schedule-head .schedule-date a {
149 display: block;
150 float: right;
151 background: #eee;
152 width: 33%;
153 text-align: center;
154 }
155 div.schedule-head .schedule-date a:nth-child(1) {
156 float: left;
157 }
158 table.basic {
159 margin-top: 0;
160 width: 100%;
161 }
162 table.basic span.main-agenda-item-tracks {
163 display: none;
164 }
165 div.agenda-details {
166 background-color: #eee;
167 border-width: 0;
168 color: black;
169 font-size: 1em;
170 position: static;
171 max-width: 100%;
172 min-width: 100%;
173 width: 100%;
174 padding: 5px;
175 margin: 0;
176 border-radius: 0;
177 }
178 div.agenda-details ul {
179 background: #101010;
180 padding-left: 4px;
181 }
182 .main-agenda-item-name {
183 display: block;
184 min-height: 24px;
185 }
186 .main-agenda-item-name img.icon {
187 height: 24px;
188 width: 24px;
189 float: left;
190 margin-right: 4px;
191 }
192 header a.logo-ubuntu img { display: none; }
193}
194</style>
257<script>195<script>
258/* Mobile handler for clicking a link */196/* Mobile handler for clicking a link */
259/* put at the bottom of the page so that the relevant elements exist */197/* put at the bottom of the page so that the relevant elements exist */
@@ -295,5 +233,4 @@
295};233};
296234
297</script>235</script>
298
299{% endblock %}236{% endblock %}
300237
=== modified file 'summit/schedule/templates/schedule/edit_meeting.html'
--- summit/schedule/templates/schedule/edit_meeting.html 2012-03-23 20:44:55 +0000
+++ summit/schedule/templates/schedule/edit_meeting.html 2012-04-05 23:27:19 +0000
@@ -8,7 +8,7 @@
8 <link rel="stylesheet" type="text/css" href="{{MEDIA_URL}}css/colortip-1.0-jquery.css"/>8 <link rel="stylesheet" type="text/css" href="{{MEDIA_URL}}css/colortip-1.0-jquery.css"/>
9{% endblock %}9{% endblock %}
1010
11{% block extrafooter %}11{% block closure %}
12<script type="text/javascript"><!--12<script type="text/javascript"><!--
13$(document).ready(function(){13$(document).ready(function(){
14 $('span[rel*=help]').colorTip({color:'orange'});14 $('span[rel*=help]').colorTip({color:'orange'});
@@ -35,12 +35,11 @@
3535
36 <form action="{{ request.path_info }}" method="POST">36 <form action="{{ request.path_info }}" method="POST">
37 <fieldset>37 <fieldset>
38 <legend>Edit Meeting</legend>38 <h3>Edit Meeting</h3>
39 {{ form.as_template }}39 {{ form.as_template }}
40 </fieldset>40 </fieldset>
41 {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %} 41 {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %}
42 <input type="submit" name="submit" value="Save" class="submit-button" /> 42 <input type="submit" name="submit" value="Save" class="submit-button" />
43 </form>43 </form>
44 </article>44 </article>
45</span>
46{% endblock %}45{% endblock %}
4746
=== modified file 'summit/schedule/templates/schedule/meeting.html'
--- summit/schedule/templates/schedule/meeting.html 2012-03-23 17:56:14 +0000
+++ summit/schedule/templates/schedule/meeting.html 2012-04-05 23:27:19 +0000
@@ -26,17 +26,17 @@
26 {% if meeting.private_key and meeting.private_key != '' %}26 {% if meeting.private_key and meeting.private_key != '' %}
27 <li><a class="sub-nav-item" href="{% url summit.schedule.views.private_meeting meeting.summit.name, meeting.private_key, meeting.name|default:'-' %}">Shared URL</a></li>27 <li><a class="sub-nav-item" href="{% url summit.schedule.views.private_meeting meeting.summit.name, meeting.private_key, meeting.name|default:'-' %}">Shared URL</a></li>
28 {% else %}28 {% else %}
29 <li><a class="sub-nav-item" href="{% url summit.schedule.views.meeting meeting.summit.name, meeting.id, meeting.name|default:'-' %}+share">Share Meeting</a></li>29 <li><a class="sub-nav-item" href="{% url summit.schedule.views.meeting meeting.summit.name, meeting.id, meeting.name|default:'-' %}+share">Share meeting</a></li>
30 {% endif %}30 {% endif %}
31 {% endif %}31 {% endif %}
32 32
33 {% if meeting.spec_url %}33 {% if meeting.spec_url %}
34 {% else %}34 {% else %}
35 {% if summit_organizer %}35 {% if summit_organizer %}
36 <li><a class="sub-nav-item" href="{% url summit.schedule.views.organizer_edit_meeting summit.name, meeting.id, meeting.name|default:'-' %}">Edit Meeting</a></li>36 <li><a class="sub-nav-item" href="{% url summit.schedule.views.organizer_edit_meeting summit.name, meeting.id, meeting.name|default:'-' %}">Edit meeting</a></li>
37 {% else %}37 {% else %}
38 {% if drafter %}38 {% if drafter %}
39 <li><a class="sub-nav-item" href="{% url summit.schedule.views.edit_meeting summit.name, meeting.id, meeting.name|default:'-' %}">Edit Meeting</a></li>39 <li><a class="sub-nav-item" href="{% url summit.schedule.views.edit_meeting summit.name, meeting.id, meeting.name|default:'-' %}">Edit meeting</a></li>
40 {% endif %}40 {% endif %}
41 {% endif %}41 {% endif %}
42 {% endif %}42 {% endif %}
@@ -47,7 +47,7 @@
47 {% endif %}47 {% endif %}
48 {% else %}48 {% else %}
49 {% if meeting.spec_url %}49 {% if meeting.spec_url %}
50 <li><a class="sub-nav-item" href="{{ meeting.spec_url }}/+subscribe">Subscribe to Blueprint</a></li>50 <li><a class="sub-nav-item" href="{{ meeting.spec_url }}/+subscribe">Subscribe to blueprint</a></li>
51 {% endif %}51 {% endif %}
52 <li><a class="sub-nav-item" href="{% url summit.schedule.views.register meeting.summit.name, meeting.id, meeting.name|default:'-' %}">Attend this meeting</a></li>52 <li><a class="sub-nav-item" href="{% url summit.schedule.views.register meeting.summit.name, meeting.id, meeting.name|default:'-' %}">Attend this meeting</a></li>
53 {% endif %}53 {% endif %}
@@ -55,6 +55,9 @@
55 {% if meeting.spec_url %}55 {% if meeting.spec_url %}
56 <li><a class="sub-nav-item" href="{{ meeting.spec_url }}">Blueprint</a></li>56 <li><a class="sub-nav-item" href="{{ meeting.spec_url }}">Blueprint</a></li>
57 {% endif %}57 {% endif %}
58 {% if scheduler %}
59 <li><a class="sub-nav-item" href="{% url summit.schedule.views.meeting_copy meeting.summit.name, meeting.id, meeting.name|default:'-' %}">Copy meeting</a></li>
60 {% endif %}
58{% endblock %}61{% endblock %}
5962
60{% block content %}63{% block content %}
6164
=== modified file 'summit/schedule/templates/schedule/meeting_review.html'
--- summit/schedule/templates/schedule/meeting_review.html 2012-03-23 20:44:55 +0000
+++ summit/schedule/templates/schedule/meeting_review.html 2012-04-05 23:27:19 +0000
@@ -8,7 +8,7 @@
8 <link rel="stylesheet" type="text/css" href="{{MEDIA_URL}}css/colortip-1.0-jquery.css"/>8 <link rel="stylesheet" type="text/css" href="{{MEDIA_URL}}css/colortip-1.0-jquery.css"/>
9{% endblock %}9{% endblock %}
1010
11{% block extrafooter %}11{% block closure %}
12<script type="text/javascript"><!--12<script type="text/javascript"><!--
13$(document).ready(function(){13$(document).ready(function(){
14 $('span[rel*=help]').colorTip({color:'orange'});14 $('span[rel*=help]').colorTip({color:'orange'});
@@ -28,7 +28,7 @@
2828
29 <form action="{{ request.path_info }}" method="POST">29 <form action="{{ request.path_info }}" method="POST">
30 <fieldset>30 <fieldset>
31 <legend>Review Meeting</legend>31 <h3>Review Meeting</h3>
32 {{ form.as_template }}32 {{ form.as_template }}
33 </fieldset>33 </fieldset>
34 {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %} 34 {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %}
3535
=== added file 'summit/schedule/templates/schedule/mine.html'
--- summit/schedule/templates/schedule/mine.html 1970-01-01 00:00:00 +0000
+++ summit/schedule/templates/schedule/mine.html 2012-04-05 23:27:19 +0000
@@ -0,0 +1,113 @@
1{% extends "base.html" %}
2
3{% block page_name %}
4Review Proposed Meetings - {{ summit.title }}
5{% endblock %}
6
7{% block head %}
8{% if linaro %}
9 <base target="_blank" />
10{% endif %}
11{{ block.super }}
12<script language="JavaScript">
13
14function show_agenda_details(agenda_id, index_id) {
15 var elem_id = 'agenda-'+agenda_id+'-'+index_id+'-details'
16 var details = document.getElementById(elem_id)
17 details.style.display='block';
18}
19
20function hide_agenda_details(agenda_id, index_id) {
21 var elem_id = 'agenda-'+agenda_id+'-'+index_id+'-details'
22 var details = document.getElementById(elem_id)
23 details.style.display='none';
24}
25
26</script>
27<style>
28TABLE img.icon {
29 vertical-align: bottom;
30 width: 16px;
31 height: 16px;
32}
33
34table.basic span.main-agenda-item-tracks {
35 font-size: 0.8em;
36}
37
38div.agenda-details {
39 display: none;
40 padding: 5px;
41 position: absolute;
42 margin-left: 20px;
43 font-size: 0.9em;
44 color: #FFFFFF;
45 background-color: #101010;
46 border: #000000 1px solid;
47 border-radius: 5px;
48 min-width: 200px;
49 max-width: 500px;
50 z-index: 100;
51}
52
53div.meeting-description {
54 white-space: pre-wrap;
55}
56
57div.agenda-details LI {
58 font-size: 1.0em;
59}
60
61div.schedule-head {
62 position: relative;
63 overflow: visible;
64 z-index: 10;
65}
66
67div.schedule-head .schedule-qrcode {
68 height: 63px;
69 vertical-align: top;
70 margin-left: -3px;
71 margin-top: -3px;
72}
73
74div.schedule-head .schedule-date {
75 font-weight: normal;
76 font-size: 36px;
77 margin-left: 5px;
78}
79
80div.schedule-head .schedule-crew, .last-updated {
81 font-size: 0.7pc;
82}
83
84</style>
85{% endblock %}
86
87{% block sub_nav %}
88{% endblock %}
89
90{% block content %}
91<div class="row">
92<article class="span-12">
93
94<div class="schedule-head">
95 <h2>Meetings created by {{ drafter.name }}</h2>
96</div>
97<table class="basic">
98{% for meeting in meetings %}
99<tr style="background-color: {{ meeting.track_color }}; {% if meeting.private %}border: 1px; border-style: solid; border-color: #FF0000;{% endif %}">
100<td width="75%">
101 <a href="{{ meeting.meeting_page_url }}" style="color: #000000;" class="main-agenda-item-name">
102 {{ meeting.title }}
103 </a>
104</td>
105<td width="25%">
106Status: {{ meeting.get_approved_display }}
107</td>
108</tr>
109{% endfor %}
110</table>
111</article>
112</div>
113{% endblock %}
0114
=== modified file 'summit/schedule/templates/schedule/nextsession.html'
--- summit/schedule/templates/schedule/nextsession.html 2011-11-01 18:00:44 +0000
+++ summit/schedule/templates/schedule/nextsession.html 2012-04-05 23:27:19 +0000
@@ -3,7 +3,7 @@
33
4<head>4<head>
5 <meta http-equiv="refresh" content="60">5 <meta http-equiv="refresh" content="60">
6{% block head %}6{% block extrahead %}
77
8{% endblock %}8{% endblock %}
9 <style type="text/css">9 <style type="text/css">
1010
=== modified file 'summit/schedule/templates/schedule/nosession.html'
--- summit/schedule/templates/schedule/nosession.html 2012-03-18 19:53:58 +0000
+++ summit/schedule/templates/schedule/nosession.html 2012-04-05 23:27:19 +0000
@@ -1,6 +1,6 @@
1{% extends "base.html" %}1{% extends "base.html" %}
22
3{% block head %}3{% block extrahead %}
4{{ block.super }}4{{ block.super }}
5<script language="JavaScript">5<script language="JavaScript">
66
77
=== modified file 'summit/schedule/templates/schedule/org_edit_meeting.html'
--- summit/schedule/templates/schedule/org_edit_meeting.html 2012-03-23 20:44:55 +0000
+++ summit/schedule/templates/schedule/org_edit_meeting.html 2012-04-05 23:27:19 +0000
@@ -8,7 +8,7 @@
8 <link rel="stylesheet" type="text/css" href="{{MEDIA_URL}}css/colortip-1.0-jquery.css"/>8 <link rel="stylesheet" type="text/css" href="{{MEDIA_URL}}css/colortip-1.0-jquery.css"/>
9{% endblock %}9{% endblock %}
1010
11{% block extrafooter %}11{% block closure %}
12<script type="text/javascript"><!--12<script type="text/javascript"><!--
13$(document).ready(function(){13$(document).ready(function(){
14 $('span[rel*=help]').colorTip({color:'orange'});14 $('span[rel*=help]').colorTip({color:'orange'});
@@ -35,7 +35,7 @@
3535
36 <form action="{{ request.path_info }}" method="POST">36 <form action="{{ request.path_info }}" method="POST">
37 <fieldset>37 <fieldset>
38 <legend>Edit Meeting</legend>38 <h3>Edit Meeting</h3>
39 {{ form.as_template }}39 {{ form.as_template }}
40 </fieldset>40 </fieldset>
41 {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %} 41 {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %}
4242
=== modified file 'summit/schedule/templates/schedule/past_summit.html'
--- summit/schedule/templates/schedule/past_summit.html 2012-03-17 19:39:42 +0000
+++ summit/schedule/templates/schedule/past_summit.html 2012-04-05 23:27:19 +0000
@@ -4,7 +4,7 @@
4{% block page_name %}Previous Summits{%endblock %}4{% block page_name %}Previous Summits{%endblock %}
55
6{% block sub_nav_links %}6{% block sub_nav_links %}
7 <li><a class="sub-nav-item" href="{% url summit.schedule.views.summit next_summit.name %}">Current Summit</a></li>7 <li><a class="sub-nav-item" href="{% url summit.schedule.views.summit next_summit.name %}">Current summit</a></li>
8{% endblock %}8{% endblock %}
99
10{% block content %}10{% block content %}
@@ -13,9 +13,7 @@
13 <div class="row">13 <div class="row">
14 <article class="span-12">14 <article class="span-12">
15 <h1><a href="{% url summit.schedule.views.summit summit.name %} ">{{ summit.title }} &rsaquo;</a></h1>15 <h1><a href="{% url summit.schedule.views.summit summit.name %} ">{{ summit.title }} &rsaquo;</a></h1>
16 <p>
17 {% include "schedule/summit_info.html" %}16 {% include "schedule/summit_info.html" %}
18 </p>
19 </article>17 </article>
20 </div>18 </div>
21{% endfor %}19{% endfor %}
2220
=== modified file 'summit/schedule/templates/schedule/propose_meeting.html'
--- summit/schedule/templates/schedule/propose_meeting.html 2012-03-23 20:44:55 +0000
+++ summit/schedule/templates/schedule/propose_meeting.html 2012-04-05 23:27:19 +0000
@@ -8,7 +8,7 @@
8 <link rel="stylesheet" type="text/css" href="{{MEDIA_URL}}css/colortip-1.0-jquery.css"/>8 <link rel="stylesheet" type="text/css" href="{{MEDIA_URL}}css/colortip-1.0-jquery.css"/>
9{% endblock %}9{% endblock %}
1010
11{% block extrafooter %}11{% block closure %}
12<script type="text/javascript"><!--12<script type="text/javascript"><!--
13$(document).ready(function(){13$(document).ready(function(){
14 $('span[rel*=help]').colorTip({color:'orange'});14 $('span[rel*=help]').colorTip({color:'orange'});
@@ -35,7 +35,7 @@
3535
36 <form action="{{ request.path_info }}" method="POST">36 <form action="{{ request.path_info }}" method="POST">
37 <fieldset>37 <fieldset>
38 <legend>Propose a Meeting</legend>38 <h3>Propose a Meeting</h3>
39 {{ form.as_template }}39 {{ form.as_template }}
40 </fieldset>40 </fieldset>
41 {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %} 41 {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %}
4242
=== modified file 'summit/schedule/templates/schedule/review.html'
--- summit/schedule/templates/schedule/review.html 2012-03-21 00:41:17 +0000
+++ summit/schedule/templates/schedule/review.html 2012-04-05 23:27:19 +0000
@@ -4,7 +4,7 @@
4Review Proposed Meetings - {{ summit.title }}4Review Proposed Meetings - {{ summit.title }}
5{% endblock %}5{% endblock %}
66
7{% block head %}7{% block extrahead %}
8{% if linaro %}8{% if linaro %}
9 <base target="_blank" />9 <base target="_blank" />
10{% endif %}10{% endif %}
1111
=== modified file 'summit/schedule/templates/schedule/schedule.html'
--- summit/schedule/templates/schedule/schedule.html 2012-03-23 17:56:14 +0000
+++ summit/schedule/templates/schedule/schedule.html 2012-04-05 23:27:19 +0000
@@ -7,7 +7,7 @@
7{% if schedule.room %}{{ schedule.room.title }}{% endif %}7{% if schedule.room %}{{ schedule.room.title }}{% endif %}
8{% endblock %}8{% endblock %}
99
10{% block head %}10{% block extrahead %}
11{{ block.super }}11{{ block.super }}
12 <link rel="stylesheet" type="text/css" media="screen" href="/media/css/schedule.css" />12 <link rel="stylesheet" type="text/css" media="screen" href="/media/css/schedule.css" />
13{% if schedule.edit %}13{% if schedule.edit %}
@@ -38,19 +38,39 @@
38}38}
39window.addEventListener('load', starttimer());39window.addEventListener('load', starttimer());
40</script>40</script>
41
42<style>
43 div.wrapper, div.inner-wrapper {
44 width: auto;
45 }
46
47 div.wrapper {
48 padding: 0px 0px;
49 clear: both;
50 display: inline;
51 float: left;
52 border: 0;
53 margin: 0;
54 }
55
56 #top-nav, header {
57 width: auto;
58 }
59</style>
60
41{% endblock %}61{% endblock %}
42{% block 960css %}{% endblock %}62{% block 960css %}{% endblock %}
4363
44{% block sub_nav_links %}64{% block sub_nav_links %}
45{% if schedule.edit %}65{% if schedule.edit %}
46 <li><a class="sub-nav-item" href="{{ request.url }}?">Read Only</a></li>66 <li><a class="sub-nav-item" href="{{ request.url }}?">Read only</a></li>
47{% else %}67{% else %}
48 {% if can_change_agenda %}68 {% if can_change_agenda %}
49 <li><a class="sub-nav-item" href="{{ request.url }}?edit">Edit</a></li>69 <li><a class="sub-nav-item" href="{{ request.url }}?edit">Edit</a></li>
50 {% endif %}70 {% endif %}
51{% endif %}71{% endif %}
52{% if ical %}72{% if ical %}
53<li><a class="sub-nav-item" href="{{ ical }}">iCal Feed</a></li>73<li><a class="sub-nav-item" href="{{ ical }}">iCal feed</a></li>
54{% endif %}74{% endif %}
55<li><a class="sub-nav-item" href="{% url mobile %}">Mobile</a></li>75<li><a class="sub-nav-item" href="{% url mobile %}">Mobile</a></li>
56{% endblock %}76{% endblock %}
5777
=== modified file 'summit/schedule/templates/schedule/schedule_list.html'
--- summit/schedule/templates/schedule/schedule_list.html 2012-01-25 18:32:06 +0000
+++ summit/schedule/templates/schedule/schedule_list.html 2012-04-05 23:27:19 +0000
@@ -1,7 +1,7 @@
1{% load datetime %}1{% load datetime %}
22
3<h2>Schedule</h2>3<h2>Schedule</h2>
4<table class="column">4<table class="column schedule">
5<tr>5<tr>
6<td>6<td>
7By date:7By date:
88
=== modified file 'summit/schedule/templates/schedule/summit.html'
--- summit/schedule/templates/schedule/summit.html 2012-03-23 23:51:49 +0000
+++ summit/schedule/templates/schedule/summit.html 2012-04-05 23:27:19 +0000
@@ -3,20 +3,9 @@
33
4{% block page_name %}{{ summit.title }} {{ summit.date_start|strftime:"%d %b" }} - {{ summit.date_end|strftime:"%d %b %Y" }} {%endblock %}4{% block page_name %}{{ summit.title }} {{ summit.date_start|strftime:"%d %b" }} - {{ summit.date_end|strftime:"%d %b %Y" }} {%endblock %}
55
6{% block extrahead %}6{% block extrahead %}{{ block.super }}{% endblock %}
7<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
87
9{{ block.super }}8 {% block extrameta %}<meta property="fb:app_id" content="310260202349342" />
10 <script type="text/javascript" src="{{MEDIA_URL}}jquery/jquery.js"></script>
11 <script type="text/javascript" src="{{MEDIA_URL}}js/twidenash/jquery-twidenash.js"></script>
12 <script type="text/javascript">
13 //<![CDATA[
14 $(function() {
15 $('.twidenash').twidenash();
16 });
17 //]]>
18 </script>
19 <meta property="fb:app_id" content="310260202349342" />
20 <meta property="og:title" content="{{ summit.title }} {{ summit.date_start|strftime:"%d" }} - {{ summit.date_end|strftime:"%d, %b. %Y" }}" />9 <meta property="og:title" content="{{ summit.title }} {{ summit.date_start|strftime:"%d" }} - {{ summit.date_end|strftime:"%d, %b. %Y" }}" />
21 {% if summit.description %}10 {% if summit.description %}
22 <meta property="og:description" content="{{ summit.description|safe }}" />11 <meta property="og:description" content="{{ summit.description|safe }}" />
@@ -26,52 +15,7 @@
26 <meta property="og:site_name" content="The Summit Scheduler"/>15 <meta property="og:site_name" content="The Summit Scheduler"/>
27 <meta property="og:type" content="summit-scheduler:meeting"/>16 <meta property="og:type" content="summit-scheduler:meeting"/>
28 <meta itemprop="name" content="{{ summit.title }} {{ summit.date_start|strftime:"%d" }} - {{ summit.date_end|strftime:"%d, %b. %Y" }}" />17 <meta itemprop="name" content="{{ summit.title }} {{ summit.date_start|strftime:"%d" }} - {{ summit.date_end|strftime:"%d, %b. %Y" }}" />
29 <meta itemprop="description" content="{{ summit.description|linebreaks|striptags }}" />18 <meta itemprop="description" content="{{ summit.description|linebreaks|striptags }}" />{% endblock %}
30
31<style>
32/* Mobile-friendly styles */
33@media screen and (max-width: 481px) {
34 aside#top-nav, header#page-header, aside#page-related, footer#page-footer, section#main-section .container, article.main-content, .container, #main-nav, .double-side-content, #page-footer div.container, #sub-nav-container, .side-content, .wrapper, .inner-wrapper, .span-9, article {
35 width: 100%;
36 margin: 0; padding: 0;
37 }
38 #page-header { text-align: center; }
39 #page-header a { height: 24px; line-height: 1; float: none; display: inline; }
40 #top-logo { display: none; }
41 table.column { width: 100%; margin: 0; padding: 0; border-width: 0; }
42 table.column td { display: block; width: 100%; margin: 0; padding: 0; border-width: 0; }
43 table.column td ul {
44 width: 100%;
45 margin: 0;
46 padding: 0;
47 }
48 article.main-content { width: 100%; }
49 table.column td ul li {
50 background: #efefef;
51 border-bottom: 1px solid black;
52 list-style: none;
53 text-align: center;
54 font-size: 24px;
55 line-height: 24px;
56 min-height: 24px;
57 width: 100%;
58 display: block;
59 padding: 4px 0;
60 margin: 0;
61 }
62 .double-side-content {
63 text-align: center;
64 }
65 .side-content { display: none; }
66 #fb-root * { width: auto; }
67 header h2 a {
68 max-width: 85px;
69 margin-top: -10px;
70 }
71}
72</style>
73{% endblock %}
74
75{% block sub_nav_links %}19{% block sub_nav_links %}
76 <li><a class="sub-nav-item" href="/{{ summit.name }}/tracks" title="Tracks">Tracks</a></li>20 <li><a class="sub-nav-item" href="/{{ summit.name }}/tracks" title="Tracks">Tracks</a></li>
77 <li><a class="sub-nav-item" href="/{{ summit.name }}.ical">All sessions (iCal)</a></li>21 <li><a class="sub-nav-item" href="/{{ summit.name }}.ical">All sessions (iCal)</a></li>
@@ -84,19 +28,17 @@
84{% block content %}28{% block content %}
8529
86<div class="row">30<div class="row">
87 <section class="span-9">31 <section class="span-8">
88 <h1>{{ summit.title }}</h1>32 <h1>{{ summit.title }}</h1>
89 <p>
90 {% include "schedule/summit_info.html" %}33 {% include "schedule/summit_info.html" %}
91 </p>
92 </section>34 </section>
93 <article class="span-3 last">35 <article class="span-4 last actions">
94 {% include "schedule/actions.html" %}36 {% include "schedule/actions.html" %}
95 </article>37 </article>
96</div>38</div>
9739
98<div class="row">40<div class="row">
99 <section class="span-9">41 <section class="span-8">
100 {% if attendee %}42 {% if attendee %}
101 <p>You are attending, you can update the days and times of your attendance <ins></ins>43 <p>You are attending, you can update the days and times of your attendance <ins></ins>
102 <a class="launchpad" href="http://launchpad.net/sprints/{{ summit.name }}/+attend"><img src="/media/img/gem-sm.png" /> Launchpad</a>.44 <a class="launchpad" href="http://launchpad.net/sprints/{{ summit.name }}/+attend"><img src="/media/img/gem-sm.png" /> Launchpad</a>.
@@ -117,9 +59,9 @@
117 {% endif %}59 {% endif %}
118 {% endif %}60 {% endif %}
119 </section>61 </section>
120 <article class="span-3 last">62 <article class="span-4 last">
121 <div class="share alone">63 <div class="share alone">
122 <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 />64 <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; border: 0;" src="http://www.reddit.com/static/spreddit7.gif" alt="submit to reddit" /></a><br />
123 <div id="fb-root"></div>65 <div id="fb-root"></div>
124 <script>(function(d, s, id) {66 <script>(function(d, s, id) {
125 var js, fjs = d.getElementsByTagName(s)[0];67 var js, fjs = d.getElementsByTagName(s)[0];
@@ -138,12 +80,10 @@
138 </article>80 </article>
139</div>81</div>
140<div class="row">82<div class="row">
141 <article class="span-9 last">83 <article class="span-8">
142 <p>
143 {% include "schedule/schedule_list.html" %}84 {% include "schedule/schedule_list.html" %}
144 </p>
145 </article>85 </article>
146 <article class="span-3">86 <article class="span-4 last">
147 {% if summit.hashtag %}87 {% if summit.hashtag %}
148 <div class="share alone">88 <div class="share alone">
149 <h4>Latest Tweets</h4>89 <h4>Latest Tweets</h4>
@@ -155,3 +95,6 @@
155 </article> 95 </article>
156</div>96</div>
157{% endblock %}97{% endblock %}
98
99{% block closure %}<script type="text/javascript" src="/media/js/twidenash/jquery-twidenash.js"></script>{% endblock %}
100
158101
=== modified file 'summit/schedule/templates/schedule/summit_info.html'
--- summit/schedule/templates/schedule/summit_info.html 2012-03-12 21:00:10 +0000
+++ summit/schedule/templates/schedule/summit_info.html 2012-04-05 23:27:19 +0000
@@ -6,4 +6,4 @@
6<strong>Ends:</strong> {{ summit.end|strftime:"%a, %d %b %Y %H:%M:%S %Z" }}</p>6<strong>Ends:</strong> {{ summit.end|strftime:"%a, %d %b %Y %H:%M:%S %Z" }}</p>
7{% endif %}7{% endif %}
8<p class="description">{{ summit.description|safe }}</p>8<p class="description">{{ summit.description|safe }}</p>
9<p><a class="launchpad" href="http://launchpad.net/sprints/{{ summit.name }}"><img src="/media/img/gem-sm.png" /> {{ summit.title }} in Launchpad &rsaquo;</a></p>9<p><a class="launchpad" href="http://launchpad.net/sprints/{{ summit.name }}"><img src="/media/img/gem-sm.png" alt="Launchpad" /> {{ summit.title }} in Launchpad &rsaquo;</a></p>
1010
=== modified file 'summit/schedule/views.py'
--- summit/schedule/views.py 2012-03-23 20:44:55 +0000
+++ summit/schedule/views.py 2012-04-05 23:27:19 +0000
@@ -285,6 +285,7 @@
285 'tracks':tracks,285 'tracks':tracks,
286 'ETHERPAD_HOST': summit.etherpad,286 'ETHERPAD_HOST': summit.etherpad,
287 'summit_organizer': summit.is_organizer(attendee),287 'summit_organizer': summit.is_organizer(attendee),
288 'scheduler': summit.can_change_agenda(attendee),
288 'drafter': drafter,289 'drafter': drafter,
289 }290 }
290 #import pdb; pdb.set_trace()291 #import pdb; pdb.set_trace()
@@ -399,7 +400,7 @@
399 return render_to_response("schedule/mobile.html", {}, RequestContext(request))400 return render_to_response("schedule/mobile.html", {}, RequestContext(request))
400401
401def past(request):402def past(request):
402 pastsummit = Summit.on_site.filter(date_end__lte=datetime.date.today()).order_by('-date_start')403 pastsummit = Summit.on_site.filter(date_end__lte=datetime.date.today())
403 context = {404 context = {
404 'past_summit': pastsummit,405 'past_summit': pastsummit,
405 }406 }
@@ -516,6 +517,7 @@
516 return render_to_response("schedule/review.html", context,517 return render_to_response("schedule/review.html", context,
517 context_instance=RequestContext(request))518 context_instance=RequestContext(request))
518519
520@summit_required
519def meeting_review(request, summit, attendee, meeting_id):521def meeting_review(request, summit, attendee, meeting_id):
520 meeting = get_object_or_404(summit.meeting_set, id=meeting_id)522 meeting = get_object_or_404(summit.meeting_set, id=meeting_id)
521523
@@ -539,3 +541,50 @@
539 return render_to_response('schedule/meeting_review.html',541 return render_to_response('schedule/meeting_review.html',
540 context, RequestContext(request))542 context, RequestContext(request))
541543
544@summit_required
545def created_meetings(request, summit, attendee, username):
546
547 drafter = get_object_or_404(Attendee, summit=summit, user__username=username)
548 if attendee.id != drafter.id:
549 meetings = summit.meeting_set.filter(drafter=drafter).exclude(private=True)
550 else:
551 meetings = summit.meeting_set.filter(drafter=drafter)
552
553 context = {
554 'summit': summit,
555 'meetings': meetings,
556 'drafter': drafter,
557 'attendee': attendee,
558 }
559 return render_to_response("schedule/mine.html", context,
560 context_instance=RequestContext(request))
561
562@summit_required
563def meeting_copy(request, summit, attendee, meeting_id, meeting_slug):
564 meeting = get_object_or_404(summit.meeting_set, id=meeting_id)
565
566 if not summit.can_change_agenda(attendee):
567 return HttpResponseRedirect(reverse('summit.schedule.views.summit', args=(summit.name,)))
568 else:
569 if request.method == 'POST':
570 form = CreateMeeting(instance=meeting, data=request.POST)
571 meeting.id = meeting.pk = None
572 meeting.approver = attendee
573 meeting.drafter = attendee
574 meeting.approved = 'APPROVED'
575
576 if form.is_valid():
577 meeting = form.save()
578 meeting_id = meeting.id
579 return HttpResponseRedirect(meeting.meeting_page_url)
580
581 else:
582 form = CreateMeeting(instance=meeting)
583
584 context = {
585 'summit': summit,
586 'form': form,
587 }
588
589 return render_to_response('schedule/create_meeting.html',
590 context, RequestContext(request))
542591
=== modified file 'summit/settings.py'
--- summit/settings.py 2012-03-08 21:54:53 +0000
+++ summit/settings.py 2012-04-05 23:27:19 +0000
@@ -172,14 +172,14 @@
172172
173BZR_APPS = {173BZR_APPS = {
174 ## ubuntu-django-foundations app management174 ## ubuntu-django-foundations app management
175 'bzr_apps': ('http://code.launchpad.net/~django-foundations-dev/ubuntu-django-foundations/bzr_apps', '7'),175 'bzr_apps': ('http://bazaar.launchpad.net/~django-foundations-dev/ubuntu-django-foundations/bzr_apps', '7'),
176176
177 ## ubuntu-website supplied templates and styles177 ## ubuntu-website supplied templates and styles
178 'ubuntu_website': ('http://bazaar.launchpad.net/~ubuntu-community-webthemes/ubuntu-community-webthemes/light-django-theme', '38'),178 'ubuntu_website': ('http://bazaar.launchpad.net/~ubuntu-community-webthemes/ubuntu-community-webthemes/light-django-theme', '41'),
179 179
180 ## linaro-website supplied templates and styles180 ## linaro-website supplied templates and styles
181 'linaro_website': ('http://bazaar.launchpad.net/~linaro-infrastructure/ubuntu-community-webthemes/light-django-linaro-theme', '41'),181 'linaro_website': ('http://bazaar.launchpad.net/~linaro-infrastructure/ubuntu-community-webthemes/light-django-linaro-theme', '43'),
182 182
183 ## twidenash supplied microblog embedding javascript183 ## twidenash supplied microblog embedding javascript
184 'media/js/twidenash': ('http://bazaar.launchpad.net/~django-foundations-dev/twidenash/2.0/', '3'),184 'media/js/twidenash': ('http://bazaar.launchpad.net/~django-foundations-dev/twidenash/2.0/', '3'),
185}185}
186186
=== modified file 'summit/sponsor/templates/sponsor/nonlaunchpadstep0.html'
--- summit/sponsor/templates/sponsor/nonlaunchpadstep0.html 2012-01-23 01:18:55 +0000
+++ summit/sponsor/templates/sponsor/nonlaunchpadstep0.html 2012-04-05 23:27:19 +0000
@@ -2,7 +2,7 @@
22
3{% block page_name %}Suggest Sponsorship{%endblock %}3{% block page_name %}Suggest Sponsorship{%endblock %}
44
5{% block head %}5{% block extrahead %}
6 {{ form.media }}6 {{ form.media }}
7{% endblock %}7{% endblock %}
88
99
=== modified file 'summit/sponsor/templates/sponsor/nonlaunchpadstep1.html'
--- summit/sponsor/templates/sponsor/nonlaunchpadstep1.html 2012-01-23 01:18:55 +0000
+++ summit/sponsor/templates/sponsor/nonlaunchpadstep1.html 2012-04-05 23:27:19 +0000
@@ -2,7 +2,7 @@
22
3{% block page_name %}Suggest Sponsorship{%endblock %}3{% block page_name %}Suggest Sponsorship{%endblock %}
44
5{% block head %}5{% block extrahead %}
6{{ form.media }}6{{ form.media }}
7{% endblock %}7{% endblock %}
88
99
=== modified file 'summit/sponsor/templates/sponsor/suggeststep0.html'
--- summit/sponsor/templates/sponsor/suggeststep0.html 2012-01-23 01:18:55 +0000
+++ summit/sponsor/templates/sponsor/suggeststep0.html 2012-04-05 23:27:19 +0000
@@ -2,7 +2,7 @@
22
3{% block page_name %}Suggest Sponsorship{%endblock %}3{% block page_name %}Suggest Sponsorship{%endblock %}
44
5{% block head %}5{% block extrahead %}
6 {{ form.media }}6 {{ form.media }}
7{% endblock %}7{% endblock %}
88
99
=== modified file 'summit/sponsor/templates/sponsor/suggeststep1.html'
--- summit/sponsor/templates/sponsor/suggeststep1.html 2012-01-23 01:18:55 +0000
+++ summit/sponsor/templates/sponsor/suggeststep1.html 2012-04-05 23:27:19 +0000
@@ -2,7 +2,7 @@
22
3{% block page_name %}Suggest Sponsorship{%endblock %}3{% block page_name %}Suggest Sponsorship{%endblock %}
44
5{% block head %}5{% block extrahead %}
6{{ form.media }}6{{ form.media }}
7{% endblock %}7{% endblock %}
88
99
=== modified file 'summit/ubuntu_settings.py'
--- summit/ubuntu_settings.py 2012-03-13 18:44:45 +0000
+++ summit/ubuntu_settings.py 2012-04-05 23:27:19 +0000
@@ -3,7 +3,7 @@
33
4from settings import *4from settings import *
55
6SITE_ROOT = 'http://summit.chrisjohnston.org'6SITE_ROOT = 'http://summit.ubuntu.com'
77
88
9SITE_ID = 19SITE_ID = 1
1010
=== modified file 'summit/urls.py'
--- summit/urls.py 2012-03-23 14:20:31 +0000
+++ summit/urls.py 2012-04-05 23:27:19 +0000
@@ -75,6 +75,7 @@
75 (r'^(?P<summit_name>[\w-]+)/edit_mtg/(?P<meeting_id>\d+)/(?P<meeting_slug>[%+\.\w-]+)/$', 'organizer_edit_meeting'),75 (r'^(?P<summit_name>[\w-]+)/edit_mtg/(?P<meeting_id>\d+)/(?P<meeting_slug>[%+\.\w-]+)/$', 'organizer_edit_meeting'),
76 (r'^(?P<summit_name>[\w-]+)/tracks$', 'tracks'),76 (r'^(?P<summit_name>[\w-]+)/tracks$', 'tracks'),
77 (r'^(?P<summit_name>[\w-]+)/next$', 'next_session'),77 (r'^(?P<summit_name>[\w-]+)/next$', 'next_session'),
78 (r'^(?P<summit_name>[\w-]+)/(?P<username>[%+\.\w-]+)/meetings$', 'created_meetings'),
78 (r'^(?P<summit_name>[\w-]+)/(?P<date>[\d-]+)/$', 'daily_schedule'),79 (r'^(?P<summit_name>[\w-]+)/(?P<date>[\d-]+)/$', 'daily_schedule'),
79 (r'^(?P<summit_name>[\w-]+)/(?P<date>[\d-]+)/display$', 'by_date'),80 (r'^(?P<summit_name>[\w-]+)/(?P<date>[\d-]+)/display$', 'by_date'),
80 (r'^(?P<summit_name>[\w-]+)/(?P<room_name>[%+\.\w-]+)/$', 'by_room'),81 (r'^(?P<summit_name>[\w-]+)/(?P<room_name>[%+\.\w-]+)/$', 'by_room'),
@@ -84,6 +85,7 @@
84 (r'^(?P<summit_name>[\w-]+)/meeting/(?P<meeting_id>\d+)/(?P<meeting_slug>[%+\.\w-]+)/\+unregister', 'unregister'),85 (r'^(?P<summit_name>[\w-]+)/meeting/(?P<meeting_id>\d+)/(?P<meeting_slug>[%+\.\w-]+)/\+unregister', 'unregister'),
85 (r'^(?P<summit_name>[\w-]+)/meeting/(?P<meeting_id>\d+)/(?P<meeting_slug>[%+\.\w-]+)/$', 'meeting'),86 (r'^(?P<summit_name>[\w-]+)/meeting/(?P<meeting_id>\d+)/(?P<meeting_slug>[%+\.\w-]+)/$', 'meeting'),
86 (r'^(?P<summit_name>[\w-]+)/private/(?P<private_key>[0-9a-f]{32})/(?P<meeting_slug>[%+\.\w-]+)/$', 'private_meeting'),87 (r'^(?P<summit_name>[\w-]+)/private/(?P<private_key>[0-9a-f]{32})/(?P<meeting_slug>[%+\.\w-]+)/$', 'private_meeting'),
88 (r'^(?P<summit_name>[\w-]+)/meeting/(?P<meeting_id>\d+)/(?P<meeting_slug>[%+\.\w-]+)/copy/$', 'meeting_copy'),
87 (r'^(?P<summit_name>[\w-]+)\.csv$', 'csv'),89 (r'^(?P<summit_name>[\w-]+)\.csv$', 'csv'),
88 (r'^(?P<summit_name>[\w-]+)\.ical$', 'ical'),90 (r'^(?P<summit_name>[\w-]+)\.ical$', 'ical'),
89 (r'^(?P<summit_name>[\w-]+)/participant/my_schedule_(?P<secret_key>[0-9a-f]{32})\.ical$', 'user_private_ical'),91 (r'^(?P<summit_name>[\w-]+)/participant/my_schedule_(?P<secret_key>[0-9a-f]{32})\.ical$', 'user_private_ical'),
9092
=== modified file 'summit/version'
--- summit/version 2012-03-08 18:04:36 +0000
+++ summit/version 2012-04-05 23:27:19 +0000
@@ -1,2 +1,2 @@
1version: 1.0.71version: 1.0.9
2revno: 3082revno: 334

Subscribers

People subscribed via source and target branches