More changes to the multiarch model.

2 files changed, 18 insertions, 20 deletions

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>