[SCM] Debian Live manual branch, master, updated. 846e876c969b1800bb88818d80ae9f0a6c72d53e

Daniel Baumann daniel at debian.org
Tue Jan 20 20:10:18 UTC 2009


The following commit has been merged in the master branch:
commit c4a5965d52c08f19b378261a859c41bf599d35f1
Author: Daniel Baumann <daniel at debian.org>
Date:   Tue Jan 20 21:09:20 2009 +0100

    Replacing build html with new design.

diff --git a/Makefile b/Makefile
index bbec40b..3482132 100644
--- a/Makefile
+++ b/Makefile
@@ -8,15 +8,19 @@ build: clean translations all
 		mkdir -p $(AUTOBUILD)/$$FORMAT; \
 		cp *.$$FORMAT $(AUTOBUILD)/$$FORMAT; \
 	done
-	sed '{s/__UPDATED__/$(shell LC_ALL=C date -R)/;s%/__LANG__%%;}' build-index.html.in > $(AUTOBUILD)/index.html.en
+
+	sed '{s/@DATE@/$(shell LC_ALL=C date -R)/;s%/@LANG@%%;}' build-index.html.in > $(AUTOBUILD)/index.html.en
+
 	set -e; for LANGUAGE in $(LANGUAGES); do \
 		for FORMAT in $(FORMATS); do \
 			mkdir -p $(AUTOBUILD)/$$FORMAT/$$LANGUAGE; \
 			cp $$LANGUAGE/*.$$FORMAT $(AUTOBUILD)/$$FORMAT/$$LANGUAGE; \
 		done; \
-		sed "{s/__UPDATED__/$(shell LC_ALL=C date -R)/;s/__LANG__/$$LANGUAGE/;}" $$LANGUAGE/build-index.html.in > $(AUTOBUILD)/index.html.$$LANGUAGE; \
+		sed "{s/@DATE@/$(shell LC_ALL=C date -R)/;s/@LANG@/$$LANGUAGE/;}" $$LANGUAGE/build-index.html.in > $(AUTOBUILD)/index.html.$$LANGUAGE; \
 	done
 
+	cp css/* $(AUTOBUILD)
+
 po4a:
 	po4a -k 0 po4a/live-manual.cfg;
 
diff --git a/build-index.html.in b/build-index.html.in
index 2d30d86..af106bb 100644
--- a/build-index.html.in
+++ b/build-index.html.in
@@ -1,38 +1,74 @@
-<html>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
 
 <head>
-	<title>Debian Live manual</title>
+	<title>Debian Live</title>
+	<link type="text/css" rel="stylesheet" href="stylesheet.css" />
+
+<!--
+	<style type="text/css">
+	/*<![CDATA[*/
+		pre { background-color: #EEEEEE; border: 1px dashed black; padding: 1em; }
+	/*]]>*/
+	</style>
+-->
 </head>
 
 <body>
 
-<p>
-	<a href="http://debian-live.alioth.debian.org/"><img src="http://debian-live.alioth.debian.org/images/debian.png" border="0" /></a>
-</p>
+<h1 id="title"><a href="/">Debian Live</a></h1>
+<h2 id="subtitle"><a href="/">Live Debian systems!</a></h2>
 
-<h1>Debian Live Manual</h1>
+<div id="body">
 
-<p>
-	<em>This manual is under heavy construction.</em> Please report errors, omissions, patches and suggestions to <a href="mailto:debian-live at lists.debian.org">debian-live at lists.debian.org</a>.
-</p>
+<h2>Live Manual</h2>
 
-<h2>Available Formats</h2>
+<dl>
 
-<ul>
-	<li><strong><a href="html/__LANG__/">HTML</a></strong></li>
-	<li><a href="txt/__LANG__/live-manual.txt">Plain text</a></li>
-	<li><a href="pdf/__LANG__/live-manual.pdf">PDF</a></li>
-</ul>
+<dd>
+	<em>This manual is under heavy construction.</em> Please report errors, omissions, patches and suggestions to our mailinglist at <a href="mailto:debian-live at lists.debian.org">debian-live at lists.debian.org</a>.
+</dd>
 
-<p>
-	The source for this manual is available <a href="http://git.debian.org/?p=debian-live/live-manual.git">here</a>.
-</p>
+<dt><h3>Available Formats</h3></dt>
+
+<dd>
+	<ul>
+		<li><strong><a href="html/@LANG@/">HTML</a></strong></li>
+	        <li><a href="pdf/@LANG@/live-manual.pdf">PDF</a></li>
+	        <li><a href="txt/@LANG@/live-manual.txt">Plain text</a></li>
+	</ul>
+
+	<p>
+		Last updated: @DATE@
+	</p>
+</dd>
+
+<dt><h3>Source</h3></dt>
 
-<hr />
+<dd>
+	<p>
+		The source for this manual is <a href="http://git.debian.org/?p=debian-live/live-manual.git">available</a> at:
+	</p>
+
+	<ul>
+		<li><a href="git://git.debian.org/git/debian-live/live-manual.git"><small><tt>git://git.debian.org/git/debian-live/live-manual.git</tt></small></a></li>
+		<li><a href="http://git.debian.org/git/debian-live/live-manual.git"><small><tt>http://git.debian.org/git/debian-live/live-manual.git</tt></small></a></li>
+	</ul>
+</dd>
+
+</dl>
+</div>
+
+<div class="footer">
 
 <p>
-	Last updated: __UPDATED__.
+	<a href="http://debian-live.alioth.debian.org/">Debian Live</a> &lt;<a href="mailto:debian-live at lists.debian.org">debian-live at lists.debian.org</a>&gt; - <a href="http://live.debian.net/legal.html">Legal Notice</a>
 </p>
 
+</div>
+
 </body>
 </html>
diff --git a/css/favicon.ico b/css/favicon.ico
new file mode 100644
index 0000000..8f4e75c
Binary files /dev/null and b/css/favicon.ico differ
diff --git a/css/image.png b/css/image.png
new file mode 100644
index 0000000..d1321d8
Binary files /dev/null and b/css/image.png differ
diff --git a/css/stylesheet.css b/css/stylesheet.css
new file mode 100644
index 0000000..a96e1c3
--- /dev/null
+++ b/css/stylesheet.css
@@ -0,0 +1,202 @@
+/*
+ * Debian PTS stylesheet.
+ * by:
+ * - Dan Callahan <dan.callahan at gmail.com>
+ * - Enrico Tassi <gareuselesinge at debian.org>
+ * - Stefano Zacchiroli <zack at debian.org>
+ */
+
+/* --- Whole-Page --- */
+body {
+    margin: 0;
+    padding: 0;
+    font-family: "DejaVu Sans", "Bitstream Vera Sans", sans-serif; /*Prefer Free Fonts*/
+    background: #fff url('image.png') no-repeat 10px 7px;
+    color: #000;
+    font-size: 100%;
+}
+
+a:link    { color: #0755d7; text-decoration: underline; }
+a:visited { color: #0755d7; text-decoration: underline; }
+a:hover   { color: #032a6b; text-decoration: underline; }
+a:active  { color: #f00;    text-decoration: underline; }
+a img { border: none; }
+
+.containertable { width: 100%; }
+
+/* --- Header --- */
+body > form { /* "Jump to package" */
+    margin: 0.3em;
+    font-size: 80%;
+    padding: 0.5em;
+    border: 1px solid #aaa;
+    background-color: #dfdfdf;
+}
+#quickforms { /* "Jump to package" */
+    margin: 0.3em;
+    font-size: 80%;
+    padding: 0.5em;
+    border: 1px solid #aaa;
+    background-color: #dfdfdf;
+}
+
+
+h1#title {
+    margin: 0 0 0 0;
+    padding: 20px 0 0 280px;
+    font-size: 150%;
+/*    min-height: 60px;
+    height: auto !important; /* "Min-Height Fast Hack" */
+/*    height: 60px; */
+}
+
+h1#title a {
+    color: black;
+    text-decoration: none;
+}
+
+h2#subtitle {
+    margin: -1em 0 1em 0;
+    padding: 20px 0 0 280px;
+    font-size: 80%;
+/*    min-height: 60px;
+    height: auto !important;
+    height: 60px;*/
+}
+
+h2#subtitle a {
+    color: black;
+    text-decoration: none;
+}
+
+/* --- Content Pane --- */
+div#body {
+    clear: both;
+    border-top: 2px solid #d70751;
+/*    background: #dfdfdf;*/
+    padding: 1em 1em; /* 0em 0em */
+}
+
+table.containertable {
+  padding: 0.5em 0.5em;
+}
+
+td.containercell { padding: 0.5em; }
+
+table.lefttable {
+    border-collapse: collapse;
+    border: 1px solid #999;
+    background: #fff;
+    width: 100%;
+}
+
+table.righttable {
+    border-collapse: collapse;
+    border: 1px solid #999;
+    background: #fff;
+    width: 100%;
+}
+
+td.titlecell {
+    padding: 0.2em 0.2em 0.1em 0.2em;
+    font-weight: bold;
+    font-size: 100%;
+    background: #d70751;
+    color: #fff;
+    border-top: 3px solid #999;
+    border-bottom: 1px solid #999;
+}
+td.titlecell a:link    { color: #ffffff; background: #d70751; text-decoration: underline; }
+td.titlecell a:visited { color: #ffffff; background: #d70751; text-decoration: underline; }
+td.titlecell a:hover   { color: #fff200; background: #d70751; text-decoration: underline; }
+td.titlecell a:active  { color: #295598; background: #d70751; text-decoration: underline; }
+
+th.titlecell {
+    padding: 0.2em 0.2em 0.1em 0.2em;
+    font-weight: bold;
+    font-size: 100%;
+    background: #d70751;
+    color: #fff;
+    border-top: 3px solid #999;
+    border-bottom: 1px solid #999;
+}
+th.titlecell a:link    { color: #ffffff; background: #d70751; text-decoration: underline; }
+th.titlecell a:visited { color: #ffffff; background: #d70751; text-decoration: underline; }
+th.titlecell a:hover   { color: #fff200; background: #d70751; text-decoration: underline; }
+th.titlecell a:active  { color: #295598; background: #d70751; text-decoration: underline; }
+
+
+
+td.labelcell {
+    font-weight: bold;
+    padding: 0.2em 0 0.2em 0.3em;
+    border-bottom: 1px dotted #999;
+}
+td.labelcell:after {
+    content: ":";
+}
+
+td.contentcell {
+    padding: 0.2em 0.3em 0.2em 0;
+    border-bottom: 1px dotted #999;
+}
+
+/* - Edge Tables - */
+tr#bugs_rc { font-size: 90%; }
+tr#bugs_in { font-size: 90%; }
+tr#bugs_mw { font-size: 90%; }
+tr#bugs_fp { font-size: 90%; }
+span.indented { padding-left: 1.5em; }
+
+td > form { margin: 0.4em 0 0.4em 0.4em; padding: 0; } /* PTS subscribe */
+
+td#src_files ul { padding: 0; }
+td#src_files li {
+    display: inline;
+    font-family: "DejaVu Sans Mono", "Bitstream Vera Sans Mono", monospace;
+}
+
+#news-list {
+    max-height: 30em;
+    overflow: auto;
+}
+
+/* - Central Table - */
+#problems { background: #0755d7; color: #ffffff; }
+#todo { background: #0755d7; color: #ffffff; }
+    
+/* --- Footer --- */
+div#body > hr { display: none; }
+
+div.footer {
+    padding: 1em 0;
+    background-color: #fff;
+    text-align: center;
+    border-top: 2px solid #d70751;
+    margin: 0 0 0 0;
+    border-bottom: 0;
+}
+
+tt { font-family: "DejaVu Sans Mono", "Bitstream Vera Sans Mono", monospace; }
+
+/* --- Misc --- */
+form > p { margin: 0; padding: 0; }
+
+a.feedlink { /* Little orange RSS button */
+    background: #f60                  !important;
+    color: #fff                       !important;
+    border: 1px solid                 !important;
+    border-color: #fc9 #630 #330 #f96 !important;
+    padding: 0 3px                    !important;
+    font-weight: bold                 !important;
+    font-size: 70%                    !important;
+    text-decoration: none             !important;
+    vertical-align: 0.2em             !important;
+    /* Without !important, inherets from td.titlecell a:* */
+}
+
+ul { list-style-type: none; padding: 0; }
+li { margin-top: 0.2em; }
+/*li { margin-top: 0.4em; }
+td > ul { padding-left: 1em; }
+a.none { color: #000 !important; text-decoration: none !important; }*/

-- 
Debian Live manual



More information about the debian-live-changes mailing list