aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPavlos Ratis <dastergon@gentoo.org>2013-08-06 03:11:57 +0300
committerPavlos Ratis <dastergon@gentoo.org>2013-08-06 03:11:57 +0300
commit0950fca3b9d638478eaf2e6c90286f0d33c66894 (patch)
tree23b5665e717bd42f9084f64f1b88318a64474263 /okupy/templates
parentMerge branch 'ssl-auth' (diff)
downloadidentity.gentoo.org-0950fca3b9d638478eaf2e6c90286f0d33c66894.tar.gz
identity.gentoo.org-0950fca3b9d638478eaf2e6c90286f0d33c66894.tar.bz2
identity.gentoo.org-0950fca3b9d638478eaf2e6c90286f0d33c66894.zip
use of LDAPUser and ldapdb to get lists info
In addition, I changed lists from function-based view to class-based view and grouped them: 1) Flexible and respects DRY principle 2) Reduce variables and code
Diffstat (limited to 'okupy/templates')
-rw-r--r--okupy/templates/devlist.html32
-rw-r--r--okupy/templates/former-devlist.html28
-rw-r--r--okupy/templates/foundation-members.html53
3 files changed, 39 insertions, 74 deletions
diff --git a/okupy/templates/devlist.html b/okupy/templates/devlist.html
index 93cee67..ce97403 100644
--- a/okupy/templates/devlist.html
+++ b/okupy/templates/devlist.html
@@ -6,37 +6,23 @@
</div>
<p>
<div class="row">
- <div class="span12">
+ <div class="span10">
<h2>Developer List</h2><br />
<table class="table table-striped sortable" >
<tr>
<td class="infohead"><b>Username</b></td>
<td class="infohead"><b>Name</b></td>
- <td class="infohead"><b>GPG key</b></td>
<td class="infohead"><b>Location</b></td>
<td class="infohead"><b>Areas of responsibility</b></td>
</tr>
- <tr>
- <td style="color:#5c4f85;"><b>mgorny</b></td>
- <td>Michał Górny</td>
- <td>0xDF84256885283521</td>
- <td><a href="devmap.xml?dev=mgorny">near Poznan, Poland</a></td>
- <td class="tableinfo">-</td>
- </tr>
- <tr>
- <td class="infohead" style="color:#5c4f85;"><b>tampakrap</b></td>
- <td class="tableinfo">Theo Chatzimichos</td>
- <td class="tableinfo">0x57DC0078</td>
- <td class="tableinfo"><a href="devmap.xml?dev=tampakrap">Larissa, Greece</a></td>
- <td class="tableinfo">Infrastructure</td>
- </tr>
- <tr>
- <td class="infohead" style="color:#5c4f85;"><b>dastergon</b></td>
- <td class="tableinfo">Pavlos Ratis</td>
- <td class="tableinfo">0x3A051746</td>
- <td class="tableinfo">Serres, Greece</td>
- <td class="tableinfo">kde</td>
- </tr>
+ {% for dev in devlist %}
+ <tr>
+ <td class="devname"><b>{{ dev.username }}</b></td>
+ <td>{{ dev.full_name }}</td>
+ <td><a href="http://maps.google.com/maps?q={{ dev.location }}">{{ dev.location }}</a></td>
+ <td class="tableinfo">{{ dev.roles }}</td>
+ </tr>
+ {% endfor %}
</table>
</div>
</div>
diff --git a/okupy/templates/former-devlist.html b/okupy/templates/former-devlist.html
index 6e4f630..27ca319 100644
--- a/okupy/templates/former-devlist.html
+++ b/okupy/templates/former-devlist.html
@@ -7,7 +7,7 @@
</div>
<p>
<div class="row">
- <div class="span12">
+ <div class="span10">
<h2>Former Developers List</h2><br />
<table class="table table-striped sortable" >
<tr>
@@ -16,24 +16,14 @@
<td class="infohead"><b>Location</b></td>
<td class="infohead"><b>Areas of responsibility</b></td>
</tr>
- <tr>
- <td style="color:#5c4f85;"><b>mgorny</b></td>
- <td>Michał Górny</td>
- <td><a href="devmap.xml?dev=mgorny">near Poznan, Poland</a></td>
- <td class="tableinfo">-</td>
- </tr>
- <tr>
- <td class="infohead" style="color:#5c4f85;"><b>tampakrap</b></td>
- <td class="tableinfo">Theo Chatzimichos</td>
- <td class="tableinfo"><a href="devmap.xml?dev=tampakrap">Larissa, Greece</a></td>
- <td class="tableinfo">Infrastructure</td>
- </tr>
- <tr>
- <td class="infohead" style="color:#5c4f85;"><b>dastergon</b></td>
- <td class="tableinfo">Pavlos Ratis</td>
- <td class="tableinfo">Serres, Greece</td>
- <td class="tableinfo">kde</td>
- </tr>
+ {% for user in devlist %}
+ <tr>
+ <td class="devname"><b>{{ user.username }}</b></td>
+ <td>{{ user.full_name }}</td>
+ <td><a href="http://maps.google.com/maps?q={{ user.location }}">{{ user.location }}</a></td>
+ <td class="tableinfo">{{ user.roles }}</td>
+ </tr>
+ {% endfor %}
</table>
</div>
</div>
diff --git a/okupy/templates/foundation-members.html b/okupy/templates/foundation-members.html
index b8a3900..b78beb7 100644
--- a/okupy/templates/foundation-members.html
+++ b/okupy/templates/foundation-members.html
@@ -1,40 +1,29 @@
{% extends "base.html" %}
{% block content %}
- <div class="hero-unit">
- <h1>Gentoo Foundation Members List</h1>
- <p>List of active Foundation members.</p>
- </div>
- <p>
- <div class="row">
- <div class="span12">
- <h2>Developer List</h2><br />
- <table class="table table-striped sortable" >
- <tr>
+<div class="hero-unit">
+ <h1>Gentoo Foundation Members List</h1>
+ <p>List of active Foundation members.</p>
+</div>
+<div class="row">
+ <div class="span10">
+ <h2>Foundation Members</h2><br />
+ <table class="table table-striped sortable" >
+ <tr>
<td class="infohead"><b>Username</b></td>
<td class="infohead"><b>Name</b></td>
- <td class="infohead"><b>GPG key</b></td>
- </tr>
- <tr>
- <td style="color:#5c4f85;"><b>mgorny</b></td>
- <td>Michał Górny</td>
- <td>0xDF84256885283521</td>
- <td class="tableinfo">-</td>
- </tr>
- <tr>
- <td class="infohead" style="color:#5c4f85;"><b>tampakrap</b></td>
- <td class="tableinfo">Theo Chatzimichos</td>
- <td class="tableinfo">0x57DC0078</td>
- </tr>
- <tr>
- <td class="infohead" style="color:#5c4f85;"><b>dastergon</b></td>
- <td class="tableinfo">Pavlos Ratis</td>
- <td class="tableinfo">0x3A051746</td>
- </tr>
- </table>
- </div>
- </div>
- </p>
+ <td class="infohead"><b>Location</b></td>
+ </tr>
+ {% for user in devlist %}
+ <tr>
+ <td style="color:#5c4f85;"><b>{{ user.username }}</b></td>
+ <td>{{ user.full_name }}</td>
+ <td><a href="http://maps.google.com/maps?q={{ user.location }}">{{ user.location }}</a></td>
+ </tr>
+ {% endfor %}
+ </table>
+ </div>
+</div>
{% endblock %}
{# vim:se fileencoding=utf8 et ts=4 sts=4 sw=4 ft=htmldjango : #}