Skip to content
GitLab
Commit 604e9d82 authored by eliott's avatar eliott
Browse files

Cherry pick of Thayer's archweb_pub retheme work

parent eefb7968
Hide whitespace changes
Inline Side-by-side
AUTHORS
View file @ 604e9d82
...@@ -3,4 +3,5 @@ Judd Vinet <judd@archlinux.org> ...@@ -3,4 +3,5 @@ Judd Vinet <judd@archlinux.org>
Simo Leone <simo@archlinux.org> Simo Leone <simo@archlinux.org>
eliott <eliott@cactuswax.net> eliott <eliott@cactuswax.net>
Dan McGee <dan@archlinux.org> Dan McGee <dan@archlinux.org>
Thayer Williams <thayerw@gmail.com>
README
View file @ 604e9d82
...@@ -15,7 +15,7 @@ For a simple testing installation: ...@@ -15,7 +15,7 @@ For a simple testing installation:
1. Install dependencies. 1. Install dependencies.
pacman -S django python-pysqlite sqlite3 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 For simple testing, sqlite is a good option. We have provided an
example test database. example test database.
wget http://dev.archlinux.org/~eliott/archweb_sqlite.db.gz -O - | zcat > archweb.db wget http://dev.archlinux.org/~eliott/archweb_sqlite.db.gz -O - | zcat > archweb.db
......
media/arch.css
View file @ 604e9d82
* { margin: 0; padding: 0; } * { margin: 0; padding: 0; }
* ul { padding: 20px; } * ul { padding: 10px 20px; }
body { 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; padding: 0 30px;
color: #46494d; 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 * Divs
*/ */
#head_container { #head_container {
height: 175px; height: 220px;
} }
#main_nav ul { #main_nav {
list-style: none; position: absolute;
padding-right: 10px; top: 123px;
padding-top: 48px; 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; display: block;
float: right; float: right;
width: 67px; margin: 0 3px;
height: 20px; padding: 0;
padding-top: 2px;
margin-left: 3px;
background: url("/media/tab.png") repeat-x bottom left #fbf8f1;
text-align: center; text-align: center;
font-size: 13px; font-size: 13px;
line-height: 26px;
} }
#main_nav ul li[class~=selected] { #main_nav ul li.selected {
background: #fbf8f1; background: #1793d1;
}
#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;
} }
#dev_nav ul li[class~=selected] { #dev_nav ul li.selected {
background: #fbf8f1; 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; text-decoration: none;
} }
#title { #main_nav ul li a:hover {
height: 140px; background: #1793d1;
float: left;
} }
.box-smalltext { .box-smalltext {
font-size: small; font-size: small;
...@@ -75,15 +67,28 @@ body { ...@@ -75,15 +67,28 @@ body {
padding: 10px; padding: 10px;
} }
#ads { #ads {
float: right; z-index: 0;
position: absolute;
top: 40px;
right: 10px;
} }
#logo { #logo {
float: left; z-index: 1;
width: 140px; position: absolute;
height: 140px; top: 10px;
} left: 25px;
#titleimg { width: 350px;
float: left; }
#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 { #devlist {
width: 80%; width: 80%;
...@@ -109,13 +114,12 @@ body { ...@@ -109,13 +114,12 @@ body {
margin: 0 360px 0 0; margin: 0 360px 0 0;
} }
.left p { .left p {
text-align: justify;
padding-bottom: 10px; padding-bottom: 10px;
} }
.box { .box {
padding: 10px; padding: 10px;
background: #e1e3e6; background: #f0f0f0;
border: 1px solid #8faecd; border: 1px solid #d9d9d9;
} }
.greybox { .greybox {
padding: 10px; padding: 10px;
...@@ -124,7 +128,6 @@ body { ...@@ -124,7 +128,6 @@ body {
} }
div.listing { div.listing {
padding-right: 10px; padding-right: 10px;
border-left: 1px solid #387cbf;
} }
.error { .error {
color: #dd0000; color: #dd0000;
...@@ -132,8 +135,10 @@ div.listing { ...@@ -132,8 +135,10 @@ div.listing {
} }
.foot { .foot {
clear: both; clear: both;
padding: 2em 0;
text-align: center; text-align: center;
font-size: 0.8em; font-size: 0.75em;
line-height: 1.5em;
} }
#search { #search {
float: right; float: right;
...@@ -170,11 +175,13 @@ h4.title { ...@@ -170,11 +175,13 @@ h4.title {
border-bottom: 1px solid #46494d; border-bottom: 1px solid #46494d;
} }
h4.news { h4.news {
border-bottom: 1px dotted #8faecd; border-bottom: 1px dotted #0771a6;
margin-bottom: .25em;
padding-bottom: .2em;
} }
div.listing h4 { div.listing h4 {
background: #d1d3d6; color: #fff;
border-top: 1px double #387cbf; background: #0771a6;
padding: 3px; padding: 3px;
} }
/* /*
...@@ -184,27 +191,20 @@ p { ...@@ -184,27 +191,20 @@ p {
padding-bottom: 20px; padding-bottom: 20px;
} }
p.news { p.news {
text-align: left;
font-size: small; font-size: small;
} }
a { a {
color: #35526f; color: #0771a6;
font-weight: bold;
text-decoration: underline;
}
.news a {
text-decoration: none; text-decoration: none;
} }
a:hover {
color: #333;
text-decoration: underline;
}
#about { #about {
position: relative; position: relative;
top: -9px; top: -9px;
} }
#about a {
text-decoration: none;
}
.community a {
text-decoration: none;
}
ol { ol {
padding-left: 45px; padding-left: 45px;
} }
...@@ -270,6 +270,9 @@ table#art { ...@@ -270,6 +270,9 @@ table#art {
vertical-align: top; vertical-align: top;
padding-right: 15px; padding-right: 15px;
} }
.devpic img {
padding-top: 25px;
}
table.deventry { table.deventry {
padding-bottom: 25px; padding-bottom: 25px;
} }
...@@ -279,7 +282,6 @@ table.deventry { ...@@ -279,7 +282,6 @@ table.deventry {
white-space: nowrap; white-space: nowrap;
} }
.deventry td { .deventry td {
border-bottom: 1px solid black;
width: 100%; width: 100%;
} }
table.results { table.results {
...@@ -305,8 +307,6 @@ table.results { ...@@ -305,8 +307,6 @@ table.results {
font-size: 0.8em; font-size: 0.8em;
} }
.listing th { .listing th {
background: #d1d3d6;
border-left: 1px solid #387cbf;
font-size: small; font-size: small;
vertical-align: top; vertical-align: top;
text-align: left; text-align: left;
...@@ -317,13 +317,13 @@ table.results { ...@@ -317,13 +317,13 @@ table.results {
padding: 2px; padding: 2px;
} }
blockquote.code { blockquote.code {
background: #c1c3f6; background: #d0d0d0;
border: 1px solid #8faecd; border: 1px solid #bbb;
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;
white-space: nowrap; white-space: nowrap;
padding: 5px; padding: 5px;
font-family: Courier, Courier New, Monospace; font-family: "DejaVu Sans Mono", "Bitstream Vera Sans Mono", Courier, "Courier New", Monospace;
} }
/* /*
* Wiki Styles * Wiki Styles
...@@ -363,7 +363,7 @@ div.wikifoot_r { ...@@ -363,7 +363,7 @@ div.wikifoot_r {
margin-right: auto; margin-right: auto;
white-space: nowrap; white-space: nowrap;
padding: 5px; padding: 5px;
font-family: Courier, Courier New, Monospace; font-family: "DejaVu Sans Mono", "Bitstream Vera Sans Mono", Courier, "Courier New", Monospace;
} }
.wikibody blockquote { .wikibody blockquote {
padding-left: 30px; padding-left: 30px;
......
media/favicon.ico
View replaced file @ eefb7968 View file @ 604e9d82
media/favicon.ico

1.12 KB | W: | H:

media/favicon.ico

575 Bytes | W: | H:

media/favicon.ico
media/favicon.ico
media/favicon.ico
media/favicon.ico
  • 2-up
  • Swipe
  • Onion skin
templates/base.html
View file @ 604e9d82
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1-strict.dtd "> <!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"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head> <head>
<title>{% block title %}Arch Linux{% endblock %}</title> <title>{% block title %}Arch Linux{% endblock %}</title>
<meta http-equiv="content-type" content="text/html; charset=utf-8" /> <meta http-equiv="content-type" content="text/html; charset=utf-8" />
<link rel="stylesheet" href="/media/arch.css" /> <link rel="stylesheet" href="/media/arch.css" />
<link rel="icon" href="/media/favicon.ico" type="image/x-icon" /> <link rel="icon" href="/media/favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="/media/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="/media/favicon.ico" type="image/x-icon" />
{% block head %} {% block head %}
{% endblock %} {% endblock %}
</head> </head>
<body> <body>
<div id="head_container"> <div id="head_container">
<div id="title"> <div id="title">
<div id="logo"><a href="/"><img src="/media/logo.png" alt="Arch Logo" /></a></div> <div id="logo"><h1 id="archtitle"><a href="/" title="Arch Linux (Home)">Arch Linux</a></h1></div>
<div id="titleimg"><a href="/"><img src="/media/title.png" alt="Arch Linux" /></a></div> </div>
</div> <div style="float: right; color: #eeeeee; font-size: small">
<div style="float: right; color: #eeeeee; font-size: small"> {% if not user.is_anonymous %}
{% if not user.is_anonymous %} Logged in as <strong>{{ user.username }}</strong>.
Logged in as <strong>{{ user.username }}</strong>. <a href="/accounts/logout/">Logout</a>
<a href="/accounts/logout/">Logout</a> {% endif %}
{% endif %} </div>
</div> <div id="main_nav">
<div id="main_nav"> {% block topmenu %}
{% block topmenu %} <ul>
<ul> <li{% ifequal path '/download/' %} class="selected"{% endifequal %}><a href="/download/">Get Arch</a></li>
<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://aur.archlinux.org">AUR</a></li> <li><a href="http://bugs.archlinux.org/">Bugs</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://wiki.archlinux.org">Wiki</a></li> <li><a href="http://bbs.archlinux.org/">Forums</a></li>
<li><a href="http://bbs.archlinux.org">Forums</a></li> <li{% ifequal path '/' %} class="selected"{% endifequal %}><a href="/">Home</a></li>
<li{% ifequal path '/' %} class="selected"{% endifequal %}><a href="/">Home</a></li> </ul>
</ul> {% endblock %}
{% endblock %} </div>
</div> {% block ads %}
{% block ads %} <div id="ads">
{% if not user.is_anonymous %} <script type="text/javascript"><!--
<div id="dev_nav"> google_ad_client = "pub-0403484505451360";
<ul> google_ad_width = 468;
<li><a href="/devel/profile/">Profile</a></li> google_ad_height = 60;
<li><a href="http://www.archlinux.org/mailman/private/arch-dev/">Archives</a></li> google_ad_format = "468x60_as";
<li><a href="/wiki/">Dev Wiki</a></li> google_color_border = "ffffff";
<li><a href="/todo/">Todos</a></li> google_color_bg = "ffffff";
<li><a href="/news/">News</a></li> google_color_link = "0771A6";
<li><a href="/devel/">Dashboard</a></li> google_color_url = "99AACC";
</ul> google_color_text = "000000";
</div> //--></script>
{% else %} <script type="text/javascript" src="http://pagead2.googlesyndication.com/pagead/show_ads.js"></script>
<div id="ads"> </div>
<script type="text/javascript"><!-- {% endblock %}
google_ad_client = "pub-0403484505451360"; </div>
google_ad_width = 468; <div id="content">
google_ad_height = 60; {% block content %}
google_ad_format = "468x60_as"; <div class="right">
google_color_border = "2D5893"; {% block content_right %}
google_color_border = "fbf8f1"; {% endblock %}
google_color_bg = "fbf8f1"; </div>
google_color_link = "6C83B0"; <div class="left">
google_color_url = "99AACC"; {% block content_left %}
google_color_text = "000000"; {% endblock %}
//--></script> </div>
<script type="text/javascript" src="http://pagead2.googlesyndication.com/pagead/show_ads.js"></script> {% endblock %}
{% endif %} </div>
</div> <div class="foot">
{% endblock %} 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 />
</div> The Arch Linux name and logo are recognized trademarks. Some rights reserved.
<div id="content"> </div>
{% block content %} </body>
<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>
</html> </html>
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment