summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2010-05-24 21:13:46 -0500
committerDan McGee <dan@archlinux.org>2010-05-24 21:13:46 -0500
commite817efad53bc075ca94e6effd6eb3b6c838e2e63 (patch)
tree6bd4dae53aca75fef1f7480769ca2c42fe473e85 /templates
parentb3e8354cdff4af8117feda0806a7c1104d5bb30e (diff)
parenta24e503a63599fb5495fd85cba5806a34c695bb6 (diff)
Merge branch 'redesign'
Conflicts: templates/public/download.html
Diffstat (limited to 'templates')
-rw-r--r--templates/403.html8
-rw-r--r--templates/404.html8
-rw-r--r--templates/500.html8
-rw-r--r--templates/base.html143
-rw-r--r--templates/devel/index.html252
-rw-r--r--templates/devel/mirrorlist.html66
-rw-r--r--templates/devel/profile.html31
-rw-r--r--templates/forms/td_input.html5
-rw-r--r--templates/general_form.html36
-rw-r--r--templates/mirrors/index.html31
-rw-r--r--templates/news/add.html39
-rw-r--r--templates/news/delete.html29
-rw-r--r--templates/news/list.html69
-rw-r--r--templates/news/view.html29
-rw-r--r--templates/packages/details.html258
-rw-r--r--templates/packages/files-list.html11
-rw-r--r--templates/packages/files.html16
-rw-r--r--templates/packages/flag.html56
-rw-r--r--templates/packages/flagged.html13
-rw-r--r--templates/packages/flaghelp.html52
-rw-r--r--templates/packages/search.html235
-rw-r--r--templates/packages/signoffs.html43
-rw-r--r--templates/public/art.html193
-rw-r--r--templates/public/blank.html8
-rw-r--r--templates/public/developer_list.html112
-rw-r--r--templates/public/donate.html126
-rw-r--r--templates/public/download.html252
-rw-r--r--templates/public/feeds.html124
-rw-r--r--templates/public/index.html266
-rw-r--r--templates/public/userlist.html13
-rw-r--r--templates/registration/login.html31
-rw-r--r--templates/registration/logout.html7
-rw-r--r--templates/todolists/addedtotodolist2
-rw-r--r--templates/todolists/list.html62
-rw-r--r--templates/todolists/todolist_confirm_delete.html37
-rw-r--r--templates/todolists/view.html114
36 files changed, 1627 insertions, 1158 deletions
diff --git a/templates/403.html b/templates/403.html
index c853fef1..6b5fc084 100644
--- a/templates/403.html
+++ b/templates/403.html
@@ -1,9 +1,9 @@
{% extends "base.html" %}
{% block content %}
- <div class="box">
- <h2>403 - Access Forbidden</h2>
- Sorry, the page you've requested is not available.
- </div>
+ <div id="error-page" class="box 403">
+ <h2>403 - Access Forbidden</h2>
+ <p>Sorry, the page you've requested is not available.</p>
+ </div>
{% endblock %}
diff --git a/templates/404.html b/templates/404.html
index 9e389ba9..33271c66 100644
--- a/templates/404.html
+++ b/templates/404.html
@@ -2,9 +2,9 @@
{% block title %}Arch Linux - Page Not Found{% endblock %}
{% block content %}
- <div class="box">
- <h2>404 - Page Not Found</h2>
- Sorry, the page you've requested does not exist.
- </div>
+ <div id="error-page" class="box 404">
+ <h2>404 - Page Not Found</h2>
+ <p>Sorry, the page you've requested does not exist.</p>
+ </div>
{% endblock %}
diff --git a/templates/500.html b/templates/500.html
index 9566fc29..7f040638 100644
--- a/templates/500.html
+++ b/templates/500.html
@@ -1,9 +1,9 @@
{% extends "base.html" %}
{% block content %}
- <div class="box">
- <h2>500 - Internal Server Error</h2>
- Something has gone horribly wrong. Back away slowly.
- </div>
+ <div id="error-page" class="box 500">
+ <h2>500 - Internal Server Error</h2>
+ <p>Something has gone horribly wrong. Back away slowly.</p>
+ </div>
{% endblock %}
diff --git a/templates/base.html b/templates/base.html
index cc5fadd2..3227fbbf 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,73 +1,90 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/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" type="text/css" href="/media/arch.css" />
- <link rel="icon" type="image/x-icon" href="/media/favicon.ico" />
- <link rel="shortcut icon" type="image/x-icon" href="/media/favicon.ico" />
- <link rel="search" type="application/opensearchdescription+xml" href="{% url opensearch-packages %}" title="Arch Linux Packages" />
- {% 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 id="main_nav">
- {% block topmenu %}
+<head>
+ <title>{% block title %}Arch Linux{% endblock %}</title>
+ <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+ <link rel="stylesheet" type="text/css" href="/media/archweb.css" media="screen, projection" />
+ <link rel="stylesheet" type="text/css" href="/media/archweb-print.css" media="print" />
+ <link rel="icon" type="image/x-icon" href="/media/favicon.ico" />
+ <link rel="shortcut icon" type="image/x-icon" href="/media/favicon.ico" />
+ <link rel="search" type="application/opensearchdescription+xml" href="{% url opensearch-packages %}" title="Arch Linux Packages" />
+ {% block head %}{% endblock %}
+</head>
+<body class="{% if user.is_authenticated %}devmode{% endif %} {% block bodyclass %}{% endblock %}">
+
+ <div id="archnavbar">
+ <div id="archnavbarlogo"><h1><a href="/" title="Return to the main page">Arch Linux</a></h1></div>
+ <div id="archnavbarmenu">
+ <ul id="archnavbarlist">
+ <li id="anb-home" {% ifnotequal path '/download/' %}class="selected"{% endifnotequal %}>
+ <a href="/" title="Arch news, packages, projects and more">Home</a></li>
+ <li id="anb-packages" {% ifequal path '/packages/' %} class="selected"{% endifequal %}>
+ <a href="/packages/" title="Arch Package Database">Packages</a></li>
+ <li id="anb-forums"><a href="http://bbs.archlinux.org/" title="Community forums">Forums</a></li>
+ <li id="anb-wiki"><a href="http://wiki.archlinux.org/" title="Community documentation">Wiki</a></li>
+ <li id="anb-bugs"><a href="http://bugs.archlinux.org/" title="Report and track bugs">Bugs</a></li>
+ <li id="anb-aur"><a href="http://aur.archlinux.org/" title="Arch Linux User Repository">AUR</a></li>
+ <li id="anb-download" {% ifequal path '/download/' %} class="selected"{% endifequal %}>
+ <a href="{% url page-download %}" title="Get Arch Linux">Download</a></li>
+ </ul>
+ </div>
+ </div><!-- #archnavbar -->
+
+ <div id="content">
+ <div id="archdev-navbar">
+ {% if user.is_authenticated %}
<ul>
- <li{% ifnotequal path '/download/' %} class="selected"{% endifnotequal %}><a href="/">Home</a></li>
- <li><a href="http://bbs.archlinux.org/">Forums</a></li>
- <li><a href="http://wiki.archlinux.org/">Wiki</a></li>
- <li><a href="http://bugs.archlinux.org/">Bugs</a></li>
- <li><a href="http://aur.archlinux.org/">AUR</a></li>
- <li{% ifequal path '/download/' %} class="selected"{% endifequal %}><a href="{% url page-download %}">Download</a></li>
+ <li><a href="/devel/" title="Developer Dashboard">Dashboard</a></li>
+ <li><a href="http://wiki.archlinux.org/index.php/DeveloperWiki"
+ title="Developer HOWTOs and documentation">DevWiki</a></li>
+ <li><a href="http://projects.archlinux.org/" title="Git Projects">Projects</a></li>
+ <li><a href="{% url news-list %}" title="Manage news articles">News</a></li>
+ <li><a href="/packages/signoffs/" title="Package signoffs">Signoffs</a></li>
+ <li><a href="/todo/" title="Developer to-do lists">Todos</a></li>
+ <li><a href="http://www.archlinux.org/mailman/private/arch-dev/"
+ title="arch-dev mailing list archives">Archives</a></li>
+ <li><a href="/mirrors/" title="Mirror server statistics">Mirrors</a></li>
+ <li><a href="/devel/profile/" title="Modify your account profile">Profile</a></li>
+ <li><a href="/accounts/logout/" title="Logout of the developer interface">Logout</a></li>
</ul>
- {% endblock %}
- </div>
- <div id="dev_nav">
- {% if user.is_authenticated %}
- <ul>
- <li><a href="/devel/">Dashboard</a></li>
- <li><a href="{% url news-list %}">News</a></li>
- <li><a href="/packages/signoffs/">Signoffs</a></li>
- <li><a href="/todo/">Todos</a></li>
- <li><a href="http://www.archlinux.org/mailman/private/arch-dev/">Archives</a></li>
- <li><a href="/mirrors/">Mirrors</a></li>
- <li><a href="/devel/profile/">Profile</a></li>
- <li><a href="/accounts/logout/">Logout</a></li>
- </ul>
- {% endif %}
- </div>
- </div>
- <div id="content">
- {% if messages %}
- <div class="box" style="width: 50%; text-align: center; margin-left: auto; margin-right: auto">
+ {% endif %}
+ </div><!-- #archdev-navbar -->
+
+ {% if messages %}
+ <div id="sys-message" class="box">
{% for message in messages %}
- <p>{{message}}</p>
+ <p>{{message}}</p>
{% endfor %}
</div>
- <br />
- {% endif %}
- {% block content %}
- <div class="right">
- {% block content_right %}
- {% endblock %}
- </div>
- <div class="left">
- {% block content_left %}
- {% endblock %}
+ {% endif %}
+
+ {% block content %}
+ <div id="content-left-wrapper">
+ <div id="content-left">
+ {% block content_left %}{% endblock %}
+ </div><!-- #content_left -->
</div>
- {% endblock %}
- </div>
- <div class="foot">
- Copyright &copy; 2002-{% now "Y" %} <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.<br />
- The registered trademark Linux® is used pursuant to a sublicense from LMI, the exclusive licensee of Linus Torvalds, owner of the mark on a world-wide basis.
- </div>
- </body>
+
+ <div id="content-right">
+ {% block content_right %}{% endblock %}
+ </div><!-- #content_right -->
+ {% endblock %}
+
+ <div id="footer">
+ <p>Copyright &copy; 2002-{% now "Y" %} <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>.</p>
+
+ <p>The Arch Linux name and logo are recognized
+ <a href="http://wiki.archlinux.org/index.php/DeveloperWiki:TrademarkPolicy"
+ title="Arch Linux Trademark Policy">trademarks</a>. Some rights reserved.</p>
+
+ <p>The registered trademark Linux® is used pursuant to a sublicense from LMI,
+ the exclusive licensee of Linus Torvalds, owner of the mark on a world-wide basis.</p>
+ </div><!-- #footer -->
+
+ </div><!-- #content -->
+
+</body>
</html>
diff --git a/templates/devel/index.html b/templates/devel/index.html
index acbe90bf..662e8246 100644
--- a/templates/devel/index.html
+++ b/templates/devel/index.html
@@ -6,107 +6,161 @@
{% endblock %}
{% block content %}
- {% if todos %}
- <div class="greybox">
- <h3 class="title">Package ToDo Lists</h3>
- <table class="results" width="100%">
- <tr>
- <th>Name</th>
- <th>Creation Date</th>
- <th>Description</th>
- </tr>
- {% for todo in todos %}
- <tr class="{% cycle pkgr2,pkgr1 %}">
- <td style="white-space:nowrap"><a href="/todo/{{ todo.id }}/">{{ todo.name }}</a></td>
- <td>{{ todo.date_added }}</td>
- <td>{{ todo.description }}</td>
- </tr>
- {% endfor %}
- </table>
- </div>
- <br /><br />
- {% endif %}
-
- <div class="greybox">
- <h3 class="title" style="cursor: pointer" onclick="$(this).next().toggle();">Stats by Architecture</h3>
- <table class="results" width="100%" style="display: none">
- <tr>
- <th width="50%">Arch</th>
- <th># Packages</th>
- <th># Flagged</th>
- </tr>
- {% for arch in arches %}
- <tr class="{% cycle pkgr2,pkgr1 %}">
- <td><strong>{{ arch.name }}</strong></td>
- <td><a href="/packages/?arch={{ arch.name }}"><strong>{{ arch.packages.count }}</strong> packages</a></td>
- <td><a href="/packages/?arch={{ arch.name }}&flagged=Flagged"><strong>{{ arch.packages.flagged.count }}</strong> packages</a></td>
- </tr>
- {% endfor %}
- </table>
- </div>
- <br /><br />
- <div class="greybox">
- <h3 class="title" style="cursor: pointer" onclick="$(this).next().toggle();">Stats by Repository</h3>
- <table class="results" width="100%" style="display: none">
- <tr>
- <th width="50%">Repository</th>
- <th># Packages</th>
- <th># Flagged</th>
- </tr>
- {% for repo in repos %}
- <tr class="{% cycle pkgr2,pkgr1 %}">
- <td><strong>{{ repo.name }}</strong></td>
- <td><a href="/packages/?repo={{ repo.name }}"><strong>{{ repo.packages.count }}</strong> packages</a></td>
- <td><a href="/packages/?repo={{ repo.name }}&flagged=Flagged"><strong>{{ repo.packages.flagged.count }}</strong> packages</a></td>
- </tr>
- {% endfor %}
- </table>
- </div>
- <br /><br />
-
- <div class="greybox">
- <div>Counts are by 'pkgbase' and not raw number of packages.</div>
- <h3 class="title" style="cursor: pointer" onclick="$(this).next().toggle();">Stats by Maintainer</h3>
- <table class="results" width="100%" style="display: none">
- <tr>
- <th width="50%">Maintainer</th>
- <th># Packages</th>
- </tr>
- {% for maint in maintainers %}
- <tr class="{% cycle pkgr2,pkgr1 %}">
- <td><strong>{{ maint.get_full_name }}</strong></td>
- <td><a href="/packages/?maintainer={{ maint.username }}"><strong>{{ maint.package_relations.count }}</strong> packages</a></td>
- </tr>
- {% endfor %}
- </table>
- </div>
- <br /><br />
-
- <div class="greybox">
- <h3 class="title">My Flagged Packages</h3>
- <form method="post" action="/devel/notify/">
- <input name="notify" type="checkbox" value="yes"
- {% if user.get_profile.notify %} checked="checked"{% endif %} />
- Notify me when packages are flagged&nbsp;&nbsp;
- <input type="submit" value="Update" />
- </form>
- <br />
- <table class="results" width="100%">
- <tr>
- <th style="width: 50%">Name</th>
- <th>Repo</th>
- <th>Version</th>
- <th>Arch</th>
- </tr>
- {% for pkg in flagged %}
- <tr class="{% cycle pkgr2,pkgr1 %}">
- <td>
- <a href="{{ pkg.get_absolute_url }}">{{ pkg.pkgname }}</a>
- </td>
+<div id="dev-dashboard" class="box">
+
+ <h2>Developer Dashboard</h2>
+
+ {% if todos %}
+ <h3>Package Todo Lists</h3>
+
+ <table id="dash-todo" class="results dash-stats">
+ <thead>
+ <tr>
+ <th>Name</th>
+ <th>Creation Date</th>
+ <th>Description</th>
+ </tr>
+ </thead>
+ <tbody>
+ {% for todo in todos %}
+ <tr class="{% cycle 'odd' 'even' %}">
+ <td class="key"><a href="/todo/{{ todo.id }}/"
+ title="View todo list: {{ todo.name }}">{{ todo.name }}</a></td>
+ <td>{{ todo.date_added }}</td>
+ <td>{{ todo.description }}</td>
+ </tr>
+ {% endfor %}
+ </tbody>
+ </table>
+ {% endif %}
+
+ <h3>My Flagged Packages</h3>
+
+ <table id="dash-myflagged" class="results dash-stats">
+ <thead>
+ <tr>
+ <th class="key">Name</th>
+ <th>Repo</th>
+ <th>Version</th>
+ <th>Arch</th>
+ </tr>
+ </thead>
+ <tbody>
+ {% for pkg in flagged %}
+ <tr class="{% cycle 'odd' 'even' %}">
+ <td><a href="{{ pkg.get_absolute_url }}"
+ title="View package details for {{ pkg.pkgname }}">{{ pkg.pkgname }}</a></td>
<td>{{ pkg.repo.name }}</td>
<td>{{ pkg.pkgver }}</td>
<td>{{ pkg.arch.name }}</td>
</tr>
- {% endfor %}
- </table>
+ {% empty %}
+ <tr><td colspan="4"><em>No flagged packages to display</em></td></tr>
+ {% endfor %}
+ </tbody>
+ </table>
+
+ <form id="dash-pkg-notify" method="post" action="/devel/notify/">
+ <fieldset>
+ <p><input id="notify" name="notify" type="checkbox" value="yes"
+ {% if user.get_profile.notify %} checked="checked"{% endif %} />
+ <label for="notify">Notify me when packages are flagged out-of-date</label>
+ <input title="Update notification status" type="submit" value="Update" /></p>
+ </fieldset>
+ </form>
+
+</div><!-- #dev-dashboard -->
+
+<div id="dash-by-arch" class="dash-stats box">
+
+ <h3 class="dash-stats" style="cursor: pointer"
+ title="Click to toggle stats by architecture" onclick="$(this).next().toggle();">
+ Stats by Architecture <span class="dash-click">(click to toggle)</span></h3>
+
+ <table id="stats-by-arch" class="results dash-stats">
+ <thead>
+ <tr>
+ <th class="key">Arch</th>
+ <th># Packages</th>
+ <th># Flagged</th>
+ </tr>
+ </thead>
+ <tbody>
+ {% for arch in arches %}
+ <tr class="{% cycle 'odd' 'even' %}">
+ <td>{{ arch.name }}</td>
+ <td><a href="/packages/?arch={{ arch.name }}"
+ title="View all packages for the {{ arch.name }} architecture">
+ <strong>{{ arch.packages.count }}</strong> packages</a></td>
+ <td><a href="/packages/?arch={{ arch.name }}&amp;flagged=Flagged"
+ title="View all flagged packages for the {{ arch.name }} architecture">
+ <strong>{{ arch.packages.flagged.count }}</strong> packages</a></td>
+ </tr>
+ {% endfor %}
+ </tbody>
+ </table>
+
+</div><!-- #dash-by-arch -->
+
+<div id="dash-by-repo" class="dash-stats box">
+
+ <h3 class="dashboard dash-stats" style="cursor: pointer"
+ title="Click to toggle stats by repository" onclick="$(this).next().toggle();">
+ Stats by Repository <span class="dash-click">(click to toggle)</span></h3>
+
+ <table id="stats-by-repo" class="results dash-stats">
+ <thead>
+ <tr>
+ <th class="key">Repository</th>
+ <th># Packages</th>
+ <th># Flagged</th>
+ </tr>
+ </thead>
+ <tbody>
+ {% for repo in repos %}
+ <tr class="{% cycle 'odd' 'even' %}">
+ <td>{{ repo.name }}</td>
+ <td><a href="/packages/?repo={{ repo.name }}"
+ title="View all packages in the {{ repo.name }} repository">
+ <strong>{{ repo.packages.count }}</strong> packages</a></td>
+ <td><a href="/packages/?repo={{ repo.name }}&amp;flagged=Flagged"
+ title="View all flagged packages in the {{ repo.name }} repository">
+ <strong>{{ repo.packages.flagged.count }}</strong> packages</a></td>
+ </tr>
+ {% endfor %}
+ </tbody>
+ </table>
+
+</div><!-- dash-by-arch -->
+
+<div id="dash-by-maintainer" class="dash-stats box">
+
+ <h3 class="dashboard dash-stats" style="cursor: pointer"
+ title="Click to toggle stats by maintainer" onclick="$(this).next().toggle();">
+ Stats by Maintainer <span class="dash-click">(click to toggle)</span></h3>
+
+ <table id="stats-by-maintainer" class="results dash-stats">
+ <thead>
+ <tr>
+ <th class="key">Maintainer</th>
+ <th># Base Packages</th>
+ <th># Flagged</th>
+ </tr>
+ </thead>
+ <tbody>
+ {% for maint in maintainers %}
+ <tr class="{% cycle 'odd' 'even' %}">
+ <td>{{ maint.get_full_name }}</td>
+ <td><a href="/packages/?maintainer={{ maint.username }}"
+ title="View all packages maintained by {{ maint.get_full_name }}">
+ <strong>{{ maint.package_relations.count }}</strong> base packages</a></td>
+ <td><a href="/packages/?maintainer={{ maint.username }}&amp;flagged=Flagged"
+ title="View all flagged packages maintained by {{ maint.get_full_name }}">
+ Flagged packages</a></td>
+ </tr>
+ {% endfor %}
+ </tbody>
+ </table>
+
+</div><!-- #dash-by-maintainer -->
{% endblock %}
diff --git a/templates/devel/mirrorlist.html b/templates/devel/mirrorlist.html
index bd09d7f2..5084ccac 100644
--- a/templates/devel/mirrorlist.html
+++ b/templates/devel/mirrorlist.html
@@ -2,34 +2,42 @@
{% block title %}Arch Linux - Mirror Overview{% endblock %}
{% block content %}
-<div class="greybox">
- <table class="results" width="100%">
- <tr>
- <th>Name</th>
- <th>Tier</th>
- <th>Country</th>
- <th>Admin Email</th>
- <th>Public</th>
- <th>Active</th>
- <th>ISOs</th>
- <th>Protocols</th>
- <th>Rsync IPs</th>
- <th>Notes</th>
- </tr>
- {% for mirror in mirror_list %}
- <tr>
- <td>{{mirror.name}}</td>
- <td>{{mirror.get_tier_display}}</td>
- <td>{{mirror.country}}</td>
- <td>{{mirror.admin_email}}</td>
- <td>{{mirror.public|yesno}}</td>
- <td>{{mirror.active|yesno}}</td>
- <td>{{mirror.isos|yesno}}</td>
- <td>{{mirror.supported_protocols}}</td>
- <td>{{mirror.rsync_ips.count}}</td>
- <td>{{mirror.notes}}</td>
- </tr>
- {% endfor %}
- </table>
+<div id="dev-mirrorlist" class="box">
+
+ <h2>Mirror List</h2>
+
+ <table class="results">
+ <thead>
+ <tr>
+ <th>Server</th>
+ <th>Tier</th>
+ <th>Country</th>
+ <th>Admin Email</th>
+ <th>Public</th>
+ <th>Active</th>
+ <th>ISOs</th>
+ <th>Protocols</th>
+ <th>Rsync IPs</th>
+ <th>Notes</th>
+ </tr>
+ </thead>
+ <tbody>
+ {% for mirror in mirror_list %}
+ <tr class="{% cycle 'odd' 'even' %}">
+ <td>{{mirror.name}}</td>
+ <td>{{mirror.get_tier_display}}</td>
+ <td>{{mirror.country}}</td>
+ <td>{{mirror.admin_email}}</td>
+ <td>{{mirror.public|yesno}}</td>
+ <td>{{mirror.active|yesno}}</td>
+ <td>{{mirror.isos|yesno}}</td>
+ <td class="wrap">{{mirror.supported_protocols}}</td>
+ <td>{{mirror.rsync_ips.count}}</td>
+ <td class="wrap">{{mirror.notes}}</td>
+ </tr>
+ {% endfor %}
+ </tbody>
+ </table>
+
</div>
{% endblock %}
diff --git a/templates/devel/profile.html b/templates/devel/profile.html
index 5b5a586b..178a59aa 100644
--- a/templates/devel/profile.html
+++ b/templates/devel/profile.html
@@ -1,21 +1,18 @@
{% extends "base.html" %}
+{% block title %}Arch Linux - Edit Profile{% endblock %}
{% block content %}
- <div class="greybox">
- <h2 class="title">Developer Profile</h2>
- <form method="post" action=".">
- <table>
- <tr>
- <th>Username:</th>
- <td><strong>{{ user.username }}</strong></td>
- </tr>
- {{form}}
- <tr>
- <td colspan="2" align="right">
- <input type="submit" value=" Save ">
- </td>
- </tr>
- </table>
- </form>
- </div>
+<div id="dev-edit-profile" class="box">
+
+ <h2>Developer Profile</h2>
+
+ <form id="edit-profile-form" method="post" action=".">
+ <fieldset>
+ <legend>Username: <strong>{{ user.username }}</strong></legend>
+ {{ form.as_p }}
+ </fieldset>
+ <p><label></label> <input title="Save changes" type="submit" value="Save" /></p>
+ </form>
+
+</div>
{% endblock %}
diff --git a/templates/forms/td_input.html b/templates/forms/td_input.html
deleted file mode 100644
index 38ff5a13..00000000
--- a/templates/forms/td_input.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<td>
- {{form_element.errors}}
- {{form_element}}
- {{form_element.help_text}}
-</td>
diff --git a/templates/general_form.html b/templates/general_form.html
index 776f3672..d499919a 100644
--- a/templates/general_form.html
+++ b/templates/general_form.html
@@ -1,25 +1,23 @@
{% extends "base.html" %}
+{% block title %}Arch Linux - {{title}}{% endblock %}
{% block content %}
- <div class="greybox">
- <h2 class="title">{{title}}</h2>
- {% if description %}{{description}}{% endif %}
- <form method="post" action=".">
- <table>
+<div id="generic-form" class="box">
+
+ <h2>{{title}}</h2>
+
+ {% if description %}{{description}}{% endif %}
+
+ <form class="general-form" method="post" action=".">
+ <fieldset>
{% for field in form %}
- <tr>
- <td style="vertical-align:top">
- <span {% if field.required %}style="fontweight: bold"{% endif%}>{{field.label}}:</span>
- <br /><span style="font-size:x-small">{{field.help_text}}</span></td>
- <td>{{field}}</td>
- </tr>
+ <p><label>{{field.label}}{% if field.help_text %}:</label><br />
+ <span class="form-help">{{field.help_text}}</span> {% else %}:</label> {% endif %}
+ {{field}} {% if field.required %}<span class="form-req-field">*</span>{% endif%}</p>
{% endfor %}
- <tr>
- <td colspan="2" style="text-align:right">
- <input type="submit" value=" {{submit_text}} " />
- </td>
- </tr>
- </table>
- </form>
- </div>
+ </fieldset>
+ <p><label></label> <input type="submit" value="{{submit_text}}" /></p>
+ </form>
+
+</div>
{% endblock %}
diff --git a/templates/mirrors/index.html b/templates/mirrors/index.html
index 73949c6f..b347a086 100644
--- a/templates/mirrors/index.html
+++ b/templates/mirrors/index.html
@@ -1,24 +1,21 @@
{% extends "base.html" %}
{% load package_extras %}
-{% block title %}Arch Linux - Generate Mirrorlist{% endblock %}
+{% block title %}Arch Linux - Pacman Mirrorlist Generator{% endblock %}
{% block content %}
-<div class="box">
- <h2 class="title">Generate Custom Mirrorlist</h2>
- <form method="post">
- <table>
- <tr>
- <td>Architecture</td>
- {% td_input mirrorlist_form.arch %}
- </tr>
- <tr>
- <td>Country</td>
- {% td_input mirrorlist_form.country %}
- </tr>
- <tr>
- <td><input type="submit" value="Generate" /></td>
- </tr>
- </table>
+<div id="mirrorlist-gen" class="box">
+
+ <h2>Pacman Mirrorlist Generator</h2>
+
+ <p>The following form can generate a custom up-to-date
+ <a href="http://wiki.archlinux.org/index.php/Pacman"
+ title="ArchWiki: Pacman">pacman</a> mirrorlist based on geography.
+ Simply replace the contents of <code>/etc/pacman.d/mirrorlist</code> with
+ the generated code.</p>
+
+ <form id="list-generator" method="post" action=".">
+ {{ mirrorlist_form.as_p }}
+ <p><label></label> <input type="submit" value="Generate List" /></p>
</form>
</div>
{% endblock %}
diff --git a/templates/news/add.html b/templates/news/add.html
index ef3f211c..38b5b21d 100644
--- a/templates/news/add.html
+++ b/templates/news/add.html
@@ -1,22 +1,25 @@
{% extends "base.html" %}
-{% block title %}Arch Linux - {% if form.instance.id %}Edit{% else %}Add{% endif %} News{% endblock %}
+{% block title %}Arch Linux - News: {% if form.instance.id %}Edit{% else %}Add{% endif %} Article{% endblock %}
{% block content %}
- <div class="greybox">
- {% if form.instance.id %}
- <h2 class="title">Edit News</h2>
- {% else %}
- <h2 class="title">Add News</h2>
- {% endif %}
- <form method="post" id="newsform" action=".">
- <table>
- {{form}}
- <tr>
- <td colspan="2" align="right">
- <input type="submit" value=" Save " />
- </td>
- </tr>
- </table>
- </form>
- </div>
+<div id="news-add-article" class="box">
+
+ {% if form.instance.id %}
+ <h2>News: Edit Article</h2>
+ {% else %}
+ <h2>News: Add Article</h2>
+ {% endif %}
+
+ <form id="newsform" method="post" action=".">
+ <fieldset>
+ {{ form.as_p }}
+ </fieldset>
+ {% if form.instance.id %}
+ <p><label></label> <input title="Save changes" type="submit" value="Save" /></p>
+ {% else %}
+ <p><label></label> <input title="Publish this article" type="submit" value="Publish" /></p>
+ {% endif %}
+ </form>
+
+</div>
{% endblock %}
diff --git a/templates/news/delete.html b/templates/news/delete.html
index c3824a26..6a2fa1e8 100644
--- a/templates/news/delete.html
+++ b/templates/news/delete.html
@@ -2,15 +2,22 @@
{% block title %}Arch Linux - Delete News{% endblock %}
{% block content %}
- <div class="greybox">
- <h2>Confirm Delete</h2>
- <hr />
- You are about to delete the news item '{{news}}'.
- <br /><br />
- Are you sure?
- <br /><br />
- <form method="post" action=".">
- <td>&nbsp; &nbsp; <input name="delete" type="submit" value=" Yes " />
- </form>
- </div>
+<div id="news-delete-entry" class="box">
+
+ <h2>News: Delete Entry Confirmation</h2>
+
+ <p>You are about to delete the following news item:</p>
+
+ <blockquote>
+ <strong>{{news}}</strong>
+ </blockquote>
+
+ <p>Are you sure?</p>
+
+ <form method="post" action=".">
+ <input title="Delete this article" id="delete" name="delete"
+ type="submit" value="Delete" /></p>
+ </form>
+
+</div>
{% endblock %}
diff --git a/templates/news/list.html b/templates/news/list.html
index a35c41e0..cadc24a2 100644
--- a/templates/news/list.html
+++ b/templates/news/list.html
@@ -1,28 +1,49 @@
{% extends "base.html" %}
{% block title %}Arch Linux - News{% endblock %}
+
{% block content %}
- <div class="greybox">
- {% if perms.main.add_news %}
- <div style="float:right">
- <a href="/news/add/">Add News Item</a>
- </div>
- {% endif %}
- <h2 class="title">News Updates</h2>
- <table class="results" width="100%">
- {% for item in news_list %}
- <tr class="{% cycle pkgr2,pkgr1 %}">
- <td>{{ item.postdate }}</td>
- <td><a href="{{ item.get_absolute_url }}">{{ item.title }}</a></td>
- <td>
- {% if perms.main.change_news %}
- <a href="/news/edit/{{ item.id }}/">edit</a>
- {% endif %}
- {% if perms.main.delete_news %}
- <a href="/news/delete/{{ item.id }}/">delete</a>
- {% endif %}
- </td>
- </tr>
- {% endfor %}
- </table>
- </div>
+<div id="news-article-list" class="box">
+
+ <h2>News Archives</h2>
+
+ {% if perms.main.add_news %}
+ <ul class="admin-actions">
+ <li><a href="/news/add/" title="Add a news item">Add News Item</a></li>
+ </ul>
+ {% endif %}
+
+ <table id="article-list" class="results">
+ <thead>
+ <tr>
+ <th>Published</th>
+ <th>Title</th>
+ <th>Author</th>
+ {% if perms.main.change_news %}
+ <th></th>
+ {% endif %}
+ </tr>
+ </thead>
+ <tbody>
+ {% for item in news_list %}
+ <tr class="{% cycle 'odd' 'even' %}">
+ <td>{{ item.postdate }}</td>
+ <td class="wrap"><a href="{{ item.get_absolute_url }}"
+ title="View: {{ item.title }}">{{ item.title }}</a></td>
+ <td>{{ item.author.get_full_name }}</td>
+ {% if perms.main.change_news %}
+ <td>
+ <a href="/news/edit/{{ item.id }}/"
+ title="Edit: {{ item.title }}">Edit</a>
+ {% endif %}
+ {% if perms.main.delete_news %}
+ &nbsp;&nbsp;<a href="/news/delete/{{ item.id }}/"
+ title="Delete: {{ item.title }}">Delete</a>
+ </td>
+ {% endif %}
+ </tr>
+ {% endfor %}
+ </tbody>
+ </table>
+
+</div>
{% endblock %}
diff --git a/templates/news/view.html b/templates/news/view.html
index 2f7c3d87..1b82bc08 100644
--- a/templates/news/view.html
+++ b/templates/news/view.html
@@ -1,14 +1,23 @@
{% extends "base.html" %}
-{% block title %}Arch Linux - {{ news.title }}{% endblock %}
+{% block title %}Arch Linux - News: {{ news.title }}{% endblock %}
{% block content %}
- <div class="box">
- <div style="float: right; font-size: small">
- {{ news.author.get_full_name }}<br />
- {{ news.postdate }}
- </div>
- <h3>{{ news.title }}</h3>
- <hr /><br />
- {{ news.content|safe|linebreaks }}
- </div>
+<div id="news-article" class="box">
+
+ <h2>News: {{ news.title }}</h2>
+
+ {% if perms.main.change_news %}
+ <ul class="admin-actions">
+ <li><a href="/news/edit/{{ news.id }}/" title="Edit this article">Edit News Item</a></li>
+ {% if perms.main.delete_news %}
+ <li><a href="/news/delete/{{ news.id }}/" title="Delete this article">Delete News Item</a></li>
+ {% endif %}
+ </ul>
+ {% endif %}
+
+ <p class="article-info">{{ news.postdate }} - {{ news.author.get_full_name }}</p>
+
+ {{ news.content|safe|linebreaks }}
+
+</div>
{% endblock %}
diff --git a/templates/packages/details.html b/templates/packages/details.html
index 78209d83..19a4b2bc 100644
--- a/templates/packages/details.html
+++ b/templates/packages/details.html
@@ -1,134 +1,166 @@
{% extends "base.html" %}
{% block title %}Arch Linux - {{ pkg.pkgname }} {{ pkg.pkgver }}-{{ pkg.pkgrel }} - Package Details{% endblock %}
+
{% block content %}
- <div class="box">
- <h2 class="title">{{ pkg.pkgname }} {{ pkg.pkgver }}-{{ pkg.pkgrel }}</h2>
- <div style="float:right" class="listing">
- <ul class="small">
- <li><a href="{{ pkg.get_arch_svn_link }}">SVN Entries ({{pkg.repo|lower}}-{{pkg.arch}})</a></li>
- <li><a href="{{ pkg.get_trunk_svn_link }}">SVN Entries (trunk)</a></li>
- <li><a href="{{ pkg.get_bugs_link }}">Bug Reports</a></li>
- <li>
+<div id="pkgdetails" class="box">
+
+ <h2>Package Details: {{ pkg.pkgname }} {{ pkg.pkgver }}-{{ pkg.pkgrel }}</h2>
+
+ <div id="actionlist" class="listing">
+
+ <ul class="small">
+ <li><a href="{{ pkg.get_arch_svn_link }}" title="View PKGBUILD
+ files for {{ pkg.pkgname }} in the {{pkg.repo|lower}}-{{pkg.arch}}
+ subversion branch">SVN Entries ({{pkg.repo|lower}}-{{pkg.arch}})</a></li>
+ <li><a href="{{ pkg.get_trunk_svn_link }}" title="View PKGBUILD
+ files for {{ pkg.pkgname }} in the subversion trunk">SVN Entries (trunk)</a></li>
+ <li><a href="{{ pkg.get_bugs_link }}" title="View existing bug
+ tickets for {{ pkg.pkgname }}">Bug Reports</a></li>
+ <li>
{% if pkg.needupdate %}
- <span style="font-size:x-small"><em>This package has been flagged out-of-date</em></span>
+ <span class="flagged">This package has been flagged out-of-date</span>
{% if user.is_authenticated %}
- <br />&nbsp; &nbsp; <a href="/packages/unflag/{{ pkg.id }}/">Click here to unflag</a>
+ <br />&nbsp; &nbsp; <a href="/packages/unflag/{{ pkg.id }}/"
+ title="Unflag this package">Click here to unflag</a>
{% endif %}
{% else %}
- <a href="/packages/flag/{{ pkg.id }}/">Flag Package Out-of-Date</a>
- <a href="/packages/flaghelp/" onclick="return !window.open('/packages/flaghelp','FlagHelp','height=350,width=450,location=no,scrollbars=yes,menubars=no,toolbars=no,resizable=no');"><span style="font-size:x-small">(?)</span></a>
+ <a href="/packages/flag/{{ pkg.id }}/" title="Flag {{ pkg.pkgname }} as out-of-date">Flag Package Out-of-Date</a>
+ <a href="/packages/flaghelp/"
+ title="Get help on package flagging"
+ onclick="return !window.open('/packages/flaghelp','FlagHelp',
+ 'height=350,width=450,location=no,scrollbars=yes,menubars=no,toolbars=no,resizable=no');">(?)</a>
{% endif %}
- </li>
- {% if user.is_authenticated %}
- <li>&nbsp;</li>
- <li>
- <form name="devaction" method="post" action="/packages/update/">
- <input type="hidden" name="pkgid" value="{{ pkg.id }}" />
- <input type="submit" style="background: #e1e3e6;" name="adopt" value="Adopt Package" />
- <input type="submit" style="background: #e1e3e6;" name="disown" value="Disown Package" />
- </form>
- </li>
- {% endif %}
+ </li>
+ </ul>
+
+ {% if user.is_authenticated %}
+ <form id="pkg-action" method="post" action="/packages/update/">
+ <div><input type="hidden" name="pkgid" value="{{ pkg.id }}" /></div>
+ <p><input title="Adopt this package" type="submit" class="adopt" name="adopt" value="Adopt" />
+ &nbsp;&nbsp;<input title="Orphan this package" type="submit" class="disown" name="disown" value="Disown" /></p>
+ </form>
+ {% endif %}
+
+ </div><!-- #actionlist -->
+
+ <table id="pkginfo">
+ <tr>
+ <th>Architecture:</th>
+ <td><a href="/packages/?arch={{ pkg.arch.name }}"
+ title="Browse packages for {{ pkg.arch.name }} architecture">{{ pkg.arch.name }}</a></td>
+ </tr><tr>
+ <th>Repository:</th>
+ <td><a href="/packages/?repo={{ pkg.repo.name|capfirst }}"
+ title="Browse the {{ pkg.repo.name|capfirst }} repository">{{ pkg.repo.name|capfirst }}</a></td>
+ </tr><tr>
+ </tr>{% ifnotequal pkg.pkgname pkg.pkgbase %}<tr>
+ <th>Base Package Name:</th>
+ <td>{{ pkg.pkgbase }}</td>
+ </tr>{% endifnotequal %}<tr>
+ <th>Description:</th>
+ <td>{% if pkg.pkgdesc %}{{ pkg.pkgdesc }}{% endif %}</td>
+ </tr><tr>
+ <th>Upstream URL:</th>
+ <td>{% if pkg.url %}<a href="{{ pkg.url }}">{{ pkg.url }}</a>{% endif %}</td>
+ </tr><tr>
+ <th>License:</th>
+ <td>{{ pkg.license }}</td>
+ </tr><tr>
+ <th>Maintainers:</th>
+ {% with pkg.maintainers as maints %}
+ <td>{% if maints %}
+ {% for m in maints %}
+ {{ m.get_full_name }}<br/>
+ {% endfor %}
+ {% else %}Orphan{% endif %}
+ </td>
+ {% endwith %}
+ </tr><tr>
+ <th>Package Size:</th>
+ <td>{{ pkg.compressed_size|filesizeformat }}</td>
+ </tr><tr>
+ <th>Installed Size:</th>
+ <td>{{ pkg.installed_size|filesizeformat }}</td>
+ </tr><tr>
+ <th>Build Date:</th>
+ <td>{{ pkg.build_date }} UTC</td>
+ </tr><tr>
+ <th>Last Updated:</th>
+ <td>{{ pkg.last_update|date:"Y-m-d" }}</td>
+ </tr>
+ </table>
+
+ <div id="metadata">
+
+ {% with pkg.get_depends as deps %}
+ <div id="pkgdeps" class="listing">
+
+ <h3 title="{{ pkg.pkgname }} has the following dependencies">
+ Dependencies ({{deps|length}})</h3>
+
+ {% if deps %}
+ <ul>
+ {% for depend in deps %}
+ {% ifequal depend.pkg None %}
+ <li>{{ depend.dep.depname }} (virtual)</li>
+ {% else %}
+ <li><a href="{{ depend.pkg.get_absolute_url }}"
+ title="View package details for {{ depend.dep.depname }}">{{ depend.dep.depname }}</a>
+ {{ depend.dep.depvcmp }}{% if depend.pkg.repo.testing %}
+ <span class="testing-dep">(testing)</span>{% endif %}</li>
+ {% endifequal %}
+ {% endfor %}
</ul>
- </div>
- <table class="listing">
- <tr>
- <th>Architecture:</th>
- <td>{{ pkg.arch.name }}</td>
- </tr><tr>
- <th>Repository:</th>
- <td>{{ pkg.repo.name|capfirst }}</td>
- </tr>{% ifnotequal pkg.pkgname pkg.pkgbase %}<tr>
- <th>Base Package Name:</th>
- <td>{{ pkg.pkgbase }}</td>
- </tr>{% endifnotequal %}<tr>
- <th>Description:</th>
- <td>{% if pkg.pkgdesc %}{{ pkg.pkgdesc }}{% endif %}</td>
- </tr><tr>
- <th>Upstream URL:</th>
- <td>{% if pkg.url %}<a href="{{ pkg.url }}">{{ pkg.url }}</a>{% endif %}</td>
- </tr><tr>
- <th>License:</th>
- <td>{{ pkg.license }}</td>
- </tr><tr>
- <th>Maintainer:</th>
- {% with pkg.maintainers as maints %}
- <td>{% if maints %}
- {% for m in maints %}
- {{ m.get_full_name }}<br/>
- {% endfor %}
- {% else %}Orphan{% endif %}
- </td>
- {% endwith %}
- </tr><tr>
- <th>Package Size:</th>
- <td>{{ pkg.compressed_size|filesizeformat }}</td>
- </tr><tr>
- <th>Installed Size:</th>
- <td>{{ pkg.installed_size|filesizeformat }}</td>
- </tr><tr>
- <th>Build Date:</th>
- <td>{{ pkg.build_date }} UTC</td>
- </tr><tr>
- <th>Last Updated:</th>
- <td>{{ pkg.last_update|date:"Y-m-d" }}</td>
- </tr>
- </table>
- <br />
- <table width="100%">
- <tr>
- <td valign="top" width="50%">
- {% with pkg.get_depends as deps %}
- <div class="listing">
- <h4>Dependencies ({{deps|length}}):</h4>
- {% if deps %}
- <ul style="font-size:small;list-style:none">
- {% for depend in deps %}
- {% ifequal depend.pkg None %}
- <li>{{ depend.dep.depname }} (virtual)</li>
- {% else %}
- <li><a href="{{ depend.pkg.get_absolute_url }}">{{ depend.dep.depname }}</a>{{ depend.dep.depvcmp }}{% if depend.pkg.repo.testing %} (testing){% endif %}</li>
- {% endifequal %}
- {% endfor %}
- </ul>
- {% endif %}
- </div>
- {% endwith %}
- </td>
- <td valign="top">
- {% with pkg.get_requiredby as rqdby %}
- <div class="listing">
- <h4>Required By ({{rqdby|length}}):</h4>
- {% if rqdby %}
- <ul style="font-size:small;list-style:none">
- {% for req in rqdby %}
- <li><a href="{{req.get_absolute_url}}">{{ req.pkgname }}</a>{% if req.repo.testing %} (testing){% endif %}</li>
- {% endfor %}
- </ul>
- {% endif %}
- </div>
- {% endwith %}
- </td>
- </tr>
- </table>
- <div class="listing" id="filelist">
- <h4>Files:</h4>
- <p style="padding: 10px 20px;">
- <a id="filelink" href="files/">View File List</a>
- </p>
- </div>
- </div>
+ {% endif %}
+
+ </div><!-- #pkgdeps -->
+ {% endwith %}
+
+ {% with pkg.get_requiredby as rqdby %}
+ <div id="pkgreqs" class="listing">
+
+ <h3 title="Packages that require {{ pkg.pkgname }}">
+ Required By ({{rqdby|length}})</h3>
+
+ {% if rqdby %}
+ <ul>
+ {% for req in rqdby %}
+ <li><a href="{{req.get_absolute_url}}"
+ title="View package details for {{ req.pkgname }}">{{ req.pkgname }}</a>
+ {% if req.repo.testing %} (testing){% endif %}</li>
+ {% endfor %}
+ </ul>
+ {% endif %}
+
+ </div><!-- #pkgreqs -->
+ {% endwith %}
+
+ <div id="pkgfiles" class="listing">
+
+ <h3 title="Complete list of files contained within this package">
+ Package Contents</h3>
+
+ <div id="pkgfilelist">
+ <p><a id="filelink" href="files/"
+ title="Click to view the complete file list for {{ pkg.pkgname }}">
+ View the file list for {{ pkg.pkgname }}</a></p>
+ </div>
+
+ </div><!-- #pkgfiles -->
+
+ </div><!-- #metadata -->
+</div><!-- #pkgdetails -->
+
{% load cdn %}{% jquery %}
<script type="text/javascript">
function ajaxifyFiles() {
$('#filelink').click(function(event) {
event.preventDefault();
$.get(this.href, function(data) {
- $('#filelist').html(data);
+ $('#pkgfilelist').html(data);
});
});
}
$(document).ready(ajaxifyFiles);
</script>
{% endblock %}
-
diff --git a/templates/packages/files-list.html b/templates/packages/files-list.html
index dee18ecd..c45e0f10 100644
--- a/templates/packages/files-list.html
+++ b/templates/packages/files-list.html
@@ -1,10 +1,9 @@
-<h4>Files:</h4>
{% if files.count %}
-<ul style="font-size:small;list-style:none">
-{% for file in files %}
-<li>{{ file.path }}</li>
-{% endfor %}
+<ul>
+ {% for file in files %}
+ <li>{{ file.path }}</li>
+ {% endfor %}
</ul>
{% else %}
-<p style="padding: 10px 20px;">No filelist available.</p>
+<p>No file list available.</p>
{% endif %}
diff --git a/templates/packages/files.html b/templates/packages/files.html
index 2f951062..7dc111b4 100644
--- a/templates/packages/files.html
+++ b/templates/packages/files.html
@@ -1,14 +1,16 @@
{% extends "base.html" %}
{% block title %}Arch Linux - {{ pkg.pkgname }} {{ pkg.pkgver }}-{{ pkg.pkgrel }} - Package File List{% endblock %}
+
{% block content %}
- <div class="box">
- <h2 class="title">{{ pkg.pkgname }} {{ pkg.pkgver }}-{{ pkg.pkgrel }}</h2>
- <p style="padding: 10px 20px;">
- <a href="{{ pkg.get_absolute_url }}">Back to Package</a>
- </p>
- <div class="listing" id="filelist">
+<div id="pkgdetails" class="box">
+
+ <h2>Package File List: {{ pkg.pkgname }} {{ pkg.pkgver }}-{{ pkg.pkgrel }}</h2>
+ <p><a href="{{ pkg.get_absolute_url }}">Back to Package</a></p>
+
+ <div id="metadata">
{% include "packages/files-list.html" %}
- </div>
</div>
+
+</div>
{% endblock %}
diff --git a/templates/packages/flag.html b/templates/packages/flag.html
index 1071fdf8..1e85be89 100644
--- a/templates/packages/flag.html
+++ b/templates/packages/flag.html
@@ -2,28 +2,40 @@
{% block title %}Arch Linux - Flag Package - {{ pkg.pkgname }}{% endblock %}
{% block content %}
-<div>
- {% if confirmed %}
- <p>Thank you. Maintainers have been notified.</p>
- {% else %}
- <p>If you notice that one of Arch's packages is out of date (ie, there is a
- newer <b>stable</b> release available), then please notify us using the
- form below.</p>
- <p>The message box portion of the flag utility is optional, and meant for
- short messages only. If you need more than 200 characters for your
- message, then file a bug report, email the maintainer directly, or send an
- email to the arch-general mailing list with your additional text.</p>
-
- <p><b>Note:</b> Please do <i>not</i> use this facility if the package is
- broken! Use the <a href='http://bugs.archlinux.org'>bug tracker</a>
- instead.</p>
+<div id="pkg-flag" class="box">
+{% if confirmed %}
+ <h2>Package Flagged</h2>
+
+ <p>Thank you, the maintainers have been notified about <strong>{{ pkg.pkgname }}</strong>.</p>
+
+ <p>You can return to the package details page for
+ <a href="{{ pkg.get_absolute_url }}" title="Package details for {{pkg.pkgname}}">{{pkg.pkgname}}</a>.</p>
+{% else %}
+ <h2>Flag Package: {{ pkg.pkgname }}</h2>
+
+ <p>If you notice a package is out of date (i.e., there is a newer
+ <strong>stable</strong> release available), then please notify us using
+ the form below.</p>
+
+ <p>The message box portion of the flag utility is optional, and meant
+ for short messages only. If you need more than 200 characters for your
+ message, then file a bug report, email the maintainer directly, or send
+ an email to the <a href="http://mailman.archlinux.org/mailman/listinfo/arch-general"
+ title="Visit the arch-general mailing list">arch-general mailing list</a>
+ with your additional text.</p>
+
+ <p><strong>Note:</strong> Please do <em>not</em> use this facility if the
+ package is broken! Use the <a href="http://bugs.archlinux.org"
+ title="Arch Linux Bugtracker">bug tracker</a> instead.</p>
+
<p>Please confirm your flag request for {{pkg.pkgname}}:</p>
- <form method="post" action=".">
- <table>
- {{form}}
- </table>
- <input type="submit" value=" Confirm " />
- </form>
- {% endif %}
+
+ <form id="flag-pkg-form" method="post" action=".">
+ <fieldset>
+ {{ form.as_p }}
+ </fieldset>
+ <p><label></label> <input title="Flag {{ pkg.pkgname }} as out-of-date" type="submit" value="Flag Package" /></p>
+ </form>
+{% endif %}
</div>
{% endblock %}
diff --git a/templates/packages/flagged.html b/templates/packages/flagged.html
index 3461bbda..7d5e1c60 100644
--- a/templates/packages/flagged.html
+++ b/templates/packages/flagged.html
@@ -2,7 +2,14 @@
{% block title %}Arch Linux - Flag Package - {{ pkg.pkgname }}{% endblock %}
{% block content %}
- <p>
- {{pkg.pkgname}} has already been flagged out of date.
- </p>
+<div id="pkg-flagged-error" class="box">
+
+ <h2>Error: Package already flagged</h2>
+
+ <p><strong>{{pkg.pkgname}}</strong> has already been flagged out-of-date.</p>
+
+ <p>You can return to the package details page for
+ <a href="{{ pkg.get_absolute_url }}" title="Package details for {{pkg.pkgname}}">{{pkg.pkgname}}</a>.</p>
+
+</div>
{% endblock %}
diff --git a/templates/packages/flaghelp.html b/templates/packages/flaghelp.html
index c376175e..d8ca643b 100644
--- a/templates/packages/flaghelp.html
+++ b/templates/packages/flaghelp.html
@@ -1,27 +1,37 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <title>Flagging Packages</title>
- <meta http-equiv="content-type" content="text/html; charset=utf-8" />
- </head>
- <body>
- <div style="font-family: sans-serif;">
- <p>If you notice that one of Arch's packages is out of date (ie,
- there is a newer <b>stable</b> release available), then please
- notify us by using the <b>Flag</b> button in the <i>Package
- Details</i> screen. This will notify the maintainer responsible
- for that package so they can update it.</p>
+ <head>
+ <title>Flagging Packages</title>
+ <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+ <style type="text/css" media="screen, projection">
+ <!--
+ body { background: #eef; color: #444; font-family: sans-serif; }
+ a { color: #07b; text-decoration: none; }
+ a:hover { text-decoration: underline; }
+ -->
+ </style>
+ </head>
+ <body>
- <p>The message box portion of the flag utility is optional, and
- meant for short messages only. If you need more than 200 characters
- for your message, then file a bug report, email the maintainer
- directly, or send an email to the arch-general mailing list with
- your additional text.</p>
+ <h3>Flagging Packages</h3>
- <p><b>Note:</b> Please do <i>not</i> use this facility if the
- package is broken! Use the
- <a target="_blank" href='http://bugs.archlinux.org'>bugtracker</a> instead.</p>
- </div>
- </body>
+ <p>If you notice that a package is out-of-date (i.e., there is a newer
+ <strong>stable</strong> release available), then please notify us by
+ using the <strong>Flag</strong> button in the <em>Package Details</em>
+ screen. This will notify the maintainer(s) responsible for that
+ package so they can update it.</p>
+
+ <p>The message box portion of the flag utility is optional, and meant
+ for short messages only. If you need more than 200 characters for your
+ message, then file a bug report, email the maintainer directly, or send
+ an email to the <a target="_blank" href="http://mailman.archlinux.org/mailman/listinfo/arch-general"
+ title="Visit the arch-general mailing list">arch-general mailing list</a>
+ with your additional text.</p>
+
+ <p><strong>Note:</strong> Please do <em>not</em> use this facility if the
+ package is broken! Use the <a target="_blank" href="http://bugs.archlinux.org"
+ title="Arch Linux Bugtracker">bugtracker</a> instead.</p>
+
+ </body>
</html>
diff --git a/templates/packages/search.html b/templates/packages/search.html
index 4f7bc776..2c85f0bc 100644
--- a/templates/packages/search.html
+++ b/templates/packages/search.html
@@ -1,6 +1,7 @@
{% extends "base.html" %}
{% load package_extras %}
-{% block title %}Arch Linux - Package Search{% endblock %}
+{% block title %}Arch Linux - Package Database{% endblock %}
+
{% block head %}
<link rel="stylesheet" type="text/css" href="/media/admin_media/css/widgets.css" />
<script type="text/javascript" src="/jsi18n/"></script>
@@ -9,129 +10,145 @@
{% endblock %}
{% block content %}
- <div class="greybox">
- <h4 style="text-align: right">Search Criteria</h4>
- <form method="get" action="/packages/">
- <input type="hidden" name="sort" value='{{sort}}' />
- <table width="100%">
- <tr>
- <td><span class="smalltext">Arch</span></td>
- <td><span class="smalltext">Repository</span></td>
- <td><span class="smalltext">Keywords</span></td>
- <td><span class="smalltext">Maintainer</span></td>
- <td><span class="smalltext">Last Update</span></td>
- <td><span class="smalltext">Flagged</span></td>
- <td><span class="smalltext">Per Page</span></td>
- </tr>
- <tr>
- {% td_input search_form.arch %}
- {% td_input search_form.repo %}
- {% td_input search_form.q %}
- {% td_input search_form.maintainer%}
- {% td_input search_form.last_update %}
- {% td_input search_form.flagged %}
- {% td_input search_form.limit %}
- <td><input type="submit" value="Search" /></td>
- </tr>
- </table>
- </form>
+<div id="pkglist-search" class="box">
+
+ <h2>Package Database</h2>
+
+ <h3>Package Search</h3>
+
+ <form id="pkg-search" method="get" action="/packages/">
+ <p><input type="hidden" name="sort" value='{{sort}}' /></p>
+ <fieldset>
+ <legend>Enter search criteria</legend>
+ <div><label title="Limit results a specific CPU architecture">
+ Arch</label>{{ search_form.arch }}</div>
+ <div><label title="Limit results to a specific respository">
+ Repository</label>{{ search_form.repo }}</div>
+ <div><label title="Enter keywords as desired">
+ Keywords</label>{{ search_form.q }}</div>
+ <div><label title="Limit results to a specific maintainer">
+ Maintainer</label>{{ search_form.maintainer}}</div>
+ <div><label title="Limit results to a date after the date entered">
+ Last Update</label>{{ search_form.last_update }}</div>
+ <div><label title="Limit results based on out-of-date status">
+ Flagged</label>{{ search_form.flagged }}</div>
+ <div><label title="Select the number of results to display per page">
+ Per Page</label>{{ search_form.limit }}</div>
+ <div ><label>&nbsp;</label><input title="Search for packages using this criteria"
+ type="submit" value="Search" /></div>
+ </fieldset>
+ </form>
+
+</div><!-- #pkglist-search -->
+
+{% if package_list %}
+<div id="pkglist-results" class="box">
+
+ {% if paginator %}
+ <div id="pkglist-stats-top">
+
+ <p>{{paginator.count}} packages found.
+ Page {{page_obj.number}} of {{paginator.num_pages}}.</p>
+
+ <p class="pkglist-nav">
+ {% if page_obj.has_previous %}
+ <a class="prev" href="/packages/{{page_obj.previous_page_number}}/{{current_query}}"
+ title="Go to previous page">&lt; Prev</a>
+ {% else %}
+ <span class="prev">&lt; Prev</span>
+ {% endif %}
+ {% if page_obj.has_next %}
+ <a class="next" href="/packages/{{page_obj.next_page_number}}/{{current_query}}"
+ title="Go to next page">Next &gt;</a>
+ {% else %}
+ <span class="next">Next &gt;</span>
+ {% endif %}
+ </p>
+
</div>
- <br /><br />
+ {% endif %}
+
+ <form id="pkglist-results-form" method="post" action="/packages/update/">
- {% if package_list %}
- <div class="greybox">
- <form method="post" action="/packages/update/">
- <table class="results" width="100%">
- {% if paginator %}
+ <table class="results">
+ <thead>
<tr>
- <td colspan="{% if user.is_authenticated %}5{% else %}4{% endif %}">
- {{paginator.count}} packages found.
- Page {{page_obj.number}} of {{paginator.num_pages}}.
- </td>
- <td>
- {% if page_obj.has_previous %}
- <a href="/packages/{{page_obj.previous_page_number}}/{{current_query}}">
- &lt;&lt;&lt; Previous
- </a>
- {% else %}
- &lt;&lt;&lt; Previous
- {% endif %}
- </td>
- <td>
- {% if page_obj.has_next %}
- <a href="/packages/{{page_obj.next_page_number}}/{{current_query}}">
- Next &gt;&gt;&gt;
- </a>
- {% else %}
- Next &gt;&gt;&gt;
- {% endif %}
- </td>
+ {% if user.is_authenticated %}
+ <th>&nbsp;</th>
+ {% endif %}
+ <th><a href="/packages/{% buildsortqs "arch" %}"
+ title="Sort packages by architecture">Arch</a></th>
+ <th><a href="/packages/{% buildsortqs "repo" %}"
+ title="Sort packages by repository">Repo</a></th>
+ <th><a href="/packages/{% buildsortqs "pkgname" %}"
+ title="Sort packages by package name">Name</a></th>
+ <th>Version</th>
+ <th>Description</th>
+ <th><a href="/packages/{% buildsortqs "-last_update" %}"
+ title="Sort packages by last update">Last Updated</a></th>
</tr>
- {% endif %}
- <tr>
- {% if user.is_authenticated %}
- <th>&nbsp;</th>
- {% endif %}
- <th><a href="/packages/{% buildsortqs "arch" %}">Arch</a></th>
- <th><a href="/packages/{% buildsortqs "repo" %}">Repo</a></th>
- <th><a href="/packages/{% buildsortqs "pkgname" %}">Name</a></th>
- <th>Version</th>
- <th>Description</th>
- <th><a href="/packages/{% buildsortqs "-last_update" %}">Last Updated</a></th>
-
- </tr>
+ </thead>
+ <tbody>
{% for pkg in package_list %}
- <tr class="{% cycle pkgr2,pkgr1 %}">
+ <tr class="{% cycle 'odd' 'even' %}">
{% if user.is_authenticated %}
<td><input type="checkbox" name="pkgid" value="{{ pkg.id }}" /></td>
{% endif %}
<td>{{ pkg.arch.name }}</td>
<td>{{ pkg.repo.name|capfirst }}</td>
- <td><a href="{{ pkg.get_absolute_url }}">{{ pkg.pkgname }}</a></td>
- {% if pkg.needupdate %}
- <td><span style="color:red">{{ pkg.pkgver }}-{{ pkg.pkgrel }}</span></td>
- {% else %}
+ <td><a href="{{ pkg.get_absolute_url }}"
+ title="View package details for {{ pkg.pkgname }}">{{ pkg.pkgname }}</a></td>
+ {% if pkg.needupdate %}
+ <td><span style="flagged">{{ pkg.pkgver }}-{{ pkg.pkgrel }}</span></td>
+ {% else %}
<td>{{ pkg.pkgver }}-{{ pkg.pkgrel }}</td>
- {% endif %}
- <td>{{ pkg.pkgdesc }}</td>
+ {% endif %}
+ <td class="wrap">{{ pkg.pkgdesc }}</td>
<td>{{ pkg.last_update|date:"Y-m-d" }}</td>
</tr>
{% endfor %}
- {% if paginator %}
- <tr>
- <td colspan="{% if user.is_authenticated %}5{% else %}4{% endif %}">
- {{paginator.count}} packages found.
- Page {{page_obj.number}} of {{paginator.num_pages}}.
- </td>
- <td>
- {% if page_obj.has_previous %}
- <a href="/packages/{{page_obj.previous_page_number}}/{{current_query}}">
- &lt;&lt;&lt; Previous
- </a>
- {% else %}
- &lt;&lt;&lt; Previous
- {% endif %}
- </td>
- <td>
- {% if page_obj.has_next %}
- <a href="/packages/{{page_obj.next_page_number}}/{{current_query}}">
- Next &gt;&gt;&gt;
- </a>
- {% else %}
- Next &gt;&gt;&gt;
- {% endif %}
- </td>
- </tr>
- {% endif %}
+ </tbody>
</table>
- {% if user.is_authenticated %}
- <div id="adoptbox">
- <input type="submit" name="adopt" value="Adopt Packages">
- <input type="submit" name="disown" value="Disown Packages">
+
+ {% if paginator %}
+ <div id="pkglist-stats-bottom">
+
+ <p>{{paginator.count}} packages found. Page {{page_obj.number}} of {{paginator.num_pages}}.</p>
+
+ <p class="pkglist-nav">
+ {% if page_obj.has_previous %}
+ <a class="prev" href="/packages/{{page_obj.previous_page_number}}/{{current_query}}"
+ title="Go to previous page">&lt; Prev</a>
+ {% else %}
+ <span class="prev">&lt; Prev</span>
+ {% endif %}
+ {% if page_obj.has_next %}
+ <a class="next" href="/packages/{{page_obj.next_page_number}}/{{current_query}}"
+ title="Go to next page">Next &gt;</a>
+ {% else %}
+ <span class="next">Next &gt;</span>
+ {% endif %}
+ </p>
+
</div>
{% endif %}
- </form>
- </div>
- {% endif %}
-{% endblock %}
+ {% if user.is_authenticated %}
+ <p><input title="Adopt selected packages" type="submit" id="adopt-btn"
+ name="adopt" value="Adopt Packages" />
+ <input title="Orphan selected packages" type="submit" id="disown-btn"
+ name="disown" value="Disown Packages" /></p>
+ {% endif %}
+
+ </form>
+
+</div><!-- #pkglist-results -->
+
+<div id="pkglist-about" class="box">
+ <p>You are browsing the Arch Linux package database. From here you can find
+ detailed information about packages located in the official supported repositories.
+ For unsupported packages, browse the <a href="http://aur.archlinux.org/"
+ title="AUR package database">Arch User Repository (AUR).</a></p>
+</div>
+{% endif %}
+{% endblock %}
diff --git a/templates/packages/signoffs.html b/templates/packages/signoffs.html
index cb6a848e..930b606e 100644
--- a/templates/packages/signoffs.html
+++ b/templates/packages/signoffs.html
@@ -2,9 +2,13 @@
{% block title %}Arch Linux - Package Signoffs{% endblock %}
{% block content %}
- {% if packages %}
- <div class="greybox">
- <table class="results" width="100%">
+{% if packages %}
+<div id="dev-signoffs" class="box">
+
+ <h2>Package Signoffs</h2>
+
+ <table id="signoffs" class="results">
+ <thead>
<tr>
<th>Arch</th>
<th>Package</th>
@@ -14,28 +18,33 @@
<th>Approved</th>
<th>Signoff</th>
</tr>
- {% for pkg,target in packages %}
- <tr class="{% cycle pkgr2,pkgr1 %}">
+ </thead>
+ <tbody>
+ {% for pkg,target in packages %}
+ <tr class="{% cycle 'odd' 'even' %}">
<td>{{ pkg.arch.name }}</td>
- <td><a href="{{ pkg.get_absolute_url }}">{{ pkg.pkgname }}</a></td>
+ <td><a href="{{ pkg.get_absolute_url }}"
+ title="View package details for {{ pkg.pkgname }}">{{ pkg.pkgname }}</a></td>
<td>{{ pkg.pkgver }}-{{ pkg.pkgrel }}</td>
<td>{{ pkg.last_update }}</td>
<td>{{ target }}</td>
- <td class="signoff_{{pkg.approved_for_signoff|yesno}}">{{ pkg.approved_for_signoff|yesno:"Yes,No" }}</td>
+ <td class="signoff-{{pkg.approved_for_signoff|yesno}}">
+ {{ pkg.approved_for_signoff|yesno:"Yes,No" }}</td>
<td>
<ul>
- {% for signoff in pkg.signoffs %}
- <li>{{signoff.packager}}</li>
- {% endfor %}
- <li>
- <a href="/packages/signoff_package/{{pkg.arch}}/{{pkg.pkgname}}/">Signoff</a>
- </li>
+ <li><a href="/packages/signoff_package/{{pkg.arch}}/{{pkg.pkgname}}/"
+ title="Signoff {{pkg.pkgname}} for {{pkg.arch}}">Signoff</a>
+ </li>
+ {% for signoff in pkg.signoffs %}
+ <li class="signed-username" title="Signed off by {{signoff.packager}}">
+ {{signoff.packager}}</li>
+ {% endfor %}
</ul>
</td>
</tr>
{% endfor %}
- </table>
- </div>
- {% endif %}
+ </tbody>
+ </table>
+</div>
+{% endif %}
{% endblock %}
-
diff --git a/templates/public/art.html b/templates/public/art.html
index 960a566c..9b0bd62f 100644
--- a/templates/public/art.html
+++ b/templates/public/art.html
@@ -1,78 +1,129 @@
{% extends "base.html" %}
{% block title %}Arch Linux - Artwork{% endblock %}
+
{% block content %}
-<div class="box">
- <h2 class="title">Arch Linux Logos and Artwork</h2>
- <h3>Official Packages</h3>
- <p>Official logos, artwork, and more are available from the Extra repository. Currently, these packages are:</p>
+<div id="artwork" class="box">
+
+ <h2>Arch Linux Logos and Artwork</h2>
+
+ <h3>Logos for Press Usage</h3>
+
+ <p>The following Arch Linux logos are available for press and other use, subject to
+ the restrictions of our <a href="http://wiki.archlinux.org/index.php/DeveloperWiki:TrademarkPolicy"
+ title="Arch Linux Trademark Policy">trademark policy</a>.</p>
+
+ <p><strong>Two-color standard version</strong><br />
+ <em>Also available in print-quality
+ <a href="/media/logos/archlinux-logo-dark-1200dpi.png"
+ title="Download 1200dpi PNG format">PNG</a> and scalable
+ <a href="/media/logos/archlinux-logo-dark-scalable.svg"
+ title="Download scalable SVG format">SVG</a> formats.</em></p>
+
+ <img src="/media/logos/archlinux-logo-dark-90dpi.png"
+ alt="Arch Linux PNG logo @ 90dpi" title="Arch Linux PNG logo @ 90dpi" />
+
+ <p><strong>Two-color inverted version</strong> (for dark backgrounds)<br />
+ <em>Also available in print-quality
+ <a href="/media/logos/archlinux-logo-light-1200dpi.png"
+ title="Download 1200dpi PNG format">PNG</a> and scalable
+ <a href="/media/logos/archlinux-logo-light-scalable.svg"
+ title="Download scalable SVG format">SVG</a> formats.</em></p>
+
+ <img src="/media/logos/archlinux-logo-light-90dpi.png"
+ alt="Arch Linux PNG logo @ 90dpi" title="Arch Linux PNG logo @ 90dpi" class="inverted" />
+
+ <p><strong>One-color standard version</strong><br />
+ <em>Also available in print-quality
+ <a href="/media/logos/archlinux-logo-black-1200dpi.png"
+ title="Download 1200dpi PNG format">PNG</a> and scalable
+ <a href="/media/logos/archlinux-logo-black-scalable.svg"
+ title="Download scalable SVG format">SVG</a> formats.</em></p>
+
+ <img src="/media/logos/archlinux-logo-black-90dpi.png"
+ alt="Arch Linux PNG logo @ 90dpi" title="Arch Linux PNG logo @ 90dpi" />
+
+ <p><strong>One-colour inverted version</strong> (for dark backgrounds)<br />
+ <em>Also available in print-quality
+ <a href="/media/logos/archlinux-logo-white-1200dpi.png"
+ title="Download 1200dpi PNG format">PNG</a> and scalable
+ <a href="/media/logos/archlinux-logo-white-scalable.svg"
+ title="Download scalable SVG format">SVG</a> formats.</em></p>
+
+ <img src="/media/logos/archlinux-logo-white-90dpi.png"
+ alt="Arch Linux PNG logo @ 90dpi" title="Arch Linux PNG logo @ 90dpi" class="inverted" />
+
+ <h3>Logos and Artwork for the Community</h3>
+
+ <p>Official logos and artwork are also available directly from the
+ repositories. Currently, these packages are:</p>
+
<ul>
- <li><strong>archlinux-artwork</strong> - official logos, icons and CD labels</li>
- <li><strong>archlinux-wallpaper</strong> - a variety of desktop wallpapers for standard and widescreen resolutions</li>
- <li><strong>archlinux-themes-gdm</strong> - GDM login themes</li>
- <li><strong>archlinux-themes-kde</strong> - KDE themes and icons</li>
- <li><strong>archlinux-themes-kdm</strong> - KDM login themes</li>
- <li><strong>archlinux-themes-ksplash</strong> - Ksplash themes</li>
- <li><strong>archlinux-themes-slim</strong> - SLiM login themes</li>
+ <li><strong>archlinux-artwork</strong> - official logos, icons and CD labels</li>
+ <li><strong>archlinux-wallpaper</strong> - a variety of desktop wallpapers
+ for standard and widescreen resolutions</li>
+ <li><strong>archlinux-themes-kde</strong> - KDE themes and icons</li>
+ <li><strong>archlinux-themes-kdm</strong> - KDM login themes</li>
+ <li><strong>archlinux-themes-slim</strong> - SLiM login themes</li>
</ul>
- <p>Alternatively, you can <a href="ftp://ftp.archlinux.org/other/artwork/" title="Browse the FTP archives">download the source files via FTP</a>.</p>
+
+ <p>Alternatively, you can <a href="ftp://ftp.archlinux.org/other/artwork/"
+ title="Browse the FTP archives">download the source files via FTP</a>.</p>
+
<h3>Former Logos</h3>
- <p>Arch has gone through a few iterations of logos and associated artwork.
- Here is a good selection of these logos. Several of the later logos can be
- clicked on to get either a larger PNG or SVG version of the logo.</p>
- <h4>Original Ribbon Logos</h4>
- <p>
- <img src="/logos/old/archlogo.gif" alt="Ribbon Logo 1"/>
- <img src="/logos/old/archlogo2.gif" alt="Ribbon Logo 2"/>
- <img src="/logos/old/archlogo_black_plain.png" alt="Ribbon Logo Black"/>
- </p>
- <p>
- <img src="/logos/old/archlogo3.gif" alt="Ribbon Logo Binary 1"/>
- <img src="/logos/old/archlogo_white.gif" alt="Ribbon Logo Binary 2"/>
- <img src="/logos/old/archlogo_black.gif" alt="Ribbon Logo Binary Black"/>
- </p>
- <h4>"Arch Blue" Logos</h4>
- <p>
- <a href="/logos/old/archlinux_logo_2.svg">
- <img src="/logos/old/archblue.png" alt="Arch Blue Full"/>
- </a>
- <span style="margin-left: 1em;">
- <a href="/logos/old/archlinux_logo_1.svg">
- <img src="/logos/old/archblue2.png" alt="Arch Blue Compact"/>
- </a>
- </span>
- </p>
- <h4>"Arch Aqua" Logos</h4>
- <p>
- <a href="/logos/old/archlinux_logo_aqua.svg">
- <img src="/logos/old/sml_128-archlinux_logo_aqua.png" alt="Arch Aqua"/>
- </a>
- <a href="/logos/old/scalable/arch_linux_blue.svg">
- <img src="/logos/old/128x128/arch_linux_blue.png" alt="Arch Aqua Blue"/>
- </a>
- <a href="/logos/old/scalable/arch_linux_white.svg">
- <img src="/logos/old/128x128/arch_linux_white.png" alt="Arch Aqua White"/>
- </a>
- </p>
- <h4>Release-specific Logos</h4>
- <p>
- <a href="/logos/old/wombat.png" title="Wombat">
- <img src="/logos/old/sml-wombat.png" height="128" alt="Arch Wombat"/>
- </a>
- </p>
- <p>
- <a href="/logos/old/scalable/arch_linux_blue_noodle.svg" title="Noodle">
- <img src="/logos/old/128x128/arch_linux_blue_noodle.png" alt="Arch Noodle Blue"/>
- </a>
- <a href="/logos/old/scalable/arch_linux_white_noodle.svg" title="Noodle">
- <img src="/logos/old/128x128/arch_linux_white_noodle.png" alt="Arch Noodle White"/>
- </a>
- <a href="/logos/old/scalable/arch_noodles.svg" title="Noodle">
- <img src="/logos/old/128x128/arch_noodles.png" alt="Arch Box of Noodles"/>
- </a>
- <a href="/logos/old/scalable/pot_arch.svg" title="Noodle">
- <img src="/logos/old/128x128/pot_arch.png" alt="Arch Cup of Noodles"/>
- </a>
- </p>
-</div>
-{% endblock %}
+ <p>Arch has gone through a few generations of branding and what follows are
+ some of our past logos. Although these images are no longer used frequently,
+ they remain subject to license restrictions. Email
+ <strong>tradermarks@archlinux.org</strong> with any questions.</p>
+
+ <h4>Original Ribbon Series</h4>
+
+ <div class="imagelist">
+ <img src="/media/logos/legacy/arch-legacy-ribbon1.png" alt="Arch Ribbon Logo 1"/>
+ <img src="/media/logos/legacy/arch-legacy-ribbon2.png" alt="Arch Ribbon Logo 2"/>
+ <img src="/media/logos/legacy/arch-legacy-ribbon5.png" alt="Arch Ribbon Logo 5"/>
+ </div>
+
+ <div class="imagelist">
+ <img src="/media/logos/legacy/arch-legacy-ribbon3.png" alt="Arch Ribbon Logo 3"/>
+ <img src="/media/logos/legacy/arch-legacy-ribbon4.png" alt="Arch Ribbon Logo 4"/>
+ <img src="/media/logos/legacy/arch-legacy-ribbon6.png" alt="Arch Ribbon Logo 6"/>
+ </div>
+
+ <h4>"Arch Blue" Series</h4>
+
+ <div class="imagelist">
+ <a href="/media/logos/legacy/arch-legacy-blue1.svg" title="Arch Blue">
+ <img src="/media/logos/legacy/arch-legacy-blue1.png" alt="Arch Blue"/></a>
+ <a href="/media/logos/legacy/arch-legacy-blue2.svg" title="Arch Blue Vertical">
+ <img src="/media/logos/legacy/arch-legacy-blue2.png" alt="Arch Blue Vertical"/></a>
+ </div>
+
+ <h4>"Arch Aqua" Series</h4>
+
+ <div class="imagelist">
+ <a href="/media/logos/legacy/arch-legacy-aqua.svg" title="Arch Aqua">
+ <img src="/media/logos/legacy/arch-legacy-aqua.png" alt="Arch Aqua" /></a>
+ <a href="/media/logos/legacy/arch-legacy-aqua-blue.svg" title="Arch Aqua Blue">
+ <img src="/media/logos/legacy/arch-legacy-aqua-blue.png" alt="Arch Aqua Blue" /></a>
+ <a href="/media/logos/legacy/arch-legacy-aqua-white.svg" title="Arch Aqua White">
+ <img src="/media/logos/legacy/arch-legacy-aqua-white.png" alt="Arch Aqua White" /></a>
+ </div>
+
+ <h4>Release-specific Series</h4>
+
+ <div class="imagelist">
+ <a href="/media/logos/legacy/arch-legacy-wombat-lg.png" title="Arch Wombat">
+ <img src="/media/logos/legacy/arch-legacy-wombat.png" alt="Arch Wombat" /></a>
+ <a href="/media/logos/legacy/arch-legacy-noodle-blue.svg" title="Arch Noodle Blue">
+ <img src="/media/logos/legacy/arch-legacy-noodle-blue.png" alt="Arch Noodle Blue" /></a>
+ <a href="/media/logos/legacy/arch-legacy-noodle-white.svg" title="Arch Noodle White">
+ <img src="/media/logos/legacy/arch-legacy-noodle-white.png" alt="Arch Noodle White" /></a>
+ <a href="/media/logos/legacy/arch-legacy-noodle-box.svg" title="Arch Box of Noodles">
+ <img src="/media/logos/legacy/arch-legacy-noodle-box.png" alt="Arch Box of Noodles" /></a>
+ <a href="/media/logos/legacy/arch-legacy-noodle-cup.svg" title="Arch Cup of Noodles">
+ <img src="/media/logos/legacy/arch-legacy-noodle-cup.png" alt="Arch Cup of Noodles" /></a>
+ </div>
+
+</div><!-- #artwork -->
+{% endblock %}
diff --git a/templates/public/blank.html b/templates/public/blank.html
index f0bcedf4..2a8c83f4 100644
--- a/templates/public/blank.html
+++ b/templates/public/blank.html
@@ -1,10 +1,8 @@
{% extends "base.html" %}
+{% block title %}Arch Linux - Sample Page Title{% endblock %}
{% block content %}
-<div class="box">
- <h2 class="title">Download Arch Linux</h2>
- <br /><br />
+<div id="sample-page-id" class="box">
+ <h2>Sample page title</h2>
</div>
-<br /><br />
{% endblock %}
-
diff --git a/templates/public/developer_list.html b/templates/public/developer_list.html
index ff38b26a..61a612c6 100644
--- a/templates/public/developer_list.html
+++ b/templates/public/developer_list.html
@@ -1,59 +1,67 @@
- <div id="devlist">
+<div id="arch-bio-toc">
+
+ <p>
{% for dev in dev_list %}
- <a href="#{{ dev.username }}">{{ dev.first_name }}{{ dev.last_name.0|capfirst}}</a> &nbsp;
+ <a href="#{{ dev.username }}" title="Jump to profile for {{ dev.get_full_name }}">
+ {{ dev.first_name }}{{ dev.last_name.0|capfirst}}</a> &nbsp;&nbsp;
{% endfor %}
- </div><br /><br />
+ </p>
+
+</div>
- <table class="center" cellpadding="20">
+<table class="arch-bio-entry">
{% for dev in dev_list %}
{% with dev.get_profile as prof %}
- <tr>
- <td class="devpic">
- <img src="{{ prof.picture.url }}" height="175" width="175" style="border:1px solid black" alt="Image for {{ prof.alias }}"/>
- </td><td>
- <a name="{{ dev.username }}"></a>
- <table class="deventry" cellspacing="5">
- <tr>
- <th>Name:</th>
- <td>{{ dev.get_full_name }}</td>
- </tr><tr>
- <th>Alias:</th>
- <td>{{ prof.alias }}</td>
- </tr><tr>
- <th>Email:</th>
- <td>{{ prof.public_email }}</td>
- </tr><tr>
- <th>Other Contact:</th>
- <td>{{ prof.other_contact }}</td>
- </tr><tr>
- <th>Roles:</th>
- <td>{{ prof.roles }}<br />
- </td>
- </tr><tr>
- <th>Website:</th>
- <td>{% if prof %}<a href="{{ prof.website }}">{{ prof.website }}</a>{% endif %}</td>
- </tr><tr>
- <th>Occupation:</th>
- <td>{{ prof.occupation }}</td>
- </tr><tr>
- <th>YOB:</th>
- <td>{% if prof.yob %}{{ prof.yob }}{% endif %}</td>
- </tr><tr>
- <th>Location:</th>
- <td>{{ prof.location }}</td>
- </tr><tr>
- <th>Languages:</th>
- <td>{{ prof.languages }}</td>
- </tr><tr>
- <th>Interests:</th>
- <td>{{ prof.interests }}</td>
- </tr><tr>
- <th>Favorite Distros:</th>
- <td>{{ prof.favorite_distros }}</td>
- </tr>
- </table>
- </td>
- </tr>
+ <tr>
+ <td class="pic pic-{{ dev.username }}">
+ <img src="{{ prof.picture.url }}" height="125" width="125" alt="Image for {{ prof.alias }}"/>
+ </td>
+ <td>
+ <a name="{{ dev.username }}"></a>
+ <table class="bio bio-{{ dev.username }}" cellspacing="0">
+ <tr>
+ <th>Name:</th>
+ <td>{{ dev.get_full_name }}</td>
+ </tr><tr>
+ <th>Alias:</th>
+ <td>{{ prof.alias }}</td>
+ </tr><tr>
+ <th>Email:</th>
+ <td>{{ prof.public_email }}</td>
+ </tr><tr>
+ <th>Other Contact:</th>
+ <td>{{ prof.other_contact }}</td>
+ </tr><tr>
+ <th>Roles:</th>
+ <td>{{ prof.roles }}<br />
+ </td>
+ </tr><tr>
+ <th>Website:</th>
+ <td>{% if prof %}<a href="{{ prof.website }}"
+ title="Visit the website for {{ dev.get_full_name }}">
+ {{ prof.website }}</a>{% endif %}</td>
+ </tr><tr>
+ <th>Occupation:</th>
+ <td>{{ prof.occupation }}</td>
+ </tr><tr>
+ <th>YOB:</th>
+ <td>{% if prof.yob %}{{ prof.yob }}{% endif %}</td>
+ </tr><tr>
+ <th>Location:</th>
+ <td>{{ prof.location }}</td>
+ </tr><tr>
+ <th>Languages:</th>
+ <td>{{ prof.languages }}</td>
+ </tr><tr>
+ <th>Interests:</th>
+ <td>{{ prof.interests }}</td>
+ </tr><tr>
+ <th>Favorite Distros:</th>
+ <td>{{ prof.favorite_distros }}</td>
+ </tr>
+ </table>
+ </td>
+ </tr>
{% endwith %}
{% endfor %}
- </table>
+</table>
diff --git a/templates/public/donate.html b/templates/public/donate.html
index a14f20ed..acbb077c 100644
--- a/templates/public/donate.html
+++ b/templates/public/donate.html
@@ -1,58 +1,86 @@
{% extends "base.html" %}
-{% block title %}Arch Linux - Donors{% endblock %}
+{% block title %}Arch Linux - Donate{% endblock %}
+
{% block content %}
-<div class="box">
- <h2 class="title">Donate to Arch Linux</h2>
- <p>
- Arch Linux survives because of the tireless efforts of many people in
- the community and the core development circle. None of us are paid for our
- work, and we don't have the personal funds to sustain server costs ourselves.
- </p><p>
- There are many ways to help Arch Linux. If technical development,
+<div id="donations" class="box">
+
+ <h2>Donate to Arch Linux</h2>
+
+ <p>Arch Linux survives because of the tireless efforts of many people in
+ the community and the core development circle. None of us are paid for
+ our work, and we don't have the personal funds to sustain server costs
+ ourselves.</p>
+
+ <p>There are many ways to help support Arch Linux. If technical development,
documentation, or support aren't your strong points, you could certainly
- help us by dropping a few bucks our way.
- </p><p>
- Many thanks!
- </p>
- <div style="text-align:center">
+ help us by dropping a few bucks our way.</p>
+
+ <p>Many thanks!</p>
+
+ <h3>Monetary donations</h3>
+
+ <p>Financial contributions are accepted via <a title="Click to donate now"
+ href="https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&business=aaronmgriffin@gmail.com&currency_code=USD">PayPal</a>.
+ Funds are used for server hardware upgrades, conventions, schwag giveaways and more.</p>
+
+ <div id="paypal-button">
<!-- paypal code -->
- <form action="https://www.paypal.com/cgi-bin/webscr" method="post">
- <input type="hidden" name="cmd" value="_xclick"/>
- <input type="hidden" name="business" value="aaronmgriffin@gmail.com"/>
- <input type="hidden" name="currency_code" value="USD"/>
- <input type="hidden" name="tax" value="0"/>
- <input type="hidden" name="lc" value="US"/>
- <input type="hidden" name="bn" value="PP-DonationsBF"/>
- <input type="hidden" name="item_name" value="Arch Linux Donation"/>
- <input type="hidden" name="image_url" value="/logos/arch-paypal.jpg"/>
- <input type="hidden" name="no_shipping" value="1"/>
- <input type="hidden" name="cn" value="Suggestions/Comments"/>
- <input type="hidden" name="no_note" value="1"/>
- <input type="image" src="/media/donate.gif" border="0" name="submit"
- alt="Make payments with PayPal - it's fast, free and secure!"
- style="background: transparent; border: none"/>
+ <form id="paypal-form" name="_xclick" action="https://www.paypal.com/cgi-bin/webscr" method="post">
+ <p><input type="hidden" name="cmd" value="_xclick"/></p>
+ <p><input type="hidden" name="business" value="aaronmgriffin@gmail.com"/></p>
+ <p><input type="hidden" name="currency_code" value="USD"/></p>
+ <p><input type="hidden" name="tax" value="0"/></p>
+ <p><input type="hidden" name="lc" value="US"/></p>
+ <p><input type="hidden" name="bn" value="PP-DonationsBF"/></p>
+ <p><input type="hidden" name="item_name" value="Arch Linux Donation"/></p>
+ <p><input type="hidden" name="no_shipping" value="1"/></p>
+ <p><input type="hidden" name="cn" value="Suggestions/Comments"/></p>
+ <p><input type="hidden" name="no_note" value="1"/></p>
+ <p><input type="image" src="/media/donate.gif" name="submit"
+ title="Make a PayPal donation to the Arch Linux project"
+ alt="Make a PayPal donation to the Arch Linux project"
+ style="background:transparent;border:none;" /></p>
</form>
</div>
- <br />
- <h2 class="title">Sponsors and Contributions</h2>
- <p>We'd like to thank <a href="http://www.velocitynetwork.net/?hosting_by=ArchLinux" title="velocity network">Velocity Network</a> for contributing space in a server rack, bandwidth, and electricity for our main server for the last couple of years.</p>
- <div style="text-align:center">
- <a href="http://www.velocitynetwork.net/?hosting_by=ArchLinux" title="velocity network"><img src="/media/vnet_button.png" class="" title="" alt="velocity network - it's about time" /></a>
- </div>
- <p>We also wish to extend a special Thank You to <a href="https://www.sevenl.net/?utm_source=archlinux-org&amp;utm_medium=sponsored-banner&amp;utm_campaign=thanks-to-sevenl" title="SevenL Networks - Dedicated Arch Linux servers">SevenL Networks</a> for their generous and ongoing contribution of a dedicated Arch Linux server. You too can have a dedicated Arch Linux server hosted by SevenL...head over to their <a href="https://www.sevenl.net/dedicated-server/?utm_source=archlinux-org&amp;utm_medium=sponsored-banner&amp;utm_campaign=thanks-to-sevenl" title="SevenL Networks - dedicated server hosting">website</a> for more details.</p>
- <div style="text-align:center">
- <a href="https://www.sevenl.net/?utm_source=archlinux-org&amp;utm_medium=sponsored-banner&amp;utm_campaign=thanks-to-sevenl" title="SevenL Networks - Dedicated Arch Linux servers"><img src="/media/sevenl_button.png" class="" title="A big Thank You to SevenL Networks for their generous contribution" alt="We would like to express our thanks to SevenL Networks for their generous contribution" /></a>
- </div>
- <p>More thanks go to <a href="http://www.airvm.com/VirtualServers" title="AirVM.com">AirVM.com</a> for contributing a VMWare-based Virtual Machine.</p>
- <div style="text-align:center">
- <a href="http://www.airvm.com/VirtualServers" title="AirVM.com - Your Green Technology Partner"><img src="/media/airvm_button.jpg" class="" title="AirVM.com - Your Green Technology Partner" alt="AirVM.com - Your Green Technology Partner" /></a>
+
+ <h3>Commercial sponsors and contributions</h3>
+
+ <p>We'd like to thank <a href="http://www.velocitynetwork.net/?hosting_by=ArchLinux"
+ title="velocity network">Velocity Network</a> for contributing space
+ in a server rack, bandwidth, and electricity for our main server.</p>
+
+ <a href="http://www.velocitynetwork.net/?hosting_by=ArchLinux"
+ title="velocity network"><img src="/media/vnet_button.png" class="sponsor-btn-vnet"
+ title="" alt="velocity network - it's about time" /></a>
+
+ <p>We also wish to extend a special Thank You to <a
+ href="https://www.sevenl.net/?utm_source=archlinux-org&amp;utm_medium=sponsored-banner&amp;utm_campaign=thanks-to-sevenl"
+ title="SevenL Networks - Dedicated Arch Linux servers">SevenL Networks</a>
+ for their generous and ongoing contribution of a dedicated Arch Linux
+ server . You too can have a dedicated Arch Linux server hosted by SevenL...
+ head over to their website for more details.</p>
+
+ <a href="https://www.sevenl.net/?utm_source=archlinux-org&amp;utm_medium=sponsored-banner&amp;utm_campaign=thanks-to-sevenl"
+ title="SevenL Networks - Dedicated Arch Linux servers"><img src="/media/sevenl_button.png"
+ class="sponsor-btn-sevenl" title="A big Thank You to SevenL Networks for their generous contribution"
+ alt="We would like to express our thanks to SevenL Networks for their generous contribution" /></a>
+
+ <p>More thanks go to <a href="http://www.airvm.com/VirtualServers"
+ title="AirVM.com">AirVM.com</a> for contributing a VMWare-based Virtual Machine.</p>
+
+ <a href="http://www.airvm.com/VirtualServers"
+ title="AirVM.com - Your Green Technology Partner"><img src="/media/airvm_button.jpg"
+ class="sponsor-btn-airvm" title="AirVM.com - Your Green Technology Partner" alt="AirVM.com - Your Green Technology Partner" /></a>
+
+ <h3>Past donors</h3>
+
+ <div id="donor-list">
+ <ul>
+ {% for donor in donors %}
+ <li>{{ donor.name }}</li>{% endfor %}
+ </ul>
</div>
- <h2 class="title">Past Donors</h2>
- <ul id="donorlist">
- {% for donor in donors %}
- <li>{{ donor.name }}</li>{% endfor %}
- </ul>
- <div class="clear"/>
+ <div class="clear"></div>
+ <p>A huge thanks to you all for your contributions!</p>
</div>
{% endblock %}
-
diff --git a/templates/public/download.html b/templates/public/download.html
index 6d7656b0..3808222a 100644
--- a/templates/public/download.html
+++ b/templates/public/download.html
@@ -1,113 +1,157 @@
{% extends "base.html" %}
+{% block title %}Arch Linux - Downloads{% endblock %}
{% block content %}
-<div class="box">
- <h2 class="title">Release Info</h2>
- <div style="text-align:center">
- <p>All available images can be burned to a CD, mounted as an ISO file,
- or be directly written to a USB stick using a utility like `dd`. These
- are intended for new installations only; an existing Arch Linux system
- can always be updated with `pacman -Syu`.</p>
-
- <b>Current Release:</b> 2010.05 <br />
- <b>Included Kernel:</b> 2.6.33.4 <br />
- <b>Resources:</b>
- <a href="http://bugs.archlinux.org/index.php?project=6">Bug Tracker</a>
- -
- <a href="http://www.archlinux.org/mailman/listinfo/arch-releng">Mailing List</a>
- <br />
- <br />
- <b>Links and Instructions:</b><br />
- <a href="http://www.archlinux.org/iso/2010.05/README">
- Downloading Instructions
- </a>
- <br />
- <a href="http://wiki.archlinux.org/index.php/Official_Arch_Linux_Install_Guide">
- Arch Linux Install Guide
- </a>
- </div>
- <h2 class="title">BitTorrent Download (recommended)</h2>
- <div style="text-align:center">
- <p>If you can spare the bytes, please leave the client open after your
- download is finished, so you can seed it back to others. A web-seed
- capable client is recommended for fastest download speeds.</p>
-
- <h3>Netinstall ISOs</h3>
- <p>
- <a href="http://www.archlinux.org/iso/2010.05/archlinux-2010.05-netinstall-i686.iso.torrent">i686</a>
- <br />
- <a href="http://www.archlinux.org/iso/2010.05/archlinux-2010.05-netinstall-x86_64.iso.torrent">x86_64</a>
- <br />
- <a href="http://www.archlinux.org/iso/2010.05/archlinux-2010.05-netinstall-dual.iso.torrent">Dual Arch</a>
- </p>
-
- <h3>Core ISOs</h3>
- <p>
- <a href="http://www.archlinux.org/iso/2010.05/archlinux-2010.05-core-i686.iso.torrent">i686</a>
- <br />
- <a href="http://www.archlinux.org/iso/2010.05/archlinux-2010.05-core-x86_64.iso.torrent">x86_64</a>
- <br />
- <a href="http://www.archlinux.org/iso/2010.05/archlinux-2010.05-core-dual.iso.torrent">Dual Arch</a>
- </p>
-
- </div>
- <h2 class="title">Buy A CD</h2>
- <div style="text-align:center">
- These suppliers donate a small percentage of each CD purchased to
- the Arch Linux project:
- <table class="center" cellspacing="10">
- <tr><td>
- <a href="http://www.osdisc.com/cgi-bin/distro/index.cgi?distro=archlinux">
- Purchase CD from OSDisc</a>
- </td></tr>
- <tr><td>
- <a href="http://www.shoplinuxonline.com/index.php?main_page=index&amp;cPath=1_46&amp;zenid=ecd15b48affe8976130bc575c1276ee4">
- Purchase CD from Shop Linux Online</a>
- </td></tr>
- </table>
- You can also purchase Arch on CD from these suppliers:
- <table class="center" cellspacing="10">
+<div id="arch-downloads" class="box">
+
+ <h2>Arch Linux Downloads</h2>
+
+ {% with "2010.05" as version %}
+ <h3>Release Info</h3>
+
+ <p>All available images can be burned to a CD, mounted as an ISO file,
+ or be directly written to a USB stick using a utility like `dd`. These
+ are intended for new installations only; an existing Arch Linux system
+ can always be updated with `pacman -Syu`.</p>
+
+ <ul>
+ <li><strong>Current Release:</strong> {{ version }}</li>
+ <li><strong>Included Kernel:</strong> 2.6.33.4</li>
+ <li><strong>Resources:</strong>
+ <ul>
+ <li><a href="http://bugs.archlinux.org/index.php?project=6"
+ title="Arch Linux Bugtracker:Release Engineering">Bug Tracker</a></li>
+ <li><a href="http://www.archlinux.org/mailman/listinfo/arch-releng"
+ title="Arch Linux Release Engineering mailing list">Mailing List</a></li>
+ </ul>
+ </li>
+ </ul>
+
+ <p><strong>Links and Instructions:</strong></p>
+
+ <ul id="download-help">
+ <li><a href="http://www.archlinux.org/iso/{{ version }}/README"
+ title="Official download instructions">Readme and Instructions</a></li>
+ <li><a href="http://wiki.archlinux.org/index.php/Official_Arch_Linux_Install_Guide"
+ title="Official Installation Guide">Arch Linux Install Guide</a></li>
+ </ul>
+
+ <h3>BitTorrent Download (recommended)</h3>
+
+ <p>If you can spare the bytes, please leave the client open after your
+ download is finished, so you can seed it back to others.
+ <em>A web-seed capable client is recommended for fastest download speeds.</em></p>
+
+ <table id="download-torrents" class="pretty1">
+ <thead>
+ <tr>
+ <th>Format</th>
+ <th class="cpu-arch">i686 CPU</th>
+ <th class="cpu-arch">x86-64 CPU</th>
+ <th class="cpu-arch">Dual Architecture</th>
+ <th>Description</th>
+ </tr>
+ </thead>
+ <tbody>
<tr>
<td>
- <a href="http://www.linuxcd.org/view_distro.php?id_distro=48">Purchase CD from LinuxCD</a>
+ Netinstall Image
+ </td><td class="cpu-arch">
+ <a href="http://www.archlinux.org/iso/{{version}}/archlinux-{{version}}-netinstall-i686.iso.torrent"
+ title="Download for i686 architecture">Download</a>
+ </td><td class="cpu-arch">
+ <a href="http://www.archlinux.org/iso/{{version}}/archlinux-{{version}}-netinstall-x86_64.iso.torrent"
+ title="Download for x86-64 architecture">Download</a>
+ </td><td class="cpu-arch">
+ <a href="http://www.archlinux.org/iso/{{version}}/archlinux-{{version}}-netinstall-dual.iso.torrent"
+ title="Download for both architectures">Download</a>
+ </td><td class="wrap">
+ Downloads and installs packages versions via FTP for absolute freshness.
+ </td>
+ </tr><tr>
+ <td>
+ Core Image
+ </td><td class="cpu-arch">
+ <a href="http://www.archlinux.org/iso/{{version}}/archlinux-{{version}}-core-i686.iso.torrent"
+ title="Download for i686 architecture">Download</a>
+ </td><td class="cpu-arch">
+ <a href="http://www.archlinux.org/iso/{{version}}/archlinux-{{version}}-core-x86_64.iso.torrent"
+ title="Download for x86-64 architecture">Download</a>
+ </td><td class="cpu-arch">
+ <a href="http://www.archlinux.org/iso/{{version}}/archlinux-{{version}}-core-dual.iso.torrent"
+ title="Download for both architectures">Download</a>
+ </td><td class="wrap">
+ Core packages are included on the media. Good for basic off-line installation.
+ </td>
+ </tbody>
+ </table>
+ {% endwith %}
+
+ <h3>Get Arch Linux on CD</h3>
+
+ <p>The following suppliers donate a portion of their proceeds to the
+ Arch Linux project:</p>
+
+ <ul id="cd-vendors-donate">
+ <li><a href="http://www.osdisc.com/cgi-bin/distro/index.cgi?distro=archlinux"
+ title="Purchase a CD from OSDisc">Purchase a CD from OSDisc</a></li>
+ <li><a href="http://www.shoplinuxonline.com/index.php?main_page=index&amp;cPath=1_46&amp;zenid=ecd15b48affe8976130bc575c1276ee4"
+ title="Purchase a CD from Shop Linux Online">Purchase a CD from Shop Linux Online</a></li>
+ </ul>
+
+ <p>Arch Linux CDs are also available for purchase from these suppliers:</p>
+
+ <ul id="cd-vendors">
+ <li><a href="http://www.linuxcd.org/view_distro.php?id_distro=48"
+ title="Purchase a CD from LinuxCD">Purchase a CD from LinuxCD</a></li>
+ </ul>
+
+
+ <h3>HTTP/FTP Direct Downloads</h3>
+
+ <p>In addition to the BitTorrent links above, install images can also be
+ downloaded via HTTP or FTP from the mirror sites listed below. Please
+ ensure the download image matches the checksum from the md5sums.txt or
+ sha1sums.txt file in the same directory as the image.</p>
+
+ <h4>Checksums</h4>
+
+ <p>File integrity checksums for the latest releases can be found below:</p>
+
+ <ul>
+ <li><a href="http://www.archlinux.org/iso/{{version}}/sha1sums.txt"
+ title="Get the latest SHA1 checksums">SHA1 checksums</a></li>
+ <li><a href="http://www.archlinux.org/iso/{{version}}/md5sums.txt"
+ title="Get the latest MD5 checksums">MD5 checksums</a></li>
+ </ul>
+
+ <table id="download-mirrors">
+ <thead>
+ <tr>
+ <th><h4>Server Location</h4></th>
+ <th><h4>Download</h4></th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr><td colspan="2">
+ {% for mirror_url in mirror_url_list %}
+ {% ifchanged mirror_url.mirror.country %}
+ </td></tr>
+ <tr><td class="mirror-country" colspan="2"><strong>{{mirror_url.mirror.country}}</strong>
+ {% endifchanged %}
+ {% ifchanged mirror_url.mirror.name %}
</td></tr>
- </table>
- </div>
-
-
- <h2 class="title">HTTP/FTP Download</h2>
- <div style="text-align:center">
- <p>In addition to the BitTorrent links above, ISO images can also be
- downloaded via HTTP or FTP from the mirror sites listed below. Please
- ensure the download image matches the checksum from the md5sums.txt or
- sha1sums.txt file in the same directory as the image.</p>
- <h3>Checksums</h3>
- <p>
- <a href="http://www.archlinux.org/iso/2010.05/sha1sums.txt">SHA1</a>
- <br />
- <a href="http://www.archlinux.org/iso/2010.05/md5sums.txt">MD5</a>
- </p>
-
- <table class="center">
- <tr><td colspan="2"><h3>Mirror Sites</h3>
- {% for mirror_url in mirror_url_list %}
- {% ifchanged mirror_url.mirror.country %}
- </td></tr>
- <tr><td colspan="2" style="text-align: left"><br /><h4>{{mirror_url.mirror.country}}</h4>
- {% endifchanged %}
- {% ifchanged mirror_url.mirror.name %}
- </td></tr>
- <tr><td style="text-align: left">{{mirror_url.mirror.name}}</td><td style="text-align: right">
- {% endifchanged %}
- (<a href="{{mirror_url.url}}iso/">{{mirror_url.protocol.protocol}}</a>)
- {% endfor %}
+ <tr><td class="mirror-server">{{mirror_url.mirror.name}}</td><td>
+ {% endifchanged %}
+ <a href="{{mirror_url.url}}iso/"
+ title="Download from {{mirror_url.url}}iso/">{{mirror_url.protocol.protocol|upper}}</a>
+ {% endfor %}
</td></tr>
- </table>
- <p>If you want to become an Official Arch Linux Mirror please follow
- the instructions listed <a href="http://wiki.archlinux.org/index.php/DeveloperWiki:NewMirrors">here</a>.
- </p>
- </div>
+ </tbody>
+ </table>
+
+ <p>If you want to become an Official Arch Linux Mirror please follow the
+ instructions listed <a href="http://wiki.archlinux.org/index.php/DeveloperWiki:NewMirrors">here</a>.</p>
+
</div>
-<br /><br />
{% endblock %}
-
diff --git a/templates/public/feeds.html b/templates/public/feeds.html
index a3502cf5..553aa3e5 100644
--- a/templates/public/feeds.html
+++ b/templates/public/feeds.html
@@ -1,16 +1,29 @@
{% extends "base.html" %}
{% block title %}Arch Linux - RSS Feeds{% endblock %}
+
{% block content %}
-<div class="box">
- <h2 class="title">RSS Feeds</h2>
- <br /><br />
+<div id="rss-feeds" class="box">
+
+ <h2>RSS Feeds</h2>
+
<p>Several RSS feeds are available for consumption from the Arch website.
- The majority of these are package related and allow feeds to be customized
+ The majority of these are package-related and allow feeds to be customized
for the updates you care about.</p>
- <p>Grab the <a href="/feeds/news/">news item feed <img src="/media/rss.png" alt="RSS Feed" /></a>
+
+ <h3>News and Activity Feeds</h3>
+
+ <p>Grab the <a href="/feeds/news/" class="rss" title="Arch Linux News feed">news item feed</a>
to keep up-to-date with the latest news from the Arch Linux development staff.</p>
- <p>If you are interested in
- <a href="/feeds/packages/">all package updates <img src="/media/rss.png" alt="RSS Feed" /></a>,
+
+ <p>The <a href="http://wiki.archlinux.org/index.php?title=Special:RecentChanges&amp;feed=rss"
+ title="ArchWiki Recent Changes feed" class="rss">Arch Wiki: Recent changes feed</a>
+ is also available to track document changes from the <a href="http://wiki.archlinux.org/"
+ title="Arch Wiki community documentation">Arch Wiki</a>.</p>
+
+ <h3>Package Feeds</h3>
+
+ <p>If you are interested in <a href="/feeds/packages/" class="rss"
+ title="Arch Linux all package update feed">all package updates</a>,
then grab this feed. Note that when a package is updated for multiple
architectures, you will see each individual update show up here.
Alternatively, you can select a packages feed from the below table that is
@@ -18,25 +31,84 @@
architecture, there are a variety of feeds you can choose from. Note that
feeds for a specific architecture, such as 'i686', will also include all
package updates for 'any' (architecture-independent) packages.</p>
- <table id="feedlist" class="center">
- <tr>
- <th>Architecture</th>
- <th>All Repos</th>
- {% for repo in repos %}
- <th>{{ repo }}</th>
- {% endfor %}
- </tr>
- {% for arch in arches %}
- <tr>
- <td><strong>{{ arch }}</strong></td>
- <td><a href="/feeds/packages/{{ arch }}/">Feed <img src="/media/rss.png" alt="RSS Feed" /></a></td>
- {% for repo in repos %}
- <td><a href="/feeds/packages/{{ arch }}/{{ repo|lower }}/">Feed <img src="/media/rss.png" alt="RSS Feed" /></a></td>
+
+ <table class="pretty2">
+ <thead>
+ <tr>
+ <th>Architecture</th>
+ <th>All Repos</th>
+ {% for repo in repos %}
+ <th>{{ repo }}</th>
+ {% endfor %}
+ </tr>
+ </thead>
+ <tbody>
+ {% for arch in arches %}
+ <tr>
+ <td><strong>{{ arch }}</strong></td>
+ <td><a href="/feeds/packages/{{ arch }}/" class="rss">Feed</a></td>
+ {% for repo in repos %}
+ <td><a href="/feeds/packages/{{ arch }}/{{ repo|lower }}/" class="rss">Feed</a></td>
+ {% endfor %}
+ </tr>
{% endfor %}
- </tr>
- {% endfor %}
+ </tbody>
</table>
-</div>
-<br /><br />
-{% endblock %}
+ <p>A <a href="http://aur.archlinux.org/rss.php" class="rss" title="AUR
+ newest packages feed">Newest Packages feed</a> is also available from
+ the <a href="http://aur.archlinux.org/" title="AUR Homepage">Arch User
+ Repository (AUR)</a>.</p>
+
+ <h3>Development Feeds</h3>
+
+ <p>Subscribe to any of the following to track bug tickets and feature
+ requests from the <a href="http://bugs.archlinux.org/" title="Arch Linux
+ Bugs">Arch Linux Bugtracker</a>:</p>
+
+ <table class="pretty2">
+ <thead>
+ <tr>
+ <th>Project</th>
+ <th>Recently Opened Tasks</th>
+ <th>Recently Edited Tasks</th>
+ <th>Recently Closed Tasks</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>All Projects</td>
+ <td><a href="http://bugs.archlinux.org/feed.php?feed_type=rss2&amp;project=99" class="rss">Feed</a></td>
+ <td><a href="http://bugs.archlinux.org/feed.php?feed_type=rss2&amp;topic=edit&amp;project=99" class="rss">Feed</a></td>
+ <td><a href="http://bugs.archlinux.org/feed.php?feed_type=rss2&amp;topic=clo&amp;project=99" class="rss">Feed</a></td>
+ </tr><tr>
+ <td>Arch Linux</td>
+ <td><a href="http://bugs.archlinux.org/feed.php?feed_type=rss2&amp;project=1" class="rss">Feed</a></td>
+ <td><a href="http://bugs.archlinux.org/feed.php?feed_type=rss2&amp;topic=edit&amp;project=1" class="rss">Feed</a></td>
+ <td><a href="http://bugs.archlinux.org/feed.php?feed_type=rss2&amp;topic=clo&amp;project=1" class="rss">Feed</a></td>
+ </tr><tr>
+ <td>Release Engineering</td>
+ <td><a href="http://bugs.archlinux.org/feed.php?feed_type=rss2&amp;project=6" class="rss">Feed</a></td>
+ <td><a href="http://bugs.archlinux.org/feed.php?feed_type=rss2&amp;topic=edit&amp;project=6" class="rss">Feed</a></td>
+ <td><a href="http://bugs.archlinux.org/feed.php?feed_type=rss2&amp;topic=clo&amp;project=6" class="rss">Feed</a></td>
+ </tr><tr>
+ <td>Pacman Development</td>
+ <td><a href="http://bugs.archlinux.org/feed.php?feed_type=rss2&amp;project=3" class="rss">Feed</a></td>
+ <td><a href="http://bugs.archlinux.org/feed.php?feed_type=rss2&amp;topic=edit&amp;project=3" class="rss">Feed</a></td>
+ <td><a href="http://bugs.archlinux.org/feed.php?feed_type=rss2&amp;topic=clo&amp;project=3" class="rss">Feed</a></td>
+ </tr><tr>
+ <td>Community Packages</td>
+ <td><a href="http://bugs.archlinux.org/feed.php?feed_type=rss2&amp;project=5" class="rss">Feed</a></td>
+ <td><a href="http://bugs.archlinux.org/feed.php?feed_type=rss2&amp;topic=edit&amp;project=5" class="rss">Feed</a></td>
+ <td><a href="http://bugs.archlinux.org/feed.php?feed_type=rss2&amp;topic=clo&amp;project=5" class="rss">Feed</a></td>
+ </tr><tr>
+ <td>AUR</td>
+ <td><a href="http://bugs.archlinux.org/feed.php?feed_type=rss2&amp;project=2" class="rss">Feed</a></td>
+ <td><a href="http://bugs.archlinux.org/feed.php?feed_type=rss2&amp;topic=edit&amp;project=2" class="rss">Feed</a></td>
+ <td><a href="http://bugs.archlinux.org/feed.php?feed_type=rss2&amp;topic=clo&amp;project=2" class="rss">Feed</a></td>
+ </tr>
+ </tbody>
+ </table>
+
+ </div>
+{% endblock %}
diff --git a/templates/public/index.html b/templates/public/index.html
index c403e08a..09239bde 100644
--- a/templates/public/index.html
+++ b/templates/public/index.html
@@ -6,127 +6,191 @@
{% endblock %}
{% block content_left %}
- <div id="about" class="box">
- <h2>Welcome to Arch!</h2>
- <p>
- You've reached the website for <strong>Arch Linux</strong>, a lightweight
- and flexible Linux&reg; distribution that tries to Keep It Simple.
- </p><p>
- Currently we have official packages optimized for the i686 and x86-64
- architectures. We complement our official package sets with a
- <a href="http://aur.archlinux.org">community-operated package repository</a>
- that grows in size and quality each and every day.
- </p><p>
- Our strong community is diverse and helpful, and we pride ourselves on
- the range of skillsets and uses for Arch that stem from it. Please
- check out our <a href="http://bbs.archlinux.org">forums</a> and
- <a href="http://www.archlinux.org/mailman/listinfo/">mailing lists</a>
- to get your feet wet. Also glance through our <a href="http://wiki.archlinux.org">wiki</a>
- if you want to learn more about Arch.
- </p><p style="text-align: right">
- <a href="{% url page-about %}"><span style="font-size:x-small">Learn more...</span></a>
- </p>
- </div>
- <br /><br />
- <div style="float:right;position:relative;bottom:-25px">
- <a href="/feeds/news/"><img src="/media/rss.png" alt="RSS Feed" /></a>
- </div>
- <h2 class="title">Latest News</h2>
- <div>
+<div id="intro" class="box">
+
+ <h2>A simple, lightweight distribution</h2>
+
+ <p>You've reached the website for <strong>Arch Linux</strong>, a
+ lightweight and flexible Linux® distribution that tries to Keep It
+ Simple.</p>
+
+ <p>Currently we have official packages optimized for the i686 and
+ x86-64 architectures. We complement our official package sets with a
+ <a href="http://aur.archlinux.org" title="Arch User Repository (AUR)">
+ community-operated package repository</a> that grows in size and
+ quality each and every day.</p>
+
+ <p>Our strong community is diverse and helpful, and we pride ourselves
+ on the range of skillsets and uses for Arch that stem from it. Please
+ check out our <a href="http://bbs.archlinux.org" title="Arch Forums">forums</a>
+ and <a href="http://www.archlinux.org/mailman/listinfo/" title="Arch Mailing Lists">mailing lists</a>
+ to get your feet wet. Also glance through our <a href="http://wiki.archlinux.org" title="Arch Wiki">wiki</a>
+ if you want to learn more about Arch.</p>
+
+ <p class="readmore"><a href="{% url page-about %}"
+ title="Learn more about Arch Linux">Learn more...</a></p>
+
+</div><!-- #intro -->
+
+<div id="news">
+
+ <h3>Latest News <span class="more">(<a href="{% url news-list %}"
+ title="Browse the news archives">more</a>)</span></h3>
+
+ <a href="/feeds/news/" title="Arch News RSS Feeds"
+ class="rss-icon"><img src="/media/rss.png" alt="RSS Feed" /></a>
+
{% for news in news_updates %}
- <br />
- <span style="float:right; font-size:x-small">{{ news.postdate }}</span>
- <h4 class="news"><a href="{{ news.get_absolute_url }}">{{ news.title }}</a></h4>
- <p class="news">{{ news.content|striptags|truncatewords:60 }}</p>
- <br />
+ <h4><a href="{{ news.get_absolute_url }}"
+ title="View full article: {{ news.title }}">{{ news.title }}</a></h4>
+ <p class="timestamp">{{ news.postdate }}</p>
+ <p>{{ news.content|striptags|truncatewords:50 }}</p>
{% endfor %}
- <span style="float:right;font-size:x-small"><a href="{% url news-list %}">More News...</a></span>
- <br /><br />
- </div>
+
+</div><!-- #news -->
{% endblock %}
{% block content_right %}
- <div id="search">
- <form method="get" action="/packages/">
- <p>Package Search:&nbsp;&nbsp;<input type="text" name="q" size="20" maxlength="200" /></p>
- </form>
- </div>
- <div id="updates">
- <table width="100%">
- <tr>
- <td><h3>Recent Updates</h3></td>
- <td style="vertical-align:top;text-align:right"><a href="/feeds/packages/"><img src="/media/rss.png" alt="RSS Feed" /></a></td>
- </tr>
+<div id="pkgsearch" class="widget">
+
+ <form id="pkgsearch-form" method="get" action="/packages/">
+ <fieldset>
+ <p>Package Search:&nbsp;&nbsp;<input id="pkgsearch-field"
+ type="text" name="q" size="18" maxlength="200" /></p>
+ </fieldset>
+ </form>
+
+</div>
+
+<div id="pkg-updates" class="widget box">
+
+ <h3>Recent Updates <span class="more">(<a href="/packages/?sort=-last_update"
+ title="Browse all of the latest packages">more</a>)</span></h3>
+
+ <a href="/feeds/packages/" title="Arch Package Updates RSS Feeds"
+ class="rss-icon"><img src="/media/rss.png" alt="RSS Feed" /></a>
+
+ <table>
{% for update in pkg_updates %}
{% with update|first as fpkg %}
- <tr>
- <td><span class="{{ fpkg.repo.name|lower }}">{{ fpkg.pkgname }} {{ fpkg.pkgver }}-{{ fpkg.pkgrel }}</span></td>
- <td style="text-align:right">
- {% for pkg in update %}<a href="{{ pkg.get_absolute_url }}">{{ pkg.arch }}</a>{% if not forloop.last %}/{% endif %}{% endfor %}
+ <tr>
+ <td class="pkg-name"><span class="{{ fpkg.repo.name|lower }}">{{ fpkg.pkgname }} {{ fpkg.pkgver }}-{{ fpkg.pkgrel }}</span></td>
+ <td class="pkg-arch">
+ {% for pkg in update %}<a href="{{ pkg.get_absolute_url }}"
+ title="View package details for {{ pkg.pkgname }}">{{ pkg.arch }}</a>{% if not forloop.last %}/{% endif %}{% endfor %}
</td>
- </tr>
+ </tr>
{% endwith %}
{% endfor %}
- <tr>
- <td style="font-size:x-small;white-space:nowrap;"><br /><a href="{% url feeds-list %}">More Feeds...</a></td>
- <td style="text-align:right;font-size:x-small;white-space:nowrap;"><br /><a href="/packages/?sort=-last_update">More Updates...</a></td>
- </tr>
- </table>
- </div>
- <br />
+ </table>
+
+</div>
+
+<div id="nav-sidebar" class="widget">
+
<div style="text-align: center;">
<a href="http://www.archlinux.ca/archcon2010/" title="ArchCon 2010"><img src="/media/archcon.png" class="" title="" alt="ArchCon 2010" /></a>
</div>
- <br />
- {% if user.is_authenticated %}
- <h3>Dev Links:</h3>
- <ul class="links">
- <li><a href="/devel/">Dev Dashboard</a></li>
- <li><a href="{% url news-list %}">News</a></li>
- <li><a href="/packages/signoffs/">Signoffs</a></li>
- <li><a href="/todo/">Todos</a></li>
- <li><a href="http://www.archlinux.org/mailman/private/arch-dev/">Archives</a></li>
- <li><a href="http://wiki.archlinux.org/index.php/DeveloperWiki:HOWTO_Be_A_Packager">Package Maintainer's Guide</a></li>
- <li><a href="/devel/profile/">Profile</a></li>
- </ul>
- {% endif %}
- <h3>Documentation:</h3>
- <ul class="links">
- <li><a href="http://wiki.archlinux.org/index.php/Official_Arch_Linux_Install_Guide">Installation Guide</a></li>
- <li><a href="http://wiki.archlinux.org/index.php/Beginners'_Guide">Beginners' Guide</a></li>
- <li><a href="http://wiki.archlinux.org">Wiki</a></li>
+
+ <h4>Documentation</h4>
+
+ <ul>
+ <li><a href="http://wiki.archlinux.org/"
+ title="Community documentation">Wiki</a></li>
+ <li><a href="http://wiki.archlinux.org/index.php/Official_Arch_Linux_Install_Guide"
+ title="Official installation guide">Official Installation Guide</a></li>
+ <li><a href="http://wiki.archlinux.org/index.php/Beginners'_Guide"
+ title="A good place to start for beginners">Unofficial Beginners' Guide</a></li>
</ul>
- <h3>Support Arch:</h3>
- <ul class="links">
- <li><a href="{% url page-donate %}">Donate</a></li>
+
+ <h4>Community</h4>
+
+ <ul>
+ <li><a href="http://mailman.archlinux.org/mailman/listinfo/"
+ title="Community and developer mailing lists">Mailing Lists</a></li>
+ <li><a href="http://wiki.archlinux.org/index.php/IRC_Channels"
+ title="Official and regional IRC communities">IRC Channels</a></li>
+ <li><a href="http://planet.archlinux.org/"
+ title="Arch in the blogosphere">Planet Arch</a></li>
+ <li><a href="/static/magazine/"
+ title="Community newsletters and magazines">Magazines</a></li>
+ <li><a href="http://wiki.archlinux.org/index.php/International_Communities"
+ title="Arch communities in your native language">International Communities</a></li>
+ <li><a href="http://wiki.archlinux.org/index.php/Related_Projects"
+ title="Projects that are in some way related to Arch Linux">Related Projects</a></li>
+ </ul>
+
+ <h4>Support</h4>
+
+ <ul>
+ <li><a href="{% url page-donate %}" title="Help support Arch Linux">Donate</a></li>
<li><a href="http://schwag.archlinux.ca/"
- title="USB keys, Jewellery, case badges">Arch Schwag</a></li>
+ title="USB keys, jewellery, case badges">Arch Schwag</a></li>
<li><a href="http://www.zazzle.com/archlinux*"
title="T-shirts, mugs, mouse pads, hoodies, posters, skateboards, shoes, etc.">Schwag via Zazzle</a></li>
<li><a href="http://www.freewear.org/?page=list_items&amp;org=Archlinux"
title="T-shirts">Schwag via Freewear</a></li>
- <li><a href="{% url page-art %}">Logos &amp; Artwork</a></li>
</ul>
- <h3>Community Links:</h3>
- <ul class="links">
- <li><a href="http://www.archlinux.org/mailman/listinfo/">Mailing Lists</a></li>
- <li><a href="http://wiki.archlinux.org/index.php/IRC_Channels">IRC Channels</a></li>
- <li><a href="http://planet.archlinux.org">Planet Arch</a></li>
- <li><a href="/static/magazine/">Magazines</a></li>
- <li><a href="http://wiki.archlinux.org/index.php/Arch_Related_Projects">Arch-Based Projects</a></li>
- <li><a href="http://wiki.archlinux.org/index.php/International_Communities">International Communities</a></li>
- <li><a href="http://wiki.archlinux.org/index.php/Arch_Linux_Press_Review">Press</a></li>
+
+ <h4>Development</h4>
+
+ <ul>
+ <li><a href="/packages/"
+ title="View/search the package repository database">Packages</a></li>
+ <li><a href="http://bugs.archlinux.org/"
+ title="Report/track bugs or make feature requests">Bug Tracker</a></li>
+ <li><a href="{% url page-svn %}"
+ title="View SVN entries for packages">SVN Repositories</a></li>
+ <li><a href="http://projects.archlinux.org/"
+ title="Official Arch projects (git)">Projects in Git</a></li>
+ <li><a href="http://wiki.archlinux.org/index.php/DeveloperWiki"
+ title="Developer Wiki articles">DeveloperWiki</a></li>
</ul>
- <h3>Development:</h3>
- <ul class="links">
- <li><a href="{% url page-devs %}">Developers</a></li>
- <li><a href="{% url page-tus %}">Trusted Users</a></li>
- <li><a href="{% url page-fellows %}">Fellows</a></li>
- <li><a href="http://bugs.archlinux.org">Bug Tracker</a></li>
- <li><a href="{% url page-svn %}">SVN</a></li>
- <li><a href="http://projects.archlinux.org">Projects</a></li>
+
+ <h4>About</h4>
+
+ <ul>
+ <li><a href="http://wiki.archlinux.org/index.php/ArchLinux:About"
+ title="Learn more about Arch Linux">About Arch</a></li>
+ <li><a href="/download/" title="Get Arch Linux">Download Arch</a></li>
+ <li><a href="http://wiki.archlinux.org/index.php/Arch_Linux_Press_Review"
+ title="Arch Linux in the media">Press Coverage</a></li>
+ <li><a href="{% url page-art %}" title="Arch logos and other artwork for promotional use">Logos &amp; Artwork</a></li>
+ <li><a href="{% url news-list %}" title="News Archives">News Archives</a></li>
+ <li><a href="/feeds/" title="Various RSS Feeds">RSS Feeds</a></li>
+ <li><a href="{% url page-devs %}" title="Active developers">Developer Profiles</a></li>
+ <li><a href="{% url page-tus %}" title="Active Trusted Users (TUs)">Trusted User Profiles</a></li>
+ <li><a href="{% url page-fellows %}" title="Retired Developers">Fellows Profiles</a></li>
</ul>
- <a href="http://www.velocitynetwork.net/?hosting_by=ArchLinux" title="velocity network"><img src="/media/vnet_button.png" class="" title="" alt="velocity network - it's about time" /></a>
- <a href="https://www.sevenl.net/?utm_source=archlinux-org&amp;utm_medium=sponsored-banner&amp;utm_campaign=thanks-to-sevenl" title="SevenL Networks - Dedicated Arch Linux servers"><img src="/media/sevenl_button.png" class="" title="A big Thank You to SevenL Networks for their generous contribution" alt="We would like to express our thanks to SevenL Networks for their generous contribution" /></a>
- <a href="http://www.airvm.com/VirtualServers" title="AirVM.com - Your Green Technology Partner"><img src="/media/airvm_button.jpg" class="" title="AirVM.com - Your Green Technology Partner" alt="AirVM.com - Your Green Technology Partner" /></a>
+
+</div><!-- #nav-sidebar -->
+
+<div id="home-paypal-button" class="widget">
+
+ <form id="paypal-form" name="_xclick" action="https://www.paypal.com/cgi-bin/webscr" method="post">
+ <p><input type="hidden" name="cmd" value="_xclick"/></p>
+ <p><input type="hidden" name="business" value="aaronmgriffin@gmail.com"/></p>
+ <p><input type="hidden" name="currency_code" value="USD"/></p>
+ <p><input type="hidden" name="tax" value="0"/></p>
+ <p><input type="hidden" name="lc" value="US"/></p>
+ <p><input type="hidden" name="bn" value="PP-DonationsBF"/></p>
+ <p><input type="hidden" name="item_name" value="Arch Linux Donation"/></p>
+ <p><input type="hidden" name="no_shipping" value="1"/></p>
+ <p><input type="hidden" name="cn" value="Suggestions/Comments"/></p>
+ <p><input type="hidden" name="no_note" value="1"/></p>
+ <p><input type="image" src="/media/donate.gif" name="submit"
+ title="Make a PayPal donation to the Arch Linux project"
+ alt="Make a PayPal donation to the Arch Linux project"
+ style="background:transparent;border:none;" /></p>
+ </form>
+
+</div>
+
+<div id="sponsors" class="widget">
+
+ <a href="http://www.velocitynetwork.net/?hosting_by=ArchLinux" title="Velocity Network"><img src="/media/vnet_button.png" alt="Velocity Network - It's about time" /></a>
+ <a href="https://www.sevenl.net/?utm_source=archlinux-org&amp;utm_medium=sponsored-banner&amp;utm_campaign=thanks-to-sevenl" title="SevenL Networks - Dedicated Arch Linux servers"><img src="/media/sevenl_button.png" title="A big Thank You to SevenL Networks for their generous contribution" alt="We would like to express our thanks to SevenL Networks for their generous contribution" /></a>
+ <a href="http://www.airvm.com/VirtualServers" title="AirVM.com - Your Green Technology Partner"><img src="/media/airvm_button.jpg" title="AirVM.com - Your Green Technology Partner" alt="AirVM.com - Your Green Technology Partner" /></a>
+
+</div>
{% endblock %}
diff --git a/templates/public/userlist.html b/templates/public/userlist.html
index ce8cb145..658e64e6 100644
--- a/templates/public/userlist.html
+++ b/templates/public/userlist.html
@@ -1,13 +1,16 @@
{% extends "base.html" %}
+{% block title %}Arch Linux - {{ user_type }}{% endblock %}
{% block content %}
-<div class="box">
- <h2 class="title">Arch Linux {{user_type}}</h2>
- <p>{{description}}</p>
+<div id="dev-tu-profiles" class="box">
+
+ <h2>Arch Linux {{user_type}}</h2>
+
+ <p>{{description}}</p>
+
{% with users as dev_list %}
{% include 'public/developer_list.html' %}
{% endwith %}
+
</div>
-<br /><br />
{% endblock %}
-
diff --git a/templates/registration/login.html b/templates/registration/login.html
index b3b264c3..2f626566 100644
--- a/templates/registration/login.html
+++ b/templates/registration/login.html
@@ -1,23 +1,22 @@
{% extends "base.html" %}
+{% block title %}Arch Linux - Developer Login{% endblock %}
{% block content %}
+<div id="dev-login" class="box">
-<div class="greybox">
-<h2 class="title">Developer Login</h2>
-{% if form.has_errors %}
-<p class="error">Your username and password didn't match. Please try again.</p>
-{% endif %}
-<br /><br />
+ <h2>Developer Login</h2>
-<form method="post" action=".">
-<input type="hidden" name="next" value="{% if next %}{{ next }}{% else %}/{% endif %}" />
-<table>
- <tr><td><label for="id_username">Username:</label></td><td>{{ form.username }}</td></tr>
- <tr><td><label for="id_password">Password:</label></td><td>{{ form.password }}</td></tr>
- <tr><td colspan="2" align="right"><input type="submit" value="Login" /></td></tr>
-</table>
-</form>
-</div>
+ {% if form.has_errors %}
+ <p class="login-error">Your username and password didn't match. Please try again.</p>
+ {% endif %}
-{% endblock %}
+ <form id="dev-login-form" method="post" action=".">
+ <fieldset>
+ <legend>Enter login credentials</legend>
+ {{ form.as_p }}
+ <p><label></label> <input type="submit" value="Login" /></p>
+ </fieldset>
+ </form>
+</div>
+{% endblock %}
diff --git a/templates/registration/logout.html b/templates/registration/logout.html
index 2b829869..f8e07621 100644
--- a/templates/registration/logout.html
+++ b/templates/registration/logout.html
@@ -1,10 +1,9 @@
{% extends "base.html" %}
+{% block title %}Arch Linux - Logout successful{% endblock %}
{% block content %}
-
-<div class="greybox">
-You've been logged out.
+<div id="dev-logout" class="box">
+ <p>Logout successful.<p>
</div>
-
{% endblock %}
diff --git a/templates/todolists/addedtotodolist b/templates/todolists/addedtotodolist
index c325c470..24fded59 100644
--- a/templates/todolists/addedtotodolist
+++ b/templates/todolists/addedtotodolist
@@ -8,7 +8,7 @@ The following package:
Repository: {{ pkg.repo.name }}
({{ weburl }})
-has been added to this to-do list:
+has been added to this todo list:
Creator: {{todolist.creator.get_full_name}}
Name: {{todolist.name}}
diff --git a/templates/todolists/list.html b/templates/todolists/list.html
index ffbab2af..e4b426bb 100644
--- a/templates/todolists/list.html
+++ b/templates/todolists/list.html
@@ -2,34 +2,40 @@
{% block title %}Arch Linux - Todo Lists{% endblock %}
{% block content %}
- <div class="greybox">
- {% if perms.main.add_todolist %}
- <div style="float:right">
- <a href="/todo/add/">Add Todo List</a>
- </div>
- {% endif %}
- <h2 class="title">Package ToDo lists</h2>
- <table class="results" width="100%">
- <thead>
- <tr>
- <th>Name</th>
- <th>Creation Date</th>
- <th>Creator</th>
- <th>Description</th>
- <th>Status</th>
- </tr>
- </thead>
- <tbody>
+<div id="dev-todo" class="box">
+
+ <h2>Package Todo Lists</h2>
+
+ {% if perms.main.add_todolist %}
+ <ul class="admin-actions">
+ <li><a href="/todo/add/" title="Add new todo list">Add Todo List</a></li>
+ </ul>
+ {% endif %}
+
+ <table id="dev-todo-lists" class="results">
+ <thead>
+ <tr>
+ <th>Name</th>
+ <th>Creation Date</th>
+ <th>Creator</th>
+ <th>Description</th>
+ <th>Status</th>
+ </tr>
+ </thead>
+ <tbody>
{% for list in lists %}
- <tr class="{% cycle pkgr2,pkgr1 %}">
- <td style="white-space:nowrap"><a href="/todo/{{ list.id }}/">{{ list.name }}</a></td>
- <td>{{ list.date_added }}</td>
- <td>{{ list.creator.get_full_name }}</td>
- <td>{{ list.description }}</td>
- <td>{% if list.complete %}<span style="color:blue">Complete</span>{% else %}<span style="color:red">Incomplete</span>{% endif %}</td>
- </tr>
+ <tr class="{% cycle 'odd' 'even' %}">
+ <td><a href="/todo/{{ list.id }}/"
+ title="View todo list: {{ list.name }}">{{ list.name }}</a></td>
+ <td>{{ list.date_added }}</td>
+ <td>{{ list.creator.get_full_name }}</td>
+ <td class="wrap">{{ list.description }}</td>
+ <td>{% if list.complete %}<span class="complete">Complete</span>
+ {% else %}<span class="incomplete">Incomplete</span>{% endif %}</td>
+ </tr>
{% endfor %}
- </tbody>
- </table>
- </div>
+ </tbody>
+ </table>
+
+</div><!-- #dev-todo -->
{% endblock %}
diff --git a/templates/todolists/todolist_confirm_delete.html b/templates/todolists/todolist_confirm_delete.html
index c0742d2b..c1e87834 100644
--- a/templates/todolists/todolist_confirm_delete.html
+++ b/templates/todolists/todolist_confirm_delete.html
@@ -1,25 +1,22 @@
{% extends "base.html" %}
-{% block title %}Arch Linux - Delete Todo List{% endblock %}
+{% block title %}Arch Linux - Delete Todo List: {{object.name}}{% endblock %}
{% block content %}
- <div class="greybox">
- <h2 class="title">Confirm Delete</h2>
- <p>
- Are you sure you want to delete this todo list?
- </p>
- <div class="box">
- <h3>{{object.name}}</h3>
- <p>
- {{object.description}}
- </p>
- </div>
- <br />
- <form method="POST">
- <input type="submit" value="Yes" />
- <button type="reset" value="No"
- onclick="document.location='/todos/{{object.id}}/';">No</button>
- </form>
+<div id="dev-todo-delete" class="box">
-
- </div>
+ <h2>Delete Todo List: {{object.name}}</h2>
+
+ <p>You are about to delete the following todo list:</p>
+
+ <blockquote>
+ <p><strong>{{object.name}}:</strong> {{object.description}}</p>
+ </blockquote>
+
+ <p>Are you sure?</p>
+
+ <form id="delete-todo-form" method="post" action=".">
+ <p><input type="submit" value="Delete" /></p>
+ </form>
+
+</div>
{% endblock %}
diff --git a/templates/todolists/view.html b/templates/todolists/view.html
index ae8a6563..6b6e9845 100644
--- a/templates/todolists/view.html
+++ b/templates/todolists/view.html
@@ -1,68 +1,74 @@
{% extends "base.html" %}
-{% block title %}Arch Linux - Todo - {{ list.name }}{% endblock %}
+{% block title %}Arch Linux - Todo: {{ list.name }}{% endblock %}
{% block content %}
- <div class="greybox">
- <div style="float:right">
- {% if perms.main.delete_todolist %}
- <a href="/todo/delete/{{list.id}}/">Delete Todo List</a> |
- {% endif %}
- {% if perms.main.change_todolist %}
- <a href="/todo/edit/{{list.id}}/">Edit Todo List</a>
- {% endif %}
- </div>
- <h2 class="title">Todo List: {{ list.name }}</h2>
- <table id="todotable" class="results" width="100%">
- <thead>
- <tr>
- <th>Name</th>
- <th>Arch</th>
- <th>Repo</th>
- <th>Maintainer</th>
- <th>Status</th>
- </tr>
- </thead>
- <tbody>
+<div id="dev-todo-details" class="box">
+
+ <h2>Todo List: {{ list.name }}</h2>
+
+ <ul class="admin-actions">
+ {% if perms.main.delete_todolist %}
+ <li><a href="/todo/delete/{{list.id}}/"
+ title="Delete this todo list">Delete Todo List</a></li>
+ {% endif %}
+ {% if perms.main.change_todolist %}
+ <li><a href="/todo/edit/{{list.id}}/"
+ title="Edit this todo list">Edit Todo List</a></li>
+ {% endif %}
+ </ul>
+
+ <p>{{list.description|linebreaks}}</p>
+
+ <table id="dev-todo-pkglist" class="results">
+ <thead>
+ <tr>
+ <th>Name</th>
+ <th>Arch</th>
+ <th>Repo</th>
+ <th>Maintainer</th>
+ <th>Status</th>
+ </tr>
+ </thead>
+ <tbody>
{% for pkg in list.packages %}
- <tr class="{% cycle pkgr2,pkgr1 %}">
- <td><a href="{{ pkg.pkg.get_absolute_url }}">{{ pkg.pkg.pkgname }}</a></td>
- <td>{{ pkg.pkg.arch.name }}</td>
- <td>{{ pkg.pkg.repo.name|capfirst }}</td>
- <td>{{ pkg.pkg.maintainers|join:', ' }}</td>
- <td>
+ <tr class="{% cycle 'odd' 'even' %}">
+ <td><a href="{{ pkg.pkg.get_absolute_url }}"
+ title="View package details for {{ pkg.pkg.pkgname }}">{{ pkg.pkg.pkgname }}</a></td>
+ <td>{{ pkg.pkg.arch.name }}</td>
+ <td>{{ pkg.pkg.repo.name|capfirst }}</td>
+ <td>{{ pkg.pkg.maintainers|join:', ' }}</td>
+ <td>
{% if pkg.complete %}
- <a href="/todo/flag/{{ list.id }}/{{ pkg.id }}/"><span style="color:blue">Complete</span></a>
+ <a href="/todo/flag/{{ list.id }}/{{ pkg.id }}/"
+ class="complete" title="Toggle completion status">Complete</a>
{% else %}
- <a href="/todo/flag/{{ list.id }}/{{ pkg.id }}/"><span style="color:red">Incomplete</span></a>
+ <a href="/todo/flag/{{ list.id }}/{{ pkg.id }}/"
+ class="incomplete" title="Toggle completion status">Incomplete</a>
{% endif %}
- </td>
- </tr>
+ </td>
+ </tr>
{% endfor %}
- </tbody>
- </table>
- <br />
- <div class="box">
- <h3>List Description</h3>
- {{list.description|linebreaks}}
- </div>
- </div>
+ </tbody>
+ </table>
- {% load cdn %}{% jquery %}
- <script type="text/javascript">
- $(function() {
- $('a[href*=todo/flag]').click(function() {
- var link = this;
+</div><!-- #dev-todo-details -->
- $.getJSON(link.href, function(data) {
- if (data.complete) {
- $(link).text('Complete').css('color', 'blue');
- } else {
- $(link).text('Incomplete').css('color', 'red');
- }
- });
+{% load cdn %}{% jquery %}
+<script type="text/javascript">
+ $(function() {
+ $('a[href*=todo/flag]').click(function() {
+ var link = this;
- return false;
+ $.getJSON(link.href, function(data) {
+ if (data.complete) {
+ $(link).text('Complete').addClass('complete').removeClass('incomplete');
+ } else {
+ $(link).text('Incomplete').addClass('incomplete').removeClass('complete');
+ }
});
+
+ return false;
});
- </script>
+ });
+</script>
{% endblock %}