Modded CSS + add JQuery magic for rendering the LP15 log and Date-Place the way Zak...

Also, common JS used by all pages are now at
/server/2015/common_js.html. All pages under /2015/ now, except the
pages under /2015/scholarships/ includ /server/2015/common_js.html.

	modified:   2015/anti-harassment/index.html
	modified:   2015/assets/css/custom.css
	modified:   2015/call_for_sessions/confirmation.html
	modified:   2015/call_for_sessions/index.html
	modified:   2015/confirmation.html
	modified:   2015/discussion_list/index.html
	modified:   2015/exhibit/confirmation.html
	modified:   2015/exhibit/index.html
	modified:   2015/exhibit/payment_confirmation.html
	modified:   2015/fixed.html
	modified:   2015/getting_around/index.html
	modified:   2015/index.html
	modified:   2015/mailing-list/index.html
	modified:   2015/mailing_list.html
	modified:   2015/volunteer/confirmation.html
	modified:   2015/volunteer/index.html
	modified:   server/2015/ahp_js.html
	modified:   server/2015/banner.html
	modified:   server/2015/cfs_js.html
	new file:   server/2015/common_js.html
	modified:   server/2015/exhibit_js.html
	modified:   server/2015/getting_around_js.html
	modified:   server/2015/home_js.html
	modified:   server/2015/mailing_list_js.html
	modified:   server/2015/volunteer_js.html

diff --git a/2015/anti-harassment/index.html b/2015/anti-harassment/index.html
index dbd86bcf870af4ba20e1a26d45cece6dd35a4682..0ecbd644ec98d6112d30c6fb0ee63eb009df8d65 100755 (executable)
--- a/2015/anti-harassment/index.html
+++ b/2015/anti-harassment/index.html
@@ -30,5 +30,6 @@
 <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/2015/footer.html"-->
+<!--#include virtual="/server/2015/common_js.html"-->
 <!--#include virtual="/server/2015/ahp_js.html"-->
 <!--#include virtual="/server/2015/close.html" -->

diff --git a/2015/assets/css/custom.css b/2015/assets/css/custom.css
index 00e84ea3f699da8149c090f9c55a05ce1be2aeda..1fe9855433b254a96da3fca2ab41cb98779bcb91 100644 (file)
--- a/2015/assets/css/custom.css
+++ b/2015/assets/css/custom.css
@@ -32,7 +32,7 @@ h3 {
 }
 
 .lp-head p {
-   margin: -0.7em 0 0.001em -4.0em;
+   margin: -1.40em 0 0.001em -4em;
 }
 
 #lp-panel {
@@ -55,14 +55,25 @@ h3 {
        margin-left: 0.3em;
 }
 
