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

[Michael Hall]

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

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

[Chris Johnston (cjohnston)]

review: Approve

=== 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:39:20 +0000
@@ -16,69 +16,6 @@
   </script>
   <script language="JavaScript" src="/media/ajax.js"></script>
   <script language="JavaScript" src="/media/schedule/schedule.js"></script>
-{% else %}
-  <script language="JavaScript">
-function toggle_uninterested()
-{
-    var divs = document.getElementsByTagName('DIV');
-    for (var i = 0; i < divs.length; i++) {
-        var div = divs[i];
-
-        if (div.className.match(/meeting.*uninterested/) || div.className.match(/meeting.*ambivalent/)) {
-            if (div.style.visibility == 'hidden') {
-                div.style.visibility = 'visible';
-            } else {
-                div.style.visibility = 'hidden';
-            }
-        }
-    }
-}
-{% if not schedule.nextonly %}
-function addMySessionsLink (e) {
-    if (!document.getElementsByClassName) return;
-    var lnk = document.createElement("a");
-    lnk.href = "#";
-    lnk.appendChild(document.createTextNode("Hide talks that aren't for me"));
-    lnk.className = 'sub-nav-item';
-    lnk.onclick = function(e) {
-        var whoami = document.getElementById("whoami");
-        if (!whoami) return;
-        var name = whoami.firstChild.nodeValue.toString().replace(/^\s*|\s*$/g, "");
-        var meetings = document.getElementsByClassName("meeting");
-        for (var i=0; i<meetings.length; i++) {
-            var foundInMeeting = false;
-            var participantslist = meetings[i].getElementsByClassName("participants");
-            if (participantslist.length > 0) {
-                var participants = participantslist[0].getElementsByTagName("li");
-                for (var j=0; j<participants.length; j++) {
-                    var plnk = participants[j].getElementsByTagName("a");
-                    if (plnk.length > 0) {
-                        if (plnk[0].textContent == name) {
-                            var foundInMeeting = true;
-                        }
-                    }
-                }
-            }
-            if (!foundInMeeting) {
-                meetings[i].style.opacity = "0.2";
-            }
-        }
-        e.preventDefault();
-        return false;
-    }
-    document.getElementById("sub-nav").appendChild(lnk);
-};
-
-(function(i) {var u =navigator.userAgent;var e=/*@cc_on!@*/false; var st =
-setTimeout;if(/webkit/i.test(u)){st(function(){var dr=document.readyState;
-if(dr=="loaded"||dr=="complete"){i()}else{st(arguments.callee,10);}},10);}
-else if((/mozilla/i.test(u)&&!/(compati)/.test(u)) || (/opera/i.test(u))){
-document.addEventListener("DOMContentLoaded",i,false); } else if(e){     (
-function(){var t=document.createElement('doc:rdy');try{t.doScroll('left');
-i();t=null;}catch(e){st(arguments.callee,0);}})();}else{window.onload=i;}})(addMySessionsLink);
-
-{% endif %}
-</script>
 {% endif %}
 {% if schedule.nextonly or autoreload %}
   <script language="JavaScript">

=== 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:39:20 +0000
@@ -115,6 +115,9 @@
             <p><a href="/openid/login?next={{login_next}}">Log in now</a></p>
         {% endif %}
     {% endif %}
+    <p>
+        {% include "schedule/schedule_list.html" %}
+    </p>
 </section>
 <article class="side-content alone">
     <div class="share">
@@ -143,9 +146,4 @@
     </article>
 {% endif %}
 
-<article class="main-content">
-    <p>
-        {% include "schedule/schedule_list.html" %}
-    </p>
-</article>
 {% endblock %}