mailing-list added to home

diff --git a/server/2015/mailing_list_js.html b/server/2015/mailing_list_js.html
new file mode 100755 (executable)
index 0000000..83eb09c
--- /dev/null
+++ b/server/2015/mailing_list_js.html
@@ -0,0 +1,24 @@
+<script type="text/javascript"
+       src="/2015/assets/js/jquery-1.11.1.min.js">
+</script>
+
+<script type="text/javascript"
+               src="/2015/assets/js/civicrm-4.4.jquery.chainedSelects.js">
+</script>
+
+<script type="text/javascript"
+               src="/2015/assets/js/jquery.form-3.25.0.js">
+</script>
+
+<script type="text/javascript"
+               src="/2015/assets/js/civicrm-4.4.Common.js">
+</script>
+
+
+
+
+<script type="text/javascript">
+ $("#mailing-list-link").addClass("active");
+</script>
+<script type="text/javascript"
+        src="/2015/assets/js/piwik.js"></script>

diff --git a/server/2015/sidebar.html b/server/2015/sidebar.html
old mode 100644 (file)
new mode 100755 (executable)
index a76de23..f763491
--- a/server/2015/sidebar.html
+++ b/server/2015/sidebar.html
@@ -16,13 +16,14 @@
               <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 id="mailing-list-link"><a href="/2015/mailing-list">Join the Mailing List</a></li>
 
 
               <!--<li><a href="/2015/video/">Watch the video</a></li>-->
             </ul>
 
             <ul class="nav nav-pills nav-stacked">
-              
+
               <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>-->
@@ -32,17 +33,17 @@
                 <a href="https://libreplanet.org/wiki/LibrePlanet:Conference/2015/Conference_brainstorm">
                  Share Your Conference Ideas
                 </a>
-              </li>    
+              </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">                            
+                               <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>