From 51d94e60d1efde509b62c79800aadc53d6d5f537 Mon Sep 17 00:00:00 2001 From: Ricky Zhou Date: Tue, 11 Mar 2008 18:46:31 -0400 Subject: [PATCH] Fix some view issues. --- fas/fas.cfg | 2 +- fas/fas/templates/home.html | 34 ++++++++++---------- fas/fas/templates/master.html | 2 +- fas/fas/templates/user/view.html | 36 ++++++++++++--------- fas/fas/user.py | 54 +++++++++++++++----------------- 5 files changed, 64 insertions(+), 64 deletions(-) diff --git a/fas/fas.cfg b/fas/fas.cfg index f97e224..b229dd1 100644 --- a/fas/fas.cfg +++ b/fas/fas.cfg @@ -53,7 +53,7 @@ mail.encoding = 'utf-8' # If you have sqlite, here's a simple default to get you started # in development sqlalchemy.dburi="postgres://fedora:test@localhost/fas2" -sqlalchemy.echo=True +#sqlalchemy.echo=True # if you are using a database or table type without transactions # (MySQL default, for example), you should turn off transactions diff --git a/fas/fas/templates/home.html b/fas/fas/templates/home.html index 40c6c9a..f1e00a0 100644 --- a/fas/fas/templates/home.html +++ b/fas/fas/templates/home.html @@ -10,26 +10,24 @@

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})} -
    • -
-
- -
+ +
+
    +
  • + ${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})} +
    • +
+
+ +
+ + Download a client-side certificate +
diff --git a/fas/fas/templates/master.html b/fas/fas/templates/master.html index 31f1f83..c54e85b 100644 --- a/fas/fas/templates/master.html +++ b/fas/fas/templates/master.html @@ -62,7 +62,7 @@
  • ${_('New Group')}
  • ${_('User List')}
    • -
  • ${_('Group List')}
    • +
  • ${_('Group List')}
  • ${_('Apply For a new Group')}
  • ${_('News')}
    • diff --git a/fas/fas/templates/user/view.html b/fas/fas/templates/user/view.html index 52f84ef..4c0afd5 100644 --- a/fas/fas/templates/user/view.html +++ b/fas/fas/templates/user/view.html @@ -7,7 +7,11 @@ ${_('View Account')} - +

    ${_('Your Fedora Account')}

    ${_('%s\'s Fedora Account') % person.human_name}

    ${_('Account Details')} ${_('(edit)')}

    @@ -22,8 +26,8 @@
    ${_('Telephone Number:')}
    ${person.telephone} 
    ${_('Postal Address:')}
    ${person.postal_address} 
    ${_('Public SSH Key:')}
    -
    ${person.ssh_key[:20]}.... 
    -
    No ssh key provided 
    +
    ${person.ssh_key[:20]}.... 
    +
    No ssh key provided 
    ${_('Comments:')}
    ${person.comments} 
    ${_('Password:')}
    ${_('Valid')} (change)
     @@ -42,20 +46,20 @@

    ${_('Your Roles')}

    ${_('%s\'s Roles') % person.human_name}

    - + --> -