www-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

www/server/staging/nav-bar/test9 body-include-1...


From: Therese Godefroy
Subject: www/server/staging/nav-bar/test9 body-include-1...
Date: Sat, 01 Mar 2014 07:57:49 +0000

CVSROOT:        /webcvs/www
Module name:    www
Changes by:     Therese Godefroy <th_g> 14/03/01 07:57:47

Modified files:
        server/staging/nav-bar/test9: body-include-1-5.html 
                                      body-include-2.html 
                                      body-include-2-5.html home5.html 
                                      edu-schools5.html 
                                      edu-schools4.html layout5.css 

Log message:
        Add body-include1-5 by hand; minor adjustments.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/body-include-1-5.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/body-include-2.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/body-include-2-5.html?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/home5.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/edu-schools5.html?cvsroot=www&r1=1.17&r2=1.18
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/edu-schools4.html?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.26&r2=1.27

Patches:
Index: body-include-1-5.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/body-include-1-5.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- body-include-1-5.html       28 Feb 2014 19:45:54 -0000      1.1
+++ body-include-1-5.html       1 Mar 2014 07:57:38 -0000       1.2
@@ -4,7 +4,7 @@
 <div id="toplinks">
  <a href="#content">Skip to main text</a>&nbsp;&nbsp;&nbsp;&nbsp;
  <a href="/accessibility/">Accessibility</a>&nbsp;&nbsp;&nbsp;
- <span class="fsf"><a 
href="https://www.fsf.org/associate/support_freedom?referrer=4052";>&nbsp;Join&nbsp;the&nbsp;FSF!&nbsp;</a></span>
+ <span class="fsf"><a 
href="https://www.fsf.org/associate/support_freedom?referrer=4052";>***&nbsp;Join&nbsp;the&nbsp;FSF!&nbsp;***</a></span>
 </div> <!-- /toplinks -->
 
 <div id="searcher">

Index: body-include-2.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/body-include-2.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- body-include-2.html 28 Feb 2014 19:45:55 -0000      1.4
+++ body-include-2.html 1 Mar 2014 07:57:39 -0000       1.5
@@ -25,7 +25,7 @@
 </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>
+<input type="submit" name="_qf_Edit_next" value="Sign in" /></p>
 </form>
 <p><strong>*** <a 
href="https://www.fsf.org/associate/support_freedom?referrer=4052";>
 JOIN THE FSF!</a> ***</strong></p>

Index: body-include-2-5.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/body-include-2-5.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- body-include-2-5.html       28 Feb 2014 19:45:55 -0000      1.8
+++ body-include-2-5.html       1 Mar 2014 07:57:39 -0000       1.9
@@ -5,7 +5,7 @@
 <div id="fssbox">
 
 <h4><a href="http://www.fsf.org/fss";>Monthly newsletter</a></h4>
