[Freeipa-devel] [PATCH] small ui tweeks
Kevin McCarthy
kmccarth at redhat.com
Thu Sep 6 00:01:28 UTC 2007
Small adjustments to the ui that started to add up, so broke into a
patch.
-Kevin
-------------- next part --------------
# HG changeset patch
# User Kevin McCarthy <kmccarth at redhat.com>
# Date 1189036795 25200
# Node ID fb7131394f05647904166312bb369b77f235a70d
# Parent 0e5e5b22b477e9147b810e63b1c7c02fa15ebc09
Small UI tweeks
- Rename buttons
- Add fake "logged in as" text
- Increase font size and spacing for sidebar
- Fix search messages for no results
- Open ipa footer link in new window
diff -r 0e5e5b22b477 -r fb7131394f05 ipa-server/ipa-gui/ipagui/controllers.py
--- a/ipa-server/ipa-gui/ipagui/controllers.py Wed Sep 05 15:54:04 2007 -0700
+++ b/ipa-server/ipa-gui/ipagui/controllers.py Wed Sep 05 16:59:55 2007 -0700
@@ -108,7 +108,7 @@ class Root(controllers.RootController):
def userupdate(self, **kw):
"""Updates an existing user"""
restrict_post()
- if kw.get('submit') == 'Cancel':
+ if kw.get('submit') == 'Cancel Edit':
turbogears.flash("Edit user cancelled")
raise turbogears.redirect('/usershow', uid=kw.get('uid'))
diff -r 0e5e5b22b477 -r fb7131394f05 ipa-server/ipa-gui/ipagui/static/css/style.css
--- a/ipa-server/ipa-gui/ipagui/static/css/style.css Wed Sep 05 15:54:04 2007 -0700
+++ b/ipa-server/ipa-gui/ipagui/static/css/style.css Wed Sep 05 16:59:55 2007 -0700
@@ -29,12 +29,20 @@ body {
margin:0;
}
+#header #logo {
+}
+
+#header #login {
+ float:right;
+}
+
#nav {
background:#cc0000;
color:#fff;
min-height:3px;
max-height:3px;
+ clear:both;
}
#nav ul {
@@ -75,7 +83,11 @@ body {
float:left;
width:10%;
padding: 5px;
- font-size: small;
+ font-size: medium;
+}
+
+#sidebar p {
+ line-height: 150%;
}
#sidebar h2 {
diff -r 0e5e5b22b477 -r fb7131394f05 ipa-server/ipa-gui/ipagui/templates/master.kid
--- a/ipa-server/ipa-gui/ipagui/templates/master.kid Wed Sep 05 15:54:04 2007 -0700
+++ b/ipa-server/ipa-gui/ipagui/templates/master.kid Wed Sep 05 16:59:55 2007 -0700
@@ -26,10 +26,15 @@
<div id="page">
<div id="header">
- <a href="${tg.url('/')}"><img
- src="${tg.url('/static/images/logo.png')}"
- border="0"
- /></a>
+ <div id="login">
+ Logged in as: ace
+ </div>
+ <div id="logo">
+ <a href="${tg.url('/')}"><img
+ src="${tg.url('/static/images/logo.png')}"
+ border="0"
+ /></a>
+ </div>
</div>
<div id="nav"><!--
@@ -38,21 +43,25 @@
<div id="sidebar">
<h2>Tasks</h2>
+ <p>
<a href="${tg.url('/usernew')}">Add Person</a><br/>
<a href="${tg.url('/userlist')}">Find People</a><br/>
- <br />
+ </p>
+ <p>
<a href="${tg.url('/groupindex')}">Add Group</a><br/>
<a href="${tg.url('/groupindex')}">Find Groups</a><br/>
- <br />
+ </p>
+ <p>
<a href="${tg.url('/')}">Manage Policy</a><br/>
<a href="${tg.url('/')}">Self Service</a><br/>
+ </p>
</div>
<div py:replace="[item.text]+item[:]"></div>
<div id="footer">
- <a href="http://www.freeipa.com/">Powered by FreeIPA</a>
+ <a href="http://www.freeipa.com/" target="_blank">Powered by FreeIPA</a>
</div>
</div>
diff -r 0e5e5b22b477 -r fb7131394f05 ipa-server/ipa-gui/ipagui/templates/usereditform.kid
--- a/ipa-server/ipa-gui/ipagui/templates/usereditform.kid Wed Sep 05 15:54:04 2007 -0700
+++ b/ipa-server/ipa-gui/ipagui/templates/usereditform.kid Wed Sep 05 16:59:55 2007 -0700
@@ -158,11 +158,13 @@
<tr>
<th>
<br />
- <input type="submit" class="submitbutton" name="submit" value="Submit"/>
+ <input type="submit" class="submitbutton" name="submit"
+ value="Update Person"/>
</th>
<td>
<br />
- <input type="submit" class="submitbutton" name="submit" value="Cancel" />
+ <input type="submit" class="submitbutton" name="submit"
+ value="Cancel Edit" />
</td>
<td></td>
</tr>
diff -r 0e5e5b22b477 -r fb7131394f05 ipa-server/ipa-gui/ipagui/templates/userlist.kid
--- a/ipa-server/ipa-gui/ipagui/templates/userlist.kid Wed Sep 05 15:54:04 2007 -0700
+++ b/ipa-server/ipa-gui/ipagui/templates/userlist.kid Wed Sep 05 16:59:55 2007 -0700
@@ -6,20 +6,18 @@
<title>Find People</title>
</head>
<body>
- <h2>Find People</h2>
<div id="search">
<form action="${tg.url('/userlist')}" method="post">
- Search:
<input id="uid" type="text" name="uid" value="${uid}" />
- <input type="submit" />
+ <input type="submit" value="Find People"/>
</form>
<script type="text/javascript">
document.getElementById("uid").focus();
</script>
</div>
- <div py:if='users != None'>
+ <div py:if='(users != None) and (len(users) > 0)'>
<h2>${len(users)} results returned:</h2>
- <table id="resultstable" py:if='len(users) > 0'>
+ <table id="resultstable">
<tr>
<th>
<label class="fieldlabel" py:content="fields.uid.label" />
@@ -61,9 +59,9 @@
</td>
</tr>
</table>
- <div py:if='len(users) == 0'>
- No results found.
- </div>
+ </div>
+ <div py:if='(users != None) and (len(users) == 0)'>
+ <h2>No results found for "${uid}"</h2>
</div>
</body>
</html>
diff -r 0e5e5b22b477 -r fb7131394f05 ipa-server/ipa-gui/ipagui/templates/usernewform.kid
--- a/ipa-server/ipa-gui/ipagui/templates/usernewform.kid Wed Sep 05 15:54:04 2007 -0700
+++ b/ipa-server/ipa-gui/ipagui/templates/usernewform.kid Wed Sep 05 16:59:55 2007 -0700
@@ -167,15 +167,11 @@
<table class="formtable" cellpadding="2" cellspacing="0" border="0">
<tr>
- <th>
- <br />
- <input type="submit" class="submitbutton" name="submit" value="Submit"/>
- </th>
+ <th></th>
<td>
<br />
- <input type="submit" class="submitbutton" name="submit" value="Cancel" />
+ <input type="submit" class="submitbutton" name="submit" value="Add Person"/>
</td>
- <td></td>
</tr>
</table>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/x-pkcs7-signature
Size: 2228 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/freeipa-devel/attachments/20070905/e86cce83/attachment.bin>
More information about the Freeipa-devel
mailing list