accounts2/fas/fas/templates invite.kid, NONE, 1.1 signUp.kid, NONE, 1.1 editAccount.kid, 1.6, 1.7 editGroup.kid, 1.4, 1.5 groupList.kid, 1.3, 1.4 login.kid, 1.3, 1.4 master.kid, 1.2, 1.3 resetPassword.kid, 1.2, 1.3 userList.kid, 1.1, 1.2 welcome.kid, 1.2, 1.3

Michael Patrick McGrath (mmcgrath) fedora-extras-commits at redhat.com
Thu Apr 26 14:28:22 UTC 2007 

Author: mmcgrath

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

Modified Files:
	editAccount.kid editGroup.kid groupList.kid login.kid 
	master.kid resetPassword.kid userList.kid welcome.kid 
Added Files:
	invite.kid signUp.kid 
Log Message:
UI changes


--- NEW FILE invite.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>

<h1>Invite a new community member!</h1>

<form method='POST'>
    To email: <input type='text' value='' name='target'/><br/>
    From: ${user.mail}<br/>
    Subject: Invitation to join the Fedora Team!<br/>
    Message: Please come up with a better more inviting message.<br/>
<pre>
${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
that make you a great fit for the Fedora community, and that you might
be interested in contributing.

How could you team up with the Fedora community to use and develop your
skills?  Check out http://fedoraproject.org/wiki/Join for some ideas.
Our community is more than just software developers -- we also have a
place for you whether you're an artist, a web site builder, a writer, or
a people person.  You'll grow and learn as you work on a team with other
very smart and talented people.

Fedora and FOSS are changing the world -- come be a part of it!
</pre>
    <input type='submit'/>
</form>
</body>

</html>


--- NEW FILE signUp.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>

<div class='draggable white' style="left: 10px; display: none" id='help'>close</div>
<script src="/fas/static/javascript/forms.js" type="text/javascript"></script>

<form>
    <table>
        <tr><td>username:</td><td><input type='text' name='cn'/></td></tr>
        <tr><td>Real Name:</td><td><input type='text' name='givenName'/></td></tr>
        <tr><td>email:</td><td><input type='text' name='mail'/></td></tr>
        <tr><td>Telephone Number:</td><td><input type='text' name='telephoneNumber'/></td></tr>
        <tr><td>Postal Address:</td><td><textarea name='postalAddressForm'></textarea></td></tr>
        
    </table>
</form>

</body>
</html>


Index: editAccount.kid
===================================================================
RCS file: /cvs/fedora/accounts2/fas/fas/templates/editAccount.kid,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- editAccount.kid	14 Apr 2007 21:35:44 -0000	1.6
+++ editAccount.kid	26 Apr 2007 14:28:20 -0000	1.7
@@ -5,144 +5,138 @@
 <head>
  <style type="text/css">
 @import "/static/css/fas.css";
+ at import "/static/css/draggable.css";
+
  </style>
 </head>
 <body>
 
+<div class='draggable white' style="left: 10px; display: none" id='help'>close</div>
+<script src="/fas/static/javascript/forms.js" type="text/javascript"></script>
+<script src="/fas/static/javascript/draggable.js" type="text/javascript"></script>
 <h2 id="your-account-header"><img src="static/images/header-icon_account.png" />Your Fedora Account</h2>
 
 <table class="account-info" id="your-account-basic-info">
  <tbody>
     <tr>
         <td>Account Name:</td>
-        <td>${user.cn}<a href='#'>(?)</a></td>
+        <td>${user.cn}<a href='#' onclick="appear('help'); new RollingSign('help', 'Crip I need help, This is not going well. WTF is going on?'); return false;">(?)</a></td>
     </tr> 
     <tr>
         <td>Real Name:</td>
-        <td py:if='action == "givenName"'>
-            <form method='post' action='editUserAttribute'>
-                <input type='hidden' name='attribute' value='givenName'/>
-                <input type='text' name='value' value='${user.givenName}'/>
-                <a href='editAccount'>(Cancel)</a>
-            </form>
-        </td>
-        <td py:if='not action == "givenName"'>${user.givenName}
-            <span class="edit-button">
-                <a href="${tg.url('', action='givenName')}">(edit)</a>
-            </span>
+        <td>
+            <div id='givenName'>${user.givenName} <a href='' onclick="formEdit('givenName'); return false;">(edit)</a></div>
+            <div id='givenNameForm' style='display: none'>
+                <form method='post' action='editUserAttribute'>
+                    <input type='hidden' name='attribute' value='givenName'/>
+                    <input type='text' name='value' value='${user.givenName}'/>
+                    <a href='editAccount' onclick="cancelEdit('givenName'); return false;">(cancel)</a>
+                </form>
+            </div>
         </td>
     </tr>
     <tr>
         <td>Email:</td>
-        <td py:if='action == "mail"'>
-            <form method='post' action='editUserAttribute'>
-                <input type='hidden' name='attribute' value='mail'/>
-                <input type='text' name='value' value='${user.mail}'/>
-                <a href='editAccount'>(Cancel)</a>
-            </form>
-        </td>
-        <td py:if='not action == "mail"'>${user.mail}
-            <span class="edit-button">
-                <a href="${tg.url('', action='mail')}">(edit)</a>
-            </span>
+        <td>
+            <div id='mail'>${user.mail} <a href='' onclick="formEdit('mail'); return false;">(edit)</a></div>
+            <div id='mailForm' style='display: none'>
+                <form method='post' action='editUserAttribute'>
+                    <input type='hidden' name='attribute' value='mail'/>
+                    <input type='text' name='value' value='${user.mail}'/>
+                    <a href='editAccount' onclick="cancelEdit('mail'); return false;">(cancel)</a>
+                </form>
+            </div>
         </td>
     </tr>
     <tr>
         <td>Bugzilla Email:</td>
-        <td py:if='action == "fedoraPersonBugzillaMail"'>
-            <form method='post' action='editUserAttribute'>
-                <input type='hidden' name='attribute' value='fedoraPersonBugzillaMail'/>
-                <input type='text' name='value' value='${user.fedoraPersonBugzillaMail}'/>
-                <a href='editAccount'>(Cancel)</a>
-            </form>
-        </td>
-        <td py:if='not action == "fedoraPersonBugzillaMail"'>${user.fedoraPersonBugzillaMail}
-            <span class="edit-button">
-                <a href="${tg.url('', action='fedoraPersonBugzillaMail')}">(edit)</a>
-            </span>
+        <td>
+            <div id='fedoraPersonBugzillaMail'>${user.fedoraPersonBugzillaMail} <a href='' onclick="formEdit('fedoraPersonBugzillaMail'); return false;">(edit)</a></div>
+            <div id='fedoraPersonBugzillaMailForm' style='display: none'>
+                <form method='post' action='editUserAttribute'>
+                    <input type='hidden' name='attribute' value='fedoraPersonBugzillaMail'/>
+                    <input type='text' name='value' value='${user.fedoraPersonBugzillaMail}'/>
+                    <a href='editAccount' onclick="cancelEdit('fedoraPersonBugzillaMail'); return false;">(cancel)</a>
+                </form>
+            </div>
         </td>
     </tr>
     <tr>
         <td>IRC Nick:</td>
-        <td py:if='action == "fedoraPersonIrcNick"'>
-            <form method='post' action='editUserAttribute'>
-                <input type='hidden' name='attribute' value='fedoraPersonIrcNick'/>
-                <input type='text' name='value' value='${user.fedoraPersonIrcNick}'/>
-                <a href='editAccount'>(Cancel)</a>
-            </form>
-        </td>
-        <td py:if='not action == "fedoraPersonIrcNick"'>${user.fedoraPersonIrcNick}
-            <span class="edit-button">
-                <a href="${tg.url('', action='fedoraPersonIrcNick')}">(edit)</a>
-            </span>
+        <td>
+            <div id='fedoraPersonIrcNick'>${user.fedoraPersonIrcNick} <a href='' onclick="formEdit('fedoraPersonIrcNick'); return false;">(edit)</a></div>
+            <div id='fedoraPersonIrcNickForm' style='display: none'>
+                <form method='post' action='editUserAttribute'>
+                    <input type='hidden' name='attribute' value='fedoraPersonIrcNick'/>
+                    <input type='text' name='value' value='${user.fedoraPersonIrcNick}'/>
+                    <a href='editAccount' onclick="cancelEdit('fedoraPersonIrcNick'); return false;">(cancel)</a>
+                </form>
+            </div>
         </td>
     </tr>
+
     <tr>
         <td>PGP Key:</td>
-        <td py:if='action == "fedoraPersonKeyId"'>
-            <form method='post' action='editUserAttribute'>
-                <input type='hidden' name='attribute' value='fedoraPersonKeyId'/>
-                <input type='text' name='value' value='${user.fedoraPersonKeyId}'/>
-                <a href='editAccount'>(Cancel)</a>
-            </form>
-        </td>
-        <td py:if='not action == "fedoraPersonKeyId"'><a href="${tg.url('http://pgp.mit.edu:11371/pks/lookup', op='get', search='0x%s' % user.fedoraPersonKeyId)}">${user.fedoraPersonKeyId}</a>
-            <span class="edit-button">
-                <a href="${tg.url('', action='fedoraPersonKeyId')}">(edit)</a>
-            </span>
+        <td>
+            <div id='fedoraPersonKeyId'>${user.fedoraPersonKeyId} <a href='' onclick="formEdit('fedoraPersonKeyId'); return false;">(edit)</a></div>
+            <div id='fedoraPersonKeyIdForm' style='display: none'>
+                <form method='post' action='editUserAttribute'>
+                    <input type='hidden' name='attribute' value='fedoraPersonKeyId'/>
+                    <input type='text' name='value' value='${user.fedoraPersonKeyId}'/>
+                    <a href='editAccount' onclick="cancelEdit('fedoraPersonKeyId'); return false;">(cancel)</a>
+                </form>
+            </div>
         </td>
     </tr>
+
     <tr>
         <td>Telephone Number:</td>
-        <td py:if='action == "telephoneNumber"'>
-            <form method='post' action='editUserAttribute'>
-                <input type='hidden' name='attribute' value='telephoneNumber'/>
-                <input type='text' name='value' value='${user.telephoneNumber}'/>
-                <a href='editAccount'>(Cancel)</a>
-            </form>
-        </td>
-        <td py:if='not action == "telephoneNumber"'>${user.telephoneNumber}
-            <span class="edit-button">
-                <a href="${tg.url('', action='telephoneNumber')}">(edit)</a>
-            </span>
+        <td>
+            <div id='telephoneNumber'>${user.telephoneNumber} <a href='' onclick="formEdit('telephoneNumber'); return false;">(edit)</a></div>
+            <div id='telephoneNumberForm' style='display: none'>
+                <form method='post' action='editUserAttribute'>
+                    <input type='hidden' name='attribute' value='telephoneNumber'/>
+                    <input type='text' name='value' value='${user.telephoneNumber}'/>
+                    <a href='editAccount' onclick="cancelEdit('telephoneNumber'); return false;">(cancel)</a>
+                </form>
+            </div>
         </td>
     </tr>
+
     <tr>
         <td>Postal Address:</td>
-        <td py:if='action == "postalAddress"'>
-            <form method='post' action='editUserAttribute'>
-                <input type='hidden' name='attribute' value='postalAddress'/>
-                <textarea name='value'>${user.postalAddress}</textarea>
-                <input type='submit' value='submit'/>
-                <a href='editAccount'>(Cancel)</a>
-            </form>
-        </td>
-        <td py:if='not action == "postalAddress"'><pre>${user.postalAddress}</pre>
-            <span class="edit-button">
-                <a href="${tg.url('', action='postalAddress')}">(edit)</a>
-            </span>
+        <td>
+            <div id='postalAddress'><pre>${user.postalAddress}</pre><a href='' onclick="formEdit('postalAddress'); return false;">(edit)</a></div>
+            <div id='postalAddressForm' style='display: none'>
+                <form method='post' action='editUserAttribute'>
+                    <input type='hidden' name='attribute' value='postalAddress'/>
+                    <textarea name='value'>${user.postalAddress}</textarea>
+                    <input type='submit' value='submit'/>
+                    <a href='editAccount' onclick="cancelEdit('postalAddress'); return false;">(cancel)</a>
+                </form>
+            </div>
         </td>
     </tr>
+
     <tr>
         <td>Description:</td>
-        <td py:if='action == "description"'>
-            <form method='post' action='editUserAttribute'>
-                <input type='hidden' name='attribute' value='description'/>
-                <textarea name='value'>${user.description}</textarea>
-                <input type='submit' value='submit'/>
-                <a href='editAccount'>(Cancel)</a>
-            </form>
-        </td>
-        <td py:if='not action == "description"'><pre>${user.description}</pre>
-            <span class="edit-button">
-                <a href="${tg.url('', action='description')}">(edit)</a>
-            </span>
+        <td>
+            <div id='description'><pre>${user.description}</pre><a href='' onclick="formEdit('description'); return false;">(edit)</a></div>
+            <div id='descriptionForm' style='display: none'>
+                <form method='post' action='editUserAttribute'>
+                    <input type='hidden' name='attribute' value='description'/>
+                    <textarea name='value'>${user.description}</textarea>
+                    <input type='submit' value='submit'/>
+                    <a href='editAccount' onclick="cancelEdit('description'); return false;">(cancel)</a>
+                </form>
+            </div>
         </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>
+       Valid <span class="edit-button"><a href="resetPassword">(change)</a></span>
         </td>
     </tr>
     <tr>
@@ -151,6 +145,10 @@
             Approved, Active <span class="edit-button"><a href="#">(deactivate)</a></span>
         </td>
     </tr>
+    <tr>
+	<td>CLA:</td>
+	<td py:if='groups["cla_done"]'><img src='static/images/status_approved.png'/> <a href="#">(?)</a></td>
+    </tr>
 <!--    <tr>
         <td>Description:</td>
         <td>
@@ -176,19 +174,26 @@
 </table>
 
 <h2 id="your-account-header-roles">Your Roles</h2>
-<h3 class="your-account-role" py:for='group in groupsPending'>
-    <span class="account-role-team">${groupsPending[group].cn}</span>
-    <img src="static/images/status_incomplete.png"/>
-    <span class="edit-button"><a href="${tg.url('editGroup', groupName=groupsPending[group].cn)}">(edit)</a></span>
-</h3>
-
-<h3 class="your-account-role" py:for='group in groups'>
-    <span class="account-role-team">${groups[group].cn}</span>
-    <!--<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="${tg.url('editGroup', groupName=groups[group].cn)}"> (edit)</a></span>
-</h3>
+
+<h2 py:if="groupsPending">Pending</h2>
+<div id='gpShow' style='display: none'><a href='' onclick="blindDown('groupsPending'); fade('gpShow'); appear('gpHide'); return false;">Show</a></div>
+<div id='gpHide'><a href='' onclick="blindUp('groupsPending'); fade('gpHide'); appear('gpShow'); return false;">Hide</a></div>
+<div id='groupsPending'>
+    <ul class="tool-links">
+        <li py:for='group in groupsPending'><img src="static/images/status_incomplete.png"/> ${groupsPending[group].cn} <a href="${tg.url('editGroup', groupName=groupsPending[group].cn)}">(edit)</a></li>
+    </ul>
+</div>
+
+<h2 py:if="groups">Approved</h2>
+<div id='gShow'><a href='' onclick="blindDown('groups'); fade('gShow'); appear('gHide'); return false;">Show</a></div>
+<div id='gHide' style='display: none'><a href='' onclick="blindUp('groups'); fade('gHide'); appear('gShow'); return false;">Hide</a></div>
+<div id='groups' style='display: none'>
+    <ul class="tool-links">
+        <li py:for='group in groups'><img src="static/images/status_approved.png"/> ${groups[group].cn} <a href="${tg.url('editGroup', groupName=groups[group].cn)}">(edit)</a></li>
+    </ul>
+</div>
+<h2>Misc</h2>
+
 <table class="account-info your-account-role-info">
  <tbody>
   <tr>
@@ -201,7 +206,7 @@
    <td>
     <ul class="tool-links">
      <li><a href="listGroup">Apply for new group ...</a></li>
-     <li><a href="inviteMember">Invite a New Member ...</a></li>
+     <li><a href="invite">Invite a New Member ...</a></li>
      <li><a href="#">View All Pending Membership Requests ...</a></li>
     </ul>
    </td>


Index: editGroup.kid
===================================================================
RCS file: /cvs/fedora/accounts2/fas/fas/templates/editGroup.kid,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- editGroup.kid	14 Apr 2007 21:35:44 -0000	1.4
+++ editGroup.kid	26 Apr 2007 14:28:20 -0000	1.5
@@ -1,14 +1,16 @@
 <!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'">
+    py:extends="'master.kid'"
+    xmlns:mochi="MyUniqueMochiUri">
 
 <head>
  <style type="text/css">
- at import "/static/css/fas.css";
+ at import "/fas/static/css/fas.css";
+ at import '/fas/static/css/sortable_tables.css';
  </style>
 </head>
 <body>
-
+<script src="/fas/static/javascript/sortable_tables.js" type="text/javascript"></script>
 <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}'/>
@@ -35,8 +37,10 @@
         <input type='submit' name='action' value='apply'/>
     </form>
 </span>
-<table>
-    <tr><th>Username</th><th>Sponsor</th><th>Date Added</th><th>Approval</th><th>Role Type</th><!--<th>Domain</th>--><th py:if='me.fedoraRoleType == "administrator" or me.fedoraRoleType == "sponsor"'>Action</th></tr>
+<table id='sortable_table' class='datagrid'>
+    <thead>
+        <tr><th mochi:format="str">Username</th><th>Sponsor</th><th mochi:format="str">Date Added</th><th mochi:format="str">Approval</th><th>Role Type</th><!--<th>Domain</th>--><th py:if='me.fedoraRoleType == "administrator" or me.fedoraRoleType == "sponsor"'>Action</th><th></th></tr>
+    </thead>
     <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>


Index: groupList.kid
===================================================================
RCS file: /cvs/fedora/accounts2/fas/fas/templates/groupList.kid,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- groupList.kid	28 Mar 2007 18:54:59 -0000	1.3
+++ groupList.kid	26 Apr 2007 14:28:20 -0000	1.4
@@ -1,14 +1,17 @@
 <!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'">
+    py:extends="'master.kid'"
+    xmlns:mochi="MyUniqueMochiUri">
 
 <head>
  <style type="text/css">
- at import "/static/css/fas.css";
+ at import "/fas/static/css/fas.css";
+ at import '/fas/static/css/sortable_tables.css';
  </style>
 </head>
 <body>
 
+<script src="/fas/static/javascript/sortable_tables.js" type="text/javascript"></script>
 <h1>List (${search})</h1>
 
 <form method='GET'>
@@ -23,8 +26,10 @@
         <td><a href='?search=*'>All</a></td>
     </tr>
 </table>
-<table>
-    <tr><th>Group</th><th>Status</th></tr>
+<table id='sortable_table' class='datagrid'>
+    <thead>
+    <tr><th mochi:format="str">Group</th><th mochi:format='istr'>Status</th></tr>
+    </thead>
     <tr py:for="group in groups">
         <td>${groups[group].cn} <a href="editGroup?groupName=${groups[group].cn}">(edit)</a></td>
         <td align='center'>


Index: login.kid
===================================================================
RCS file: /cvs/fedora/accounts2/fas/fas/templates/login.kid,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- login.kid	4 Apr 2007 16:36:52 -0000	1.3
+++ login.kid	26 Apr 2007 14:28:20 -0000	1.4
@@ -102,6 +102,9 @@
                 <tr>
                     <td align='right'><a href='resetPassword'>Forgot Password?</a></td>
                 </tr>
