mirror of
https://salsa.debian.org/freeipa-team/freeipa.git
synced 2025-02-25 18:55:28 -06:00
UI cleanup
This commit is contained in:
Kevin McCarthy
parent
e9bd8dee3b
commit
50450d6acb
@ -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")
|
||||
|
||||
@ -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;
|
||||
}
|
||||
|
||||
@ -7,12 +7,5 @@
|
||||
</head>
|
||||
<body>
|
||||
Groups go here.
|
||||
<br />
|
||||
<br />
|
||||
<br />
|
||||
<br />
|
||||
<br />
|
||||
<br />
|
||||
<br />
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@ -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>
|
||||
|
||||
@ -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>
|
||||
|
||||
|
||||
@ -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>
|
||||
@ -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>
|
||||
@ -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>
|
||||
|
||||
@ -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>
|
||||
|
||||
@ -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>
|
||||
|
||||
@ -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>
|
||||
|
||||
@ -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">
|
||||
|
||||
@ -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>
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user