[Cluster-devel] conga/luci/site/luci/Extensions homebase_adapt ...
rmccabe at sourceware.org
rmccabe at sourceware.org
Tue Aug 1 16:27:55 UTC 2006
CVSROOT: /cvs/cluster
Module name: conga
Changes by: rmccabe at sourceware.org 2006-08-01 16:27:55
Modified files:
luci/site/luci/Extensions: homebase_adapters.py
Log message:
ui and wording tweaks
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/homebase_adapters.py.diff?cvsroot=cluster&r1=1.19&r2=1.20
--- conga/luci/site/luci/Extensions/homebase_adapters.py 2006/07/27 13:37:01 1.19
+++ conga/luci/site/luci/Extensions/homebase_adapters.py 2006/08/01 16:27:53 1.20
@@ -630,38 +630,6 @@
pagetype = str(pagetype)
- try:
- if havePermAddUser(self):
- addUser = {}
- addUser['Title'] = 'Add a User'
- addUser['absolute_url'] = url + '?pagetype=' + HOMEBASE_ADD_USER
- addUser['Description'] = 'Add a User'
- if pagetype == HOMEBASE_ADD_USER:
- addUser['currentItem'] = True
- ret['curIndex'] = index
- cur = addUser
- else:
- addUser['currentItem'] = False
- index += 1
- temp.append(addUser)
- except: pass
-
- try:
- if (self.portal_membership.listMembers() and havePermDelUser(self)):
- delUser = {}
- delUser['Title'] = 'Delete a User'
- delUser['absolute_url'] = url + '?pagetype=' + HOMEBASE_DEL_USER
- delUser['Description'] = 'Delete a User'
- if pagetype == HOMEBASE_DEL_USER:
- delUser['currentItem'] = True
- ret['curIndex'] = index
- cur = delUser
- else:
- delUser['currentItem'] = False
- index += 1
- temp.append(delUser)
- except: pass
-
#
# The Add System page
#
@@ -671,7 +639,7 @@
addSystem = {}
addSystem['Title'] = 'Add a System'
addSystem['absolute_url'] = url + '?pagetype=' + HOMEBASE_ADD_SYSTEM
- addSystem['Description'] = 'Add a System'
+ addSystem['Description'] = 'Add a system to the Luci storage management interface.'
if pagetype == HOMEBASE_ADD_SYSTEM:
cur = addSystem
addSystem['currentItem'] = True
@@ -688,9 +656,9 @@
raise
if havePermAddCluster(self):
addCluster = {}
- addCluster['Title'] = 'Manage a Cluster'
+ addCluster['Title'] = 'Add a Cluster'
addCluster['absolute_url'] = url + '?pagetype=' + HOMEBASE_ADD_CLUSTER_INITIAL
- addCluster['Description'] = 'Manage a Cluster'
+ addCluster['Description'] = 'Add a cluster to the Luci cluster management interface.'
if pagetype == HOMEBASE_ADD_CLUSTER_INITIAL:
addCluster['currentItem'] = True
ret['curIndex'] = index
@@ -707,9 +675,9 @@
raise
if havePermAddCluster(self):
addCluster = {}
- addCluster['Title'] = 'Manage a Cluster'
+ addCluster['Title'] = 'Add a Cluster'
addCluster['absolute_url'] = url + '?pagetype=' + HOMEBASE_ADD_CLUSTER
- addCluster['Description'] = 'Manage a Cluster'
+ addCluster['Description'] = 'Add a cluster to the Luci cluster management interface.'
if pagetype == HOMEBASE_ADD_CLUSTER:
addCluster['currentItem'] = True
ret['curIndex'] = index
@@ -727,9 +695,9 @@
try:
if (havePermRemStorage(self) and havePermRemCluster(self) and (getStorage(self) or getClusters(self))):
remSystem = {}
- remSystem['Title'] = 'Remove a Managed System'
+ remSystem['Title'] = 'Manage Systems'
remSystem['absolute_url'] = url + '?pagetype=' + HOMEBASE_DEL_SYSTEM
- remSystem['Description'] = 'Remove a Managed System'
+ remSystem['Description'] = 'Update or remove storage systems and clusters.'
if pagetype == HOMEBASE_DEL_SYSTEM:
remSystem['currentItem'] = True
ret['curIndex'] = index
@@ -741,6 +709,46 @@
except: pass
#
+# Add a Luci user.
+#
+
+ try:
+ if havePermAddUser(self):
+ addUser = {}
+ addUser['Title'] = 'Add a User'
+ addUser['absolute_url'] = url + '?pagetype=' + HOMEBASE_ADD_USER
+ addUser['Description'] = 'Add a user to the Luci interface.'
+ if pagetype == HOMEBASE_ADD_USER:
+ addUser['currentItem'] = True
+ ret['curIndex'] = index
+ cur = addUser
+ else:
+ addUser['currentItem'] = False
+ index += 1
+ temp.append(addUser)
+ except: pass
+
+#
+# Delete a Luci user
+#
+
+ try:
+ if (self.portal_membership.listMembers() and havePermDelUser(self)):
+ delUser = {}
+ delUser['Title'] = 'Delete a User'
+ delUser['absolute_url'] = url + '?pagetype=' + HOMEBASE_DEL_USER
+ delUser['Description'] = 'Delete a Luci user.'
+ if pagetype == HOMEBASE_DEL_USER:
+ delUser['currentItem'] = True
+ ret['curIndex'] = index
+ cur = delUser
+ else:
+ delUser['currentItem'] = False
+ index += 1
+ temp.append(delUser)
+ except: pass
+
+#
# The User Permissions Page
#
try:
@@ -748,7 +756,7 @@
userPerm = {}
userPerm['Title'] = 'User Permissions'
userPerm['absolute_url'] = url + '?pagetype=' + HOMEBASE_PERMS
- userPerm['Description'] = 'Set permissions for users'
+ userPerm['Description'] = 'Set permissions for Luci users.'
if pagetype == HOMEBASE_PERMS:
userPerm['currentItem'] = True
ret['curIndex'] = index
More information about the Cluster-devel
mailing list