Summit

Merge lp:~summit-hackers/summit/collapsable-agenda into lp:summit

  1. collapsable-agenda
  2. Merge into trunk
Proposed by Chris Johnston on 2012-10-05
Status: Merged
Approved by: Michael Hall on 2012-10-09
Approved revision: 455
Merged at revision: 453
Proposed branch: lp:~summit-hackers/summit/collapsable-agenda
Merge into: lp:summit
Diff against target: 160 lines
To merge this branch: bzr merge lp:~summit-hackers/summit/collapsable-agenda
Reviewer Review Type Date Requested Status
Michael Hall (community) Approve on 2012-10-09
Adnane Belmadiaf 2012-10-05 Approve on 2012-10-06
Review via email: mp+128328@code.launchpad.net

Commit Message

Adds the ability to collapse the tables on the agenda views... Props daker for the JS/CSS help!

To post a comment you must log in.
Adnane Belmadiaf (daker) wrote :

stripes.js doesn't have any relation with un/collapsing the table so just remove it.

review: Needs Fixing
lp:~summit-hackers/summit/collapsable-agenda updated on 2012-10-06
454. By Chris Johnston on 2012-10-06

Updates

455. By Chris Johnston on 2012-10-06

Removes stripes.js

Adnane Belmadiaf (daker) wrote :

+1 from me.

review: Approve
Michael Hall (mhall119) wrote :

