IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-01-26 16:16:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Replace references to Person and People with User and Users

Browse Source
This commit is contained in:
Rob Crittenden 2007-11-15 13:13:35 -05:00
parent 816b3e2ea5
commit 3e24df161b
9 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ipa-server/ipa-gui/ipagui/subcontrollers/user.py
View File

@ -183,7 +183,7 @@ class UserController(IPAController):
rv = client.add_user(new_user)
except ipaerror.exception_for(ipaerror.LDAP_DUPLICATE):
turbogears.flash("Person with login '%s' already exists" %
turbogears.flash("User with login '%s' already exists" %
kw.get('uid'))
return dict(form=user_new_form, user=kw,
tg_template='ipagui.templates.usernew')
@ -219,7 +219,7 @@ class UserController(IPAController):
try:
client.modifyPassword(user_dict['krbprincipalname'], "", kw.get('userpassword'))
except ipaerror.IPAError, e:
message = "Person successfully created.<br />"
message = "User successfully created.<br />"
message += "There was an error setting the password.<br />"
turbogears.flash(message)
return dict(form=user_edit_form, user=user_dict,
@ -242,7 +242,7 @@ class UserController(IPAController):
failed_adds = dnadds
if len(failed_adds) > 0:
message = "Person successfully created.<br />"
message = "User successfully created.<br />"
message += "There was an error adding groups.<br />"
message += "Failures have been preserved in the add/remove lists."
turbogears.flash(message)

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

@ -70,8 +70,8 @@
<div id="sidebar">
<h2>Tasks</h2>
<ul>
<li py:if="'admins' in tg.identity.groups"><a href="${tg.url('/user/new')}">Add Person</a></li>
<li><a href="${tg.url('/user/list')}">Find People</a></li>
<li py:if="'admins' in tg.identity.groups"><a href="${tg.url('/user/new')}">Add User</a></li>
<li><a href="${tg.url('/user/list')}">Find Users</a></li>
</ul>
<ul>
<li py:if="'admins' in tg.identity.groups"><a href="${tg.url('/group/new')}">Add Group</a></li>

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

@ -3,7 +3,7 @@
py:extends="'userlayout.kid'">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" py:replace="''"/>
<title>Edit Person</title>
<title>Edit User</title>
</head>
<body>
@ -14,7 +14,7 @@
<span class="small">edit protected fields</span>
</input>
</div>
<h1>Edit Person</h1>
<h1>Edit User</h1>
</div>
<?python

8
ipa-server/ipa-gui/ipagui/templates/usereditform.kid
View File

@ -10,11 +10,11 @@
onsubmit="preSubmit()">
<input type="submit" class="submitbutton" name="submit"
value="Update Person"/>
value="Update User"/>
<input type="submit" class="submitbutton" name="submit"
value="Cancel Edit" />
<input type="button" class="submitbutton"
value="Delete Person"
value="Delete User"
onclick="return confirmDelete();"
/>
@ -847,11 +847,11 @@ from ipagui.helpers import ipahelper
<hr/>
<input type="submit" class="submitbutton" name="submit"
value="Update Person"/>
value="Update User"/>
<input type="submit" class="submitbutton" name="submit"
value="Cancel Edit" />
<input type="button" class="submitbutton"
value="Delete Person"
value="Delete User"
onclick="return confirmDelete();"
/>

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

@ -15,8 +15,8 @@
<!-- <div id="sidebar">
<h2>Tools</h2>
<a href="${tg.url('/user/new')}">Add Person</a><br/>
<a href="${tg.url('/user/list')}">Find People</a><br/>
<a href="${tg.url('/user/new')}">Add User</a><br/>
<a href="${tg.url('/user/list')}">Find Users</a><br/>
</div> -->
</div>
</body>

8
ipa-server/ipa-gui/ipagui/templates/userlist.kid
View File

@ -3,15 +3,15 @@
py:extends="'userlayout.kid'">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" py:replace="''"/>
<title>Find People</title>
<title>Find Users</title>
</head>
<body>
<h1>Find People</h1>
<h1>Find Users</h1>
<script type="text/javascript" charset="utf-8" src="${tg.url('/static/javascript/tablekit.js')}"></script>
<div id="search">
<form action="${tg.url('/user/list')}" method="get">
<input id="uid" type="text" name="uid" value="${uid}" />
<input class="searchbutton" type="submit" value="Find People"/>
<input class="searchbutton" type="submit" value="Find Users"/>
</form>
<script type="text/javascript">
document.getElementById("uid").focus();
@ -23,7 +23,7 @@
<thead>
<tr>
<th>
Person
User
</th>
<th>
Phone

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

@ -3,10 +3,10 @@
py:extends="'userlayout.kid'">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" py:replace="''"/>
<title>Add Person</title>
<title>Add User</title>
</head>
<body>
<h1>Add Person</h1>
<h1>Add User</h1>
${form.display(action=tg.url("/user/create"), value=user)}
</body>

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

@ -3,7 +3,7 @@
<form action="${action}" name="${name}" method="${method}" class="tableform"
onsubmit="preSubmit()">
<input type="submit" class="submitbutton" name="submit" value="Add Person"/>
<input type="submit" class="submitbutton" name="submit" value="Add User"/>
<?python
from ipagui.helpers import ipahelper
@ -786,7 +786,7 @@ from ipagui.helpers import ipahelper
</div>
<hr />
<input type="submit" class="submitbutton" name="submit" value="Add Person"/>
<input type="submit" class="submitbutton" name="submit" value="Add User"/>
</form>

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

@ -3,18 +3,18 @@
py:extends="'userlayout.kid'">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" py:replace="''"/>
<title>View Person</title>
<title>View User</title>
</head>
<body>
<?python
edit_url = tg.url('/user/edit', uid=user.get('uid'))
?>
<h1>View Person</h1>
<h1>View User</h1>
<input py:if="'editors' in tg.identity.groups or 'admins' in tg.identity.groups"
class="submitbutton" type="button"
onclick="document.location.href='${edit_url}'"
value="Edit Person" />
value="Edit User" />
<?python
from ipagui.helpers import userhelper
@ -377,6 +377,6 @@ else:
<input py:if="'editors' in tg.identity.groups or 'admins' in tg.identity.groups"
class="submitbutton" type="button"
onclick="document.location.href='${edit_url}'"
value="Edit Person" />
value="Edit User" />
</body>
</html>