Moved /server/2016/ -> /2016/includes/

diff --git a/2016/README.md b/2016/README.md
index ef1a5a2f8a4ca186cc9db15e32573a959811c8db..2290051b9f645e372cba654523ba918d3f0b49c1 100644 (file)
--- a/2016/README.md
+++ b/2016/README.md
@@ -102,20 +102,20 @@ Creating a New Page
 Add the following to your new page (it should remain commented out, as that is the syntax for SSI):
 
 ```
-<!--#include virtual="/server/2016/header.html"-->
-<!--#include virtual="/server/2016/banner.html"-->
-<!--#include virtual="/server/2016/sidebar.html"-->
-<!--#include virtual="/server/2016/footer.html"-->
-<!--#include virtual="/server/2016/close.html"-->
+<!--#include virtual="/2016/includes/header.html"-->
+<!--#include virtual="/2016/includes/banner.html"-->
+<!--#include virtual="/2016/includes/sidebar.html"-->
+<!--#include virtual="/2016/includes/footer.html"-->
+<!--#include virtual="/2016/includes/close.html"-->
 ```
 
 This will include the header, banner, sidebar, footer and closing tags
 saving you from duplicating HTML.
 
 If JS is needed for a page, then create a file, containing the JS
-includes, in `/server/2016/` & use SSI to include it in the page.
+includes, in `/2016/includes/` & use SSI to include it in the page.
 
-Use `/server/2016/boilerplate.html` to start a new page.
+Use `/2016/includes/boilerplate.html` to start a new page.
 
 ### Add Your Markup
 

diff --git a/2016/confirmation.html b/2016/confirmation.html
index 94e009c5dc1580b1cdc75c755c1cb82a709c0aef..52e5ef99e89484543276f515ca79977a8b2e6320 100755 (executable)
--- a/2016/confirmation.html
+++ b/2016/confirmation.html
@@ -1,16 +1,16 @@
-<!--#include virtual="/server/2016/header.html"-->
+<!--#include virtual="/2016/includes/header.html"-->
 
 <title>LibrePlanet &mdash; Announcements List Confirmation</title>
 
-<!--#include virtual="/server/2016/banner.html"-->
-<!--#include virtual="/server/2016/sidebar.html"-->
+<!--#include virtual="/2016/includes/banner.html"-->
+<!--#include virtual="/2016/includes/sidebar.html"-->
 
                        <h2><span class="glyphicon glyphicon-inbox"></span> Please check for our confirmation email</h2>
 <br>
                          <p>For your protection and to prevent spam, we don't process form submissions until you click the link in the confirmation email.</p>
 <p>If you don't see the email, please check your spam folder. Still can't find it? Let us know at <a href="mailto:campaigns@fsf.org">campaigns@fsf.org</a>.</p>
 
-<!--#include virtual="/server/2016/footer.html"-->
-<!--#include virtual="/server/2016/common_js.html"-->
-<!--#include virtual="/server/2016/cfs_js.html"-->
-<!--#include virtual="/server/2016/close.html" -->
+<!--#include virtual="/2016/includes/footer.html"-->
+<!--#include virtual="/2016/includes/common_js.html"-->
+<!--#include virtual="/2016/includes/cfs_js.html"-->
+<!--#include virtual="/2016/includes/close.html" -->

diff --git a/2016/feedback-closed.html b/2016/feedback-closed.html
index cc2ad4194a81955a0ebcf93326486c7cce3dd4db..b4238c636d6d0ff14242f2191a29b36464d9d327 100755 (executable)
--- a/2016/feedback-closed.html
+++ b/2016/feedback-closed.html
@@ -1,9 +1,9 @@
-<!--#include virtual="/server/2016/header.html"-->
+<!--#include virtual="/2016/includes/header.html"-->
 
 <title>LibrePlanet &mdash; Feedback Survey Closed</title>
 
-<!--#include virtual="/server/2016/banner.html"-->
-<!--#include virtual="/server/2016/sidebar.html"-->
+<!--#include virtual="/2016/includes/banner.html"-->
+<!--#include virtual="/2016/includes/sidebar.html"-->
 
 <h2> Sorry, the feedback survey is now closed</h2>
                        <p>
@@ -11,7 +11,7 @@
                                Return to the homepage.
                          </a>
                        </p>
-<!--#include virtual="/server/2016/footer.html"-->
-<!--#include virtual="/server/2016/common_js.html"-->
-<!--#include virtual="/server/2016/cfs_js.html"-->
-<!--#include virtual="/server/2016/close.html" -->
+<!--#include virtual="/2016/includes/footer.html"-->
+<!--#include virtual="/2016/includes/common_js.html"-->
+<!--#include virtual="/2016/includes/cfs_js.html"-->
+<!--#include virtual="/2016/includes/close.html" -->