It would be better if past hours would default to collapsed

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'summit/media/css/collapsible-tables.css'
2--- summit/media/css/collapsible-tables.css 1970-01-01 00:00:00 +0000
3+++ summit/media/css/collapsible-tables.css 2012-10-06 17:28:21 +0000
4@@ -0,0 +1,1 @@
5+/* ---------- 3. tables ---------- */
6
7table {
8 border-collapse: collapse;
9 }
10
11tbody {
12 display: table-row-group;
13 }
14
15thead a {
16 display: none;
17 }
18\ No newline at end of file
19
20=== added file 'summit/media/css/js-override.css'
21--- summit/media/css/js-override.css 1970-01-01 00:00:00 +0000
22+++ summit/media/css/js-override.css 2012-10-06 17:28:21 +0000
23@@ -0,0 +1,1 @@
24+thead a {
25 display: inline-block;
26 height: 12px;
27 width: 20px;
28 text-decoration: none;
29 text-transform: uppercase;
30 color: black;
31 padding: 4px 0;
32 background: url(/media/img/up-arrow.png) 0px 60% no-repeat;
33 float: right;
34}
35\ No newline at end of file
36
37=== added file 'summit/media/img/down-arrow.png'
38Binary files summit/media/img/down-arrow.png 1970-01-01 00:00:00 +0000 and summit/media/img/down-arrow.png 2012-10-06 17:28:21 +0000 differ
39=== added file 'summit/media/img/up-arrow.png'
40Binary files summit/media/img/up-arrow.png 1970-01-01 00:00:00 +0000 and summit/media/img/up-arrow.png 2012-10-06 17:28:21 +0000 differ
41=== added file 'summit/media/js/collapsible-tables.js'
42--- summit/media/js/collapsible-tables.js 1970-01-01 00:00:00 +0000
43+++ summit/media/js/collapsible-tables.js 2012-10-06 17:28:21 +0000
44@@ -0,0 +1,39 @@
45+ var cssNode = document.createElement('link');
46+ cssNode.setAttribute('rel', 'stylesheet');
47+ cssNode.setAttribute('type', 'text/css');
48+ cssNode.setAttribute('href', '/media/css/js-override.css');
49+ document.getElementsByTagName('head')[0].appendChild(cssNode);
50+
51+
52+function toggle(toggler) {
53+ if(document.getElementById) {
54+ imageSwitch = toggler;
55+ targetElement = toggler.parentNode.parentNode.parentNode.nextSibling;
56+
57+ if(targetElement.className == undefined) {
58+ targetElement = toggler.parentNode.parentNode.parentNode.nextSibling.nextSibling;
59+ }
60+
61+
62+if (navigator.userAgent.indexOf('IE')!= -1)
63+ {
64+ var displaySetting = "block";
65+ }
66+ else
67+ {
68+ var displaySetting = "table-row-group";
69+ }
70+
71+
72+if (targetElement.style.display == displaySetting)
73+ {
74+ targetElement.style.display = "none";
75+ imageSwitch.style.backgroundImage = "url(/media/img/down-arrow.png)";
76+ }
77+ else
78+ {
79+ targetElement.style.display = displaySetting;
80+ imageSwitch.style.backgroundImage = "url(/media/img/up-arrow.png)";
81+ }
82+ }
83+}
84
85=== modified file 'summit/schedule/templates/schedule/by_participant.html'
86--- summit/schedule/templates/schedule/by_participant.html 2012-05-28 03:36:43 +0000
87+++ summit/schedule/templates/schedule/by_participant.html 2012-10-06 17:28:21 +0000
88@@ -6,7 +6,8 @@
89 {% endblock %}
90
91 {% block extrahead %}
92-
93+<link rel="stylesheet" type="text/css" media="screen" href="/media/css/collapsible-tables.css" />
94+<script src="/media/js/collapsible-tables.js" type="text/javascript"></script>
95 {{ block.super }}
96 {% endblock %}
97
98@@ -30,8 +31,8 @@
99 <br class="clear" />
100 {% for slot, meetings in schedule.items %}
101 <table class="basic">
102-<thead><tr><th colspan="2">{{slot.start|strftime:"%A %H:%M"}} - {{slot.end|strftime:"%H:%M"}} {{summit.start|strftime:"%Z"}}</th></tr></thead>
103-<tbody>
104+<thead><tr><th colspan="2">{{slot.start|strftime:"%A %H:%M"}} - {{slot.end|strftime:"%H:%M"}} {{summit.start|strftime:"%Z"}} <a href="#" onclick="toggle(this); return false;"></a></th></tr></thead>
105+<tbody style="display: table-row-group;">
106 {% for room, agenda in meetings.items %}
107 <tr style="background-color: {% ifequal agenda.meeting.type 'plenary' %}#ffffe0{% else %}{{ agenda.meeting.track_color }}{% endifequal %}; {% if agenda.meeting.private %}border: 1px; border-style: solid; border-color: #FF0000;{% endif %}">
108 <td width="75%">
109
110=== modified file 'summit/schedule/templates/schedule/by_room.html'
111--- summit/schedule/templates/schedule/by_room.html 2012-09-27 22:00:15 +0000
112+++ summit/schedule/templates/schedule/by_room.html 2012-10-06 17:28:21 +0000
113@@ -6,6 +6,8 @@
114 {% endblock %}
115
116 {% block extrahead %}
117+<link rel="stylesheet" type="text/css" media="screen" href="/media/css/collapsible-tables.css" />
118+<script src="/media/js/collapsible-tables.js" type="text/javascript"></script>
119 {{ block.super }}
120 {% endblock %}
121
122@@ -28,8 +30,8 @@
123 <br class="clear" />
124 {% for slot, meetings in schedule.items %}
125 <table class="basic">
126-<thead><tr><th colspan="2">{{slot.start|strftime:"%A, %H:%M"}} - {{slot.end|strftime:"%H:%M"}} {{summit.start|strftime:"%Z"}}</th></tr></thead>
127-<tbody>
128+<thead><tr><th colspan="2">{{slot.start|strftime:"%A, %H:%M"}} - {{slot.end|strftime:"%H:%M"}} {{summit.start|strftime:"%Z"}} <a href="#" onclick="toggle(this); return false;"></a></th></tr></thead>
129+<tbody style="display: table-row-group;">
130 {% for room, agenda in meetings.items %}
131 <tr style="background-color: {% ifequal agenda.meeting.type 'plenary' %}#ffffe0{% else %}{{ agenda.meeting.track_color }}{% endifequal %}; {% if agenda.meeting.private %}border: 1px; border-style: solid; border-color: #FF0000;{% endif %}">
132 <td width="75%">
133
134=== modified file 'summit/schedule/templates/schedule/by_track.html'
135--- summit/schedule/templates/schedule/by_track.html 2012-09-27 22:00:15 +0000
136+++ summit/schedule/templates/schedule/by_track.html 2012-10-06 17:28:21 +0000
137@@ -6,7 +6,8 @@
138 {% endblock %}
139
140 {% block extrahead %}
141-
142+<link rel="stylesheet" type="text/css" media="screen" href="/media/css/collapsible-tables.css" />
143+<script src="/media/js/collapsible-tables.js" type="text/javascript"></script>
144 {{ block.super }}
145 {% endblock %}
146
147@@ -29,8 +30,8 @@
148 <br class="clear" />
149 {% for slot, meetings in schedule.items %}
150 <table class="basic">
151-<thead><tr><th colspan="2">{{slot.start|strftime:"%A %H:%M"}} - {{slot.end|strftime:"%H:%M"}} {{summit.start|strftime:"%Z"}}</th></tr></thead>
152-<tbody>
153+<thead><tr><th colspan="2">{{slot.start|strftime:"%A %H:%M"}} - {{slot.end|strftime:"%H:%M"}} {{summit.start|strftime:"%Z"}} <a href="#" onclick="toggle(this); return false;"></a></th></tr></thead>
154+<tbody style="display: table-row-group;">
155 {% for room, agenda in meetings.items %}
156 <tr style="background-color: {% ifequal agenda.meeting.type 'plenary' %}#ffffe0{% else %}{{ agenda.meeting.track_color }}{% endifequal %}; {% if agenda.meeting.private %}border: 1px; border-style: solid; border-color: #FF0000;{% endif %}">
157 <td width="75%">
158
159=== modified file 'summit/schedule/templates/schedule/daily.html'
160--- summit/schedule/templates/schedule/daily.html 2012-09-27 22:00:15 +0000
161+++ summit/schedule/templates/schedule/daily.html 2012-10-06 17:28:21 +0000
162@@ -6,7 +6,8 @@
163 {% endblock %}
164
165 {% block extrahead %}
166-
167+<link rel="stylesheet" type="text/css" media="screen" href="/media/css/collapsible-tables.css" />
168+<script src="/media/js/collapsible-tables.js" type="text/javascript"></script>
169 {{ block.super }}
170 {% endblock %}
171
172@@ -38,8 +39,8 @@
173 <br class="clear" />
174 {% for slot, meetings in schedule.items %}
175 <table class="basic">
176-<thead><tr><th colspan="2">{{slot.start.time|strftime:"%H:%M"}} - {{slot.end.time|strftime:"%H:%M"}} {{summit.start|strftime:"%Z"}} {% ifequal slot.type 'plenary' %}[PLENARY]{% endifequal %}</th></tr></thead>
177-<tbody>
178+<thead><tr><th colspan="2">{{slot.start.time|strftime:"%H:%M"}} - {{slot.end.time|strftime:"%H:%M"}} {{summit.start|strftime:"%Z"}} {% ifequal slot.type 'plenary' %}[PLENARY]{% endifequal %} <a href="#" onclick="toggle(this); return false;"></a></th></tr></thead>
179+<tbody style="display: table-row-group;">
180 {% if slot.type == 'lunch' %}
181 <tr style="background-color: #AAFFAA;">
182 <td colspan="2" style="text-align: center;">

Subscribers

People subscribed via source and target branches