accounts2/fas/fas/templates editAccount.kid, 1.4, 1.5 editGroup.kid, 1.2, 1.3 login.kid, 1.2, 1.3 resetPassword.kid, 1.1, 1.2

Wed Apr 4 16:36:54 UTC 2007

Author: mmcgrath

Update of /cvs/fedora/accounts2/fas/fas/templates
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11966/fas/templates

Modified Files:
	editAccount.kid editGroup.kid login.kid resetPassword.kid 
Log Message:
Added many features and needed cleanup.  Still not yet ready for a production release


Index: editAccount.kid
===================================================================
RCS file: /cvs/fedora/accounts2/fas/fas/templates/editAccount.kid,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5

--- editAccount.kid	28 Mar 2007 18:54:59 -0000	1.4
+++ editAccount.kid	4 Apr 2007 16:36:52 -0000	1.5
@@ -41,6 +41,11 @@
    <td>Description:</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>Password: </td>
+   <td><img src="static/images/status_approved.png" />
+       Valid <span class="edit-button"><a href="changePassword">(change)</a></span>
+   </td>
+  </tr><tr>
    <td>Account Status:</td>
    <td><img src="static/images/status_approved.png" />
        Approved, Active <span class="edit-button"><a href="#">(deactivate)</a></span>
@@ -55,7 +60,7 @@
     <span class="account-role-title">(${groups[group].fedoraRoleSponsor})</span>
     <span class="account-role-type">${groups[group].fedoraRoleType}</span>
     <img py:if="groups[group].fedoraRoleStatus.lower() == 'approved'" src="static/images/status_approved.png" />
-    <span class="edit-button"><a href="#"> (edit)</a></span>
+    <span class="edit-button"><a href="${tg.url('editGroup', groupName=groups[group].cn)}"> (edit)</a></span>
 </h3>
 
 <table class="account-info your-account-role-info">


Index: editGroup.kid
===================================================================
RCS file: /cvs/fedora/accounts2/fas/fas/templates/editGroup.kid,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- editGroup.kid	28 Mar 2007 18:54:59 -0000	1.2
+++ editGroup.kid	4 Apr 2007 16:36:52 -0000	1.3
@@ -9,13 +9,13 @@
 </head>
 <body>
 
-<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'/>
+<h1>My Status: ${me.fedoraRoleStatus}</h1>
+<form py:if="'Not a Member' in me.fedoraRoleStatus" action='applyForGroup'>
+    <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'/>
 </form>
-<a py:if="'Not a Member' not in myStatus" href="${tg.url('applyForGroup', groupName=group.cn)}">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>
  
 
 <h2>${group.cn}</h2>
@@ -28,17 +28,35 @@
     <tr><td>fedoraGroupJoinMsg</td><td><pre>${group.fedoraGroupJoinMsg}</pre></td></tr>
 </table>
 <h2>Members</h2>
+<span>
+    <form action='modifyGroup'>
+        <input type='hidden' name='groupName' value='${group.cn}'/>
+        <input type='text' name='userName'/>
+        <input type='submit' name='action' value='apply'/>
+    </form>
+</span>
 <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><th>Username</th><th>Sponsor</th><th>Date Added</th><th>Approval</th><th>Role Type</th><th>Domain</th><th>Action</th></tr>
     <tr py:for="user in groups">
         <td><a href='editAccount?userName=${user}'>${user}</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>
         <td>${groups[user].fedoraRoleStatus}</td>
+        <td>${groups[user].fedoraRoleType}</td>
         <td>${groups[user].fedoraRoleDomain}</td>
+        <td py:if='me.fedoraRoleType == "administrator"'>
+            Approve Sponsor
+            <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>
+        </td>
+        <td py:if='me.fedoraRoleType == "sponsor" and not groups[user].fedoraRoleType == "administrator"'>
+            Approve Sponsor
+            <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>
+        </td>
     </tr>
 </table>
 


Index: login.kid
===================================================================
RCS file: /cvs/fedora/accounts2/fas/fas/templates/login.kid,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- login.kid	28 Mar 2007 18:54:59 -0000	1.2
+++ login.kid	4 Apr 2007 16:36:52 -0000	1.3
@@ -100,7 +100,7 @@
                     </td>
                 </tr>
                 <tr>
-                    <td align='right'><a href='passwordReset'>Forgot Password?</a></td>
+                    <td align='right'><a href='resetPassword'>Forgot Password?</a></td>
                 </tr>
             </table>
 


Index: resetPassword.kid
===================================================================
RCS file: /cvs/fedora/accounts2/fas/fas/templates/resetPassword.kid,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- resetPassword.kid	28 Mar 2007 18:54:59 -0000	1.1
+++ resetPassword.kid	4 Apr 2007 16:36:52 -0000	1.2
@@ -11,13 +11,14 @@
 <span py:if="tg.identity.anonymous">
     <form method='post'>
         Username: <input type='text' name='userName'/><br/>
-        Primary Email: <input type='password' email='primaryEmailAddress'/><br/>
+        Primary Email: <input type='password' name='mail'/><br/>
         <input type='submit'/>
     </form>
 </span>
 <span py:if=" not tg.identity.anonymous">
     <form method='post'>
-        New Password: <input type='password' name='password'/>
+        New password for ${tg.identity.user.user_name}<br/>
+        New Password: <input type='password' name='password'/><br/>
         Verify Password: <input type='password' name='passwordCheck'/>
         <input type='submit'/>
     </form>