diff --git a/2016/feedback-confirmation.html b/2016/feedback-confirmation.html
index c7c403637c50db4f60827f5b1759948600578c29..a5d37499c98e04ce26b5019da4a5411393d1658a 100755 (executable)
--- a/2016/feedback-confirmation.html
+++ b/2016/feedback-confirmation.html
@@ -1,9 +1,9 @@
-<!--#include virtual="/server/2016/header.html"-->
+<!--#include virtual="/2016/includes/header.html"-->
 
 <title>LibrePlanet &mdash; Feedback Survey Confirmation</title>
 
-<!--#include virtual="/server/2016/banner.html"-->
-<!--#include virtual="/server/2016/sidebar.html"-->
+<!--#include virtual="/2016/includes/banner.html"-->
+<!--#include virtual="/2016/includes/sidebar.html"-->
 
 <h2> One more step! </h2>
 <p>
@@ -21,7 +21,7 @@
                                Return to the homepage.
                          </a>
                        </p>
-<!--#include virtual="/server/2016/footer.html"-->
-<!--#include virtual="/server/2016/common_js.html"-->
-<!--#include virtual="/server/2016/cfs_js.html"-->
-<!--#include virtual="/server/2016/close.html" -->
+<!--#include virtual="/2016/includes/footer.html"-->
+<!--#include virtual="/2016/includes/common_js.html"-->
+<!--#include virtual="/2016/includes/cfs_js.html"-->
+<!--#include virtual="/2016/includes/close.html" -->

diff --git a/2016/getting_around/index.html b/2016/getting_around/index.html
index df88443660e9044dc9f771d31c96807e662ca31b..05ff599b1b7deea13578f3f98f0270a5f7760370 100755 (executable)
--- a/2016/getting_around/index.html
+++ b/2016/getting_around/index.html
@@ -1,9 +1,9 @@
-<!--#include virtual="/server/2016/header.html"-->
+<!--#include virtual="/2016/includes/header.html"-->
 
 <title>LibrePlanet 2016 &mdash; Travel</title>
 
-<!--#include virtual="/server/2016/banner.html"-->
-<!--#include virtual="/server/2016/sidebar.html"-->
+<!--#include virtual="/2016/includes/banner.html"-->
+<!--#include virtual="/2016/includes/sidebar.html"-->
 
 <h1>Travel</h1>
 
@@ -192,7 +192,7 @@
 -->
 
 
-      <!--#include virtual="/server/2016/footer.html"-->
-      <!--#include virtual="/server/2016/common_js.html"-->
-      <!--#include virtual="/server/2016/getting_around_js.html"-->
-      <!--#include virtual="/server/2016/close.html" -->
+      <!--#include virtual="/2016/includes/footer.html"-->
+      <!--#include virtual="/2016/includes/common_js.html"-->
+      <!--#include virtual="/2016/includes/getting_around_js.html"-->
+      <!--#include virtual="/2016/includes/close.html" -->

diff --git a/server/2016/ahp_js.html b/2016/includes/ahp_js.html
similarity index 100%
rename from server/2016/ahp_js.html
rename to 2016/includes/ahp_js.html

diff --git a/server/2016/banner.html b/2016/includes/banner.html
similarity index 100%
rename from server/2016/banner.html
rename to 2016/includes/banner.html

diff --git a/2016/includes/boilerplate.html b/2016/includes/boilerplate.html
new file mode 100755 (executable)
index 0000000..6778d62
--- /dev/null
+++ b/2016/includes/boilerplate.html
@@ -0,0 +1,12 @@
+<!--#include virtual="/2016/includes/header.html"-->
+
+<title>LibrePlanet 2016 &mdash; Title here</title>
+
+<!--#include virtual="/2016/includes/banner.html"-->
+<!--#include virtual="/2016/includes/sidebar.html"-->
+
+<!-- Content comes here -->
+
+<!--#include virtual="/2016/includes/footer.html"-->
+<!--#include virtual="/2016/includes/home_js.html"-->
+<!--#include virtual="/2016/includes/close.html" -->

diff --git a/server/2016/cfs_js.html b/2016/includes/cfs_js.html
similarity index 100%
rename from server/2016/cfs_js.html
rename to 2016/includes/cfs_js.html

diff --git a/server/2016/close.html b/2016/includes/close.html
similarity index 100%
rename from server/2016/close.html
rename to 2016/includes/close.html

diff --git a/server/2016/common_js.html b/2016/includes/common_js.html
similarity index 100%
rename from server/2016/common_js.html
rename to 2016/includes/common_js.html

diff --git a/server/2016/exhibit_js.html b/2016/includes/exhibit_js.html
similarity index 100%
rename from server/2016/exhibit_js.html
rename to 2016/includes/exhibit_js.html

