[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www home.nb.shtml server/banner.nb.html
|
From: |
Andreas Tolfsen |
|
Subject: |
www home.nb.shtml server/banner.nb.html |
|
Date: |
Fri, 07 Dec 2007 23:50:05 +0000 |
CVSROOT: /web/www
Module name: www
Changes by: Andreas Tolfsen <att> 07/12/07 23:50:05
Modified files:
. : home.nb.shtml
server : banner.nb.html
Log message:
Forgot to remove English paragraph.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/home.nb.shtml?cvsroot=www&r1=1.13&r2=1.14
http://web.cvs.savannah.gnu.org/viewcvs/www/server/banner.nb.html?cvsroot=www&r1=1.7&r2=1.8
Patches:
Index: home.nb.shtml
===================================================================
RCS file: /web/www/www/home.nb.shtml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- home.nb.shtml 7 Dec 2007 20:53:56 -0000 1.13
+++ home.nb.shtml 7 Dec 2007 23:49:50 -0000 1.14
@@ -36,11 +36,6 @@
<h3>Hva er fri programvare?</h3>
-<p>“<a href="/philosophy/free-sw.html">Free software</a>” is a
matter of liberty, not price.
-To understand the concept, you should think of “free” as in
-“free speech”, not as in
-“free beer”.</p>
-
<p>«<a href="/philosophy/free-sw.html">Fri programvare</a>» handler
om frihet, ikke om pris. PÃ¥ engelsk er ordet <em>free</em> flertydig ved at
det
kan bety både <em>fri</em> og <em>gratis</em>. For å unngå misforståelse
burde
@@ -126,7 +121,7 @@
GNUs Flash is a pun on News Flash.
Please don't make it GNU's Flash.
-->
-<h3 id="Flashes">GNUs Flashes</h3>
+<h3 id="Flashes">GNUs lynmeldinger</h3>
<!--
FOR ENTRIES ADDED TO GNUs FLASHES:
@@ -239,7 +234,7 @@
<p>Oppdatert:
<!-- timestamp start -->
- $Date: 2007/12/07 20:53:56 $
+ $Date: 2007/12/07 23:49:50 $
<!-- timestamp end -->
</p>
Index: server/banner.nb.html
===================================================================
RCS file: /web/www/www/server/banner.nb.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- server/banner.nb.html 1 Dec 2007 02:01:04 -0000 1.7
+++ server/banner.nb.html 7 Dec 2007 23:49:57 -0000 1.8
@@ -1,50 +1,76 @@
- <link rel="stylesheet" href="/gnu-new.css" title="All-new GNU Project
style" />
- <style type="text/css" media="print">
- @import url("/gnu-print.css");
- </style>
+<style type="text/css" media="all">
address@hidden url('/style.css');
+</style>
+
+<style type="text/css" media="print">
address@hidden url('/print.css');
+</style>
</head>
-<body id="foo">
+<body>
-<div id="wrapper">
+<div id="null-wrapper">
-<p class="netscape4"><a href="#content" accesskey="2">Hopp til innhold</a> |
<a href="#amspita">Hopp til menyen</a></p>
+<p class="netscape4"><a href="#content">Hopp til innhold</a></p>
-<div id="top2">
-<div id="banner">
+ <!-- enable this div if there something urgent for us to do -->
- <h1><a href="/">GNU's Not Unix! (GNU er ikke Unix!) – Fri
programvare, fritt samfunn</a></h1>
+ <div id="urgent">
+
+ <a
href="http://www.michaelgeist.ca/content/view/2431/125/";>Kanadiere: Din
regjering planlegger å innføre noe lignende DMCA i Kanada. Gjør noe for å
stoppe det!</a>
+
+
+ </div>
+
+
+ <div id="header">
+
+ <div class="inner">
+
+ <h1 id="logo"><a href="/">Operativsystemet GNU</a></h1>
<ul id="links">
- <li><a href="http://www.gnu.org/philosophy/free-sw.html";>Hva
er fri programvare?</a></li>
- <li><a href="http://www.fsf.org/join"; title="Bli et
støttemedlem idag!">Bli med i Free Software Foundation</a></li>
- <li><a href="http://www.fsf.org/register_form";
title="Registrer deg for å få jevnlige post- og e-post oppdateringer">Få
nyheter fra FSF</a></li>
- </ul>
-</div>
+ <li><a
+
href="https://www.fsf.org/associate/support_freedom/join_fsf?referrer=2442";>Bli
med i FSF idag!</a></li>
+ <li id="tabContactUs"><a
href="/links/links.html#FreeGNULinuxDistributions">Frie
GNU/Linux-distroer</a></li>
+ <li><a href="http://www.fsf.org/";>Free Software Foundation</a></li>
+ </ul>
-<h5 class="netscape4" id="amspita">Meny</h5>
+ </div>
-<div id="navigation-bar">
-<div id="navbar">
+ </div>
+ <div id="navigation">
+ <div class="inner">
<ul>
- <li id="tabMenu"><a href="/home.nb.html">Hjem</a></li>
- <li id="tabAboutGNU"><a href="/gnu/">Om GNU</a></li>
- <li id="tabSoftware"><a
href="/software/software.nb.html">Programvare</a></li>
- <li id="tabPhilosophy"><a href="/philosophy/">Filosofi</a></li>
- <li id="tabLicenses"><a href="/licenses/">Lisenser</a></li>
- <li id="tabDocumentation"><a
href="/doc/">Dokumentasjon</a></li>
- <li id="tabHelpGNU"><a href="/help/">Hjelp GNU</a></li>
- <li id="tabContactUs"><a href="/contact/">Kontakt oss</a></li>
- <li id="tabGPLv3"><a
href="http://gplv3.fsf.org/";>GPLv3</a></li>
+ <li id="tabMenu"><a href="/">Hjem</a></li>
+ <li id="tabAboutGNU"><a href="/gnu/gnu.html">Om</a></li>
+ <li id="tabSoftware"><a href="/software/software.html">Fri
programvare</a></li>
+ <li id="tabPhilosophy"><a
href="/philosophy/philosophy.html">Filosofi</a></li>
+ <li id="tabLicenses"><a
href="/licenses/licenses.html">Lisenser</a></li>
+ <li><a href="/server/sitemap.html">Sitekart</a></li>
+ <li><a href="/help/help.html">Hjelp oss</a></li>
</ul>
+ </div>
+ </div>
+
+<div id="content" class="inner">
+
+<div style="width: 260px; margin-left: 20px; float: right; margin-right: 20px;
margin-top: 20px; margin-bottom: 2em;">
+
+ <p style="text-align: center; font-size: 1.3em; margin: 0;">Support the
<acronym title="Free Software Foundation">FSF</acronym>!</p>
+
+ <script type="text/javascript">
+var fsf_widget_text = "Bidra til å forsvare din frihet!";
+var fsf_widget_d_btn = "Donér";
+var fsf_widget_share = "Del denne boksen.";
+var fsf_widget_size = "normal";
+var fsf_associate_id = "2442"; // already a member? change this to your own
associate ID and refer people - earn gifts from the FSF, see
www.fsf.org/associate/referral
+</script>
+<script type="text/javascript"
src="http://gplv3.fsf.org/static/widget/widget.js";></script>
-</div>
-</div>
-</div>
+ <p style="text-align: center; font-size: 0.9em; padding-top: 1em;"><a
href="https://www.fsf.org/associate/support_freedom/join_fsf?referrer=2442";>Join
today and make a difference</a></p>
-<div id="columns">
+ </div>
-<!-- BEGIN content -->
-<div id="content">
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- www home.nb.shtml server/banner.nb.html,
Andreas Tolfsen <=