[llvm-commits] [zorg] r125897 - in /zorg/trunk/llvmlab/llvmlab: data.py ui/frontend/views.py ui/templates/machines.html

[Daniel Dunbar]

Author: ddunbar
Date: Fri Feb 18 10:42:30 2011
New Revision: 125897

URL: http://llvm.org/viewvc/llvm-project?rev=125897&view=rev
Log:
llvmlab: Add a machines page.

Added:
    zorg/trunk/llvmlab/llvmlab/ui/templates/machines.html
Modified:
    zorg/trunk/llvmlab/llvmlab/data.py
    zorg/trunk/llvmlab/llvmlab/ui/frontend/views.py

Modified: zorg/trunk/llvmlab/llvmlab/data.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/data.py?rev=125897&r1=125896&r2=125897&view=diff
==============================================================================
--- zorg/trunk/llvmlab/llvmlab/data.py (original)
+++ zorg/trunk/llvmlab/llvmlab/data.py Fri Feb 18 10:42:30 2011
@@ -27,11 +27,10 @@
                                for item in self.machines.values()] }
 
     def __init__(self, users, machines):
+        self.machines = dict((item.id, item) for item in machines)
         self.users = dict((item.id, item) for item in users)
         self.admin_user = None
 
-        self.machines = dict((item.id, item) for item in machines)
-
     def set_admin_user(self, user):
         if user.id in self.users:
             raise ValueError, "database contains admin user %r" % user.id

Modified: zorg/trunk/llvmlab/llvmlab/ui/frontend/views.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/frontend/views.py?rev=125897&r1=125896&r2=125897&view=diff
==============================================================================
--- zorg/trunk/llvmlab/llvmlab/ui/frontend/views.py (original)
+++ zorg/trunk/llvmlab/llvmlab/ui/frontend/views.py Fri Feb 18 10:42:30 2011
@@ -16,6 +16,10 @@
 def favicon_ico():
     return redirect(url_for('.static', filename='favicon.ico'))
 
+ at frontend.route('/machines')
+def machines():
+    return render_template("machines.html")
+
 @frontend.route('/users')
 def users():
     return render_template("users.html")

Added: zorg/trunk/llvmlab/llvmlab/ui/templates/machines.html
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/templates/machines.html?rev=125897&view=auto
==============================================================================
--- zorg/trunk/llvmlab/llvmlab/ui/templates/machines.html (added)
+++ zorg/trunk/llvmlab/llvmlab/ui/templates/machines.html Fri Feb 18 10:42:30 2011
@@ -0,0 +1,27 @@
+{% extends "layout.html" %}
+{% block title %}users{% endblock %}
+{% block body %}
+
+{% if not session.logged_in %}
+
+You must <a href="{{ url_for('login') }}">login</a>.
+
+{% else %}
+
+<table>
+<thead>
+<tr><th colspan=3>Machines</th></tr>
+<tr><th>ID</th><th>Hostname</th><th>Admin</th></tr>
+</thead>
+{% for id,machine in config.data.machines|dictsort %}
+<tr>
+  <td>{{ id }}</td>
+  <td>{{ machine.hostname }}</td>
+  <td><a href="{{ url_for('user', machine.admin) }}">{{ machine.admin }}</td>
+</tr>
+{% endfor %}
+</table>
+
+{% endif %}
+
+{% endblock %}