+                <tr>
+                    <td align='right'><a href='signUp'>Sign Up</a></td>
+                </tr>
             </table>
 
             <input py:if="forward_url" type="hidden" name="forward_url"


Index: master.kid
===================================================================
RCS file: /cvs/fedora/accounts2/fas/fas/templates/master.kid,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- master.kid	14 Apr 2007 21:35:44 -0000	1.2
+++ master.kid	26 Apr 2007 14:28:20 -0000	1.3
@@ -15,8 +15,10 @@
         }
     </style>
     <style type="text/css" media="screen">
- at import "/static/css/style.css";
+ at import "/fas/static/css/style.css";
 </style>
+    <script src="/fas/static/javascript/MochiKit.js" type="text/javascript"></script>
+    <script src="/fas/static/javascript/New.js" type="text/javascript"></script>
 </head>
 
 <body py:match="item.tag=='{http://www.w3.org/1999/xhtml}body'" py:attrs="item.items()">
@@ -32,11 +34,13 @@
     </div>
     <div id="header"> </div>
     <div id="main_content">
-    <table><tr><td><a href='listGroup'>List Groups</a></td><td><a href='editAccount'>Edit Account</a></td><td><a href='listUser'>List Users</a></td><td><a href='#'>News</a></td></tr></table>
-    <div py:if="tg_flash" class="flash">
+    <div id="menu_items" py:if="not tg.identity.anonymous">
+        <table><tr><td><a href='listGroup'>List Groups</a></td><td><a href='editAccount'>Edit Account</a></td><td><a href='listUser'>List Users</a></td><td><a href='#'>News</a></td></tr></table>
+    </div>
+    <div py:if="tg_flash" class="flash" id='flashMessage'>
     <table class="account-info">
         <tr>
