summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
Diffstat (limited to 'templates')
-rw-r--r--templates/base.html4
-rw-r--r--templates/devel/developers.html4
-rw-r--r--templates/devel/fellows.html63
-rw-r--r--templates/devel/index.html42
-rw-r--r--templates/devel/siteindex.html30
-rw-r--r--templates/feeds/news_description.html1
-rw-r--r--templates/feeds/news_title.html1
-rw-r--r--templates/feeds/packages_description.html1
-rw-r--r--templates/feeds/packages_title.html1
-rw-r--r--templates/packages/details.html141
-rw-r--r--templates/packages/flag.html26
-rw-r--r--templates/packages/flaghelp.html14
-rw-r--r--templates/packages/outofdate.txt13
-rw-r--r--templates/packages/search.html192
-rw-r--r--templates/todolists/list.html41
-rw-r--r--templates/todolists/view.html96
16 files changed, 338 insertions, 332 deletions
diff --git a/templates/base.html b/templates/base.html
index 5aa52152..9aa05c58 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -26,8 +26,6 @@
</ul>
{% endblock %}
</div>
- {% block ads %}
- {% if not user.is_anonymous %}
<div id="dev_nav">
<ul>
<li><a href="/accounts/logout/">Logout</a></li>
@@ -38,8 +36,6 @@
<li><a href="/devel/">Dashboard</a></li>
</ul>
</div>
- {% endif %}
- {% endblock %}
</div>
<div id="content">
{% block content %}
diff --git a/templates/devel/developers.html b/templates/devel/developers.html
index 6b1fe8b7..179e03aa 100644
--- a/templates/devel/developers.html
+++ b/templates/devel/developers.html
@@ -6,7 +6,7 @@
<br /><br />
<div id="devlist">
{% for dev in devs %}
- <a href="#{{ dev.first_name}}">{{ dev.first_name }}</a> &nbsp;
+ <a href="#{{ dev.first_name}}{{ dev.last_name.0|upper }}">{{ dev.first_name }}{{ dev.last_name.0|upper }}</a> &nbsp;
{% endfor %}
</div><br /><br />
@@ -16,7 +16,7 @@
<td class="devpic">
<img src="{{ dev.get_profile.get_picture_url }}" height="175" width="175" style="border:1px solid black">
</td><td>
- <a name="{{ dev.first_name }}" />
+ <a name="{{ dev.first_name }}{{ dev.last_name.0|upper }}" />
<table class="deventry" cellspacing="5">
<tr>
<th>Name:</th>
diff --git a/templates/devel/fellows.html b/templates/devel/fellows.html
new file mode 100644
index 00000000..8457f7e4
--- /dev/null
+++ b/templates/devel/fellows.html
@@ -0,0 +1,63 @@
+{% extends "base.html" %}
+
+{% block content %}
+<div class="box">
+ <h2 class="title">Arch Linux Fellows</h2>
+ Below you can find a list of ex-developers (aka Project Fellows). These folks helped make Arch
+ what it is today. Thanks!
+ <br /><br />
+ <div id="devlist">
+ {% for fellow in fellows %}
+ <a href="#{{ fellow.first_name}}{{ fellow.last_name.0|upper }}">{{ fellow.first_name }}{{ fellow.last_name.0|upper }}</a> &nbsp;
+ {% endfor %}
+ </div><br /><br />
+
+ <table class="center" cellpadding="20">
+ {% for fellow in fellows %}
+ <tr>
+ <td class="devpic">
+ <img src="{{ fellow.get_profile.get_picture_url }}" height="175" width="175" style="border:1px solid black">
+ </td><td>
+ <a name="{{ fellow.first_name }}{{ fellow.last_name.0|upper }}" />
+ <table class="deventry" cellspacing="5">
+ <tr>
+ <th>Name:</th>
+ <td>{{ fellow.get_full_name }}</td>
+ </tr><tr>
+ <th>Alias:</th>
+ <td>{{ fellow.get_profile.alias }}</td>
+ </tr><tr>
+ <th>Past Roles:</th>
+ <td>{{ fellow.get_profile.roles }}<br />
+ </td>
+ </tr><tr>
+ <th>Website:</th>
+ <td>{{ fellow.get_profile.website }}</td>
+ </tr><tr>
+ <th>Occupation:</th>
+ <td>{{ fellow.get_profile.occupation }}</td>
+ </tr><tr>
+ <th>YOB:</th>
+ <td>{% if fellow.get_profile.yob %}{{ fellow.get_profile.yob }}{% else %}&nbsp;{% endif %}</td>
+ </tr><tr>
+ <th>Location:</th>
+ <td>{{ fellow.get_profile.location }}</td>
+ </tr><tr>
+ <th>Languages:</th>
+ <td>{{ fellow.get_profile.languages }}</td>
+ </tr><tr>
+ <th>Interests:</th>
+ <td>{{ fellow.get_profile.interests }}</td>
+ </tr><tr>
+ <th>Favorite Distros:</th>
+ <td>{{ fellow.get_profile.favorite_distros }}</td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ {% endfor %}
+ </table>
+</div>
+<br /><br />
+{% endblock %}
+
diff --git a/templates/devel/index.html b/templates/devel/index.html
index 939e7ecd..8c621cc5 100644
--- a/templates/devel/index.html
+++ b/templates/devel/index.html
@@ -23,18 +23,36 @@
{% endif %}
<div class="greybox">
- <h3 class="title">Repository Package Stats</h3>
+ <h3 class="title">Stats by Architecture</h3>
+ <table class="results" width="100%">
+ <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.count }}</strong> packages</a></td>
+ <td><a href="/packages/?arch={{ arch.name }}&flagged_only=y"><strong>{{ arch.flagged }}</strong> packages</a></td>
+ </tr>
+ {% endfor %}
+ </table>
+ </div>
+ <br /><br />
+ <div class="greybox">
+ <h3 class="title">Stats by Repository</h3>
<table class="results" width="100%">
<tr>
<th width="50%">Repository</th>
- <th># Package</th>
+ <th># Packages</th>
<th># Flagged</th>
</tr>
{% for repo in repos %}
<tr class="{% cycle pkgr2,pkgr1 %}">
- <td><a href="/packages/?repo={{ repo.name }}">{{ repo.name }}</a></td>
- <td><strong>{{ repo.count }}</strong> packages</td>
- <td><strong>{{ repo.flagged }}</strong> packages</td>
+ <td><strong>{{ repo.name }}</strong></td>
+ <td><a href="/packages/?repo={{ repo.name }}"><strong>{{ repo.count }}</strong> packages</a></td>
+ <td><a href="/packages/?repo={{ repo.name }}&flagged_only=y"><strong>{{ repo.flagged }}</strong> packages</a></td>
</tr>
{% endfor %}
</table>
@@ -42,20 +60,18 @@
<br /><br />
<div class="greybox">
- <h3 class="title">Maintainer Package Stats</h3>
+ <h3 class="title">Stats by Maintainer</h3>
<table class="results" width="100%">
<tr>
<th width="50%">Maintainer</th>
- <th># Package</th>
+ <th># Packages</th>
<th># Flagged</th>
- <th># Flagged notesting</th>
</tr>
{% for maint in stats %}
<tr class="{% cycle pkgr2,pkgr1 %}">
- <td><a href="/packages/?maint={{ maint.0.id }}">{{ maint.0.get_full_name }}</a></td>
- <td><strong>{{ maint.1 }}</strong> packages</td>
- <td><strong>{{ maint.2 }}</strong> packages</td>
- <td><strong>{{ maint.3 }}</strong> packages</td>
+ <td><strong>{{ maint.0.get_full_name }}</strong></td>
+ <td><a href="/packages/?maint={{ maint.0.id }}"><strong>{{ maint.1 }}</strong> packages</a></td>
+ <td><a href="/packages/?maint={{ maint.0.id }}&flagged_only=y"><strong>{{ maint.2 }}</strong> packages</a></td>
</tr>
{% endfor %}
</table>
@@ -86,7 +102,7 @@
</ul>
<ul class="small">
{% for pkg in pkgs %}
- <li><a href="/packages/{{ pkg.id }}/">{{ pkg.repo.name }}::{{ pkg.pkgname }} {{ pkg.pkgver }}</a></li>
+ <li><a href="/packages/{{ pkg.id }}/">{{ pkg.repo.name }}::{{ pkg.pkgname }} &nbsp; &nbsp; {{ pkg.pkgver }} &nbsp; &nbsp; {{ pkg.arch.name }}</a></li>
{% endfor %}
</ul>
{% endif %}
diff --git a/templates/devel/siteindex.html b/templates/devel/siteindex.html
index 0c25fd8b..37bdba42 100644
--- a/templates/devel/siteindex.html
+++ b/templates/devel/siteindex.html
@@ -21,7 +21,7 @@
{% for pkg in pkg_updates %}
<tr>
<td><a href="{{ pkg.get_absolute_url }}">{{ pkg.pkgname }} {{ pkg.pkgver }}-{{ pkg.pkgrel }}</a></td>
- <td style="text-align:right">{{ pkg.category.category }}</td>
+ <td style="text-align:right">{{ pkg.arch.name }}</td>
</tr>
{% endfor %}
<tr>
@@ -101,29 +101,17 @@
<p><b>Package Search:</b>&nbsp;&nbsp;<input type="text" name="q" size="20" maxlength="200" /></p>
</form>
</div>
- <br />
- <div class="greybox">
- <h3>Package Repositories</h3>
- <table id="repolinks">
- {% for repo in repos %}
- <tr>
- <th><a href="/packages/?repo={{ repo.name }}">{{ repo.name }}</a></th>
- <td>{{ repo.last_update }}</td>
- </tr>
- {% endfor %}
- </table>
- </div>
- <br />
- <h3>Dev Links:</h3>
- <ul class="links">
- <li><a href="/devel/">Dev Dashboard</a></li>
- <li><a href="/developers/">Developer List</a></li>
- </ul>
- <br />
+ <br clear="all" />
+ <h3>Dev Links:</h3>
+ <ul class="links">
+ <li><a href="/devel/">Dev Dashboard</a></li>
+ <li><a href="/developers/">Developer List</a></li>
+ <li><a href="/fellows/">Fellows List</a></li>
+ </ul>
<h3>Main Site Links:</h3>
<ul class="links">
<li><a href="http://bugs.archlinux.org">Bug Tracker</a></li>
- <li><a href="http://archlinux.org/cvs/">CVS</a></li>
+ <li><a href="http://repos.archlinux.org/viewvc.cgi/">SVN</a></li>
<li><a href="http://projects.archlinux.org">Projects</a></li>
</ul>
{% endblock %}
diff --git a/templates/feeds/news_description.html b/templates/feeds/news_description.html
deleted file mode 100644
index 26e1cbbe..00000000
--- a/templates/feeds/news_description.html
+++ /dev/null
@@ -1 +0,0 @@
-{{ obj.content }}
diff --git a/templates/feeds/news_title.html b/templates/feeds/news_title.html
deleted file mode 100644
index d355de5b..00000000
--- a/templates/feeds/news_title.html
+++ /dev/null
@@ -1 +0,0 @@
-{{ obj.title }}
diff --git a/templates/feeds/packages_description.html b/templates/feeds/packages_description.html
deleted file mode 100644
index 6b9c47b3..00000000
--- a/templates/feeds/packages_description.html
+++ /dev/null
@@ -1 +0,0 @@
-{{ obj.pkgdesc }}
diff --git a/templates/feeds/packages_title.html b/templates/feeds/packages_title.html
deleted file mode 100644
index a2731625..00000000
--- a/templates/feeds/packages_title.html
+++ /dev/null
@@ -1 +0,0 @@
-{{ obj.pkgname }} {{ obj.pkgver }}-{{ obj.pkgrel }}
diff --git a/templates/packages/details.html b/templates/packages/details.html
index 8daae748..c3b214e0 100644
--- a/templates/packages/details.html
+++ b/templates/packages/details.html
@@ -1,77 +1,80 @@
{% load package_extras %}
{% extends "base.html" %}
+{% block title %}Pkg: {{ pkg.pkgname }} - Arch Linux 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="http://svn.archlinux.org/viewvc.cgi/{{ pkg.pkgname }}/repos/">View SVN Entries</a></li>
- <li><a href="/packages/files/{{ pkg.id }}/">View File List</a></li>
- <li>
- {% if pkg.needupdate %}
- <span style="font-size:x-small"><em>This package has been flagged out-of-date</em></span>
- {% if not user.is_anonymous %}
+ <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="http://repos.archlinux.org/viewvc.cgi/{{ pkg.pkgname }}/repos/{{ pkg.repo.name|lower }}-{{ pkg.arch.name|lower }}/">View SVN Entries</a></li>
+ <!-- <li><a href="/packages/files/{{ pkg.id }}/">View File List</a></li> -->
+ {% if pkg.needupdate %}
+ <li>
+ <span style="font-size:x-small"><em>This package has been flagged out-of-date</em></span>
<br />&nbsp; &nbsp; <a href="/packages/unflag/{{ pkg.id }}/">Click here to unflag</a>
- {% endif %}
- {% else %}
- <a href="/packages/flag/{{ pkg.id }}/" onclick="return !window.open('/packages/flag/{{ pkg.id }}/','FlagHelp','height=250,width=450,location=no,scrollbars=yes,menubars=no,toolbars=no,resizable=no');">Flag Package Out-of-Date</a>
- <a href="/packages/flaghelp" onclick="return !window.open('/packages/flaghelp','FlagHelp','height=250,width=450,location=no,scrollbars=yes,menubars=no,toolbars=no,resizable=no');"><span style="font-size:x-small">(?)</span></a>
- {% endif %}
- </li>
- {% if not user.is_anonymous %}
- <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 %}
- </ul>
- </div>
- <table class="listing">
- <tr>
- <th>Repository:</th>
- <td>{{ pkg.repo.name }}</td>
- </tr><tr>
- <th>Category:</th>
- <td>{{ pkg.category.category }}</td>
- </tr><tr>
- <th>Description:</th>
- <td>{{ pkg.pkgdesc }}</td>
- </tr><tr>
- <th>URL:</th>
- <td><a href="{{ pkg.url }}">{{ pkg.url }}</a></td>
- </tr><tr>
- <th>Maintainer:</th>
- <td>{% if pkg.maintainer %}{{ pkg.maintainer.get_full_name }}{% else %}None{% endif %}</td>
- </tr><tr>
- <th>LastUpdated:</th>
+ </li>
+ {% endif %}
+ <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>
+ </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><tr>
+ <th>Description:</th>
+ <td>{{ pkg.pkgdesc }}</td>
+ </tr><tr>
+ <th>Upstream URL:</th>
+ <td><a href="{{ pkg.url }}">{{ pkg.url }}</a></td>
+ </tr><tr>
+ <th>Maintainer:</th>
+ <td>{% if pkg.maintainer %}{{ pkg.maintainer.get_full_name }}{% else %}None{% endif %}</td>
+ </tr><tr>
+ <th>LastUpdated:</th>
<td>{{ pkg.last_update|date:"Y-m-d" }}</td>
- </tr>
- </table>
- <br />
- <table width="100%">
- <tr>
- <td valign="top">
- <div class="listing">
- <h4>Dependencies:</h4>
- <ul style="font-size:small;list-style:none">
- {{ pkg.depends_urlize }}
- </ul>
- </div>
- </td><td colspan="2" valign="top">
- <div class="listing">
- <h4>Sources:</h4>
- <ul style="font-size:small;list-style:none">
- {{ pkg.sources_urlize }}
- </ul>
- </div>
- </td>
- </tr>
- </table>
- </div>
+ </tr>
+ </table>
+ <br />
+ <table width="100%">
+ <tr>
+ <td valign="top" width="50%">
+ <div class="listing">
+ <h4>Dependencies:</h4>
+ <ul style="font-size:small;list-style:none">
+ {% for depend in pkg.get_depends %}
+ {% ifequal depend.pkg None %}
+ <li>{{ depend.dep.depname }} (virtual)</li>
+ {% else %}
+ <li><a href="/packages/{{ depend.pkg.id }}/">{{ depend.dep.depname }}</a>{{ depend.dep.depvcmp }}</li>
+ {% endifequal %}
+ {% endfor %}
+ </ul>
+ </div>
+ </td>
+ <td valign="top">
+ <div class="listing">
+ <h4>Required By:</h4>
+ <ul style="font-size:small;list-style:none">
+ {% for req in pkg.get_requiredby %}
+ <li><a href="/packages/{{ req.id }}/">{{ req.pkgname }}{% ifequal req.repo.name "Testing" %} (testing){% endifequal %}{% ifequal req.repo.name "Unstable" %} (unstable){% endifequal %}</a></li>
+ {% endfor %}
+ </ul>
+ </div>
+ </td>
+ </tr>
+ </table>
+ </div>
{% endblock %}
diff --git a/templates/packages/flag.html b/templates/packages/flag.html
deleted file mode 100644
index 215b6fa8..00000000
--- a/templates/packages/flag.html
+++ /dev/null
@@ -1,26 +0,0 @@
-{% load validation %}
-<html>
-<head><title>Flagging Packages</title></head>
-<body>
-{% if errors %}
- {% print_errors errors %}
-{% endif %}
-<span style="font-family: verdana, arial, helvetica">
-{% if confirmemail %}
- Thank you. Maintainers have been notified.
-{% else %}
-<form method="post" action=".">
- Please confirm your flag request.<br />
- <br />
- Email Address: (required) <br />
- <input type="text" name="confirmemail" size="40" maxlength="128" /><br />
- <br />
- Message to dev: (optional)<br />
- <textarea name="usermessage" rows="3" cols="40"></textarea><br />
- <input type="submit" value=" Confirm " />
-</form>
-{% endif %}
-</span>
-</body>
-</html>
-
diff --git a/templates/packages/flaghelp.html b/templates/packages/flaghelp.html
deleted file mode 100644
index 09f7530b..00000000
--- a/templates/packages/flaghelp.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<html>
-<head><title>Flagging Packages</title></head>
-<body>
-<span style="font-family: verdana, arial, helvetica">
-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.
-<br><br>
-<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.
-</span>
-</body>
-</html>
diff --git a/templates/packages/outofdate.txt b/templates/packages/outofdate.txt
deleted file mode 100644
index 7b863608..00000000
--- a/templates/packages/outofdate.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-
-* Note: this is an automated message
-
-{{ email }} wants to notify you that the following package may be out
-of date:
-
- {{ pkgname }} ({{ weburl }})
-{% if message %}
-The user provided the following additional text:
-
-{{ message }}
-{% endif %}
-
diff --git a/templates/packages/search.html b/templates/packages/search.html
index c5006cd6..a64b92a2 100644
--- a/templates/packages/search.html
+++ b/templates/packages/search.html
@@ -1,47 +1,47 @@
{% load validation %}
{% load package_extras %}
{% extends "base.html" %}
-
+{% block title %}Arch Linux - Package Search{% endblock %}
{% block head %}
<script type="text/JavaScript" src="/media/calendar.js"></script>
<link href="/media/calendar.css" rel="stylesheet" type="text/css" />
{% endblock %}
{% block content %}
- <div class="greybox">
- <h4 style="text-align: right">Search Criteria</h4>
- {% if errors %}
- {% print_errors errors %}
- {% endif %}
- <hr />
- <form method="get" action="/packages/search/">
- <table width="100%">
- <tr>
- <td><span class="smalltext">Repository</span></td>
- <td><span class="smalltext">Category</span></td>
- <td><span class="smalltext">Keywords</span></td>
- <td><span class="smalltext">Last Update</span></td>
- <td><span class="smalltext">Per Page</span></td>
- </tr><tr>
- <td>
- <select name="repo">
- <option value="all">All</option>
- {% for r in repos %}
- <option value="{{ r.name }}"{% ifequal repo r.name %} selected{% endifequal %}>{{ r.name|capfirst }}</option>
- {% endfor %}
- </select>
- </td><td>
- <select name="category">
- <option value="all">All</option>
- {% for c in categories %}
- <option value="{{ c.category }}"{% ifequal category c.category %} selected{% endifequal %}>{{ c.category|capfirst }}</option>
- {% endfor %}
- </select>
- </td><td>
- <input type="text" name="q" value="{{ query|escape }}" size="30" maxlength="200" />
- </td><td>
- <input type="text" name="lastupdate" value="{{ lastupdate|escape }}" size="10" maxlength="10" id="f_lastupdate" /> <button type="reset" id="f_trigger">...</button>
- <script type="text/javascript">
+ <div class="greybox">
+ <h4 style="text-align: right">Search Criteria</h4>
+ {% if errors %}
+ {% print_errors errors %}
+ {% endif %}
+ <hr />
+ <form method="get" action="/packages/search/">
+ <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">Last Update</span></td>
+ <td><span class="smalltext">Per Page</span></td>
+ </tr><tr>
+ <td>
+ <select name="arch">
+ <option value="all">All</option>
+ {% for a in arches %}
+ <option value="{{ a.name }}"{% ifequal arch a.name %} selected{% endifequal %}>{{ a.name }}</option>
+ {% endfor %}
+ </select>
+ </td><td>
+ <select name="repo">
+ <option value="all">All</option>
+ {% for r in repos %}
+ <option value="{{ r.name }}"{% ifequal repo r.name %} selected{% endifequal %}>{{ r.name|capfirst }}</option>
+ {% endfor %}
+ </select>
+ </td><td>
+ <input type="text" name="q" value="{{ query|escape }}" size="30" maxlength="200" />
+ </td><td>
+ <input type="text" name="lastupdate" value="{{ lastupdate|escape }}" size="10" maxlength="10" id="f_lastupdate" /> <button type="reset" id="f_trigger">...</button>
+ <script type="text/javascript">
Calendar.setup({
inputField : "f_lastupdate", // id of the input field
ifFormat : "%Y-%m-%d", // format of the input field
@@ -50,71 +50,65 @@
singleClick : true, // double-click mode
step : 1 // show all years in drop-down boxes (instead of every other year as default)
});
- </script>
- </td><td>
- <select name="limit">
- <option value="50"{% ifequal limit 50 %} selected{% endifequal %}>50</option>
- <option value="100"{% ifequal limit 100 %} selected{% endifequal %}>100</option>
- <option value="250"{% ifequal limit 250 %} selected{% endifequal %}>250</option>
- <option value="0"{% ifequal limit 0 %} selected{% endifequal %}>All</option>
- </select>
- </td><td>
- <input type="submit" value=" Search " />
- </td>
- </tr>
- </table>
- </form>
- </div>
- <br /><br />
+ </script>
+ </td><td>
+ <select name="limit">
+ <option value="50"{% ifequal limit 50 %} selected{% endifequal %}>50</option>
+ <option value="100"{% ifequal limit 100 %} selected{% endifequal %}>100</option>
+ <option value="250"{% ifequal limit 250 %} selected{% endifequal %}>250</option>
+ <option value="0"{% ifequal limit 0 %} selected{% endifequal %}>All</option>
+ </select>
+ </td><td>
+ <input type="submit" value=" Search " />
+ </td>
+ </tr>
+ </table>
+ </form>
+ </div>
+ <br /><br />
- {% if results %}
- <div class="greybox">
- <table class="results" width="100%">
- <tr>
- {% if not user.is_anonymous %}
- <form method="post" action="/packages/update/">
- <th>&nbsp;</th>
- {% endif %}
- <th><a href="{% buildsortqs "repo" %}">Repo</a></th>
- <th><a href="{% buildsortqs "category" %}">Category</a></th>
- <th><a href="{% buildsortqs "pkgname" %}">Name</a></th>
- <th>Version</th>
- <th>Description</th>
- <th><a href="{% buildsortqs "last_update" %}">Last Updated</a></th>
- </tr>
- {% for pkg in results %}
+ {% if results %}
+ <div class="greybox">
+ <table class="results" width="100%">
+ <tr>
+ <form method="post" action="/packages/update/">
+ <th>&nbsp;</th>
+ <th><a href="{% buildsortqs "arch" %}">Arch</a></th>
+ <th><a href="{% buildsortqs "repo" %}">Repo</a></th>
+ <th><a href="{% buildsortqs "pkgname" %}">Name</a></th>
+ <th>Version</th>
+ <th>Description</th>
+ <th><a href="{% buildsortqs "-last_update" %}">Last Updated</a></th>
+ </tr>
+ {% for pkg in results %}
<tr class="{% cycle pkgr2,pkgr1 %}">
- {% if not user.is_anonymous %}
- <td><input type="checkbox" name="pkgid" value="{{ pkg.id }}" /></td>
- {% endif %}
- <td>{{ pkg.repo.name }}</td>
- <td>{{ pkg.category.category }}</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>{{ pkg.pkgver }}-{{ pkg.pkgrel }}</td>
- {% endif %}
- <td>{{ pkg.pkgdesc }}</td>
- <td>{{ pkg.last_update|date:"Y-m-d" }}</td>
- </tr>
- {% endfor %}
- <tr>
- <td colspan="2" style="font-size:x-small">{% if prevpage %}<br /><a href="{{ prevpage }}">&lt;&lt;&lt; Prev</a>{% endif %}</td>
- <td colspan="2">&nbsp;</td>
- <td colspan="2" style="font-size:x-small;text-align:right">{% if nextpage %}<br /><a href="{{ nextpage }}">Next &gt;&gt;&gt;</a>{% endif %}</td>
- </tr>
- {% if not user.is_anonymous %}
- <tr>
- <td colspan="3">&nbsp;</td>
- <td colspan="2" style="text-align:center"><input type="submit" name="adopt" value="Adopt Packages"></td>
- <td colspan="1" style="text-align:center"><input type="submit" name="disown" value="Disown Packages"></td>
- <td colspan="1">&nbsp;</td>
- </tr>
- </form>
- {% endif %}
- </table>
- </div>
- {% endif %}
+ <td><input type="checkbox" name="pkgid" value="{{ pkg.id }}" /></td>
+ <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>{{ pkg.pkgver }}-{{ pkg.pkgrel }}</td>
+ {% endif %}
+ <td>{{ pkg.pkgdesc }}</td>
+ <td>{{ pkg.last_update|date:"Y-m-d" }}</td>
+ </tr>
+ {% endfor %}
+ <tr>
+ <td colspan="2" style="font-size:x-small">{% if prevpage %}<br /><a href="{{ prevpage }}">&lt;&lt;&lt; Prev</a>{% endif %}</td>
+ <td colspan="2">&nbsp;</td>
+ <td colspan="2" style="font-size:x-small;text-align:right">{% if nextpage %}<br /><a href="{{ nextpage }}">Next &gt;&gt;&gt;</a>{% endif %}</td>
+ </tr>
+ <tr>
+ <td colspan="3">&nbsp;</td>
+ <td colspan="2" style="text-align:center"><input type="submit" name="adopt" value="Adopt Packages"></td>
+ <td colspan="1" style="text-align:center"><input type="submit" name="disown" value="Disown Packages"></td>
+ <td colspan="1">&nbsp;</td>
+ </tr>
+ </form>
+ </table>
+ </div>
+ {% endif %}
{% endblock %}
diff --git a/templates/todolists/list.html b/templates/todolists/list.html
index 714e1139..6edf1324 100644
--- a/templates/todolists/list.html
+++ b/templates/todolists/list.html
@@ -1,4 +1,5 @@
{% extends "base.html" %}
+
{% block content %}
<div class="greybox">
{% if perms.todolists.add_todolist %}
@@ -8,26 +9,26 @@
{% 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>
- {% 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>
- {% endfor %}
- </tbody>
+ <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>
+ {% endfor %}
+ </tbody>
</table>
</div>
{% endblock %}
diff --git a/templates/todolists/view.html b/templates/todolists/view.html
index c0c0dc90..1ebf810c 100644
--- a/templates/todolists/view.html
+++ b/templates/todolists/view.html
@@ -4,62 +4,64 @@
<script type="text/javascript" src="/media/jquery.tablesorter.min.js"></script>
<script type="text/javascript">
$(document).ready(
- function(){
+ function(){
$("#todotable").tablesorter({widgets: ['zebra']});
- }
+ }
);
</script>
<style type="text/css">
-table#todotable thead tr .header {
- background-image: url('/media/bg.gif');
- background-repeat: no-repeat;
- background-position: center right;
- cursor: pointer;
-}
-table#todotable thead tr .headerSortUp {
- background-image: url('/media/asc.gif');
-}
-table#todotable thead tr .headerSortDown {
- background-image: url('/media/desc.gif');
-}
-table#todotable thead tr .headerSortDown, table#todotable thead tr .headerSortUp {
- background-color: #8dbdd8;
-}
-table#todotable tbody tr.odd {
- background-color: #eee4cb;
-}
+ table#todotable thead tr .header {
+ background-image: url('/media/bg.gif');
+ background-repeat: no-repeat;
+ background-position: center right;
+ cursor: pointer;
+ }
+ table#todotable thead tr .headerSortUp {
+ background-image: url('/media/asc.gif');
+ }
+ table#todotable thead tr .headerSortDown {
+ background-image: url('/media/desc.gif');
+ }
+ table#todotable thead tr .headerSortDown, table.todotable thead tr .headerSortUp {
+ background-color: #8dbdd8;
+ }
+ table#todotable tbody tr.odd {
+ background-color: #eee4cb;
+ }
</style>
{% endblock %}
{% block content %}
<div class="greybox">
- <h3 class="title">ToDo List: {{ list.name }}</h2>
+ <h2 class="title">ToDo List: {{ list.name }}</h2>
<table id="todotable" class="results" width="100%">
- <thead>
- <tr>
- <th>ID</th>
- <th>Repo</th>
- <th>Name</th>
- <th>Maintainer</th>
- <th>Status</th>
- </tr>
- </thead>
- <tbody>
- {% for pkg in pkgs %}
- <tr class="{% cycle even,odd %}">
- <td><a href="/packages/{{ pkg.pkg.id }}/">{{ pkg.pkg.id }}</a></td>
- <td>{{ pkg.pkg.repo.name }}</td>
- <td>{{ pkg.pkg.pkgname }}</td>
- <td>{{ pkg.pkg.maintainer.get_full_name }}</td>
- <td>
- {% if pkg.complete %}
- <a href="/todo/flag/{{ list.id }}/{{ pkg.id }}/"><span style="color:blue">Complete</span></a>
- {% else %}
- <a href="/todo/flag/{{ list.id }}/{{ pkg.id }}/"><span style="color:red">Incomplete</span></a>
- {% endif %}
- </td>
- </tr>
- {% endfor %}
- </tbody>
+ <thead>
+ <tr>
+ <th>ID</th>
+ <th>Arch</th>
+ <th>Repo</th>
+ <th>Name</th>
+ <th>Maintainer</th>
+ <th>Status</th>
+ </tr>
+ </thead>
+ <tbody>
+ {% for pkg in pkgs %}
+ <tr class="{% cycle even,odd %}">
+ <td><a href="/packages/{{ pkg.pkg.id }}/">{{ pkg.pkg.id }}</a></td>
+ <td>{{ pkg.pkg.arch.name }}</td>
+ <td>{{ pkg.pkg.repo.name|capfirst }}</td>
+ <td>{{ pkg.pkg.pkgname }}</td>
+ <td>{{ pkg.pkg.maintainer.get_full_name|default:"Orphan" }}</td>
+ <td>
+ {% if pkg.complete %}
+ <a href="/todo/flag/{{ list.id }}/{{ pkg.id }}/"><span style="color:blue">Complete</span></a>
+ {% else %}
+ <a href="/todo/flag/{{ list.id }}/{{ pkg.id }}/"><span style="color:red">Incomplete</span></a>
+ {% endif %}
+ </td>
+ </tr>
+ {% endfor %}
+ </tbody>
</table>
</div>
{% endblock %}