www/server body-include-2.html head-include-2.html

[Therese Godefroy]

CVSROOT:        /webcvs/www
Module name:    www
Changes by:     Therese Godefroy <th_g> 16/11/23 17:44:25

Modified files:
        server         : body-include-2.html head-include-2.html 

Log message:
        Add the FSF fundraising banner.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/body-include-2.html?cvsroot=www&r1=1.104&r2=1.105
http://web.cvs.savannah.gnu.org/viewcvs/www/server/head-include-2.html?cvsroot=www&r1=1.27&r2=1.28

Patches:
Index: body-include-2.html
===================================================================
RCS file: /webcvs/www/www/server/body-include-2.html,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -b -r1.104 -r1.105
--- body-include-2.html 3 Nov 2016 20:29:29 -0000       1.104
+++ body-include-2.html 23 Nov 2016 17:44:24 -0000      1.105
@@ -1,40 +1,31 @@
 <!-- start of server/body-include-2 -->
-<p id="gnuhealth-text" class="unprintable"
-style="text-align: center; font-size: 1.2em; line-height: 1.4em;
-padding: .2em; margin: 0; background: #ddeced;
-border-top: .2em solid #0088a0; border-bottom: .2em solid #0088a0;">
-<strong><a href="http://www.gnuhealthcon.org/2016-las_palmas/";>GNU Health
-   Conference</a></strong>&nbsp; Nov&nbsp;18-20, Las&nbsp;Palmas, Spain
-   #GNUHealthCon2016
-</p>
 <div id="header">
-<div id="fsf-frame">
-<p id="join-fsf"><a 
href="https://www.fsf.org/associate/support_freedom?referrer=4052";>JOIN&nbsp;THE&nbsp;FSF</a></p>
-<div id="fssbox">
-<p><a href="http://www.fsf.org/fss";>Free Software Supporter</a></p>
-<form action="https://my.fsf.org/civicrm/profile/create?reset=1&amp;gid=31";
- method="post" class="header">
- <div>
-  <input name="postURL" type="hidden" value="" />
-  <input type="hidden" name="group[25]" value="1" />
-  <input name="cancelURL" type="hidden" 
value="https://crm.fsf.org/civicrm/profile?reset=1&amp;gid=31"; />
-  <input name="_qf_default" type="hidden" value="Edit:cancel" />
- </div>
- <p>
-  <input type="text" id="frmEmail" name="email-Primary" size="18" 
maxlength="80"
-         value="email address" onfocus="this.value=''"/>
-  <input type="submit" name="_qf_Edit_next" value="Sign up" />
- </p>
-</form>
-</div><!-- /fssbox -->
-</div><!-- /fsf-frame -->
 
 <div id="gnu-banner">
  <a href="/">
- <img src="/graphics/heckert_gnu.small.png" alt=" [A GNU head] " 
/><strong>GNU</strong> Operating System</a>
+ <img src="/graphics/heckert_gnu.transp.small.png" alt=" [A GNU head] " 
/><strong>GNU</strong> Operating System</a>
 
 <p id="fsf-support">Sponsored by the <a href="#mission-statement">Free 
Software Foundation</a></p>
 </div><!-- /gnu-banner -->
+
+<div id="fsf-frame">
+<p id="fundraiser">
+The Free Software Foundation has <a 
href="https://www.fsf.org/appeal?pk_campaign=2016_Fundraiser_Banner&amp;pk_kwd=Appeal";>planted
 the seeds of computer user
+freedom</a> for more than three decades. Associate Members are the roots
+sustaining this work. 
+Join now for $10/month and help freedom thrive.</p>
+
+<p id="join-fsf"><a 
href="http://fsf.org/jfb?pk_campaign=2016_Fundraiser_Banner&amp;pk_kwd=Join";>JOIN<span
 class="normal">&nbsp;THE&nbsp;FSF</span></a></p>
