summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authoreliott <eliott@cactuswax.net>2008-03-08 12:11:02 -0800
committereliott <eliott@cactuswax.net>2008-03-08 12:11:02 -0800
commit3e31808521e990b3b86d25de7d49cdd90a2de29f (patch)
tree610986402708677b9cccf3c8d2632177173789ed /templates
parent4d1977f24e062370efd307cbe51d4cd826828362 (diff)
More changes to the multiarch model.
Diffstat (limited to 'templates')
-rw-r--r--templates/devel/index.html26
-rw-r--r--templates/devel/siteindex.html2
-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.html20
-rw-r--r--templates/packages/search.html18
-rw-r--r--templates/todolists/view.html2
9 files changed, 43 insertions, 29 deletions
diff --git a/templates/devel/index.html b/templates/devel/index.html
index afbec25a..091fcb99 100644
--- a/templates/devel/index.html
+++ b/templates/devel/index.html
@@ -23,11 +23,29 @@
{% 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 archs %}
+ <tr class="{% cycle pkgr2,pkgr1 %}">
+ <td><a href="/packages/?arch={{ arch.name }}">{{ arch.name }}</a></td>
+ <td><strong>{{ repo.count }}</strong> packages</td>
+ <td><strong>{{ repo.flagged }}</strong> packages</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 %}
@@ -42,11 +60,11 @@
<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>
</tr>
{% for maint in stats %}
diff --git a/templates/devel/siteindex.html b/templates/devel/siteindex.html
index 0c25fd8b..e97d9150 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>
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 a0e78210..1435557b 100644
--- a/templates/packages/details.html
+++ b/templates/packages/details.html
@@ -6,11 +6,6 @@
<h2 class="title">{{ pkg.pkgname }} {{ pkg.pkgver }}-{{ pkg.pkgrel }}</h2>
<div style="float:right" class="listing">
<ul class="small">
- {% if origin_repo %}
- <li><a href="http://cvs.archlinux.org/cgi-bin/viewcvs.cgi/{{ pkg.category.category }}/{{ pkg.pkgname }}/?cvsroot={{ origin_repo }}&amp;only_with_tag=TESTING">View CVS Entries</a></li>
- {% else %}
- <li><a href="http://cvs.archlinux.org/cgi-bin/viewcvs.cgi/{{ pkg.category.category }}/{{ pkg.pkgname }}/?cvsroot={{ pkg.repo.name }}&amp;only_with_tag=CURRENT">View CVS Entries</a></li>
- {% endif %}
<li><a href="/packages/files/{{ pkg.id }}/">View File List</a></li>
<li>
{% if pkg.needupdate %}
@@ -37,12 +32,12 @@
</div>
<table class="listing">
<tr>
+ <th>Architecture:</th>
+ <td>{{ pkg.arch.name }}</td>
+ </tr><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>
@@ -66,11 +61,14 @@
{{ pkg.depends_urlize }}
</ul>
</div>
- </td><td colspan="2" valign="top">
+ </td>
+ </tr>
+ <tr>
+ <td valign="top">
<div class="listing">
- <h4>Sources:</h4>
+ <h4>Required By:</h4>
<ul style="font-size:small;list-style:none">
- {{ pkg.sources_urlize }}
+ {{ pkg.required_by_urlize }}
</ul>
</div>
</td>
diff --git a/templates/packages/search.html b/templates/packages/search.html
index c5006cd6..309f926d 100644
--- a/templates/packages/search.html
+++ b/templates/packages/search.html
@@ -17,24 +17,24 @@
<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">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">
+ <select name="arch">
<option value="all">All</option>
- {% for r in repos %}
- <option value="{{ r.name }}"{% ifequal repo r.name %} selected{% endifequal %}>{{ r.name|capfirst }}</option>
+ {% for a in archs %}
+ <option value="{{ a.arch }}"{% ifequal arch a.name %} selected{% endifequal %}>{{ a.name }}</option>
{% endfor %}
</select>
</td><td>
- <select name="category">
+ <select name="repo">
<option value="all">All</option>
- {% for c in categories %}
- <option value="{{ c.category }}"{% ifequal category c.category %} selected{% endifequal %}>{{ c.category|capfirst }}</option>
+ {% for r in repos %}
+ <option value="{{ r.name }}"{% ifequal repo r.name %} selected{% endifequal %}>{{ r.name|capfirst }}</option>
{% endfor %}
</select>
</td><td>
@@ -75,8 +75,8 @@
<form method="post" action="/packages/update/">
<th>&nbsp;</th>
{% endif %}
+ <th><a href="{% buildsortqs "arch" %}">Arch</a></th>
<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>
@@ -87,8 +87,8 @@
{% if not user.is_anonymous %}
<td><input type="checkbox" name="pkgid" value="{{ pkg.id }}" /></td>
{% endif %}
+ <td>{{ pkg.arch.name }}</td>
<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>
diff --git a/templates/todolists/view.html b/templates/todolists/view.html
index 7cd58dc8..b77e6e76 100644
--- a/templates/todolists/view.html
+++ b/templates/todolists/view.html
@@ -6,6 +6,7 @@
<table class="results" width="100%">
<tr>
<th>ID</th>
+ <th>Arch</th>
<th>Repo</th>
<th>Name</th>
<th>Maintainer</th>
@@ -14,6 +15,7 @@
{% for pkg in pkgs %}
<tr class="{% cycle pkgr1,pkgr2 %}">
<td><a href="/packages/{{ pkg.pkg.id }}/">{{ pkg.pkg.id }}</a></td>
+ <td>{{ pkg.pkg.arch.name }}</td>
<td>{{ pkg.pkg.repo.name }}</td>
<td>{{ pkg.pkg.pkgname }}</td>
<td>{{ pkg.pkg.maintainer.get_full_name }}</td>