Cherry pick of Thayer's archweb_pub retheme work

7 files changed, 150 insertions, 164 deletions

diff --git a/AUTHORS b/AUTHORS
index 522c8011..59ae0103 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -3,4 +3,5 @@ Judd Vinet <judd@archlinux.org>
 Simo Leone <simo@archlinux.org>
 eliott <eliott@cactuswax.net>
 Dan McGee <dan@archlinux.org>
+Thayer Williams <thayerw@gmail.com>
 
diff --git a/README b/README
index aaae09bc..0d92063f 100644
--- a/README
+++ b/README
@@ -15,7 +15,7 @@ For a simple testing installation:
  1. Install dependencies.
    pacman -S django python-pysqlite sqlite3
 
- 2. Fetch and Extract test database
+ 2. Fetch and extract test database
    For simple testing, sqlite is a good option. We have provided an 
    example test database.
    wget http://dev.archlinux.org/~eliott/archweb_sqlite.db.gz -O - | zcat > archweb.db
diff --git a/media/arch.css b/media/arch.css
index 0e745e1a..ec00eb31 100644
--- a/media/arch.css
+++ b/media/arch.css
@@ -1,70 +1,62 @@
 * { margin: 0; padding: 0; }
-* ul { padding: 20px; }
+* ul { padding: 10px 20px; }
 body {
-	background: url("/media/title_back.png") repeat-x top left #fbf8f1;
+  min-width: 600px;
+	background: url("/media/titlebar.png") repeat-x top left #fff;
 	padding: 0 30px;
 	color: #46494d;
-	font-family: Bitstream Vera Sans, Lucida Grande, Arial, sans-serif;
+  font-size: 14px;
+	font-family: "DejaVu Sans", "Bitstream Vera Sans", "Lucida Grande", Arial, sans-serif;
 }
 /*
  * Divs
  */
 #head_container {
-	height: 175px;
-}
-#main_nav ul {
-	list-style: none;
-	padding-right: 10px;
-	padding-top: 48px;
+	height: 220px;
+}
+#main_nav {
+  position: absolute;
+  top: 123px;
+  right: 30px;
+  width: 600px;
+  background: #333;
+}
+#dev_nav {
+  position: absolute;
+  top: 149px;
+  right: 30px;
+  width: 600px;
+  background: #1793d1;
+}
+#main_nav ul, #dev_nav ul {
+	list-style: none; 
+	margin: 0;
+  padding: 0;
 }
-#main_nav ul li {
+#main_nav ul li, #dev_nav ul li {
 	display: block;
 	float: right;
-	width: 67px;
-	height: 20px;
-	padding-top: 2px;
-	margin-left: 3px;
-	background: url("/media/tab.png") repeat-x bottom left #fbf8f1;
+  margin: 0 3px;
+  padding: 0;
 	text-align: center;
 	font-size: 13px;
+  line-height: 26px;
 }
-#main_nav ul li[class~=selected] {
-	background: #fbf8f1;
-}
-#main_nav ul li a {
-	text-decoration: none;
-    display: block;
-}
-#dev_nav ul li a {
-	text-decoration: none;
-    display: block;
-}
-#dev_nav ul {
-	list-style: none;
-	padding-right: 10px;
-	padding-top: 5px;
-}
-#dev_nav ul li {
-	display: block;
-	float: right;
-	width: 87px;
-	height: 20px;
-	padding-top: 2px;
-	margin-left: 3px;
-	background: url("/media/tab.png") repeat-x bottom left #fbf8f1;
-	border: 1px solid #cccccc;
-	text-align: center;
-	font-size: 13px;
+#main_nav ul li.selected {
+	background: #1793d1;
 }
-#dev_nav ul li[class~=selected] {
-	background: #fbf8f1;
+#dev_nav ul li.selected {
+	background: #333;
 }
-#dev_nav ul li a {
+#main_nav ul li a, #dev_nav ul li a {
+  display: block;
+  padding: 0 8px;
+  color: #fff;
+  font-weight: bold;
 	text-decoration: none;
 }