diff --git a/server/2016/footer.html b/2016/includes/footer.html
similarity index 100%
rename from server/2016/footer.html
rename to 2016/includes/footer.html

diff --git a/server/2016/getting_around_js.html b/2016/includes/getting_around_js.html
similarity index 100%
rename from server/2016/getting_around_js.html
rename to 2016/includes/getting_around_js.html

diff --git a/server/2016/header.html b/2016/includes/header.html
similarity index 100%
rename from server/2016/header.html
rename to 2016/includes/header.html

diff --git a/server/2016/home_js.html b/2016/includes/home_js.html
similarity index 100%
rename from server/2016/home_js.html
rename to 2016/includes/home_js.html

diff --git a/server/2016/live_menu.html b/2016/includes/live_menu.html
similarity index 100%
rename from server/2016/live_menu.html
rename to 2016/includes/live_menu.html

diff --git a/server/2016/live_sidebar.html b/2016/includes/live_sidebar.html
similarity index 100%
rename from server/2016/live_sidebar.html
rename to 2016/includes/live_sidebar.html

diff --git a/server/2016/mailing_list_js.html b/2016/includes/mailing_list_js.html
similarity index 100%
rename from server/2016/mailing_list_js.html
rename to 2016/includes/mailing_list_js.html

diff --git a/server/2016/media-status.html b/2016/includes/media-status.html
similarity index 100%
rename from server/2016/media-status.html
rename to 2016/includes/media-status.html

diff --git a/server/2016/program-menu.html b/2016/includes/program-menu.html
similarity index 100%
rename from server/2016/program-menu.html
rename to 2016/includes/program-menu.html

diff --git a/server/2016/program_js.html b/2016/includes/program_js.html
similarity index 100%
rename from server/2016/program_js.html
rename to 2016/includes/program_js.html

diff --git a/server/2016/scholarship_js.html b/2016/includes/scholarship_js.html
similarity index 100%
rename from server/2016/scholarship_js.html
rename to 2016/includes/scholarship_js.html

diff --git a/server/2016/sidebar.html b/2016/includes/sidebar.html
similarity index 100%
rename from server/2016/sidebar.html
rename to 2016/includes/sidebar.html

diff --git a/server/2016/signup.html b/2016/includes/signup.html
similarity index 100%
rename from server/2016/signup.html
rename to 2016/includes/signup.html

diff --git a/server/2016/volunteer_js.html b/2016/includes/volunteer_js.html
similarity index 100%
rename from server/2016/volunteer_js.html
rename to 2016/includes/volunteer_js.html

diff --git a/2016/index.html b/2016/index.html
index 92f9c809d9ee5a0fdb737ed6b375a06909a853da..6c083eab45f36d060b4a8c5712c40a530a6abadd 100755 (executable)
--- a/2016/index.html
+++ b/2016/index.html
@@ -1,9 +1,9 @@
-<!--#include virtual="/server/2016/header.html"-->
+<!--#include virtual="/2016/includes/header.html"-->
 
 <title>LibrePlanet 2016</title>
 
-<!--#include virtual="/server/2016/banner.html"-->
-<!--#include virtual="/server/2016/sidebar.html"-->
+<!--#include virtual="/2016/includes/banner.html"-->
+<!--#include virtual="/2016/includes/sidebar.html"-->
 
 <!-- start of carousel -->
 <div id="lpc-carousel" class="carousel slide">
@@ -144,7 +144,7 @@ Get excited for our keynote speakers!
 </div>-->
 <!-- This is an SSI include for the media status box we use after the conference. To make it work, remove this comment and comment *in* the #include line.
 <div class="col-md-12">
-#include virtual="/server/2016/media-status.html"
+#include virtual="/2016/includes/media-status.html"
 </div>-->
 </div>
 
@@ -161,7 +161,7 @@ Get excited for our keynote speakers!
 
 <p>FSF members and students attend LibrePlanet at no cost! <a href="https://crm.fsf.org/join">Become a member now</a>.<!-- Registration opens in October - sign up above to receive updates.--></p>
 
-<!--#include virtual="/server/2016/footer.html"-->
-<!--#include virtual="/server/2016/common_js.html"-->
-<!--#include virtual="/server/2016/home_js.html"-->
-<!--#include virtual="/server/2016/close.html" -->
+<!--#include virtual="/2016/includes/footer.html"-->
+<!--#include virtual="/2016/includes/common_js.html"-->
+<!--#include virtual="/2016/includes/home_js.html"-->
+<!--#include virtual="/2016/includes/close.html" -->

