IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2024-12-28 01:41:14 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge with head.

Browse Source
This commit is contained in:
Karl MacMillan 0001-01-01 00:00:00 +00:00
commit 4718fc6dff
6 changed files with 32 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ipa-server/ipa-gui/ipagui/static/css/style.css
View File

@ -255,3 +255,18 @@ div.resize-handle {
left:0;
}
/*
* Overrides for printing
*/
@media print {
#header { display:none; }
#nav { display:none; }
#sidebar { display:none; }
#footer { display:none; }
#main_content { width: 95%; margin:0; padding:0; border-left-style: none; }
.submitbutton { display:none; }
.deletebutton { display:none; }
}

8
ipa-server/ipa-gui/ipagui/subcontrollers/ipacontroller.py
View File

@ -32,19 +32,19 @@ class IPAController(controllers.Controller):
def sort_group_member(self, a, b):
"""Comparator function used for sorting group members."""
if a.getValue('uid') and b.getValue('uid'):
if a.getValue('givenname') == b.getValue('givenname'):
if a.getValue('sn') == b.getValue('sn'):
if a.getValue('sn') == b.getValue('sn'):
if a.getValue('givenName') == b.getValue('givenName'):
if a.getValue('uid') == b.getValue('uid'):
return 0
elif a.getValue('uid') < b.getValue('uid'):
return -1
else:
return 1
elif a.getValue('sn') < b.getValue('sn'):
elif a.getValue('givenName') < b.getValue('givenName'):
return -1
else:
return 1
elif a.getValue('givenname') < b.getValue('givenname'):
elif a.getValue('sn') < b.getValue('sn'):
return -1
else:
return 1

2
ipa-server/ipa-gui/ipagui/templates/delegateedit.kid
View File

@ -10,7 +10,7 @@
<h2>Edit Delegation</h2>
${form.display(action=tg.url("/delegate/update"), value=delegate,
actionname='Edit')}
actionname='Update')}
</body>
</html>

4
ipa-server/ipa-gui/ipagui/templates/delegateform.kid
View File

@ -71,7 +71,7 @@
value="Cancel ${actionname}"/>
<br/><br/>
</td>
<td py:if='actionname == "Edit"'>
<td py:if='actionname == "Update"'>
&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
<input type="button" class="deletebutton"
value="Delete Delegation"
@ -179,7 +179,7 @@
<input type="submit" class="submitbutton" name="submit"
value="Cancel ${actionname}"/>
</td>
<td py:if='actionname == "Edit"'>
<td py:if='actionname == "Update"'>
<br/>
&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
<input type="button" class="deletebutton"

2
ipa-server/ipa-gui/ipagui/templates/master.kid
View File

@ -6,7 +6,7 @@
<meta content="text/html; charset=UTF-8" http-equiv="content-type" py:replace="''"/>
<title py:replace="''">Your title goes here</title>
<meta py:replace="item[:]"/>
<style type="text/css" media="screen">
<style type="text/css" media="all">
@import "${tg.url('/static/css/style.css')}";
</style>
<script type="text/javascript" charset="utf-8" src="${tg.url('/static/javascript/prototype.js')}"></script>

14
ipa-server/ipa-gui/ipagui/templates/usershow.kid
View File

@ -248,15 +248,19 @@ else:
<th>
<label class="fieldlabel" py:content="fields.labeleduri.label" />:
</th>
<td>${user.get("labeleduri")}</td>
<td>
<a href="${user.get('labeleduri')}">${user.get('labeleduri')}</a>
</td>
</tr>
</table>
<div class="formsection" py:if='len(user_reports) &gt; 0'>Direct Reports</div>
<div py:for="report in user_reports">
<a href="${tg.url('/user/show', uid=report.uid)}"
>${report.givenname} ${report.sn}</a>
</div>
<ol>
<li py:for="report in user_reports">
<a href="${tg.url('/user/show', uid=report.uid)}"
>${report.givenname} ${report.sn}</a>
</li>
</ol>
<div class="formsection">Groups</div>
<div py:for="group in user_groups">