From 401114378024daa8ace507ca3556ae13b5e40b0b Mon Sep 17 00:00:00 2001 From: rsiddharth Date: Fri, 12 Sep 2014 21:18:16 -0400 Subject: [PATCH] Removed JS includes from footer.html. From now on JS includes will put in a seperate file residing at /server/2015/ 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. 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. --- 2015/anti-harassment/index.html | 2 + 2015/call_for_sessions/confirmation.html | 2 + 2015/exhibit/confirmation.html | 2 + 2015/exhibit/index.html | 2 + 2015/exhibit/payment_confirmation.html | 2 + 2015/footer.html | 47 +---------- 2015/getting_around/index.html | 2 + 2015/header.html | 10 +-- 2015/index.html | 3 +- 2015/volunteer/confirmation.html | 5 +- 2015/volunteer/index.html | 2 + server/2015/close.html | 2 + server/2015/home_js.html | 41 +++++++++ server/staging/lp15/weblabels.html | 103 +++++++++++++++++++++++ 14 files changed, 171 insertions(+), 54 deletions(-) create mode 100644 server/2015/close.html create mode 100644 server/2015/home_js.html create mode 100644 server/staging/lp15/weblabels.html diff --git a/2015/anti-harassment/index.html b/2015/anti-harassment/index.html index 84e16905..758eb345 100755 --- a/2015/anti-harassment/index.html +++ b/2015/anti-harassment/index.html @@ -24,3 +24,5 @@

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/2015/call_for_sessions/confirmation.html b/2015/call_for_sessions/confirmation.html index 6da9a14d..08103890 100755 --- a/2015/call_for_sessions/confirmation.html +++ b/2015/call_for_sessions/confirmation.html @@ -17,3 +17,5 @@

+ + diff --git a/2015/exhibit/confirmation.html b/2015/exhibit/confirmation.html index 3b503f42..5fbd08ca 100755 --- a/2015/exhibit/confirmation.html +++ b/2015/exhibit/confirmation.html @@ -16,3 +16,5 @@

+ + diff --git a/2015/exhibit/index.html b/2015/exhibit/index.html index bd9ab66a..ca9aba0f 100755 --- a/2015/exhibit/index.html +++ b/2015/exhibit/index.html @@ -549,3 +549,5 @@ + + diff --git a/2015/exhibit/payment_confirmation.html b/2015/exhibit/payment_confirmation.html index fc0d0ce5..4b811f30 100755 --- 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

+ + diff --git a/2015/footer.html b/2015/footer.html index 18c027a0..48887b42 100644 --- a/2015/footer.html +++ b/2015/footer.html @@ -32,7 +32,8 @@

- + + JavaScript license information

@@ -46,47 +47,3 @@

- - - - - - - - - - diff --git a/2015/getting_around/index.html b/2015/getting_around/index.html index 7a08482b..25dc3ac1 100755 --- 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 + + diff --git a/2015/header.html b/2015/header.html index 5fd1fbaa..00cece1e 100755 --- a/2015/header.html +++ b/2015/header.html @@ -26,7 +26,7 @@

March 21-22
- Cambridge, MA
+ Cambridge, MA
Registration opens in October

@@ -44,7 +44,7 @@ Registration opens in October

-
+
diff --git a/2015/index.html b/2015/index.html index 77e48c60..cf75a48f 100755 --- a/2015/index.html +++ b/2015/index.html @@ -15,4 +15,5 @@

FSF members and students attend LibrePlanet at no cost! Become a member now. Registration opens in October--sign up above to receive updates.

- + + diff --git a/2015/volunteer/confirmation.html b/2015/volunteer/confirmation.html index 435f7564..8b56fb18 100755 --- a/2015/volunteer/confirmation.html +++ b/2015/volunteer/confirmation.html @@ -16,6 +16,5 @@

- - - + + diff --git a/2015/volunteer/index.html b/2015/volunteer/index.html index 4f7485fc..2fa0132c 100755 --- a/2015/volunteer/index.html +++ b/2015/volunteer/index.html @@ -476,3 +476,5 @@ + + diff --git a/server/2015/close.html b/server/2015/close.html new file mode 100644 index 00000000..308b1d01 --- /dev/null +++ b/server/2015/close.html @@ -0,0 +1,2 @@ + + diff --git a/server/2015/home_js.html b/server/2015/home_js.html new file mode 100644 index 00000000..6e903863 --- /dev/null +++ b/server/2015/home_js.html @@ -0,0 +1,41 @@ + + + + + + + diff --git a/server/staging/lp15/weblabels.html b/server/staging/lp15/weblabels.html new file mode 100644 index 00000000..66e0563f --- /dev/null +++ b/server/staging/lp15/weblabels.html @@ -0,0 +1,103 @@ + + + + libreplanet.org - JavaScript License Information + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
jquery-1.10.2.min.jsExpatjquery-1.10.2.js
bootstrap.min.jsApache-2.0-onlybootstrap.js
bootstrap-3.2.0.min.jsExpatbootstrap-3.2.0.js
wikibits.jsGNU General + Public License version 2 or laterwikibits.js
ajax.jsGNU General + Public License version 2 or laterajax.js
ajaxwatch.jsGNU General + Public License version 2 or laterajaxwatch.js
mwsuggest.jsGNU General + Public License version 2 or latermwsuggest.js
edit.jsGNU General + Public License version 2 or lateredit.js
wikiGNU General + Public License version 2 or laterwiki
jquery.chainedSelects.jsGNU General + Public License version 3 or laterjquery.chainedSelects.js
jquery.form.jsGNU General + Public License version 2 or laterjquery.form.js
Common.jsGNU Affero + General Public License version 3Common.js
civicrm-4.4.Common.jsGNU Affero + General Public License version 3civicrm-4.4.Common.js
+ + -- 2.25.1