-@media (max-width:767px) {
+@media (max-width:551px) {
+       .lp-head p {
+               margin: 0 0 0.2em 0;
+               text-align: center;
+       }
+       .lp-head img {
+               margin: 1.5em auto 0.5em auto;
+       }
+}
+
+@media (min-width: 552px) and (max-width:767px) {
+
        .lp-head img {
-               margin: 1.5em auto 0.001em auto;
+               margin: 1.5em auto 0.5em auto;
        }
        .lp-head p {
-               margin: 0.0em 0 0.7em;
-               text-align: center;
+               margin: -0.4em 0 0 -3.6em;
        }
+
        #lp-panel {
                max-width: 100%;
                margin-left: 0;
@@ -93,13 +104,13 @@ h3 {
                margin-top: 1.0em;
        }
        .lp-head p {
-               margin: -0.7em 0 0.001em -3.6em;
+               margin: -1.0em 0 0.001em -3.6em;
        }
 }
 
 @media (min-width:1200px) {
        .lp-head p {
-               margin: -0.7em 0 0.001em -7em;
+               margin: -1.45em 0 0.001em -7em;
        }
 }
 

diff --git a/2015/call_for_sessions/confirmation.html b/2015/call_for_sessions/confirmation.html
index 5f688490fa2b325cf72a2a844dc1d7c861b1056e..e6c02b88bf60b2faecb40c1b00ce8f2253e2815e 100755 (executable)
--- a/2015/call_for_sessions/confirmation.html
+++ b/2015/call_for_sessions/confirmation.html
@@ -23,5 +23,6 @@
                          </a>
                        </p>
 <!--#include virtual="/server/2015/footer.html"-->
+<!--#include virtual="/server/2015/common_js.html"-->
 <!--#include virtual="/server/2015/cfs_js.html"-->
 <!--#include virtual="/server/2015/close.html" -->

diff --git a/2015/call_for_sessions/index.html b/2015/call_for_sessions/index.html
index bc5c2279c2b29a66f100068b7d0a1088bb89a0b2..21c04611df9dcc6cbb84c8ca2338a6066bf11c32 100755 (executable)
--- a/2015/call_for_sessions/index.html
+++ b/2015/call_for_sessions/index.html
@@ -742,5 +742,6 @@
                          </div>
                  </form>
 <!--#include virtual="/server/2015/footer.html"-->
+<!--#include virtual="/server/2015/common_js.html"-->
 <!--#include virtual="/server/2015/cfs_js.html"-->
 <!--#include virtual="/server/2015/close.html" -->

diff --git a/2015/confirmation.html b/2015/confirmation.html
index c271c163ddf36941b3416b3c240596dba0c2e30c..49cf0c75b80fc34d93448306565fe66010497b32 100755 (executable)
--- a/2015/confirmation.html
+++ b/2015/confirmation.html
@@ -23,5 +23,6 @@
                          </a>
                        </p>
 <!--#include virtual="/server/2015/footer.html"-->
+<!--#include virtual="/server/2015/common_js.html"-->
 <!--#include virtual="/server/2015/cfs_js.html"-->
 <!--#include virtual="/server/2015/close.html" -->

diff --git a/2015/discussion_list/index.html b/2015/discussion_list/index.html
index a654c16cf0f00c47b0aecbeda92e59a9f08b6e6c..2fd4756829dc9c45556e91d69e7e463a35dcfdd3 100755 (executable)
--- a/2015/discussion_list/index.html
+++ b/2015/discussion_list/index.html
@@ -13,6 +13,7 @@
        <p><INPUT type="Text" name="email" size="30" value=""></p>
        <p><INPUT type="Submit" name="email-button" value="Subscribe"></p>
     </FORM><!--#include virtual="/server/2015/footer.html"-->
-    
+
+<!--#include virtual="/server/2015/common_js.html"-->
 <!--#include virtual="/server/2015/cfs_js.html"-->
-<!--#include virtual="/server/2015/close.html" -->
\ No newline at end of file
+<!--#include virtual="/server/2015/close.html" -->

diff --git a/2015/exhibit/confirmation.html b/2015/exhibit/confirmation.html
index 9f63b65dbe4821e89f92a8e919f9927ce6fc8621..7272d3ef64a4c7dbe447133d89fa19d9ec65c587 100755 (executable)
--- a/2015/exhibit/confirmation.html
+++ b/2015/exhibit/confirmation.html
@@ -22,5 +22,6 @@
                          </a>
                        </p>
 <!--#include virtual="/server/2015/footer.html"-->
+<!--#include virtual="/server/2015/common_js.html"-->
 <!--#include virtual="/server/2015/exhibit_js.html"-->
 <!--#include virtual="/server/2015/close.html" -->

diff --git a/2015/exhibit/index.html b/2015/exhibit/index.html
index b861a984c70a7fd5b5082b49a9d69879e6c03e26..9542d8bb33f9c764a275fbceba99fb2c06d0e7ef 100755 (executable)
--- a/2015/exhibit/index.html
+++ b/2015/exhibit/index.html
@@ -571,5 +571,6 @@
                          </div>
                        </form>
 <!--#include virtual="/server/2015/footer.html"-->
+<!--#include virtual="/server/2015/common_js.html"-->
 <!--#include virtual="/server/2015/exhibit_js.html"-->
 <!--#include virtual="/server/2015/close.html" -->

diff --git a/2015/exhibit/payment_confirmation.html b/2015/exhibit/payment_confirmation.html
index 13579ae7f28f204f1d4c7abdd19a11e659b5c028..6e3d5d07cf2594fab96fe3f3cfa749effc439204 100755 (executable)
--- a/2015/exhibit/payment_confirmation.html
+++ b/2015/exhibit/payment_confirmation.html
@@ -15,5 +15,6 @@ Thank you for being an exhibitor at LibrePlanet 2015! You will receive a payment
                          </a>
                        </p>
 <!--#include virtual="/server/2015/footer.html"-->
+<!--#include virtual="/server/2015/common_js.html"-->
 <!--#include virtual="/server/2015/exhibit_js.html"-->
 <!--#include virtual="/server/2015/close.html" -->

diff --git a/2015/fixed.html b/2015/fixed.html
index b7cb7dd5b341aa150968a88c23f89752b603d81f..e4a63c617e1b48797d2d2e3a2830cc8f65eeb842 100755 (executable)
--- a/2015/fixed.html
+++ b/2015/fixed.html
@@ -245,5 +245,6 @@
   <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>
 
 <!--#include virtual="/server/2015/footer.html"-->
+<!--#include virtual="/server/2015/common_js.html"-->
 <!--#include virtual="/server/2015/home_js.html"-->
 <!--#include virtual="/server/2015/close.html" -->

diff --git a/2015/getting_around/index.html b/2015/getting_around/index.html
index 524e905fdac792511c486b6f9762c25e560dd6ea..1da8abb91374ea9eb9fae80e2302eba1442fab05 100755 (executable)
--- a/2015/getting_around/index.html
+++ b/2015/getting_around/index.html
@@ -178,5 +178,6 @@
       </ul>
 
       <!--#include virtual="/server/2015/footer.html"-->
+      <!--#include virtual="/server/2015/common_js.html"-->
       <!--#include virtual="/server/2015/getting_around_js.html"-->
       <!--#include virtual="/server/2015/close.html" -->

diff --git a/2015/index.html b/2015/index.html
index 28c5371555a817f9634e159349355bf9c6d7b958..7c990475c10b6e3884459d84be6b5247afff5f1c 100755 (executable)
--- a/2015/index.html
+++ b/2015/index.html
@@ -164,5 +164,6 @@ and be part of LibrePlanet 2014!
 <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>
 
 <!--#include virtual="/server/2015/footer.html"-->
+<!--#include virtual="/server/2015/common_js.html"-->
 <!--#include virtual="/server/2015/home_js.html"-->
 <!--#include virtual="/server/2015/close.html" -->

diff --git a/2015/mailing-list/index.html b/2015/mailing-list/index.html
index d664fb65752e8d5ab013f0937cf2e060a5a6f88a..c27e01241aee70d02cc4d9b693c95760ccde3323 100755 (executable)
--- a/2015/mailing-list/index.html
+++ b/2015/mailing-list/index.html
@@ -66,5 +66,6 @@
 \r
 \r
 <!--#include virtual="/server/2015/footer.html"-->\r
+<!--#include virtual="/server/2015/common_js.html"-->\r
 <!--#include virtual="/server/2015/mailing_list_js.html"-->\r
 <!--#include virtual="/server/2015/close.html" -->\r

diff --git a/2015/mailing_list.html b/2015/mailing_list.html
index a654c16cf0f00c47b0aecbeda92e59a9f08b6e6c..2fd4756829dc9c45556e91d69e7e463a35dcfdd3 100755 (executable)
--- a/2015/mailing_list.html
+++ b/2015/mailing_list.html
@@ -13,6 +13,7 @@
        <p><INPUT type="Text" name="email" size="30" value=""></p>
        <p><INPUT type="Submit" name="email-button" value="Subscribe"></p>
     </FORM><!--#include virtual="/server/2015/footer.html"-->
-    
+
+<!--#include virtual="/server/2015/common_js.html"-->
 <!--#include virtual="/server/2015/cfs_js.html"-->
-<!--#include virtual="/server/2015/close.html" -->
\ No newline at end of file
+<!--#include virtual="/server/2015/close.html" -->

diff --git a/2015/volunteer/confirmation.html b/2015/volunteer/confirmation.html
index 9b81a572f3c995c98e90fd573089306b2ee13abf..5c5fad667c276936098447740d8b6e3e493fa1fa 100755 (executable)
--- a/2015/volunteer/confirmation.html
+++ b/2015/volunteer/confirmation.html
@@ -22,5 +22,6 @@
                          </a>
                        </p>
 <!--#include virtual="/server/2015/footer.html"-->
+<!--#include virtual="/server/2015/common_js.html"-->
 <!--#include virtual="/server/2015/volunteer_js.html"-->
 <!--#include virtual="/server/2015/close.html" -->

diff --git a/2015/volunteer/index.html b/2015/volunteer/index.html
index ce2390e206bab3914ebda378b4d62ab5f996a8de..233f04eabba9d1dff7b7f93b730ebb34d94b6fe6 100755 (executable)
--- a/2015/volunteer/index.html
+++ b/2015/volunteer/index.html
@@ -553,5 +553,6 @@
                        </form>
 
 <!--#include virtual="/server/2015/footer.html"-->
+<!--#include virtual="/server/2015/common_js.html"-->
 <!--#include virtual="/server/2015/volunteer_js.html"-->
 <!--#include virtual="/server/2015/close.html" -->

diff --git a/server/2015/ahp_js.html b/server/2015/ahp_js.html
index 37aa5ef4307b9daf9e5bf1384ea8135fe4b043ae..9ca7e87d497511285b1021ac3e1e83730b0ffc6b 100644 (file)
--- a/server/2015/ahp_js.html
+++ b/server/2015/ahp_js.html
@@ -1,9 +1,3 @@
-<script type="text/javascript"
-       src="/2015/assets/js/jquery-1.11.1.min.js">
-</script>
-
 <script type="text/javascript">
  $("#ahp-link").addClass("active");
 </script>
-<script type="text/javascript"
-        src="/2015/assets/js/piwik.js"></script>

diff --git a/server/2015/banner.html b/server/2015/banner.html
index 726b8a3d10cc3a46404ab78aae2fdbef68f59108..7e3ff5607f49af16d0b3e752ff5d23009d3f7a1f 100644 (file)
--- a/server/2015/banner.html
+++ b/server/2015/banner.html
@@ -5,14 +5,14 @@
                <div class="container"> <!-- start of container -->
                  <div class="row">
                        <div class="lp-head"> <!-- start of lp header -->
-                         <div class="col-sm-3">
+                         <div id="lp15-logo"  class="col-sm-3 col-xs-5">
                                <a href="/2015/">
                                  <img src="/2015/assets/img/site_logo_alternate.png"
                                           class="img-responsive"
                                           alt="[ LibrePlanet 2015 &mdash; Free Software Everywhere]" />
                                </a>
                          </div>
-                         <div class="col-sm-3">
+                         <div id="lp15-date-place" class="col-sm-3 col-xs-3">
                                <p>
                                  <strong><br>March 21-22<br />
                                        MIT Stata Center<br />
@@ -80,7 +80,7 @@
 
 
 
-           <div class="col-sm-offset-3 col-sm-3"> <!-- Start of register button -->
+           <div class="col-sm-offset-3 col-sm-3 col-xs-12"> <!-- Start of register button -->
            <a class="btn btn-register-lp14 btn-lg btn-block"
            href="https://my.fsf.org/civicrm/event/register?reset=1&amp;id=20">
            <span class="glyphicon glyphicon-ok"></span>

diff --git a/server/2015/cfs_js.html b/server/2015/cfs_js.html
index 17066ed45169b6e6d2014b762360368d2681dffc..f687fdf39cf09a87919521c98012cfbfa97342bc 100644 (file)
--- a/server/2015/cfs_js.html
+++ b/server/2015/cfs_js.html
@@ -1,9 +1,5 @@
-<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.Common.js">
 </script>
 <script type="text/javascript">
  $("#cfs-link").addClass("active");
 </script>
-<script type="text/javascript"
-        src="/2015/assets/js/piwik.js"></script>

diff --git a/server/2015/common_js.html b/server/2015/common_js.html
new file mode 100644 (file)
index 0000000..70c472f
--- /dev/null
+++ b/server/2015/common_js.html
@@ -0,0 +1,22 @@
+<script type="text/javascript"
+               src="/2015/assets/js/jquery-1.11.1.min.js"></script>
+<script type="text/javascript"
+        src="/2015/assets/js/piwik.js"></script>
+
+<script>
+$(document).ready(logoTextStack);
+
+$(window).resize(logoTextStack);
+
+function logoTextStack() {
+    screenSize = $(window).width();
+    if(screenSize <= 551) {
+        $("#lp15-logo").removeClass("col-xs-5");
+        $("#lp15-date-place").removeClass("col-xs-3");
+    }else if(!$("#lp15-logo").hasClass("col-xs-5")) {
+               $("#lp15-logo").addClass("col-xs-5");
+        $("#lp15-date-place").addClass("col-xs-3");
+    }
+}
+</script>
+

diff --git a/server/2015/exhibit_js.html b/server/2015/exhibit_js.html
index eabe390f2ce8a1b0f3ca728110b98d6b9e9c5820..e028a55e51d0eb3fef9dfb52940239c3b5e83516 100644 (file)
--- a/server/2015/exhibit_js.html
+++ b/server/2015/exhibit_js.html
@@ -1,7 +1,3 @@
-<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>
@@ -23,5 +19,3 @@
 <script type="text/javascript">
  $("#exhibit-link").addClass("active");
 </script>
-<script type="text/javascript"
-        src="/2015/assets/js/piwik.js"></script>

diff --git a/server/2015/getting_around_js.html b/server/2015/getting_around_js.html
index a7d359e8aa5ae1cfe7ff456cf6fe429ab1e2233c..509dbfbac7d375c08d65acf90400ef9312c00688 100644 (file)
--- a/server/2015/getting_around_js.html
+++ b/server/2015/getting_around_js.html
@@ -1,9 +1,3 @@
-<script type="text/javascript"
-       src="/2015/assets/js/jquery-1.11.1.min.js">
-</script>
-
 <script type="text/javascript">
  $("#getting_around-link").addClass("active");
 </script>
-<script type="text/javascript"
-        src="/2015/assets/js/piwik.js"></script>

diff --git a/server/2015/home_js.html b/server/2015/home_js.html
index aa95ab0b78a87b60a7677d071bf40f38effacea9..81817a3b014e4e9403e211cd05d2762df0e40370 100644 (file)
--- a/server/2015/home_js.html
+++ b/server/2015/home_js.html
@@ -1,10 +1,5 @@
-<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>
-<script type="text/javascript"
-        src="/2015/assets/js/piwik.js"></script>
-
 <script>
          $(document).ready(function() {
         $('.carousel').carousel({ interval:6000 });

diff --git a/server/2015/mailing_list_js.html b/server/2015/mailing_list_js.html
index 83eb09c56eed7750a99a23e53a90a251fa3b73a1..2631a022c273d64676c67511e9fc3c2906b2555f 100755 (executable)
--- a/server/2015/mailing_list_js.html
+++ b/server/2015/mailing_list_js.html
@@ -1,7 +1,3 @@
-<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>
@@ -14,11 +10,6 @@
                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/volunteer_js.html b/server/2015/volunteer_js.html
index 5f1d1a2f31dac2cad69c1fae9c5296347b489e5d..2fcc1e01a561ab19ec6526efe3f6289ffab43bfb 100644 (file)
--- a/server/2015/volunteer_js.html
+++ b/server/2015/volunteer_js.html
@@ -1,7 +1,3 @@
-<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>
@@ -24,5 +20,3 @@
 <script type="text/javascript">
  $("#volunteer-link").addClass("active");
 </script>
-<script type="text/javascript"
-        src="/2015/assets/js/piwik.js"></script>