The following commit has been merged in the master branch:
commit 328a13f86dd922f1cbb5c2e6eb50020de2d1daf8
Author: Ole Streicher <oleb...@debian.org>
Date:   Wed Nov 25 12:24:24 2015 +0100

    Put some content into debian/astro main page (to be overwritten with a 
generated page)

diff --git a/www/astro/index.html b/www/astro/index.html
index 89890ad..3eacdad 100644
--- a/www/astro/index.html
+++ b/www/astro/index.html
@@ -1,67 +1,81 @@
-<!DOCTYPE html>
-<html>
-       <head>
-                       <title>Debian Astro Pure Blend</title>
-        <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-        <meta name="robots" content="noindex" />
-        <link href="/css/debian.css" rel="stylesheet" type="text/css">
-        <link href="/css/blends.css" rel="stylesheet" type="text/css">
-        <link rel="shortcut icon" href="/img/favicon.ico">
-
-       </head>
-
-       <body>
-                       <div id="header">
-               <div id="wikisection">
-                       <p class="section"><a href="/" title="Debian Astro Pure 
Blend">Astro Pure Blend</a></p>
-               </div>
-
-               <div id="upperheader">
-                       <div id="logo">
-                               <a href="http://www.debian.org"; title="Debian 
Home">
-                                       <img src="/img/openlogo-50.png" 
alt="Debian" width="50" height="61">
-                               </a>
-                       </div>
-               </div> <!-- end upperheader -->
-
-               <div id="navbar">
-                       <p class="hidecss"><a href="#content">Skip 
Quicknav</a></p>
-                       <ul>
-                               <li><a href="/astro/">Home</a></li>
-<li><a href="/astro/tasks/">Tasks</a>
-<li><a href="/astro/bugs/">Bugs</a></li>
-<li><a href="/astro/thermometer/">Thermometer</a></li>
-<li><a href="/astro/maintstats/">Maintainer Stats</a></li>
-
-                       </ul>
-               </div> <!-- end navbar -->
-
-               <p id="breadcrumbs">&nbsp;Debian Astro Pure Blend</p>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
+  <head>
+    <title>Debian Astro Pure Blend</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <meta name="robots" content="noindex" />
+    <link href="/css/debhandheld.css" media="screen" rel="stylesheet" 
type="text/css" />
+    <link href="/css/debian.css" rel="stylesheet" type="text/css" />
+    <link href="/css/blends.css" rel="stylesheet" type="text/css" />
+    <link rel="shortcut icon" href="http://www.debian.org/favicon.ico"; />
+  </head>
+  <body>
+    <div id="header">
+      <div id="upperheader">
+       <div id="logo">
+         <a href="http://www.debian.org/"; title="Debian Home">
+           <img src= "http://www.debian.org/Pics/openlogo-50.png";
+                alt="Debian" width="50" height= "61"></a>
+         </div>
+         <p class="section">Pure Blend</p>
        </div>
-
-
-
-               <div id="content">
-                       <div id="splash">
-       <h1 id="astro">Debian Astro Pure Blend</h1>
-</div>
-
-
-               </div>
-
-               <div id="footer">
-<div id="fineprint">
-    <p>
-    The source code powering these pages is available <a 
href="http://anonscm.debian.org/cgit/blends/website.git";>here</a>.
-    <br />
-    Contact: <a href="mailto:debian-as...@lists.debian.org";>Debian Astro Pure 
Blend</a> (<a href="https://lists.debian.org/debian-astro/";>archives</a>)
-     or <a href="irc://irc.debian.org/debian-astro">#debian-astro</a> on 
irc.debian.org.
-    <br />
-    Debian is a registered trademark of <a 
href="http://www.spi-inc.org/";>Software in the Public Interest</a>.
-    </p>
-</div>
-</div>
-
-
-       </body>
+       <div id="navbar">
+         <ul> 
+           <li><a href="index.html">Debian Astro</a></li>
+           <li><a href="tasks">Packages</a></li>
+           <li><a href="contact.html">Contact</a></li>
+           <li><a href="contribute.html">Contribute</a></li>
+         </ul>
+       </div>
+       <p id="breadcrumbs">
+         <a href="http://blends.debian.org";>Debian Pure Blends</a>
+         / Debian Astro
+       </p>
+      </div><!-- end header -->
+      <div id="content">
+       <div id="splash">
+         <h1 id="astro">Debian Astro</h1>
+       </div>
+       <p>
+         Debian Astro is a "Debian Pure Blend" with the aim to develop a
+         Debian based operating system that fits the requirements of both
+         professional and hobby astronomers. It integrates a large number of
+         software packages covering telescope control, data reduction,
+         presentation and other fields.
+       </p>
+       <h2>Installation</h2>
+       <p>
+         On an existing Debian Stretch installation, you can get the
+         Debian Astro Pure Blend just by installing
+         the <a href="">debian-astro</a> package, or the
+         individual <a href="tasks.html">metapackages</a>.  During
+         the installation on a new system, this will be possible
+         during the installation process.
+       </p>
+       <p>
+         If you're new to Debian and you'd like to try the Debian
+         Astro Pure Blend without installing it on your computer, or
+         if you'd like to perform a fresh installation of Debian with
+         all the astronomy software ready-to-go, you might find the
+         live images useful. Images will be produced that can be run
+         from DVDs or USB sticks on both 32-bit and 64-bit Intel
+         architectures.
+       </p>
+       <p>
+         <strong>Note:</strong> Debian Astro is not available under Debian
+         Jessie. Our plan is to deliver the first version together with
+         Debian Stretch.
+       </p>
+    </div>
+    <div id="footer">
+      <p>
+       The source code powering these pages is available
+       <a href="http://anonscm.debian.org/cgit/blends/website.git";>here</a>.
+       <br />
+       Debian is a registered trademark
+       of <a href="http://www.spi-inc.org/";>Software in the Public
+         Interest</a>.
+      </p>
+    </div>
+  </body>
 </html>

-- 
Static and dynamic websites for Debian Pure Blends

_______________________________________________
Blends-commit mailing list
Blends-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit

Reply via email to