accounts2/fas/fas/templates editAccount.kid, 1.8, 1.9 editGroup.kid, 1.5, 1.6

[Michael Patrick McGrath (mmcgrath)]

Author: mmcgrath

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

Modified Files:
	editAccount.kid editGroup.kid 
Log Message:
Major UI changes


Index: editAccount.kid
===================================================================
RCS file: /cvs/fedora/accounts2/fas/fas/templates/editAccount.kid,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- editAccount.kid	26 Apr 2007 18:31:11 -0000	1.8
+++ editAccount.kid	26 Apr 2007 19:35:50 -0000	1.9
@@ -147,7 +147,8 @@
     </tr>
     <tr>
 	<td>CLA:</td>
-	<td py:if='groups["cla_done"]'><img src='static/images/status_approved.png'/> <a href="#">(?)</a></td>
+	<td py:if='claDone'><img src='static/images/status_approved.png'/> Done <a href="#">(?)</a></td>
+	<td py:if='not claDone'><img src='static/images/status_incomplete.png'/> Not Done <a href="#">(?)</a></td>
     </tr>
 <!--    <tr>
         <td>Description:</td>


Index: editGroup.kid
===================================================================
RCS file: /cvs/fedora/accounts2/fas/fas/templates/editGroup.kid,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- editGroup.kid	26 Apr 2007 14:28:20 -0000	1.5
+++ editGroup.kid	26 Apr 2007 19:35:50 -0000	1.6
@@ -58,14 +58,12 @@
             <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"'>
-            <span py:if="group.fedoraGroupNeedsSponsor.upper() == 'TRUE'"> Sponsor</span>
-            <span py:if="not group.fedoraGroupNeedsSponsor.upper() == 'TRUE'"> Approve</span>
+            <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
-        </td>
-        <td id='error' py:if="'not' in '%s' % tg_flash and user in '%s' % tg_flash">
-            -- ERROR!
+            <div py:if="'not' in '%s' % tg_flash and user in '%s' % tg_flash"> -- Error!</div>
         </td>
     </tr>
 </table>