[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/server/staging/gnuhealth body-include-2.htm...
|
From: |
Therese Godefroy |
|
Subject: |
www/server/staging/gnuhealth body-include-2.htm... |
|
Date: |
Sat, 3 Sep 2016 20:03:47 +0000 (UTC) |
CVSROOT: /webcvs/www
Module name: www
Changes by: Therese Godefroy <th_g> 16/09/03 20:03:47
Modified files:
server/staging/gnuhealth: body-include-2.html
head-include-1.html home0.html
Removed files:
server/staging/gnuhealth: head-include-2.html
Log message:
Remove obsolete include.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/gnuhealth/body-include-2.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/gnuhealth/head-include-1.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/gnuhealth/home0.html?cvsroot=www&r1=1.15&r2=1.16
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/gnuhealth/head-include-2.html?cvsroot=www&r1=1.1&r2=0
Patches:
Index: body-include-2.html
===================================================================
RCS file: /webcvs/www/www/server/staging/gnuhealth/body-include-2.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- body-include-2.html 23 Aug 2016 16:50:06 -0000 1.1
+++ body-include-2.html 3 Sep 2016 20:03:46 -0000 1.2
@@ -1,13 +1,14 @@
<!-- start of server/body-include-2 -->
-
-<p id="gnuhealth-text"><strong><a
href="http://www.gnuhealthcon.org/2016-las_palmas/";>GNU Health
- Conference</a></strong> Nov 18-20, Las Palmas,
- Spain #GNUHealthCon2016</p>
-
+<p id="gnuhealth-text"
+style="text-align: center; font-size: 1.2em; line-height: 1.4em;
+padding: .2em; margin: 0; background: #ddeced;
+border-top: .2em solid #0088a0; border-bottom: .2em solid #0088a0;">
+<strong><a href="http://www.gnuhealthcon.org/2016-las_palmas/";>GNU Health
+ Conference</a></strong> Nov 18-20, Las Palmas, Spain
+ #GNUHealthCon2016
+</p>
<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="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">
@@ -29,12 +30,11 @@
<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><!-- /gnu-banner -->
</div><!-- /header -->
-
<div id="navigation">
<ul>
<!--#set var="MARK_START" value=" <span class='no-display'>=</span> " -->
Index: head-include-1.html
===================================================================
RCS file: /webcvs/www/www/server/staging/gnuhealth/head-include-1.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- head-include-1.html 23 Aug 2016 16:50:06 -0000 1.1
+++ head-include-1.html 3 Sep 2016 20:03:46 -0000 1.2
@@ -7,6 +7,6 @@
<meta name="viewport" content="width=device-width, initial-scale=1" />
<link rel="stylesheet" href="/combo.css" media="screen" />
<link rel="stylesheet" href="/mini.css" media="handheld" />
-<link rel="stylesheet" href="/layout.min.css" media="screen" />
+<link rel="stylesheet" href="layout.css" media="screen" />
<link rel="stylesheet" href="/print.min.css" media="print" />
<!-- end of server/head-include-1.html -->
Index: home0.html
===================================================================
RCS file: /webcvs/www/www/server/staging/gnuhealth/home0.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- home0.html 31 Aug 2016 13:44:02 -0000 1.15
+++ home0.html 3 Sep 2016 20:03:46 -0000 1.16
@@ -1,10 +1,4 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
-<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
-
-<head>
-<!--#include virtual="/server/staging/gnuhealth/head-include-1.html" -->
-<!-- end of server/header.html -->
+<!--#include virtual="/server/header.html" -->
<!-- Parent-Version: 1.79 -->
<title>The GNU Operating System and the Free Software Movement</title>
@@ -15,9 +9,7 @@
<style type="text/css" media="print,screen">
<!--
-
/* === Not necessary with the new version of layout.css === */
-html { background: #ddd; }
#content:after { display: none; }
#fsf-frame { display: none; }
ol li { margin: 1em 0 0 1em; }
@@ -25,10 +17,6 @@
h2 { text-shadow: none; }
.emph-box p { font-size: 1em; }
.emph-box p, .emph-box ul { margin-bottom: 0; } /* For NetSurf */
-.translators-notes ol {
- margin-bottom: 0;
- padding-bottom: 2em;
-}
.translators-notes ol li { margin: .5em 0 0 1.1em; }
#backtotop { font-size: 1em; }
@@ -41,36 +29,24 @@
font-size: 1.8em;
text-align: center;
font-weight: bold;
- margin-top: 1.3em; margin-bottom: 1.3em;
+ margin: 1.7em 0;
}
-.button a {
+.button a, .button a:visited {
display: block;
- padding: .5em .6em;
- background: #ebedef;
- border-top: none;
- border-bottom: none;
- border-left: .1em solid #d1d4d7;
- border-right: .1em solid #d1d4d7;
+ padding: .4em .6em;
+ text-decoration: none;
+ color: #004caa;
+ background: #f5f5f5;
+ border: .1em solid #4080d0;
border-radius: .3em;
-moz-border-radius: .3em;
-khtml-border-radius: .3em;
-webkit-border-radius: .3em;
-opera-border-radius: .3em;
- background: #dbdddf; /* For browsers that do not support gradients */
- background: -webkit-linear-gradient(#f0f2f4, white, #b9bcbf); /* For Safari
5.1 to 6.0 */
- background: -o-linear-gradient(#f0f2f4, white, #b9bcbf); /* For Opera 11.1
to 12.0 */
- background: -moz-linear-gradient(#f0f2f4, white, #b9bcbf); /* For Firefox
3.6 to 15 */
- background: linear-gradient(#f0f2f4, white, #b9bcbf); /* Standard syntax */
}
.button a:hover {
- background: #f7f9fb;
- background: -webkit-linear-gradient(#f7f9fb, white, #c9cccf);
- background: -o-linear-gradient(#f7f9fb, white, #c9cccf);
- background: -moz-linear-gradient(#f7f9fb, white, #c9cccf);
- background: linear-gradient(#f7f9fb, white, #c9cccf);
-}
-.button a, .button a:visited {
- text-decoration: none;
+ color: #004caa;
+ background: #eee;
}
/* This inactivates the old style. */
@@ -89,20 +65,19 @@
/* ======================= */
#content {
- padding: 0;
margin: 0;
}
.first-column, .second-column {
- width: 40em; max-width: 94%;
- margin: 0 auto;
+ width: 40em; max-width: 100%;
+ margin: auto;
}
h2 {
color: #333;
- padding-top: .2em;
+ margin: 1.2em 0 .9em;
}
-.first-column p {
- margin-bottom: 1em;
+h2.first {
+ margin-top: 1em;
}
.first-column p.back {
margin-bottom: 0;
@@ -120,6 +95,9 @@
padding: 0 1.2em 1.2em;
margin-top: 2em;
}
+.second-column .emph-box.white {
+ background: white;
+}
.second-column .emph-box .back {
margin-top: 1em;
}
@@ -133,11 +111,12 @@
height: .8em;
margin-left: .5em;
}
-h4 {
+#blurb h4 {
+ text-align: left;
font-size: 1.5em;
- text-align: center;
}
-h4 img {
+#blurb h4 img {
+ float: left;
margin-right: .5em;
}
@@ -146,11 +125,11 @@
height: 1.8em;
}
.translators-notes {
- width: 44.4em; max-width: 94%;
+ width: 44.4em; max-width: 100%;
margin: 0 auto;
}
#backtotop {
- margin: 0 5% 1.8em;
+ float: right; margin: 2em 5% 1.8em;
}
#mission-statement {
margin-bottom: 0;
@@ -166,24 +145,24 @@
#gnuhealth {
display: block;
width: 100%;
- margin-top: 2em;
+ margin-top: 2.3em;
}
}
/* ======================= */
@media (min-width: 57em) {
.first-column {
- width: 56.5%;
+ width: 61%;
float: left;
- margin: 0 0 0 3%;
+ margin: 0;
}
.second-column {
- width: 30%;
+ width: 33%;
float: right;
- margin: 0 3% 0 0;
+ margin: 0;
}
.translators-notes {
- width: 94%;
+ width: 100%;
}
}
-->
@@ -191,7 +170,6 @@
<!--#include virtual="/server/fs-gang-definitions.html" -->
<!--#include virtual="/po/home.translist" -->
<!--#include virtual="/server/banner.html" -->
-
<p class="no-display">GNU is the only operating system developed
specifically to give its users freedom. What is GNU, and what freedom
is at stake?</p>
@@ -199,7 +177,7 @@
<div id="home">
<div class="first-column">
-<h2>What is GNU?</h2>
+<h2 class="first">What is GNU?</h2>
<p>GNU is an operating system that
is <a href="/philosophy/free-sw.html">free software</a>—that is,
@@ -299,7 +277,7 @@
<a href="http://www.gnuhealthcon.org/2016-las_palmas/";><img id="gnuhealth"
src="gnuhealthcon2016_small.jpg" alt="GNUHealth Conference 2016" /></a>
-<div id="Flashes" class="emph-box">
+<div id="Flashes" class="emph-box white">
<h3><a href="http://planet.gnu.org/";>Planet GNU</a>
<a href="http://planet.gnu.org/rss20.xml";><img src="/feed-icon-10x10.png"
alt="RSS Feed" /></a></h3>
@@ -336,8 +314,7 @@
<p class="back"><a href="/server/takeaction.html">More action items</a></p>
</div>
-<div class="emph-box" id="unmaint">
-<h3>Help GNU</h3>
+<div id="unmaint" class="emph-box">
<ul>
<li><strong>Can you contribute to any of
the <a href="http://www.fsf.org/campaigns/priority-projects/";>High
@@ -349,20 +326,20 @@
<p><span class="gnun-split"></span>
<a href="/software/halifax/">halifax</a>,
<a href="/software/metahtml/">metahtml</a>,
- <a href="/software/orgadoc/">orgadoc</a></small><span class="gnun-split">,
+ <a href="/software/orgadoc/">orgadoc</a><span class="gnun-split"></span>,
are all <a href="/server/takeaction.html#unmaint">looking for
-maintainers</a>.</br />Also, these packages are looking for co-maintainers:
+maintainers</a>. Also, these packages are looking for co-maintainers:
<span class="gnun-split"></span>
<a href="/software/aspell/">aspell</a>,
<a href="/software/gnuae/">gnuae</a>,
<a href="/software/metaexchange/">metaexchange</a>,
<a href="/software/powerguru/">powerguru</a><span class="gnun-split"></span>.
-<br />See the package web pages for more information.</p></li>
+See the package web pages for more information.</p></li>
</ul>
</div>
-<div id="blurb" class="emph-box">
-<p><strong>Today's random package…</strong></p>
+<div id="blurb" class="emph-box white">
+<p>Today's random package…</p>
<!--#include virtual="/server/home-pkgselect.html" -->
<!--#include virtual="/server/home-pkgblurbs.html" -->
<p class="back"><small><a href="/manual/blurbs.html">Short descriptions for
all GNU
@@ -373,12 +350,8 @@
</div><!-- /home -->
<div class="clear"></div>
-<div class="translators-notes">
-<b>Note de traduction</b><ol>
-<li>Bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla
bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla
bla bla bla </li></ol></div>
-
</div><!-- for id="content", starts in the include above -->
-<!--#include virtual="/server/staging/gnuhealth/footer-text.html" -->
+<!--#include virtual="/server/footer.html" -->
<p id="sisters">The <a href="http://www.fsf.org/";>FSF</a> also has sister
organizations in <a href="http://www.fsfe.org";>Europe</a>, <a
@@ -432,8 +405,7 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 <a
+<p>Copyright © 1996-2016 <a
href="http://www.fsf.org";>Free Software Foundation</a>, Inc.</p>
<p>This page is licensed under a <a rel="license"
@@ -444,7 +416,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2016/08/31 13:44:02 $
+$Date: 2016/09/03 20:03:46 $
<!-- timestamp end -->
</p>
</div>
Index: head-include-2.html
===================================================================
RCS file: head-include-2.html
diff -N head-include-2.html
--- head-include-2.html 23 Aug 2016 16:50:06 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-<!-- start of head-include-2.html -->
-<style type="text/css" media="screen"><!--
-#gnuhealth-text {
- text-align: center;
- font-size: 1.2em;
- line-height: 1.4em;
- padding: .2em;
- margin: 0;
- color: #334683;
- background: #ddeced;
- border-top: .3em solid #0088a0;
- border-bottom: .3em solid #0088a0;
-}
-#gnuhealth-text a {
- color: #334683;
-}
-#translations { border: 0; }
---></style>
-<!-- end of head-include-2.html -->
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- www/server/staging/gnuhealth body-include-2.htm...,
Therese Godefroy <=