diff options
author | Kevin McCarthy <kmccarth@redhat.com> | 2007-08-29 16:49:46 -0700 |
---|---|---|
committer | Kevin McCarthy <kmccarth@redhat.com> | 2007-08-29 16:49:46 -0700 |
commit | 50450d6acb6f79f46aec531a8d8832a45e77ddee (patch) | |
tree | 7e5bfdff7eaf895ed27b7c61bb7c3506cdece055 | |
parent | e9bd8dee3b0350c08d16d57bfd008a72cb283c48 (diff) | |
download | freeipa-50450d6acb6f79f46aec531a8d8832a45e77ddee.tar.gz freeipa-50450d6acb6f79f46aec531a8d8832a45e77ddee.tar.xz freeipa-50450d6acb6f79f46aec531a8d8832a45e77ddee.zip |
UI cleanup
-rw-r--r-- | ipa-server/ipa-gui/ipagui/controllers.py | 4 | ||||
-rw-r--r-- | ipa-server/ipa-gui/ipagui/static/css/style.css | 74 | ||||
-rw-r--r-- | ipa-server/ipa-gui/ipagui/templates/groupindex.kid | 7 | ||||
-rw-r--r-- | ipa-server/ipa-gui/ipagui/templates/grouplayout.kid | 7 | ||||
-rw-r--r-- | ipa-server/ipa-gui/ipagui/templates/master.kid | 27 | ||||
-rw-r--r-- | ipa-server/ipa-gui/ipagui/templates/resindex.kid | 18 | ||||
-rw-r--r-- | ipa-server/ipa-gui/ipagui/templates/reslayout.kid | 22 | ||||
-rw-r--r-- | ipa-server/ipa-gui/ipagui/templates/useredit.kid | 4 | ||||
-rw-r--r-- | ipa-server/ipa-gui/ipagui/templates/userlayout.kid | 7 | ||||
-rw-r--r-- | ipa-server/ipa-gui/ipagui/templates/userlist.kid | 15 | ||||
-rw-r--r-- | ipa-server/ipa-gui/ipagui/templates/usernew.kid | 4 | ||||
-rw-r--r-- | ipa-server/ipa-gui/ipagui/templates/usershow.kid | 4 | ||||
-rw-r--r-- | ipa-server/ipa-gui/ipagui/templates/welcome.kid | 6 |
13 files changed, 86 insertions, 113 deletions
diff --git a/ipa-server/ipa-gui/ipagui/controllers.py b/ipa-server/ipa-gui/ipagui/controllers.py index ebd0b20d6..d767f2686 100644 --- a/ipa-server/ipa-gui/ipagui/controllers.py +++ b/ipa-server/ipa-gui/ipagui/controllers.py @@ -148,13 +148,13 @@ class Root(controllers.RootController): counter = users[0] users = users[1:] if counter == -1: - turbogears.flash("These results are truncated.\n" + + turbogears.flash("These results are truncated.<br />" + "Please refine your search and try again.") except ipaerror.IPAError, e: turbogears.flash("User list failed: " + str(e)) raise turbogears.redirect("/userlist") - return dict(users=users, fields=forms.user.UserFields()) + return dict(users=users, uid=uid, fields=forms.user.UserFields()) @expose("ipagui.templates.usershow") diff --git a/ipa-server/ipa-gui/ipagui/static/css/style.css b/ipa-server/ipa-gui/ipagui/static/css/style.css index 152175e1f..3c260c21b 100644 --- a/ipa-server/ipa-gui/ipagui/static/css/style.css +++ b/ipa-server/ipa-gui/ipagui/static/css/style.css @@ -33,7 +33,8 @@ body { #nav { background:#cc0000; color:#fff; - padding:5px; + min-height:3px; + max-height:3px; } #nav ul { @@ -58,15 +59,14 @@ body { background:#fff; float:right; width:85%; + min-height:500px; border-left: 1px solid #000; - padding-left: 15px; - padding-bottom: 15px; -/* color: black; - font-size: 127%; - background-color: white; - margin: 0 auto 0 auto; padding: 10px; - float: left; */ +} + +#main_content h1,h2 { + margin-top: 0px; + margin-bottom: 5px; } @@ -74,12 +74,8 @@ body { background:#ccc; /* should be same as #page */ float:left; width:10%; - /* border: 1px solid #aaa; - background-color: #eee; - margin: 0.5em; - padding: 1em; - float: left; - font-size: 88%; */ + padding: 5px; + font-size: small; } #sidebar h2 { @@ -91,17 +87,25 @@ body { padding-left: 0; } +#sidebar a:visited, +#sidebar a:link { + color:#000; +} + #footer { background:#fff; clear:both; border-top: 1px solid #000; - /* color: #999; - background-color: white; - padding: 10px; - font-size: 80%; + padding-top: 10px; text-align: center; - margin: 0 auto 1em auto; */ + font-size: x-small; +} + +#footer a:visited, +#footer a:link { + color:#777; + text-decoration: none; } @@ -129,26 +133,32 @@ body { #status_block { margin: 0 auto 0.5em auto; padding: 15px 10px 15px 55px; - background: #cec; - border: 1px solid #9c9; + background: #ecc; + border: 1px solid #c99; width: 450px; font-size: 120%; font-weight: bolder; } -.notice { - margin: 0.5em auto 0.5em auto; - padding: 15px 10px 15px 55px; - width: 450px; - background: #eef URL('../images/info.png') left center no-repeat; - border: 1px solid #cce; -} - .fielderror { - color: red; - font-weight: bold; + color: red; + font-weight: bold; } .requiredfield { - background: #eebbbb; + background: #eebbbb; +} + +#resultstable, +#resultstable th, +#resultstable td { + border-collapse: collapse; + border-style: solid; + border-width: 1px; + margin: 0px; + padding: 5px; +} + +#resultstable th { + background: #eee; } diff --git a/ipa-server/ipa-gui/ipagui/templates/groupindex.kid b/ipa-server/ipa-gui/ipagui/templates/groupindex.kid index 0bb70ac9a..84a138468 100644 --- a/ipa-server/ipa-gui/ipagui/templates/groupindex.kid +++ b/ipa-server/ipa-gui/ipagui/templates/groupindex.kid @@ -7,12 +7,5 @@ </head> <body> Groups go here. - <br /> - <br /> - <br /> - <br /> - <br /> - <br /> - <br /> </body> </html> diff --git a/ipa-server/ipa-gui/ipagui/templates/grouplayout.kid b/ipa-server/ipa-gui/ipagui/templates/grouplayout.kid index af05a8082..edaf716e9 100644 --- a/ipa-server/ipa-gui/ipagui/templates/grouplayout.kid +++ b/ipa-server/ipa-gui/ipagui/templates/grouplayout.kid @@ -6,17 +6,18 @@ <body py:match="item.tag=='{http://www.w3.org/1999/xhtml}body'" py:attrs="item.items()"> <div id="main_content"> - <div id="status_block" class="flash" py:if="value_of('tg_flash', None)" py:content="tg_flash"></div> + <div id="status_block" py:if="value_of('tg_flash', None)" + py:content="XML(tg_flash)"></div> <div py:replace="[item.text]+item[:]"></div> </div> - <div id="sidebar"> +<!-- <div id="sidebar"> <h2>Tools</h2> <a href="${tg.url('/groupindex')}">Add Group</a><br/> <a href="${tg.url('/groupindex')}">Find Group</a><br/> <a href="${tg.url('/groupindex')}">List Groups</a><br/> - </div> + </div> --> </body> </html> diff --git a/ipa-server/ipa-gui/ipagui/templates/master.kid b/ipa-server/ipa-gui/ipagui/templates/master.kid index a1979df09..8e8d26551 100644 --- a/ipa-server/ipa-gui/ipagui/templates/master.kid +++ b/ipa-server/ipa-gui/ipagui/templates/master.kid @@ -25,22 +25,33 @@ <div id="page"> <div id="header"> - <h1>Free IPA</h1> + <a href="${tg.url('/')}"><img + src="${tg.url('/static/images/logo.png')}" + border="0" + /></a> </div> - <div id="nav"> - <ul> - <li><a href="${tg.url('/userindex')}">Users</a></li> - <li><a href="${tg.url('/groupindex')}">Groups</a></li> - <li><a href="${tg.url('/resindex')}">Resources</a></li> - </ul> + <div id="nav"><!-- + This used to have links. Keeping around in case we move them back... + --></div> + + <div id="sidebar"> + <h2>Tasks</h2> + <a href="${tg.url('/usernew')}">Add Person</a><br/> + <a href="${tg.url('/userlist')}">Find People</a><br/> + <br /> + <a href="${tg.url('/groupindex')}">Add Group</a><br/> + <a href="${tg.url('/groupindex')}">Find Groups</a><br/> + <br /> + <a href="${tg.url('/')}">Manage Policy</a><br/> + <a href="${tg.url('/')}">Self Service</a><br/> </div> <div py:replace="[item.text]+item[:]"></div> <div id="footer"> - This is the footer + <a href="http://www.freeipa.com/">Powered by FreeIPA</a> </div> </div> diff --git a/ipa-server/ipa-gui/ipagui/templates/resindex.kid b/ipa-server/ipa-gui/ipagui/templates/resindex.kid deleted file mode 100644 index 5cd06f7eb..000000000 --- a/ipa-server/ipa-gui/ipagui/templates/resindex.kid +++ /dev/null @@ -1,18 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xmlns:py="http://purl.org/kid/ns#" - py:extends="'reslayout.kid'"> -<head> -<meta content="text/html; charset=utf-8" http-equiv="Content-Type" py:replace="''"/> -<title>Resource Listing</title> -</head> -<body> - Resources go here. - <br /> - <br /> - <br /> - <br /> - <br /> - <br /> - <br /> -</body> -</html> diff --git a/ipa-server/ipa-gui/ipagui/templates/reslayout.kid b/ipa-server/ipa-gui/ipagui/templates/reslayout.kid deleted file mode 100644 index 5b9b35c12..000000000 --- a/ipa-server/ipa-gui/ipagui/templates/reslayout.kid +++ /dev/null @@ -1,22 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xmlns:py="http://purl.org/kid/ns#" - py:extends="'master.kid'"> -<head> -</head> - -<body py:match="item.tag=='{http://www.w3.org/1999/xhtml}body'" py:attrs="item.items()"> - <div id="main_content"> - <div id="status_block" class="flash" py:if="value_of('tg_flash', None)" py:content="tg_flash"></div> - - <div py:replace="[item.text]+item[:]"></div> - </div> - - <div id="sidebar"> - <h2>Tools</h2> - <a href="${tg.url('/resindex')}">Add Resource</a><br/> - <a href="${tg.url('/resindex')}">Find Resource</a><br/> - <a href="${tg.url('/resindex')}">List Resources</a><br/> - </div> -</body> - -</html> diff --git a/ipa-server/ipa-gui/ipagui/templates/useredit.kid b/ipa-server/ipa-gui/ipagui/templates/useredit.kid index 781ff7ff1..db47ab298 100644 --- a/ipa-server/ipa-gui/ipagui/templates/useredit.kid +++ b/ipa-server/ipa-gui/ipagui/templates/useredit.kid @@ -3,10 +3,10 @@ py:extends="'userlayout.kid'"> <head> <meta content="text/html; charset=utf-8" http-equiv="Content-Type" py:replace="''"/> -<title>Edit a Person</title> +<title>Edit Person</title> </head> <body> - <h2>Edit User</h2> + <h2>Edit Person</h2> ${form.display(action="userupdate", value=user)} </body> diff --git a/ipa-server/ipa-gui/ipagui/templates/userlayout.kid b/ipa-server/ipa-gui/ipagui/templates/userlayout.kid index c49db5468..ecd49f3b9 100644 --- a/ipa-server/ipa-gui/ipagui/templates/userlayout.kid +++ b/ipa-server/ipa-gui/ipagui/templates/userlayout.kid @@ -6,16 +6,17 @@ <body py:match="item.tag=='{http://www.w3.org/1999/xhtml}body'" py:attrs="item.items()"> <div id="main_content"> - <div id="status_block" class="flash" py:if="value_of('tg_flash', None)" py:content="tg_flash"></div> + <div id="status_block" py:if="value_of('tg_flash', None)" + py:content="XML(tg_flash)"></div> <div py:replace="[item.text]+item[:]"></div> </div> - <div id="sidebar"> +<!-- <div id="sidebar"> <h2>Tools</h2> <a href="${tg.url('/usernew')}">Add Person</a><br/> <a href="${tg.url('/userlist')}">Find People</a><br/> - </div> + </div> --> </body> </html> diff --git a/ipa-server/ipa-gui/ipagui/templates/userlist.kid b/ipa-server/ipa-gui/ipagui/templates/userlist.kid index c3b53272e..de4c4eb2f 100644 --- a/ipa-server/ipa-gui/ipagui/templates/userlist.kid +++ b/ipa-server/ipa-gui/ipagui/templates/userlist.kid @@ -3,19 +3,23 @@ py:extends="'userlayout.kid'"> <head> <meta content="text/html; charset=utf-8" http-equiv="Content-Type" py:replace="''"/> -<title>User Listing</title> +<title>Find People</title> </head> <body> + <h2>Find People</h2> <div id="search"> <form action="${tg.url('/userlist')}" method="post"> Search: - <input type="text" name="uid" /> + <input id="uid" type="text" name="uid" value="${uid}" /> <input type="submit" /> </form> + <script type="text/javascript"> + document.getElementById("uid").focus(); + </script> </div> <div py:if='users != None'> <h2>${len(users)} results returned:</h2> - <table py:if='len(users) > 0' border="1"> + <table id="resultstable" py:if='len(users) > 0'> <tr> <th> <label class="fieldlabel" py:content="fields.uid.label" /> @@ -61,10 +65,5 @@ No results found. </div> </div> - - <!-- fix for visual artifact of my crappy ui --> - <div> - <br /><br /><br /><br /> - </div> </body> </html> diff --git a/ipa-server/ipa-gui/ipagui/templates/usernew.kid b/ipa-server/ipa-gui/ipagui/templates/usernew.kid index 84b6029ae..37f5bb449 100644 --- a/ipa-server/ipa-gui/ipagui/templates/usernew.kid +++ b/ipa-server/ipa-gui/ipagui/templates/usernew.kid @@ -3,10 +3,10 @@ py:extends="'userlayout.kid'"> <head> <meta content="text/html; charset=utf-8" http-equiv="Content-Type" py:replace="''"/> - <title>Add a Person</title> + <title>Add Person</title> </head> <body> - <h2>Add New User</h2> + <h2>Add Person</h2> ${form.display(action="usercreate")} </body> diff --git a/ipa-server/ipa-gui/ipagui/templates/usershow.kid b/ipa-server/ipa-gui/ipagui/templates/usershow.kid index 6d3fd5bb6..c21ff12bb 100644 --- a/ipa-server/ipa-gui/ipagui/templates/usershow.kid +++ b/ipa-server/ipa-gui/ipagui/templates/usershow.kid @@ -3,10 +3,10 @@ py:extends="'userlayout.kid'"> <head> <meta content="text/html; charset=utf-8" http-equiv="Content-Type" py:replace="''"/> - <title>View a Person</title> + <title>View Person</title> </head> <body> - <h2>View User</h2> + <h2>View Person</h2> <div class="formsection">Account Details</div> <table class="formtable" cellpadding="2" cellspacing="0" border="0"> diff --git a/ipa-server/ipa-gui/ipagui/templates/welcome.kid b/ipa-server/ipa-gui/ipagui/templates/welcome.kid index dc08c0b32..402468be7 100644 --- a/ipa-server/ipa-gui/ipagui/templates/welcome.kid +++ b/ipa-server/ipa-gui/ipagui/templates/welcome.kid @@ -6,11 +6,9 @@ <title>Welcome</title> </head> <body> - <div id="sidebar"> - <h2>Tools</h2> - </div> <div id="main_content"> - <div id="status_block" class="flash" py:if="value_of('tg_flash', None)" py:content="tg_flash"></div> + <div id="status_block" py:if="value_of('tg_flash', None)" + py:content="XML(tg_flash)"></div> <h1>Welcome to Free IPA</h1> </div> |