accounts2/fas/fas/templates editAccount.kid, 1.2, 1.3 groupList.kid, 1.1, 1.2

Michael Patrick McGrath (mmcgrath) fedora-extras-commits at redhat.com
Mon Mar 26 18:52:14 UTC 2007


Author: mmcgrath

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

Modified Files:
	editAccount.kid groupList.kid 
Log Message:
added better group handling, as well as not including unapproved members by default


Index: editAccount.kid
===================================================================
RCS file: /cvs/fedora/accounts2/fas/fas/templates/editAccount.kid,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- editAccount.kid	26 Mar 2007 16:29:43 -0000	1.2
+++ editAccount.kid	26 Mar 2007 18:52:07 -0000	1.3
@@ -79,6 +79,7 @@
    <td>Queue:</td>
    <td>
     <ul class="queue-links">
+     <li py:for="group in groupsPending">Group "${groupsPending[group].cn}" status: <strong>${groupsPending[group].fedoraRoleStatus}</strong></li>
      <li><a href="#">Chewbacca D. Wookiee requests approval to join project as <strong>user</strong> ...</a></li>
      <li><a href="#">Gaius Baltar request approval to upgrade from <strong>user</strong> to <strong>administrator</strong> ...</a></li>
      <li><a href="#">Leia Organa requests approval to upgrade from <strong>user</strong> to <strong>sponsor</strong> ...</a></li>


Index: groupList.kid
===================================================================
RCS file: /cvs/fedora/accounts2/fas/fas/templates/groupList.kid,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- groupList.kid	26 Mar 2007 15:11:18 -0000	1.1
+++ groupList.kid	26 Mar 2007 18:52:07 -0000	1.2
@@ -24,8 +24,12 @@
     </tr>
 </table>
 <table>
-    <tr py:for="item in printList">
-        <td>${item}<a href="editGroup?groupName=${item}"> (edit)</a></td>
+    <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"/>
+        </td>
     </tr>
 </table>
 




More information about the fedora-extras-commits mailing list