summaryrefslogtreecommitdiff
path: root/templates/public
diff options
context:
space:
mode:
Diffstat (limited to 'templates/public')
-rw-r--r--templates/public/developer_list.html1
-rw-r--r--templates/public/developers.html16
-rw-r--r--templates/public/index.html1
-rw-r--r--templates/public/userlist.html (renamed from templates/public/fellows.html)6
4 files changed, 5 insertions, 19 deletions
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/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>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/fellows.html b/templates/public/userlist.html
index 4bbda775..ce8cb145 100644
--- a/templates/public/fellows.html
+++ b/templates/public/userlist.html
@@ -2,9 +2,11 @@
{% block content %}
<div class="box">
- <h2 class="title">Arch Linux {{dev_type}}</h2>
- {{description}}
+ <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 %}