From c6e24a90babb00d85b60ce9e67d7021d89e0037d Mon Sep 17 00:00:00 2001 From: Michael McGrath Date: Wed, 5 Mar 2008 11:07:08 -0600 Subject: [PATCH] added some better info to the 'home' screen as well as re-arranged menu items --- fas/fas/controllers.py | 9 ++++++++- fas/fas/templates/home.html | 20 ++++++++++++++++++++ fas/fas/templates/master.html | 7 ++++--- 3 files changed, 32 insertions(+), 4 deletions(-) diff --git a/fas/fas/controllers.py b/fas/fas/controllers.py index 15e0732..48cc176 100644 --- a/fas/fas/controllers.py +++ b/fas/fas/controllers.py @@ -13,6 +13,7 @@ from fas.group import Group from fas.cla import CLA from fas.json_request import JsonRequest from fas.help import Help +from fas.auth import * #from fas.openid_fas import OpenID import os @@ -74,7 +75,13 @@ class Root(controllers.RootController): @expose(template="fas.templates.home", allow_json=True) @identity.require(identity.not_anonymous()) def home(self): - return dict() + user_name = turbogears.identity.current.user_name + person = People.by_username(user_name) + cla = None + if signedCLAPrivs(person): + cla = 'signed' + + return dict(person=person, cla=cla) @expose(template="fas.templates.about") def about(self): diff --git a/fas/fas/templates/home.html b/fas/fas/templates/home.html index 0013343..c64eb8b 100644 --- a/fas/fas/templates/home.html +++ b/fas/fas/templates/home.html @@ -7,5 +7,25 @@ ${_('Fedora Accounts System')} + +

Todo queue:

+ +
+ +
+
    +
  • + ${Markup(_('<strong>%(user)s</strong> requests approval to join <a href="group/view/%(group)s">%(group)s</a>.') % {'user': role.member.username, 'group': group.name, 'group': group.name})} +
    • +
+
+ +
+ + diff --git a/fas/fas/templates/master.html b/fas/fas/templates/master.html index de5c18a..fde9e5f 100644 --- a/fas/fas/templates/master.html +++ b/fas/fas/templates/master.html @@ -56,14 +56,15 @@