Merge branch 'master' into stable

[libreplanet-static.git] / 2018 / includes / sidebar.html

diff --git a/2018/includes/sidebar.html b/2018/includes/sidebar.html
index 475f7792a12f08e8cd0a0262e68443d0e7ee1c1c..f7356f8c3eb706655a1ca02bd7c387bf507ca93e 100755 (executable)
--- a/2018/includes/sidebar.html
+++ b/2018/includes/sidebar.html
@@ -9,18 +9,6 @@
                        </p>
                        <!--#endif -->
 
-                       <!-- Sidebar items that are commented out
-                       <li><a href="/2018/program/exhibit_hall.html">Exhibit hall</a></li>
-
-                       <li id="scholarship-link"><a href="https://my.fsf.org/civicrm/profile/create?gid=334&reset=1">Apply for a scholarship</a></li>
-                       <li><a href="https://libreplanet.org/wiki/LibrePlanet:Conference/2018/Conference_brainstorm">Share Your Conference Ideas</a></li>
-                       <li><a href="/2018/live">Livestream & Chat</a></li>
-                       <li><a href="https://www.libreplanet.org/2015/program">Last year's program</a></li>
-                       <li id="exhibit-link"><a href="/2018/program/exhibit-hall.html">Exhibit Hall</a></li>
-      <li id="cfs-link"><a href="https://my.fsf.org/civicrm/profile/create?gid=325&amp;reset=1">Propose a session</a></li>
-                       <li><a href="/2018/exhibit">Reserve an exhibit table</a></li>
-               -->
-
 
                <ul class="nav nav-pills nav-stacked hidden-xs">
                   <!--#include virtual="/2018/includes/nav-list-1.html"-->
@@ -41,17 +29,17 @@
                <p class="text-muted text-center">and attend the conference gratis!</p>
 
                <ul  class="list-group margin-top">
-                       <li class="list-group-item">
+                   <li class="list-group-item">
                                <strong>Recent Updates</strong>
 
+                    </li>
+                    <!--
+                         Markup of update items:
 
-                               <li class="list-group-item">
-                                       <strong>03/20/2018:</strong> <a href="https://www.fsf.org/blogs/community/your-guide-to-libreplanet-2018-wherever-you-are-march-25-26">Your guide to LibrePlanet 2018, wherever you are</a></li>
-                       </li>
-                                       <li class="list-group-item"><strong>03/01/2018:</strong> <a href="https://www.fsf.org/blogs/community/meet-the-libreplanet-2018-speakers-gordon-hall-1">Meet the LibrePlanet 2018 Speakers: Gordon Hall</a></li>
-                       <li class="list-group-item">
-                               <strong>02/06/2018:</strong><a href="https://www.fsf.org/news/aclu-technology-for-liberty-director-kade-crockford-at-libreplanet-2018"> Kade Crockford will give keynote at LibrePlanet 2018</a></li>
-
-                                                       </ul>
-                               </div> <!-- end of sidebar column -->
-                               <div id="lp-content" class="col-sm-9"> <!-- start of content column -->
+                        <li class="list-group-item">
+                        <strong>MM/DD/YYYY:</strong> <a href="#">Update item description.</a>
+                         </li>
+                       -->
+               </ul>
+               </div> <!-- end of sidebar column -->
+               <div id="lp-content" class="col-sm-9"> <!-- start of content column -->