[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/server/staging body-include-1.html educatio...
|
From: |
Therese Godefroy |
|
Subject: |
www/server/staging body-include-1.html educatio... |
|
Date: |
Sun, 8 Dec 2019 11:00:52 -0500 (EST) |
CVSROOT: /webcvs/www
Module name: www
Changes by: Therese Godefroy <th_g> 19/12/08 11:00:52
Modified files:
server/staging : body-include-1.html education.css
free-software-for-education.html
Log message:
Restyle the top links, searcher and translation list; change link hover
style per Lorenzo.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/body-include-1.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/education.css?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/free-software-for-education.html?cvsroot=www&r1=1.6&r2=1.7
Patches:
Index: body-include-1.html
===================================================================
RCS file: /webcvs/www/www/server/staging/body-include-1.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- body-include-1.html 27 Nov 2019 11:16:08 -0000 1.3
+++ body-include-1.html 8 Dec 2019 16:00:52 -0000 1.4
@@ -5,28 +5,32 @@
<!--#set var="cb" value="$1" -->
<!--#endif -->
<!--#set var="language_selector"
- value='<a href="/server/select-language.html?callback=$cb" rel="nofollow">'
-->
+ value='<a title="Set your preferred language for this session"
href="/server/select-language.html?callback=$cb" rel="nofollow">' -->
<!--#set var="closing_anchor" value='</a>' -->
<div id="toplinks">
- <a href="#content">Skip to main text</a>
- <span class="gnun-split"></span>
- <!--#echo encoding="none" var="language_selector" -->
- Set language
- <span class="gnun-split"></span>
- <!--#echo encoding="none" var="closing_anchor" -->
-</div> <!-- /toplinks -->
+ <span id="skip"><a title="Skip to main text"
+ href="#content"><span>Skip to main text </span>▼</a></span>
<div id="searcher">
- <form method="get" action="//www.gnu.org/cgi-bin/estseek.cgi">
+ <form method="get" action="//www.gnu.org/cgi-bin/estseek.cgi" class="header">
<div>
- <input name="phrase" id="phrase" type="text" size="18" accesskey="s"
+ <input title="Enter keywords"
+ name="phrase" id="phrase" type="text" size="18" accesskey="s"
value="Why GNU/Linux?" onfocus="this.value=''" />
- <input type="submit" value="Search" />
+ <input title="Search www.gnu.org"
+ type="submit" value="Search" />
</div>
</form>
</div><!-- /searcher -->
-<!--#if expr="$TRANSLATION_LIST" -->
+
+ <div id="set-language">
+ <span class="gnun-split"></span>
+ <!--#echo encoding="none" var="language_selector" -->
+ Set language<span class="gnun-split"></span><!--#echo encoding="none"
+ var="closing_anchor"--></div>
+
+<div id="page-languages" title="Available languages for this page">
<!--#echo encoding="none" var="TRANSLATION_LIST" -->
<!--#elif expr="$INITIAL_TRANSLATIONS_LIST = included" -->
<!-- if initial translation list isn't included before banner.html,
@@ -34,4 +38,9 @@
div#translations in its body, and we mustn't duplicate it here. -->
<!--#include virtual="/server/gnun/initial-translations-list.html" -->
<!--#endif -->
+</div>
+
+<div style="clear: both"></div>
+</div>
+
<!-- end of server/body-include-1.html -->
Index: education.css
===================================================================
RCS file: /webcvs/www/www/server/staging/education.css,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- education.css 4 Dec 2019 19:24:20 -0000 1.6
+++ education.css 8 Dec 2019 16:00:52 -0000 1.7
@@ -7,6 +7,7 @@
body {
border-top: .2em solid #a42e2b;
}
+
#content {
margin-bottom: 3em;
}
@@ -17,6 +18,7 @@
.small {
font-size: .9em;
}
+
.announcement, .important {
font-size: inherit;
padding: .1em 1em .7em;
@@ -43,14 +45,8 @@
.pict p {
font-size: .9em;
}
-
-#searcher, #header {
- background: white;
-}
-#translations {
- background: #f7f7f7;
- border-top: .1em solid #ddd;
- border-bottom: .2em solid #ddd;
+#header {
+ background: #edf7fe;
}
#content .edu-breadcrumb {
@@ -58,18 +54,109 @@
font-weight: normal;
padding-top: .6em;
}
-a[href]:link, a[href]:visited {
- color: #222;
- font-family: "sans-serif", sans-serif;
+
+a[href]:link {
+ font-family: sans-serif;
+ color: #004caa;
+}
+a[href]:visited {
+ color: #333;
+ text-decoration: underline #333 solid;
+}
+a[href]:hover, a[href]:visited:hover {
+ text-decoration: underline #006400 dotted;
}
-a[href]:link:hover, a[href]:visited:hover {
- color: #5f7000;
+a[href]:active {
text-decoration: none;
}
+
.edu-breadcrumb a {
text-decoration: underline;
}
+#toplinks {
+ float: none;
+ line-height: 1.2em;
+ font-family: sans-serif;
+ padding: .5em 3%;
+ background: #edf7fe;
+ margin: 0;
+}
+#skip, #set-language {
+ display: inline-block;
+ font-size: .9em;
+ padding: 0 1em .5em 0;
+}
+#skip a {
+ color: #555;
+ font-weight: normal;
+ text-transform: uppercase;
+ margin: 0;
+}
+#skip span {
+ display: none;
+}
+#set-language a {
+ font-size: .9em;
+ text-transform: uppercase;
+ font-weight: normal;
+ margin: 0;
+}
+
+#page-languages {
+ display: inline-block;
+ font-size: .9em;
+ line-height: 1.2em;
+}
+#translations {
+ display: inline-block;
+ font-size: inherit;
+ margin: 0 0 .5em;
+}
+#translations p {
+ display: inline;
+ margin: 0;
+}
+#translations span {
+ font-size: inherit;
+}
+#translations span a {
+ font-size: inherit;
+ font-weight: normal;
+ padding: 0;
+ margin: 0;
+}
+#translations span.original a {
+ font-weight: bold;
+}
+
+#searcher {
+ float: right;
+ font-size: .9em;
+ background: #edf7fe;
+ padding: 1px 0 .5em 1em;
+ margin: 0;
+}
+form.header input[type="text"] {
+ font-weight: normal;
+}
+form.header input[type="submit"] {
+ text-transform: uppercase;
+}
+
+#skip a, #set-language a, #translations {
+ padding: .25em .7em;
+ background: white;
+ border: .1em solid #ccc;
+ border-radius: .3em;
+ -moz-border-radius: .3em;
+ -khtml-border-radius: .3em;
+ -webkit-border-radius: .3em;
+ -opera-border-radius: .3em;
+}
+#translations {
+ padding-right: 0;
+}
/*** From graphics.css ***/
@@ -222,7 +309,7 @@
}
/* Links */
-.menu a, #navlinks a {
+.menu a[href], .menu a[href]:visited, #navlinks a[href], #navlinks
a[href]:visited {
text-decoration: none;
}
li.current {
Index: free-software-for-education.html
===================================================================
RCS file: /webcvs/www/www/server/staging/free-software-for-education.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- free-software-for-education.html 8 Feb 2016 10:32:55 -0000 1.6
+++ free-software-for-education.html 8 Dec 2019 16:00:52 -0000 1.7
@@ -1,41 +1,34 @@
<!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.79 -->
+<!-- Parent-Version: 1.86 -->
<title>Free Software for Education - GNU Project - Free Software
Foundation</title>
-<!--#include virtual="/server/gnun/initial-translations-list.html" -->
-
+<!--#include virtual="/software/po/free-software-for-education.translist" -->
+<link rel="stylesheet" type="text/css" href="education.css" media="screen" />
<style type="text/css" media="print,screen">
<!--
-table#TOC {
- width: 100%;
+table.programs {
+ display: block;
+ overflow: auto;
border-collapse: collapse;
- margin: 2.5em auto 0em auto;
-}
-#TOC td, #TOC th {
- border: 1px solid #6989b6;
+ margin: 2em auto;
}
-#TOC thead {
- background-color: #fff898;
- border: 2px solid #6989b6;
+table.programs td, table.programs th {
+ border: 1px solid #bbb;
}
-#TOC tbody {
- background-color: #f0f2f4;
- border-left: 2px solid #6989b6;
- border-right: 2px solid #6989b6;
+table.programs thead {
+ background-color: #fff1c0;
+ border: 2px solid #bbb;
}
-div#notes {
- border-top: 1px solid #6989b6;
- border-left: 2px solid #6989b6;
- border-right: 2px solid #6989b6;
- border-bottom: 2px solid #6989b6;
- margin-top: 0;
+table.programs tbody {
+ background-color: #f7f7f7;
+ border: 2px solid #bbb;
}
-->
</style>
<!--#include virtual="/server/fs-gang-definitions.html" -->
-<!--#include virtual="/server/banner.html" -->
+<!--#include virtual="/server/staging/banner.html" -->
<h2>Free Software for Education</h2>
@@ -58,8 +51,8 @@
<p>Everyone should use free software, because only free software gives
users the freedom to control their own computers. However, there are
-<a href="/education/edu-schools.html">other reasons</a> that apply
-specifically to education.</p>
+<a href="/education/edu-schools.html">specific ethical reasons</a> that
+apply to education.</p>
<p>In addition to the wrong of nonfree software, the use of third-party
network services in schools poses yet another problem: <a
@@ -68,11 +61,11 @@
<p>But even if the school never used those services, it could not be sure
that the machines are not sending data. In fact, the source code of
-proprietary programs is secret, so users don't know what the software is
-really doing.</p>
+proprietary programs (with a few exceptions) is secret, so users don't
+know what the software is really doing.</p>
-<table>
+<table class="programs">
<thead>
<tr>
<th>Category</th>
@@ -110,9 +103,11 @@
<td>Microsoft Office, Office 365</td>
</tr>
<tr>
- <td><a href="http://directory.fsf.org/wiki/Etherpad";>Etherpad</a></td>
- <td>Real-time collaborative editor that runs in your browser.</td>
- <td>Google Docs, Sheets, Slides</td>
+ <td><a href="http://directory.fsf.org/wiki/Etherpad";>Etherpad</a>,
+ <a href="https://ethercalc.net/";>EtherCalc</a></td>
+ <td>Real-time collaborative text editor and spreadsheet that run in
+ your browser.</td>
+ <td>Google Docs, Sheets</td>
<td>----</td>
</tr>
@@ -145,7 +140,7 @@
<tr>
<td>Email</td>
- <td><a href="https://kolab.org/";>Kolab</a></td>
+ <td><a href="https://docs.kolab.org/";>Kolab</a></td>
<td>Entirely self-hosted. Complete groupware solution which includes
email, calendar, address books, file synching and tasks. Clients
are based on Roundcube (web interface) by default but any other
@@ -158,7 +153,7 @@
<tr>
<td>Chat (audio,video, text)</td>
<td><a href="https://jitsi.org/";>Jitsi</a>,
- <a href="https://jitsi.org/Projects/JitsiMeet";>Jitsi Meet</a>
+ <a href="https://jitsi.org/jitsi-meet/";>Jitsi Meet</a>
(browser-based)</td>
<td>Entirely self-hosted
(<a href="http://directory.fsf.org/wiki/Prosody";>Prosody</a>
@@ -185,7 +180,7 @@
<p>Here's some additional free software useful for educational purposes:</p>
-<table>
+<table class="programs">
<thead>
<tr>
<th>Category</th>
@@ -241,13 +236,20 @@
</tr>
<tr>
+ <td rowspan="1">Physics</td>
+ <td><a href="http://directory.fsf.org/wiki/Fisicalab";>FisicaLab</a></td>
+ <td>Solve physics problems creatively. Focus in physics concepts
+ while the program takes care of the mathematical details.</td>
+ </tr>
+
+ <tr>
<td rowspan="3">Music</td>
<td><a href="http://directory.fsf.org/wiki/Solfege";>GNU Solfege</a></td>
<td>Ear and music training program.</td>
</tr>
<tr>
- <td><a
href="http://directory.fsf.org/wiki/Linux_Multimedia_studio";>LMMS</a></td>
+ <td><a href="http://directory.fsf.org/wiki/LMMS";>LMMS</a></td>
<td>Professional-grade (but easy to use) music creation software and
digital audio workstation.</td>
</tr>
@@ -332,20 +334,22 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © 2016 Free Software Foundation, Inc.</p>
+<p>Copyright © 2016, 2017, 2018 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>
+<p>Permission is granted to copy, distribute and/or modify this
+document under the terms of the GNU Free Documentation License,
+Version 1.2 or any later version published by the Free Software
+Foundation; with no Invariant Sections, no Front-Cover Texts,
+and no Back-Cover Texts.</p>
<!--#include virtual="/server/bottom-notes.html" -->
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2016/02/08 10:32:55 $
+$Date: 2019/12/08 16:00:52 $
<!-- timestamp end -->
</p>
</div>
-</div>
+</div><!-- for class="inner", starts in the banner include -->
</body>
</html>
- www/server/staging body-include-1.html educatio...,
Therese Godefroy <=