-            <th></th><td py:content='tg_flash'></td>
+            <th></th><td py:content='tg_flash'></td><td><a href='' onClick="squish('flashMessage'); return false;">(hide)</a></td>
         </tr>
     </table>
     </div>


Index: resetPassword.kid
===================================================================
RCS file: /cvs/fedora/accounts2/fas/fas/templates/resetPassword.kid,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- resetPassword.kid	4 Apr 2007 16:36:52 -0000	1.2
+++ resetPassword.kid	26 Apr 2007 14:28:20 -0000	1.3
@@ -4,7 +4,7 @@
 
 <head>
  <style type="text/css">
- at import "/static/css/fas.css";
+ at import "/fas/static/css/fas.css";
  </style>
 </head>
 <body>


Index: userList.kid
===================================================================
RCS file: /cvs/fedora/accounts2/fas/fas/templates/userList.kid,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- userList.kid	26 Mar 2007 15:11:18 -0000	1.1
+++ userList.kid	26 Apr 2007 14:28:20 -0000	1.2
@@ -1,13 +1,16 @@
 <!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'">
+    py:extends="'master.kid'"
+    xmlns:mochi="MyUniqueMochiUri">
 
 <head>
  <style type="text/css">
- at import "/static/css/fas.css";
+ at import "/fas/static/css/fas.css";
+ at import '/fas/static/css/sortable_tables.css';
  </style>
 </head>
 <body>
