Merge branch 'master' into cdn-jquery

Conflicts:
	templates/todolists/view.html

14 files changed, 49 insertions, 12 deletions

diff --git a/templates/404.html b/templates/404.html
index bc50f69b..9e389ba9 100644
--- a/templates/404.html
+++ b/templates/404.html
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+{% block title %}Arch Linux - Page Not Found{% endblock %}
 
 {% block content %}
 	<div class="box">
diff --git a/templates/devel/index.html b/templates/devel/index.html
index 1203d8a6..12c0791e 100644
--- a/templates/devel/index.html
+++ b/templates/devel/index.html
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+{% block title %}Arch Linux - Developer Dashboard{% endblock %}
 
 {% block head %}
 {% load cdn %}{% jquery %}
diff --git a/templates/devel/mirrorlist.html b/templates/devel/mirrorlist.html
index 01699daf..630d018d 100644
--- a/templates/devel/mirrorlist.html
+++ b/templates/devel/mirrorlist.html
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+{% block title %}Arch Linux - Mirror Overview{% endblock %}
 
 {% block content %}
 <div class="greybox">
diff --git a/templates/news/add.html b/templates/news/add.html
index daa75871..ef3f211c 100644
--- a/templates/news/add.html
+++ b/templates/news/add.html
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+{% block title %}Arch Linux - {% if form.instance.id %}Edit{% else %}Add{% endif %} News{% endblock %}
 
 {% block content %}
 	<div class="greybox">
diff --git a/templates/news/delete.html b/templates/news/delete.html
index 0f48f8bb..c3824a26 100644
--- a/templates/news/delete.html
+++ b/templates/news/delete.html
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+{% block title %}Arch Linux - Delete News{% endblock %}
 
 {% block content %}
 	<div class="greybox">
diff --git a/templates/news/view.html b/templates/news/view.html
index 281d8a7e..2f7c3d87 100644
--- a/templates/news/view.html
+++ b/templates/news/view.html
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+{% block title %}Arch Linux - {{ news.title }}{% endblock %}
 
 {% block content %}
 	<div class="box">
diff --git a/templates/packages/details.html b/templates/packages/details.html
index 5c3c9497..9b7a0492 100644
--- a/templates/packages/details.html
+++ b/templates/packages/details.html
@@ -1,6 +1,5 @@
 {% extends "base.html" %}
-{% load package_extras %}
-{% block title %}Pkg: {{ pkg.pkgname }} - Arch Linux Package Details{% endblock %}
+{% 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>
@@ -9,7 +8,6 @@
                 <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><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>
@@ -79,7 +77,7 @@
                           {% 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 }}</li>
+                            <li><a href="{{ depend.pkg.get_absolute_url }}">{{ depend.dep.depname }}</a>{{ depend.dep.depvcmp }}{% ifequal depend.pkg.repo.name "Testing" %} (testing){% endifequal %}</li>
                           {% endifequal %}
                         {% endfor %}
                         </ul>
@@ -94,7 +92,7 @@
                         {% if rqdby %}
                         <ul style="font-size:small;list-style:none">
                         {% for req in rqdby %}
-                        <li><a href="{{req.get_absolute_url}}">{{ req.pkgname }}{% ifequal req.repo.name "Testing" %} (testing){% endifequal %}{% ifequal req.repo.name "Unstable" %} (unstable){% endifequal %}</a></li>
+                        <li><a href="{{req.get_absolute_url}}">{{ req.pkgname }}</a>{% ifequal req.repo.name "Testing" %} (testing){% endifequal %}</li>
                         {% endfor %}
                         </ul>
                         {% endif %}
@@ -103,6 +101,24 @@
                 </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>
+<script type="text/javascript" src="/media/jquery-1.4.1.min.js"></script>
+<script type="text/javascript">
+function ajaxifyFiles() {
+    $('#filelink').click(function(event) {
+        event.preventDefault();
+        $.get(this.href, function(data) {
+            $('#filelist').html(data);
+        });
+    });
+}
+$(document).ready(ajaxifyFiles);
+</script>
 {% endblock %}
 
