Removed JS includes from footer.html. From now on JS includes will put in a seperate...

This change was done because each page will have different JS
requirement.

All pages, from now on:

- Will have to include an additional /server/2015/close.html file that
closes the HTML document.

- There will be three SSI includes at the end of each HTML document.

  <!--#include virtual="/2015/footer.html"-->
  <!--#include virtual="/server/2015/pagename_js.html"-->
  <!--#include virtual="/server/2015/close.html" -->

where `/server/2015/pagename_js.html' is a file containing the JS
includes for a page at /2015/pagename/. For instance, the 'call for
sessions' page will have a /server/2015/cfs_js.html file containing
the JS includes for that page.

diff --git a/2015/anti-harassment/index.html b/2015/anti-harassment/index.html
index 84e1690512498006c994adb53045de369cb31e1c..758eb3451008c71664fae8c2e073e6188403808d 100755 (executable)
--- a/2015/anti-harassment/index.html
+++ b/2015/anti-harassment/index.html
@@ -24,3 +24,5 @@
 <p class="text-muted">This policy is based on several other policies, including the OLF anti-harassment policy, written by Esther Filderman and Beth Lynn Eicher, and the Con Anti-Harassment Project. Mary Gardiner, Valerie Aurora, Sarah Smith, and Donna Benjamin generalized the policies and added supporting material. Many members of LinuxChix, Geek Feminism and other groups contributed to this work.
 </p>
 <!--#include virtual="/2015/footer.html"-->
+<!--#include virtual="/server/2015/home_js.html"-->
+<!--#include virtual="/server/2015/close.html" -->

diff --git a/2015/call_for_sessions/confirmation.html b/2015/call_for_sessions/confirmation.html
index 6da9a14d5307c391b7c520c29f918be31426f860..08103890b519826e9fe9e72035e1810226b44d69 100755 (executable)
--- a/2015/call_for_sessions/confirmation.html
+++ b/2015/call_for_sessions/confirmation.html
@@ -17,3 +17,5 @@
                          </a>
                        </p>
 <!--#include virtual="/2015/footer.html"-->
+<!--#include virtual="/server/2015/home_js.html"-->
+<!--#include virtual="/server/2015/close.html" -->

diff --git a/2015/exhibit/confirmation.html b/2015/exhibit/confirmation.html
index 3b503f4231bc4e9c305ecab308d9f1101c5cb4e4..5fbd08caab789abcb364a5fb83d36af6c8ab26c3 100755 (executable)
--- a/2015/exhibit/confirmation.html
+++ b/2015/exhibit/confirmation.html
@@ -16,3 +16,5 @@
                          </a>
                        </p>
 <!--#include virtual="/2015/footer.html"-->              
+<!--#include virtual="/server/2015/home_js.html"-->
+<!--#include virtual="/server/2015/close.html" -->

diff --git a/2015/exhibit/index.html b/2015/exhibit/index.html
index bd9ab66a0f25a3a021034e13408188e9562fcd6e..ca9aba0f4e6670bf94f1b09c76c4a8e9968ea568 100755 (executable)
--- a/2015/exhibit/index.html
+++ b/2015/exhibit/index.html
@@ -549,3 +549,5 @@
                          </div>
                        </form>
 <!--#include virtual="/2015/footer.html"-->
+<!--#include virtual="/server/2015/home_js.html"-->
+<!--#include virtual="/server/2015/close.html" -->

diff --git a/2015/exhibit/payment_confirmation.html b/2015/exhibit/payment_confirmation.html
index fc0d0ce5dc421975bf37d2ba636250497db038ed..4b811f309892a864264bd2f53d1ebefea53520bf 100755 (executable)
--- a/2015/exhibit/payment_confirmation.html
+++ b/2015/exhibit/payment_confirmation.html
@@ -9,3 +9,5 @@ Thank you for being an exhibitor at LibrePlanet 2014! You will receive a payment
                          </a>
                        </p>
 <!--#include virtual="/2015/footer.html"-->
+<!--#include virtual="/server/2015/home_js.html"-->
+<!--#include virtual="/server/2015/close.html" -->

diff --git a/2015/footer.html b/2015/footer.html
index 18c027a0322217b1020fcde032fdcb2e376b8581..48887b42abd9f932e4754f5454f78621b222e157 100644 (file)
--- a/2015/footer.html
+++ b/2015/footer.html
@@ -32,7 +32,8 @@
     </p>
 
     <p class="text-muted text-center">
-      <a href="http://weblabels.fsf.org/libreplanet.org/CURRENT/" rel="jslicense">
+ <!--     <a href="http://weblabels.fsf.org/libreplanet.org/CURRENT/" rel="jslicense">-->
+     <a href="/server/staging/lp15/weblabels.html" rel="jslicense">
        JavaScript license information
       </a>
     </p>
@@ -46,47 +47,3 @@
     </p>
   </div>
 </div>
-
-<script type="text/javascript"
-       src="/2015/assets/js/jquery-1.11.1.min.js"></script>
-<script type="text/javascript"
-       src="/2015/assets/js/bootstrap.min.js"></script>
-
-<!-- - Piwik -->
-<script type="text/javascript">
- /*
-  * |@licstart The following is the entire license notice for the JavaScript code in this page.|
-
-  * Copyright 2012 Matthieu Aubry.
-
-  * This program is free software: you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-  * the Free Software Foundation, either version 3 of the License, or
-  * (at your option) any later version.
-
-  * This program is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  * GNU General Public License for more details.
-
-  * You should have received a copy of the GNU General Public License
-  * along with this program.  If not, see http://www.gnu.org/licenses/.
-
-  * |@licend The above is the entire license notice for the JavaScript code in this page.|
-  */
- var _paq = _paq || [];
- _paq.push(["trackPageView"]);
- _paq.push(["enableLinkTracking"]);
-
- (function() {
-   var u=(("https:" == document.location.protocol) ? "https" : "http") + "://piwik.fsf.org/";
-   _paq.push(["setTrackerUrl", u+"piwik.php"]);
-   _paq.push(["setSiteId", "10"]);
-   var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
-   g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
- })();
-</script>
-<!-- - End Piwik Code -->
-
-</body>
-</html>

diff --git a/2015/getting_around/index.html b/2015/getting_around/index.html
index 7a08482b1a18752f15c2a5d4a77ed41416039b93..25dc3ac163bd1b13a38c970fd7b9e0d4acc12791 100755 (executable)
--- a/2015/getting_around/index.html
+++ b/2015/getting_around/index.html
@@ -180,3 +180,5 @@ The Stata Center was famously designed by Frank Gehry; its <a href="http://uploa
 </ul>
 -->
 <!--#include virtual="/2015/footer.html"-->
+<!--#include virtual="/server/2015/home_js.html"-->
+<!--#include virtual="/server/2015/close.html" -->

diff --git a/2015/header.html b/2015/header.html
index 5fd1fbaa487cd313a580a828f9003e862c992675..00cece1e51580395ee06aac334fba0440cf9c4f4 100755 (executable)
--- a/2015/header.html
+++ b/2015/header.html
@@ -26,7 +26,7 @@
                        <div class="col-sm-3">
                          <p class="text-muted">
                                <strong>March 21-22<br />
-                               Cambridge, MA</strong></br>
+                               Cambridge, MA</strong><br />
 Registration opens in October</p>
                        </div>
            </div><!-- end of lp header -->
@@ -44,7 +44,7 @@ Registration opens in October</p>
                 </div>
 
                 <div id="crm-container" lang="en" xml:lang="en">
-                  </br>
+                  <br />
                   <div id="editrow-email-Primary"
                        class="form-group">
                     <label class="sr-only" for="email-Primary">
@@ -73,12 +73,12 @@ Registration opens in October</p>
                         <input id="custom_79_yes"
                                name="custom_79[yes]" type="checkbox" value="1" checked="checked"
                                class="checkbox" />
-                        <span class="text-muted">Also join the FSF's newsletter
+                                               <span class="text-muted">Also join the FSF's newsletter</span>
                       </label>
-                      &middot;
+                                         &middot;
                       <p class="help-block">
                         <a href="https://my.fsf.org/donate/privacypolicy.html">
-                          Read our privacy policy.</span>
+                          Read our privacy policy.
                         </a>
                       </p>
                     </div>

diff --git a/2015/index.html b/2015/index.html
index 77e48c60a14b64b1d7e783a0a7fc02fab6cd538a..cf75a48f42a7b1d44c8dfecee2d973c6468752e2 100755 (executable)
--- a/2015/index.html
+++ b/2015/index.html
@@ -15,4 +15,5 @@
   <p>FSF members and students attend LibrePlanet at no cost! <a href="https://my.fsf.org/associate/support_freedom">Become a member now</a>. Registration opens in October--sign up above to receive updates.</p>
 </div> <!-- end of LP15 text -->
 <!--#include virtual="/2015/footer.html"-->
-
+<!--#include virtual="/server/2015/home_js.html"-->
+<!--#include virtual="/server/2015/close.html" -->

diff --git a/2015/volunteer/confirmation.html b/2015/volunteer/confirmation.html
index 435f75641b151b5cafd0dd7d210b8b7e34a1773f..8b56fb18c521a07268c267f00678d1363fa5fc66 100755 (executable)
--- a/2015/volunteer/confirmation.html
+++ b/2015/volunteer/confirmation.html
@@ -16,6 +16,5 @@
                          </a>
                        </p>
 <!--#include virtual="/2015/footer.html"-->
-
-
-
+<!--#include virtual="/server/2015/home_js.html"-->
+<!--#include virtual="/server/2015/close.html" -->

diff --git a/2015/volunteer/index.html b/2015/volunteer/index.html
index 4f7485fc6e55a46ea1a9be542f9ba616193c2474..2fa0132c154942ecb90191bcf50ac5fb735784b7 100755 (executable)
--- a/2015/volunteer/index.html
+++ b/2015/volunteer/index.html
@@ -476,3 +476,5 @@
        </div> <!-- end of wrapper -->
 
 <!--#include virtual="/2015/footer.html"-->
+<!--#include virtual="/server/2015/home_js.html"-->
+<!--#include virtual="/server/2015/close.html" -->

diff --git a/server/2015/close.html b/server/2015/close.html
new file mode 100644 (file)
index 0000000..308b1d0
--- /dev/null
+++ b/server/2015/close.html
@@ -0,0 +1,2 @@
+</body>
+</html>

diff --git a/server/2015/home_js.html b/server/2015/home_js.html
new file mode 100644 (file)
index 0000000..6e90386
--- /dev/null
+++ b/server/2015/home_js.html
@@ -0,0 +1,41 @@
+<script type="text/javascript"
+       src="/2015/assets/js/jquery-1.11.1.min.js"></script>
+<script type="text/javascript"
+       src="/2015/assets/js/bootstrap-3.2.0.min.js"></script>
+
+
+<!-- - Piwik -->
+<script type="text/javascript">
+ /*
+  * |@licstart The following is the entire license notice for the JavaScript code in this page.|
+
+  * Copyright 2012 Matthieu Aubry.
+
+  * This program is free software: you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+  * the Free Software Foundation, either version 3 of the License, or
+  * (at your option) any later version.
+
+  * This program is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU General Public License for more details.
+
+  * You should have received a copy of the GNU General Public License
+  * along with this program.  If not, see http://www.gnu.org/licenses/.
+
+  * |@licend The above is the entire license notice for the JavaScript code in this page.|
+  */
+ var _paq = _paq || [];
+ _paq.push(["trackPageView"]);
+ _paq.push(["enableLinkTracking"]);
+
+ (function() {
+   var u=(("https:" == document.location.protocol) ? "https" : "http") + "://piwik.fsf.org/";
+   _paq.push(["setTrackerUrl", u+"piwik.php"]);
+   _paq.push(["setSiteId", "10"]);
+   var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
+   g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
+ })();
+</script>
+<!-- - End Piwik Code -->

diff --git a/server/staging/lp15/weblabels.html b/server/staging/lp15/weblabels.html
new file mode 100644 (file)
index 0000000..66e0563
--- /dev/null
+++ b/server/staging/lp15/weblabels.html
@@ -0,0 +1,103 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+                 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+  <head>
+       <title>libreplanet.org - JavaScript License Information</title>
+  </head>
+  
+  <body>
+       
+       <table id="jslicense-labels1">
+         
+         <tr>
+               <td><a href="https://libreplanet.org/2014/assets/js/jquery-1.10.2.min.js">jquery-1.10.2.min.js</a></td>
+               <td><a href="http://www.jclark.com/xml/copying.txt">Expat</a></td>
+               <td><a href="https://libreplanet.org/2014/assets/js/jquery-1.10.2.min.js">jquery-1.10.2.js</a></td>
+         </tr>
+
+         <tr>
+               <td><a href="https://libreplanet.org/2014/assets/js/bootstrap.min.js">bootstrap.min.js</a></td>
+               <td><a href="http://www.apache.org/licenses/LICENSE-2.0">Apache-2.0-only</a></td>
+                 <td><a href="https://libreplanet.org/2014/assets/js/bootstrap.min.js">bootstrap.js</a></td>
+         </tr>
+
+         <tr>
+               <td><a href="/2015/assets/js/bootstrap-3.2.0.min.js">bootstrap-3.2.0.min.js</a></td>
+               <td><a href="http://www.jclark.com/xml/copying.txt">Expat</a></td>
+               <td><a href="/2015/assets/js/bootstrap-3.2.0.js">bootstrap-3.2.0.js</a></td>
+         </tr>
+
+         <tr>
+               <td><a href="https://libreplanet.org/w/skins/common/wikibits.js">wikibits.js</a></td>
+               <td><a href="http://www.gnu.org/licenses/gpl-2.0.html">GNU General
+                       Public License version 2 or later</a></td>
+               <td><a href="https://libreplanet.org/w/skins/common/wikibits.js">wikibits.js</a></td>
+         </tr>
+         
+         <tr>
+               <td><a href="https://libreplanet.org/w/skins/common/ajax.js">ajax.js</a></td>
+               <td><a href="http://www.gnu.org/licenses/gpl-2.0.html">GNU General
+                       Public License version 2 or later</a></td>
+               <td><a href="https://libreplanet.org/w/skins/common/ajax.js">ajax.js</a></td>
+         </tr>
+         
+         <tr>
+               <td><a href="https://libreplanet.org/w/skins/common/ajaxwatch.js">ajaxwatch.js</a></td>
+               <td><a href="http://www.gnu.org/licenses/gpl-2.0.html">GNU General
+                       Public License version 2 or later</a></td>
+               <td><a href="https://libreplanet.org/w/skins/common/ajaxwatch.js">ajaxwatch.js</a></td>
+         </tr>
+         
+         <tr>
+               <td><a href="https://libreplanet.org/w/skins/common/mwsuggest.js">mwsuggest.js</a></td>
+               <td><a href="http://www.gnu.org/licenses/gpl-2.0.html">GNU General
+                       Public License version 2 or later</a></td>
+               <td><a href="https://libreplanet.org/w/skins/common/mwsuggest.js">mwsuggest.js</a></td>
+         </tr>
+         
+         <tr>
+               <td><a href="https://libreplanet.org/w/skins/common/edit.js">edit.js</a></td>
+               <td><a href="http://www.gnu.org/licenses/gpl-2.0.html">GNU General
+                       Public License version 2 or later</a></td>
+               <td><a href="https://libreplanet.org/w/skins/common/edit.js">edit.js</a></td>
+         </tr>
+         
+
+         <tr>
+               <td><a href="http://libreplanet.org/wiki?title=-&amp;action=raw&amp;smaxage=0&amp;gen=js&amp;useskin=vector&amp;270">wiki</a></td>
+               <td><a href="http://www.gnu.org/licenses/gpl-2.0.html">GNU General
+                       Public License version 2 or later</a></td>
+               <td><a href="http://weblabels.fsf.org/libreplanet.org/CURRENT/files/w/wiki">wiki</a></td>
+         </tr>
+         
+         <tr>
+               <td><a href="http://libreplanet.org/2014/assets/js/jquery.chainedSelects.js">jquery.chainedSelects.js</a></td>
+               <td><a href="http://www.gnu.org/licenses/gpl-3.0.html">GNU General
+                       Public License version 3 or later</a></td>
+               <td><a href="http://libreplanet.org/2014/assets/js/jquery.chainedSelects.js">jquery.chainedSelects.js</a></td>
+         </tr>
+         
+         <tr>
+               <td><a href="http://libreplanet.org/2014/assets/js/jquery.form.js">jquery.form.js</a></td>
+               <td><a href="http://www.gnu.org/licenses/gpl-2.0.html">GNU General
+                       Public License version 2 or later</a></td>
+               <td><a href="http://libreplanet.org/2014/assets/js/jquery.form.js">jquery.form.js</a></td>
+         </tr>
+         
+         <tr>
+                 <td><a href="http://libreplanet.org/2014/assets/js/Common.js">Common.js</a></td>
+                 <td><a href="http://www.gnu.org/licenses/agpl-3.0.html">GNU Affero
+                         General Public License version 3</a></td>
+                 <td><a href="http://libreplanet.org/2014/assets/js/Common.js">Common.js</a></td>
+         </tr>
+         
+         <tr>
+               <td><a href="/2015/assets/js/civicrm-4.4.Common.js">civicrm-4.4.Common.js</a></td>
+               <td><a href="http://www.gnu.org/licenses/agpl-3.0.html">GNU Affero
+                       General Public License version 3</a></td>
+               <td><a href="/2015/assets/js/civicrm-4.4.Common.js">civicrm-4.4.Common.js</a></td>
+         </tr>
+         
+       </table>
+  </body>
+</html>