-<p>(in English, Spanish or French)</p>
+<p>(also in Spanish and 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="" />
@@ -15,7 +15,7 @@
 </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>
+<input type="submit" name="_qf_Edit_next" value="Sign in" /></p>
 </form>
 
 </div><!-- /fssbox -->

Index: home5.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/home5.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- home5.html  28 Feb 2014 19:45:55 -0000      1.4
+++ home5.html  1 Mar 2014 07:57:39 -0000       1.5
@@ -20,6 +20,7 @@
 <link rel="alternate" title="Planet GNU" 
href="http://planet.gnu.org/rss20.xml"; type="application/rss+xml" />
 
 <!--#include virtual="/po/home.translist" -->
+
 <!-- start of server/banner.html -->
 <!-- start of head-include-2.html -->
 
@@ -35,9 +36,35 @@
 <body>
 <div  class="inner">
 
-<!--#include virtual="body-include-1-5.html" -->
+<!-- start of server/body-include-1.html -->
+<!--#set var="HTML_BODY" value="yes" -->
 
-<!--#include virtual="body-include-2-5.html" -->
+<div id="toplinks">
+ <a href="#content">Skip to main text</a>&nbsp;&nbsp;&nbsp;&nbsp;
+ <a href="/accessibility/">Accessibility</a>&nbsp;&nbsp;&nbsp;
+ <span class="fsf"><a 
href="https://www.fsf.org/associate/support_freedom?referrer=4052";>***&nbsp;Join&nbsp;the&nbsp;FSF!&nbsp;***</a></span>
+</div> <!-- /toplinks -->
+
+<div id="searcher">
+ <form method="get" action="http://www.gnu.org/cgi-bin/estseek.cgi";>
+  <div><label class="netscape4" for="phrase">Search:</label>
+  <input name="phrase" id="phrase" type="text" size="18" accesskey="s"
+         value="Why GNU/Linux?" onfocus="this.value=''" />
+  <input type="submit" value="Search" />
+  </div><!-- unnamed label -->
+ </form>
+</div><!-- /searcher -->
+
+<!--#if expr="$TRANSLATION_LIST" -->
+<!--#echo encoding="none" var="TRANSLATION_LIST" -->
+<!--#elif expr="$INITIAL_TRANSLATIONS_LIST = included" -->
+<!-- if initial translation list isn't included before banner.html,
+     then the file may use an old boilerplate that contains
+     div#translations in its body, and we mustn't duplicate it here. -->
+<!--#include virtual="/server/gnun/initial-translations-list.html" -->
+<!--#endif -->
+<!-- end of server/body-include-1.html -->
+<!--#include virtual="/server/staging/nav-bar/test9/body-include-2-5.html" -->
 
 <div id="content">
 
@@ -282,7 +309,7 @@
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2014/02/28 19:45:55 $
+$Date: 2014/03/01 07:57:39 $
 <!-- timestamp end -->
 </p>
 </div>

Index: edu-schools5.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/edu-schools5.html,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- edu-schools5.html   28 Feb 2014 20:52:03 -0000      1.17
+++ edu-schools5.html   1 Mar 2014 07:57:40 -0000       1.18
@@ -30,7 +30,7 @@
 <div id="toplinks">
  <a href="#content">Skip to main text</a>&nbsp;&nbsp;&nbsp;&nbsp;
  <a href="/accessibility/">Accessibility</a>&nbsp;&nbsp;&nbsp;
- <span class="fsf"><a 
href="https://www.fsf.org/associate/support_freedom?referrer=4052";>&nbsp;Join&nbsp;the&nbsp;FSF!&nbsp;</a></span>
+ <span class="fsf"><a 
href="https://www.fsf.org/associate/support_freedom?referrer=4052";>***&nbsp;Join&nbsp;the&nbsp;FSF!&nbsp;***</a></span>
 </div> <!-- /toplinks -->
 
 <div id="searcher">
@@ -52,6 +52,7 @@
 <!--#include virtual="/server/gnun/initial-translations-list.html" -->
 <!--#endif -->
 <!-- end of server/body-include-1.html -->
+
 <!-- start of server/body-include-2.html -->
 
 <div id="header">
@@ -59,7 +60,7 @@
 <div id="fssbox">
 
 <h4><a href="http://www.fsf.org/fss";>Monthly newsletter</a></h4>
-<p>(in English, Spanish or French)</p>
+<p>(also in Spanish and 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="" />
@@ -69,7 +70,7 @@
 </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>
+<input type="submit" name="_qf_Edit_next" value="Sign in" /></p>
 </form>
 
 </div><!-- /fssbox -->
@@ -94,8 +95,7 @@
  </ul>
 </div><!--  /navigation -->
 
-<!-- end of server/body-include-2.html -->
-<div id="content">
+<!-- end of server/body-include-2.html --><div id="content">
 
 <!-- end of banner.html -->
 
@@ -259,7 +259,7 @@
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2014/02/28 20:52:03 $
+$Date: 2014/03/01 07:57:40 $
 <!-- timestamp end -->
 </p>
 

Index: edu-schools4.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/edu-schools4.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- edu-schools4.html   28 Feb 2014 19:54:25 -0000      1.10
+++ edu-schools4.html   1 Mar 2014 07:57:41 -0000       1.11
@@ -23,6 +23,8 @@
 <title>Why Schools Should Exclusively Use Free Software - GNU Project - 
 Free Software Foundation</title>
 
+<!--#include virtual="/education/po/edu-schools.translist" -->
+
 <!-- start of banner.html -->
 
 <!-- start of head-include-2.html -->
@@ -200,7 +202,7 @@
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2014/02/28 19:54:25 $
+$Date: 2014/03/01 07:57:41 $
 <!-- timestamp end -->
 </p>
 

Index: layout5.css
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/layout5.css,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- layout5.css 28 Feb 2014 18:43:21 -0000      1.26
+++ layout5.css 1 Mar 2014 07:57:42 -0000       1.27
@@ -155,6 +155,7 @@
 
 /* Highlight the link to the FSF mission statement */
 #toplinks span.fsf a, a:visited {
+   font-size: 1.1em;
    color: #971611;
 }
 #toplinks span.fsf a:hover {
@@ -223,9 +224,9 @@
    line-height: 1.2em;
    padding: .5em .5em .2em .5em;
    border: 1px dashed #971611;
-   margin: 0 1% .7em 0;
+   margin: .7em 1% .7em 0;
 }
-#fssbox p, h4 { margin-top: .1em; margin-bottom: .3em; }
+#fssbox p, h4 { margin-top: 0; margin-bottom: .3em; }
 #fssbox input { font-weight: bold; color: #444; }
 
 /* For "normal" pages */
@@ -234,14 +235,13 @@
    font-family: sans-serif;
    font-weight: bold;
    line-height: 1.1em;
-   padding-top: .7em;
-   margin-top: .35em;
+   padding-top: 1.3em;
 }
 #gnu-banner img {
    float: left;
    height: 2.4em;
    margin: 0 .15em 0 1.5%;
-   position: relative; bottom: .7em;
+   position: relative; bottom: .8em;
 }
 #gnu-banner a {
    color: #334683; text-decoration: none;



reply via email to

[Prev in Thread] Current Thread [Next in Thread]