[Pkg-debile-commits] [debile-web] 07/07: create a new page for the repository

[Sylvestre Ledru]

This is an automated email from the git hooks/post-receive script.

sylvestre pushed a commit to branch update-usuability
in repository debile-web.

commit 0d689b85b1a0842087befebec0f11f5d41d74d9a
Author: Sylvestre Ledru <sylvestre at debian.org>
Date:   Sat Sep 28 15:25:59 2013 +0200

    create a new page for the repository
---
 debileweb/blueprints/frontend.py |   21 ++++++++++++++++++---
 templates/repository.html        |   21 +++++++++++++++++++++
 templates/source.html            |    6 +++++-
 templates/worker.html            |   12 ------------
 4 files changed, 44 insertions(+), 16 deletions(-)

diff --git a/debileweb/blueprints/frontend.py b/debileweb/blueprints/frontend.py
index 85fb2fa..dbbb0b1 100644
--- a/debileweb/blueprints/frontend.py
+++ b/debileweb/blueprints/frontend.py
@@ -127,6 +127,7 @@ def source_list():
         info['source_link'] = "/source/%s/%s/%s/%s" % (s.user.login, s.name, s.version, s.run)
         info['group_link'] = "/group/%s" % s.group.name
         info['user_link'] = "/worker/%s" % s.user.login
+        info['user_repository_link'] = "/repository/%s" % s.user.login
         sources_info.append(info)
 
     return render_template('source_list.html', **{
@@ -218,6 +219,8 @@ def source(package_name="", owner_name="fred", package_version="latest", run_num
     # Compute description section
     desc = {}
     desc['user_link'] = "/worker/%s" % package.user.login
+    desc['user_repository_link'] = "/repository/%s" % package.user.login
+
     desc['run'] = run_number
     # desc['pool_link'] =
 
@@ -335,17 +338,29 @@ def machine(machine_name):
 @frontend.route("/worker/<worker_login>")
 def worker(worker_login):
     session = Session()
-    # FIXME : unsafe code, catch exceptions
+    # FIXME : unsafe code, catch exceptions                                                                            
     user = session.query(User).filter(User.login == worker_login).one()
 
     ur = UserRepository(user)
     dput_upload_profile = ur.generate_dputprofile()
+
+    return render_template('worker.html', **{
+        "worker": user,
+        "dput_upload_profile": dput_upload_profile
+    })
+
+ at frontend.route("/repository/<worker_login>")
+def repository(worker_login):
+    session = Session()
+    # FIXME : unsafe code, catch exceptions
+    user = session.query(User).filter(User.login == worker_login).one()
+
+    ur = UserRepository(user)
     apt_binary_list = ur.generate_aptbinarylist()
     apt_source_list = ur.generate_aptsourcelist()
 
-    return render_template('worker.html', **{
+    return render_template('repository.html', **{
         "worker": user,
-        "dput_upload_profile": dput_upload_profile,
         "apt_binary_list": apt_binary_list,
         "apt_source_list": apt_source_list
     })
diff --git a/templates/repository.html b/templates/repository.html
new file mode 100644
index 0000000..bb42f29
--- /dev/null
+++ b/templates/repository.html
@@ -0,0 +1,21 @@
+{% extends "base.html" %}
+
+{% block title %}Repository{% endblock %}
+
+{% block content %}
+<h1>{{worker.name}}</h1>
+
+{{worker.name}}'s GPG key is <code>{{worker.gpg_fingerprint}}</code>.
+
+<h2>Repositories of packages</h2>
+Choose to add one of the following mirrors to <strong>/etc/apt/sources.list.d/debile.list</strong>
+<pre>
+{{apt_binary_list}}
+</pre>
+
+<h2>Source repository</h2>
+Add the following mirror(s) to <strong>/etc/apt/sources.list.d/debile.list</strong>
+<pre>
+{{apt_source_list}}
+</pre>
+{% endblock %}
diff --git a/templates/source.html b/templates/source.html
index 965918d..f452a51 100644
--- a/templates/source.html
+++ b/templates/source.html
@@ -29,9 +29,13 @@
             <div class='desc_value'>{{package.maintainer}}</div>
         </div>
         <div class='desc_line'>
-            <div class='desc_key'>Uploaded by</div>
+            <div class='desc_key'>Built by</div>
             <div class='desc_value'><a href='{{desc.user_link}}'>{{package.user.name}}</a></div>
         </div>
+        <div class='desc_line'>
+            <div class='desc_key'>Available on</div>
+            <div class='desc_value'><a href='{{desc.user_repository_link}}'>Repository</a></div>
+        </div>
     </div>
 
     {% if multiple_runs %}
diff --git a/templates/worker.html b/templates/worker.html
index b0f4158..af7f20d 100644
--- a/templates/worker.html
+++ b/templates/worker.html
@@ -16,16 +16,4 @@ Follow our one-minute-very-easy-even-for-noobs setup guide.
 <pre>
 {{dput_upload_profile}}
 </pre>
-
-<h2>Repositories of packages</h2>
-Choose to add one of the following mirrors to <strong>/etc/apt/sources.list.d/debile.list</strong>
-<pre>
-{{apt_binary_list}}
-</pre>
-
-<h2>Source repository</h2>
-Add the following mirrors to <strong>/etc/apt/sources.list.d/debile.list</strong>
-<pre>
-{{apt_source_list}}
-</pre>
 {% endblock %}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-debile/debile-web.git