Bunch o little updates prepping for registration launch.

diff --git a/2015/index.html b/2015/index.html
index 8fa7b9c4fcdf0c04df5bdb619ceddbe669044172..c113d8564160aab3a427fb0cea50ef4403866d3b 100755 (executable)
--- a/2015/index.html
+++ b/2015/index.html
@@ -32,7 +32,7 @@
        <li class="list-group-item">
                   10/15/2014: <a href="https://crm.fsf.org/civicrm/event/register?reset=1&id=20">Registration</a> is now open!</li>
 
-       <li class="list-group-item">9/16/2014: <a href="https://www.fsf.org/news/libreplanet-is-coming-march-21-22-2015-call-for-proposals-now-open-for-annual-free-software-conference">LibrePlanet is coming March 21-22, 2015, call for proposals now open for annual free software conference</a></li>
+       <li class="list-group-item">09/16/2014: <a href="https://www.fsf.org/news/libreplanet-is-coming-march-21-22-2015-call-for-proposals-now-open-for-annual-free-software-conference">LibrePlanet is coming March 21-22, 2015, call for proposals now open for annual free software conference</a></li>
 
          </ul>
        </div> <!-- end of Updates -->

diff --git a/server/2015/banner.html b/server/2015/banner.html
index 8179129aadc22d8dac72177d1e5ea576a6226f41..c3630486f523f3d3f54b83caf40f6655f171a088 100644 (file)
--- a/server/2015/banner.html
+++ b/server/2015/banner.html
@@ -14,9 +14,8 @@
                          </div>
                          <div class="col-sm-3">
                                <p class="text-muted">
-                                 <strong>March 21-22<br />
-                                       Cambridge, MA</strong><br />
-                                 Registration opens in October</p>
+                                 <strong><br>March 21-22<br />
+                                       Cambridge, MA</strong></p>
                          </div>
                        </div><!-- end of lp header -->
 

diff --git a/server/2015/sidebar.html b/server/2015/sidebar.html
index 470ba024ab6036d19d9faf6f915d06904ce2c20d..65efc790f01edfe557cf313326374de9d193cb80 100644 (file)
--- a/server/2015/sidebar.html
+++ b/server/2015/sidebar.html
@@ -15,6 +15,8 @@
               <!--<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>