[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/server/staging/nav-bar/test9 edu-cases-indi...
|
From: |
Therese Godefroy |
|
Subject: |
www/server/staging/nav-bar/test9 edu-cases-indi... |
|
Date: |
Sun, 27 Apr 2014 17:35:56 +0000 |
CVSROOT: /webcvs/www
Module name: www
Changes by: Therese Godefroy <th_g> 14/04/27 17:35:56
Modified files:
server/staging/nav-bar/test9: edu-cases-india-irimpanam.html
edu-software-gcompris.html
home5.html body-include-1.html
body-include-2.html layout7.css
Log message:
Integrate the translation list in the top bar if there are few
translations; remove space between text and submit inputs; add onfocus
attribute to subscription form; indent #edu-cases in % instead of em for better
shrinking; restyle #fsf-frame slightly (remove hr).
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/edu-cases-india-irimpanam.html?cvsroot=www&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/edu-software-gcompris.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/home5.html?cvsroot=www&r1=1.27&r2=1.28
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/body-include-1.html?cvsroot=www&r1=1.12&r2=1.13
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/body-include-2.html?cvsroot=www&r1=1.16&r2=1.17
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/layout7.css?cvsroot=www&r1=1.39&r2=1.40
Patches:
Index: edu-cases-india-irimpanam.html
===================================================================
RCS file:
/webcvs/www/www/server/staging/nav-bar/test9/edu-cases-india-irimpanam.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- edu-cases-india-irimpanam.html 25 Apr 2014 16:20:49 -0000 1.9
+++ edu-cases-india-irimpanam.html 27 Apr 2014 17:35:54 -0000 1.10
@@ -6,8 +6,27 @@
- GNU Project - Free Software Foundation</title>
<!--#include virtual="/education/po/edu-cases-india-irimpanam.translist" -->
-<!--#include virtual="/server/banner.html" -->
+<!-- start of server/banner.html -->
+<!-- start of head-include-2.html -->
+<link rel="stylesheet" href="combo.css" media="screen" />
+<link rel="stylesheet" href="layout7.css" media="screen" />
+
+<link rel="stylesheet" href="/mini.css" media="handheld" />
+
+<link rel="stylesheet" href="/print.css" media="print" />
+
+<!-- end of head-include-2.html --></head>
+<body>
+<div class="inner">
+
+<!--#include virtual="/server/staging/nav-bar/test9/body-include-1.html" -->
+
+<!--#include virtual="/server/staging/nav-bar/test9/body-include-2.html" -->
+
+<div id="content">
+
+<!-- end of server/banner.html -->
<div id="education-content">
<!-- begin edu navigation bar -->
@@ -81,9 +100,10 @@
<a href="/education/misc/irimpanam-school.jpg">
<img src="/education/misc/irimpanam-school-sm.jpg"
-alt="Image of students at a Free Software event."/></a>
+alt="Image of students at a Free Software event." /></a>
<p class="c">Students at a Free Software event organized by SSK VHSS
Irimpanam.</p>
+
</div> <!-- /photo -->
<p>Training courses for teachers were implemented by the government to
@@ -149,6 +169,7 @@
<p class="c"><a href="/education/misc/adeenia.ogg">Listen</a> to a student
pronounce the name of the Adeenia flower in Malayalam.</p>
+
</div> <!-- /photo -->
<p>Education in the State of Kerala has become "IT-enabled", meaning
@@ -260,7 +281,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2014/04/25 16:20:49 $
+$Date: 2014/04/27 17:35:54 $
<!-- timestamp end -->
</p>
</div>
Index: edu-software-gcompris.html
===================================================================
RCS file:
/webcvs/www/www/server/staging/nav-bar/test9/edu-software-gcompris.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- edu-software-gcompris.html 25 Apr 2014 08:06:45 -0000 1.4
+++ edu-software-gcompris.html 27 Apr 2014 17:35:55 -0000 1.5
@@ -6,8 +6,27 @@
- GNU Project - Free Software Foundation</title>
<!--#include virtual="/education/po/edu-software-gcompris.translist" -->
-<!--#include virtual="/server/banner.html" -->
+<!-- start of server/banner.html -->
+<!-- start of head-include-2.html -->
+<link rel="stylesheet" href="combo.css" media="screen" />
+<link rel="stylesheet" href="layout7.css" media="screen" />
+
+<link rel="stylesheet" href="/mini.css" media="handheld" />
+
+<link rel="stylesheet" href="/print.css" media="print" />
+
+<!-- end of head-include-2.html --></head>
+<body>
+<div class="inner">
+
+<!--#include virtual="/server/staging/nav-bar/test9/body-include-1.html" -->
+
+<!--#include virtual="/server/staging/nav-bar/test9/body-include-2.html" -->
+
+<div id="content">
+
+<!-- end of server/banner.html -->
<div id="education-content">
<!-- begin edu navigation bar -->
@@ -27,6 +46,7 @@
<a href="/education/edu-resources.html">Educational Resources</a> →
<a href="/education/edu-software.html">Educational Free Software</a> →
GCompris</p>
+
<!--GNUN: OUT-OF-DATE NOTICE-->
<!--#if expr="$OUTDATED_SINCE" --><!--#else -->
<!--#if expr="$LANGUAGE_SUFFIX" -->
@@ -34,6 +54,7 @@
<!--#include virtual="/server/top-addendum.html" -->
<!--#endif -->
<!--#endif -->
+
<h2>GCompris</h2>
<h3>Description</h3>
@@ -41,8 +62,8 @@
<div class="photo">
<a href="/education/misc/gcompris.jpg">
-<img class="recessed" src="/education/misc/gcompris-sm.jpg" alt="Screenshot of
the GCompris
-interface showing the various boards."/></a>
+<img class="recessed" src="/education/misc/gcompris-sm.jpg"
+alt="Screenshot of the GCompris interface showing the various
activities."/></a>
</div>
<p>GCompris is a cross-platform complete educational suite for children
@@ -151,7 +172,7 @@
of this article.</p>
</div>
-<p>Copyright © 2011, 2012 Free Software Foundation, Inc.</p>
+<p>Copyright © 2011, 2012, 2014 Free Software Foundation, Inc.</p>
<p>This page is licensed under a <a rel="license"
href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative
@@ -161,7 +182,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2014/04/25 08:06:45 $
+$Date: 2014/04/27 17:35:55 $
<!-- timestamp end -->
</p>
</div>
Index: home5.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/home5.html,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- home5.html 17 Apr 2014 21:46:38 -0000 1.27
+++ home5.html 27 Apr 2014 17:35:55 -0000 1.28
@@ -12,87 +12,23 @@
<!-- start of server/banner.html -->
<!-- start of head-include-2.html -->
-<link rel="stylesheet" href="/combo.css" media="screen" />
-<link rel="stylesheet" href="/mini.css" media="handheld" />
+<link rel="stylesheet" href="combo.css" media="screen" />
<link rel="stylesheet" href="layout7.css" media="screen" />
+<link rel="stylesheet" href="/mini.css" media="handheld" />
+
<link rel="stylesheet" href="/print.css" media="print" />
<!-- end of head-include-2.html --></head>
<body>
<div class="inner">
-<!-- start of server/body-include-1.html -->
-<!--#set var="HTML_BODY" value="yes" -->
-<div id="toplinks">
- <a href="#content">Skip to main text</a>
-</div> <!-- /toplinks -->
-
-<div id="searcher">
- <form method="get" action="http://www.gnu.org/cgi-bin/estseek.cgi";>
- <div>
- <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 -->
-<!-- start of server/body-include-2.html -->
-
-<div id="header">
-
-<div id="fsf-frame">
-<p id="join-fsf"><a
href="https://www.fsf.org/associate/support_freedom?referrer=4052";>JOIN THE FSF</a></p><hr
/>
-
-<div id="fssbox">
-<p><a href="http://www.fsf.org/fss";>GNU/FSF Newsletter</a></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>
- <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>
-</div><!-- /gnu-banner -->
-<p id="fsf-support">Sponsored by the <a href="#mission-statement">Free
Software Foundation</a></p>
-
-</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 -->
+<!--#include virtual="/server/staging/nav-bar/test9/body-include-1.html" -->
+
+<!--#include virtual="/server/staging/nav-bar/test9/body-include-2.html" -->
+
+<div id="content">
-<!-- end of server/body-include-2.html --><div id="content">
<!-- end of server/banner.html -->
<p class="netscape4">Richard Stallman announced in September 1983 the plan to
develop a free software Unix-like operating system called GNU. GNU is the only
operating system developed specifically for the sake of users' freedom.</p>
@@ -305,7 +241,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2014/04/17 21:46:38 $
+$Date: 2014/04/27 17:35:55 $
<!-- timestamp end -->
</p>
</div>
Index: body-include-1.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/body-include-1.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- body-include-1.html 4 Apr 2014 13:53:36 -0000 1.12
+++ body-include-1.html 27 Apr 2014 17:35:55 -0000 1.13
@@ -5,13 +5,13 @@
<a href="#content">Skip to main text</a>
</div> <!-- /toplinks -->
-<div id="searcher">
- <form method="get" action="http://www.gnu.org/cgi-bin/estseek.cgi";>
+<div id="searcher" class="imgright">
+ <form method="get" action="//www.gnu.org/cgi-bin/estseek.cgi">
<div>
- <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 -->
+ <input name="phrase" id="phrase" type="text" size="20" accesskey="s"
+ value="Why GNU/Linux?" onfocus="this.value=''" /><input
+ type="submit" value="Search" />
+ </div>
</form>
</div><!-- /searcher -->
Index: body-include-2.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/body-include-2.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- body-include-2.html 15 Apr 2014 20:15:24 -0000 1.16
+++ body-include-2.html 27 Apr 2014 17:35:55 -0000 1.17
@@ -1,10 +1,8 @@
<!-- start of server/body-include-2.html -->
<div id="header">
-
<div id="fsf-frame">
-<p id="join-fsf"><a
href="https://www.fsf.org/associate/support_freedom?referrer=4052";>JOIN THE FSF</a></p><hr
/>
-
+<p id="join-fsf"><a
href="https://www.fsf.org/associate/support_freedom?referrer=4052";>JOIN THE FSF</a></p>
<div id="fssbox">
<p><a href="http://www.fsf.org/fss";>GNU/FSF Newsletter</a></p>
<form
action="https://crm.fsf.org/civicrm/profile/create&reset=1&gid=31";
method="post">
@@ -15,9 +13,8 @@
<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" />
+ <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 -->
Index: layout7.css
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/layout7.css,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- layout7.css 25 Apr 2014 08:06:45 -0000 1.39
+++ layout7.css 27 Apr 2014 17:35:55 -0000 1.40
@@ -42,14 +42,14 @@
Backgrounds
white #inner, navbar li.active
#f0f2f4 light bluish gray: #translations p, .emph-box, #outdated,
- .listing, #footer, .toc
+ .listing, #footer, .toc, #fsf-frame
#e7e9eb .button, .lyrics
#d1d4d7 #edu-navbar, #fsf-links, #searcher + #translations
#ddd gray (looks purplish): #gpl-compat-matrix
#ccffcc light green: #gpl-compat-matrix
#e4ffcc light yellowish green: #gpl-compat-matrix
#ffc very pale yellow: .highlight-para
- #fff898 pale yellow: table headers, #fsf-frame, .highlight, nav-bar hover
+ #fff898 pale yellow: table headers, #join-fsf, .highlight, nav-bar hover
#ff3 yellow: #urgent
#a50606 intermediate red from #fs-gang gradient: #navigation
[#fs-gang gradient: #820202-#f71111]
@@ -63,7 +63,6 @@
#c9cccf bluish gray: .button, .toc
#d1d4d7 bluish gray: #translations, #outdated
#3465a4 blue (slightly lighter than GNU banner): edu-cases ridges, .note
- #334683 #join-fsf
#171d33 dark blue (from screenshot): shade behind .button.large
#6989b6 light blue: border for h3 (license-list.html)
#cdc66e greenish yellow: submit buttons and focused text input
@@ -205,20 +204,23 @@
font-size: .9em;
font-family: "FreeSans", sans-serif;
font-weight: bold;
- padding: .5em 1.5em 0 1.5em;
+ padding: .5em 1.4em;
margin: 0;
- background-color: #d1d4d7;
}
#toplinks a, #toplinks a:visited {
color: #404040; text-decoration: none;
}
#toplinks a:hover { color: #777; }
+/* #searcher has class="imgright" in body-include-1.html,
+but some old pages don't use this include. This is why
+background-color and text-align have to be specified. */
#searcher {
display: block;
text-align: right;
font-weight: bold;
padding: .2em 1.5%;
+ margin: 0;
background-color: #d1d4d7;
}
#searcher input {
@@ -248,23 +250,21 @@
}
#translations {
- clear: both;
text-align: left;
font-size: .8em;
+ min-height: 1.7em;
font-family: "FreeSans", sans-serif;
- line-height: 1.3em;
- padding-bottom: .5em;
+ padding: .45em 1.5%;
background-color: #d1d4d7;
}
-
#translations p {
+ display: inline-block;
padding: .1em .5em .2em .5em;
- margin: 0 1.5%;
+ margin: 0;
background-color: #f0f2f4;
border-left: .2em solid #d1d4d7;
border-right: .2em solid #d1d4d7;
}
-
#translations span {
white-space: nowrap;
margin-right: .5em;
@@ -315,6 +315,7 @@
/*** HEADER ***/
#header {
+ clear: both;
font-family: "FreeSans", sans-serif;
margin: 0 1.5%;
background-color: white;
@@ -330,18 +331,11 @@
line-height: 1.3em;
width: auto;
margin: 1em 0;
- padding: .7em .5em .5em .5em;
- background: #fff898;
+ padding: .5em;
+ background: #f0f2f4;
border: .2em solid #c9cccf;
}
-#fsf-frame #join-fsf { padding: 0; }
-#fsf-frame hr {
- border: 1px #b9bcbf;
- width: .5em; height: .5em;
- margin: .4em auto;
- background-color: #b9bcbf;
-}
-#fsf-frame p { color: #222; margin: 0; padding: .3em; }
+#fsf-frame p { color: #222; margin-bottom: .7em; }
#fsf-frame a, #fsf-frame a:visited {
font-size: 1.1em;
font-weight: bold;
@@ -349,10 +343,15 @@
color: #334683;
}
#fsf-frame a:hover { color: #777; }
+#fsf-frame #join-fsf { padding: 0; }
+#fsf-frame #join-fsf a {
+ padding: .2em .5em;
+ background: #fff898;
+}
#fssbox { padding: 0; }
#fssbox p, input { margin: 0; }
-#fssbox p { padding: .2em 0 0 0; }
+#fssbox p { padding: 0; }
#fssbox input {
font-family: "FreeSans", sans-serif;
font-weight: bold;
@@ -820,6 +819,7 @@
color: #222; text-decoration: none;
}
#edu-navigation li.active a {
+ padding: .2em .45em;
background-color: white;
}
#edu-navigation li a:hover,
@@ -850,7 +850,7 @@
border-top: 5px ridge #3465a4;
border-bottom: 5px ridge #3465a4;
padding: 1.5em 0;
- margin: 2em 3em;
+ margin: 2em 4%;
}
/* make h3 for edu-cases look like h4 for other pages */
@@ -859,7 +859,7 @@
margin: 0; margin-bottom: 1em;
}
div.edu-cases ul, div.edu-cases ol {
- padding: 0 3em;
+ padding: 0 4%;
}
/* For images in the Education section (and elsewhere?) */
- www/server/staging/nav-bar/test9 edu-cases-indi..., Therese Godefroy, 2014/04/07
- www/server/staging/nav-bar/test9 edu-cases-indi..., Therese Godefroy, 2014/04/07
- www/server/staging/nav-bar/test9 edu-cases-indi..., Therese Godefroy, 2014/04/07
- www/server/staging/nav-bar/test9 edu-cases-indi..., Therese Godefroy, 2014/04/21
- www/server/staging/nav-bar/test9 edu-cases-indi..., Therese Godefroy, 2014/04/21
- www/server/staging/nav-bar/test9 edu-cases-indi..., Therese Godefroy, 2014/04/21
- www/server/staging/nav-bar/test9 edu-cases-indi..., Therese Godefroy, 2014/04/21
- www/server/staging/nav-bar/test9 edu-cases-indi..., Therese Godefroy, 2014/04/22
- www/server/staging/nav-bar/test9 edu-cases-indi..., Therese Godefroy, 2014/04/25
- www/server/staging/nav-bar/test9 edu-cases-indi..., Therese Godefroy, 2014/04/25
- www/server/staging/nav-bar/test9 edu-cases-indi...,
Therese Godefroy <=
- www/server/staging/nav-bar/test9 edu-cases-indi..., Therese Godefroy, 2014/04/27