Clean up templates more, update to work in Fedora environment.
This commit is contained in:
parent
4bb4712464
commit
f62a04b427
15 changed files with 186 additions and 186 deletions
|
|
@ -45,7 +45,7 @@ class newPerson(widgets.WidgetsList):
|
|||
# cn = widgets.TextField(label='Username', validator=validators.PlainText(not_empty=True, max=10))
|
||||
cn = widgets.TextField(label=_('Username'), validator=validators.All(knownUser(not_empty=True, max=10), validators.String(max=32, min=3)))
|
||||
givenName = widgets.TextField(label=_('Full Name'), validator=validators.String(not_empty=True, max=42))
|
||||
mail = widgets.TextField(label=_('email'), validator=validators.Email(not_empty=True, strip=True))
|
||||
mail = widgets.TextField(label=_('Email'), validator=validators.Email(not_empty=True, strip=True))
|
||||
telephoneNumber = widgets.TextField(label=_('Telephone Number'), validator=validators.PhoneNumber(not_empty=True))
|
||||
postalAddress = widgets.TextArea(label=_('Postal Address'), validator=validators.NotEmpty)
|
||||
|
||||
|
|
|
|||
|
|
@ -457,7 +457,7 @@ def delete(base, ldapServer=None):
|
|||
s = Server()
|
||||
ldapServer = s.ldapConn
|
||||
|
||||
ldapServer.simple_bind_s('cn=directory manager', 'fedoraproject')
|
||||
ldapServer.simple_bind_s('cn=directory manager', 'test')
|
||||
print "Deleteing %s " % base
|
||||
ldapServer.delete_s(base)
|
||||
|
||||
|
|
@ -468,7 +468,7 @@ def add(base, attributes, ldapServer=None):
|
|||
ldapServer = s.ldapConn
|
||||
attributes=[ (k,v) for k,v in attributes.items() ]
|
||||
|
||||
ldapServer.simple_bind_s('cn=directory manager', 'fedoraproject')
|
||||
ldapServer.simple_bind_s('cn=directory manager', 'test')
|
||||
ldapServer.add_s(base, attributes)
|
||||
|
||||
def modify(base, attribute, new, old=None, ldapServer=None):
|
||||
|
|
@ -481,7 +481,7 @@ def modify(base, attribute, new, old=None, ldapServer=None):
|
|||
ldapServer = s.ldapConn
|
||||
|
||||
from ldap import modlist
|
||||
ldapServer.simple_bind_s('cn=directory manager', 'fedoraproject')
|
||||
ldapServer.simple_bind_s('cn=directory manager', 'test')
|
||||
|
||||
if old == None:
|
||||
old = 'None'
|
||||
|
|
@ -505,7 +505,7 @@ def search(base, filter, attributes=None, ldapServer=None):
|
|||
scope = ldap.SCOPE_SUBTREE
|
||||
count = 0
|
||||
timeout = 2
|
||||
ldapServer.simple_bind_s('cn=directory manager', 'fedoraproject')
|
||||
ldapServer.simple_bind_s('cn=directory manager', 'test')
|
||||
result_set = []
|
||||
try:
|
||||
result_id = ldapServer.search(base, scope, filter, attributes)
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ from xml.dom import minidom
|
|||
|
||||
|
||||
class Koji:
|
||||
def __init__(self, userName, url='http://publictest8.fedora.redhat.com/koji/recentbuilds?user='):
|
||||
def __init__(self, userName, url='http://publictest8/koji/recentbuilds?user='):
|
||||
buildFeed = minidom.parse(urllib.urlopen(url + userName))
|
||||
try:
|
||||
self.userLink = buildFeed.getElementsByTagName('link')[0].childNodes[0].data
|
||||
|
|
|
|||
|
|
@ -203,7 +203,6 @@ a
|
|||
#content h3
|
||||
{
|
||||
font-size: 2.2ex;
|
||||
border-bottom: 1px solid #C0C0C0;
|
||||
margin-bottom: 0.25ex;
|
||||
}
|
||||
|
||||
|
|
@ -411,16 +410,17 @@ pre
|
|||
form ul
|
||||
{
|
||||
list-style: none;
|
||||
margin: 1ex 0!important;
|
||||
}
|
||||
|
||||
form li
|
||||
form ul li
|
||||
{
|
||||
margin: 0 0 1ex;
|
||||
text-align: left;
|
||||
overflow: auto;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
form li label
|
||||
form ul label
|
||||
{
|
||||
float: left;
|
||||
clear: left;
|
||||
|
|
@ -430,7 +430,7 @@ form li label
|
|||
padding: 0 2ex 0 0;
|
||||
}
|
||||
|
||||
form li input, form li textarea
|
||||
form ul input, form ul textarea
|
||||
{
|
||||
margin: 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:py="http://purl.org/kid/ns#">
|
||||
<body>
|
||||
<div py:for="user in groups">${user},${Person.byUserName(user).mail},${Person.byUserName(user).givenName},${groups[user].fedoraRoleType},0
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:py="http://purl.org/kid/ns#">
|
||||
<body>
|
||||
<div py:for="user in groups">${user},${Person.byUserName(user).mail},${Person.byUserName(user).givenName},${groups[user].fedoraRoleType},0
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:py="http://purl.org/kid/ns#" py:extends="'master.kid'">
|
||||
<head>
|
||||
<title>Crap!</title>
|
||||
</head>
|
||||
<body>
|
||||
${exception}
|
||||
</body>
|
||||
</html>
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:py="http://purl.org/kid/ns#" py:extends="'master.kid'">
|
||||
<head>
|
||||
<title>Crap!</title>
|
||||
</head>
|
||||
<body>
|
||||
${exception}
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
<body>
|
||||
<h2>List (${search})</h2>
|
||||
<h3>Search Groups</h3>
|
||||
<form method="GET">
|
||||
<form method="GET" action="${tg.url('/listGroup')}">
|
||||
<p>"*" is a wildcard (Ex: "cvs*")</p>
|
||||
<div>
|
||||
<input type="text" value="${search}" name="search" size="15 "/>
|
||||
|
|
@ -16,8 +16,8 @@
|
|||
</form>
|
||||
<h3>Results</h3>
|
||||
<ul class="letters">
|
||||
<li py:for="letter in 'abcdefghijklmnopqrstuvwxyz'.upper()"><a href="?search=${letter}*">${letter}</a></li>
|
||||
<li><a href="?search=*">All</a></li>
|
||||
<li py:for="letter in 'abcdefghijklmnopqrstuvwxyz'.upper()"><a href="${tg.url('/listGroup/%s*' % letter)}">${letter}</a></li>
|
||||
<li><a href="${tg.url('/listGroup/*')}">All</a></li>
|
||||
</ul>
|
||||
|
||||
<table py:if="groups">
|
||||
|
|
@ -30,14 +30,14 @@
|
|||
keys.sort()
|
||||
?>
|
||||
<tr py:for="group in map(groups.get, keys)">
|
||||
<td><a href="${tg.url('viewGroup', groupName=group.cn)}">${group.cn}</a></td>
|
||||
<td><a href="${tg.url('/viewGroup/%s' % group.cn)}">${group.cn}</a></td>
|
||||
<td>${group.fedoraGroupDesc}</td>
|
||||
<td>
|
||||
<a py:if="group.cn in myGroups" href="${tg.url('viewGroup', groupName=group.cn)}">
|
||||
<a py:if="group.cn in myGroups" href="${tg.url('/viewGroup/%s' % group.cn)}">
|
||||
<span class="approved" py:if="myGroups[group.cn].fedoraRoleStatus.lower() == 'approved'">Approved</span>
|
||||
<span class="unapproved" py:if="myGroups[group.cn].fedoraRoleStatus.lower() == 'unapproved'">Unapproved</span>
|
||||
</a>
|
||||
<a py:if="group.cn not in myGroups" href="${tg.url('viewGroup', groupName=group.cn)}"><span>Not a Member</span></a>
|
||||
<a py:if="group.cn not in myGroups" href="${tg.url('/viewGroup/%s' % group.cn)}"><span>Not a Member</span></a>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
|
|
|
|||
|
|
@ -1,23 +1,23 @@
|
|||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:py="http://purl.org/kid/ns#" py:extends="'master.kid'">
|
||||
<head>
|
||||
<title>Fedora Accounts System</title>
|
||||
</head>
|
||||
<body>
|
||||
<h2 py:if="'userID' in builds.userLink" class="accounts">Recent Builds <a href="${builds.userLink}">(Koji)</a></h2>
|
||||
<table py:if="'userID' in builds.userLink">
|
||||
<thead>
|
||||
<tr><th>Build</th><th>Build Date</th></tr>
|
||||
</thead>
|
||||
<!--<tr><td>Koji</td><td><a href="${builds.userLink}">Build Info</a></td></tr>-->
|
||||
<tr py:for="build in builds.builds">
|
||||
<td>
|
||||
<span py:if="'complete' in builds.builds[build]['title']" class="approved"><a href="${build}">${builds.builds[build]['title']}</a></span>
|
||||
<span py:if="'failed' in builds.builds[build]['title']" class="unapproved"><a href="${build}">${builds.builds[build]['title']}</a></span>
|
||||
</td>
|
||||
<td>${builds.builds[build]['pubDate']}</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:py="http://purl.org/kid/ns#" py:extends="'master.kid'">
|
||||
<head>
|
||||
<title>Fedora Accounts System</title>
|
||||
</head>
|
||||
<body>
|
||||
<h2 py:if="'userID' in builds.userLink" class="accounts">Recent Builds <a href="${builds.userLink}">(Koji)</a></h2>
|
||||
<table py:if="'userID' in builds.userLink">
|
||||
<thead>
|
||||
<tr><th>Build</th><th>Build Date</th></tr>
|
||||
</thead>
|
||||
<!--<tr><td>Koji</td><td><a href="${builds.userLink}">Build Info</a></td></tr>-->
|
||||
<tr py:for="build in builds.builds">
|
||||
<td>
|
||||
<span py:if="'complete' in builds.builds[build]['title']" class="approved"><a href="${build}">${builds.builds[build]['title']}</a></span>
|
||||
<span py:if="'failed' in builds.builds[build]['title']" class="unapproved"><a href="${build}">${builds.builds[build]['title']}</a></span>
|
||||
</td>
|
||||
<td>${builds.builds[build]['pubDate']}</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
Message:
|
||||
<div class="message">
|
||||
<p>
|
||||
${user.givenName} <<a href='mailto: ${user.mail}'>${user.mail}</a>> has invited you to join the Fedora
|
||||
${user.givenName} <<a href="mailto: ${user.mail}">${user.mail}</a>> has invited you to join the Fedora
|
||||
Project! We are a community of users and developers who produce a
|
||||
complete operating system from entirely free and open source software
|
||||
(FOSS). ${user.givenName} thinks that you have knowledge and skills
|
||||
|
|
|
|||
|
|
@ -26,8 +26,8 @@
|
|||
</ul>
|
||||
</form>
|
||||
<ul>
|
||||
<li><a href="resetPassword">Forgot Password?</a></li>
|
||||
<li><a href="signUp">Sign Up</a></li>
|
||||
<li><a href="${tg.url('/resetPassword')}">Forgot Password?</a></li>
|
||||
<li><a href="${tg.url('/signUp')}">Sign Up</a></li>
|
||||
</ul>
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -1,79 +1,79 @@
|
|||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||
<?python import sitetemplate ?>
|
||||
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:py="http://purl.org/kid/ns#" py:extends="sitetemplate">
|
||||
<head py:match="item.tag=='{http://www.w3.org/1999/xhtml}head'" py:attrs="item.items()">
|
||||
<title py:replace="''">Title</title>
|
||||
<link href="${tg.url('/static/css/style.css')}" rel="stylesheet" type="text/css" />
|
||||
<meta py:replace="item[:]"/>
|
||||
</head>
|
||||
<body py:match="item.tag=='{http://www.w3.org/1999/xhtml}body'" py:attrs="item.items()">
|
||||
<div id="wrapper">
|
||||
<div id="head">
|
||||
<h1><a href="/">Fedora</a></h1>
|
||||
<div id="searchbox">
|
||||
<form action="" method="get">
|
||||
<label for="q">Search:</label>
|
||||
<input type="text" name="q" id="q" />
|
||||
<input type="submit" value="Search" />
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
<div id="topnav">
|
||||
<ul>
|
||||
<li class="first"><a href="http://fedoraproject.org/">Learn about Fedora</a></li>
|
||||
<li><a href="http://fedoraproject.org/get-fedora.html">Download Fedora</a></li>
|
||||
<li><a href="http://fedoraproject.org/wiki/">Projects</a></li>
|
||||
<li><a href="http://fedoraproject.org/join-fedora.html">Join Fedora</a></li>
|
||||
<li><a href="/">Communicate</a></li>
|
||||
<li><a href="http://docs.fedoraproject.org/">Help/Documentation</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
<div id="infobar">
|
||||
<div id="authstatus">
|
||||
<span py:if="not tg.identity.anonymous">
|
||||
<strong>Logged in:</strong> ${tg.identity.user.user_name}
|
||||
</span>
|
||||
</div>
|
||||
<div id="control">
|
||||
<ul>
|
||||
<li py:if="not tg.identity.anonymous"><a href="${tg.url('viewAccount')}">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>
|
||||
</div>
|
||||
</div>
|
||||
<div id="main">
|
||||
<div id="sidebar">
|
||||
<ul>
|
||||
<li class="first"><a href="${tg.url('listGroup')}">Group List</a></li>
|
||||
<li py:if="'accounts' in tg.identity.groups"><a href="listUser">User List</a></li>
|
||||
<li><a href="http://fedoraproject.org/wiki/FWN/LatestIssue">News</a></li>
|
||||
<li><a href="${tg.url('listGroup', search='A*')}">Apply For a new Group</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
<div id='content'>
|
||||
<div py:if="tg_flash" class="flash">
|
||||
${tg_flash}
|
||||
</div>
|
||||
<div py:replace="[item.text]+item[:]" />
|
||||
</div> <!-- End main -->
|
||||
<div id="footer">
|
||||
<ul id="footlinks">
|
||||
<li class="first"><a href="/">About</a></li>
|
||||
<li><a href="http://fedoraproject.org/wiki/Communicate">Contact Us</a></li>
|
||||
<li><a href="http://fedoraproject.org/wiki/Legal">Legal & Privacy</a></li>
|
||||
<!--<li><a href="/">Site Map</a></li>-->
|
||||
<li><a href="${tg.url('logout')}">Log Out</a></li>
|
||||
</ul>
|
||||
<p class="copy">
|
||||
Copyright © 2007 Red Hat, Inc. and others. All Rights Reserved.
|
||||
Please send any comments or corrections to the <a href="mailto:webmaster@fedoraproject.org">websites team</a>.
|
||||
</p>
|
||||
<p class="disclaimer">
|
||||
The Fedora Project is maintained and driven by the community and sponsored by Red Hat. This is a community maintained site. Red Hat is not responsible for content.
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</div> <!-- End wrapper -->
|
||||
</body>
|
||||
</html>
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||
<?python import sitetemplate ?>
|
||||
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:py="http://purl.org/kid/ns#" py:extends="sitetemplate">
|
||||
<head py:match="item.tag=='{http://www.w3.org/1999/xhtml}head'" py:attrs="item.items()">
|
||||
<title py:replace="''">Title</title>
|
||||
<link href="${tg.url('/static/css/style.css')}" rel="stylesheet" type="text/css" />
|
||||
<meta py:replace="item[:]"/>
|
||||
</head>
|
||||
<body py:match="item.tag=='{http://www.w3.org/1999/xhtml}body'" py:attrs="item.items()">
|
||||
<div id="wrapper">
|
||||
<div id="head">
|
||||
<h1><a href="http://fedoraproject.org/">Fedora</a></h1>
|
||||
<div id="searchbox">
|
||||
<form action="" method="get">
|
||||
<label for="q">Search:</label>
|
||||
<input type="text" name="q" id="q" />
|
||||
<input type="submit" value="Search" />
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
<div id="topnav">
|
||||
<ul>
|
||||
<li class="first"><a href="http://fedoraproject.org/">Learn about Fedora</a></li>
|
||||
<li><a href="http://fedoraproject.org/get-fedora.html">Download Fedora</a></li>
|
||||
<li><a href="http://fedoraproject.org/wiki/">Projects</a></li>
|
||||
<li><a href="http://fedoraproject.org/join-fedora.html">Join Fedora</a></li>
|
||||
<li><a href="http://fedoraproject.org/wiki/Communicate">Communicate</a></li>
|
||||
<li><a href="http://docs.fedoraproject.org/">Help/Documentation</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
<div id="infobar">
|
||||
<div id="authstatus">
|
||||
<span py:if="not tg.identity.anonymous">
|
||||
<strong>Logged in:</strong> ${tg.identity.user.user_name}
|
||||
</span>
|
||||
</div>
|
||||
<div id="control">
|
||||
<ul>
|
||||
<li py:if="not tg.identity.anonymous"><a href="${tg.url('/viewAccount')}">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>
|
||||
</div>
|
||||
</div>
|
||||
<div id="main">
|
||||
<div id="sidebar">
|
||||
<ul>
|
||||
<li class="first"><a href="${tg.url('/listGroup')}">Group List</a></li>
|
||||
<li py:if="'accounts' in tg.identity.groups"><a href="${tg.url('/listUser')}">User List</a></li>
|
||||
<li><a href="http://fedoraproject.org/wiki/FWN/LatestIssue">News</a></li>
|
||||
<li><a href="${tg.url('/listGroup', search='A*')}">Apply For a new Group</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
<div id='content'>
|
||||
<div py:if="tg_flash" class="flash">
|
||||
${tg_flash}
|
||||
</div>
|
||||
<div py:replace="[item.text]+item[:]" />
|
||||
</div> <!-- End main -->
|
||||
<div id="footer">
|
||||
<ul id="footlinks">
|
||||
<li class="first"><a href="/">About</a></li>
|
||||
<li><a href="http://fedoraproject.org/wiki/Communicate">Contact Us</a></li>
|
||||
<li><a href="http://fedoraproject.org/wiki/Legal">Legal & Privacy</a></li>
|
||||
<!--<li><a href="/">Site Map</a></li>-->
|
||||
<li><a href="${tg.url('/logout')}">Log Out</a></li>
|
||||
</ul>
|
||||
<p class="copy">
|
||||
Copyright © 2007 Red Hat, Inc. and others. All Rights Reserved.
|
||||
Please send any comments or corrections to the <a href="mailto:webmaster@fedoraproject.org">websites team</a>.
|
||||
</p>
|
||||
<p class="disclaimer">
|
||||
The Fedora Project is maintained and driven by the community and sponsored by Red Hat. This is a community maintained site. Red Hat is not responsible for content.
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</div> <!-- End wrapper -->
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
</head>
|
||||
<body>
|
||||
<h2>List (${search})</h2>
|
||||
<form method="GET">
|
||||
<form method="GET" action="${tg.url('/listUser')}">
|
||||
<p>"*" is a wildcard (Ex: "cvs*")</p>
|
||||
<div>
|
||||
<input type="text" value="${search}" name="search" size="15 "/>
|
||||
|
|
@ -14,8 +14,8 @@
|
|||
</form>
|
||||
<h3>Results</h3>
|
||||
<ul class="letters">
|
||||
<li py:for="letter in 'abcdefghijklmnopqrstuvwxyz'.upper()"><a href="?search=${letter}*">${letter}</a></li>
|
||||
<li><a href="?search=*">All</a></li>
|
||||
<li py:for="letter in 'abcdefghijklmnopqrstuvwxyz'.upper()"><a href="${tg.url('/listUser/%s*' % letter)}">${letter}</a></li>
|
||||
<li><a href="${tg.url('/listUser/*')}">All</a></li>
|
||||
</ul>
|
||||
<table>
|
||||
<thead>
|
||||
|
|
@ -29,7 +29,7 @@
|
|||
users.sort()
|
||||
?>
|
||||
<tr py:for="user in users">
|
||||
<td><a href="editAccount?userName=${user}">${user}</a></td>
|
||||
<td><a href="${tg.url('/viewAccount/%s' % user)}">${user}</a></td>
|
||||
<td>
|
||||
<span py:if="claDone[user]" class="approved"> Done</span>
|
||||
<span py:if="not claDone[user]" class="unapproved"> Done</span>
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
<body>
|
||||
<h2 class="account" py:if="personal">Your Fedora Account</h2>
|
||||
<h2 class="account" py:if="not personal">${user.givenName}'s Fedora Account</h2>
|
||||
<h3>Account Details <a href="${tg.url('editAccount', userName=user.cn)}" py:if="personal or admin">(edit)</a></h3>
|
||||
<h3>Account Details <a href="${tg.url('/editAccount', userName=user.cn)}" py:if="personal or admin">(edit)</a></h3>
|
||||
<div class="userbox">
|
||||
<dl>
|
||||
<dt>Account Name</dt><dd>${user.cn}</dd>
|
||||
|
|
@ -18,7 +18,7 @@
|
|||
<dt>Telephone Number</dt><dd>${user.telephoneNumber}</dd>
|
||||
<dt>Postal Address</dt><dd>${user.postalAddress}</dd>
|
||||
<dt>Description</dt><dd>${user.description}</dd>
|
||||
<dt>Password</dt><dd><span class="approved">Valid</span> <a href="${tg.url('resetPassword')}" py:if="personal">(change)</a></dd>
|
||||
<dt>Password</dt><dd><span class="approved">Valid</span> <a href="${tg.url('/resetPassword')}" py:if="personal">(change)</a></dd>
|
||||
<dt>Account Status</dt><dd><span class="approved">Approved</span>, Active</dd>
|
||||
<dt>CLA</dt><dd><span py:if="claDone" class="approved">Done</span><span py:if="not claDone" class="unapproved"> Not Done</span></dd>
|
||||
</dl>
|
||||
|
|
@ -33,7 +33,7 @@
|
|||
?>
|
||||
<ul class="roleslist">
|
||||
<li py:for="group in map(groups.get, keys)"><span class="team approved">${groupdata[group.cn].fedoraGroupDesc} (${group.cn})</span></li>
|
||||
<li py:for="group in map(groupsPending.get, keysPending)"><span class="team unapproved">${groupdata[group.cn].fedoraGroupDesc} (groupsPending.cn)</span></li>
|
||||
<li py:for="group in map(groupsPending.get, keysPending)"><span class="team unapproved">${groupdata[group.cn].fedoraGroupDesc} (${group.cn})</span></li>
|
||||
</ul>
|
||||
<ul class="actions" py:if="personal">
|
||||
<li><a href="/">(Join another project)</a></li>
|
||||
|
|
@ -51,9 +51,9 @@
|
|||
<dd>
|
||||
<ul class="tools">
|
||||
<li><a href="/">Invite a New Member...</a></li>
|
||||
<li py:if="group.fedoraRoleType.lower() in ('administrator', 'sponsor')"><a href="${tg.url('viewGroup', groupName=group.cn)}">View All Pending Group Membership Requests...</a></li>
|
||||
<li><a href="${tg.url('viewGroup', groupName=group.cn)}">Manage Group Membership...</a></li>
|
||||
<li py:if="group.fedoraRoleType.lower() == 'administrator'"><a href="${tg.url('editGroup', groupName=group.cn)}">Manage Group Details...</a></li>
|
||||
<li py:if="group.fedoraRoleType.lower() in ('administrator', 'sponsor')"><a href="${tg.url('/viewGroup', groupName=group.cn)}">View All Pending Group Membership Requests...</a></li>
|
||||
<li><a href="${tg.url('/viewGroup', groupName=group.cn)}">Manage Group Membership...</a></li>
|
||||
<li py:if="group.fedoraRoleType.lower() == 'administrator'"><a href="${tg.url('/editGroup', groupName=group.cn)}">Manage Group Details...</a></li>
|
||||
</ul>
|
||||
</dd>
|
||||
<div py:if="group.fedoraRoleType.lower() in ('administrator', 'sponsor')" py:strip="">
|
||||
|
|
|
|||
|
|
@ -12,14 +12,14 @@
|
|||
<span py:if="me.fedoraRoleStatus.lower() == 'unapproved'" class="unapproved">Unapproved</span>
|
||||
<span py:if="'Not a Member' in me.fedoraRoleStatus">Not a Member</span>
|
||||
</h3>
|
||||
<form py:if="'Not a Member' in me.fedoraRoleStatus" action='applyForGroup'>
|
||||
<form py:if="'Not a Member' in me.fedoraRoleStatus" action="${tg.url('/applyForGroup')}">
|
||||
<div>
|
||||
<input type="hidden" name="groupName" value="${group.cn}" />
|
||||
<input type="text" name="requestField" value="Please let me join.." />
|
||||
<input type="submit" name="action" value="Join" />
|
||||
</div>
|
||||
</form>
|
||||
<a py:if="'Not a Member' not in me.fedoraRoleStatus" href="${tg.url('applyForGroup', groupName=group.cn, action='Remove')}">Remove me</a>
|
||||
<a py:if="'Not a Member' not in me.fedoraRoleStatus" href="${tg.url('/applyForGroup', groupName=group.cn, action='Remove')}">Remove me</a>
|
||||
<h3>Group Details <a href="${tg.url('editGroup', groupName=group.cn)}">(edit)</a></h3>
|
||||
<div class="userbox">
|
||||
<dl>
|
||||
|
|
@ -40,7 +40,7 @@
|
|||
</div>
|
||||
<h3 py:if='me.fedoraRoleStatus == "approved"'>Invite</h3>
|
||||
<span py:if='me.fedoraRoleStatus == "approved"'>${searchUserForm(action='modifyGroup', value=value, method='get')}</span>
|
||||
<h2>Members</h2>
|
||||
<h3>Members</h3>
|
||||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
|
|
@ -54,8 +54,8 @@
|
|||
</tr>
|
||||
</thead>
|
||||
<tr py:for="user in groups">
|
||||
<td><a href='viewAccount?userName=${user}'>${user}</a></td>
|
||||
<td py:if='not(groups[user].fedoraRoleSponsor == "None")'><a href='viewAccount?userName=${groups[user].fedoraRoleSponsor}'>${groups[user].fedoraRoleSponsor}</a></td>
|
||||
<td><a href="${tg.url('viewAccount/%s' % user)}">${user}</a></td>
|
||||
<td py:if='not(groups[user].fedoraRoleSponsor == "None")'><a href="%{tg.url('viewAccount/%s' % groups[user].fedoraRoleSponsor)}">${groups[user].fedoraRoleSponsor}</a></td>
|
||||
<td py:if='groups[user].fedoraRoleSponsor == "None"'>${groups[user].fedoraRoleSponsor}</td>
|
||||
<td>${groups[user].fedoraRoleCreationDate}</td>
|
||||
<td>${groups[user].fedoraRoleApprovalDate}</td>
|
||||
|
|
@ -64,18 +64,18 @@
|
|||
<!--<td>${groups[user].fedoraRoleDomain}</td>-->
|
||||
<!-- This section includes all action items -->
|
||||
<td py:if='me.fedoraRoleType == "administrator"'>
|
||||
<a py:if="group.fedoraGroupNeedsSponsor.upper() == 'TRUE'" href="${tg.url('modifyGroup', groupName=groups[user].cn, userName=user, action='sponsor')}">Sponsor</a>
|
||||
<a py:if="not group.fedoraGroupNeedsSponsor.upper() == 'TRUE' and groups[user].fedoraRoleStatus.lower() != 'approved'" href="${tg.url('modifyGroup', groupName=groups[user].cn, userName=user, action='sponsor')}">Approve</a>
|
||||
<a href="${tg.url('modifyGroup', groupName=groups[user].cn, userName=user, action='remove')}">Delete</a>
|
||||
<a href="${tg.url('modifyGroup', groupName=groups[user].cn, userName=user, action='upgrade')}">Upgrade</a>
|
||||
<a href="${tg.url('modifyGroup', groupName=groups[user].cn, userName=user, action='downgrade')}">Downgrade</a> Suspend
|
||||
<a py:if="group.fedoraGroupNeedsSponsor.upper() == 'TRUE'" href="${tg.url('/modifyGroup', groupName=groups[user].cn, userName=user, action='sponsor')}">Sponsor</a>
|
||||
<a py:if="not group.fedoraGroupNeedsSponsor.upper() == 'TRUE' and groups[user].fedoraRoleStatus.lower() != 'approved'" href="${tg.url('/modifyGroup', groupName=groups[user].cn, userName=user, action='sponsor')}">Approve</a>
|
||||
<a href="${tg.url('/modifyGroup', groupName=groups[user].cn, userName=user, action='remove')}">Delete</a>
|
||||
<a href="${tg.url('/modifyGroup', groupName=groups[user].cn, userName=user, action='upgrade')}">Upgrade</a>
|
||||
<a href="${tg.url('/modifyGroup', groupName=groups[user].cn, userName=user, action='downgrade')}">Downgrade</a> Suspend
|
||||
</td>
|
||||
<td py:if='me.fedoraRoleType == "sponsor" and not groups[user].fedoraRoleType == "administrator"'>
|
||||
<a href="${tg.url('modifyGroup', groupName=groups[user].cn, userName=user, action='sponsor')}" py:if="group.fedoraGroupNeedsSponsor.upper() == 'TRUE'">Sponsor</a>
|
||||
<a href="${tg.url('modifyGroup', groupName=groups[user].cn, userName=user, action='sponsor')}" py:if="not group.fedoraGroupNeedsSponsor.upper() == 'TRUE'">Approve</a>
|
||||
<a href="${tg.url('modifyGroup', groupName=groups[user].cn, userName=user, action='remove')}">Delete</a>
|
||||
<a py:if='groups[user].fedoraRoleType' href="${tg.url('modifyGroup', groupName=groups[user].cn, userName=user, action='upgrade')}">Upgrade</a>
|
||||
<a href="${tg.url('modifyGroup', groupName=groups[user].cn, userName=user, action='downgrade')}">Downgrade</a> Suspend
|
||||
<a href="${tg.url('/modifyGroup', groupName=groups[user].cn, userName=user, action='sponsor')}" py:if="group.fedoraGroupNeedsSponsor.upper() == 'TRUE'">Sponsor</a>
|
||||
<a href="${tg.url('/modifyGroup', groupName=groups[user].cn, userName=user, action='sponsor')}" py:if="not group.fedoraGroupNeedsSponsor.upper() == 'TRUE'">Approve</a>
|
||||
<a href="${tg.url('/modifyGroup', groupName=groups[user].cn, userName=user, action='remove')}">Delete</a>
|
||||
<a py:if='groups[user].fedoraRoleType' href="${tg.url('/modifyGroup', groupName=groups[user].cn, userName=user, action='upgrade')}">Upgrade</a>
|
||||
<a href="${tg.url('/modifyGroup', groupName=groups[user].cn, userName=user, action='downgrade')}">Downgrade</a> Suspend
|
||||
<div py:if="'not' in '%s' % tg_flash and user in '%s' % tg_flash"> -- Error!</div><!-- Clean this up -->
|
||||
</td>
|
||||
</tr>
|
||||
|
|
|
|||
|
|
@ -1,23 +1,23 @@
|
|||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:py="http://purl.org/kid/ns#" py:extends="'master.kid'">
|
||||
<head>
|
||||
<title>Welcome to FAS2</title>
|
||||
<style type="text/css">
|
||||
#content ul
|
||||
{
|
||||
list-style: square;
|
||||
margin: 1ex 3ex;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<p>
|
||||
Welcome to the Fedora Accounts System 2. This system is not yet live so feel free to play around. Just don't expect it to work.
|
||||
</p>
|
||||
<ul>
|
||||
<li><a href="${tg.url('login')}">Log In</a></li>
|
||||
<li><a href="${tg.url('signUp')}">New Account</a></li>
|
||||
<li><a href="http://fedoraproject.org/wiki/Join">Why Join?</a></li>
|
||||
</ul>
|
||||
</body>
|
||||
</html>
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:py="http://purl.org/kid/ns#" py:extends="'master.kid'">
|
||||
<head>
|
||||
<title>Welcome to FAS2</title>
|
||||
<style type="text/css">
|
||||
#content ul
|
||||
{
|
||||
list-style: square;
|
||||
margin: 1ex 3ex;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<p>
|
||||
Welcome to the Fedora Accounts System 2. This system is not yet live so feel free to play around. Just don't expect it to work.
|
||||
</p>
|
||||
<ul>
|
||||
<li><a href="${tg.url('/login')}">Log In</a></li>
|
||||
<li><a href="${tg.url('/signUp')}">New Account</a></li>
|
||||
<li><a href="http://fedoraproject.org/wiki/Join">Why Join?</a></li>
|
||||
</ul>
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue