Merge branch 'master' of ssh://git.fedorahosted.org/git/fedora-infrastructure

This commit is contained in:
Toshio Kuratomi 2008-02-20 12:22:37 -08:00
commit 7102229050
2 changed files with 4 additions and 4 deletions

View file

@ -159,6 +159,7 @@ cla_click_group = "cla_click"
privileged_view_groups = "(^cla_.*)"
username_blacklist = "(.*-members)|(.*-sponsors)|(.*-administrators)|(root)|(webmaster)"
# It'd be nice to have these emails under a different (sub)domain, just to be 100% safe.
openidstore = "/var/tmp/fas/openid"
@ -173,9 +174,8 @@ openssl_ou = "Upload Files"
# compress the data sends to the web browser
# [/]
# gzip_filter.on = True
# gzip_filter.on = TrueNote: in the SVG XML, change the 'interviewee-name' text to be the name of whichever in
# gzip_filter.mime_types = ["application/x-javascript", "text/javascript", "text/html", "text/css", "text/plain"]
[/robots.txt]
static_filter.on = True
static_filter.dir = "%(top_level_dir)s/static/robots.txt"

View file

@ -35,12 +35,12 @@
<div id="infobar">
<div id="authstatus">
<span py:if="not tg.identity.anonymous">
<strong>${_('Logged in:')}</strong> ${tg.identity.user.user_name}
<strong>${_('Logged in:')}</strong> ${tg.identity.user.username}
</span>
</div>
<div id="control">
<ul>
<li py:if="not tg.identity.anonymous"><a href="${tg.url('/user/view/%s' % tg.identity.user.user_name)}">${_('My Account')}</a></li>
<li py:if="not tg.identity.anonymous"><a href="${tg.url('/user/view/%s' % tg.identity.user.username)}">${_('My Account')}</a></li>
<li py:if="not tg.identity.anonymous"><a href="${tg.url('/logout')}">${_('Log Out')}</a></li>
<li py:if="tg.identity.anonymous"><a href="${tg.url('/login')}">${_('Log In')}</a></li>
</ul>