diff --git a/2016/js-labels/index.html b/2016/js-labels/index.html
index 02e50a4a6bda57e2fd3ecab86009f3b2340f087d..eeb0c61f88cc242649504d2c5f840377d8440b29 100755 (executable)
--- a/2016/js-labels/index.html
+++ b/2016/js-labels/index.html
@@ -1,9 +1,9 @@
-<!--#include virtual="/server/2016/header.html"-->
+<!--#include virtual="/2016/includes/header.html"-->
 
 <title>LibrePlanet 2016 &mdash; JS Weblabels </title>
 
-<!--#include virtual="/server/2016/banner.html"-->
-<!--#include virtual="/server/2016/sidebar.html"-->
+<!--#include virtual="/2016/includes/banner.html"-->
+<!--#include virtual="/2016/includes/sidebar.html"-->
 
 
        <table class="table" id="jslicense-labels1">
@@ -24,5 +24,5 @@
                <td><a href="/2016/assets/js/piwik.js">piwik.js</a></td>
          </tr>
        </table>
-<!--#include virtual="/server/2016/footer.html"-->
-<!--#include virtual="/server/2016/close.html" -->
+<!--#include virtual="/2016/includes/footer.html"-->
+<!--#include virtual="/2016/includes/close.html" -->

diff --git a/2016/program/index.html b/2016/program/index.html
index 64ee1afb71501f77009addffe2c9a19e1f788239..c79ebbe5d91ae969f286391e147e83b426cead52 100755 (executable)
--- a/2016/program/index.html
+++ b/2016/program/index.html
@@ -1,9 +1,9 @@
-<!--#include virtual="/server/2016/header.html"-->
+<!--#include virtual="/2016/includes/header.html"-->
 
 <title>LibrePlanet 2016 &mdash; Sessions </title>
 
-<!--#include virtual="/server/2016/banner.html"-->
-<!--#include virtual="/server/2016/sidebar.html"-->
+<!--#include virtual="/2016/includes/banner.html"-->
+<!--#include virtual="/2016/includes/sidebar.html"-->
 
 <h1>Program <small>Sessions</small></h1>
 
@@ -448,7 +448,7 @@
   </div> <!-- session column end -->
 </div> <!-- session row end -->
 
-<!--#include virtual="/server/2016/footer.html"-->
-<!--#include virtual="/server/2016/common_js.html"-->
-<!--#include virtual="/server/2016/program_js.html"-->
-<!--#include virtual="/server/2015/close.html" -->
+<!--#include virtual="/2016/includes/footer.html"-->
+<!--#include virtual="/2016/includes/common_js.html"-->
+<!--#include virtual="/2016/includes/program_js.html"-->
+<!--#include virtual="/2016/includes/close.html" -->

diff --git a/2016/safe-space-policy/index.html b/2016/safe-space-policy/index.html
index fd94edcb21a0a6ca4a4d58cefa820c61b863c827..a448b34d844eb623b16195a37b2c711089546bc4 100755 (executable)
--- a/2016/safe-space-policy/index.html
+++ b/2016/safe-space-policy/index.html
@@ -1,9 +1,9 @@
-<!--#include virtual="/server/2016/header.html"-->
+<!--#include virtual="/2016/includes/header.html"-->
 
 <title>LibrePlanet 2016 &mdash; Safe space policy</title>
 
-<!--#include virtual="/server/2016/banner.html"-->
-<!--#include virtual="/server/2016/sidebar.html"-->
+<!--#include virtual="/2016/includes/banner.html"-->
+<!--#include virtual="/2016/includes/sidebar.html"-->
 
                        <h1> Anti-Harassment Policy </h1>
 
@@ -29,7 +29,7 @@
 <hr>
 <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="/server/2016/footer.html"-->
-<!--#include virtual="/server/2016/common_js.html"-->
-<!--#include virtual="/server/2016/ahp_js.html"-->
-<!--#include virtual="/server/2016/close.html" -->
+<!--#include virtual="/2016/includes/footer.html"-->
+<!--#include virtual="/2016/includes/common_js.html"-->
+<!--#include virtual="/2016/includes/ahp_js.html"-->
+<!--#include virtual="/2016/includes/close.html" -->

diff --git a/server/2016/boilerplate.html b/server/2016/boilerplate.html
deleted file mode 100755 (executable)
index 924857d..0000000
--- a/server/2016/boilerplate.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<!--#include virtual="/server/2016/header.html"-->
-
-<title>LibrePlanet 2016 &mdash; Title here</title>
-
-<!--#include virtual="/server/2016/banner.html"-->
-<!--#include virtual="/server/2016/sidebar.html"-->
-
-<!-- Content comes here -->
-
-<!--#include virtual="/server/2016/footer.html"-->
-<!--#include virtual="/server/2016/home_js.html"-->
-<!--#include virtual="/server/2016/close.html" -->