Infrastructure/fedora-infrastructure
1
0
Fork 0
Code Issues 70 Pull requests Projects Releases Packages Wiki Activity Actions

Formatting fix, update date/time display on group page.

Browse source
This commit is contained in:
Ricky Zhou (周家杰) 2007-12-05 08:55:43 -07:00
parent eedec5a531
commit 27712f599b
2 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
fas/fas/templates/group/view.html
View file

@ -65,9 +65,9 @@
<?python
from datetime import datetime
?>
<td>${datetime.utcfromtimestamp(float(groups[user].fedoraRoleCreationDate)).ctime()}</td>
<td py:if="groups[user].fedoraRoleApprovalDate.lower() == 'notapproved'">N/A</td>
<td py:if="groups[user].fedoraRoleApprovalDate.lower() != 'notapproved'">${datetime.utcfromtimestamp(float(groups[user].fedoraRoleApprovalDate)).ctime()}</td>
<td>${datetime.fromtimestamp(float(groups[user].fedoraRoleCreationDate))}</td>
<td py:if="groups[user].fedoraRoleApprovalDate.lower() == 'none'">${groups[user].fedoraRoleApprovalDate}</td>
<td py:if="groups[user].fedoraRoleApprovalDate.lower() != 'none'">${datetime.fromtimestamp(float(groups[user].fedoraRoleApprovalDate))}</td>
<td>${groups[user].fedoraRoleStatus}</td>
<td>${groups[user].fedoraRoleType}</td>
<!--<td>${groups[user].fedoraRoleDomain}</td>-->

18
fas/fas/templates/user/view.html
View file

@ -13,15 +13,15 @@
<h3>Account Details <a href="${tg.url('/user/edit/%s' % user.cn)}" py:if="personal or admin">(edit)</a></h3>
<div class="userbox">
<dl>
<dt>Account Name:</dt><dd>${user.cn}&nbsp;</dd>
<dt>Real Name:</dt><dd>${user.givenName}&nbsp;</dd>
<dt>Email:</dt><dd>${user.mail}&nbsp;</dd>
<dt>Bugzilla Email:</dt><dd>${user.fedoraPersonBugzillaMail}&nbsp;</dd>
<dt>IRC Nick:</dt><dd>${user.fedoraPersonIrcNick}&nbsp;</dd>
<dt>PGP Key:</dt><dd>${user.fedoraPersonKeyId}&nbsp;</dd>
<dt>Telephone Number:</dt><dd>${user.telephoneNumber}&nbsp;</dd>
<dt>Postal Address:</dt><dd>${user.postalAddress}&nbsp;</dd>
<dt>Description:</dt><dd>${user.description}&nbsp;</dd>
<dt>Account Name:</dt><dd>${user.cn}</dd>
<dt>Real Name:</dt><dd>${user.givenName}</dd>
<dt>Email:</dt><dd>${user.mail}</dd>
<dt>Bugzilla Email:</dt><dd>${user.fedoraPersonBugzillaMail}</dd>
<dt>IRC Nick:</dt><dd>${user.fedoraPersonIrcNick}</dd>
<dt>PGP Key:</dt><dd>${user.fedoraPersonKeyId}</dd>
<dt>Telephone Number:</dt><dd>${user.telephoneNumber}</dd>
<dt>Postal Address:</dt><dd>${user.postalAddress}</dd>
<dt>Description:</dt><dd>${user.description}</dd>
<dt>Password:</dt><dd><span class="approved">Valid</span> <a href="${tg.url('/user/changepass')}" py:if="personal">(change)</a></dd>
<dt>Account Status:</dt><dd><span class="approved">Approved</span>, Active</dd>
<dt>CLA:</dt><dd><span py:if="claDone" class="approved">Done</span><span py:if="not claDone" class="unapproved">Not Done (<a href="${tg.url('/cla')}">Sign it</a>!)</span></dd>