From: Zak Rogoff <zak@montage.office.fsf.org>
Date: Fri, 16 Jan 2015 19:44:46 +0000 (-0500)
Subject: Added program link to sidebar and finalized initial program content.
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=9230bc88fac82ae343c29f9712ce5f329ca92d7f;p=libreplanet-static.git

Added program link to sidebar and finalized initial program content.
---

diff --git a/2015/program/schedule.html b/2015/program/schedule.html
index 53b8cc04..e4ed3d43 100755
--- a/2015/program/schedule.html
+++ b/2015/program/schedule.html
@@ -5,7 +5,7 @@
 <!--#include virtual="/server/2015/banner.html"-->
 <!--#include virtual="/server/2015/sidebar.html"-->
 
-<h1>Schedule</h1>
+<h1>Program <small>Schedule</small></h1>
 
 <!--#include virtual="/server/2015/program-menu.html"-->
 
diff --git a/server/2015/sidebar.html b/server/2015/sidebar.html
index 168b8668..a21fe17b 100755
--- a/server/2015/sidebar.html
+++ b/server/2015/sidebar.html
@@ -9,15 +9,15 @@
       </p>
       <!--#endif -->
 
-            <ul class="nav nav-pills nav-stacked" style="padding-top: 0 !important;">
-              <!--<li id="cfs-link"><a href="/2015/call_for_sessions">Propose a Session</a></li>-->
-              <!--<li><a href="/2015/program">Program</a></li>-->
-              <!--<li><a href="/2015/program/exhibit_hall.html">Exhibit hall</a></li>-->
-              <li id="exhibit-link"><a href="/2015/exhibit">Join the Exhibit Hall</a></li>
-              <li id="volunteer-link"><a href="/2015/volunteer">Volunteer</a></li>
-              <!--<li id="scholarship-link"><a href="/2015/scholarships">Apply for a Scholarship</a></li>-->
-
-        <!--<li><a href="/2015/video/">Watch the video</a></li>-->
+      <ul class="nav nav-pills nav-stacked" style="padding-top: 0 !important;">
+        <!--<li id="cfs-link"><a href="/2015/call_for_sessions">Propose a Session</a></li>-->
+        <!--<li><a href="/2015/program">Program</a></li>-->
+        <!--<li><a href="/2015/program/exhibit_hall.html">Exhibit hall</a></li>-->
+        <li id="program-link"><a href="/2015/program">Program</a></li>
+        <li id="exhibit-link"><a href="/2015/exhibit">Join the Exhibit Hall</a></li>
+        <li id="volunteer-link"><a href="/2015/volunteer">Volunteer</a></li>
+        <!--<li id="scholarship-link"><a href="/2015/scholarships">Apply for a Scholarship</a></li>-->
+
       </ul>
 
       <ul class="nav nav-pills nav-stacked">
@@ -51,13 +51,13 @@
       </ul>
       <p class="text-muted text-center">and attend the conference gratis!</p>
 
-			<ul  class="list-group margin-top">
-			  <li class="list-group-item">
-				<strong>Recent Updates</strong>
-        <li class="list-group-item">
-          <strong>12/11/2014:</strong> <a href="https://www.fsf.org/blogs/community/how-many-libreplanet-scholarships-will-we-give">Karen Sandler announced as keynote speaker</a></li>
+      <ul  class="list-group margin-top">
         <li class="list-group-item">
-				<strong>10/15/2014:</strong> <a href="https://fsf.org/blogs/community/registration-opens-for-libreplanet-2015">Registration now open</a></li>
-			</ul>
+          <strong>Recent Updates</strong>
+          <li class="list-group-item">
+            <strong>12/11/2014:</strong> <a href="https://www.fsf.org/blogs/community/how-many-libreplanet-scholarships-will-we-give">Karen Sandler announced as keynote speaker</a></li>
+            <li class="list-group-item">
+              <strong>10/15/2014:</strong> <a href="https://fsf.org/blogs/community/registration-opens-for-libreplanet-2015">Registration now open</a></li>
+            </ul>
           </div> <!-- end of sidebar column -->
           <div id="lp-content" class="col-sm-9"> <!-- start of content column -->