www/server/staging/nav-bar/test9 layout4.css la...

[Therese Godefroy]

CVSROOT:        /webcvs/www
Module name:    www
Changes by:     Therese Godefroy <th_g> 14/02/28 18:43:21

Modified files:
        server/staging/nav-bar/test9: layout4.css layout5.css 
                                      body-include-2.html 

Log message:
        fssbox with subscription form.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/layout4.css?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/layout5.css?cvsroot=www&r1=1.25&r2=1.26
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/body-include-2.html?cvsroot=www&r1=1.2&r2=1.3

Patches:
Index: layout4.css
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/layout4.css,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- layout4.css 28 Feb 2014 15:02:43 -0000      1.10
+++ layout4.css 28 Feb 2014 18:43:20 -0000      1.11
@@ -225,10 +225,10 @@
    line-height: 1.2em;
    padding: .5em .5em .2em .5em;
    border: 1px dashed #971611;
-   margin: .7em 1% .7em 0;
+   margin: 0 1% .7em 0;
 }
-#fssbox p { margin-top: 0; margin-bottom: .5em; }
-#fssbox a { font-size: 1.1em; }
+#fssbox p, h4 { margin-top: .1em; margin-bottom: .3em; }
+#fssbox input { font-weight: bold; color: #444; }
 
 #gnu-banner table {
    float: left;

Index: layout5.css
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/layout5.css,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- layout5.css 28 Feb 2014 15:02:43 -0000      1.25
+++ layout5.css 28 Feb 2014 18:43:21 -0000      1.26
@@ -223,9 +223,10 @@
    line-height: 1.2em;
    padding: .5em .5em .2em .5em;
    border: 1px dashed #971611;
-   margin: .35em 1% .7em 0;
+   margin: 0 1% .7em 0;
 }
-#fssbox p { margin-top: 0; margin-bottom: .5em; }
+#fssbox p, h4 { margin-top: .1em; margin-bottom: .3em; }
+#fssbox input { font-weight: bold; color: #444; }
 
 /* For "normal" pages */
 #gnu-banner {

Index: body-include-2.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/body-include-2.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- body-include-2.html 16 Feb 2014 09:52:27 -0000      1.2
+++ body-include-2.html 28 Feb 2014 18:43:21 -0000      1.3
@@ -3,16 +3,27 @@
 <div id="header">
 
 <div id="fssbox">
-<p><strong>Sign up for our monthly email newsletter, the<br /><a
-href="https://www.fsf.org/free-software-supporter/";>Free Software
-Supporter</a></strong></p>
+
+<h4><a href="http://www.fsf.org/fss";>Monthly newsletter</a></h4>
+<p>(in English, Spanish or French)</p>
+<form 
action="https://crm.fsf.org/civicrm/profile/create&amp;reset=1&amp;gid=31"; 
method="post">
+<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><label></label>
+<input type="text" id="frmEmail" name="email-Primary" size="18" maxlength="80" 
value="email address"/>
+<input type="submit" name="_qf_Edit_next" value="Subscribe" /></p>
+</form>
+
 </div><!-- /fssbox -->
 
 <div id="logo">
- <a href="/">
- <img src="/graphics/heckert_gnu.small.png" alt=" [A GNU head] " 
/><strong>GNU</strong> Operating System</a>
+ <p><a href="/">
+ <img src="/graphics/heckert_gnu.small.png" alt=" [Une tête de GNU] " 
/><strong>GNU</strong>&nbsp;Operating&nbsp;System</a><br /><span>supported by 
the <a href="#mission-statement">Free Software Foundation</span></p>
 </div><!-- /logo -->
-<p id="fsf-support">Supported by the <a href="#mission-statement">Free 
Software Foundation</a></p>
 
 </div><!-- /header -->