From 31b38b49c3736c5dcd139fa63ab06ad211aa25a1 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Sun, 31 Jan 2010 22:55:49 -0600
Subject: Spruce up the developer view pages

Quite a few changes here. Unify the developer view pages into one actual
django view and template, and use different dispatches from urls.py to set
up the three different queries for who to display and what message and group
name to show.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 templates/public/developer_list.html |  1 -
 templates/public/developers.html     | 16 ----------------
 templates/public/fellows.html        | 11 -----------
 templates/public/index.html          |  1 +
 templates/public/userlist.html       | 13 +++++++++++++
 5 files changed, 14 insertions(+), 28 deletions(-)
 delete mode 100644 templates/public/developers.html
 delete mode 100644 templates/public/fellows.html
 create mode 100644 templates/public/userlist.html

(limited to 'templates/public')

diff --git a/templates/public/developer_list.html b/templates/public/developer_list.html
index 37a59539..9a63a6dc 100644
--- a/templates/public/developer_list.html
+++ b/templates/public/developer_list.html
@@ -1,4 +1,3 @@
-    <br /><br />
     <div id="devlist">
     {% for dev in dev_list %}
         <a href="#{{ dev.username }}">{{ dev.first_name }}{{ dev.last_name.0|capfirst}}</a>  &nbsp;
diff --git a/templates/public/developers.html b/templates/public/developers.html
deleted file mode 100644
index f2905876..00000000
--- a/templates/public/developers.html
+++ /dev/null
@@ -1,16 +0,0 @@
-{% extends "base.html" %}
-
-{% block content %}
-<div class="box">
-    <h2 class="title">Arch Linux Core Developers</h2>
-    {% with developers as dev_list %}
-    {% include 'public/developer_list.html' %}
-    {% endwith %}
-    <h2 class="title">Arch Linux Trusted Users</h2>
-    {% with tus as dev_list %}
-    {% include 'public/developer_list.html' %}
-    {% endwith %}
-</div>
-<br /><br />
-{% endblock %}
-
diff --git a/templates/public/fellows.html b/templates/public/fellows.html
deleted file mode 100644
index 4bbda775..00000000
--- a/templates/public/fellows.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{% extends "base.html" %}
-
-{% block content %}
-<div class="box">
-    <h2 class="title">Arch Linux {{dev_type}}</h2>
-    {{description}}
-    {% include 'public/developer_list.html' %}
-</div>
-<br /><br />
-{% endblock %}
-
diff --git a/templates/public/index.html b/templates/public/index.html
index 0ccbfb77..9351a722 100644
--- a/templates/public/index.html
+++ b/templates/public/index.html
@@ -111,6 +111,7 @@ <h3>Community Links:</h3>
     <h3>Development:</h3>
     <ul class="links">
         <li><a href="/developers/">Developers</a></li>
+        <li><a href="/trustedusers/">Trusted Users</a></li>
         <li><a href="/fellows/">Fellows</a></li>
         <li><a href="http://bugs.archlinux.org">Bug Tracker</a></li>
         <li><a href="/svn/">SVN</a></li>
diff --git a/templates/public/userlist.html b/templates/public/userlist.html
new file mode 100644
index 00000000..ce8cb145
--- /dev/null
+++ b/templates/public/userlist.html
@@ -0,0 +1,13 @@
+{% extends "base.html" %}
+
+{% block content %}
+<div class="box">
+    <h2 class="title">Arch Linux {{user_type}}</h2>
+	<p>{{description}}</p>
+    {% with users as dev_list %}
+    {% include 'public/developer_list.html' %}
+    {% endwith %}
+</div>
+<br /><br />
+{% endblock %}
+
-- 
cgit v1.2.3-54-g00ecf