From 7814473df2f650eb5946defb462edebec100dff3 Mon Sep 17 00:00:00 2001 From: rsiddharth Date: Mon, 26 Oct 2015 22:42:20 -0400 Subject: [PATCH] Moved /server/2016/ -> /2016/includes/ --- 2016/README.md | 14 +++++++------- 2016/confirmation.html | 14 +++++++------- 2016/feedback-closed.html | 14 +++++++------- 2016/feedback-confirmation.html | 14 +++++++------- 2016/getting_around/index.html | 14 +++++++------- {server/2016 => 2016/includes}/ahp_js.html | 0 {server/2016 => 2016/includes}/banner.html | 0 2016/includes/boilerplate.html | 12 ++++++++++++ {server/2016 => 2016/includes}/cfs_js.html | 0 {server/2016 => 2016/includes}/close.html | 0 {server/2016 => 2016/includes}/common_js.html | 0 {server/2016 => 2016/includes}/exhibit_js.html | 0 {server/2016 => 2016/includes}/footer.html | 0 .../includes}/getting_around_js.html | 0 {server/2016 => 2016/includes}/header.html | 0 {server/2016 => 2016/includes}/home_js.html | 0 {server/2016 => 2016/includes}/live_menu.html | 0 {server/2016 => 2016/includes}/live_sidebar.html | 0 .../2016 => 2016/includes}/mailing_list_js.html | 0 {server/2016 => 2016/includes}/media-status.html | 0 {server/2016 => 2016/includes}/program-menu.html | 0 {server/2016 => 2016/includes}/program_js.html | 0 .../2016 => 2016/includes}/scholarship_js.html | 0 {server/2016 => 2016/includes}/sidebar.html | 0 {server/2016 => 2016/includes}/signup.html | 0 {server/2016 => 2016/includes}/volunteer_js.html | 0 2016/index.html | 16 ++++++++-------- 2016/js-labels/index.html | 10 +++++----- 2016/program/index.html | 14 +++++++------- 2016/safe-space-policy/index.html | 14 +++++++------- server/2016/boilerplate.html | 12 ------------ 31 files changed, 74 insertions(+), 74 deletions(-) rename {server/2016 => 2016/includes}/ahp_js.html (100%) rename {server/2016 => 2016/includes}/banner.html (100%) create mode 100755 2016/includes/boilerplate.html rename {server/2016 => 2016/includes}/cfs_js.html (100%) rename {server/2016 => 2016/includes}/close.html (100%) rename {server/2016 => 2016/includes}/common_js.html (100%) rename {server/2016 => 2016/includes}/exhibit_js.html (100%) rename {server/2016 => 2016/includes}/footer.html (100%) rename {server/2016 => 2016/includes}/getting_around_js.html (100%) rename {server/2016 => 2016/includes}/header.html (100%) rename {server/2016 => 2016/includes}/home_js.html (100%) rename {server/2016 => 2016/includes}/live_menu.html (100%) rename {server/2016 => 2016/includes}/live_sidebar.html (100%) rename {server/2016 => 2016/includes}/mailing_list_js.html (100%) rename {server/2016 => 2016/includes}/media-status.html (100%) rename {server/2016 => 2016/includes}/program-menu.html (100%) rename {server/2016 => 2016/includes}/program_js.html (100%) rename {server/2016 => 2016/includes}/scholarship_js.html (100%) rename {server/2016 => 2016/includes}/sidebar.html (100%) rename {server/2016 => 2016/includes}/signup.html (100%) rename {server/2016 => 2016/includes}/volunteer_js.html (100%) delete mode 100755 server/2016/boilerplate.html diff --git a/2016/README.md b/2016/README.md index ef1a5a2f..2290051b 100644 --- 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): ``` - - - - - + + + + + ``` 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 94e009c5..52e5ef99 100755 --- a/2016/confirmation.html +++ b/2016/confirmation.html @@ -1,16 +1,16 @@ - + LibrePlanet — Announcements List Confirmation - - + +

Please check for our confirmation email


For your protection and to prevent spam, we don't process form submissions until you click the link in the confirmation email.

If you don't see the email, please check your spam folder. Still can't find it? Let us know at campaigns@fsf.org.

- - - - + + + + diff --git a/2016/feedback-closed.html b/2016/feedback-closed.html index cc2ad419..b4238c63 100755 --- a/2016/feedback-closed.html +++ b/2016/feedback-closed.html @@ -1,9 +1,9 @@ - + LibrePlanet — Feedback Survey Closed - - + +

Sorry, the feedback survey is now closed

@@ -11,7 +11,7 @@ Return to the homepage.

- - - - + + + + diff --git a/2016/feedback-confirmation.html b/2016/feedback-confirmation.html index c7c40363..a5d37499 100755 --- a/2016/feedback-confirmation.html +++ b/2016/feedback-confirmation.html @@ -1,9 +1,9 @@ - + LibrePlanet — Feedback Survey Confirmation - - + +

One more step!

@@ -21,7 +21,7 @@ Return to the homepage.

- - - - + + + + diff --git a/2016/getting_around/index.html b/2016/getting_around/index.html index df884436..05ff599b 100755 --- a/2016/getting_around/index.html +++ b/2016/getting_around/index.html @@ -1,9 +1,9 @@ - + LibrePlanet 2016 — Travel - - + +

Travel

@@ -192,7 +192,7 @@ --> - - - - + + + + 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 index 00000000..6778d626 --- /dev/null +++ b/2016/includes/boilerplate.html @@ -0,0 +1,12 @@ + + +LibrePlanet 2016 — Title here + + + + + + + + + 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 92f9c809..6c083eab 100755 --- a/2016/index.html +++ b/2016/index.html @@ -1,9 +1,9 @@ - + LibrePlanet 2016 - - + + --> @@ -161,7 +161,7 @@ Get excited for our keynote speakers!

FSF members and students attend LibrePlanet at no cost! Become a member now.

- - - - + + + + diff --git a/2016/js-labels/index.html b/2016/js-labels/index.html index 02e50a4a..eeb0c61f 100755 --- a/2016/js-labels/index.html +++ b/2016/js-labels/index.html @@ -1,9 +1,9 @@ - + LibrePlanet 2016 — JS Weblabels - - + + @@ -24,5 +24,5 @@
piwik.js
- - + + diff --git a/2016/program/index.html b/2016/program/index.html index 64ee1afb..c79ebbe5 100755 --- a/2016/program/index.html +++ b/2016/program/index.html @@ -1,9 +1,9 @@ - + LibrePlanet 2016 — Sessions - - + +

Program Sessions

@@ -448,7 +448,7 @@ - - - - + + + + diff --git a/2016/safe-space-policy/index.html b/2016/safe-space-policy/index.html index fd94edcb..a448b34d 100755 --- a/2016/safe-space-policy/index.html +++ b/2016/safe-space-policy/index.html @@ -1,9 +1,9 @@ - + LibrePlanet 2016 — Safe space policy - - + +

Anti-Harassment Policy

@@ -29,7 +29,7 @@

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.

- - - - + + + + diff --git a/server/2016/boilerplate.html b/server/2016/boilerplate.html deleted file mode 100755 index 924857db..00000000 --- a/server/2016/boilerplate.html +++ /dev/null @@ -1,12 +0,0 @@ - - -LibrePlanet 2016 — Title here - - - - - - - - - -- 2.25.1