[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/server/staging/nav-bar/test9 layout4.css bo...
|
From: |
Therese Godefroy |
|
Subject: |
www/server/staging/nav-bar/test9 layout4.css bo... |
|
Date: |
Fri, 28 Feb 2014 19:45:55 +0000 |
CVSROOT: /webcvs/www
Module name: www
Changes by: Therese Godefroy <th_g> 14/02/28 19:45:55
Modified files:
server/staging/nav-bar/test9: layout4.css body-include-2.html
body-include-2-5.html
edu-schools4.html
edu-schools5.html home5.html
Added files:
server/staging/nav-bar/test9: body-include-1-5.html
Log message:
Fix includes.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/layout4.css?cvsroot=www&r1=1.11&r2=1.12
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/body-include-2.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/body-include-2-5.html?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/edu-schools4.html?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/edu-schools5.html?cvsroot=www&r1=1.14&r2=1.15
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/home5.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/body-include-1-5.html?cvsroot=www&rev=1.1
Patches:
Index: layout4.css
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/layout4.css,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- layout4.css 28 Feb 2014 18:43:20 -0000 1.11
+++ layout4.css 28 Feb 2014 19:45:54 -0000 1.12
@@ -223,12 +223,12 @@
font-size: .9em;
text-align: center;
line-height: 1.2em;
- padding: .5em .5em .2em .5em;
+ padding: .5em .5em .4em .5em;
border: 1px dashed #971611;
- margin: 0 1% .7em 0;
+ margin: .5em 1% .5em 0;
}
-#fssbox p, h4 { margin-top: .1em; margin-bottom: .3em; }
-#fssbox input { font-weight: bold; color: #444; }
+#fssbox p, h4 { margin-top: 0em; margin-bottom: .1em; }
+#fssbox input { font-weight: bold; color: #555; margin-bottom: .4em; }
#gnu-banner table {
float: left;
Index: body-include-2.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/body-include-2.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- body-include-2.html 28 Feb 2014 18:43:21 -0000 1.3
+++ body-include-2.html 28 Feb 2014 19:45:55 -0000 1.4
@@ -2,6 +2,16 @@
<div id="header">
+<div id="gnu-banner">
+ <table><tr>
+ <td><img src="/graphics/heckert_gnu.small.png" alt="[GNU logo]"></td>
+ <td><strong>GNU</strong><br />
+ <small>Operating System</small></td>
+ </tr></table>
+</div>
+
+<p id="fsf-support">GNU is supported by the <a
href="#mission-statement"><strong>Free Software Foundation</strong></a></p>
+
<div id="fssbox">
<h4><a href="http://www.fsf.org/fss";>Monthly newsletter</a></h4>
@@ -17,14 +27,10 @@
<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>
-
+<p><strong>***Â <a
href="https://www.fsf.org/associate/support_freedom?referrer=4052";>
+JOINÂ THEÂ FSF!</a>Â ***</strong></p>
</div><!-- /fssbox -->
-<div id="logo">
- <p><a href="/">
- <img src="/graphics/heckert_gnu.small.png" alt=" [Une tête de GNU] "
/><strong>GNU</strong> Operating System</a><br /><span>supported by
the <a href="#mission-statement">Free Software Foundation</span></p>
-</div><!-- /logo -->
-
</div><!-- /header -->
<div id="navigation">
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.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- body-include-2-5.html 27 Feb 2014 17:00:18 -0000 1.7
+++ body-include-2-5.html 28 Feb 2014 19:45:55 -0000 1.8
@@ -3,10 +3,21 @@
<div id="header">
<div id="fssbox">
-<p><strong>Sign up for our monthly newsletter</strong>
-<br />(also in Spanish and French),
-<br />the <a href="https://www.fsf.org/free-software-supporter/";>
-<strong>Free Software Supporter</strong></a></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&reset=1&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&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="gnu-banner">
Index: edu-schools4.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/edu-schools4.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- edu-schools4.html 27 Feb 2014 17:24:11 -0000 1.8
+++ edu-schools4.html 28 Feb 2014 19:45:55 -0000 1.9
@@ -36,87 +36,8 @@
<body>
<div class="inner">
-<!-- start of server/body-include-1.html -->
-
-<div id="toplinks">
- <a href="#content">Skip to main text</a>
- <a href="/accessibility/">Accessibility</a>
-</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 -->
-
-<div id="translations">
-<p>
-<span dir="ltr" class="original"><a lang="en" hreflang="en"
href="/education/edu-schools.en.html">English</a> [en]</span>
-<span dir="ltr"><a lang="ar" hreflang="ar"
href="/education/edu-schools.ar.html">اÙعربÙØ©</a> [ar]</span>
-<span dir="ltr"><a lang="bg" hreflang="bg"
href="/education/edu-schools.bg.html">бÑлгаÑÑки</a> [bg]</span>
-<span dir="ltr"><a lang="ca" hreflang="ca"
href="/education/edu-schools.ca.html">català </a> [ca]</span>
-<span dir="ltr"><a lang="de" hreflang="de"
href="/education/edu-schools.de.html">Deutsch</a> [de]</span>
-<span dir="ltr"><a lang="el" hreflang="el"
href="/education/edu-schools.el.html">ελληνικά</a> [el]</span>
-<span dir="ltr"><a lang="es" hreflang="es"
href="/education/edu-schools.es.html">español</a> [es]</span>
-<span dir="ltr"><a lang="fa" hreflang="fa"
href="/education/edu-schools.fa.html">ÙارسÛ</a> [fa]</span>
-<span dir="ltr"><a lang="fr" hreflang="fr"
href="/education/edu-schools.fr.html">français</a> [fr]</span>
-<span dir="ltr"><a lang="he" hreflang="he"
href="/education/edu-schools.he.html">×¢×ר×ת</a> [he]</span>
-<span dir="ltr"><a lang="hr" hreflang="hr"
href="/education/edu-schools.hr.html">hrvatski</a> [hr]</span>
-<span dir="ltr"><a lang="it" hreflang="it"
href="/education/edu-schools.it.html">italiano</a> [it]</span>
-<span dir="ltr"><a lang="ja" hreflang="ja"
href="/education/edu-schools.ja.html">æ¥æ¬èª</a> [ja]</span>
-<span dir="ltr"><a lang="ml" hreflang="ml"
href="/education/edu-schools.ml.html">മലയാളà´</a> [ml]</span>
-<span dir="ltr"><a lang="nl" hreflang="nl"
href="/education/edu-schools.nl.html">Nederlands</a> [nl]</span>
-<span dir="ltr"><a lang="pl" hreflang="pl"
href="/education/edu-schools.pl.html">polski</a> [pl]</span>
-<span dir="ltr"><a lang="pt-br" hreflang="pt-br"
href="/education/edu-schools.pt-br.html">português do Brasil</a> [pt-br]</span>
-<span dir="ltr"><a lang="ru" hreflang="ru"
href="/education/edu-schools.ru.html">ÑÑÑÑкий</a> [ru]</span>
-<span dir="ltr"><a lang="ta" hreflang="ta"
href="/education/edu-schools.ta.html">தமிழà¯</a> [ta]</span>
-<span dir="ltr"><a lang="uz" hreflang="uz"
href="/education/edu-schools.uz.html">Oʻzbekcha</a> [uz]</span>
-</p>
-</div>
-<!-- end of server/body-include-1.html -->
-
-<!-- start of server/body-include-2.html -->
-
-<div id="header">
-
-<div id="gnu-banner">
- <table><tr>
- <td><img src="/graphics/heckert_gnu.small.png" alt="[GNU logo]"></td>
- <td><strong>GNU</strong><br />
- <small>Operating System</small></td>
- </tr></table>
-</div>
-
-<p id="fsf-support">GNU is supported by the <a
href="#mission-statement"><strong>Free Software Foundation</strong></a></p>
-
-<div id="fssbox">
-<p><strong>Sign up for our monthly newsletter</strong>
-<br />(also in Spanish and French),
-<br />the <a href="https://www.fsf.org/free-software-supporter/";>
-<strong>Free Software Supporter</strong></a></p>
-<p><strong>***Â <a
href="https://www.fsf.org/associate/support_freedom?referrer=4052";>
-JOINÂ THEÂ FSF!</a>Â ***</strong></p>
-</div><!-- /fssbox -->
-
-</div><!-- /header -->
-
-<div id="navigation">
- <ul>
- <li id="tabAboutGNU"><a href="/gnu/gnu.html">About GNU</a></li>
- <li id="tabPhilosophy"><a
href="/philosophy/philosophy.html">Philosophy</a></li>
- <li id="tabLicenses"><a href="/licenses/licenses.html">Licenses</a></li>
- <li id="tabEducation"><a href="/education/education.html">Education</a></li>
- <li id="tabSoftware"><a href="/software/software.html">Software</a></li>
- <li id="tabDoc"><a href="/doc/doc.html">Documentation</a></li>
- <li id="tabHelp"><a href="/help/help.html">Help GNU</a></li>
- </ul>
-</div><!-- /navigation -->
-
-<!-- end of server/body-include-2.html -->
+<!--#include virtual "body-include-1.html" -->
+<!--#include virtual "body-include-2.html" -->
<div id="content">
@@ -279,7 +200,7 @@
<p>Updated:
<!-- timestamp start -->
-$Date: 2014/02/27 17:24:11 $
+$Date: 2014/02/28 19:45:55 $
<!-- timestamp end -->
</p>
Index: edu-schools5.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/edu-schools5.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- edu-schools5.html 26 Feb 2014 19:27:38 -0000 1.14
+++ edu-schools5.html 28 Feb 2014 19:45:55 -0000 1.15
@@ -24,7 +24,7 @@
<body>
<div class="inner">
-<!--#include virtual="body-include-1.html" -->
+<!--#include virtual="body-include-1-5.html" -->
<!--#include virtual="body-include-2-5.html" -->
<div id="content">
@@ -191,7 +191,7 @@
<p>Updated:
<!-- timestamp start -->
-$Date: 2014/02/26 19:27:38 $
+$Date: 2014/02/28 19:45:55 $
<!-- timestamp end -->
</p>
Index: home5.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/home5.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- home5.html 14 Feb 2014 12:50:01 -0000 1.3
+++ home5.html 28 Feb 2014 19:45:55 -0000 1.4
@@ -23,7 +23,7 @@
<!-- start of server/banner.html -->
<!-- start of head-include-2.html -->
-<link rel="stylesheet" href="/combo.css" media="screen" />
+<link rel="stylesheet" href="combo.css" media="screen" />
<link rel="stylesheet" href="layout5.css" media="screen" />
<link rel="stylesheet" href="/mini.css" media="handheld" />
@@ -35,9 +35,9 @@
<body>
<div class="inner">
-<!--#include virtual="/server/staging/nav-bar/test9/body-include-1.html" -->
+<!--#include virtual="body-include-1-5.html" -->
-<!--#include virtual="/server/staging/nav-bar/test9/body-include-2-5.html" -->
+<!--#include virtual="body-include-2-5.html" -->
<div id="content">
@@ -112,7 +112,7 @@
<div class="emph-box">
-<h4 id="Flashes"><a href="http://planet.gnu.org/";>Planet GNU</a> <a
href="http://planet.gnu.org/rss20.xml";><img src="/feed-icon-10x10.png" alt="RSS
Feed" /></a></h4>
+<h4 id="Flashes"><a href="http://planet.gnu.org/";>Planet GNU</a> <a
href="http://planet.gnu.org/rss20.xml";><img src="feed-icon-10x10.png" alt="RSS
Feed" /></a></h4>
<!--#include virtual="/planetfeeds.html" -->
<p>For more news, see <a href="http://planet.gnu.org/";>Planet GNU</a>
@@ -205,7 +205,42 @@
</div><!-- for id="content", starts in the include above -->
-<!--#include virtual="/server/staging/nav-bar/test9/footer-text.html" -->
+<!-- begin server/footer-text.html -->
+
+<div id="fsf-links">
+ <ul>
+ <li><a href="/">GNU home page</a></li>
+ <li><a
href="http://www.fsf.org/";>FSF home page</a></li>
+ <li><a href="/graphics/graphics.html">GNU Art</a></li>
+ <li><a href="/fun/fun.html">GNU Fun</a></li>
+ <li><a href="/people/people.html">GNU's Who?</a></li>
+ <li><a
href="http://directory.fsf.org";>Free Software Directory</a></li>
+ <li><a href="/server/sitemap.html">Site map</a></li>
+ </ul>
+</div><!-- /fsf-links -->
+
+<div id="mission-statement">
+
+<blockquote>
+<a href="http://www.fsf.org";><img id="fsfbanner" src="logo-fsf.org-notext.png"
alt=" [FSF logo] "/></a><strong>âOur mission is to preserve, protect and
promote the freedom to use, study, copy, modify, and redistribute computer
software, and to defend the rights of Free Software users.â</strong>
+</blockquote>
+
+<p>The <a href="http://www.fsf.org";>Free Software Foundation</a> is the
principal organizational sponsor of the GNU Operating System. <strong>Support
GNU and the FSF</strong> by</p>
+<div id="support-items">
+<p>* <a href="http://shop.fsf.org/";>buying manuals and gear</a>,</p>
+<p>* <a href="https://my.fsf.org/associate/support_freedom?referrer=4052";>
+ <strong>joining the FSF</strong></a> as an associate member, or</p>
+<p>* making a <strong>donation</strong>,
+ either <a href="http://donate.fsf.org/";>directly to the FSF</a>
+ or <a href="http://flattr.com/thing/313733/gnuproject-on-Flattr";>via
Flattr</a>.</p>
+</div> <!-- /support-gnu-fsf -->
+
+<p id="backtotop"><a href="#header">Back to Top</a></p>
+
+</div> <!-- /mission-statement -->
+
+<!-- end server/footer-text.html -->
+
<p id="sisters">The FSF also has sister organizations in <a
href="http://www.fsfe.org";>Europe</a>, <a
href="http://www.fsfla.org/";>Latin America</a> and <a
@@ -247,7 +282,7 @@
<p>Updated:
<!-- timestamp start -->
-$Date: 2014/02/14 12:50:01 $
+$Date: 2014/02/28 19:45:55 $
<!-- timestamp end -->
</p>
</div>
Index: body-include-1-5.html
===================================================================
RCS file: body-include-1-5.html
diff -N body-include-1-5.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ body-include-1-5.html 28 Feb 2014 19:45:54 -0000 1.1
@@ -0,0 +1,28 @@
+<!-- start of server/body-include-1.html -->
+<!--#set var="HTML_BODY" value="yes" -->
+
+<div id="toplinks">
+ <a href="#content">Skip to main text</a>
+ <a href="/accessibility/">Accessibility</a>
+ <span class="fsf"><a
href="https://www.fsf.org/associate/support_freedom?referrer=4052";> Join the FSF! </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 -->
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- www/server/staging/nav-bar/test9 layout4.css bo...,
Therese Godefroy <=