+<script src="/fas/static/javascript/sortable_tables.js" type="text/javascript"></script>
 
 <h1>List (${search})</h1>
 
@@ -23,9 +26,12 @@
         <td><a href='?search=*'>All</a></td>
     </tr>
 </table>
-<table>
+<table id='sortable_table' class='datagrid'>
+    <thead>
+        <tr><th mochi:format="str">Username</th></tr>
+    </thead>
     <tr py:for="item in printList">
-        <td>${item}<a href="editAccount?userName=${item}"> (edit)</a></td>
+        <td>${item} <a href="editAccount?userName=${item}">(edit)</a></td>
     </tr>
 </table>
 


Index: welcome.kid
===================================================================
RCS file: /cvs/fedora/accounts2/fas/fas/templates/welcome.kid,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- welcome.kid	28 Mar 2007 18:54:59 -0000	1.2
+++ welcome.kid	26 Apr 2007 14:28:20 -0000	1.3
@@ -8,11 +8,14 @@
 <body>
 
 
+Welcome to the Fedora Account System 2.  This system is not yet live so feel free to play around.  Just don't expect it to work. <br/>
+
 <br/><br/>
-<br/><a href='listGroup'>listGroup</a>
-<br/><a href='userList'>userList</a>
-<br/><a href='editAccount'>editAccount</a>
-<br/><a href='editGroup'>editGroup</a>
+
+<a href='login'>Log In</a><br/>
+<!--<a href='#'>New Account</a><br/>-->
+<a href='http://fedoraproject.org/wiki/Join'>Why Join?</a>
+
 
 </body>
 </html>

More information about the fedora-extras-commits mailing list