[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/server/staging/nav-bar/test9 layout7.css bo...
|
From: |
Therese Godefroy |
|
Subject: |
www/server/staging/nav-bar/test9 layout7.css bo... |
|
Date: |
Tue, 22 Sep 2015 10:49:36 +0000 |
CVSROOT: /webcvs/www
Module name: www
Changes by: Therese Godefroy <th_g> 15/09/22 10:49:36
Modified files:
server/staging/nav-bar/test9: layout7.css body-include-1.html
body-include-2.html education.html
edu-cases-india-ambedkar.html
edu-cases-india-irimpanam.html
edu-software-gcompris.html
edu-software-gimp.html
edu-software-tuxpaint.html
Log message:
Various adjustments to the nav-bars, addition of a home button, no tags
anymore, etc.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/layout7.css?cvsroot=www&r1=1.92&r2=1.93
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/body-include-1.html?cvsroot=www&r1=1.16&r2=1.17
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/body-include-2.html?cvsroot=www&r1=1.29&r2=1.30
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/education.html?cvsroot=www&r1=1.25&r2=1.26
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/edu-cases-india-ambedkar.html?cvsroot=www&r1=1.15&r2=1.16
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/edu-cases-india-irimpanam.html?cvsroot=www&r1=1.15&r2=1.16
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/edu-software-gcompris.html?cvsroot=www&r1=1.12&r2=1.13
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/edu-software-gimp.html?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/edu-software-tuxpaint.html?cvsroot=www&r1=1.12&r2=1.13
Patches:
Index: layout7.css
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/layout7.css,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -b -r1.92 -r1.93
--- layout7.css 20 Sep 2015 08:36:29 -0000 1.92
+++ layout7.css 22 Sep 2015 10:49:34 -0000 1.93
@@ -50,9 +50,9 @@
#971611 red from GNU banner: .button link, #join-fsf
Backgrounds
- white #inner, navbar li.active
+ white body, #header, (edu-)navigation .active
#f0f2f4 light bluish gray: #translations p, .emph-box, #outdated,
- .listing, #footer, .toc
+ .listing, #footer, .toc, .summary
#e7e9eb html, .button, .lyrics, #join-fsf, submit
#d1d4d7 #edu-navbar, #fsf-links, #searcher + #translations
#ddd gray (looks purplish): #gpl-compat-matrix
@@ -61,8 +61,8 @@
#ffc very pale yellow: .highlight-para
#fff898 pale yellow: table headers, .highlight, nav-bar hover
#ff3 yellow: #urgent
- #a50606 intermediate red from #fs-gang gradient: #navigation
- [#fs-gang gradient: #820202-#f71111]
+ #973e3a like the GNU-banner, just a bit more subdued: #navigation
+ #820202-#f71111: #fs-gang gradient
#5b6a96-#c9cccf: #body gradient
#5b6a96 fallback from gradient (intermediate between banner blue and
#c9cccf)
@@ -131,7 +131,7 @@
*/
-/*** GENERAL SETTINGS ***/
+/*** SCREEN LAYOUT ***/
html, body {
font-size: 1em;
@@ -158,9 +158,37 @@
-o-box-shadow: 0 0 10px 10px #b9bcbf;
box-shadow: 0 0 10px 10px #b9bcbf;
}
-.inner { margin: 0 3%; }
+/*** MAIN DIVS ***/
+
+/* Width (class inner throughout the page) */
+.inner { padding: 0 3%; }
+
+#searcher, #translations, #header, #footer,
+ #navigation, ul#edu-navigation, #fsf-links {
+ margin-left: -3.2%; margin-right: -3.2%;
+}
+#searcher, #translations, #header, #footer {
+ padding-left: 3.2%; padding-right: 3.2%;
+}
+#navigation, ul#edu-navigation, #fsf-links {
+ padding-left: .3em; padding-right: .3em;
+}
+
+/* Background */
+#searcher, #edu-navigation, #fsf-links { background-color: #c9cccf; }
+#translations, #footer { background-color: #f0f2f4; }
+#header { background-color: white; }
+#navigation { background-color: #963e3a; }
+
+/* Font */
+#searcher, #toplinks, #translations, #header, #navigation, #edu-navigation,
+ #fsf-links { font-family: "FreeSans", sans-serif; }
+
+
+/*** GENERAL SETTINGS ***/
+
a[href] { color: #005090; }
a[href]:visited { color: #100070; }
a[href]:active, a[href]:hover { color: #777; }
@@ -184,6 +212,10 @@
from subsequent <p> */
dd p { margin-top: 1em; }
+pre { overflow: auto; }
+
+
+/*** CLASSES ***/
.center, .c { text-align: center; }
#content .nocenter{ text-align: left; }
@@ -200,14 +232,19 @@
.netscape4, .no-display { display: none !important; }
-.rounded-corners {
+
+/*** SPECIAL FEATURES ***/
+
+#searcher input[type="text"], #searcher input[type="submit"],
+ #fssbox input[type="text"] {
border-radius: .4em;
-moz-border-radius: .4em;
-khtml-border-radius: .4em;
-webkit-border-radius: .4em;
-opera-border-radius: .4em;
}
-.button-shadow {
+#join-fsf a, #join-fsf a:visited, .button a, .button a:visited,
+ #fssbox input[type="submit"] {
box-shadow: 0 .15em #171d33;
-moz-box-shadow: 0 .15em #171d33;
-webkit-box-shadow: 0 .15em #171d33;
@@ -225,7 +262,6 @@
#toplinks {
float: left;
- font-family: "FreeSans", sans-serif;
font-weight: bold;
padding: .54em 0 .36em 0;
margin: 0;
@@ -240,13 +276,15 @@
}
#toplinks a:hover { color: #777; }
+#home-icon { float: left; }
+#home-icon p { margin: 0; }
+#home-icon img { height: 1.8em; margin-top: .1em; }
+
#searcher {
display: block;
text-align: right;
font-weight: bold;
- padding: .3em 3.2%;
- margin: 0 -3.2%;
- background-color: #d1d4d7;
+ padding-top: .3em; padding-bottom: .3em;
}
#searcher input {
font-family: "FreeSans", sans-serif;
@@ -281,18 +319,13 @@
#translations {
clear: both;
text-align: left;
- font-family: "FreeSans", sans-serif;
line-height: 1.3em;
- margin: 0 -3.2%;
- padding: 0 3.2%;
- background-color: #f0f2f4;
border-bottom: .3em solid #d1d4d7;
}
#translations p {
font-size: .8em;
padding: .2em 0;
margin: 0;
- background-color: #f0f2f4;
}
#translations span {
white-space: nowrap;
@@ -312,16 +345,12 @@
}
#translations a:hover,
#translations span.original a:hover {
- color: #666;
+ color: #777;
}
/*** HEADER ***/
-#header {
- font-family: "FreeSans", sans-serif;
- background-color: white;
-}
#header:after {
clear: both; content: ""; display: block;
height: 0px; visibility: hidden; width: 0px;
@@ -341,20 +370,16 @@
font-weight: bold;
text-decoration: none;
}
-#fsf-frame a:hover { color: #666; }
#fsf-frame p { padding: 0; margin: 0; }
#fsf-frame hr { display: none; }
-#join-fsf {
- padding: .4em 0;
-}
+#join-fsf { padding: .4em 0; }
#join-fsf a, #join-fsf a:visited {
padding: .3em 1em;
color: #971611;
background: #e7e9eb;
border: .1em solid #999;
}
-
#fssbox {
padding: 0;
margin-top: 1.3em;
@@ -391,6 +416,7 @@
#fssbox input[type="text"]:focus + input[type="submit"] {
border: .1em solid #334683;
}
+#fsf-frame a:hover { color: #777; }
/* Try to optimize #fsf-frame for narrow screens. */
@media (max-width: 55em) {
@@ -460,44 +486,45 @@
}
-/*** NAVIGATION BAR ***/
+/*** NAVIGATION BARS ***/
-#navigation {
+#navigation, #fsf-links {
clear: both;
- font-family: "FreeSans", sans-serif;
- margin: 0 -3.2%;
- padding: .3em;
- background-color: #a50606;
}
+#navigation ul, #fsf-links ul { margin: 0; }
+ul#edu-navigation { margin-top: 0; margin-bottom: 0; }
-#navigation:after {
- clear: both; content: ""; display: block;
- height: 0px; visibility: hidden; width: 0px;
-}
-#navigation ul {
+#navigation ul, #fsf-links ul, ul#edu-navigation {
text-align: center;
- font-size: 0.9em;
- line-height: 1.8em;
- padding: 0;
- margin: 0;
- background-color: #a50606;
+ padding: 0 .3em;
}
-#navigation li {
- display: inline; white-space: nowrap;
- padding: 0;
-}
-#navigation li a, #navigation li a:visited {
+ul#edu-navigation li { font-size: .9em; }
+#navigation li, ul#edu-navigation li, #fsf-links li {
+ display: inline-block;
font-weight: bold;
+ line-height: 1.7em;
+ padding-bottom: .1em;
+ margin: 0; margin-top: .3em;
+}
+
+#navigation li a, ul#edu-navigation li a, #fsf-links li a {
padding: .3em .5em;
- color: white; text-decoration: none;
+ text-decoration: none;
}
-#navigation li.active a {
- color: #333;
+#navigation li a, #navigation li a:visited { color: white; }
+#edu-navigation li a, ul#edu-navigation li a:visited,
+ #fsf-links li a, #fsf-links li a:visited { color: #222; }
+#navigation li a:hover, ul#edu-navigation li a:hover,
+ #fsf-links li a:hover { text-decoration: underline; }
+
+#navigation li.active, #edu-navigation li.active {
background-color: white;
}
-#navigation li a:hover {
- text-decoration: underline;
+ul#edu-navigation li.active {
+ border-left: .1em solid #999; border-right: .1em solid #999;
+ border-top: .1em solid #999;
}
+#navigation li.active a, #edu-navigation li.active a { color: #333; }
/*** TAGS ***/
@@ -507,7 +534,6 @@
line-height: 1.7em; padding: 0;
margin-top: .7em;
}
-
div.page-tags a, div.page-tags a:visited {
padding: 0 .4em;
line-height: 1.5em;
@@ -515,7 +541,7 @@
background: #f0f2f4;
margin-bottom: 1em;
}
-div.page-tags a:hover { color: #666; }
+div.page-tags a:hover { color: #777; }
/*** CONTENT ***/
@@ -537,17 +563,15 @@
}
#content h3 { font-size: 1.6em; color: #333; margin: 1.2em 0 .7em 0; }
#content h4 { font-size: 1.3em; color: #333; margin-bottom: .6em; }
-#content h5 { font-size: 1.1em; margin-bottom: .9em; }
+#content h5 { font-size: 1.1em; margin-bottom: .7em; }
#content h6 { font-size: 1em; }
-#content ul li, #fsf-campaigns ul li {
- list-style: square; line-height: 1.4em;
-}
+#content ul li, #fsf-campaigns ul li { list-style: square; }
#content ol {
- list-style: decimal; margin-left: 1.9em; margin-right: 1.9em;
+ list-style: decimal; margin-left: 1em; margin-right: 1em;
}
-#content li, #fsf-campaigns li, #content dd, #content p, #content pre,
- #content dt, #content code, #content address { line-height: 1.3em; }
-#content li { margin-top: .1em; }
+#content li, #fsf-campaigns li { line-height: 1.4em; margin-top: .2em; }
+#content dd, #content p, #content pre, #content dt,
+ #content code, #content address { line-height: 1.3em; }
#content h3 a[href]:visited, #content h4 a[href]:visited { color: #334683; }
#content h3 a[href]:hover, #content h4 a[href]:hover { color: #777; }
@@ -562,46 +586,16 @@
padding: .4em 2%;
}
#content p.back a, .back a:visited { color: #333; }
-#content p.back a:hover { color: #666; }
-
-
-/*** ADDITIONAL LINKS ***/
-
-#fsf-links {
- clear: both;
- font-family: "FreeSans", sans-serif;
- margin: 0 -3.2%;
- padding: .3em ;
- background-color: #d1d4d7;
- margin-top: 2.5em;
-}
-#fsf-links ul {
- text-align: center;
- font-size: .9em;
- line-height: 1.8em;
- margin: 0;
- background-color: #d1d4d7;
-}
-#fsf-links li {
- display: inline; white-space: nowrap;
- list-style: none;
- padding: 0;
-}
-#fsf-links li a, #fsf-links li a:visited {
- font-weight: bold;
- padding: .3em .5em;
- color: #222; text-decoration: none;
-}
-#fsf-links li a:hover {
- text-decoration: underline;
-}
+#content p.back a:hover { color: #777; }
/*** FSF STUFF ***/
+#fsf-links { margin-top: 2.5em }
+#mission-statement { margin: 2em 0 1em 0; }
+
#mission-statement {
font-size: 0.9em;
- margin: 2em 0 1em 0;
}
#mission-statement blockquote {
font-weight: bold;
@@ -622,7 +616,7 @@
margin: 2.5em 2% 1.5em 2%;
}
#backtotop a, #backtotop a:visited { color: #333; }
-#backtotop a:hover { color: #666; }
+#backtotop a:hover { color: #777; }
#sisters { font-size: .9em; margin: 0 0 1.5em 0; }
@@ -631,10 +625,9 @@
#footer {
clear: both;
- margin: 1em -3.2%;
- padding: 1em 3.2%;
color: #333;
- background-color: #f0f2f4;
+ padding-top: 1em; padding-bottom: 1em;
+ margin-bottom: 1em;
border-top: 1px solid #c9cccf;
}
#footer p { font-size: .9em; margin-bottom: 0; }
@@ -686,7 +679,7 @@
text-decoration: none;
}
.button a:hover {
- color: #666;
+ color: #777;
}
.large a {
display: inline-block;
@@ -702,17 +695,7 @@
background-color: #e7e9eb;
}
-.emph-box {
- padding: 1em; padding-top: 0;
- margin-bottom: 2.5em;
- background-color: #f0f2f4;
- border: 1px solid #c9cccf;
-}
-.emph-box p { font-size: .9em }
-#content .emph-box h4 {
- text-align: center;
- font-size: 1.5em;
-}
+#home .emph-box p { font-size: .9em; }
#Action {
text-align: left;
@@ -737,7 +720,8 @@
float: none; width: 100%; }
}
-/*** HIGHLIGHTED STUFF ***/
+
+/*** HIGHLIGHTED STUFF AND INSETS ***/
.highlight, .highlight-para {
clear: both;
@@ -755,6 +739,16 @@
border: 2px solid #b9bcbf;
}
+.emph-box {
+ padding: 0 1em; margin-bottom: 2.5em;
+ background-color: #f0f2f4;
+ border: 1px solid #c9cccf;
+}
+#content .emph-box h4 {
+ text-align: center;
+ font-size: 1.5em;
+}
+
/*** NOTES AND ANNOUNCEMENTS ***/
@@ -792,7 +786,7 @@
float: right;
text-align: center;
font-style: normal;
- width: 20em; max-width: 90%;
+ max-width: 20em;
padding: 0;
margin: .3em 0 1em 1.5em;
border: .3em solid #3465a4;
@@ -800,12 +794,12 @@
#content .note p {
font-size: 1.1em;
line-height: 1.4em;
- padding: 0 1em;
+ padding: 0 1em ;
margin: 1em 0;
}
#content .note strong { font-size: 1.2em; }
address@hidden (max-width: 46em) {
- #content .note { float: none; margin: .3em auto 1em auto; }
address@hidden (max-width: 45em) {
+ #content .note { float: none; margin: auto; }
}
/* For the note about Free Software Free Society */
@@ -823,6 +817,9 @@
#content div.summary a, #content div.toc a {
text-decoration: none;
}
+#content div.summary a:hover, #content div.toc a:hover {
+ color: black; text-decoration: underline;
+}
#content div.summary strong, #content div.toc strong {
display: block; padding-top: .5em;
}
@@ -839,10 +836,13 @@
clear: right;
float: right;
max-width: 20em;
- margin: .3em 0 1em 1.5em;
+ margin: .3em 0 1.5em 1.5em;
}
@media (max-width: 46em) {
- #content div.summary { float: none; margin: auto; max-width: 25em; }
+ #content div.summary {
+ float: none; max-width: 25em;
+ margin: auto; margin-top: 2.5em;
+ }
}
/* Big tables of contents */
@@ -863,7 +863,7 @@
}
#content .trans-disclaimer a,
#content .trans-disclaimer a:visited { color: #333; }
-#content .trans-disclaimer a:hover { color: #666; }
+#content .trans-disclaimer a:hover { color: #777; }
/* For outdated translations */
#outdated {
@@ -896,34 +896,6 @@
/* definitions for /education-specific navigation bar
and breadcrumbs for education */
-#edu-navigation {
- clear: both;
- font-family: "FreeSans", sans-serif;
- background-color: #d1d4d7;
-}
-ul#edu-navigation {
- text-align: center;
- font-size: .9em; font-weight: bold;
- line-height: 1.8em;
- padding: 0;
- margin: 0 -3.2%;
-}
-#edu-navigation li {
- display: inline; white-space: nowrap;
- list-style-type: none;
- padding: 0;
-}
-#edu-navigation li a, #edu-navigation li a:visited {
- padding: .3em .45em .35em .45em;
- color: #222; text-decoration: none;
-}
-#edu-navigation li.active a {
- background-color: white;
-}
-#edu-navigation li a:hover,
-#edu-navigation li.active a:hover {
- text-decoration: underline;
-}
#content .edu-breadcrumb {
font-family: "FreeSans", sans-serif;
font-weight: bold;
@@ -963,13 +935,13 @@
/* For images in the Education section (and elsewhere?) */
#content .photo {
float: right;
- width: 30em; max-width: 100%;
+ width: 27em; max-width: 100%;
margin: .3em 0 1em 1.5em;
}
-#content .photo img { width: 100% }
+#content .photo img { width: 100%; }
address@hidden (max-width: 55em) {
- #content .photo { float: none; margin: auto }
address@hidden (max-width: 50em) {
+ #content .photo { float: none; margin: auto; }
}
/* End items specific to education */
@@ -1068,7 +1040,7 @@
.anchor-reference-id { font-size: 80%; font-weight: normal; }
span.anchor-reference-id a { color: #333; }
-span.anchor-reference-id a[href]:hover { color: #666; }
+span.anchor-reference-id a[href]:hover { color: #777; }
/* For license-list.html. */
#content div.big-section {
Index: body-include-1.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/body-include-1.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- body-include-1.html 7 Sep 2015 22:11:15 -0000 1.16
+++ body-include-1.html 22 Sep 2015 10:49:34 -0000 1.17
@@ -2,8 +2,6 @@
<!--#set var="HTML_BODY" value="yes" -->
<!--#set var="language_selector"
value='<a href="/server/select-language.html?callback=$REQUEST_URI"
rel="nofollow">' -->
-<!--#set var="tag_selector"
- value='' -->
<!--#set var="closing_anchor" value='</a>' -->
<div id="toplinks">
<a href="#content">Skip to main text</a>
@@ -12,15 +10,18 @@
Set language
<span class="gnun-split"></span>
<!--#echo encoding="none" var="closing_anchor" -->
- <a href="#all-tags">All keywords</a>
</div> <!-- /toplinks -->
+<div id="home-icon">
+ <p><a href="/home.html"><img
+ src="/Actions-home-icon_red.png" alt=" Home "/></a></p>
+</div>
<div id="searcher">
<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=''"
class="rounded-corners" />
- <input type="submit" value="Search" class="rounded-corners" />
+ 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.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- body-include-2.html 12 Sep 2015 04:20:16 -0000 1.29
+++ body-include-2.html 22 Sep 2015 10:49:34 -0000 1.30
@@ -2,7 +2,7 @@
<div id="header">
<div id="fsf-frame">
-<p id="join-fsf"><a
href="https://www.fsf.org/associate/support_freedom?referrer=4052";
class="button-shadow">JOIN THE FSF</a></p>
+<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";>Free Software Supporter</a></p>
<form action="https://my.fsf.org/civicrm/profile/create?reset=1&gid=31";
method="post">
@@ -14,8 +14,8 @@
</div>
<p>
<input type="text" id="frmEmail" name="email-Primary" size="18"
maxlength="80"
- value="email address" onfocus="this.value=''" class="rounded-corners"
/>
- <input type="submit" name="_qf_Edit_next" value="Sign up"
class="button-shadow" />
+ value="email address" onfocus="this.value=''"/>
+ <input type="submit" name="_qf_Edit_next" value="Sign up" />
</p>
</form>
</div><!-- /fssbox -->
@@ -34,27 +34,27 @@
<ul>
<!--#set var="MARK_START" value=" <span class='no-display'>=</span> " -->
<!--#set var="MARK_END" value=" <span class='no-display'>=</span> " -->
-<!--#if expr="$REQUEST_URI = /gnu\//" -->
+<!--#if expr="$REQUEST_URI = /^\/gnu\//" -->
<li id="tabAboutGNU" class="active">
<!--#echo encoding="none" var="MARK_START" -->
- <a href="/gnu/about-gnu.html">About GNU</a>
+ <a href="/gnu/gnu.html">About GNU</a>
<span class="gnun-split"></span>
<!--#echo encoding="none" var="MARK_END" -->
</li>
<!--#else -->
- <li id="tabAboutGNU"><a href="/gnu/about-gnu.html">About GNU</a></li>
+ <li id="tabAboutGNU"><a href="/gnu/gnu.html">About GNU</a></li>
<!--#endif -->
-<!--#if expr="$REQUEST_URI = /\/philosophy/ || $REQUEST_URI =
/rms-nyu-2001-transcript/ || $REQUEST_URI = /essays-and-articles/" -->
+<!--#if expr="$REQUEST_URI = /^\/philosophy\//" -->
<li id="tabPhilosophy" class="active">
<!--#echo encoding="none" var="MARK_START" -->
- <a href="philosophy.html">Philosophy</a>
+ <a href="/philosophy/philosophy.html">Philosophy</a>
<span class="gnun-split"></span>
<!--#echo encoding="none" var="MARK_END" -->
</li>
<!--#else -->
- <li id="tabPhilosophy"><a href="philosophy.html">Philosophy</a></li>
+ <li id="tabPhilosophy"><a
href="/philosophy/philosophy.html">Philosophy</a></li>
<!--#endif -->
-<!--#if expr="$REQUEST_URI = /\/license/ || $REQUEST_URI = /^\/copyleft\//" -->
+<!--#if expr="$REQUEST_URI = /^\/licenses\// || $REQUEST_URI =
/^\/copyleft\//" -->
<li id="tabLicenses" class="active">
<!--#echo encoding="none" var="MARK_START" -->
<a href="/licenses/licenses.html">Licenses</a>
@@ -64,27 +64,27 @@
<!--#else -->
<li id="tabLicenses"><a href="/licenses/licenses.html">Licenses</a></li>
<!--#endif -->
-<!--#if expr="$REQUEST_URI = /\/edu/" -->
+<!--#if expr="$REQUEST_URI = /edu/" -->
<li id="tabEducation" class="active">
<!--#echo encoding="none" var="MARK_START" -->
- <a href="education.html">Education</a>
+ <a href="/education/education.html">Education</a>
<span class="gnun-split"></span>
<!--#echo encoding="none" var="MARK_END" -->
</li>
<!--#else -->
- <li id="tabEducation"><a href="education.html">Education</a></li>
+ <li id="tabEducation"><a href="/education/education.html">Education</a></li>
<!--#endif -->
-<!--#if expr="$REQUEST_URI = /\/software/ || $REQUEST_URI = /\/gethelp/" -->
+<!--#if expr="$REQUEST_URI = /^\/software\// || $REQUEST_URI =
/^\/help\/gethelp/" -->
<li id="tabSoftware" class="active">
<!--#echo encoding="none" var="MARK_START" -->
- <a href="software.html">Software</a>
+ <a href="/software/software.html">Software</a>
<span class="gnun-split"></span>
<!--#echo encoding="none" var="MARK_END" -->
</li>
<!--#else -->
- <li id="tabSoftware"><a href="software.html">Software</a></li>
+ <li id="tabSoftware"><a href="/software/software.html">Software</a></li>
<!--#endif -->
-<!--#if expr="$REQUEST_URI = /^\/doc\// || $REQUEST_URI = /^\/manual\// ||
$REQUEST_URI = /books/" -->
+<!--#if expr="$REQUEST_URI = /^\/doc\// || $REQUEST_URI = /^\/manual\//" -->
<li id="tabDoc" class="active">
<!--#echo encoding="none" var="MARK_START" -->
<a href="/doc/doc.html">Documentation</a>
@@ -107,6 +107,6 @@
</ul>
</div><!-- /navigation -->
-<!--#include virtual="/server/staging/nav-bar/test9/page-tags.html" -->
+<!-- include virtual="/server/page-tags.html" -->
<!-- end of server/body-include-2 -->
Index: education.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/education.html,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- education.html 15 Sep 2015 21:25:56 -0000 1.25
+++ education.html 22 Sep 2015 10:49:35 -0000 1.26
@@ -1,23 +1,19 @@
<!--#include virtual="/server/html5-header.html" -->
-<!-- Parent-Version: 1.76 -->
+<!-- Parent-Version: 1.77 -->
<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
-<title>Free Software and Education - GNU Project - Free Software
Foundation</title>
+<title>Free Software and Education
+- GNU Project - Free Software Foundation</title>
<!--#include virtual="/education/po/education.translist" -->
<style type="text/css" media="screen">
<!--
#content #video-container {
float: left; max-width: 40em;
- margin: 1em 0 2em 0;
-}
-#content #video-container p {
- text-align: justify;
- padding: 1em; margin: 0;
- background-color: #f0f2f4;
- border: 1px solid #c9cccf;
+ margin: 1em 0 0 0;
}
+#content #video-container p { text-align: justify; }
#rms-movie { width: 100%; margin-bottom: .3em; }
#content #indepth {
text-align: left;
@@ -37,7 +33,7 @@
<!--
@media (max-width: 68em) {
#content #video-container {
- float: none; max-width: 100%; width: 40em;
+ float: none; width: 40em; max-width: 100%;
margin: 2em auto; }
#content #indepth {
float: none; width: 39.5em; max-width: 98%;
@@ -51,19 +47,17 @@
<!-- begin edu navigation bar -->
<ul id="edu-navigation">
- <li><a href="/education/edu-contents.html">Contents</a></li>
+ <li><a href="/education/edu-contents.html">Education Contents</a></li>
<li><a href="/education/edu-cases.html">Case Studies</a></li>
- <li><a href="/education/edu-resources.html">Resources</a></li>
- <li><a href="/education/edu-projects.html">Projects</a></li>
+ <li><a href="/education/edu-resources.html">Educational Resources</a></li>
+ <li><a href="/education/edu-projects.html">Education Projects</a></li>
<li><a href="/education/edu-faq.html">FAQ</a></li>
- <li><a href="/education/edu-team.html">Our Team</a></li>
+ <li><a href="/education/edu-team.html">The Education Team</a></li>
</ul>
<!-- end edu navigation bar -->
</div> <!-- id="education-content" -->
-<!--#include virtual="/server/staging/nav-bar/test9/tag-base.html" -->
-<!--#include virtual="/server/staging/nav-bar/test9/page-tags.html" -->
<!--GNUN: OUT-OF-DATE NOTICE-->
<!--#if expr="$OUTDATED_SINCE" --><!--#else -->
<!--#if expr="$LANGUAGE_SUFFIX" -->
@@ -76,7 +70,7 @@
<h2>Free Software and Education</h2>
</div>
-<blockquote id="free-games" class="note"><p>
+<blockquote class="note"><p>
We are looking for free educational games, or information about free games
that can be used for educational purposes. Contact
<a href="mailto:address@hidden";><address@hidden></a>.
@@ -110,7 +104,7 @@
<h3>The Basics</h3>
<p>The GNU Project was
-<a href=" /gnu/initial-announcement.html">launched</a> in 1983 by
+<a href="/gnu/initial-announcement.html">launched</a> in 1983 by
Richard Stallman to develop a Free Libre operating system: the GNU
operating system. As a result, today it is possible for anyone to use a
computer in freedom.</p>
@@ -128,7 +122,7 @@
type='video/ogg; codecs="theora, vorbis"' />
</video>
-<p>
+<div class="emph-box"><p>
<!-- TRANSLATORS: Please replace the link to the video with subtitles in
English with a link to the video with subtitles in your language,
if it exists. -->
@@ -156,8 +150,8 @@
<a href="/education/misc/rms-education-es-sub.es.srt">Spanish</a>, and
<a href="/education/misc/edu-misc.html#subtitles-rms-education">other
languages</a>.
-</p>
-</div>
+</p></div> <!-- /.emph-box -->
+</div> <!-- /#video-container -->
<blockquote class="note" id="indepth">
<h3>In Depth</h3>
@@ -177,7 +171,7 @@
</div> <!-- for id="content", starts in the include above -->
-<!--#include virtual="/server/staging/nav-bar/test9/footer-text.html" -->
+<!--#include virtual="/server//staging/nav-bar/test9/footer-text.html" -->
<div id="footer">
<div class="unprintable">
@@ -206,17 +200,17 @@
of this article.</p>
</div>
-<p>Copyright © 2011, 2012, 2014, 2015 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/4.0/";>Creative
-Commons Attribution-NoDerivatives 4.0 International License</a>.</p>
+href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative
+Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
<!--#include virtual="/server/bottom-notes.html" -->
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2015/09/15 21:25:56 $
+$Date: 2015/09/22 10:49:35 $
<!-- timestamp end -->
</p>
</div>
Index: edu-cases-india-ambedkar.html
===================================================================
RCS file:
/webcvs/www/www/server/staging/nav-bar/test9/edu-cases-india-ambedkar.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- edu-cases-india-ambedkar.html 7 Sep 2015 22:25:25 -0000 1.15
+++ edu-cases-india-ambedkar.html 22 Sep 2015 10:49:35 -0000 1.16
@@ -72,7 +72,7 @@
<h3>How We Did It</h3>
-<div class="photo">
+<div class="photo" style="width:22em">
<a href="/education/misc/ambedkar.jpg">
<img src="/education/misc/ambedkar-sm.jpg" alt="Image of a student handing
@@ -134,7 +134,7 @@
</div><!-- for id="content", starts in the include above -->
-<!--#include virtual="/server/footer.html" -->
+<!--#include virtual="/server//staging/nav-bar/test9/footer-text.html" -->
<div id="footer">
<div class="unprintable">
@@ -163,17 +163,17 @@
of this article.</p>
</div>
-<p>Copyright © 2011, 2012, 2015 Free Software Foundation, Inc.</p>
+<p>Copyright © 2011, 2012 Free Software Foundation, Inc.</p>
<p>This page is licensed under a <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
-Commons Attribution-NoDerivatives 4.0 International License</a>.</p>
+href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative
+Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
<!--#include virtual="/server/bottom-notes.html" -->
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2015/09/07 22:25:25 $
+$Date: 2015/09/22 10:49:35 $
<!-- timestamp end -->
</p>
</div>
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.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- edu-cases-india-irimpanam.html 7 Sep 2015 22:25:25 -0000 1.15
+++ edu-cases-india-irimpanam.html 22 Sep 2015 10:49:35 -0000 1.16
@@ -223,7 +223,7 @@
</div><!-- for id="content", starts in the include above -->
-<!--#include virtual="/server/footer.html" -->
+<!--#include virtual="/server//staging/nav-bar/test9/footer-text.html" -->
<div id="footer">
<div class="unprintable">
@@ -262,7 +262,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2015/09/07 22:25:25 $
+$Date: 2015/09/22 10:49:35 $
<!-- 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.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- edu-software-gcompris.html 7 Sep 2015 22:11:17 -0000 1.12
+++ edu-software-gcompris.html 22 Sep 2015 10:49:35 -0000 1.13
@@ -6,6 +6,13 @@
- GNU Project - Free Software Foundation</title>
<!--#include virtual="/education/po/edu-software-gcompris.translist" -->
+<style type="text/css" media="screen,print">
+<!--
address@hidden (max-width: 55em) {
+ #content div.photo { margin-top: 1.6em; }
+}
+-->
+</style>
<!--#include virtual="/server/staging/nav-bar/test9/banner.html" -->
<div id="education-content">
@@ -28,8 +35,6 @@
<a href="/education/edu-software.html">Educational Free Software</a> →
GCompris</p>
-<!--#include virtual="/server/staging/nav-bar/test9/tag-base.html" -->
-<!--#include virtual="/server/staging/nav-bar/test9/page-tags.html" -->
<!--GNUN: OUT-OF-DATE NOTICE-->
<!--#if expr="$OUTDATED_SINCE" --><!--#else -->
<!--#if expr="$LANGUAGE_SUFFIX" -->
@@ -126,7 +131,7 @@
</div><!-- for id="content", starts in the include above -->
-<!--#include virtual="/server/staging/nav-bar/test9/footer-text.html" -->
+<!--#include virtual="/server//staging/nav-bar/test9/footer-text.html" -->
<div id="footer">
<div class="unprintable">
@@ -155,17 +160,17 @@
of this article.</p>
</div>
-<p>Copyright © 2011, 2012, 2014, 2015 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/4.0/";>Creative
-Commons Attribution-NoDerivatives 4.0 International License</a>.</p>
+href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative
+Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
<!--#include virtual="/server/bottom-notes.html" -->
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2015/09/07 22:11:17 $
+$Date: 2015/09/22 10:49:35 $
<!-- timestamp end -->
</p>
</div>
Index: edu-software-gimp.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/edu-software-gimp.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- edu-software-gimp.html 7 Sep 2015 22:25:25 -0000 1.7
+++ edu-software-gimp.html 22 Sep 2015 10:49:35 -0000 1.8
@@ -5,21 +5,16 @@
<title>GIMP - GNU Project - Free Software Foundation</title>
-<!--#include virtual="/education/po/education.translist" -->
+<!--#include virtual="/education/po/edu-software-gimp.translist" -->
-<style type="text/css">
+<style type="text/css" media="screen">
<!--
#mani-movie {
max-width: 40em;
margin: 2em auto;
}
#mani-movie video { width: 100%; margin-bottom: .3em; }
-#content #mani-movie p {
- padding: 1em; margin: 0;
- background-color: #f0f2f4;
- border: 1px solid #c9cccf;
- }
-
+#content #mani-movie p { margin: .5em 0; }
-->
</style>
<!--#include virtual="/server/staging/nav-bar/test9/banner.html" -->
@@ -126,20 +121,22 @@
type='video/ogg; codecs="theora, vorbis"' />
</video>
+<div class="emph-box">
<p>Watch and download the video as
<a href="http://audio-video.gnu.org/video/we_use_gnu-linux_high.ogv";>
-Ogg Theora</a> at a higher resolution.<br />
+Ogg Theora</a> at a higher resolution.</p>
-<em>Note to the hearing impaired:</em> the only audio in this video is the
-soundtrack, which is a piano version of the Free Software Song.<br />
+<p><em>Note to the hearing-impaired:</em> the only audio in this video is the
+soundtrack, which is a piano version of the Free Software Song.</p>
<!-- TRANSLATORS: please translate the written description of the video
and replace the link to the English version with the link to your
translation -->
-<em>Note to the visually impaired:</em> A
+<p><em>Note to the visually impaired:</em> A
<a href="/education/misc/we_use_gnu-linux_description.en.txt"> written
description of the video</a> is available.</p>
-</div> <!-- /mani-movie -->
+</div> <!-- /.emph-box -->
+</div> <!-- /#mani-movie -->
<p>At the time of writing (March 2012) Mani is a student of Computer
Science in Bangalore. He says:</p>
@@ -266,7 +263,7 @@
</div><!-- for id="content", starts in the include above -->
-<!--#include virtual="/server/footer.html" -->
+<!--#include virtual="/server//staging/nav-bar/test9/footer-text.html" -->
<div id="footer">
<div class="unprintable">
@@ -295,17 +292,17 @@
of this article.</p>
</div>
-<p>Copyright © 2012, 2015 Free Software Foundation, Inc.</p>
+<p>Copyright © 2012 Free Software Foundation, Inc.</p>
<p>This page is licensed under a <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
-Commons Attribution-NoDerivatives 4.0 International License</a>.</p>
+href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative
+Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
<!--#include virtual="/server/bottom-notes.html" -->
-<p></p><p class="unprintable">Updated:
+<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2015/09/07 22:25:25 $
+$Date: 2015/09/22 10:49:35 $
<!-- timestamp end -->
</p>
</div>
Index: edu-software-tuxpaint.html
===================================================================
RCS file:
/webcvs/www/www/server/staging/nav-bar/test9/edu-software-tuxpaint.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- edu-software-tuxpaint.html 7 Sep 2015 22:25:25 -0000 1.12
+++ edu-software-tuxpaint.html 22 Sep 2015 10:49:35 -0000 1.13
@@ -9,15 +9,15 @@
<style type="text/css" media="screen,print">
<!--
-#content .stamp { float: right; width: 13em; margin: 0 1em; }
+#content .stamp { float: right; width: 12em; margin: 0 1em; }
#content .stamp img, #content .stamp p {
width: 100%; padding: 0; margin: 0;
}
#content .stamp p { margin-bottom: 2em; }
address@hidden (max-width: 55em) {
- #content #flowers { width: 15em; float: right; }
address@hidden (max-width: 50em) {
+ #content #flowers { width: 14em; float: right; }
}
address@hidden (max-width: 35em) {
address@hidden (max-width: 37em) {
#content #flowers { width: 100%; }
#content .stamp { float: none; margin: auto; }
}
@@ -63,7 +63,7 @@
<!-- GNUN: localize URL /education/misc/tuxpaint-start-sm.png,
/education/misc/tuxpaint-start.png -->
<a href="/education/misc/tuxpaint-start.png">
-<img class="recessed" src="/education/misc/tuxpaint-start-sm.png"
+<img src="/education/misc/tuxpaint-start-sm.png"
alt="Screenshot of the Tux Paint interface."/></a>
</div>
@@ -153,7 +153,7 @@
<p class="c"><a href="/education/misc/anthoorium.ogg">Listen</a> to a student
pronounce the name of the Anthoorium flower in Malayalam.</p>
</div> <!-- /stamp -->
-</div> <!-- /flowers -->
+</div> <!-- /#flowers -->
<p>A good example of how software freedom can be applied in Tux Paint is
the work done by 11 and 12 years old students from the
@@ -218,7 +218,7 @@
</div><!-- for id="content", starts in the include above -->
-<!--#include virtual="/server/footer.html" -->
+<!--#include virtual="/server//staging/nav-bar/test9/footer-text.html" -->
<div id="footer">
<div class="unprintable">
@@ -247,17 +247,17 @@
of this article.</p>
</div>
-<p>Copyright © 2011, 2012, 2014, 2015 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/4.0/";>Creative
-Commons Attribution-NoDerivatives 4.0 International License</a>.</p>
+href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative
+Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
<!--#include virtual="/server/bottom-notes.html" -->
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2015/09/07 22:25:25 $
+$Date: 2015/09/22 10:49:35 $
<!-- timestamp end -->
</p>
</div>