summaryrefslogtreecommitdiffstats
path: root/ipa-server/ipa-gui/ipagui/templates
diff options
context:
space:
mode:
Diffstat (limited to 'ipa-server/ipa-gui/ipagui/templates')
-rw-r--r--ipa-server/ipa-gui/ipagui/templates/groupindex.kid7
-rw-r--r--ipa-server/ipa-gui/ipagui/templates/grouplayout.kid7
-rw-r--r--ipa-server/ipa-gui/ipagui/templates/master.kid27
-rw-r--r--ipa-server/ipa-gui/ipagui/templates/resindex.kid18
-rw-r--r--ipa-server/ipa-gui/ipagui/templates/reslayout.kid22
-rw-r--r--ipa-server/ipa-gui/ipagui/templates/useredit.kid4
-rw-r--r--ipa-server/ipa-gui/ipagui/templates/userlayout.kid7
-rw-r--r--ipa-server/ipa-gui/ipagui/templates/userlist.kid45
-rw-r--r--ipa-server/ipa-gui/ipagui/templates/usernew.kid4
-rw-r--r--ipa-server/ipa-gui/ipagui/templates/usershow.kid4
-rw-r--r--ipa-server/ipa-gui/ipagui/templates/welcome.kid6
11 files changed, 69 insertions, 82 deletions
diff --git a/ipa-server/ipa-gui/ipagui/templates/groupindex.kid b/ipa-server/ipa-gui/ipagui/templates/groupindex.kid
index 0bb70ac9..84a13846 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 af05a808..edaf716e 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 a1979df0..8e8d2655 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 5cd06f7e..00000000
--- 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 5b9b35c1..00000000
--- 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 781ff7ff..db47ab29 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 c49db546..ecd49f3b 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 df3e247e..de4c4eb2 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 by login/name:
- <input type="text" name="uid" />
+ Search:
+ <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>Results</h2>
- <table py:if='len(users) > 0'>
+ <h2>${len(users)} results returned:</h2>
+ <table id="resultstable" py:if='len(users) > 0'>
<tr>
<th>
<label class="fieldlabel" py:content="fields.uid.label" />
@@ -23,13 +27,37 @@
<th>
Name
</th>
+ <th>
+ Phone
+ </th>
+ <th>
+ Unit
+ </th>
+ <th>
+ Title
+ </th>
+ <th>
+ License Plate
+ </th>
</tr>
<tr py:for="user in users">
<td>
<a href="${tg.url('/usershow',uid=user.uid)}">${user.uid}</a>
</td>
<td>
- ${user.cn}
+ ${user.givenName} ${user.sn}
+ </td>
+ <td>
+ ${user.telephoneNumber}
+ </td>
+ <td>
+ ${user.ou}
+ </td>
+ <td>
+ ${user.title}
+ </td>
+ <td>
+ ${user.carLicense}
</td>
</tr>
</table>
@@ -37,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 84b6029a..37f5bb44 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 6d3fd5bb..c21ff12b 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 dc08c0b3..402468be 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>
generated by cgit (git 2.34.1) at 2024-06-13 10:11:53 +0000