X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=server%2F2015%2Fsidebar.html;h=168b8668710b16e0d666dd52bb8f865f80157481;hb=81a6a94f1d1eb39d58a69decf49e96645f03cbce;hp=fc47ba83e92f8bd6f32f69f3b1cbfcef8ed4dc50;hpb=897bda8626788c4d8975c7a4f8960c5e7e47a489;p=libreplanet-static.git

diff --git a/server/2015/sidebar.html b/server/2015/sidebar.html
old mode 100644
new mode 100755
index fc47ba83..168b8668
--- a/server/2015/sidebar.html
+++ b/server/2015/sidebar.html
@@ -1,51 +1,63 @@
-      <div class="container"> <!-- start of container -->
-	<div class="row">
-          <div id="lp-nav" class="col-sm-3">
-            <!--#if expr='"$REQUEST_URI" != "/2015/"' -->
-	    <p class="text-center lp-home">
-	      <a class="text-muted" href="/2015/">
-		<span class="glyphicon glyphicon-chevron-left"></span> Home
-	      </a>
-	    </p>
-            <!--#endif -->
-
-            <ul class="nav nav-pills nav-stacked">
-              <li id="cfs-link"><a href="/2015/call_for_sessions">Propose a Session</a></li>
+<div class="container"> <!-- start of container -->
+  <div class="row">
+    <div id="lp-nav" class="col-sm-3"> <!-- start of sidebar column -->
+      <!--#if expr='"$REQUEST_URI" != "/2015/"' -->
+      <p class="text-center lp-home">
+        <a class="text-muted" href="/2015/">
+          <span class="glyphicon glyphicon-chevron-left"></span> Home
+        </a>
+      </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>
+
+      <ul class="nav nav-pills nav-stacked">
+        <li id="mailing-list-link"><a href="https://lists.gnu.org/mailman/listinfo/libreplanet-discuss">Join the Discussion List</a></li>
+        <li id="getting_around-link"><a href="/2015/getting_around">Travel Info</a></li>
+        <!--<li><a href="/2015/scholarships">Scholarships (until January 10th)</a></li>-->
+        <!--<li><a href="/2015/live">Participate online</a></li>-->
+
+        <li><a href="/2015/scholarship_donation">Build the Scholarship Fund</a></li>
+        <li>
+          <a href="https://libreplanet.org/wiki/LibrePlanet:Conference/2015/Conference_brainstorm">
+            Share Your Conference Ideas
+          </a>
+        </li>
+      </ul>
+
+      <ul class="nav nav-pills nav-stacked">
+
+        <!--<li><a href="http://media.libreplanet.org/">Videos of previous conferences</a></li>-->
+        <li id="ahp-link"><a href="/2015/anti-harassment/">Anti-Harassment Policy</a></li>
+        <li><a href="/2014/program/sessions.html">Last Year's Program</a></li>
+      </ul>
+
+      <ul class="nav nav-pills nav-stacked">
+        <li class="fsf-donate">
+          <a href="https://my.fsf.org/associate/support_freedom">
+            <span class="glyphicon glyphicon-heart"></span>
+            Become a proud FSF Member
+          </a>
+        </li>
+      </ul>
+      <p class="text-muted text-center">and attend the conference gratis!</p>
 
-              <!--<li><a href="/2015/video/">Watch the video</a></li>-->
-            </ul>
-
-            <ul class="nav nav-pills nav-stacked">
-              <li><a href="/2014">LibrePlanet 2014 Site</a></li>
-              <li id="getting_around-link"><a href="/2015/getting_around">Travel</a></li>
-              <!--<li><a href="/2015/scholarships">Scholarships (until January 10th)</a></li>-->
-              <!--<li><a href="/2015/live">Participate online</a></li>-->
-
-              <li><a href="/2015/scholarship_donation">Build the Scholarship Fund</a></li>
-            </ul>
-
-            <ul class="nav nav-pills nav-stacked">
-              <li>
-                <a href="https://libreplanet.org/wiki/LibrePlanet:Conference/2015/Conference_brainstorm">
-	          Share Ideas for the Conference
-                </a>
-              </li>	
-              <!--<li><a href="http://media.libreplanet.org/">Videos of previous conferences</a></li>-->
-              <li id="ahp-link"><a href="/2015/anti-harassment/">Anti-Harassment Policy</a></li>
-              </ul>
-
-				<ul class="nav nav-pills nav-stacked">                            
-              <li class="fsf-donate">
-                <a href="https://my.fsf.org/associate/support_freedom">
-	          <span class="glyphicon glyphicon-heart"></span>
-	          Become a proud FSF Member
-                </a>
-              </li>
-            </ul>
-            <p class="text-muted text-center">and attend the conference gratis!</p>
-          </div>
-		  <div id="lp-content" class="col-sm-9"> <!-- start of content column -->
+			<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>
+        <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 -->