[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/server/staging education.css banner.html bo...
|
From: |
Therese Godefroy |
|
Subject: |
www/server/staging education.css banner.html bo... |
|
Date: |
Wed, 25 Dec 2019 13:09:10 -0500 (EST) |
CVSROOT: /webcvs/www
Module name: www
Changes by: Therese Godefroy <th_g> 19/12/25 13:09:10
Modified files:
server/staging : education.css banner.html body-include-1.html
body-include-2.html
server/staging/layout: banner.html body-include-2.html
server/staging/nav-bar/test9: edu-software-tuxpaint.html
server/staging/readability: free-sw.html
Log message:
New test of checkbox-css method for displaying elements:
translist up to 1400px, #outdated up to 640px, navbar up to 400px;
horizontal display for FSF stuff.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/education.css?cvsroot=www&r1=1.17&r2=1.18
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/banner.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/body-include-1.html?cvsroot=www&r1=1.14&r2=1.15
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/body-include-2.html?cvsroot=www&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/layout/banner.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/layout/body-include-2.html?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/edu-software-tuxpaint.html?cvsroot=www&r1=1.27&r2=1.28
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/readability/free-sw.html?cvsroot=www&r1=1.22&r2=1.23
Patches:
Index: education.css
===================================================================
RCS file: /webcvs/www/www/server/staging/education.css,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- education.css 20 Dec 2019 17:01:56 -0000 1.17
+++ education.css 25 Dec 2019 18:09:10 -0000 1.18
@@ -10,31 +10,23 @@
/* Style and asides */
body {
- border-top: 2px solid #a42e2b;
+ border-top: .15em solid #a42e2b;
}
#header {
- border-bottom: 1px solid #a42e2b;
-}
-#content {
- border-top: 1px solid #a42e2b;
+ border-bottom: .15em solid #a42e2b;
}
-#toplinks, form.header, #header {
- font-family: sans-serif;
-}
-
-#toplinks, #header, #searcher {
- background: #f9f9f9;
-}
#gnu-banner strong {
font-weight: normal;
}
-#languages, #translations, #translations p {
- background: white;
+#languages, #translations, #translations p, #set-language {
+ background: #f7f7f7;
}
-#switches {
- padding: .1em;
- background: white;
+form.header input, #join-fsf a, #fssbox a, #fssbox a:visited {
+ font-weight: normal;
+}
+span.lang-abbr {
+ color: #a42e2b;
}
.italic {
@@ -43,17 +35,14 @@
.small {
font-size: .9em;
}
-
-#searcher input[type="text"] {
- width: 17em; max-width: 70%;
-}
-form.header input[type="text"] {
- max-width: 15em;
- font-weight: normal;
+.article h2 {
+ font-size: 1.7em;
+ margin: .8em 0;
+ padding: .2em .3em;
+ border-left: .7em solid #eee;
}
-form.header input[type="submit"] {
- text-transform: uppercase;
- font-weight: normal;
+.article h2, h3 {
+ font-family: serif;
}
.announcement, .important {
font-size: inherit;
@@ -86,6 +75,11 @@
margin: 1.5em 3%;
}
}
+#outdated {
+ color: black;
+ padding: .5em;
+ border: .2em solid #fc7;
+}
/* Article layout */
@@ -93,260 +87,99 @@
max-width: 50rem;
margin: auto;
}
-.article h2 {
- font-size: 1.7em;
- margin-top: .6em;
- padding-left: .3em;
- border-left: .7em solid #eee;
-}
-.article h2, h3 {
- font-family: serif;
-}
-
-/**********************************************/
-/* Header layout for CSS3-unaware browsers. */
-/**********************************************/
-
-/* Reduce font size below 40em. */
-html {
- font-size: .9em;
-}
-#content {
- position: relative;
- margin-bottom: 3em;
-}
-#toplinks {
- padding: 0;
-}
-#skip {
- display: none;
-}
-#header {
- position: relative;
- padding: .2em 3% 0;
-}
-#gnu-banner {
- float: left;
- line-height: 1em;
- font-weight: normal;
- padding: 0;
- margin: 0 .7em .5em 3%;
-}
-#gnu-banner img {
- height: 1.7em;
- vertical-align: bottom;
- position: relative; top: .2em;
- margin: 0 .15em 0 0;
-}
-#fsf-frame {
- display: none;
-}
-p#join-fsf {
- margin-top: 1em;
-}
-#fssbox {
- margin: 0;
-}
-#fssbox p {
- display: inline-block;
- vertical-align: middle;
- text-align: left;
- margin: 0;
-}
-#fss-signup a {
- display: inline-block;
- background: #fff;
- padding: .4em .5em .3em;
- border: .1em solid #0a8080;
- margin-left: 1em;
-}
+/***********************/
+/* Links and buttons */
+/***********************/
-/* On-off switches to display navbar, searcher & languages. */
+/* Basic definitions */
-p#switches {
- float: right;
- white-space: nowrap;
- padding: .1em 0 .1em .3em;
- margin: 0 0 .3em 1em;
-}
-.switch {
- display: inline-block;
- vertical-align: middle;
- margin: 0 1em;
-}
-.switch img {
- display: inline-block;
- vertical-align: middle;
- height: 100%;
-}
-.switch span {
- display: inline-block;
- vertical-align: middle;
- position: relative;
- right: .2em;
+a[href]:link {
+ color: #004caa;
}
-#navbar-button {
- line-height: 1em;;
- height: 1.2em;
- padding: .3em 0;
+a[href]:visited {
+ color: #004caa;
+ text-decoration: underline #333 solid;
}
-#language-button {
- height: 2em;
- line-height: 1em;
+a[href]:link:hover, a[href]:visited:hover {
+ color: #006400;
+ text-decoration: underline #006400 dotted;
}
-#searcher-button {
- height: 1.8em;
- line-height: 1em;
+a[href]:active {
+ text-decoration: none;
}
-/* Searcher */
+/* Variants */
-#searcher, #searcher p {
- float: right;
- display: inline-block;
- padding: 0;
- margin: 0;
-}
-#searcher {
- margin-top: .3em;
+#set-language a[href]:link, #set-language a[href]:visited,
+ #translations span a[href], #translations span a[href]:visited {
+ color: #004caa;
}
-
-/* Languages */
-
-#languages {
- display: block;
- margin: auto;
- text-align: left;
- font-size: inherit;
- text-align: center;
- padding: 0 1em 1em 1em;
- border-top: 1px solid #a42e2b;
- margin: .3em -3.2% 0;
+#gnu-banner a[href]:link, #gnu-banner a[href]:visited,
+ #gnu-banner a[href]:link strong, #gnu-banner a[href]:visited strong,
+ .switch a[href]:link, .switch a[href]:visited {
+ color: #333;
}
-.language-container {
- display: inline-block;
- margin: auto;
+.menu a[href]:link, .menu a[href]:visited,
+ #navlinks a[href], #navlinks a[href]:visited,
+ #breadcrumb a[href]:link, #breadcrumb a[href]:visited {
+ text-decoration: none;
}
-#set-language a {
- display: block;
- border: none;
+#join-fsf a[href]:link, #join-fsf a[href]:visited,
+ #fss-link a[href]:link, #fss-link a[href]:visited {
+ color: #555;
+ border-color: #ccc;
}
-#languages > p {
- display: block;
- text-align: left;
- margin: 0 0 .5em;
+#join-fsf a[href]:link, #join-fsf a[href]:visited {
+ background: #e7f2e2;
}
-#translations {
- display: block;
- column-count: 2;
- padding: 0 0 0 1em;
- border: none;
+#fsf-support a[href]:link:hover, #fsf-support a[href]:visited:hover {
+ color: #006400;
+ text-decoration: underline #006400 dotted;
}
-#translations p {
- line-height: .9em;
- padding: 0;
- margin: 0 0 0 1.5em;
+#fss-link a[href]:link:hover, #fss-link a[href]:visited:hover {
+ color: #006400;
+ text-decoration: underline #006400 dotted;
}
-#translations span {
- display: block;
- font-size: inherit;
- padding: 0;
+#join-fsf a[href]:link:hover, #join-fsf a[href]:visited:hover,
+ .switch a[href]:link:hover, .switch a[href]:visited:hover,
+ .button a[href]:link:hover, .button a[href]:visited:hover {
+ color: #006400;
+ border-color: #006400;
}
-#translations span a {
- display: inline-block;
- font-size: inherit;
- font-weight: normal;
- padding: .3em;
- margin: 0;
+#join-fsf a[href]:link:hover, #join-fsf a[href]:visited:hover {
+ background: white;
}
-
-/* Main navbar */
-
-#navigation {
- clear: both;
- text-align: left;
- padding-left: 1em;
- margin: 0 -3.2%;
+.switch img:hover {
+ opacity: 0.5;
+ filter: alpha(opacity=50); /* For IE8 and earlier */
+ cursor: pointer;
}
-
-
-/******************************/
-/* Media queries for header */
-/******************************/
-
-@media (max-width: 30em) {
- #gnu-banner .hide {
- display: none;
- }
- #gnu-banner {
- margin: 0 .7em .5em 0;
- }
- .switch {
- margin: 0;
- }
- #translations {
- column-count: 1;
- }
+.menu a[href]:link:hover, .menu a[href]:visited:hover,
+ #navlinks a[href]:link:hover, #navlinks a[href]:visited:hover,
+ #breadcrumb a[href]:link:hover, #breadcrumb a[href]:visited:hover,
+ #set-language a[href]:link:hover, #set-language a[href]:visited:hover,
+ #translations p span a:hover, #translations p span a:visited:hover,
+ #translations p span.original a:hover, #translations p span.original
a:visited:hover {
+ color: #006400;
+ text-decoration: underline #006400 dotted;
}
-
-@media (min-width: 40em) {
- html {
- font-size: 1em;
- }
- #gnu-banner {
- margin-bottom: 0;
- }
- #gnu-banner img {
- top: .3em;
- }
- #fsf-support {
- display: block;
- margin: .4em 0 .5em;
- }
+#fssbox input[type="submit"] {
+ color: #555;
+ background: #e7f2e2;
+ border-color: #ccc;
}
-
-@media (min-width: 50em) {
- #translations {
- column-count: 3;
- }
+#fssbox form.header input[type="text"]:focus {
+ color: #333;
+ border: .1em solid #006400;
}
-
-@media (min-width: 60em) {
- #header {
- text-align: center;
- }
- #searcher {
- float: none;
- position: absolute;
- left: 0;
- }
- #gnu-fsf {
- display: table;
- width: 100%;
- padding: 0 3% 0 0
- }
- #gnu-banner, #fsf-frame {
- float: none;
- display: table-cell;
- vertical-align: middle;
- }
- #gnu-banner {
- margin: 0;
- }
- #fsf-frame {
- display: block;
- padding: .7em 0 .7em 3%;
- margin: 0;
- }
- p#switches {
- float: none;
- display: inline-block;
- text-align: center;
- margin: 0 0 .3em 0;
- }
+#fssbox form.header input[type="text"]:focus + input[type="submit"],
+ #fssbox form.header input[type="submit"]:hover {
+ color: #006400;
+ background: white;
+ border-color: #006400;
}
@@ -374,7 +207,7 @@
#breadcrumb {
line-height: 1.7em;
font-size: 1.0rem;
- padding: .6em 0;
+ padding: .6em 0 0;
margin: 0;
}
@@ -418,6 +251,7 @@
}
/* The style of #navigation will match this (no more underline). */
+
li.current {
font-style: italic;
background: #eee;
@@ -438,7 +272,7 @@
margin: auto;
}
}
-
+/*
@media (min-width: 60em) {
#navlinks {
display: inline-block;
@@ -454,14 +288,12 @@
padding: 0 1em 0 15.1rem;
}
}
-
+*/
/***********************/
/* From graphics.css */
/***********************/
-/* This could become #footer definitions. */
-
.infobox {
font-size: .9em;
line-height: 1.3em;
@@ -500,70 +332,309 @@
}
-/***********************/
-/* Links and buttons */
-/***********************/
+/**********************************************/
+/* Header layout for CSS3-unaware browsers. */
+/**********************************************/
-/* Basic definitions */
+body {
+ position: relative;
+}
+#content {
+ position: relative;
+ margin-bottom: 3em;
+}
+#toplinks {
+ width: 94%;
+ padding: 0 3%;
+}
+#skip {
+ display: none;
+}
-a[href]:link {
- font-family: sans-serif;
- color: #004caa;
+/* FSF stuff */
+
+#fssbox {
+ display: none;
+ float: none;
+ font-weight: normal;
+ margin: 0 1.5em .5em 0;
}
-a[href]:visited {
- color: #004caa;
- text-decoration: underline #333 solid;
+#fss-link {
+ display: inline-block;
+ vertical-align: middle;
+ font-weight: normal;
+ line-height: 1.1em;
+ padding: 0;
+ margin: 0;
}
-a[href]:hover, a[href]:visited:hover {
- color: #004caa;
- text-decoration: underline #006400 dotted;
+#fssbox form {
+ display: inline-block;
+ font-size: .9em;
+ vertical-align: middle;
+ padding: .7em 0;
}
-a[href]:active {
- text-decoration: none;
+#join-fsf {
+ float: right;
+ margin: .7em 0 .7em 1.5em;
+}
+#join-fsf a {
+ padding: .25em .4em;
+ margin: 0;
}
-/* Variants */
+/* GNU stuff */
-#set-language a[href]:link, #set-language a[href]:visited,
- #translations span a[href]:link, #translations span a[href]:visited {
- color: #004caa;
+#header {
+ font-family: "FreeSans", sans-serif;
+ font-weight: normal;
+ text-align: center;
+ padding: 0;
}
-#gnu-banner a[href]:link, #gnu-banner a[href]:visited,
- #gnu-banner a[href]:link strong, #gnu-banner a[href]:visited strong,
- .switch a[href]:link, .switch a[href]:visited {
- color: #333;
+p#gnu-banner {
+ display: inline-block;
+ text-align: center;
+ font-family: "FreeSans", sans-serif;
+ line-height: 1em;
+ font-weight: normal;
+ margin: .1em 3% .4em;
+ padding: 0;
+}
+
+/* Languages */
+
+#languages {
+ display: block;
+ text-align: left;
+ margin: auto;
+ font-size: 1em;
+ padding: .1em 3% 0;
+ border-top: .1em solid #999;
}
-#fss-link a[href]:link, #fss-link a[href]:visited,
- #fss-signup a[href]:link, #fss-signup a[href]:visited {
- color: #0a8080;
+p#set-language {
+ float: right;
+ font-weight: bold;
+ padding-left: 1em;
}
-.menu a[href]:link, .menu a[href]:visited,
- #navlinks a[href], #navlinks a[href]:visited,
- #breadcrumb a[href]:link, #breadcrumb a[href]:visited {
- text-decoration: none;
+#languages p {
+ display: inline-block;
+ margin: .4em 0;
}
-#fsf-support a[href]:hover, #fsf-support a[href]:visited:hover {
- color: #333;
- text-decoration: underline #006400 dotted;
+#translations {
+ display: inline-block;
+ padding: 0;
+ border: none;
}
-#fss-link a[href]:hover, #fss-link a[href]:visited:hover {
- text-decoration: underline #006400 dotted;
+#translations p {
+ display: inline-block;
+ padding: .3em 0;
+ margin: 0;
}
-#fss-signup a[href]:hover, #fss-signup a[href]:visited:hover,
- .switch a[href]:hover, .switch a[href]:visited:hover {
- color: #777;
- border-color: #777;
+#translations p > span, #translations p > span.original {
+ display: inline-block;
+ vertical-align: middle;
+ font-size: 1.1em;
+ line-height: 1.1em;
+ width: 8em;
+ white-space: nowrap;
+ padding: 0;
+ margin: .1em 0;
}
-.switch img:hover {
- opacity: 0.5;
- filter: alpha(opacity=70); /* For IE8 and earlier */
+#translations p span a {
+ white-space: normal;
+ font-size: 1em;
+ line-height: 1.1em;
+ font-weight: normal;
+ padding: 0;
+ margin: 0;
}
-.menu a[href]:hover, .menu a[href]:visited:hover,
- #navlinks a[href]:hover, #navlinks a[href]:visited:hover,
- #breadcrumb a[href]:hover, #breadcrumb a[href]:visited:hover,
- #set-language a[href]:hover, #set-language a[href]:visited:hover,
- #translations span a[href]:hover, #translations span a[href]:visited:hover {
- color: #004caa;
- text-decoration: underline #006400 dotted;
+#translations span.original a {
+ font-weight: bold;
}
+/* Main navbar */
+
+#navigation {
+ clear: both;
+ position: relative;
+}
+#navigation li, ul#edu-navigation li, #fsf-links li {
+ font-family: "FreeSans", sans-serif;
+}
+#navigation ul {
+ text-align: left;
+}
+
+/* Toggle switches to display navbar and languages,
+ and searcher button. */
+
+#switches {
+ display: inline-block;
+ clear: right;
+ float: right;
+ vertical-align: top;
+ max-width: 6em;
+ padding: .3em 1em .3em 0;
+}
+#searcher, #navbar-input, #language-input, #outdated-input,
+ #navbar-button, #language-button, #outdated-button {
+ display: none;
+}
+.switch {
+ vertical-align: middle;
+ height: 2em;
+ padding: 0;
+ margin: 0 .3em;
+}
+.switch img {
+ display: inline-block;
+ vertical-align: middle;
+ height: 100%;
+}
+#navbar-button {
+ height: 1.4em;
+ padding: .3em 0;
+}
+#searcher-button {
+ display: inline-block;
+ height: 1.8em;
+ padding: .1em 0;
+}
+
+
+/******************************/
+/* Media queries for header */
+/******************************/
+
+@media (min-width: 0) {
+ /* Reduce font size below 40em. */
+ html {
+ font-size: .9em;
+ }
+ #gnu-banner .hide {
+ display: none;
+ }
+ #language-button {
+ display: inline-block;
+ }
+ #navbar-button {
+ display: none;
+ }
+ #languages {
+ display: none;
+ }
+ #language-input:checked ~ #languages {
+ display: block;
+ }
+ #translations p span, #translations p span.original {
+ padding: .1em 0;
+ }
+ #translations p span a {
+ padding: .1em .3em;
+ }
+ #navigation {
+ display: none;
+ }
+ #navbar-button {
+ display: inline-block;
+ }
+ #navbar-input:checked ~ #navigation {
+ display: block;
+ }
+ #edu-navigation {
+ display: none;
+ }
+ #outdated-button {
+ display: inline-block;
+ float: right;
+ }
+ #outdated {
+ display: none;
+ }
+ #outdated-input:checked ~ #outdated {
+ display: block;
+ }
+}
+
+@media (min-width: 25em) {
+ #navigation, #edu-navigation {
+ display: block;
+ }
+ #navbar-button {
+ display: none;
+ }
+}
+@media (min-width: 40em) {
+ html {
+ font-size: 1em;
+ }
+ #fsf-support {
+ display: inline;
+ font-size: .44em;
+ margin: .3em 0 0;
+ }
+ #gnu-banner .hide {
+ display: inline;
+ }
+ #gnu-banner img {
+ top: .3em;
+ }
+ p#gnu-banner {
+ float: none;
+ }
+ #navigation {
+ display: block;
+ }
+ #outdated-button {
+ display: none;
+ }
+ #outdated {
+ display: block;
+ }
+}
+
+@media (min-width: 60em) {
+ #join-fsf {
+ display: block;
+ }
+ #fssbox {
+ display: inline;
+ }
+ #switches {
+ padding: .3em 3% .3em 0;
+ }
+ #navigation ul, ul#edu-navigation {
+ text-align: center;
+ }
+
+@media (min-width: 77.5em) {
+ body {
+ margin-left: .5em;
+ }
+ .inner {
+ overflow: visible;
+ }
+@media (min-width: 86em) {
+ #languages {
+ display: block;
+ width: 8em;
+ position: absolute;
+ top: -.15em; left: 100%;
+ border: .1em solid #999;
+ border-top: 2px solid #a42e2b;
+ padding: 1em;
+ }
+ #language-button {
+ display: none;
+ }
+ #translations p span, #translations p span.original {
+ padding: .2em 0;
+ }
+ #translations p span a {
+ padding: .2em .3em;
+ }
+ p#set-language {
+ float: none;
+ text-align: left;
+ padding: 0;
+ }
+}
Index: banner.html
===================================================================
RCS file: /webcvs/www/www/server/staging/banner.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- banner.html 10 Dec 2019 15:58:04 -0000 1.3
+++ banner.html 25 Dec 2019 18:09:10 -0000 1.4
@@ -1,5 +1,5 @@
<!-- start of server/banner.html -->
-<!--#include virtual="/server/staging/fundraiser/head-include-2.html" -->
+<!--#include virtual="/server/staging/head-include-2.html" -->
</head>
<body>
<div class="inner">
Index: body-include-1.html
===================================================================
RCS file: /webcvs/www/www/server/staging/body-include-1.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- body-include-1.html 20 Dec 2019 17:01:56 -0000 1.14
+++ body-include-1.html 25 Dec 2019 18:09:10 -0000 1.15
@@ -8,6 +8,8 @@
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>' -->
+<!--#set var="MARK_START" value=" <span class='no-display'>=</span> " -->
+<!--#set var="MARK_END" value=" <span class='no-display'>=</span> " -->
<!--#if expr="$QUERY_STRING = /navbar=([^&#]+)/"
--><!--#set var="nd" value="$1"
--><!--#endif -->
@@ -32,7 +34,30 @@
<!--#set var="MARK_START" value=" <span class='no-display'>=</span> " -->
<!--#set var="MARK_END" value=" <span class='no-display'>=</span> " -->
<div id="toplinks">
- <span id="skip"><a title="Skip to main text"
- href="#content">Skip to main text</a> </span>
+
+<span id="skip"><a title="Skip to main text"
+href="#content">Skip to main text</a> </span>
+
+<p id="join-fsf" class="button">
+<a
href="https://www.fsf.org/associate/support_freedom?referrer=4052";>Prisijunkite
prie FSF</a></p>
+
+<div id="fssbox">
+<span id="fss-link"><a href="//www.fsf.org/fss">Laisvos programinÄs<br
/>įrangos palaikytojas</a></span>
+<form id="fss-sign-up"
action="https://my.fsf.org/civicrm/profile/create?reset=1&gid=31";
+ method="post" class="header">
+ <span>
+ <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" />
+ <input type="text" id="frmEmail" name="email-Primary"
+ value="el. pašto adresas" onfocus="this.value=''"/>
+ <input type="submit" name="_qf_Edit_next" value="Prisiregistruokite" />
+ </span>
+</form>
+</div>
+
</div>
+
+<div style="clear: both"></div>
<!-- end of server/body-include-1.html -->
Index: body-include-2.html
===================================================================
RCS file: /webcvs/www/www/server/staging/body-include-2.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- body-include-2.html 20 Dec 2019 17:01:56 -0000 1.9
+++ body-include-2.html 25 Dec 2019 18:09:10 -0000 1.10
@@ -1,116 +1,87 @@
<!-- start of server/body-include-2 -->
<div id="header">
-<div id="gnu-fsf">
+
+<span id="switches">
+<span id="searcher-button" class="switch">
+ <a href="//www.gnu.org/cgi-bin/estseek.cgi">
+ <img id="search-icon"
+ src="/server/staging/layout/search.png"
+ alt=" [Search www.gnu.org] "
+ title="Search www.gnu.org" /></a>
+</span>
+
+<label for="language-input" id="language-button" class="switch">
+ <img id="language-icon"
+ src="/server/staging/layout/translation-opt.1.png"
+ alt=" [Languages - Toggle translation list] "
+ title="Languages - Toggle translation list" />
+</label>
+
+<label for="navbar-input" id="navbar-button" class="switch">
+ <img id="navbar-icon" src="/server/staging/layout/menu.png"
+ alt="[Toggle main navigation bar] "
+ title="Toggle main navigation bar" />
+</label>
+</span>
+
+<input type="checkbox" id="language-input" />
+<input type="checkbox" id="navbar-input" />
+
+<!-- For text-based browsers -->
+<span style="display: none"> (The last 2 buttons and the checkboxes
+are inactive without CSS.)</span>
<p id="gnu-banner">
<a href="/">
<img src="/graphics/heckert_gnu.transp.small.png"
- alt=" [A GNU head] " /><strong>GNU</strong> <span class="hide">Operating
System</span></a><br />
-<span id="fsf-support" class="hide">Sponsored by the <a
href="#mission-statement">Free Software Foundation</a></span>
+ alt=" [A GNU head] " /><strong>GNU</strong> <span id="os"
class="hide">ãªãã¬ã¼ãã£ã³ã°ã»ã·ã¹ãã </span></a><br />
+<span id="fsf-support" class="hide"><a
href="#mission-statement">ããªã¼ã½ããã¦ã§ã¢ãã¡ã¦ã³ãã¼ã·ã§ã³</a>主å¬</span>
</p><!-- /gnu-banner -->
-<div id="fsf-frame">
-<div id="fssbox">
-<p id="fss-link">BoletÃn<br />«<cite><a href="//www.fsf.org/fss">Free
Software Supporter</a></cite>»<br />
-(también en español)</p>
-<p id="fss-signup" class="button">
-<a href="https://my.fsf.org/civicrm/profile/create?reset=1&gid=31";>SIGN
UP</a></p>
<!--
-<form action="https://my.fsf.org/civicrm/profile/create?reset=1&gid=31";
- method="post" class="header">
- <p>
- <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" />
- <input type="text" id="frmEmail" name="email-Primary"
- value="email address" onfocus="this.value=''"/>
- <input type="submit" name="_qf_Edit_next" value="Sign up" />
- </p>
-</form>
--->
-</div>
-<p id="join-fsf" class="button">
-<a
href="https://www.fsf.org/associate/support_freedom?referrer=4052";>JOIN THE FSF</a></p>
-</div>
-</div>
-
-<p id="switches">
- <span id="searcher-button" class="switch">
- <!--#if expr="$sd = on"
- --><!--#echo encoding="none" var='searcher_off'
- --><!--#else
- --><!--#echo encoding="none" var='searcher_on'
- --><!--#endif
- --><img id="search-icon"
- src="/server/staging/layout/search.png"
- alt=" [Search www.gnu.org] "
- title="Search www.gnu.org" />
- <span><!--#if expr="$sd = on"
- -->▾<!--#else -->◂<!--#endif --> </span>
- <!--#echo encoding="none" var="closing_anchor" -->
- </span>
-
- <span id="language-button" class="switch">
- <!--#if expr="$ld = on"
- --><!--#echo encoding="none" var='languages_off'
- --><!--#else
- --><!--#echo encoding="none" var='languages_on'
- --><!--#endif
- --><img src="/server/staging/layout/translation-opt.png"
- alt=" [Available languages] "
- title="Languages" />
- <span><!--#if expr="$ld = on"
- -->▾<!--#else -->◂<!--#endif --> </span>
- <!--#echo encoding="none" var="closing_anchor" -->
- </span>
-
- <span id="navbar-button" class="switch">
- <!--#if expr="$nd = on"
- --><!--#echo encoding="none" var='navbar_off'
- --><!--#else
- --><!--#echo encoding="none" var='navbar_on'
- --><!--#endif
- --><img src="/server/staging/layout/menu.png"
- alt=" [Main menu] "
- title="Main menu" />
- <span><!--#if expr="$nd = on"
- -->▾<!--#else -->◂<!--#endif --> </span>
- <!--#echo encoding="none" var="closing_anchor" -->
- </span>
-</p>
-
-<!--#if expr="$sd = on" --><div id="searcher">
+<div id="searcher">
<form method="get" action="//www.gnu.org/cgi-bin/estseek.cgi" class="header">
- <p>
+ <div>
<input name="phrase" id="phrase" type="text" size="18" accesskey="s"
value="Why GNU/Linux?" onfocus="this.value=''" />
<input type="submit" value="Search" />
- </p>
+ </div>
</form>
-</div><!--#endif -->
+</div>
+-->
<div style="clear: both"></div>
-<!--#if expr="$ld = on" --><div id="languages">
-<div class="language-container">
+<div id="languages">
<p id="set-language">
<span class="gnun-split"></span><!--#echo
encoding="none" var="language_selector" -->Set
- preferred language<span class="gnun-split"></span><!--#echo
+ language<span class="gnun-split"></span><!--#echo
encoding="none" var="closing_anchor" --></p>
-<p>Available for this page:</p>
-<!--#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 --></div><!--#endif -->
+<div id="translations" title="Available for this page">
+<p>
+<span dir="ltr" class="original"><span class='lang-abbr'>[en]</span><a
lang="en" hreflang="en"
href="/education/edu-software.en.html">English</a></span>
+<span dir="ltr"><span class='lang-abbr'>[ar]</span><a lang="ar" hreflang="ar"
href="/education/edu-software.ar.html">اÙعربÙØ©</a></span>
+<span dir="ltr"><span class='lang-abbr'>[de]</span><a lang="de" hreflang="de"
href="/education/edu-software.de.html">Deutsch</a></span>
+<span dir="ltr"><span class='lang-abbr'>[es]</span><a lang="es" hreflang="es"
href="/education/edu-software.es.html">español</a></span>
+<span dir="ltr"><span class='lang-abbr'>[fr]</span><a lang="fr" hreflang="fr"
href="/education/edu-software.fr.html">français</a></span>
+<span dir="ltr"><span class='lang-abbr'>[hr]</span><a lang="hr" hreflang="hr"
href="/education/edu-software.hr.html">hrvatski</a></span>
+<span dir="ltr"><span class='lang-abbr'>[it]</span><a lang="it" hreflang="it"
href="/education/edu-software.it.html">italiano</a></span>
+<span dir="ltr"><span class='lang-abbr'>[ja]</span><a lang="ja" hreflang="ja"
href="/education/edu-software.ja.html">æ¥æ¬èª</a></span>
+<span dir="ltr"><span class='lang-abbr'>[lt]</span><a lang="lt" hreflang="lt"
href="/education/edu-software.lt.html">lietuvių</a></span>
+<span dir="ltr"><span class='lang-abbr'>[nl]</span><a lang="nl" hreflang="nl"
href="/education/edu-software.nl.html">Nederlands</a></span>
+<span dir="ltr"><span class='lang-abbr'>[pl]</span><a lang="pl" hreflang="pl"
href="/education/edu-software.pl.html">polski</a></span>
+<span dir="ltr"><span class='lang-abbr'>[pt-br]</span><a lang="pt-br"
hreflang="pt-br" href="/education/edu-software.pt-br.html">português do
Brasil</a></span>
+<span dir="ltr"><span class='lang-abbr'>[ru]</span><a lang="ru" hreflang="ru"
href="/education/edu-software.ru.html">ÑÑÑÑкий</a></span>
+<span dir="ltr"><span class='lang-abbr'>[uk]</span><a lang="uk" hreflang="uk"
href="/education/edu-software.uk.html">ÑкÑаÑнÑÑка</a></span>
+<span dir="ltr"><span class='lang-abbr'>[zh-cn]</span><a lang="zh-cn"
hreflang="zh-cn"
href="/education/edu-software.zh-cn.html">ç®ä½ä¸æ</a></span>
+</p>
</div>
+</div>
+
+<div style="clear: both"></div>
-<!--#if expr="$nd = on" --><div id="navigation">
+<div id="navigation">
<ul>
<!--#set var="MARK_START" value=" <span class='no-display'>=</span> " -->
<!--#set var="MARK_END" value=" <span class='no-display'>=</span> " -->
@@ -198,7 +169,6 @@
<li id="more-links"><a href="#fsf-links">More ▼</a></li>
</ul>
<div style="clear: both"></div>
-</div><!--#endif -->
+</div>
</div><!-- /header -->
-<div style="clear: both"></div>
<!-- end of server/body-include-2 -->
Index: layout/banner.html
===================================================================
RCS file: /webcvs/www/www/server/staging/layout/banner.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- layout/banner.html 28 Dec 2018 12:38:47 -0000 1.2
+++ layout/banner.html 25 Dec 2019 18:09:10 -0000 1.3
@@ -1,8 +1,9 @@
<!-- start of server/banner.html -->
+<!--#include virtual="/server/staging/head-include-2.html" -->
</head>
<body>
<div class="inner">
-<!--#include virtual="/server/body-include-1.html" -->
+<!--#include virtual="/server/staging/body-include-1.html" -->
<!--#include virtual="/server/staging/layout/body-include-2.html" -->
<div id="content">
<!-- end of server/banner.html -->
Index: layout/body-include-2.html
===================================================================
RCS file: /webcvs/www/www/server/staging/layout/body-include-2.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- layout/body-include-2.html 4 Jan 2019 15:28:23 -0000 1.6
+++ layout/body-include-2.html 25 Dec 2019 18:09:10 -0000 1.7
@@ -1,35 +1,82 @@
<!-- start of server/body-include-2 -->
-
<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>
-<div id="fssbox">
-<p><a href="//www.fsf.org/fss">Free Software Supporter</a></p>
-<form action="https://my.fsf.org/civicrm/profile/create?reset=1&gid=31";
- method="post" class="header">
+
+<span id="switches">
+<span id="searcher-button" class="switch">
+ <a href="//www.gnu.org/cgi-bin/estseek.cgi">
+ <img id="search-icon"
+ src="/server/staging/layout/search.png"
+ alt=" [Search www.gnu.org] "
+ title="Search www.gnu.org" /></a>
+</span>
+
+<label for="language-input" id="language-button" class="switch">
+ <img id="language-icon"
+ src="/server/staging/layout/translation-opt.png"
+ alt=" [Languages - Toggle translation list] "
+ title="Languages - Toggle translation list" />
+</label>
+<!--
+<label for="navbar-input" id="navbar-button" class="switch">
+ <img id="navbar-icon" src="/server/staging/layout/menu.png"
+ alt="[Toggle main navigation bar] "
+ title="Toggle main navigation bar" />
+</label>
+-->
+</span>
+
+<input type="checkbox" id="language-input" />
+<!--
+<input type="checkbox" id="navbar-input" />
+-->
+<!-- For text-based browsers -->
+<!--
+<span style="display: none"> (The last 2 buttons and the checkboxes
+are inactive without CSS.)</span>
+-->
+<span style="display: none"> (The second button and the checkbox
+are inactive without CSS.)</span>
+
+<p id="gnu-banner">
+<a href="/">
+<img src="/graphics/heckert_gnu.transp.small.png"
+ alt=" [A GNU head] " /><strong>GNU</strong> <span id="os"
class="hide">ãªãã¬ã¼ãã£ã³ã°ã»ã·ã¹ãã </span></a><br />
+<span id="fsf-support" class="hide"><a
href="#mission-statement">ããªã¼ã½ããã¦ã§ã¢ãã¡ã¦ã³ãã¼ã·ã§ã³</a>主å¬</span>
+</p><!-- /gnu-banner -->
+
+
+
+<!--
+<div id="searcher">
+ <form method="get" action="//www.gnu.org/cgi-bin/estseek.cgi" class="header">
<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" />
+ <input name="phrase" id="phrase" type="text" size="18" accesskey="s"
+ value="Why GNU/Linux?" onfocus="this.value=''" />
+ <input type="submit" value="Search" />
</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.transp.small.png" alt=" [A GNU head] "
/><strong>GNU</strong> Operating System</a>
-
-<p id="fsf-support">Sponsored by the <a href="#mission-statement">Free
Software Foundation</a></p>
-</div><!-- /gnu-banner -->
-<div style="clear:both"></div>
-</div><!-- /header -->
+ </form>
+</div>
+-->
+<div style="clear: both"></div>
+
+<div id="languages">
+<p 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" --></p>
+
+<!--#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 -->
+</div>
+
+<div style="clear: both"></div>
<div id="navigation">
<ul>
@@ -38,12 +85,12 @@
<!--#if expr="$REQUEST_URI = /^\/gnu\//" -->
<li id="tabAboutGNU" class="active">
<!--#echo encoding="none" var="MARK_START" -->
- <a href="/gnu/gnu.html">ABOUT</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/gnu.html">ABOUT</a></li>
+ <li id="tabAboutGNU"><a href="/gnu/gnu.html">ABOUT GNU</a></li>
<!--#endif -->
<!--#if expr="$REQUEST_URI = /^\/philosophy\//" -->
<li id="tabPhilosophy" class="active">
@@ -88,12 +135,23 @@
<!--#if expr="$REQUEST_URI = /^\/(doc|manual)\//" -->
<li id="tabDoc" class="active">
<!--#echo encoding="none" var="MARK_START" -->
- <a href="/doc/doc.html">DOC</a>
+ <a href="/doc/doc.html">DOCS</a>
+ <span class="gnun-split"></span>
+ <!--#echo encoding="none" var="MARK_END" -->
+ </li>
+<!--#else -->
+ <li id="tabDoc"><a href="/doc/doc.html">DOCS</a></li>
+<!--#endif -->
+<!--#if expr="$REQUEST_URI = /^\/proprietary\//" -->
+ <li id="tabMalware" class="active">
+ <!--#echo encoding="none" var="MARK_START" -->
+ <a href="/proprietary/proprietary.html">MALWARE</a>
<span class="gnun-split"></span>
<!--#echo encoding="none" var="MARK_END" -->
</li>
<!--#else -->
- <li id="tabDoc"><a href="/doc/doc.html">DOC</a></li>
+ <li id="tabMalware"><a href="/proprietary/proprietary.html">MALWARE</a>
+</li>
<!--#endif -->
<!--#if expr="$REQUEST_URI = /^\/help\//" -->
<li id="tabHelp" class="active">
@@ -107,7 +165,7 @@
<!--#endif -->
<li id="more-links"><a href="#fsf-links">More ▼</a></li>
</ul>
- <div style="clear:both"></div>
-</div><!-- /navigation -->
+<div style="clear: both"></div>
+</div>
+</div><!-- /header -->
<!-- end of server/body-include-2 -->
-
Index: nav-bar/test9/edu-software-tuxpaint.html
===================================================================
RCS file:
/webcvs/www/www/server/staging/nav-bar/test9/edu-software-tuxpaint.html,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- nav-bar/test9/edu-software-tuxpaint.html 20 Dec 2019 17:01:56 -0000
1.27
+++ nav-bar/test9/edu-software-tuxpaint.html 25 Dec 2019 18:09:10 -0000
1.28
@@ -26,6 +26,7 @@
font-size: .9em;
font-style: italic;
}
+#gnu-banner span#os { font-size: .8em; }
@media (max-width: 35em) {
#flowers {
width: 13.3em;
@@ -33,8 +34,8 @@
}
-->
</style>
-<!--#include virtual="/education/po/edu-software-tuxpaint.translist" -->
-<!--#include virtual="/server/staging/banner.html" -->
+<!--#include virtual="/server/gnun/initial-translations-list.html" -->
+<!--#include virtual="/server/staging/layout/banner.html" -->
<div id="main-text" class="article">
<p id="breadcrumb"><a href="/education/education.html">Education</a> →
@@ -246,7 +247,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2019/12/20 17:01:56 $
+$Date: 2019/12/25 18:09:10 $
<!-- timestamp end -->
</p>
</div>
Index: readability/free-sw.html
===================================================================
RCS file: /webcvs/www/www/server/staging/readability/free-sw.html,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- readability/free-sw.html 20 Dec 2019 17:01:56 -0000 1.22
+++ readability/free-sw.html 25 Dec 2019 18:09:10 -0000 1.23
@@ -15,7 +15,7 @@
<meta http-equiv="Description" content="Since 1983, developing the free Unix
style operating system GNU, so that computer users can have the freedom to
share and improve the software they use." />
<!--#include virtual="/philosophy/po/free-sw.translist" -->
-<!--#include virtual="/server/staging/banner.html" -->
+<!--#include virtual="/server/staging/layout/banner.html" -->
<div id="main-text" class="article">
<p id="breadcrumb">
@@ -23,7 +23,6 @@
<a href="/philosophy/essays-and-articles.html#content">Essays &
articles</a>
→ <a href="/philosophy/essays-and-articles.html#aboutfs">About free
software</a> → What is free software?</p>
-<!--#include virtual="/server/staging/nav-bar/test9/philosophy-menu.html" -->
<!--GNUN: OUT-OF-DATE NOTICE-->
<!--#if expr="$OUTDATED_SINCE" --><!--#else -->
<!--#if expr="$LANGUAGE_SUFFIX" -->
@@ -670,7 +669,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2019/12/20 17:01:56 $
+$Date: 2019/12/25 18:09:10 $
<!-- timestamp end -->
</p>
</div>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- www/server/staging education.css banner.html bo...,
Therese Godefroy <=