Merge lp:~mhall119/summit/fix-schedule-layout into lp:summit/production

Proposed by Michael Hall
Status: Merged
Merged at revision: 168
Proposed branch: lp:~mhall119/summit/fix-schedule-layout
Merge into: lp:summit/production
Diff against target: 97 lines (+3/-68)
2 files modified
summit/schedule/templates/schedule/schedule.html (+0/-63)
summit/schedule/templates/schedule/summit.html (+3/-5)
To merge this branch: bzr merge lp:~mhall119/summit/fix-schedule-layout
Reviewer Review Type Date Requested Status
Summit Hackers Pending
Review via email: mp+91586@code.launchpad.net

Commit message

* Removes broken javascript for "Hide talks that aren't for me"
* Fixes schedule layout on the summit page to avoid excessive scrolling

Description of the change

* Removes broken javascript for "Hide talks that aren't for me"
* Fixes schedule layout on the summit page to avoid excessive scrolling

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'summit/schedule/templates/schedule/schedule.html'
--- summit/schedule/templates/schedule/schedule.html 2012-02-02 16:40:27 +0000
+++ summit/schedule/templates/schedule/schedule.html 2012-02-05 18:42:20 +0000
@@ -16,69 +16,6 @@
16 </script>16 </script>
17 <script language="JavaScript" src="/media/ajax.js"></script>17 <script language="JavaScript" src="/media/ajax.js"></script>
18 <script language="JavaScript" src="/media/schedule/schedule.js"></script>18 <script language="JavaScript" src="/media/schedule/schedule.js"></script>
19{% else %}
20 <script language="JavaScript">
21function toggle_uninterested()
22{
23 var divs = document.getElementsByTagName('DIV');
24 for (var i = 0; i < divs.length; i++) {
25 var div = divs[i];
26
27 if (div.className.match(/meeting.*uninterested/) || div.className.match(/meeting.*ambivalent/)) {
28 if (div.style.visibility == 'hidden') {
29 div.style.visibility = 'visible';
30 } else {
31 div.style.visibility = 'hidden';
32 }
33 }
34 }
35}
36{% if not schedule.nextonly %}
37function addMySessionsLink (e) {
38 if (!document.getElementsByClassName) return;
39 var lnk = document.createElement("a");
40 lnk.href = "#";
41 lnk.appendChild(document.createTextNode("Hide talks that aren't for me"));
42 lnk.className = 'sub-nav-item';
43 lnk.onclick = function(e) {
44 var whoami = document.getElementById("whoami");
45 if (!whoami) return;
46 var name = whoami.firstChild.nodeValue.toString().replace(/^\s*|\s*$/g, "");
47 var meetings = document.getElementsByClassName("meeting");
48 for (var i=0; i<meetings.length; i++) {
49 var foundInMeeting = false;
50 var participantslist = meetings[i].getElementsByClassName("participants");
51 if (participantslist.length > 0) {
52 var participants = participantslist[0].getElementsByTagName("li");
53 for (var j=0; j<participants.length; j++) {
54 var plnk = participants[j].getElementsByTagName("a");
55 if (plnk.length > 0) {
56 if (plnk[0].textContent == name) {
57 var foundInMeeting = true;
58 }
59 }
60 }
61 }
62 if (!foundInMeeting) {
63 meetings[i].style.opacity = "0.2";
64 }
65 }
66 e.preventDefault();
67 return false;
68 }
69 document.getElementById("sub-nav").appendChild(lnk);
70};
71
72(function(i) {var u =navigator.userAgent;var e=/*@cc_on!@*/false; var st =
73setTimeout;if(/webkit/i.test(u)){st(function(){var dr=document.readyState;
74if(dr=="loaded"||dr=="complete"){i()}else{st(arguments.callee,10);}},10);}
75else if((/mozilla/i.test(u)&&!/(compati)/.test(u)) || (/opera/i.test(u))){
76document.addEventListener("DOMContentLoaded",i,false); } else if(e){ (
77function(){var t=document.createElement('doc:rdy');try{t.doScroll('left');
78i();t=null;}catch(e){st(arguments.callee,0);}})();}else{window.onload=i;}})(addMySessionsLink);
79
80{% endif %}
81</script>
82{% endif %}19{% endif %}
83{% if schedule.nextonly or autoreload %}20{% if schedule.nextonly or autoreload %}
84 <script language="JavaScript">21 <script language="JavaScript">
8522
=== modified file 'summit/schedule/templates/schedule/summit.html'
--- summit/schedule/templates/schedule/summit.html 2012-01-28 11:37:36 +0000
+++ summit/schedule/templates/schedule/summit.html 2012-02-05 18:42:20 +0000
@@ -115,6 +115,9 @@
115 <p><a href="/openid/login?next={{login_next}}">Log in now</a></p>115 <p><a href="/openid/login?next={{login_next}}">Log in now</a></p>
116 {% endif %}116 {% endif %}
117 {% endif %}117 {% endif %}
118 <p>
119 {% include "schedule/schedule_list.html" %}
120 </p>
118</section>121</section>
119<article class="side-content alone">122<article class="side-content alone">
120 <div class="share">123 <div class="share">
@@ -143,9 +146,4 @@
143 </article>146 </article>
144{% endif %}147{% endif %}
145148
146<article class="main-content">
147 <p>
148 {% include "schedule/schedule_list.html" %}
149 </p>
150</article>
151{% endblock %}149{% endblock %}

Subscribers

People subscribed via source and target branches

to all changes: