Menu
▾
▴
zenoss-commit — svn commit list
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
(65) |
Mar
(276) |
Apr
(544) |
May
(638) |
Jun
(225) |
Jul
(204) |
Aug
(294) |
Sep
(532) |
Oct
(506) |
Nov
(324) |
Dec
(359) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(208) |
Feb
(225) |
Mar
(248) |
Apr
(388) |
May
(222) |
Jun
(47) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <sv...@ze...> - 2007-05-03 15:19:41
|
Author: marc
Date: 2007-05-03 11:19:41 -0400 (Thu, 03 May 2007)
New Revision: 5095
Modified:
trunk/Products/ZenModel/FileSystem.py
trunk/Products/ZenModel/IpInterface.py
trunk/Products/ZenModel/IpService.py
trunk/Products/ZenModel/OSProcess.py
trunk/Products/ZenModel/WinService.py
trunk/Products/ZenModel/ZenModelRM.py
trunk/Products/ZenModel/skins/zenmodel/winServiceDetail.pt
Log:
* Updating OS components (test)
Modified: trunk/Products/ZenModel/FileSystem.py
===================================================================
--- trunk/Products/ZenModel/FileSystem.py 2007-05-03 15:14:55 UTC (rev 5094)
+++ trunk/Products/ZenModel/FileSystem.py 2007-05-03 15:19:41 UTC (rev 5095)
@@ -90,11 +90,11 @@
, 'action' : 'viewFileSystem'
, 'permissions' : ('View',)
},
- #{ 'id' : 'perfConf'
- #, 'name' : 'PerfConf'
- #, 'action' : 'objRRDTemplate'
- #, 'permissions' : ("Change Device", )
- #},
+ { 'id' : 'perfConf'
+ , 'name' : 'Template'
+ , 'action' : 'objRRDTemplate'
+ , 'permissions' : ("Change Device", )
+ },
{ 'id' : 'viewHistory'
, 'name' : 'Modifications'
, 'action' : 'viewHistory'
Modified: trunk/Products/ZenModel/IpInterface.py
===================================================================
--- trunk/Products/ZenModel/IpInterface.py 2007-05-03 15:14:55 UTC (rev 5094)
+++ trunk/Products/ZenModel/IpInterface.py 2007-05-03 15:19:41 UTC (rev 5095)
@@ -123,11 +123,11 @@
, 'action' : 'viewIpInterface'
, 'permissions' : ('View',)
},
-# { 'id' : 'perfConf'
-# , 'name' : 'PerfConf'
-# , 'action' : 'objRRDTemplate'
-# , 'permissions' : ("Change Device", )
-# },
+ { 'id' : 'perfConf'
+ , 'name' : 'Template'
+ , 'action' : 'objRRDTemplate'
+ , 'permissions' : ("Change Device", )
+ },
{ 'id' : 'viewHistory'
, 'name' : 'Modifications'
, 'action' : 'viewHistory'
Modified: trunk/Products/ZenModel/IpService.py
===================================================================
--- trunk/Products/ZenModel/IpService.py 2007-05-03 15:14:55 UTC (rev 5094)
+++ trunk/Products/ZenModel/IpService.py 2007-05-03 15:19:41 UTC (rev 5095)
@@ -179,22 +179,23 @@
security.declareProtected('Manage DMD', 'manage_editService')
- def manage_editService(self, status, id, ipaddresses, protocol, port, description,
- monitor=False, severity=5, sendString="",
- expectRegex="", REQUEST=None):
+ def manage_editService(self, id=None,
+ status=None, ipaddresses=None,
+ protocol=None, port=None,
+ description=None,
+ monitor=False, severity=5, sendString="",
+ expectRegex="", REQUEST=None):
"""Edit a Service from a web page.
"""
- if id != self.id:
- self.ipservices._remoteRemove(self)
- setattr(self, 'id', id)
- self.ipservices._setObject(name, self)
-
- setattr(self, 'status', status)
- setattr(self, 'ipaddresses', ipaddresses)
- setattr(self, 'description', description)
- setattr(self, 'protocol', protocol)
- setattr(self, 'port', int(port))
- self.setServiceClass({'protocol':protocol, 'port':int(port)})
+ if id:
+ self.rename(id)
+ if status: self.status = status
+ self.ipaddresses = ipaddresses
+ self.description = description
+ self.protocol = protocol
+ self.port = int(port)
+ if protocol != self.protocol or port != self.port:
+ self.setServiceClass({'protocol':protocol, 'port':int(port)})
msg = []
msg.append(self.setAqProperty("sendString", sendString, "string"))
Modified: trunk/Products/ZenModel/OSProcess.py
===================================================================
--- trunk/Products/ZenModel/OSProcess.py 2007-05-03 15:14:55 UTC (rev 5094)
+++ trunk/Products/ZenModel/OSProcess.py 2007-05-03 15:19:41 UTC (rev 5095)
@@ -69,11 +69,11 @@
, 'action' : 'osProcessDetail'
, 'permissions' : ( Permissions.view, )
},
-# { 'id' : 'perfConf'
-# , 'name' : 'PerfConf'
-# , 'action' : 'objRRDTemplate'
-# , 'permissions' : ("Change Device", )
-# },
+ { 'id' : 'perfConf'
+ , 'name' : 'Template'
+ , 'action' : 'objRRDTemplate'
+ , 'permissions' : ("Change Device", )
+ },
# { 'id' : 'manage'
# , 'name' : 'Administration'
# , 'action' : 'osProcessManage'
Modified: trunk/Products/ZenModel/WinService.py
===================================================================
--- trunk/Products/ZenModel/WinService.py 2007-05-03 15:14:55 UTC (rev 5094)
+++ trunk/Products/ZenModel/WinService.py 2007-05-03 15:19:41 UTC (rev 5095)
@@ -123,37 +123,26 @@
primarySortKey = caption
security.declareProtected('Manage DMD', 'manage_editService')
- def manage_editService(self, status,
- id, description,
- acceptPause, acceptStop,
- pathName, serviceType,
- startMode, startName,
+ def manage_editService(self, id=None, description=None,
+ acceptPause=None, acceptStop=None,
+ pathName=None, serviceType=None,
+ startMode=None, startName=None,
monitor=False, severity=5,
REQUEST=None):
"""Edit a Service from a web page.
"""
- serviceClassChanged = False
- if id != self.id:
- serviceClassChanged = True
- self.winservices._remoteRemove(self)
- setattr(self, 'id', id)
- self.winservices._setObject(name, self)
+ if id:
+ if self.rename(id) or description != self.description:
+ self.description = description
+ self.setServiceClass({'name':name, 'description':description})
- if description != self.description:
- serviceClassChanged = True
- setattr(self, 'description', description)
+ self.acceptPause = acceptPause
+ self.acceptStop = acceptStop
+ self.pathName = pathName
+ self.serviceType = serviceType
+ self.startMode = startMode
+ self.startName = startName
- if serviceClassChanged:
- self.setServiceClass({'name':name, 'description':description})
-
- setattr(self, 'status', status)
- setattr(self, 'acceptPause', acceptPause)
- setattr(self, 'acceptStop', acceptStop)
- setattr(self, 'pathName', pathName)
- setattr(self, 'serviceType', serviceType)
- setattr(self, 'startMode', startMode)
- setattr(self, 'startName', startName)
-
return super(WinService, self).manage_editService(monitor, severity,
REQUEST=REQUEST)
Modified: trunk/Products/ZenModel/ZenModelRM.py
===================================================================
--- trunk/Products/ZenModel/ZenModelRM.py 2007-05-03 15:14:55 UTC (rev 5094)
+++ trunk/Products/ZenModel/ZenModelRM.py 2007-05-03 15:19:41 UTC (rev 5095)
@@ -63,7 +63,7 @@
parent.manage_renameObject(self.getId(), newId)
renamed = True
if REQUEST:
- REQUEST['message'] = "Object renamed"
+ if renamed: REQUEST['message'] = "Object renamed"
return self.callZenScreen(REQUEST, renamed)
return renamed
Modified: trunk/Products/ZenModel/skins/zenmodel/winServiceDetail.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/winServiceDetail.pt 2007-05-03 15:14:55 UTC (rev 5094)
+++ trunk/Products/ZenModel/skins/zenmodel/winServiceDetail.pt 2007-05-03 15:19:41 UTC (rev 5095)
@@ -68,15 +68,12 @@
</td>
<td class="tableheader">Fail Severity</td>
<td class="tablevalues">
- <select class="tableheader" name="severity:int"
- tal:condition="editable">
+ <select class="tableheader" name="severity:int">
<option tal:repeat="sev here/getSeverities"
tal:content="python:sev[0]"
tal:attributes="value python:sev[1];
selected python:sev[1] == here.getFailSeverity()" />
</select>
- <tal:block tal:condition="not:editable"
- tal:content="here/getFailSeverityString"/>
</td>
</tr>
<tr>
|
|
From: <sv...@ze...> - 2007-05-03 15:15:01
|
Author: ian
Date: 2007-05-03 11:14:55 -0400 (Thu, 03 May 2007)
New Revision: 5094
Added:
trunk/Products/ZenModel/skins/zenmodel/locked-sendevent-icon.png
Modified:
trunk/Products/ZenModel/skins/zenmodel/deviceListMacro.pt
trunk/Products/ZenModel/skins/zenmodel/deviceOsDetail.pt
trunk/Products/ZenModel/skins/zenmodel/deviceStatus.pt
trunk/Products/ZenModel/skins/zenmodel/ipServiceDetail.pt
trunk/Products/ZenModel/skins/zenmodel/locked-delete-icon.png
trunk/Products/ZenModel/skins/zenmodel/locked-update-icon.png
trunk/Products/ZenModel/skins/zenmodel/osProcessDetail.pt
trunk/Products/ZenModel/skins/zenmodel/viewFileSystem.pt
trunk/Products/ZenModel/skins/zenmodel/viewIpInterface.pt
trunk/Products/ZenModel/skins/zenmodel/winServiceDetail.pt
Log:
* Fixes #1371: Added lock warning icon and updated templates
Modified: trunk/Products/ZenModel/skins/zenmodel/deviceListMacro.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/deviceListMacro.pt 2007-05-03 14:51:57 UTC (rev 5093)
+++ trunk/Products/ZenModel/skins/zenmodel/deviceListMacro.pt 2007-05-03 15:14:55 UTC (rev 5094)
@@ -119,6 +119,8 @@
<td class=tablevalues>
<img tal:condition="device/isLockedFromUpdates" border="0" src="locked-update-icon.png">
<img tal:condition="device/isLockedFromDeletion" border="0" src="locked-delete-icon.png">
+ <img tal:condition="here/sendEventWhenBlocked"
+ border="0" src="locked-sendevent-icon.png">
</td>
</tr>
</tal:block>
Modified: trunk/Products/ZenModel/skins/zenmodel/deviceOsDetail.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/deviceOsDetail.pt 2007-05-03 14:51:57 UTC (rev 5093)
+++ trunk/Products/ZenModel/skins/zenmodel/deviceOsDetail.pt 2007-05-03 15:14:55 UTC (rev 5094)
@@ -33,7 +33,7 @@
tableName,'description','Descr')"/>
<th class="tableheader" align="center" width="30">O</th>
<th class="tableheader" align="center" width="30">A</th>
- <th class="tableheader" align="center" width="40">Lock</th>
+ <th class="tableheader" align="center" width="60">Lock</th>
</tr>
<tr tal:condition="not:batch">
<th class="tableheader" align="left">
@@ -89,6 +89,7 @@
<td class="tablevalues" align="center">
<img tal:condition="intf/isLockedFromDeletion" border="0" src="locked-delete-icon.png">
<img tal:condition="intf/isLockedFromUpdates" border="0" src="locked-update-icon.png">
+ <img tal:condition="intf/isLockedFromUpdates" border="0" src="locked-sendevent-icon.png">
</td>
</tr>
</tal:block>
@@ -133,7 +134,7 @@
<th tal:replace="structure python:here.ZenTableManager.getTableHeader(
tableName,'getStatus','Status','cmp')"
width="60" />
- <th class="tableheader" align="center" width="40">Lock</th>
+ <th class="tableheader" align="center" width="60">Lock</th>
</tr>
<tal:block tal:repeat="srv batch">
<tr tal:define="odd repeat/srv/odd"
@@ -152,9 +153,10 @@
<img border="0" tal:attributes="src
python:here.getStatusImgSrc(srv.getStatus())" />
</td>
- <td class="tablevalues" align="center" width="40">
+ <td class="tablevalues" align="center" width="60">
<img tal:condition="srv/isLockedFromDeletion" border="0" src="locked-delete-icon.png">
<img tal:condition="srv/isLockedFromUpdates" border="0" src="locked-update-icon.png">
+ <img tal:condition="srv/isLockedFromUpdates" border="0" src="locked-sendevent-icon.png">
</td>
</tr>
</tal:block>
@@ -212,7 +214,7 @@
<th tal:replace="structure python:here.ZenTableManager.getTableHeader(
tableName,'getStatus','Status','cmp')"
width="60" />
- <th class="tableheader" align="center" width="40">Lock</th>
+ <th class="tableheader" align="center" width="60">Lock</th>
</tr>
<tal:block tal:repeat="proc batch">
<tr tal:define="odd repeat/proc/odd"
@@ -233,9 +235,10 @@
<img border="0" tal:attributes="src
python:here.getStatusImgSrc(proc.getStatus())" />
</td>
- <td class="tablevalues" align="center" width="40">
+ <td class="tablevalues" align="center" width="60">
<img tal:condition="proc/isLockedFromDeletion" border="0" src="locked-delete-icon.png">
<img tal:condition="proc/isLockedFromUpdates" border="0" src="locked-update-icon.png">
+ <img tal:condition="proc/isLockedFromUpdates" border="0" src="locked-sendevent-icon.png">
</td>
</tr>
</tal:block>
@@ -290,7 +293,7 @@
<th tal:replace="structure python:here.ZenTableManager.getTableHeader(
tableName,'getStatus','Status','cmp')"
width="60" />
- <th class="tableheader" align="center" width="40">Lock</th>
+ <th class="tableheader" align="center" width="60">Lock</th>
</tr>
<tal:block tal:repeat="srv batch">
<tr tal:define="odd repeat/srv/odd"
@@ -313,9 +316,10 @@
<img border="0" tal:attributes="src
python:here.getStatusImgSrc(srv.getStatus())" />
</td>
- <td class="tablevalues" align="center" width="40">
+ <td class="tablevalues" align="center" width="60">
<img tal:condition="srv/isLockedFromDeletion" border="0" src="locked-delete-icon.png">
<img tal:condition="srv/isLockedFromUpdates" border="0" src="locked-update-icon.png">
+ <img tal:condition="srv/isLockedFromUpdates" border="0" src="locked-sendevent-icon.png">
</td>
</tr>
</tal:block>
@@ -370,7 +374,7 @@
tableName,'storageDevice','Storage Device')">Device
</th>
-->
- <th class="tableheader" align="center" width="40">Lock</th>
+ <th class="tableheader" align="center" width="60">Lock</th>
</tr>
<tr tal:condition="not:objects">
<th class="tableheader" align="left">
@@ -406,9 +410,10 @@
tal:content="fsys/storageDevice">vol
</td>
-->
- <td class="tablevalues" align="center" width="40">
+ <td class="tablevalues" align="center" width="60">
<img tal:condition="fsys/isLockedFromDeletion" border="0" src="locked-delete-icon.png">
<img tal:condition="fsys/isLockedFromUpdates" border="0" src="locked-update-icon.png">
+ <img tal:condition="fsys/isLockedFromUpdates" border="0" src="locked-sendevent-icon.png">
</td>
</tr>
</tal:block>
@@ -452,7 +457,7 @@
tableName,'routeproto','Protocol')"/>
<th tal:replace="structure python:here.ZenTableManager.getTableHeader(
tableName,'routetype','Type')"/>
- <th class="tableheader" align="center" width="40">Lock</th>
+ <th class="tableheader" align="center" width="60">Lock</th>
</tr>
<tr tal:condition="not:batch">
<th class="tableheader" align="left">
@@ -483,6 +488,7 @@
src="locked-delete-icon.png">
<img tal:condition="route/isLockedFromUpdates" border="0"
src="locked-update-icon.png">
+ <img tal:condition="route/isLockedFromUpdates" border="0" src="locked-sendevent-icon.png">
</td>
</tr>
</tal:block>
Modified: trunk/Products/ZenModel/skins/zenmodel/deviceStatus.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/deviceStatus.pt 2007-05-03 14:51:57 UTC (rev 5093)
+++ trunk/Products/ZenModel/skins/zenmodel/deviceStatus.pt 2007-05-03 15:14:55 UTC (rev 5094)
@@ -59,12 +59,12 @@
</tr>
<tr>
<td class=tableheader align=left>Locks</td>
- <td class=tablevalues>
+ <td class=tablevalues colspan=3>
<img tal:condition="here/isLockedFromDeletion" border="0" src="locked-delete-icon.png">
<img tal:condition="here/isLockedFromUpdates" border="0" src="locked-update-icon.png">
+ <img tal:condition="here/sendEventWhenBlocked"
+ border="0" src="locked-sendevent-icon.png">
</td>
- <td class=tableheader align=left>Lock warning</td>
- <td class=tablevalues tal:content="here/lockWarning">Send event when blocked</td>
</tr>
<!-- END TABLE CONTENTS -->
Modified: trunk/Products/ZenModel/skins/zenmodel/ipServiceDetail.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/ipServiceDetail.pt 2007-05-03 14:51:57 UTC (rev 5093)
+++ trunk/Products/ZenModel/skins/zenmodel/ipServiceDetail.pt 2007-05-03 15:14:55 UTC (rev 5094)
@@ -154,15 +154,11 @@
<td class="tablevalues">
<img tal:condition="here/isLockedFromDeletion" border="0" src="locked-delete-icon.png">
<img tal:condition="here/isLockedFromUpdates" border="0" src="locked-update-icon.png">
+ <img tal:condition="here/sendEventWhenBlocked" border="0"
+ src="locked-sendevent-icon.png">
</td>
</tr>
<tr>
- <td class=tableheader align=left>Lock warnings</td>
- <td class="tablevalues" tal:content="here/lockWarning">
- Send event when blocked
- </td>
- </tr>
- <tr>
<td align="left" class="tableheader" colspan="2">
<input class="tableheader" type="submit" value=" Save "
name="manage_editService:method" />
Modified: trunk/Products/ZenModel/skins/zenmodel/locked-delete-icon.png
===================================================================
(Binary files differ)
Added: trunk/Products/ZenModel/skins/zenmodel/locked-sendevent-icon.png
Property changes on: trunk/Products/ZenModel/skins/zenmodel/locked-sendevent-icon.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/Products/ZenModel/skins/zenmodel/locked-update-icon.png
===================================================================
(Binary files differ)
Modified: trunk/Products/ZenModel/skins/zenmodel/osProcessDetail.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/osProcessDetail.pt 2007-05-03 14:51:57 UTC (rev 5093)
+++ trunk/Products/ZenModel/skins/zenmodel/osProcessDetail.pt 2007-05-03 15:14:55 UTC (rev 5094)
@@ -101,13 +101,11 @@
<td class=tablevalues>
<img tal:condition="here/isLockedFromDeletion" border="0" src="locked-delete-icon.png">
<img tal:condition="here/isLockedFromUpdates" border="0" src="locked-update-icon.png">
+ <img tal:condition="here/sendEventWhenBlocked" border="0"
+ src="locked-sendevent-icon.png">
</td>
</tr>
<tr>
- <td class=tableheader align=left>Lock warnings</td>
- <td class=tablevalues tal:content="here/lockWarning">Send event when blocked</td>
- </tr>
- <tr>
<td align="left" class="tableheader" colspan="2">
<input class="tableheader" type="submit" value=" Save "
name="manage_editOSProcess:method" />
Modified: trunk/Products/ZenModel/skins/zenmodel/viewFileSystem.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/viewFileSystem.pt 2007-05-03 14:51:57 UTC (rev 5093)
+++ trunk/Products/ZenModel/skins/zenmodel/viewFileSystem.pt 2007-05-03 15:14:55 UTC (rev 5094)
@@ -156,14 +156,12 @@
</tr>
<tr>
<td class="tableheader" align=left>Locks</td>
- <td class="tablevalues">
+ <td class="tablevalues" colspan=3>
<img tal:condition="here/isLockedFromDeletion" border="0" src="locked-delete-icon.png">
<img tal:condition="here/isLockedFromUpdates" border="0" src="locked-update-icon.png">
+ <img tal:condition="here/sendEventWhenBlocked"
+ border="0" src="locked-sendevent-icon.png">
</td>
- <td class="tableheader" align=left>Lock warnings</td>
- <td class="tablevalues" tal:content="here/lockWarning">
- Send event when blocked
- </td>
</tr>
<tr tal:condition="editable">
<td align="left" class="tableheader" colspan="4">
Modified: trunk/Products/ZenModel/skins/zenmodel/viewIpInterface.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/viewIpInterface.pt 2007-05-03 14:51:57 UTC (rev 5093)
+++ trunk/Products/ZenModel/skins/zenmodel/viewIpInterface.pt 2007-05-03 15:14:55 UTC (rev 5094)
@@ -137,12 +137,12 @@
</tr>
<tr>
<td class="tableheader" align=left>Locks</td>
- <td class="tablevalues">
+ <td class="tablevalues" colspan=3>
<img tal:condition="here/isLockedFromDeletion" border="0" src="locked-delete-icon.png">
<img tal:condition="here/isLockedFromUpdates" border="0" src="locked-update-icon.png">
+ <img tal:condition="here/sendEventWhenBlocked" border="0"
+ src="locked-sendevent-icon.png">
</td>
- <td class="tableheader" align=left>Lock warnings</td>
- <td class="tablevalues" tal:content="here/lockWarning">Send event when blocked</td>
</tr>
<tr>
<td align="left" class="tableheader" colspan="4">
Modified: trunk/Products/ZenModel/skins/zenmodel/winServiceDetail.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/winServiceDetail.pt 2007-05-03 14:51:57 UTC (rev 5093)
+++ trunk/Products/ZenModel/skins/zenmodel/winServiceDetail.pt 2007-05-03 15:14:55 UTC (rev 5094)
@@ -163,15 +163,11 @@
border="0" src="locked-delete-icon.png">
<img tal:condition="here/isLockedFromUpdates"
border="0" src="locked-update-icon.png">
+ <img tal:condition="here/sendEventWhenBlocked"
+ border="0" src="locked-sendevent-icon.png">
</td>
</tr>
<tr>
- <td class=tableheader align=left>Lock warnings</td>
- <td class=tablevalues colspan=3 tal:content="here/lockWarning">
- Send event when blocked
- </td>
- </tr>
- <tr>
<td align="left" class="tableheader" colspan="4">
<input class="tableheader" type="submit" value=" Save "
name="manage_editService:method" />
|
|
From: <sv...@ze...> - 2007-05-03 14:51:58
|
Author: ian
Date: 2007-05-03 10:51:57 -0400 (Thu, 03 May 2007)
New Revision: 5093
Modified:
trunk/Products/ZenModel/skins/zenmodel/zenoss.css
trunk/Products/ZenWidgets/skins/zenui/img/tabtable_rounded_cap.gif
trunk/Products/ZenWidgets/skins/zenui/img/tabtable_rounded_cap_left.gif
Log:
* Fixes #1372
Modified: trunk/Products/ZenModel/skins/zenmodel/zenoss.css
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/zenoss.css 2007-05-03 13:57:25 UTC (rev 5092)
+++ trunk/Products/ZenModel/skins/zenmodel/zenoss.css 2007-05-03 14:51:57 UTC (rev 5093)
@@ -356,12 +356,12 @@
}
table.tabtable td.tabtablecap {
- background: transparent url('img/tabtable_rounded_cap.gif') 0px 11px no-repeat;
+ background: transparent url('img/tabtable_rounded_cap.gif') bottom left no-repeat;
width: 21px;
}
table.tabtable td.tabtableleftcap {
- background: transparent url('img/tabtable_rounded_cap_left.gif') 0px 11px no-repeat;
+ background: transparent url('img/tabtable_rounded_cap_left.gif') bottom left no-repeat;
width: 21px;
}
Modified: trunk/Products/ZenWidgets/skins/zenui/img/tabtable_rounded_cap.gif
===================================================================
(Binary files differ)
Modified: trunk/Products/ZenWidgets/skins/zenui/img/tabtable_rounded_cap_left.gif
===================================================================
(Binary files differ)
|
|
From: <sv...@ze...> - 2007-05-03 13:57:24
|
Author: edahl
Date: 2007-05-03 09:57:25 -0400 (Thu, 03 May 2007)
New Revision: 5092
Modified:
trunk/Products/ZenModel/migrate/menus.py
trunk/Products/ZenModel/migrate/zCollectorPlugins.py
Log:
* revert backk to proper collectorplugins
* more fine tuning of menus
Modified: trunk/Products/ZenModel/migrate/menus.py
===================================================================
--- trunk/Products/ZenModel/migrate/menus.py 2007-05-03 13:56:53 UTC (rev 5091)
+++ trunk/Products/ZenModel/migrate/menus.py 2007-05-03 13:57:25 UTC (rev 5092)
@@ -354,16 +354,28 @@
'isdialog': True,
'ordering': 2.0,
'permissions': ('Change Device',)}],
-'Manage': [ { 'action': 'dialog_changeClass',
+'Manage': [
+ { 'action': 'collectDevice',
+ 'allowed_classes': ( 'Device',
+ 'OperatingSystem',
+ 'DeviceClass',
+ 'DeviceGroup',
+ 'Location',
+ 'System'),
+ 'description': 'Model Device',
+ 'id': 'modelDevice',
+ 'ordering': 90.0,
+ 'permissions': ('Change Device',)},
+ { 'action': 'dialog_changeClass',
'allowed_classes': ('Device', 'OperatingSystem'),
'description': 'Change Class...',
'id': 'changeClass',
'isdialog': True,
- 'ordering': 90.0,
+ 'ordering': 85.0,
'permissions': ('Change Device',)},
{ 'action': 'dialog_setProductionState',
- 'allowed_classes': ( 'Device',
- 'OperatingSystem',
+ 'allowed_classes': (
+
'DeviceClass',
'DeviceGroup',
'Location',
@@ -374,8 +386,8 @@
'ordering': 80.0,
'permissions': ('Change Device',)},
{ 'action': 'dialog_setPriority',
- 'allowed_classes': ( 'Device',
- 'OperatingSystem',
+ 'allowed_classes': (
+
'DeviceClass',
'DeviceGroup',
'Location',
@@ -385,17 +397,6 @@
'isdialog': True,
'ordering': 70.0,
'permissions': ('Change Device',)},
- { 'action': 'collectDevice',
- 'allowed_classes': ( 'Device',
- 'OperatingSystem',
- 'DeviceClass',
- 'DeviceGroup',
- 'Location',
- 'System'),
- 'description': 'Model Device',
- 'id': 'modelDevice',
- 'ordering': 60.0,
- 'permissions': ('Change Device',)},
{ 'action': 'dialog_resetIp',
'allowed_classes': ( 'Device',
'OperatingSystem',
@@ -417,7 +418,7 @@
'System'),
'description': 'Reset Community',
'id': 'resetCommunity',
- 'ordering': 40.0,
+ 'ordering': 12.0,
'permissions': ('Change Device',)},
{ 'action': 'dialog_renameDevice',
'allowed_classes': ('Device', 'OperatingSystem'),
@@ -431,7 +432,7 @@
'description': 'Delete Device...',
'id': 'deleteDevice',
'isdialog': True,
- 'ordering': 20.0,
+ 'ordering': 4.0,
'permissions': ('Change Device',)},
{ 'action': 'dialog_lock',
'allowed_classes': [ 'Device',
@@ -446,19 +447,19 @@
'description': 'Lock...',
'id': 'lockObject',
'isdialog': True,
- 'ordering': 10.0,
+ 'ordering': 15.0,
'permissions': ('Change Device',)},
{ 'action': 'pushConfig',
'allowed_classes': ['DeviceClass', 'Device'],
'description': 'Push Changes',
'id': 'pushConfig',
- 'ordering': 15.0,
+ 'ordering': 10.0,
'permissions': ('Change Device',)},
{ 'action': '../pushConfig',
'allowed_classes': ['OperatingSystem'],
'description': 'Push Changes',
'id': 'pushConfig_os',
- 'ordering': 15.0,
+ 'ordering': 10.0,
'permissions': ('Change Device',)},
{ 'action': 'manage_deleteHeartbeat',
'allowed_classes': ('Device', 'OperatingSystem'),
@@ -553,15 +554,15 @@
'HardDisk',
'IpInterface',
'OSProcess'],
- 'description': 'PerfConf',
+ 'description': 'Templates',
'id': 'objRRDTemplate',
- 'ordering': 90.0,
+ 'ordering': 81.0,
'permissions': ('Change Device',)},
{ 'action': '../objRRDTemplate',
'allowed_classes': ['OperatingSystem'],
- 'description': 'PerfConf',
+ 'description': 'Templates',
'id': 'objRRDTemplate_os',
- 'ordering': 90.0,
+ 'ordering': 81.0,
'permissions': ('Change Device',)},
{ 'action': 'dialog_addOneToZenPack',
'allowed_classes': ['ZenPackable'],
@@ -593,13 +594,13 @@
'allowed_classes': ['Device'],
'description': 'Custom',
'id': 'deviceCustomEdit',
- 'ordering': 60.0,
+ 'ordering': 95.0,
'permissions': ('View',)},
{ 'action': '../deviceCustomEdit',
'allowed_classes': ['OperatingSystem'],
'description': 'Custom',
'id': 'deviceCustomEdit_os',
- 'ordering': 60.0,
+ 'ordering': 95.0,
'permissions': ('View',)},
{ 'action': 'deviceManagement',
'allowed_classes': ['Device', 'DeviceClass'],
@@ -623,13 +624,13 @@
'allowed_classes': [ 'Device',],
'description': 'zProperties',
'id': 'zPropertyEdit',
- 'ordering': 70.0,
+ 'ordering': 85.0,
'permissions': ('View',)},
{ 'action': '../zPropertyEdit',
'allowed_classes': ['OperatingSystem'],
'description': 'zProperties',
'id': 'zPropertyEdit_os',
- 'ordering': 70.0,
+ 'ordering': 85.0,
'permissions': ('View',)}],
'OIDMappings': [ { 'action': 'dialog_addOIDMapping',
'description': 'Add OID Mapping...',
Modified: trunk/Products/ZenModel/migrate/zCollectorPlugins.py
===================================================================
--- trunk/Products/ZenModel/migrate/zCollectorPlugins.py 2007-05-03 13:56:53 UTC (rev 5091)
+++ trunk/Products/ZenModel/migrate/zCollectorPlugins.py 2007-05-03 13:57:25 UTC (rev 5092)
@@ -1,16 +1,157 @@
+###########################################################################
+#
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
import Migrate
from Acquisition import aq_base
+from Products.ZenModel.DeviceClass import DeviceClass
class zCollectorPlugins(Migrate.Step):
- version = Migrate.Version(2, 0, 0)
+ version = Migrate.Version(1, 2, 0)
+ clist = (
+ 'zenoss.snmp.NewDeviceMap',
+ 'zenoss.snmp.DeviceMap',
+ 'zenoss.snmp.InterfaceMap',
+ 'zenoss.snmp.RouteMap',
+ )
+
def cutover(self, dmd):
if not hasattr(aq_base(dmd.Devices), 'zCollectorPlugins'):
- dmd.Devices._setProperty("zCollectorPlugins", [], type='lines')
+ dmd.Devices._setProperty("zCollectorPlugins", clist, type='lines')
+ if not dmd.Devices.zCollectorPlugins:
+ dmd.Devices.zCollectorPlugins = (
+ 'zenoss.snmp.NewDeviceMap',
+ 'zenoss.snmp.DeviceMap',
+ 'zenoss.snmp.InterfaceMap',
+ 'zenoss.snmp.RouteMap',
+ )
+ if not dmd.Devices.Server.zCollectorPlugins:
+ dmd.Devices.Server.zCollectorPlugins = (
+ 'zenoss.snmp.NewDeviceMap',
+ 'zenoss.snmp.NewDeviceMap',
+ 'zenoss.snmp.DeviceMap',
+ 'zenoss.snmp.DellDeviceMap',
+ 'zenoss.snmp.HPDeviceMap',
+ 'zenoss.snmp.InterfaceMap',
+ 'zenoss.snmp.RouteMap',
+ 'zenoss.snmp.IpServiceMap',
+ 'zenoss.snmp.HRFileSystemMap',
+ 'zenoss.snmp.HRSWInstalledMap',
+ 'zenoss.snmp.HRSWRunMap',
+ 'zenoss.snmp.CpuMap',
+ 'zenoss.snmp.DellCPUMap',
+ 'zenoss.snmp.DellPCIMap',
+ 'zenoss.snmp.HPCPUMap',
+ )
+ if not aq_base(hasattr(dmd.Devices.Server,'Scan')):
+ scan = DeviceClass('Scan')
+ dmd.Devices.Server._setObject('Scan',scan)
+
+ if not dmd.Devices.Server.Scan.zCollectorPlugins:
+ dmd.Devices.Server.Scan.zCollectorPlugins = (
+ 'zenoss.portscan.IpServiceMap',
+ )
+
+ if not aq_base(hasattr(dmd.Devices.Server,'Cmd')):
+ cmd = DeviceClass('Cmd')
+ dmd.Devices.Server._setObject('Cmd', cmd)
+
+ if not dmd.Devices.Server.Cmd._getOb('zCollectorPlugins',False):
+ dmd.Devices.Server.Cmd.zCollectorPlugins = (
+ 'zenoss.cmd.uname',
+ 'zenoss.cmd.df',
+ 'zenoss.cmd.linux.ifconfig',
+ 'zenoss.cmd.linux.memory',
+ 'zenoss.cmd.linux.netstat_an',
+ 'zenoss.cmd.linux.netstat_rn',
+ 'zenoss.cmd.linux.process',
+ 'zenoss.cmd.darwin.cpu',
+ 'zenoss.cmd.darwin.ifconfig',
+ 'zenoss.cmd.darwin.memory',
+ 'zenoss.cmd.darwin.netstat_an',
+ 'zenoss.cmd.darwin.process',
+ 'zenoss.cmd.darwin.swap',
+ )
+
+
+ if not dmd.Devices.Server.Linux._getOb('zCollectorPlugins',False):
+ dmd.Devices.Server.Linux.zCollectorPlugins = (
+ 'zenoss.snmp.NewDeviceMap',
+ 'zenoss.snmp.DeviceMap',
+ 'zenoss.snmp.DellDeviceMap',
+ 'zenoss.snmp.HPDeviceMap',
+ 'zenoss.snmp.InterfaceMap',
+ 'zenoss.snmp.RouteMap',
+ 'zenoss.snmp.IpServiceMap',
+ 'zenoss.snmp.HRFileSystemMap',
+ 'zenoss.snmp.HRSWRunMap',
+ 'zenoss.snmp.CpuMap',
+ 'zenoss.snmp.DellCPUMap',
+ 'zenoss.snmp.DellPCIMap',
+ 'zenoss.snmp.HPCPUMap',
+ )
+
+ if not dmd.Devices.Server.Windows._getOb('zCollectorPlugins',False):
+ dmd.Devices.Server.Windows.zCollectorPlugins = (
+ 'zenoss.snmp.NewDeviceMap',
+ 'zenoss.snmp.DeviceMap',
+ 'zenoss.snmp.DellDeviceMap',
+ 'zenoss.snmp.HPDeviceMap',
+ 'zenoss.snmp.InterfaceMap',
+ 'zenoss.snmp.RouteMap',
+ 'zenoss.snmp.IpServiceMap',
+ 'zenoss.snmp.HRFileSystemMap',
+ 'zenoss.snmp.HRSWInstalledMap',
+ 'zenoss.snmp.HRSWRunMap',
+ 'zenoss.snmp.CpuMap',
+ 'zenoss.snmp.DellCPUMap',
+ 'zenoss.snmp.DellPCIMap',
+ 'zenoss.snmp.HPCPUMap',
+ 'zenoss.snmp.InformantHardDiskMap',
+ )
+
+ if not dmd.Devices.Power._getOb('zCollectorPlugins',False):
+ dmd.Devices.Power.zCollectorPlugins = (
+ 'zenoss.snmp.NewDeviceMap',
+ 'zenoss.snmp.DeviceMap',
+ 'zenoss.snmp.APCDeviceMap',
+ 'zenoss.snmp.PowerwareDeviceMap',
+ )
+
+ if not dmd.Devices.Network._getOb('zCollectorPlugins',False):
+ dmd.Devices.Network.Router.zCollectorPlugins = (
+ 'zenoss.snmp.NewDeviceMap',
+ 'zenoss.snmp.DeviceMap',
+ 'zenoss.snmp.InterfaceMap',
+ 'zenoss.snmp.RouteMap',
+ )
+
+ if not dmd.Devices.Network.Router.Cisco._getOb(
+ 'zCollectorPlugins',False):
+ dmd.Devices.Network.Router.Cisco.zCollectorPlugins = (
+ 'zenoss.snmp.NewDeviceMap',
+ 'zenoss.snmp.DeviceMap',
+ 'zenoss.snmp.CiscoMap',
+ 'zenoss.snmp.InterfaceMap',
+ 'zenoss.snmp.CiscoHSRP',
+ 'zenoss.snmp.RouteMap',
+ )
+
zCollectorPlugins()
+
+
|
|
From: <sv...@ze...> - 2007-05-03 13:56:54
|
Author: edahl
Date: 2007-05-03 09:56:53 -0400 (Thu, 03 May 2007)
New Revision: 5091
Modified:
trunk/Products/ZenModel/skins/zenmodel/deviceOsDetail.pt
Log:
* if there are no os components at least show interface an route tables
Modified: trunk/Products/ZenModel/skins/zenmodel/deviceOsDetail.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/deviceOsDetail.pt 2007-05-03 13:43:32 UTC (rev 5090)
+++ trunk/Products/ZenModel/skins/zenmodel/deviceOsDetail.pt 2007-05-03 13:56:53 UTC (rev 5091)
@@ -5,7 +5,6 @@
name="ipInterfaceListForm">
<tal:block
- tal:condition="here/interfaces/countObjects"
tal:define="unused here/cacheComponents;
tableName string:interfacelist;
objects here/interfaces/objectValuesAll;
@@ -432,7 +431,6 @@
name="ipRouteEntryListForm">
<tal:block metal:define-macro="routeTableList"
- tal:condition="here/routes/countObjects"
tal:define="tableName string:routeTablelist;
objects here/routes/objectValuesAll;
tabletitle string:Routes;
|
|
From: <sv...@ze...> - 2007-05-03 13:43:52
|
Author: ian
Date: 2007-05-03 09:43:32 -0400 (Thu, 03 May 2007)
New Revision: 5090
Modified:
trunk/Products/ZenWidgets/skins/zenui/dialog_moveEventsToHistory.pt
trunk/Products/ZenWidgets/skins/zenui/dialog_undeleteHistoryEvents.pt
trunk/Products/ZenWidgets/skins/zenui/javascript/zengrid.js
Log:
* Fixes #1369
* Fixes #1370
Dialogs accidentally got unAjaxified when adding response messages. Back to
normal now.
Modified: trunk/Products/ZenWidgets/skins/zenui/dialog_moveEventsToHistory.pt
===================================================================
--- trunk/Products/ZenWidgets/skins/zenui/dialog_moveEventsToHistory.pt 2007-05-03 02:14:05 UTC (rev 5089)
+++ trunk/Products/ZenWidgets/skins/zenui/dialog_moveEventsToHistory.pt 2007-05-03 13:43:32 UTC (rev 5090)
@@ -7,8 +7,7 @@
<div id="dialog_buttons">
<input type="submit" name="manage_deleteEvents:method"
value="OK"
- tal:attributes="onclick string:return $$('dialog').submit_form(
- '${here/absolute_url_path}')" />
+ onclick="$('dialog').hide();eventZenGrid.deleteBatch()"/>
<input id="dialog_cancel" type="button" value="Cancel"
onclick="$('dialog').hide()"/>
</div>
Modified: trunk/Products/ZenWidgets/skins/zenui/dialog_undeleteHistoryEvents.pt
===================================================================
--- trunk/Products/ZenWidgets/skins/zenui/dialog_undeleteHistoryEvents.pt 2007-05-03 02:14:05 UTC (rev 5089)
+++ trunk/Products/ZenWidgets/skins/zenui/dialog_undeleteHistoryEvents.pt 2007-05-03 13:43:32 UTC (rev 5090)
@@ -7,8 +7,7 @@
<div id="dialog_buttons">
<input type="submit" name="manage_undeleteEvents:method"
value="OK"
- tal:attributes="onclick string:return $$('dialog').submit_form(
- '${here/absolute_url_path}')" />
+ onclick="$('dialog').hide();eventZenGrid.undeleteBatch()"/>
<input id="dialog_cancel" type="button" value="Cancel"
onclick="$('dialog').hide()"/>
</div>
Modified: trunk/Products/ZenWidgets/skins/zenui/javascript/zengrid.js
===================================================================
--- trunk/Products/ZenWidgets/skins/zenui/javascript/zengrid.js 2007-05-03 02:14:05 UTC (rev 5089)
+++ trunk/Products/ZenWidgets/skins/zenui/javascript/zengrid.js 2007-05-03 13:43:32 UTC (rev 5090)
@@ -829,6 +829,7 @@
this.buffer.clear();
this.refreshTable(this.lastOffset);
this.setSelectNone();
+ showMessage(r.responseText);
}, this));
},
undeleteBatch: function() {
@@ -850,6 +851,7 @@
this.buffer.clear();
this.refreshTable(this.lastOffset);
this.setSelectNone();
+ showMessage(r.responseText);
}, this));
},
|
|
From: <sv...@ze...> - 2007-05-03 02:14:06
|
Author: chris
Date: 2007-05-02 22:14:05 -0400 (Wed, 02 May 2007)
New Revision: 5089
Modified:
tags/zenoss-2.0/inst/rpm/zenoss.spec
Log:
* synchronized with tagname by zenpkg
Modified: tags/zenoss-2.0/inst/rpm/zenoss.spec
===================================================================
--- tags/zenoss-2.0/inst/rpm/zenoss.spec 2007-05-03 02:10:35 UTC (rev 5088)
+++ tags/zenoss-2.0/inst/rpm/zenoss.spec 2007-05-03 02:14:05 UTC (rev 5089)
@@ -27,7 +27,7 @@
# set to 1 if the version of the software to be built is the trunk
# if trunk is set to 0 the version will be extrapolated from the
# rpm information contained in the %{version} and %{release} vars
-%define trunk 1
+%define trunk 0
# the name of the ctl file for zenoss (in /etc/rc.d/rc#.d)
%define S_zenoss S99zenoss
@@ -41,8 +41,8 @@
# the RPM meta information
Name: zenoss
Summary: The Open Source Network Management System
-Version: 1.1.0
-Release: 0
+Version: 2.0
+Release: 0
License: GPL
Vendor: Zenoss, Inc.
Packager: Christopher Blunck <ch...@ze...>
|
|
From: <sv...@ze...> - 2007-05-03 02:10:36
|
Author: chris Date: 2007-05-02 22:10:35 -0400 (Wed, 02 May 2007) New Revision: 5088 Added: tags/zenoss-2.0/ Log: * auto-build of zenoss-2.0 by zenpkg Copied: tags/zenoss-2.0 (from rev 5087, trunk) |
|
From: <sv...@ze...> - 2007-05-03 02:09:50
|
Author: chris Date: 2007-05-02 22:09:50 -0400 (Wed, 02 May 2007) New Revision: 5087 Removed: tags/zenoss-2.0/ Log: cleanup |
|
From: <sv...@ze...> - 2007-05-03 01:30:48
|
Author: ecn
Date: 2007-05-02 21:30:12 -0400 (Wed, 02 May 2007)
New Revision: 5086
Modified:
trunk/inst/rpm/zenoss.spec
Log:
* add LD_LIBRARY_PATH
Modified: trunk/inst/rpm/zenoss.spec
===================================================================
--- trunk/inst/rpm/zenoss.spec 2007-05-03 00:15:56 UTC (rev 5085)
+++ trunk/inst/rpm/zenoss.spec 2007-05-03 01:30:12 UTC (rev 5086)
@@ -259,6 +259,7 @@
echo "export ZENHOME=%{zenhome}" >> %{os_home}/.bashrc
echo "export PATH=${ZENHOME}/bin:${PATH}" >> %{os_home}/.bashrc
echo "export PYTHONPATH=%{zenhome}/lib/python" >> %{os_home}/.bashrc
+ echo "export LD_LIBRARY_PATH=%{zenhome}/lib" >> %{os_home}/.bashrc
chown %{os_username} %{os_home}/.bashrc
fi
|
|
From: <sv...@ze...> - 2007-05-03 00:16:33
|
Author: ecn Date: 2007-05-02 20:15:56 -0400 (Wed, 02 May 2007) New Revision: 5085 Added: trunk/inst/externallibs/pynetsnmp-0.21.tar.gz Removed: trunk/inst/externallibs/pynetsnmp-0.2.tar.gz Modified: trunk/inst/externallibs/wmi-20070502.tar.bz2 Log: updates for rhel5 Deleted: trunk/inst/externallibs/pynetsnmp-0.2.tar.gz Added: trunk/inst/externallibs/pynetsnmp-0.21.tar.gz Property changes on: trunk/inst/externallibs/pynetsnmp-0.21.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/inst/externallibs/wmi-20070502.tar.bz2 =================================================================== (Binary files differ) |
|
From: <sv...@ze...> - 2007-05-03 00:10:24
|
Author: ecn Date: 2007-05-02 20:10:23 -0400 (Wed, 02 May 2007) New Revision: 5084 Added: tags/pynetsnmp-0.21/ Log: making release 0.21 Copied: tags/pynetsnmp-0.21 (from rev 5083, trunk/pynetsnmp) |
|
From: <sv...@ze...> - 2007-05-03 00:05:16
|
Author: ecn
Date: 2007-05-02 20:05:14 -0400 (Wed, 02 May 2007)
New Revision: 5083
Modified:
trunk/pynetsnmp/netsnmp.py
trunk/pynetsnmp/pkg
Log:
* support net-snmp version 5.3 datastructures
Modified: trunk/pynetsnmp/netsnmp.py
===================================================================
--- trunk/pynetsnmp/netsnmp.py 2007-05-02 21:56:44 UTC (rev 5082)
+++ trunk/pynetsnmp/netsnmp.py 2007-05-03 00:05:14 UTC (rev 5083)
@@ -36,10 +36,12 @@
version = cast(lib.netsnmp_get_version(), c_char_p).value
float_version = float('.'.join(version.split('.')[:-1]))
-if float_version < 5.2:
- localname = []
-else:
+localname = []
+paramName = []
+if float_version > 5.199:
localname = [('localname', c_char_p)]
+ if float_version > 5.299:
+ paramName = [('paramName', c_char_p)]
netsnmp_session._fields_ = [
('version', c_long),
@@ -73,6 +75,7 @@
('securityEngineIDLen', size_t),
('securityName', c_char_p),
('securityNameLen', size_t),
+
('securityAuthProto', POINTER(oid)),
('securityAuthProtoLen', size_t),
('securityAuthKey', u_char * USM_AUTH_KU_LEN),
@@ -87,6 +90,8 @@
('securityPrivLocalKey', c_char_p),
('securityPrivLocalKeyLen', c_size_t),
+ ] + paramName + [
+
('securityModel', c_int),
('securityLevel', c_int),
Modified: trunk/pynetsnmp/pkg
===================================================================
--- trunk/pynetsnmp/pkg 2007-05-02 21:56:44 UTC (rev 5082)
+++ trunk/pynetsnmp/pkg 2007-05-03 00:05:14 UTC (rev 5083)
@@ -4,7 +4,7 @@
exit 1
}
PACKAGE=pynetsnmp
-VERSION=0.2
+VERSION=0.21
VPACKAGE=$PACKAGE-$VERSION
SVN=http://dev.zenoss.org/svn
SVNTRUNK=$SVN/trunk/$PACKAGE
|
|
From: <sv...@ze...> - 2007-05-02 21:56:44
|
Author: ian
Date: 2007-05-02 17:56:44 -0400 (Wed, 02 May 2007)
New Revision: 5082
Modified:
trunk/Products/ZenModel/skins/zenmodel/editUserSettings.pt
Log:
* Enhancement to #1076: Changed text box to a select.
Modified: trunk/Products/ZenModel/skins/zenmodel/editUserSettings.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/editUserSettings.pt 2007-05-02 21:47:50 UTC (rev 5081)
+++ trunk/Products/ZenModel/skins/zenmodel/editUserSettings.pt 2007-05-02 21:56:44 UTC (rev 5082)
@@ -121,8 +121,13 @@
<tr>
<td class="tableheader" align="left">Dashboard Organizer</td>
<td class="tablevalues">
- <input class="tablevalues" type="text" name="dashboardOrganizer"
- tal:attributes="value here/dashboardOrganizer" />
+ <select class="tablevalues" name="dashboardOrganizer"
+ tal:define="options
+ python:['Devices','Systems','Groups','Locations']">
+ <option tal:repeat="option options" tal:content="option"
+ tal:attributes="selected
+ python:here.dashboardOrganizer==option"/>
+ </select>
</td>
</tr>
<tr>
|
|
From: <sv...@ze...> - 2007-05-02 21:47:54
|
Author: ian
Date: 2007-05-02 17:47:50 -0400 (Wed, 02 May 2007)
New Revision: 5081
Modified:
trunk/Products/ZenWidgets/skins/zenui/css/menus.css
Log:
* Fixes #1367: Removed some CSS earlier, now it's back. Here's hoping this doesn't break IE.
Modified: trunk/Products/ZenWidgets/skins/zenui/css/menus.css
===================================================================
--- trunk/Products/ZenWidgets/skins/zenui/css/menus.css 2007-05-02 21:40:30 UTC (rev 5080)
+++ trunk/Products/ZenWidgets/skins/zenui/css/menus.css 2007-05-02 21:47:50 UTC (rev 5081)
@@ -140,6 +140,7 @@
padding:0;
margin:0;
font-weight: normal;
+ position: relative;
}
.menu {
position: relative;
|
|
From: <sv...@ze...> - 2007-05-02 21:40:29
|
Author: marc
Date: 2007-05-02 17:40:30 -0400 (Wed, 02 May 2007)
New Revision: 5080
Modified:
trunk/Products/ZenModel/skins/zenmodel/serviceClassEdit.pt
Log:
* monitored is zMonitor
Modified: trunk/Products/ZenModel/skins/zenmodel/serviceClassEdit.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/serviceClassEdit.pt 2007-05-02 21:37:07 UTC (rev 5079)
+++ trunk/Products/ZenModel/skins/zenmodel/serviceClassEdit.pt 2007-05-02 21:40:30 UTC (rev 5080)
@@ -36,9 +36,9 @@
<tr>
<td class="tableheader">Monitor</td>
<td class="tablevalues">
- <select class="tablevalues" name="monitor:boolean">
+ <select class="tablevalues" name="zMonitor:boolean">
<option tal:repeat="e python:(True,False)" tal:content="e"
- tal:attributes="value e; selected python:e==here.monitored()"/>
+ tal:attributes="value e; selected python:e==here.zMonitor()"/>
</select>
</td>
</tr>
|
|
From: <sv...@ze...> - 2007-05-02 21:37:14
|
Author: ian
Date: 2007-05-02 17:37:07 -0400 (Wed, 02 May 2007)
New Revision: 5079
Modified:
trunk/Products/ZenModel/Device.py
Log:
* Fixes #1361: Ensured that browser isn't redirected to the relationship 'devices'
Modified: trunk/Products/ZenModel/Device.py
===================================================================
--- trunk/Products/ZenModel/Device.py 2007-05-02 21:04:18 UTC (rev 5078)
+++ trunk/Products/ZenModel/Device.py 2007-05-02 21:37:07 UTC (rev 5079)
@@ -1225,6 +1225,8 @@
parent._delObject(self.getId())
if REQUEST:
REQUEST['message'] = "Device deleted"
+ if parent.getId()=='devices':
+ parent = parent.getPrimaryParent()
REQUEST['RESPONSE'].redirect(parent.absolute_url() +
"/deviceOrganizerStatus")
|
|
From: <sv...@ze...> - 2007-05-02 21:05:25
|
Author: marc
Date: 2007-05-02 17:04:18 -0400 (Wed, 02 May 2007)
New Revision: 5078
Modified:
trunk/Products/ZenModel/DeviceClass.py
trunk/Products/ZenModel/migrate/menus.py
trunk/Products/ZenModel/skins/zenmodel/dialog_setPriority.pt
trunk/Products/ZenWidgets/skins/zenui/dialog_setGroups.pt
trunk/Products/ZenWidgets/skins/zenui/dialog_setSystems.pt
Log:
#1365
* Added set perf mon dialog to device lists
* Fixed setter dialogs to have "OK" button
Modified: trunk/Products/ZenModel/DeviceClass.py
===================================================================
--- trunk/Products/ZenModel/DeviceClass.py 2007-05-02 20:45:08 UTC (rev 5077)
+++ trunk/Products/ZenModel/DeviceClass.py 2007-05-02 21:04:18 UTC (rev 5078)
@@ -218,6 +218,18 @@
REQUEST['message'] = "Devices deleted"
return self.callZenScreen(REQUEST)
+ def setPerformanceMonitor(self, performanceMonitor, deviceNames=None, REQUEST=None):
+ """ Provide a method to set performance monitor from any organizer """
+ if not performanceMonitor or not deviceNames:
+ return self()
+ if type(deviceNames) == type(''): deviceNames = (deviceNames,)
+ for devname in deviceNames:
+ dev = self.findDevice(devname)
+ dev.setPerformanceMonitor(performanceMonitor)
+ if REQUEST:
+ REQUEST['message'] = "Performance monitor set to %s" % performanceMonitor
+ REQUEST['RESPONSE'].redirect(self.getPrimaryUrlPath())
+
def setGroups(self, groupPaths=None, deviceNames=None, REQUEST=None):
""" Provide a method to set device groups from any organizer """
if not groupPaths or not deviceNames: return self()
@@ -248,7 +260,7 @@
dev = self.findDevice(devname)
dev.setLocation(locationPath)
if REQUEST:
- REQUEST['message'] = "Location set"
+ REQUEST['message'] = "Location set to %s" % locationPath
return self()
Modified: trunk/Products/ZenModel/migrate/menus.py
===================================================================
--- trunk/Products/ZenModel/migrate/menus.py 2007-05-02 20:45:08 UTC (rev 5077)
+++ trunk/Products/ZenModel/migrate/menus.py 2007-05-02 21:04:18 UTC (rev 5078)
@@ -178,6 +178,12 @@
'isdialog': True,
'ordering': 20.0,
'permissions': ('Change Device',)},
+ { 'action': 'dialog_setPerformanceMonitor',
+ 'description': 'Set Performance Monitor...',
+ 'id': 'setPerformanceMonitor',
+ 'isdialog': True,
+ 'ordering': 15.0,
+ 'permissions': ('Change Device',)},
{ 'action': 'dialog_removeDevices',
'description': 'Delete devices...',
'id': 'removeDevices',
Modified: trunk/Products/ZenModel/skins/zenmodel/dialog_setPriority.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/dialog_setPriority.pt 2007-05-02 20:45:08 UTC (rev 5077)
+++ trunk/Products/ZenModel/skins/zenmodel/dialog_setPriority.pt 2007-05-02 21:04:18 UTC (rev 5078)
@@ -1,16 +1,11 @@
<h2>Set Priority</h2>
-
-<form action="_" method="post"
- tal:attributes="action here/REQUEST/URL1">
+<form action="_" method="post" tal:attributes="action here/REQUEST/URL1">
<p>
-What priority would you like set?<br/>
-<br/>
<select name="priority:int"
tal:define="
priorities here/getPriorityConversions;
curpriority device/priority |
- request/priority | python:1000"
- >
+ request/priority | python:1000">
<option tal:repeat="priority priorities"
tal:attributes="value python:priority[1];
selected python:curpriority == priority[1]"
@@ -19,8 +14,7 @@
</p>
<br/>
<div id="dialog_buttons">
-<input type="submit" name="setPriority:method"
- value="OK" />
+<input type="submit" name="setPriority:method" value="OK" />
<input id="dialog_cancel" type="button" value="Cancel"
onclick="$('dialog').hide()"/>
</div>
Modified: trunk/Products/ZenWidgets/skins/zenui/dialog_setGroups.pt
===================================================================
--- trunk/Products/ZenWidgets/skins/zenui/dialog_setGroups.pt 2007-05-02 20:45:08 UTC (rev 5077)
+++ trunk/Products/ZenWidgets/skins/zenui/dialog_setGroups.pt 2007-05-02 21:04:18 UTC (rev 5078)
@@ -1,8 +1,4 @@
<h2>Set Groups</h2>
-<p>
-Which groups would you like to set for these devices?<br/>
-</p>
-<br/>
<p style="text-align:center;font-size:0.8em;">
<select class="tablevalues" name="groupPaths:list" multiple
tal:define="groups python:here.getDmdRoot('Groups').getOrganizerNames(True)" >
@@ -12,10 +8,9 @@
</select>
</p>
<div id="dialog_buttons">
-<input type="submit" name="setGroups:method"
- value="Set Groups"
+<input type="submit" name="setGroups:method" value="OK"
tal:attributes="onclick string:return $$('dialog').submit_form(
'${here/getPrimaryUrlPath}')" />
<input id="dialog_cancel" type="button" value="Cancel"
-onclick="$('dialog').hide()"/>
+ onclick="$('dialog').hide()"/>
</div>
Modified: trunk/Products/ZenWidgets/skins/zenui/dialog_setSystems.pt
===================================================================
--- trunk/Products/ZenWidgets/skins/zenui/dialog_setSystems.pt 2007-05-02 20:45:08 UTC (rev 5077)
+++ trunk/Products/ZenWidgets/skins/zenui/dialog_setSystems.pt 2007-05-02 21:04:18 UTC (rev 5078)
@@ -1,7 +1,4 @@
<h2>Set Systems</h2>
-<p>
-Which systems would you like to set for these devices?
-</p>
<p style="text-align:center;font-size:0.8em;">
<select class="tablevalues" name="systemPaths:list" multiple
tal:define="systems python:here.getDmdRoot('Systems').getOrganizerNames(True)" >
@@ -11,10 +8,9 @@
</select>
</p>
<div id="dialog_buttons">
-<input type="submit" name="setSystems:method"
- value="Set Systems"
+<input type="submit" name="setSystems:method" value="OK"
tal:attributes="onclick string:return $$('dialog').submit_form(
'${here/getPrimaryUrlPath}')" />
<input id="dialog_cancel" type="button" value="Cancel"
-onclick="$('dialog').hide()"/>
+ onclick="$('dialog').hide()"/>
</div>
|
|
From: <sv...@ze...> - 2007-05-02 20:45:29
|
Author: ecn
Date: 2007-05-02 16:45:08 -0400 (Wed, 02 May 2007)
New Revision: 5077
Modified:
trunk/Products/ZenModel/skins/zenmodel/zenrrdzoom.js
Log:
* Fixes #1342: set height on graph panning buttons
Modified: trunk/Products/ZenModel/skins/zenmodel/zenrrdzoom.js
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/zenrrdzoom.js 2007-05-02 20:06:06 UTC (rev 5076)
+++ trunk/Products/ZenModel/skins/zenmodel/zenrrdzoom.js 2007-05-02 20:45:08 UTC (rev 5077)
@@ -47,16 +47,18 @@
var table = function(obj, newme) {
- _height = function(o) { return String(o.height + 14)+'px'; };
+ _height = function(o) {
+ return String(getElementDimensions(o).h + 14)+'px';
+ };
return TABLE({'id':obj.id + '_table'},
TBODY({'id':obj.id + '_tbody'},
[TR(null,[TD({'rowspan':'2','style':'background-color:lightgrey;'
},INPUT({'type':'button',
- 'id':obj.id + '_panl','style':'height:'+_height(obj)+';border:1px solid grey;' +
+ 'id':obj.id + '_panl','style':'border:1px solid grey;' +
'cursor:pointer','value':'<', 'onfocus':'this.blur();'},"<")),
TD({'rowspan':'2'},newme),TD({'rowspan':'2','style':'background-color:lightgrey;'
},INPUT({'type':'button',
- 'id':obj.id + '_panr','style':'height:'+_height(obj)+';border:1px solid grey;'+
+ 'id':obj.id + '_panr','style':'border:1px solid grey;'+
'cursor:pointer','value':'>','onfocus':'this.blur();'},">")),
TD({'id' : obj.id + '_zin','style':'cursor:pointer;background-color:grey;'+
'width:3em;text-align:center;' +'border:1px solid grey;'},
@@ -79,6 +81,7 @@
this.setDates();
this.buildTables();
this.registerListeners();
+ this.loadImage();
},
updateFromUrl: function() {
@@ -249,10 +252,13 @@
if (this.obj.src!=this.url) {
this.obj.src = this.url;
};
+ var myh = getElementDimensions(this.obj).h;
+ setElementDimensions(this.panl, {'h':myh});
+ setElementDimensions(this.panr, {'h':myh});
disconnectAll(this.buffer);
delete this.buffer;
};
- var x = connect(this.buffer, 'onload', onSuccess.bind(this));
+ var x = connect(this.buffer, 'onload', bind(onSuccess, this));
this.buffer.src = this.url;
},
|
|
From: <sv...@ze...> - 2007-05-02 20:06:47
|
Author: ian
Date: 2007-05-02 16:06:06 -0400 (Wed, 02 May 2007)
New Revision: 5076
Modified:
trunk/Products/ZenEvents/EventManagerBase.py
trunk/Products/ZenModel/UserSettings.py
trunk/Products/ZenModel/skins/zenmodel/Dashboard.pt
trunk/Products/ZenModel/skins/zenmodel/dashboard.js
trunk/Products/ZenModel/skins/zenmodel/editUserSettings.pt
Log:
* Fixes #1076: Added user setting to determine the organizer for the dashboard portlet
Modified: trunk/Products/ZenEvents/EventManagerBase.py
===================================================================
--- trunk/Products/ZenEvents/EventManagerBase.py 2007-05-02 19:00:52 UTC (rev 5075)
+++ trunk/Products/ZenEvents/EventManagerBase.py 2007-05-02 20:06:06 UTC (rev 5076)
@@ -868,14 +868,14 @@
security.declareProtected('View','getDashboardInfo')
- def getDashboardInfo(self, simple=False, REQUEST=None):
+ def getDashboardInfo(self, simple=False, organizer='Devices', REQUEST=None):
"""Return a dictionary that has all info for the dashboard.
"""
data = self.checkCache("dashboardinfo%s" % simple)
if data: return data
data = {}
data['systemevents'] = self.getOrganizerSummary(
- 'Systems','viewEvents', simple)
+ organizer,'viewEvents', simple)
# Dashboard just wants the first 3 elements of each heartbeat
data['heartbeat'] = [h[:3] for h in self.getHeartbeat()]
data['deviceevents'] = self.getDeviceDashboard(simple)
Modified: trunk/Products/ZenModel/UserSettings.py
===================================================================
--- trunk/Products/ZenModel/UserSettings.py 2007-05-02 19:00:52 UTC (rev 5075)
+++ trunk/Products/ZenModel/UserSettings.py 2007-05-02 20:06:06 UTC (rev 5076)
@@ -314,6 +314,7 @@
escalationMinutes = 0
dashboardRefresh = 30
dashboardTimeout = 25
+ dashboardOrganizer = 'Devices'
_properties = ZenModelRM._properties + (
{'id':'email', 'type':'string', 'mode':'w'},
@@ -327,6 +328,7 @@
{'id':'escalationMinutes', 'type':'int', 'mode':'w'},
{'id':'dashboardRefresh', 'type':'int', 'mode':'w'},
{'id':'dashboardTimeout', 'type':'int', 'mode':'w'},
+ {'id':'dashboardOrganizer', 'type':'string', 'mode':'w'},
)
Modified: trunk/Products/ZenModel/skins/zenmodel/Dashboard.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/Dashboard.pt 2007-05-02 19:00:52 UTC (rev 5075)
+++ trunk/Products/ZenModel/skins/zenmodel/Dashboard.pt 2007-05-02 20:06:06 UTC (rev 5076)
@@ -16,14 +16,17 @@
</tal:block>
<tal:block metal:fill-slot="contentPane">
+ <script type="text/javascript" src="/zport/js/MochiKit.js"></script>
+ <script type="text/javascript" src="/zport/js/zenutils.js"></script>
+ <script tal:define="userSettings python:here.ZenUsers.getUserSettings()"
+ tal:content="string:
+ var dashparams = {'organizer':'${userSettings/dashboardOrganizer}'};
+ var refresh = ${userSettings/dashboardRefresh};
+ var timeout = ${userSettings/dashboardTimeout};
+ "></script>
<script type="text/javascript">
var dashurl='/zport/dmd/ZenEventManager/getDashboardInfo'
</script>
- <script type="text/javascript" src="/zport/js/MochiKit.js"></script>
- <script type="text/javascript" src="/zport/js/zenutils.js"></script>
- <script type="text/javascript"
- tal:define="userSettings python:here.ZenUsers.getUserSettings()"
- tal:content="string:var refresh=${userSettings/dashboardRefresh}; var timeout=${userSettings/dashboardTimeout}"/>
<script type="text/javascript" src="dashboard.js"></script>
<table width=100%>
<tr>
@@ -36,11 +39,13 @@
<!-- Begin Systems Portlet -->
-<tal:block tal:define="tabletitle string:Systems Level Event Summary">
+<tal:block tal:define="userSettings python:here.ZenUsers.getUserSettings();
+ tabletitle string: ${userSettings/dashboardOrganizer} Level Event Summary">
<tal:block metal:use-macro="here/zenuimacros/macros/zentable">
<div metal:fill-slot="zentablecontents" tal:omit-tag="">
<tr>
- <th class="tableheader">System</th>
+ <th class="tableheader" tal:content="
+ python:userSettings.dashboardOrganizer[:-1]"></th>
<th class="tableheader">Critical</th>
<th class="tableheader">Error</th>
<th class="tableheader">Warn</th>
Modified: trunk/Products/ZenModel/skins/zenmodel/dashboard.js
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/dashboard.js 2007-05-02 19:00:52 UTC (rev 5075)
+++ trunk/Products/ZenModel/skins/zenmodel/dashboard.js 2007-05-02 20:06:06 UTC (rev 5076)
@@ -87,7 +87,7 @@
refreshData = function() {
log("Loading dashboard data...");
var defr = cancelWithTimeout(
- loadJSONDoc(dashurl), timeout); // timeout set on Dashboard
+ loadJSONDoc(dashurl, dashparams), timeout); // timeout set on Dashboard
defr.addCallback(updateDashboard);
defr.addErrback(updateError);
callLater(refresh, refreshData, dashurl); // refresh set on Dashboard
Modified: trunk/Products/ZenModel/skins/zenmodel/editUserSettings.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/editUserSettings.pt 2007-05-02 19:00:52 UTC (rev 5075)
+++ trunk/Products/ZenModel/skins/zenmodel/editUserSettings.pt 2007-05-02 20:06:06 UTC (rev 5076)
@@ -119,6 +119,13 @@
</td>
</tr>
<tr>
+ <td class="tableheader" align="left">Dashboard Organizer</td>
+ <td class="tablevalues">
+ <input class="tablevalues" type="text" name="dashboardOrganizer"
+ tal:attributes="value here/dashboardOrganizer" />
+ </td>
+ </tr>
+ <tr>
<td class=tableheader align="left" >
</td>
<td align="left" class="tableheader" colspan=3>
|
|
From: <sv...@ze...> - 2007-05-02 19:00:54
|
Author: marc
Date: 2007-05-02 15:00:52 -0400 (Wed, 02 May 2007)
New Revision: 5075
Added:
trunk/Products/ZenModel/skins/zenmodel/dialog_addActionRule.pt
trunk/Products/ZenModel/skins/zenmodel/dialog_addActionRuleWindow.pt
trunk/Products/ZenModel/skins/zenmodel/dialog_addAdministrator.pt
trunk/Products/ZenModel/skins/zenmodel/dialog_addEventView.pt
trunk/Products/ZenModel/skins/zenmodel/dialog_addMaintenanceWindow.pt
trunk/Products/ZenModel/skins/zenmodel/dialog_addUserCommand.pt
trunk/Products/ZenModel/skins/zenmodel/dialog_deleteActionRuleWindows.pt
trunk/Products/ZenModel/skins/zenmodel/dialog_deleteActionRules.pt
trunk/Products/ZenModel/skins/zenmodel/dialog_deleteAdministrators.pt
trunk/Products/ZenModel/skins/zenmodel/dialog_deleteEventViews.pt
trunk/Products/ZenModel/skins/zenmodel/dialog_deleteMaintenanceWindows.pt
trunk/Products/ZenModel/skins/zenmodel/dialog_deleteUserCommands.pt
trunk/Products/ZenModel/skins/zenmodel/dialog_saveAdministrators.pt
Modified:
trunk/Products/ZenEvents/skins/zenevents/editActionRuleSchedule.pt
trunk/Products/ZenEvents/skins/zenevents/editActionRules.pt
trunk/Products/ZenEvents/skins/zenevents/editEventViews.pt
trunk/Products/ZenModel/Manufacturer.py
trunk/Products/ZenModel/System.py
trunk/Products/ZenModel/migrate/menus.py
trunk/Products/ZenModel/skins/zenmodel/deviceManagement.pt
trunk/Products/ZenModel/skins/zenmodel/maintenanceWindowsMacro.pt
trunk/Products/ZenModel/skins/zenmodel/userCommandsMacros.pt
Log:
#1359
* Added many dialogs
* Removed editor row (Add, Delete) from tables
* Added new menus to tables
Modified: trunk/Products/ZenEvents/skins/zenevents/editActionRuleSchedule.pt
===================================================================
--- trunk/Products/ZenEvents/skins/zenevents/editActionRuleSchedule.pt 2007-05-02 18:41:10 UTC (rev 5074)
+++ trunk/Products/ZenEvents/skins/zenevents/editActionRuleSchedule.pt 2007-05-02 19:00:52 UTC (rev 5075)
@@ -5,10 +5,12 @@
<input type="hidden" name="zenScreenName" tal:attributes="value template/id"/>
- <tal:block tal:define="objects here/windows/objectValuesAll;
- tableName string:actionrulewindow;
- batch python:here.ZenTableManager.getBatch(tableName,objects);
- tabletitle string:Active Periods">
+ <tal:block tal:define="
+ objects here/windows/objectValuesAll;
+ tableName string:actionrulewindow;
+ batch python:here.ZenTableManager.getBatch(tableName,objects);
+ tabletitle string:Active Periods;
+ menu_id string:ActionRuleWindow_list">
<tal:block metal:use-macro="here/zenuimacros/macros/zentable">
<!--====Optional titlebar slots=============
@@ -66,17 +68,6 @@
<span metal:use-macro="here/zenTableNavigation/macros/navbody" />
</td>
</tr>
- <tr tal:condition="here/isManager">
- <td class="tableheader" colspan="7">
- <input type="hidden" name="id" tal:attributes="value here/getId"/>
- <input class="tableheader" type="text" name="newId"/>
- <input class="tableheader" type="submit"
- name="manage_addActionRuleWindow:method" value=" Add " />
- |
- <input class="tableheader" type="submit"
- name="manage_deleteActionRuleWindow:method" value=" Delete " />
- </td>
- </tr>
<!-- END TABLE CONTENTS -->
Modified: trunk/Products/ZenEvents/skins/zenevents/editActionRules.pt
===================================================================
--- trunk/Products/ZenEvents/skins/zenevents/editActionRules.pt 2007-05-02 18:41:10 UTC (rev 5074)
+++ trunk/Products/ZenEvents/skins/zenevents/editActionRules.pt 2007-05-02 19:00:52 UTC (rev 5075)
@@ -4,11 +4,13 @@
<input type="hidden" name="zenScreenName" tal:attributes="value template/id"/>
- <tal:block tal:define="objects python:here.objectValues(spec='ActionRule');
- tableName string:eventactionrules;
- zem here/ZenTableManager;
- batch python:zem.getBatch(tableName,objects);
- tabletitle string:Alerting Rules">
+ <tal:block tal:define="
+ objects python:here.objectValues(spec='ActionRule');
+ tableName string:eventactionrules;
+ zem here/ZenTableManager;
+ batch python:zem.getBatch(tableName,objects);
+ tabletitle string:Alerting Rules;
+ menu_id string:ActionRule_list">
<tal:block metal:use-macro="here/zenuimacros/macros/zentable">
<!--====Optional titlebar slots=============
@@ -56,16 +58,6 @@
<span metal:use-macro="here/zenTableNavigation/macros/navbody"/>
</td>
</tr>
- <tr tal:condition="here/iseditable">
- <td class="tableheader" colspan="4">
- <input class="tableheader" type="text" name="id"/>
- <input class="tableheader" type="submit"
- name="manage_addActionRule:method" value=" Add " />
- |
- <input class="tableheader" type="submit"
- name="manage_deleteObjects:method" value=" Delete " />
- </td>
- </tr>
<!-- END TABLE CONTENTS -->
Modified: trunk/Products/ZenEvents/skins/zenevents/editEventViews.pt
===================================================================
--- trunk/Products/ZenEvents/skins/zenevents/editEventViews.pt 2007-05-02 18:41:10 UTC (rev 5074)
+++ trunk/Products/ZenEvents/skins/zenevents/editEventViews.pt 2007-05-02 19:00:52 UTC (rev 5075)
@@ -4,11 +4,13 @@
<input type="hidden" name="zenScreenName" tal:attributes="value template/id"/>
- <tal:block tal:define="objects python:here.objectValues(spec='CustomEventView');
- tableName string:eventactionrules;
- zem here/ZenTableManager;
- batch python:zem.getBatch(tableName,objects);
- tabletitle string:">
+ <tal:block tal:define="
+ objects python:here.objectValues(spec='CustomEventView');
+ tableName string:eventactionrules;
+ zem here/ZenTableManager;
+ batch python:zem.getBatch(tableName,objects);
+ tabletitle string:Event Views;
+ menu_id string:EventView_list">
<tal:block metal:use-macro="here/zenuimacros/macros/zentable">
<!--====Optional titlebar slots=============
@@ -66,16 +68,6 @@
<span metal:use-macro="here/zenTableNavigation/macros/navbody"/>
</td>
</tr>
- <tr tal:condition="here/iseditable">
- <td class="tableheader" colspan="4">
- <input class="tableheader" type="text" name="id"/>
- <input class="tableheader" type="submit"
- name="manage_addCustomEventView:method" value=" Add " />
- |
- <input class="tableheader" type="submit"
- name="manage_deleteObjects:method" value=" Delete " />
- </td>
- </tr>
<!-- END TABLE CONTENTS -->
Modified: trunk/Products/ZenModel/Manufacturer.py
===================================================================
--- trunk/Products/ZenModel/Manufacturer.py 2007-05-02 18:41:10 UTC (rev 5074)
+++ trunk/Products/ZenModel/Manufacturer.py 2007-05-02 19:00:52 UTC (rev 5075)
@@ -91,11 +91,11 @@
, 'action' : 'editManufacturer'
, 'permissions' : ("Manage DMD", )
},
- #{ 'id' : 'config'
- #, 'name' : 'zProperties'
- #, 'action' : 'zPropertyEdit'
- #, 'permissions' : ("Manage DMD",)
- #},
+ { 'id' : 'config'
+ , 'name' : 'zProperties'
+ , 'action' : 'zPropertyEdit'
+ , 'permissions' : ("Manage DMD",)
+ },
{ 'id' : 'viewHistory'
, 'name' : 'Modifications'
, 'action' : 'viewHistory'
Modified: trunk/Products/ZenModel/System.py
===================================================================
--- trunk/Products/ZenModel/System.py 2007-05-02 18:41:10 UTC (rev 5074)
+++ trunk/Products/ZenModel/System.py 2007-05-02 19:00:52 UTC (rev 5075)
@@ -106,11 +106,11 @@
, 'permissions' : (
permissions.view, )
},
- { 'id' : 'manage'
- , 'name' : 'Administration'
- , 'action' : 'deviceOrganizerManage'
- , 'permissions' : ('Manage DMD',)
- },
+ #{ 'id' : 'manage'
+ #, 'name' : 'Administration'
+ #, 'action' : 'deviceOrganizerManage'
+ #, 'permissions' : ('Manage DMD',)
+ #},
)
},
)
Modified: trunk/Products/ZenModel/migrate/menus.py
===================================================================
--- trunk/Products/ZenModel/migrate/menus.py 2007-05-02 18:41:10 UTC (rev 5074)
+++ trunk/Products/ZenModel/migrate/menus.py 2007-05-02 19:00:52 UTC (rev 5075)
@@ -838,6 +838,84 @@
'isdialog': True,
'ordering': 80.0,
'permissions': ('Manage DMD',)}],
+'EventView_list': [ { 'action': 'dialog_addEventView',
+ 'description': 'Add Event View...',
+ 'id': 'addEventView',
+ 'isdialog': True,
+ 'ordering': 90.0,
+ 'permissions': ('Manage DMD',)},
+ { 'action': 'dialog_deleteEventViews',
+ 'description': 'Delete Event Views...',
+ 'id': 'deleteEventViews',
+ 'isdialog': True,
+ 'ordering': 80.0,
+ 'permissions': ('Manage DMD',)}],
+'ActionRule_list': [ { 'action': 'dialog_addActionRule',
+ 'description': 'Add Alerting Rule...',
+ 'id': 'addActionRule',
+ 'isdialog': True,
+ 'ordering': 90.0,
+ 'permissions': ('Manage DMD',)},
+ { 'action': 'dialog_deleteActionRules',
+ 'description': 'Delete Alerting Rules...',
+ 'id': 'deleteActionRules',
+ 'isdialog': True,
+ 'ordering': 80.0,
+ 'permissions': ('Manage DMD',)}],
+'ActionRuleWindow_list': [ { 'action': 'dialog_addActionRuleWindow',
+ 'description': 'Add Action Rule Window...',
+ 'id': 'addActionRuleWindow',
+ 'isdialog': True,
+ 'ordering': 90.0,
+ 'permissions': ('Manage DMD',)},
+ { 'action': 'dialog_deleteActionRuleWindows',
+ 'description': 'Delete Action Rule Windows...',
+ 'id': 'deleteActionRuleWindows',
+ 'isdialog': True,
+ 'ordering': 80.0,
+ 'permissions': ('Manage DMD',)}],
+'Administrator_list': [ { 'action': 'dialog_addAdministrator',
+ 'description': 'Add Administrator...',
+ 'id': 'addAdministrator',
+ 'isdialog': True,
+ 'ordering': 90.0,
+ 'permissions': ('Manage DMD',)},
+ { 'action': 'dialog_deleteAdministrators',
+ 'description': 'Delete Administrators...',
+ 'id': 'deleteAdministrators',
+ 'isdialog': True,
+ 'ordering': 80.0,
+ 'permissions': ('Manage DMD',)},
+ { 'action': 'dialog_saveAdministrators',
+ 'description': 'Save Administrators...',
+ 'id': 'saveAdministrators',
+ 'isdialog': True,
+ 'ordering': 85.0,
+ 'permissions': ('Manage DMD',)}],
+'UserCommand_list': [ { 'action': 'dialog_addUserCommand',
+ 'description': 'Add User Command...',
+ 'id': 'addUserCommand',
+ 'isdialog': True,
+ 'ordering': 90.0,
+ 'permissions': ('Manage DMD',)},
+ { 'action': 'dialog_deleteUserCommands',
+ 'description': 'Delete User Commands...',
+ 'id': 'deleteUserCommands',
+ 'isdialog': True,
+ 'ordering': 80.0,
+ 'permissions': ('Manage DMD',)}],
+'MaintenanceWindow_list': [ { 'action': 'dialog_addMaintenanceWindow',
+ 'description': 'Add Maintenance Window...',
+ 'id': 'addMaintenanceWindow',
+ 'isdialog': True,
+ 'ordering': 90.0,
+ 'permissions': ('Manage DMD',)},
+ { 'action': 'dialog_deleteMaintenanceWindows',
+ 'description': 'Delete Maintenance Windows...',
+ 'id': 'deleteMaintenanceWindows',
+ 'isdialog': True,
+ 'ordering': 80.0,
+ 'permissions': ('Manage DMD',)}],
'Subnetworks': [ { 'action': 'javascript:submitFormToMethod("subnetworkForm", "discoverDevices")',
'allowed_classes': ('IpNetwork',),
'description': 'Discover Devices',
Modified: trunk/Products/ZenModel/skins/zenmodel/deviceManagement.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/deviceManagement.pt 2007-05-02 18:41:10 UTC (rev 5074)
+++ trunk/Products/ZenModel/skins/zenmodel/deviceManagement.pt 2007-05-02 19:00:52 UTC (rev 5075)
@@ -23,7 +23,8 @@
editable here/isManager;
tableName string:deviceadminroles;
tabletitle string:Administrators;
- batch python:here.ZenTableManager.getBatch(tableName,objects); ">
+ batch python:here.ZenTableManager.getBatch(tableName,objects);
+ menu_id string:Administrator_list">
<tal:block metal:use-macro="here/zenuimacros/macros/zentable">
<!--====================
@@ -85,23 +86,6 @@
<span metal:use-macro="here/zenTableNavigation/macros/navbody" />
</td>
</tr>
- <tr tal:condition="here/isManager">
- <td class="tableheader" colspan="5">
- <select class="tableheader" name="newId"
- tal:define="us python:here.ZenUsers.getAllUserSettingsNames(
- here.adminRoles.objectIds())">
- <option tal:repeat="u us" tal:content="u"/>
- </select>
- <input class="tableheader" type="submit"
- name="manage_addAdministrativeRole:method" value=" Add " />
- |
- <input class="tableheader" type="submit"
- name="manage_editAdministrativeRoles:method" value=" Save " />
- |
- <input class="tableheader" type="submit"
- name="manage_deleteAdministrativeRole:method" value=" Delete " />
- </td>
- </tr>
<!-- END TABLE CONTENTS -->
Added: trunk/Products/ZenModel/skins/zenmodel/dialog_addActionRule.pt
Added: trunk/Products/ZenModel/skins/zenmodel/dialog_addActionRuleWindow.pt
Added: trunk/Products/ZenModel/skins/zenmodel/dialog_addAdministrator.pt
Added: trunk/Products/ZenModel/skins/zenmodel/dialog_addEventView.pt
Added: trunk/Products/ZenModel/skins/zenmodel/dialog_addMaintenanceWindow.pt
Added: trunk/Products/ZenModel/skins/zenmodel/dialog_addUserCommand.pt
Added: trunk/Products/ZenModel/skins/zenmodel/dialog_deleteActionRuleWindows.pt
Added: trunk/Products/ZenModel/skins/zenmodel/dialog_deleteActionRules.pt
Added: trunk/Products/ZenModel/skins/zenmodel/dialog_deleteAdministrators.pt
Added: trunk/Products/ZenModel/skins/zenmodel/dialog_deleteEventViews.pt
Added: trunk/Products/ZenModel/skins/zenmodel/dialog_deleteMaintenanceWindows.pt
Added: trunk/Products/ZenModel/skins/zenmodel/dialog_deleteUserCommands.pt
Added: trunk/Products/ZenModel/skins/zenmodel/dialog_saveAdministrators.pt
Modified: trunk/Products/ZenModel/skins/zenmodel/maintenanceWindowsMacro.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/maintenanceWindowsMacro.pt 2007-05-02 18:41:10 UTC (rev 5074)
+++ trunk/Products/ZenModel/skins/zenmodel/maintenanceWindowsMacro.pt 2007-05-02 19:00:52 UTC (rev 5075)
@@ -7,7 +7,8 @@
objects here/maintenanceWindows/objectValuesAll;
tableName string:devicemaintenancewindow;
batch python:here.ZenTableManager.getBatch(tableName,objects);
- tabletitle string:Maintenance Windows;">
+ tabletitle string:Maintenance Windows;
+ menu_id string:MaintenanceWindow_list">
<tal:block metal:use-macro="here/zenuimacros/macros/zentable">
<!--====================
@@ -77,17 +78,7 @@
<span metal:use-macro="here/zenTableNavigation/macros/navbody" />
</td>
</tr>
- <tr tal:condition="here/isManager">
- <td class="tableheader" colspan="7">
- <input type="hidden" name="id" tal:attributes="value here/getId"/>
- <input class="tableheader" type="text" name="newId"/>
- <input class="tableheader" type="submit"
- name="manage_addMaintenanceWindow:method" value=" Add " />
- |
- <input class="tableheader" type="submit"
- name="manage_deleteMaintenanceWindow:method" value=" Delete " />
- </td>
- </tr>
+
<!-- END TABLE CONTENTS -->
</tal:block>
Modified: trunk/Products/ZenModel/skins/zenmodel/userCommandsMacros.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/userCommandsMacros.pt 2007-05-02 18:41:10 UTC (rev 5074)
+++ trunk/Products/ZenModel/skins/zenmodel/userCommandsMacros.pt 2007-05-02 19:00:52 UTC (rev 5075)
@@ -6,7 +6,8 @@
editable here/isManager;
showfilterbox python:True;
tableName string:userCommands;
- batch python:here.ZenTableManager.getBatch(tableName,objects);">
+ batch python:here.ZenTableManager.getBatch(tableName,objects);
+ menu_id string:UserCommand_list">
<input type="hidden" name="zenScreenName" tal:attributes="value template/id"/>
<input type='hidden' name='tableName' tal:attributes="value tableName" />
@@ -61,18 +62,7 @@
<span metal:use-macro="here/zenTableNavigation/macros/navbody" />
</td>
</tr>
- <tr tal:condition="here/isManager">
- <td class="tableheader" colspan="5">
- <input type="hidden" name="id" tal:attributes="value here/getId"/>
- <input class="tableheader" type="text" name="newId"/>
- <input class="tableheader" type="submit"
- name="manage_addUserCommand:method" value=" Add " />
- |
- <input class="tableheader" type="submit"
- name="manage_deleteUserCommand:method" value=" Delete " />
- </td>
- </tr>
<!-- END TABLE CONTENTS -->
</tal:block>
|
|
From: <sv...@ze...> - 2007-05-02 18:41:13
|
Author: ian
Date: 2007-05-02 14:41:10 -0400 (Wed, 02 May 2007)
New Revision: 5074
Modified:
trunk/Products/ZenModel/skins/zenmodel/templates.pt
trunk/Products/ZenModel/skins/zenmodel/zenoss.css
Log:
* Fixes #1364: redid the selected tab CSS
Modified: trunk/Products/ZenModel/skins/zenmodel/templates.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/templates.pt 2007-05-02 18:28:21 UTC (rev 5073)
+++ trunk/Products/ZenModel/skins/zenmodel/templates.pt 2007-05-02 18:41:10 UTC (rev 5074)
@@ -317,6 +317,7 @@
<tal:block tal:condition="python:tab.get('selected', None)">
+ <div class="tablinehider"></div>
<div class="tableft">
<div class="tabright">
<div class="tabcenter">
Modified: trunk/Products/ZenModel/skins/zenmodel/zenoss.css
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/zenoss.css 2007-05-02 18:28:21 UTC (rev 5073)
+++ trunk/Products/ZenModel/skins/zenmodel/zenoss.css 2007-05-02 18:41:10 UTC (rev 5074)
@@ -316,6 +316,7 @@
height: 23px;
margin: 0px;
padding: 0px;
+ table-layout: fixed;
}
table.tabtable td {
@@ -323,6 +324,7 @@
margin: 0px;
text-align: center;
vertical-align: bottom;
+ position: relative;
}
table.tabtable td a.tabletitle {
@@ -354,40 +356,52 @@
}
table.tabtable td.tabtablecap {
- background: transparent url('img/tabtable_rounded_cap.gif') 0px 8px no-repeat;
+ background: transparent url('img/tabtable_rounded_cap.gif') 0px 11px no-repeat;
width: 21px;
}
table.tabtable td.tabtableleftcap {
- background: transparent url('img/tabtable_rounded_cap_left.gif') 0px 8px no-repeat;
+ background: transparent url('img/tabtable_rounded_cap_left.gif') 0px 11px no-repeat;
width: 21px;
}
table.tabtable td.tabletitleselected {
+ white-space: nowrap;
color: #333333;
- height: 29px;
+ height: 32px;
font-size:8pt;
padding-top: 3px;
background-color: white;
border: 0px;
}
+
+table.tabtable td.tabletitleselected div.tablinehider {
+ background-color: #E0E0E0;
+ height: 10px;
+ margin-left: 5px;
+ margin-right: 5px;
+ position: absolute;
+ bottom: -3px;
+ width: 75%;
+}
+
table.tabtable div.tableft {
background: transparent url(img/tab_bg_selected.gif) no-repeat left 0pt;
- height: 30px;
- overflow: hidden;
+ height: 32px;
}
+
table.tabtable div.tabright {
background: transparent url(img/tab_bg_selected.gif) no-repeat right 0pt;
- height: 30px;
- overflow: hidden;
+ height: 32px;
}
+
table.tabtable div.tabcenter {
margin: 0px 14px;
padding: 0px 10px;
height: 32px;
background: transparent url(img/tab_bg_selected_cont.gif) repeat-x scroll 1pt 0pt;
- overflow: hidden;
}
+
table.tabtable td.tabletitleselected a,
table.tabtable td.tabletitleselected a:visited,
table.tabtable td.tabletitleselected a:link {
@@ -400,8 +414,6 @@
background: none;
}
-
-
table.zentable {
font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 8pt;
@@ -446,7 +458,6 @@
}
#selectedtablinehider {
- background-color: blue;
height: 3px;
z-index: 2999;
position: absolute;
|
|
From: <sv...@ze...> - 2007-05-02 18:28:21
|
Author: edahl
Date: 2007-05-02 14:28:21 -0400 (Wed, 02 May 2007)
New Revision: 5073
Modified:
trunk/Products/ZenHub/services/PerformanceConfig.py
Log:
* handle case where there is no performance monitor on a changed device
Modified: trunk/Products/ZenHub/services/PerformanceConfig.py
===================================================================
--- trunk/Products/ZenHub/services/PerformanceConfig.py 2007-05-02 18:03:57 UTC (rev 5072)
+++ trunk/Products/ZenHub/services/PerformanceConfig.py 2007-05-02 18:28:21 UTC (rev 5073)
@@ -59,7 +59,7 @@
return self.config.getDefaultRRDCreateCommand(*args, **kwargs)
def notifyAll(self, device):
- if device.perfServer().id == self.instance:
+ if device.perfServer.getRelatedId() == self.instance:
self.procrastinator.doLater(device)
def pushConfig(self, device):
|
|
From: <sv...@ze...> - 2007-05-02 18:03:58
|
Author: ecn Date: 2007-05-02 14:03:57 -0400 (Wed, 02 May 2007) New Revision: 5072 Modified: trunk/wmi/GNUmakefile Log: need to install off DESTDIR Modified: trunk/wmi/GNUmakefile =================================================================== --- trunk/wmi/GNUmakefile 2007-05-02 18:03:01 UTC (rev 5071) +++ trunk/wmi/GNUmakefile 2007-05-02 18:03:57 UTC (rev 5072) @@ -12,12 +12,12 @@ DATE=$(shell date +%Y%m%d) pywmi-installed: $(DESTDIR)$(PYLIBDIR) $(DESTDIR)$(ZENBIN) - cd Samba/source && \ - ./autogen.sh && \ - CPPFLAGS="-I$(PYINCLUDE)" ./configure --without-readline && \ + cd Samba/source && \ + ./autogen.sh && \ + CPPFLAGS="-I$(PYINCLUDE)" ./configure --without-readline && \ $(MAKE) proto bin/wmic bin/wmis wmi/_pywmi.so bin/winexe && \ - cp bin/winexe $(ZENBIN) && \ - cp wmi/_pywmi.so $(DESTDIR)$(PYLIBDIR) && \ + cp bin/winexe $(DESTDIR)$(ZENBIN) && \ + cp wmi/_pywmi.so $(DESTDIR)$(PYLIBDIR) && \ cp wmi/pywmi.py $(DESTDIR)$(PYLIBDIR) $(DESTDIR)$(ZENBIN) $(DESTDIR)$(PYLIBDIR): |
|
From: <sv...@ze...> - 2007-05-02 18:03:04
|
Author: edahl
Date: 2007-05-02 14:03:01 -0400 (Wed, 02 May 2007)
New Revision: 5071
Modified:
trunk/Products/ZenModel/DeviceClass.py
trunk/Products/ZenModel/DeviceOrganizer.py
trunk/Products/ZenModel/ProductClass.py
trunk/Products/ZenModel/System.py
trunk/Products/ZenModel/migrate/menus.py
Log:
* more menu and tab reorganization
* make ProductClass a ZenPackable
Modified: trunk/Products/ZenModel/DeviceClass.py
===================================================================
--- trunk/Products/ZenModel/DeviceClass.py 2007-05-02 17:52:55 UTC (rev 5070)
+++ trunk/Products/ZenModel/DeviceClass.py 2007-05-02 18:03:01 UTC (rev 5071)
@@ -125,6 +125,11 @@
, 'action' : 'zPropertyEdit'
, 'permissions' : (permissions.view,)
},
+ { 'id' : 'templates'
+ , 'name' : 'Templates'
+ , 'action' : 'perfConfig'
+ , 'permissions' : ('Manage DMD',)
+ },
)
},
)
Modified: trunk/Products/ZenModel/DeviceOrganizer.py
===================================================================
--- trunk/Products/ZenModel/DeviceOrganizer.py 2007-05-02 17:52:55 UTC (rev 5070)
+++ trunk/Products/ZenModel/DeviceOrganizer.py 2007-05-02 18:03:01 UTC (rev 5071)
@@ -71,12 +71,6 @@
, 'action' : 'deviceOrganizerManage'
, 'permissions' : ('Manage DMD',)
},
- { 'id' : 'viewHistory'
- , 'name' : 'Modifications'
- , 'action' : 'viewHistory'
- , 'permissions' : (
- permissions.view, )
- },
)
},
)
Modified: trunk/Products/ZenModel/ProductClass.py
===================================================================
--- trunk/Products/ZenModel/ProductClass.py 2007-05-02 17:52:55 UTC (rev 5070)
+++ trunk/Products/ZenModel/ProductClass.py 2007-05-02 18:03:01 UTC (rev 5071)
@@ -25,10 +25,11 @@
from AccessControl import Permissions as permissions
from ZenModelRM import ZenModelRM
+from ZenPackable import ZenPackable
from Products.ZenRelations.RelSchema import *
-class ProductClass(ZenModelRM):
+class ProductClass(ZenModelRM, ZenPackable):
meta_type = "ProductClass"
Modified: trunk/Products/ZenModel/System.py
===================================================================
--- trunk/Products/ZenModel/System.py 2007-05-02 17:52:55 UTC (rev 5070)
+++ trunk/Products/ZenModel/System.py 2007-05-02 18:03:01 UTC (rev 5071)
@@ -111,12 +111,6 @@
, 'action' : 'deviceOrganizerManage'
, 'permissions' : ('Manage DMD',)
},
- { 'id' : 'viewHistory'
- , 'name' : 'Modifications'
- , 'action' : 'viewHistory'
- , 'permissions' : (
- permissions.view, )
- },
)
},
)
Modified: trunk/Products/ZenModel/migrate/menus.py
===================================================================
--- trunk/Products/ZenModel/migrate/menus.py 2007-05-02 17:52:55 UTC (rev 5070)
+++ trunk/Products/ZenModel/migrate/menus.py 2007-05-02 18:03:01 UTC (rev 5071)
@@ -530,7 +530,7 @@
'ordering': 70.0,
'permissions': ('Manage DMD',)}],
'More': [ { 'action': 'viewHistory',
- 'allowed_classes': ['Device', 'DeviceClass'],
+ 'allowed_classes': ['Device', 'DeviceOrganizer'],
'description': 'Modifications',
'id': 'viewHistory',
'ordering': 2.0,
@@ -596,7 +596,7 @@
'ordering': 60.0,
'permissions': ('View',)},
{ 'action': 'deviceManagement',
- 'allowed_classes': ['Device', 'DeviceOrganizer'],
+ 'allowed_classes': ['Device', 'DeviceClass'],
'description': 'Administration',
'id': 'deviceManagement',
'ordering': 50.0,
@@ -611,18 +611,10 @@
'allowed_classes': ['DeviceClass'],
'description': 'All Templates',
'id': 'performanceTemplates',
- 'ordering': 30.0,
+ 'ordering': 65.0,
'permissions': ('View Device',)},
- { 'action': 'perfConfig',
- 'allowed_classes': ['DeviceClass'],
- 'description': 'Available Templates',
- 'id': 'perfConfig',
- 'ordering': 30.100000000000001,
- 'permissions': ('Change Device',)},
{ 'action': 'zPropertyEdit',
- 'allowed_classes': [ 'Device',
- 'Manufacturer',
- 'ProductClass'],
+ 'allowed_classes': [ 'Device',],
'description': 'zProperties',
'id': 'zPropertyEdit',
'ordering': 70.0,
|