+</div><!-- /fsf-frame -->
+
+<div class="progress">
+<div class="progress-bar">
+<span class="percentage"><span class="gnun-split"></span><!--#echo 
var="percent" -->%</span>
+</div>
+<span class="goal">$450,000</span>
+</div>
+
+<div style="clear: both"></div>
 </div><!-- /header -->
 
 <div id="navigation">

Index: head-include-2.html
===================================================================
RCS file: /webcvs/www/www/server/head-include-2.html,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- head-include-2.html 24 Aug 2016 04:36:17 -0000      1.27
+++ head-include-2.html 23 Nov 2016 17:44:24 -0000      1.28
@@ -1,3 +1,119 @@
 <!-- start of head-include-2.html -->
-<meta name="viewport" content="width=device-width, initial-scale=1" />
+<!--#include virtual="/server/banners/sofar.html"
+ --><meta name="viewport" content="width=device-width, initial-scale=1" />
+<style type="text/css" media="screen">
+#header {
+   padding: 1em 3%;
+   background: #effbfb 
url(/server/staging/fundraiser/background-desktop.1.jpg) no-repeat;
+   background-position: 100% 100%;
+   background-size: auto 100%;
+}
+#translations {
+   background: #efede6;
+   border-color: #d7d4c5;
+}
+#fsf-frame {
+   margin: 0;
+}
+#fsf-frame p {
+   line-height: 1.4em;
+}
+#fsf-support, #fundraiser, .progress {
+   display: none;
+}
+p#fundraiser {
+   float: right; 
+   font-size: 1.1em;
+   margin: 0 0 1.2em 2em;
+}
+#join-fsf a, #join-fsf a:visited {
+   color: white;
+   background: #fc7b82;
+   border-color: #fa5c64;
+}
+#join-fsf a:hover {
+   color: white;
+   background: #fa5c64;
+}
+#gnu-banner {
+   padding: 0 0 .7em;
+   margin: 0;
+}
+.progress {
+   clear: left;
+   width: 50%;
+   font-size: .9em;
+   line-height: 1.1em;
+   text-align: right;
+   margin: 2em 0 0;
+   background: #d7d4c5;
+   border: .1em solid #b6ac93;
+}
+.progress-bar {
+   float: left;
+   line-height: 1em;
+   margin: 0;
+   width: 1.5em; min-width: 1.8em;
+   background: #fc7b82;
+   border: .1em solid #fa5c64;
+}
+.percentage, .goal {
+   margin-right: .1em;
+}
+<!--#set var="bar"
+ value=".progress-bar {
+    width: $percent%;
+ }
+" --><!--#echo var="bar" -->
+#join-fsf a, #join-fsf a:visited, .progress, .progress-bar {
+   border-radius: 1em;
+   -moz-border-radius: 1em;
+   -khtml-border-radius: 1em;
+   -webkit-border-radius: 1em;
+   -opera-border-radius: 1em;
+}
+
address@hidden (min-width: 30em) {
+   p#join-fsf {
+      display: block;
+      float: right;
+      margin-left: 2em;
+   }
+   #gnu-banner {
+      float: left;
+      margin-bottom: 0;
+   }
+}
address@hidden (min-width: 40em) {
+   #header {
+      position: relative;
+   }
+   p#fundraiser, .progress {
+      display: block;
+   }
+   .progress {
+      float: left;
+      position: absolute;
+      bottom: 1em;
+   }
+   p#join-fsf {
+      float: none;
+      font-size: 1.1em;
+      margin: 0 15% .5em 2em;
+   }
+   #join-fsf span.normal {
+      display: none;
+   }
+   #gnu-banner {
+      clear: none;
+      float: left;
+      max-width: 50%;
+      padding-top: .4em;
+   }
+   #fsf-frame {
+      max-width: 48%;
+      text-align: right;
+   }
+}
+</style>
 <!-- end of head-include-2.html -->