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

Minor formatting changes.

Browse source
This commit is contained in:
Ricky Zhou (周家杰) 2007-11-29 17:09:28 -07:00
parent a2ee4a5ec5
commit bc2fc31e3f
4 changed files with 25 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
fas/fas/static/css/style.css
View file

@ -225,7 +225,7 @@ a
.userbox dd .userbox dd
{ {
margin-left: 22ex; margin-left: 24ex;
} }
.account .account

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

@ -62,7 +62,10 @@
<td><a href="${tg.url('/user/view/%s' % user)}">${user}</a></td> <td><a href="${tg.url('/user/view/%s' % user)}">${user}</a></td>
<td py:if='not(groups[user].fedoraRoleSponsor == "None")'><a href="${tg.url('/user/view/%s' % groups[user].fedoraRoleSponsor)}">${groups[user].fedoraRoleSponsor}</a></td> <td py:if='not(groups[user].fedoraRoleSponsor == "None")'><a href="${tg.url('/user/view/%s' % groups[user].fedoraRoleSponsor)}">${groups[user].fedoraRoleSponsor}</a></td>
<td py:if='groups[user].fedoraRoleSponsor == "None"'>None</td> <td py:if='groups[user].fedoraRoleSponsor == "None"'>None</td>
<td>${groups[user].fedoraRoleCreationDate}</td> <?python
from datetime import datetime
?>
<td>${datetime.utcfromtimestamp(groups[user].fedoraRoleCreationDate).ctime()}</td>
<td>${groups[user].fedoraRoleApprovalDate}</td> <td>${groups[user].fedoraRoleApprovalDate}</td>
<td>${groups[user].fedoraRoleStatus}</td> <td>${groups[user].fedoraRoleStatus}</td>
<td>${groups[user].fedoraRoleType}</td> <td>${groups[user].fedoraRoleType}</td>

5
fas/fas/templates/home.html
View file

@ -13,6 +13,11 @@
<tr><th>Build</th><th>Build Date</th></tr> <tr><th>Build</th><th>Build Date</th></tr>
</thead> </thead>
<!--<tr><td>Koji</td><td><a href="${builds.userLink}">Build Info</a></td></tr>--> <!--<tr><td>Koji</td><td><a href="${builds.userLink}">Build Info</a></td></tr>-->
<tr py:if="not builds.builds" style="text-align: center;">
<td colspan="2">
None
</td>
</tr>
<tr py:for="build in builds.builds"> <tr py:for="build in builds.builds">
<td> <td>
<span py:if="'complete' in builds.builds[build]['title']" class="approved"><a href="${build}">${builds.builds[build]['title']}</a></span> <span py:if="'complete' in builds.builds[build]['title']" class="approved"><a href="${build}">${builds.builds[build]['title']}</a></span>

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

@ -13,18 +13,18 @@
<h3>Account Details <a href="${tg.url('/user/edit/%s' % user.cn)}" py:if="personal or admin">(edit)</a></h3> <h3>Account Details <a href="${tg.url('/user/edit/%s' % user.cn)}" py:if="personal or admin">(edit)</a></h3>
<div class="userbox"> <div class="userbox">
<dl> <dl>
<dt>Account Name</dt><dd>${user.cn}&nbsp;</dd> <dt>Account Name:</dt><dd>${user.cn}&nbsp;</dd>
<dt>Real Name</dt><dd>${user.givenName}&nbsp;</dd> <dt>Real Name:</dt><dd>${user.givenName}&nbsp;</dd>
<dt>Email</dt><dd>${user.mail}&nbsp;</dd> <dt>Email:</dt><dd>${user.mail}&nbsp;</dd>
<dt>Bugzilla Email</dt><dd>${user.fedoraPersonBugzillaMail}&nbsp;</dd> <dt>Bugzilla Email:</dt><dd>${user.fedoraPersonBugzillaMail}&nbsp;</dd>
<dt>IRC Nick</dt><dd>${user.fedoraPersonIrcNick}&nbsp;</dd> <dt>IRC Nick:</dt><dd>${user.fedoraPersonIrcNick}&nbsp;</dd>
<dt>PGP Key</dt><dd>${user.fedoraPersonKeyId}&nbsp;</dd> <dt>PGP Key:</dt><dd>${user.fedoraPersonKeyId}&nbsp;</dd>
<dt>Telephone Number</dt><dd>${user.telephoneNumber}&nbsp;</dd> <dt>Telephone Number:</dt><dd>${user.telephoneNumber}&nbsp;</dd>
<dt>Postal Address</dt><dd>${user.postalAddress}&nbsp;</dd> <dt>Postal Address:</dt><dd>${user.postalAddress}&nbsp;</dd>
<dt>Description</dt><dd>${user.description}&nbsp;</dd> <dt>Description:</dt><dd>${user.description}&nbsp;</dd>
<dt>Password</dt><dd><span class="approved">Valid</span> <a href="${tg.url('/user/changepass')}" py:if="personal">(change)</a></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>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</span></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>
</dl> </dl>
</div> </div>
<h3 py:if="personal">Your Roles</h3> <h3 py:if="personal">Your Roles</h3>
@ -33,14 +33,16 @@
<li py:for="group in sorted(groups.keys())"><span class="team approved">${groupdata[group].fedoraGroupDesc} (${group})</span></li> <li py:for="group in sorted(groups.keys())"><span class="team approved">${groupdata[group].fedoraGroupDesc} (${group})</span></li>
<li py:for="group in sorted(groupsPending.keys())"><span class="team unapproved">${groupdata[group].fedoraGroupDesc} (${group})</span></li> <li py:for="group in sorted(groupsPending.keys())"><span class="team unapproved">${groupdata[group].fedoraGroupDesc} (${group})</span></li>
</ul> </ul>
<!--
<ul class="actions" py:if="personal"> <ul class="actions" py:if="personal">
<li><a href="${tg.url('/group/list/A*')}">(Join another project)</a></li> <li><a href="${tg.url('/group/list/A*')}">(Join another project)</a></li>
<li><a href="/">(Create a new project)</a></li> <li><a href="/">(Create a new project)</a></li>
</ul> </ul>
-->
<ul id="rolespanel" py:if="personal"> <ul id="rolespanel" py:if="personal">
<li py:for="group in sorted(groups.keys())" class="role"> <li py:for="group in sorted(groups.keys())" class="role">
<div py:if="auth.canViewGroup(user.cn, group)" py:strip=""> <div py:if="auth.canViewGroup(user.cn, group)" py:strip="">
<h4>${groupdata[group].fedoraGroupDesc}</h4>, ${groups[group].fedoraRoleType} <h4>${groupdata[group].fedoraGroupDesc}</h4> (${groups[group].fedoraRoleType})
<dl> <dl>
<dt>Status:</dt> <dt>Status:</dt>
<dd> <dd>