fixes for changes in the model dealing with the urlize -> get_* refactor

1 files changed, 74 insertions, 69 deletions

diff --git a/templates/packages/details.html b/templates/packages/details.html
index 1784ab79..6d1f5066 100644
--- a/templates/packages/details.html
+++ b/templates/packages/details.html
@@ -1,77 +1,82 @@
 {% 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="/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="/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>
                 <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>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>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>
+            {% 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>
+                <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" width="50%">
-					<div class="listing">
-						<h4>Dependencies:</h4>
-						<ul style="font-size:small;list-style:none">
-						{{ pkg.depends_urlize }}
-						</ul>
-					</div>
-				</td>
-				<td valign="top">
-					<div class="listing">
-						<h4>Required By:</h4>
-						<ul style="font-size:small;list-style:none">
-						{{ pkg.required_by_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 dep in pkg.get_depends %}
+                          {% ifequal dep.0 None %}
+                            <li>{{ dep.1 }}</li>
+                          {% else %}
+                            <li><a href="/packages/{{ dep.0 }}/">{{ dep.1 }}</a>{{ dep.2 }}</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.0 }}/">{{ req.1 }}</a></li>
+                        {% endfor %}
+                        </ul>
+                    </div>
+                </td>
+            </tr>
+        </table>
+    </div>
 {% endblock %}