-#title {
-	height: 140px;
-	float: left;
+#main_nav ul li a:hover {
+	background: #1793d1;
 }
 .box-smalltext {
 	font-size: small;
@@ -75,15 +67,28 @@ body {
 	padding: 10px;
 }
 #ads {
-	float: right;
+  z-index: 0;
+  position: absolute;
+  top: 40px;
+  right: 10px;
 }
 #logo {
-	float: left;
-	width: 140px;
-	height: 140px;
-}
-#titleimg {
-	float: left;
+  z-index: 1;
+	position: absolute;
+  top: 10px;
+  left: 25px;
+	width: 350px;
+}
+#logo h1#archtitle {
+  text-indent: -9999px;
+  margin: 0;
+  padding: 0;
+}
+#logo h1#archtitle a {
+  display: block;
+  background: transparent url("/media/titlelogo.png") top left no-repeat;
+  width: 350px;
+  height: 103px;
 }
 #devlist {
 	width: 80%;
@@ -109,13 +114,12 @@ body {
 	margin: 0 360px 0 0;
 }
 .left p {
-	text-align: justify;
 	padding-bottom: 10px;
 }
 .box {
 	padding: 10px;
-	background: #e1e3e6;
-	border: 1px solid #8faecd;
+	background: #f0f0f0;
+	border: 1px solid #d9d9d9;
 }
 .greybox {
 	padding: 10px;
@@ -124,7 +128,6 @@ body {
 }
 div.listing {
 	padding-right: 10px;
-	border-left: 1px solid #387cbf;
 }
 .error {
 	color: #dd0000;
@@ -132,8 +135,10 @@ div.listing {
 }
 .foot {
 	clear: both;
+  padding: 2em 0;
 	text-align: center;
-	font-size: 0.8em;
+	font-size: 0.75em;
+  line-height: 1.5em;
 }
 #search {
 	float: right;
@@ -170,11 +175,13 @@ h4.title {
 	border-bottom: 1px solid #46494d;
 }
 h4.news {
-	border-bottom: 1px dotted #8faecd;
+	border-bottom: 1px dotted #0771a6;
+  margin-bottom: .25em;
+  padding-bottom: .2em;
 }
 div.listing h4 {
-	background: #d1d3d6;
-	border-top: 1px double #387cbf;
+  color: #fff;
+	background: #0771a6;
 	padding: 3px;
 }
 /*
@@ -184,27 +191,20 @@ p {
 	padding-bottom: 20px;
 }
 p.news {
-	text-align: left;
 	font-size: small;
 }
 a {
-	color: #35526f;
-	font-weight: bold;
-	text-decoration: underline;
-}
-.news a {
+	color: #0771a6;
 	text-decoration: none;
 }
+a:hover {
+  color: #333;
+  text-decoration: underline;
+}
 #about {
 	position: relative;
 	top: -9px;
 }
-#about a {
-	text-decoration: none;
-}
-.community a {
-	text-decoration: none;
-}
 ol {
 	padding-left: 45px;
 }
@@ -270,6 +270,9 @@ table#art {
 	vertical-align: top;
 	padding-right: 15px;
 }
+.devpic img {
+  padding-top: 25px;
+}
 table.deventry {
 	padding-bottom: 25px;
 }
@@ -279,7 +282,6 @@ table.deventry {
 	white-space: nowrap;
 }
 .deventry td {
-	border-bottom: 1px solid black;
 	width: 100%;
 }
 table.results {
@@ -305,8 +307,6 @@ table.results {
 	font-size: 0.8em;
 }
 .listing th {
-	background: #d1d3d6;
-	border-left: 1px solid #387cbf;
 	font-size: small;
 	vertical-align: top;
 	text-align: left;
@@ -317,13 +317,13 @@ table.results {
 	padding: 2px;
 }
 blockquote.code {
-	background: #c1c3f6;
-	border: 1px solid #8faecd;
+	background: #d0d0d0;
+	border: 1px solid #bbb;
 	margin-left: auto;
 	margin-right: auto;
 	white-space: nowrap;
 	padding: 5px;
-	font-family: Courier, Courier New, Monospace;
+	font-family: "DejaVu Sans Mono", "Bitstream Vera Sans Mono", Courier, "Courier New", Monospace;
 }
 /*
  * Wiki Styles
@@ -363,7 +363,7 @@ div.wikifoot_r {
 	margin-right: auto;
 	white-space: nowrap;
 	padding: 5px;
-	font-family: Courier, Courier New, Monospace;
+	font-family: "DejaVu Sans Mono", "Bitstream Vera Sans Mono", Courier, "Courier New", Monospace;
 }
 .wikibody blockquote {
 	padding-left: 30px;
diff --git a/media/favicon.ico b/media/favicon.ico
index 3a6d2ab9..55497b85 100644
--- a/media/favicon.ico
+++ b/media/favicon.ico
diff --git a/media/titlebar.png b/media/titlebar.png
new file mode 100644
index 00000000..4e17b609
--- /dev/null
+++ b/media/titlebar.png
diff --git a/media/titlelogo.png b/media/titlelogo.png
new file mode 100644
index 00000000..4db09df7
--- /dev/null
+++ b/media/titlelogo.png
diff --git a/templates/base.html b/templates/base.html
index 266d73b1..59cbf462 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,84 +1,69 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1-strict.dtd ">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-	<head>
-		<title>{% block title %}Arch Linux{% endblock %}</title>
-		<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-		<link rel="stylesheet" href="/media/arch.css" />
-		<link rel="icon" href="/media/favicon.ico" type="image/x-icon" />
-		<link rel="shortcut icon" href="/media/favicon.ico" type="image/x-icon" />
-		{% block head %}
-		{% endblock %}
-	</head>
-	<body>
-		<div id="head_container">
-			<div id="title">
-				<div id="logo"><a href="/"><img src="/media/logo.png" alt="Arch Logo" /></a></div>
-				<div id="titleimg"><a href="/"><img src="/media/title.png" alt="Arch Linux" /></a></div>
-			</div>
-			<div style="float: right; color: #eeeeee; font-size: small">
-			{% if not user.is_anonymous %}
-				Logged in as <strong>{{ user.username }}</strong>.
-				<a href="/accounts/logout/">Logout</a>
-			{% endif %}
-			</div>
-			<div id="main_nav">
-				{% block topmenu %}
-				<ul>
-					<li{% ifequal path '/download/' %} class="selected"{% endifequal %}><a href="/download/">Get Arch</a></li>
-					<li><a href="http://aur.archlinux.org">AUR</a></li>
-					<li><a href="http://bugs.archlinux.org">Bugs</a></li>
-					<li><a href="http://wiki.archlinux.org">Wiki</a></li>
-					<li><a href="http://bbs.archlinux.org">Forums</a></li>
-					<li{% ifequal path '/' %} class="selected"{% endifequal %}><a href="/">Home</a></li>
-				</ul>
-				{% endblock %}
-			</div>
-			{% block ads %}
-				{% if not user.is_anonymous %}
-			<div id="dev_nav">
-				<ul>
-					<li><a href="/devel/profile/">Profile</a></li>
-					<li><a href="http://www.archlinux.org/mailman/private/arch-dev/">Archives</a></li>
-					<li><a href="/wiki/">Dev Wiki</a></li>
-					<li><a href="/todo/">Todos</a></li>
-					<li><a href="/news/">News</a></li>
-					<li><a href="/devel/">Dashboard</a></li>
-				</ul>
-			</div>
-				{% else %}
-			<div id="ads">
-				<script type="text/javascript"><!--
-					google_ad_client = "pub-0403484505451360";
-					google_ad_width = 468;
-					google_ad_height = 60;
-					google_ad_format = "468x60_as";
-					google_color_border = "2D5893";
-					google_color_border = "fbf8f1";
-					google_color_bg = "fbf8f1";
-					google_color_link = "6C83B0";
-					google_color_url = "99AACC";
-					google_color_text = "000000";
-				//--></script>
-				<script type="text/javascript" src="http://pagead2.googlesyndication.com/pagead/show_ads.js"></script>
-				{% endif %}
-			</div>
-			{% endblock %}
-		</div>
-		<div id="content">
-			{% block content %}
-			<div class="right">
-				{% block content_right %}
-				{% endblock %}
-			</div>
-			<div class="left">
-				{% block content_left %}
-				{% endblock %}
-			</div>
-			{% endblock %}
-		</div>
-		<div class="foot">
-			Copyright © 2002-2007, Judd Vinet &lt;<a href="mailto:jvinet@zeroflux.org">jvinet@zeroflux.org</a>&gt;<br /><br />
-			<img src="/media/button.png" alt="Arch Linux" />
-		</div>
-	</body>
+    <head>
+        <title>{% block title %}Arch Linux{% endblock %}</title>
+        <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+        <link rel="stylesheet" href="/media/arch.css" />
+        <link rel="icon" href="/media/favicon.ico" type="image/x-icon" />
+        <link rel="shortcut icon" href="/media/favicon.ico" type="image/x-icon" />
+        {% block head %}
+        {% endblock %}
+    </head>
+    <body>
+        <div id="head_container">
+            <div id="title">
+              <div id="logo"><h1 id="archtitle"><a href="/" title="Arch Linux (Home)">Arch Linux</a></h1></div>
+            </div>
+            <div style="float: right; color: #eeeeee; font-size: small">
+            {% if not user.is_anonymous %}
+                Logged in as <strong>{{ user.username }}</strong>.
+                 <a href="/accounts/logout/">Logout</a>
+            {% endif %}
+            </div>
+            <div id="main_nav">
+                {% block topmenu %}
+                <ul>
+                    <li{% ifequal path '/download/' %} class="selected"{% endifequal %}><a href="/download/">Get Arch</a></li>
+                    <li><a href="http://aur.archlinux.org/">AUR</a></li>
+                    <li><a href="http://bugs.archlinux.org/">Bugs</a></li>
+                    <li><a href="http://wiki.archlinux.org/">Wiki</a></li>
+                    <li><a href="http://bbs.archlinux.org/">Forums</a></li>
+                    <li{% ifequal path '/' %} class="selected"{% endifequal %}><a href="/">Home</a></li>
+                </ul>
+                {% endblock %}
+            </div>
+                {% block ads %}
+            <div id="ads">
+                <script type="text/javascript"><!--
+                    google_ad_client = "pub-0403484505451360";
+                    google_ad_width = 468;
+                    google_ad_height = 60;
+                    google_ad_format = "468x60_as";
+                    google_color_border = "ffffff";
+                    google_color_bg = "ffffff";
+                    google_color_link = "0771A6";
+                    google_color_url = "99AACC";
+                    google_color_text = "000000";
+                //--></script>
+                <script type="text/javascript" src="http://pagead2.googlesyndication.com/pagead/show_ads.js"></script>
+            </div>
+            {% endblock %}
+        </div>
+        <div id="content">
+            {% block content %}
+            <div class="right">
+                {% block content_right %}
+                {% endblock %}
+            </div>
+            <div class="left">
+                {% block content_left %}
+                {% endblock %}
+            </div>
+            {% endblock %}
+        </div>
+        <div class="foot">
+          Copyright &copy; 2002-2008 <a href="mailto:jvinet@zeroflux.org" title="contact Judd Vinet">Judd Vinet</a> and <a href="mailto:aaron@archlinux.org" title="contact Aaron Griffin">Aaron Griffin</a>.<br />
+          The Arch Linux name and logo are recognized trademarks. Some rights reserved.
+        </div>
+    </body>
 </html>