accounts2/fas/fas/templates resetPassword.kid, NONE, 1.1 editAccount.kid, 1.3, 1.4 editGroup.kid, 1.1, 1.2 groupList.kid, 1.2, 1.3 login.kid, 1.1, 1.2 welcome.kid, 1.1, 1.2
Michael Patrick McGrath (mmcgrath)
fedora-extras-commits at redhat.com
Wed Mar 28 18:55:02 UTC 2007
Author: mmcgrath
Update of /cvs/fedora/accounts2/fas/fas/templates
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13716/fas/templates
Modified Files:
editAccount.kid editGroup.kid groupList.kid login.kid
welcome.kid
Added Files:
resetPassword.kid
Log Message:
Just making sure current changes have been committed
--- NEW FILE resetPassword.kid ---
<!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>
<style type="text/css">
@import "/static/css/fas.css";
</style>
</head>
<body>
<span py:if="tg.identity.anonymous">
<form method='post'>
Username: <input type='text' name='userName'/><br/>
Primary Email: <input type='password' email='primaryEmailAddress'/><br/>
<input type='submit'/>
</form>
</span>
<span py:if=" not tg.identity.anonymous">
<form method='post'>
New Password: <input type='password' name='password'/>
Verify Password: <input type='password' name='passwordCheck'/>
<input type='submit'/>
</form>
</span>
</body>
</html>
Index: editAccount.kid
===================================================================
RCS file: /cvs/fedora/accounts2/fas/fas/templates/editAccount.kid,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- editAccount.kid 26 Mar 2007 18:52:07 -0000 1.3
+++ editAccount.kid 28 Mar 2007 18:54:59 -0000 1.4
@@ -15,31 +15,31 @@
<tbody>
<tr>
<td>Real Name:</td>
- <td>${user.givenName}<span class="edit-button"><a href="${tg.url('edit', attribute='givenName', value=user.givenName, userName=user.givenName)}" onclick="window.open('${tg.url('edit', attribute='givenName', value=user.givenName, userName=user.cn)}','editWindow','width=250,height=100,top=0,left=0,resizable=no,scrollbars=no'); return false;">(edit)</a></span></td>
+ <td>${user.givenName}<span class="edit-button"><a href="${tg.url('editUserAttribute', attribute='givenName', value=user.givenName, userName=user.givenName)}" onclick="window.open('${tg.url('editUserAttribute', attribute='givenName', value=user.givenName, userName=user.cn)}','editWindow','width=250,height=100,top=0,left=0,resizable=no,scrollbars=no'); return false;">(edit)</a></span></td>
</tr><tr>
<td>Account Name:</td>
<td>${user.cn}<a href='#'>(?)</a></td>
</tr><tr>
<td>Email:</td>
- <td>${user.mail}<span class="edit-button"><a href="${tg.url('edit', attribute='mail', value=user.mail, userName=user.mail)}" onclick="window.open('${tg.url('edit', attribute='mail', value=user.mail, userName=user.cn)}','editWindow','width=250,height=100,top=0,left=0,resizable=no,scrollbars=no'); return false;">(edit)</a></span></td>
+ <td>${user.mail}<span class="edit-button"><a href="${tg.url('editUserAttribute', attribute='mail', value=user.mail, userName=user.mail)}" onclick="window.open('${tg.url('editUserAttribute', attribute='mail', value=user.mail, userName=user.cn)}','editWindow','width=250,height=100,top=0,left=0,resizable=no,scrollbars=no'); return false;">(edit)</a></span></td>
</tr><tr>
<td>Bugzilla Email:</td>
- <td>${user.fedoraPersonBugzillaMail}<span class="edit-button"><a href="${tg.url('edit', attribute='fedoraPersonBugzillaMail', value=user.fedoraPersonBugzillaMail, userName=user.cn)}" onclick="window.open('${tg.url('edit', attribute='fedoraPersonBugzillaMail', value=user.fedoraPersonBugzillaMail, userName=user.cn)}','editWindow','width=250,height=100,top=0,left=0,resizable=no,scrollbars=no'); return false;">(edit)</a></span></td>
+ <td>${user.fedoraPersonBugzillaMail}<span class="edit-button"><a href="${tg.url('editUserAttribute', attribute='fedoraPersonBugzillaMail', value=user.fedoraPersonBugzillaMail, userName=user.cn)}" onclick="window.open('${tg.url('editUserAttribute', attribute='fedoraPersonBugzillaMail', value=user.fedoraPersonBugzillaMail, userName=user.cn)}','editWindow','width=250,height=100,top=0,left=0,resizable=no,scrollbars=no'); return false;">(edit)</a></span></td>
</tr><tr>
<td>IRC Nick:</td>
- <td>${user.fedoraPersonIrcNick}<span class="edit-button"><a href="${tg.url('edit', attribute='fedoraPersonIrcNick', value=user.fedoraPersonIrcNick, userName=user.cn)}" onclick="window.open('${tg.url('edit', attribute='fedoraPersonIrcNick', value=user.fedoraPersonIrcNick, userName=user.cn)}','editWindow','width=250,height=100,top=0,left=0,resizable=no,scrollbars=no'); return false;">(edit)</a></span></td>
+ <td>${user.fedoraPersonIrcNick}<span class="edit-button"><a href="${tg.url('editUserAttribute', attribute='fedoraPersonIrcNick', value=user.fedoraPersonIrcNick, userName=user.cn)}" onclick="window.open('${tg.url('editUserAttribute', attribute='fedoraPersonIrcNick', value=user.fedoraPersonIrcNick, userName=user.cn)}','editWindow','width=250,height=100,top=0,left=0,resizable=no,scrollbars=no'); return false;">(edit)</a></span></td>
</tr><tr>
<td>PGP Key:</td>
- <td>${user.fedoraPersonKeyId}<span class="edit-button"><a href="${tg.url('edit', attribute='fedoraPersonKeyId', value=user.fedoraPersonKeyId, userName=user.cn)}" onclick="window.open('${tg.url('edit', attribute='fedoraPersonKeyId', value=user.fedoraPersonKeyId, userName=user.cn)}','editWindow','width=250,height=100,top=0,left=0,resizable=no,scrollbars=no'); return false;">(edit)</a></span></td>
+ <td>${user.fedoraPersonKeyId}<span class="edit-button"><a href="${tg.url('editUserAttribute', attribute='fedoraPersonKeyId', value=user.fedoraPersonKeyId, userName=user.cn)}" onclick="window.open('${tg.url('editUserAttribute', attribute='fedoraPersonKeyId', value=user.fedoraPersonKeyId, userName=user.cn)}','editWindow','width=250,height=100,top=0,left=0,resizable=no,scrollbars=no'); return false;">(edit)</a></span></td>
</tr><tr>
<td>Postal Address:</td>
- <td><pre>${user.postalAddress}</pre><span class="edit-button"><a href="${tg.url('edit', attribute='postalAddress', value=user.postalAddress, userName=user.cn)}" onclick="window.open('${tg.url('edit', attribute='postalAddress', value=user.postalAddress, userName=user.cn)}','editWindow','width=250,height=100,top=0,left=0,resizable=no,scrollbars=no'); return false;">(edit)</a></span></td>
+ <td><pre>${user.postalAddress}</pre><span class="edit-button"><a href="${tg.url('editUserAttribute', attribute='postalAddress', value=user.postalAddress, userName=user.cn)}" onclick="window.open('${tg.url('editUserAttribute', attribute='postalAddress', value=user.postalAddress, userName=user.cn)}','editWindow','width=250,height=100,top=0,left=0,resizable=no,scrollbars=no'); return false;">(edit)</a></span></td>
</tr><tr>
<td>Telephone Number:</td>
- <td>${user.telephoneNumber}<span class="edit-button"><a href="${tg.url('edit', attribute='telephoneNumber', value=user.telephoneNumber, userName=user.cn)}" onclick="window.open('${tg.url('edit', attribute='telephoneNumber', value=user.telephoneNumber, userName=user.cn)}','editWindow','width=250,height=100,top=0,left=0,resizable=no,scrollbars=no'); return false;">(edit)</a></span></td>
+ <td>${user.telephoneNumber}<span class="edit-button"><a href="${tg.url('editUserAttribute', attribute='telephoneNumber', value=user.telephoneNumber, userName=user.cn)}" onclick="window.open('${tg.url('editUserAttribute', attribute='telephoneNumber', value=user.telephoneNumber, userName=user.cn)}','editWindow','width=250,height=100,top=0,left=0,resizable=no,scrollbars=no'); return false;">(edit)</a></span></td>
</tr><tr>
<td>Description:</td>
- <td><pre>${user.description}</pre><span class="edit-button"><a href="${tg.url('edit', attribute='description', value=user.description, userName=user.cn)}" onclick="window.open('${tg.url('edit', attribute='description', value=user.description, userName=user.cn)}','editWindow','width=250,height=100,top=0,left=0,resizable=no,scrollbars=no'); return false;">(edit)</a></span></td>
+ <td><pre>${user.description}</pre><span class="edit-button"><a href="${tg.url('editUserAttribute', attribute='description', value=user.description, userName=user.cn)}" onclick="window.open('${tg.url('editUserAttribute', attribute='description', value=user.description, userName=user.cn)}','editWindow','width=250,height=100,top=0,left=0,resizable=no,scrollbars=no'); return false;">(edit)</a></span></td>
</tr><tr>
<td>Account Status:</td>
<td><img src="static/images/status_approved.png" />
@@ -69,10 +69,9 @@
<td>Tools:</td>
<td>
<ul class="tool-links">
+ <li><a href="/fas/listGroup">Apply for new group ...</a></li>
<li><a href="#">Invite a New Member ...</a></li>
<li><a href="#">View All Pending Membership Requests ...</a></li>
- <li><a href="#">Manage Project Membership ...</a></li>
- <li><a href="#">Manage Project Details ...</a></li>
</ul>
</td>
</tr><tr>
Index: editGroup.kid
===================================================================
RCS file: /cvs/fedora/accounts2/fas/fas/templates/editGroup.kid,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- editGroup.kid 26 Mar 2007 15:11:18 -0000 1.1
+++ editGroup.kid 28 Mar 2007 18:54:59 -0000 1.2
@@ -9,12 +9,31 @@
</head>
<body>
-<h1>${groupName}</h1>
+<h1>My Status: ${myStatus}</h1>
+<form py:if="'Not a Member' in myStatus" action='applyForGroup'>
+ <input type='hidden' name='groupName' value='${myStatus}'/>
+ <input type='text' name='Request field' value='Please let me join..'/>
+ <input type='submit' name='submit' value='Apply'/>
+</form>
+<a py:if="'Not a Member' not in myStatus" href="${tg.url('applyForGroup', groupName=group.cn)}">Remove me</a>
+
+
+<h2>${group.cn}</h2>
+<table>
+ <tr><td>Name</td><td>${group.cn}</td></tr>
+ <tr><td>Owner</td><td>${group.fedoraGroupOwner}</td></tr>
+ <tr><td>Type</td><td>${group.fedoraGroupType}</td></tr>
+ <tr><td>Needs Sponsor</td><td>${group.fedoraGroupNeedsSponsor}</td></tr>
+ <tr><td>Self Removal</td><td>${group.fedoraGroupUserCanRemove}</td></tr>
+ <tr><td>fedoraGroupJoinMsg</td><td><pre>${group.fedoraGroupJoinMsg}</pre></td></tr>
+</table>
+<h2>Members</h2>
<table>
<tr><th>Username</th><th>Sponsor</th><th>Date Added</th><th>Role Type</th><th>Role Status</th><th>Approval</th><th>Domain</th></tr>
<tr py:for="user in groups">
<td><a href='editAccount?userName=${user}'>${user}</a></td>
- <td><a href='editAccount?userName=${groups[user].fedoraRoleSponsor}'>${groups[user].fedoraRoleSponsor}</a></td>
+ <td py:if='not(groups[user].fedoraRoleSponsor == "None")'><a href='editAccount?userName=${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].objectClass}</td>
<td>${groups[user].fedoraRoleType}</td>
Index: groupList.kid
===================================================================
RCS file: /cvs/fedora/accounts2/fas/fas/templates/groupList.kid,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- groupList.kid 26 Mar 2007 18:52:07 -0000 1.2
+++ groupList.kid 28 Mar 2007 18:54:59 -0000 1.3
@@ -24,11 +24,12 @@
</tr>
</table>
<table>
- <tr py:for="group in printList">
- <td>${group} <a href="editGroup?groupName=${group}">(edit)</a></td>
- <td>
- <img py:if="group in myGroups" src="static/images/status_approved.png" alt="Already in Group"/>
- <img py:if="group not in myGroups" src="static/images/status_incomplete.png" alt="Apply For Group"/>
+ <tr><th>Group</th><th>Status</th></tr>
+ <tr py:for="group in groups">
+ <td>${groups[group].cn} <a href="editGroup?groupName=${groups[group].cn}">(edit)</a></td>
+ <td align='center'>
+ <a py:if="groups[group].cn in myGroups" href="${tg.url('editGroup', groupName=groups[group].cn)}"><img src="static/images/status_approved.png" border='0'/></a>
+ <a py:if="groups[group].cn not in myGroups" href="${tg.url('editGroup', groupName=groups[group].cn)}"><img src="static/images/status_incomplete.png" border='0'/></a>
</td>
</tr>
</table>
Index: login.kid
===================================================================
RCS file: /cvs/fedora/accounts2/fas/fas/templates/login.kid,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- login.kid 26 Mar 2007 15:11:18 -0000 1.1
+++ login.kid 28 Mar 2007 18:54:59 -0000 1.2
@@ -99,6 +99,9 @@
<input type="submit" name="login" value="Login"/>
</td>
</tr>
+ <tr>
+ <td align='right'><a href='passwordReset'>Forgot Password?</a></td>
+ </tr>
</table>
<input py:if="forward_url" type="hidden" name="forward_url"
Index: welcome.kid
===================================================================
RCS file: /cvs/fedora/accounts2/fas/fas/templates/welcome.kid,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- welcome.kid 26 Mar 2007 15:11:18 -0000 1.1
+++ welcome.kid 28 Mar 2007 18:54:59 -0000 1.2
@@ -9,9 +9,9 @@
<br/><br/>
-<br/><a href='groupList'>groupList</a>
+<br/><a href='listGroup'>listGroup</a>
<br/><a href='userList'>userList</a>
-<br/><a href='editUser'>editUser</a>
+<br/><a href='editAccount'>editAccount</a>
<br/><a href='editGroup'>editGroup</a>
</body>
More information about the fedora-extras-commits
mailing list