accounts2/fas/fas/templates editAccount.kid, 1.9, 1.10 editGroup.kid, 1.7, 1.8 master.kid, 1.4, 1.5 signUp.kid, 1.3, 1.4
Michael Patrick McGrath (mmcgrath)
fedora-extras-commits at redhat.com
Mon Apr 30 13:37:49 UTC 2007
Author: mmcgrath
Update of /cvs/fedora/accounts2/fas/fas/templates
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7136/fas/fas/templates
Modified Files:
editAccount.kid editGroup.kid master.kid signUp.kid
Log Message:
Major UI changes. Added help system. Added group prereq to ldap schema
Index: editAccount.kid
===================================================================
RCS file: /cvs/fedora/accounts2/fas/fas/templates/editAccount.kid,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- editAccount.kid 26 Apr 2007 19:35:50 -0000 1.9
+++ editAccount.kid 30 Apr 2007 13:37:45 -0000 1.10
@@ -19,15 +19,16 @@
<table class="account-info" id="your-account-basic-info">
<tbody>
<tr>
- <td>Account Name:</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>
+ <td>Account Name <a href='' onClick="displayHelp('cn'); return false;">(?)</a>:</td>
+ <td>${user.cn}</td>
</tr>
<tr>
- <td>Real Name:</td>
+ <td>Real Name <a href='' onClick="displayHelp('givenName'); return false;">(?)</a>:</td>
<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='userName' value='${user.cn}'/>
<input type='hidden' name='attribute' value='givenName'/>
<input type='text' name='value' value='${user.givenName}'/>
<a href='' onclick="cancelEdit('givenName'); return false;">(cancel)</a>
@@ -36,11 +37,12 @@
</td>
</tr>
<tr>
- <td>Email:</td>
+ <td>Email <a href='' onClick="displayHelp('mail'); return false;">(?)</a>:</td>
<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='userName' value='${user.cn}'/>
<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>
@@ -49,11 +51,12 @@
</td>
</tr>
<tr>
- <td>Bugzilla Email:</td>
+ <td>Bugzilla Email <a href='' onClick="displayHelp('fedoraPersonBugzillaMail'); return false;">(?)</a>:</td>
<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='userName' value='${user.cn}'/>
<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>
@@ -62,11 +65,12 @@
</td>
</tr>
<tr>
- <td>IRC Nick:</td>
+ <td>IRC Nick <a href='' onClick="displayHelp('fedoraPersonIrcNick'); return false;">(?)</a>:</td>
<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='userName' value='${user.cn}'/>
<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>
@@ -76,11 +80,12 @@
</tr>
<tr>
- <td>PGP Key:</td>
+ <td>PGP Key <a href='' onClick="displayHelp('fedoraPersonKeyId'); return false;">(?)</a>:</td>
<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='userName' value='${user.cn}'/>
<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>
@@ -90,11 +95,12 @@
</tr>
<tr>
- <td>Telephone Number:</td>
+ <td>Telephone Number <a href='' onClick="displayHelp('telephoneNumber'); return false;">(?)</a>:</td>
<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='userName' value='${user.cn}'/>
<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>
@@ -104,11 +110,12 @@
</tr>
<tr>
- <td>Postal Address:</td>
+ <td>Postal Address <a href='' onClick="displayHelp('postalAddress'); return false;">(?)</a>:</td>
<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='userName' value='${user.cn}'/>
<input type='hidden' name='attribute' value='postalAddress'/>
<textarea name='value'>${user.postalAddress}</textarea>
<input type='submit' value='submit'/>
@@ -119,11 +126,12 @@
</tr>
<tr>
- <td>Description:</td>
+ <td>Description <a href='' onClick="displayHelp('description'); return false;">(?)</a>:</td>
<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='userName' value='${user.cn}'/>
<input type='hidden' name='attribute' value='description'/>
<textarea name='value'>${user.description}</textarea>
<input type='submit' value='submit'/>
@@ -134,19 +142,19 @@
</tr>
<tr>
- <td>Password: </td>
+ <td>Password <a href='' onClick="displayHelp('password'); return false;">(?)</a>: </td>
<td><img src="static/images/status_approved.png" />
Valid <span class="edit-button"><a href="resetPassword">(change)</a></span>
</td>
</tr>
<tr>
- <td>Account Status:</td>
+ <td>Account Status <a href='' onClick="displayHelp('accountStatus'); return false;">(?)</a>:</td>
<td><img src="static/images/status_approved.png" />
Approved, Active <span class="edit-button"><a href="#">(deactivate)</a></span>
</td>
</tr>
<tr>
- <td>CLA:</td>
+ <td>CLA <a href='' onClick="displayHelp('cla'); return false;">(?)</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>
Index: editGroup.kid
===================================================================
RCS file: /cvs/fedora/accounts2/fas/fas/templates/editGroup.kid,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- editGroup.kid 27 Apr 2007 21:08:50 -0000 1.7
+++ editGroup.kid 30 Apr 2007 13:37:45 -0000 1.8
@@ -37,6 +37,11 @@
<tr><td>Self Removal</td><td>${group.fedoraGroupUserCanRemove}</td></tr>
<tr><td>fedoraGroupJoinMsg</td><td>${group.fedoraGroupJoinMsg}</td></tr>
</table>
+
+<h2 py:if='me.fedoraRoleStatus == "approved"'>Invite <a href='' onClick="displayHelp('inviteToGroup'); return false;">(?)</a></h2>
+<span py:if='me.fedoraRoleStatus == "approved"'>${searchUserForm(action='modifyGroup', value=value, method='get')}</span>
+
+
<h2>Members</h2>
<span>
<!-- <form action='modifyGroup'>
@@ -44,12 +49,11 @@
<input type='text' name='userName'/>
<input type='submit' name='action' value='apply'/>
</form>-->
-${searchUserForm.display(action='modifyGroup', value=value, method='get')}
</span>
<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>
+ <tr><th mochi:format="str">Username</th><th>Sponsor</th><th mochi:format="str">Date Added</th><th>Date Approved</th><th mochi:format="str">Approval</th><th>Role Type</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>
@@ -60,9 +64,11 @@
<td>${groups[user].fedoraRoleStatus}</td>
<td>${groups[user].fedoraRoleType}</td>
<!--<td>${groups[user].fedoraRoleDomain}</td>-->
+
+ <!-- This section includes all action items -->
<td py:if='me.fedoraRoleType == "administrator"'>
<a py:if="group.fedoraGroupNeedsSponsor.upper() == 'TRUE'" href="${tg.url('modifyGroup', groupName=groups[user].cn, userName=user, action='sponsor')}">Sponsor</a>
- <a py:if="not group.fedoraGroupNeedsSponsor.upper() == 'TRUE'" href="${tg.url('modifyGroup', groupName=groups[user].cn, userName=user, action='sponsor')}">Approve</a>
+ <a py:if="not group.fedoraGroupNeedsSponsor.upper() == 'TRUE' and groups[user].fedoraRoleStatus.lower() != 'approved'" href="${tg.url('modifyGroup', groupName=groups[user].cn, userName=user, action='sponsor')}">Approve</a>
<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> Suspend
Index: master.kid
===================================================================
RCS file: /cvs/fedora/accounts2/fas/fas/templates/master.kid,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- master.kid 26 Apr 2007 18:31:11 -0000 1.4
+++ master.kid 30 Apr 2007 13:37:45 -0000 1.5
@@ -26,7 +26,7 @@
<div id="head">
<h1><a href="/">Fedora</a></h1>
<div py:if="tg_flash" class="flash" id='flashMessage'>
- ${tg_flash}<a href='' onClick="squish('flashMessage'); return false;">(hide)</a>
+ ${tg_flash} <a href='' onClick="squish('flashMessage'); return false;">(hide)</a>
</div>
<div id="searchbox">
<form action="" method="get">
@@ -68,8 +68,8 @@
<li><a href="/">Return of the Son of Nav Item</a></li>
</ul>
</div>
- </div>
- </div>
+<!-- </div>
+ </div>-->
@@ -89,17 +89,33 @@
<a href="${tg.url('/logout')}">Logout</a>
</span>
</div>-->
- <div id="header"> </div>
- <div id="main_content">
+<!-- <div id="header"> </div>
+ <div id="main_content">-->
+ <div id='content'>
+ <div class="help" id='helpMessageMain' style='display: none'>
+ <div id='helpMessage'>
+ Help! What is interesting about this piece of help is that it's really long. I wonder if it will word wrap? That is so f'ing beautiful. You have NO idea.
+ </div>
+ <a href='' onClick="squish('helpMessageMain'); return false;">(hide)</a>
+
+ <script src="/fas/static/javascript/forms.js" type="text/javascript"></script>
+ </div>
+
+
+ <!--<div py:if="tg_flash" class="flash" id='flashMessage'>
+ ${tg_flash} <a href='' onClick="squish('flashMessage'); return false;">(hide)</a>
+ </div>-->
+
<div py:replace="[item.text]+item[:]"/>
- <!-- End of main_content -->
+ <!-- End of content -->
</div>
+ </div> <!-- End main -->
<div id="footer"> <img src="/static/images/under_the_hood_blue.png" alt="TurboGears under the hood" />
<p>TurboGears is a open source front-to-back web development
framework written in Python</p>
<p>Copyright © 2006 Kevin Dangoor</p>
</div>
+</div> <!-- End wrapper -->
</body>
-
</html>
Index: signUp.kid
===================================================================
RCS file: /cvs/fedora/accounts2/fas/fas/templates/signUp.kid,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- signUp.kid 27 Apr 2007 21:08:50 -0000 1.3
+++ signUp.kid 30 Apr 2007 13:37:45 -0000 1.4
@@ -10,7 +10,6 @@
</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 action='newAccountSubmit' method='post'>
More information about the scm-commits
mailing list