diff --git a/templates/packages/files-list.html b/templates/packages/files-list.html
new file mode 100644
index 00000000..d26a11e9
--- /dev/null
+++ b/templates/packages/files-list.html
@@ -0,0 +1,12 @@
+<div class="listing" id="filelist">
+	<h4>Files:</h4>
+	{% if files.count %}
+	<ul style="font-size:small;list-style:none">
+	{% for file in files %}
+		<li>{{ file.path }}</li>
+	{% endfor %}
+	</ul>
+	{% else %}
+	<p style="padding: 10px 20px;">No filelist available.</p>
+	{% endif %}
+</div>
diff --git a/templates/packages/files.html b/templates/packages/files.html
index 145bcf24..2fff5ff1 100644
--- a/templates/packages/files.html
+++ b/templates/packages/files.html
@@ -1,11 +1,9 @@
 {% extends "base.html" %}
-{% block title %}Pkg: {{ pkg.pkgname }} - Arch Linux Package File List{% endblock %}
+{% block title %}Arch Linux - {{ pkg.pkgname }} {{ pkg.pkgver }}-{{ pkg.pkgrel }} - Package File List{% endblock %}
 {% block content %}
     <div class="box">
-        <h3>Viewing Files: {{ pkg.pkgname }} {{ pkg.pkgver }}-{{ pkg.pkgrel }}</h3>
-        {% for file in files %}
-            {{ file.path }}<br />
-        {% endfor %}
+        <h2 class="title">{{ pkg.pkgname }} {{ pkg.pkgver }}-{{ pkg.pkgrel }}</h2>
+        {% include "packages/files-list.html" %}
     </div>
 {% endblock %}
 
diff --git a/templates/packages/flag.html b/templates/packages/flag.html
index 0bea7396..1071fdf8 100644
--- a/templates/packages/flag.html
+++ b/templates/packages/flag.html
@@ -1,5 +1,6 @@
 {% extends "base.html" %}
 {% block title %}Arch Linux - Flag Package - {{ pkg.pkgname }}{% endblock %}
+
 {% block content %}
 <div>
     {% if confirmed %}
@@ -22,7 +23,7 @@
 			{{form}}
 		</table>
 		<input type="submit" value=" Confirm " />
-		<br />
 	</form>
     {% endif %}
+</div>
 {% endblock %}
diff --git a/templates/packages/flagged.html b/templates/packages/flagged.html
index 738b633f..64cb2452 100644
--- a/templates/packages/flagged.html
+++ b/templates/packages/flagged.html
@@ -1,5 +1,6 @@
 {% extends "base.html" %}
 {% block title %}Arch Linux - Flag Package - {{ pkg.pkgname }}{% endblock %}
+
 {% block content %}
     <p>
     {{pkg.pkgname}} on {{pkg.arch}} has already been flagged out of date.
diff --git a/templates/todolists/list.html b/templates/todolists/list.html
index 9b423342..ffbab2af 100644
--- a/templates/todolists/list.html
+++ b/templates/todolists/list.html
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+{% block title %}Arch Linux - Todo Lists{% endblock %}
 
 {% block content %}
 	<div class="greybox">
diff --git a/templates/todolists/todolist_confirm_delete.html b/templates/todolists/todolist_confirm_delete.html
index bfa3dbab..c0742d2b 100644
--- a/templates/todolists/todolist_confirm_delete.html
+++ b/templates/todolists/todolist_confirm_delete.html
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+{% block title %}Arch Linux - Delete Todo List{% endblock %}
 
 {% block content %}
 	<div class="greybox">
diff --git a/templates/todolists/view.html b/templates/todolists/view.html
index 6f85c231..5af6da81 100644
--- a/templates/todolists/view.html
+++ b/templates/todolists/view.html
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+{% block title %}Arch Linux - Todo - {{ list.name }}{% endblock %}
 
 {% block content %}
 	<div class="greybox">
@@ -10,7 +11,7 @@
                     <a href="/todo/edit/{{list.id}}/">Edit Todo List</a>
                 {% endif %}
             </div>
-		<h2 class="title">ToDo List: {{ list.name }}</h2>
+		<h2 class="title">Todo List: {{ list.name }}</h2>
 		<table id="todotable" class="results" width="100%">
             <thead>
                 <tr>