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-01 14:16:53
|
Author: marc
Date: 2007-05-01 10:16:53 -0400 (Tue, 01 May 2007)
New Revision: 4995
Modified:
trunk/Products/ZenModel/MibModule.py
trunk/Products/ZenModel/skins/zenmodel/dialog_addOIDMapping.pt
trunk/Products/ZenModel/skins/zenmodel/dialog_addTrap.pt
Log:
* Added dropdown for OID Mappings and Traps
Modified: trunk/Products/ZenModel/MibModule.py
===================================================================
--- trunk/Products/ZenModel/MibModule.py 2007-05-01 14:05:40 UTC (rev 4994)
+++ trunk/Products/ZenModel/MibModule.py 2007-05-01 14:16:53 UTC (rev 4995)
@@ -22,6 +22,8 @@
class MibModule(ZenModelRM, ZenPackable):
+ types = ('COUNTER', 'GAUGE', 'DERIVE', 'ABSOLUTE')
+
language = ""
contact = ""
description = ""
Modified: trunk/Products/ZenModel/skins/zenmodel/dialog_addOIDMapping.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/dialog_addOIDMapping.pt 2007-05-01 14:05:40 UTC (rev 4994)
+++ trunk/Products/ZenModel/skins/zenmodel/dialog_addOIDMapping.pt 2007-05-01 14:16:53 UTC (rev 4995)
@@ -11,7 +11,10 @@
name="id"
tal:attributes="onblur string:checkValidId('${here/absolute_url}', this.id)"><br/><br/>
OID: <input type="text" name="oid"><br/><br/>
-Type: <input type="text" name="nodetype">
+Type: <select class="tableheader" name="nodetype">
+ <option tal:repeat="type here/types"
+ tal:content="type">/Thing</option>
+</select>
</p>
<div id="dialog_buttons">
<input type="submit" name="addMibNode:method"
Modified: trunk/Products/ZenModel/skins/zenmodel/dialog_addTrap.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/dialog_addTrap.pt 2007-05-01 14:05:40 UTC (rev 4994)
+++ trunk/Products/ZenModel/skins/zenmodel/dialog_addTrap.pt 2007-05-01 14:16:53 UTC (rev 4995)
@@ -11,7 +11,10 @@
name="id"
tal:attributes="onblur string:checkValidId('${here/absolute_url}', this.id)"><br/><br/>
OID: <input type="text" name="oid"><br/><br/>
-Type: <input type="text" name="nodetype">
+Type: <select class="tableheader" name="nodetype">
+ <option tal:repeat="type here/types"
+ tal:content="type">/Thing</option>
+</select>
</p>
<div id="dialog_buttons">
<input type="submit" name="addMibNotification:method"
|
|
From: <sv...@ze...> - 2007-05-01 14:05:41
|
Author: ecn
Date: 2007-05-01 10:05:40 -0400 (Tue, 01 May 2007)
New Revision: 4994
Modified:
trunk/Products/ZenWin/WinEventlog.py
Log:
fix unknown event class
Modified: trunk/Products/ZenWin/WinEventlog.py
===================================================================
--- trunk/Products/ZenWin/WinEventlog.py 2007-05-01 14:03:11 UTC (rev 4993)
+++ trunk/Products/ZenWin/WinEventlog.py 2007-05-01 14:05:40 UTC (rev 4994)
@@ -14,14 +14,13 @@
import logging
log = logging.getLogger("zen.WinEventlog")
+from Products.ZenEvents.ZenEventClasses import Status_Wmi
+
class WinEventlog(object):
- name = "WinEventlog"
+ agent = name = "zeneventlog"
manager = socket.getfqdn()
- evtAgent = "WinEventlog"
evtAlertGroup = "Eventlog"
- failure = {'eventClass':'/Status/WinEventlog', 'agent': 'zenwin',
- 'severity':4}
statmsg = "Windows Service '%s' is %s"
eventlogFields = "EventCode,EventType,Message,SourceName,TimeGenerated"
@@ -65,9 +64,10 @@
evt['component'] = lrec.SourceName
evt['ntevid'] = lrec.EventCode
evt['summary'] = lrec.Message.strip()
- evt['agent'] = self.evtAgent
+ evt['agent'] = self.agent
evt['severity'] = sev
evt['eventGroup'] = self.evtAlertGroup
evt['manager'] = self.manager
+ evt['eventClass'] = Status_Wmi
log.debug("device:%s msg:'%s'", srec.name, lrec.Message)
return evt
|
|
From: <sv...@ze...> - 2007-05-01 14:03:11
|
Author: marc
Date: 2007-05-01 10:03:11 -0400 (Tue, 01 May 2007)
New Revision: 4993
Modified:
trunk/Products/ZenModel/MibModule.py
Log:
* OID Mapping dialog now working
Modified: trunk/Products/ZenModel/MibModule.py
===================================================================
--- trunk/Products/ZenModel/MibModule.py 2007-05-01 13:59:09 UTC (rev 4992)
+++ trunk/Products/ZenModel/MibModule.py 2007-05-01 14:03:11 UTC (rev 4993)
@@ -96,13 +96,13 @@
return self.callZenScreen(REQUEST)
- def createMibNotification(self, id, **kwargs):
+ def createMibNode(self, id, **kwargs):
"""Create a MibNotification
"""
- from MibNotification import MibNotification
+ from MibNode import MibNode
if self.oid2name(kwargs['oid']):
return None
- node = MibNotification(id, **kwargs)
+ node = MibNode(id, **kwargs)
self.nodes._setObject(node.id, node)
node = self.nodes._getOb(node.id)
return node
|
|
From: <sv...@ze...> - 2007-05-01 13:59:07
|
Author: ian
Date: 2007-05-01 09:59:09 -0400 (Tue, 01 May 2007)
New Revision: 4992
Added:
trunk/Products/ZenWidgets/skins/zenui/img/tabtable_rounded_cap.gif
Modified:
trunk/Products/ZenModel/skins/zenmodel/templates.pt
trunk/Products/ZenModel/skins/zenmodel/zenoss.css
trunk/Products/ZenWidgets/skins/zenui/img/contextmenu_tab.gif
trunk/Products/ZenWidgets/skins/zenui/img/contextmenu_tab_depressed.gif
Log:
* Made padding above tab table constant
* Added a rounded cap to the tabs
Modified: trunk/Products/ZenModel/skins/zenmodel/templates.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/templates.pt 2007-05-01 13:47:14 UTC (rev 4991)
+++ trunk/Products/ZenModel/skins/zenmodel/templates.pt 2007-05-01 13:59:09 UTC (rev 4992)
@@ -315,6 +315,7 @@
Other Page
</div>
</td>
+ <td class="tabtablecap"> </td>
</tr>
</table>
</div>
Modified: trunk/Products/ZenModel/skins/zenmodel/zenoss.css
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/zenoss.css 2007-05-01 13:47:14 UTC (rev 4991)
+++ trunk/Products/ZenModel/skins/zenmodel/zenoss.css 2007-05-01 13:59:09 UTC (rev 4992)
@@ -319,6 +319,7 @@
}
table.tabtable td {
+ height: 32px;
margin: 0px;
text-align: center;
vertical-align: bottom;
@@ -346,17 +347,23 @@
border-right: 0pt;
margin-right: -1px;
margin-bottom: -1px;
- background-image: url('img/actions_button_left.gif');
+ background-image: url('img/contextmenu_tab.gif');
}
table.tabtable td.contextmenutab a.tabletitle:hover {
- background-image: url('img/actions_button_depressed_left.gif');
+ background-image: url('img/contextmenu_tab_depressed.gif');
}
+table.tabtable td.tabtablecap {
+ background: transparent url('img/tabtable_rounded_cap.gif') 0px 8px no-repeat;
+ width: 30px;
+}
+
table.tabtable td.tabletitleselected {
color: #333333;
height: 29px;
font-size:8pt;
- padding: 0px;
+ padding-top: 3px;
+ background-color: white;
border: 0px;
}
table.tabtable div.tableft {
Modified: trunk/Products/ZenWidgets/skins/zenui/img/contextmenu_tab.gif
===================================================================
(Binary files differ)
Modified: trunk/Products/ZenWidgets/skins/zenui/img/contextmenu_tab_depressed.gif
===================================================================
(Binary files differ)
Added: trunk/Products/ZenWidgets/skins/zenui/img/tabtable_rounded_cap.gif
Property changes on: trunk/Products/ZenWidgets/skins/zenui/img/tabtable_rounded_cap.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
|
|
From: <sv...@ze...> - 2007-05-01 13:47:12
|
Author: marc
Date: 2007-05-01 09:47:14 -0400 (Tue, 01 May 2007)
New Revision: 4991
Modified:
trunk/Products/ZenModel/skins/zenmodel/viewMibModule.pt
Log:
* Removed funky redundant message about State at time
Modified: trunk/Products/ZenModel/skins/zenmodel/viewMibModule.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/viewMibModule.pt 2007-05-01 13:43:45 UTC (rev 4990)
+++ trunk/Products/ZenModel/skins/zenmodel/viewMibModule.pt 2007-05-01 13:47:14 UTC (rev 4991)
@@ -19,10 +19,6 @@
<tal:block metal:fill-slot="zentablecontents">
<!-- BEGIN TABLE CONTENTS -->
- <tr tal:define="message request/message | string:State at time:">
- <th class=tabletitle colspan="2"
- tal:content="string:${message} ${here/getNowString}" />
- </tr>
<tr>
<td class="tableheader">Name</td>
<td class="tablevalues" tal:content="here/id"/>
|
|
From: <sv...@ze...> - 2007-05-01 13:43:44
|
Author: ecn Date: 2007-05-01 09:43:45 -0400 (Tue, 01 May 2007) New Revision: 4990 Modified: trunk/inst/GNUmakefile Log: rules for building wmi tarball Modified: trunk/inst/GNUmakefile =================================================================== --- trunk/inst/GNUmakefile 2007-05-01 13:42:30 UTC (rev 4989) +++ trunk/inst/GNUmakefile 2007-05-01 13:43:45 UTC (rev 4990) @@ -1,8 +1,15 @@ -################################################################# +########################################################################### # -# Copyright (c) 2006 Zenoss, Inc. All rights reserved. +# 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/ +# +########################################################################### SHELL=/bin/sh @@ -82,6 +89,7 @@ ELEMENTTREE= $(call ROOT, elementtree) PYNETSNMP= $(call ROOT, pynetsnmp) CTYPES= $(call ROOT, ctypes) +WMI= $(call ROOT, wmi) # optional packages SENDPAGE= $(call ROOT, sendpage) @@ -137,6 +145,7 @@ EVERYTHING = \ zope-install \ + wmi-install \ twistedsnmp-install \ pynetsnmp-install \ mysql-python-install \ @@ -260,6 +269,9 @@ @cd $(<D)/source ; $(MAKE) BIN_PROGS=bin/winexe SBIN_PROGS= $(LOG) @cd $(<D)/source ; $(MAKE) BIN_PROGS=bin/winexe SBIN_PROGS= installbin $(LOG) +wmi-install: build/$(WMI)/.unpacked + @cd $(<D) ; $(MAKE) install + build/$(NAGIOS)/Makefile: build/$(NAGIOS)/.unpacked @cd $(<D) ; export LIBS=-ldl ; $(CONFIGURE) $(LOG) @touch $@ |
|
From: <sv...@ze...> - 2007-05-01 13:42:29
|
Author: ecn Date: 2007-05-01 09:42:30 -0400 (Tue, 01 May 2007) New Revision: 4989 Added: trunk/inst/externallibs/setuptools-0.6c5-py2.5.egg trunk/inst/externallibs/wmi-20070501.tar.bz2 Removed: trunk/inst/externallibs/zc.queue-1.0.1.tar.gz Log: cleanup and prep for 2.0 release Added: trunk/inst/externallibs/setuptools-0.6c5-py2.5.egg Property changes on: trunk/inst/externallibs/setuptools-0.6c5-py2.5.egg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/inst/externallibs/wmi-20070501.tar.bz2 Property changes on: trunk/inst/externallibs/wmi-20070501.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: trunk/inst/externallibs/zc.queue-1.0.1.tar.gz |
|
From: <sv...@ze...> - 2007-05-01 13:38:12
|
Author: marc
Date: 2007-05-01 09:37:46 -0400 (Tue, 01 May 2007)
New Revision: 4988
Modified:
trunk/Products/ZenModel/migrate/menus.py
Log:
* Push Changes moved to Manage Menu
* zProperties moved before Administration tab
Modified: trunk/Products/ZenModel/migrate/menus.py
===================================================================
--- trunk/Products/ZenModel/migrate/menus.py 2007-05-01 13:27:53 UTC (rev 4987)
+++ trunk/Products/ZenModel/migrate/menus.py 2007-05-01 13:37:46 UTC (rev 4988)
@@ -160,21 +160,6 @@
isdialog=True,
permissions=('Change Device',)
),
- dict(action='pushConfig',
- allowed_classes=['DeviceClass',
- 'Device'],
- description='Push Changes',
- ordering=10.0,
- id='pushConfig',
- permissions=('Change Device',)
- ),
- dict(action='../pushConfig',
- allowed_classes=['OperatingSystem'],
- description='Push Changes',
- ordering=10.0,
- id='pushConfig_os',
- permissions=('Change Device',)
- ),
dict(action='editCustSchema',
allowed_classes=['DeviceClass',],
description='Custom Schema',
@@ -199,14 +184,14 @@
dict(action='deviceManagement',
allowed_classes=['Device'],
description='Administration',
- ordering=70.0,
+ ordering=50.0,
id='deviceManagement',
permissions=('Change Device',)
),
dict(action='../deviceManagement',
allowed_classes=['OperatingSystem'],
description='Administration',
- ordering=70.0,
+ ordering=50.0,
id='deviceManagement_os',
permissions=('Change Device',)
),
@@ -237,14 +222,14 @@
'ProductClass',
],
description='zProperties',
- ordering=50.0,
+ ordering=70.0,
id='zPropertyEdit',
permissions=('View',)
),
dict(action='../zPropertyEdit',
allowed_classes=['OperatingSystem'],
description='zProperties',
- ordering=50.0,
+ ordering=70.0,
id='zPropertyEdit_os',
permissions=('View',)
),
@@ -986,6 +971,21 @@
isdialog=True,
permissions=('Change Device',)
),
+ dict(action='pushConfig',
+ allowed_classes=['DeviceClass',
+ 'Device'],
+ description='Push Changes',
+ ordering=15.0,
+ id='pushConfig',
+ permissions=('Change Device',)
+ ),
+ dict(action='../pushConfig',
+ allowed_classes=['OperatingSystem'],
+ description='Push Changes',
+ ordering=15.0,
+ id='pushConfig_os',
+ permissions=('Change Device',)
+ ),
],
'Add': [
dict(
|
|
From: <sv...@ze...> - 2007-05-01 13:27:52
|
Author: ecn
Date: 2007-05-01 09:27:53 -0400 (Tue, 01 May 2007)
New Revision: 4987
Modified:
trunk/wmi/pycom/win32com/client.py
Log:
remove debugging print stmt
Modified: trunk/wmi/pycom/win32com/client.py
===================================================================
--- trunk/wmi/pycom/win32com/client.py 2007-05-01 13:27:15 UTC (rev 4986)
+++ trunk/wmi/pycom/win32com/client.py 2007-05-01 13:27:53 UTC (rev 4987)
@@ -15,7 +15,6 @@
def Dispatch(IDispatch):
if "WbemScripting.SWbemLocator" == IDispatch:
return SWbemLocator()
- print "Dispatch: " + IDispatch
class SWbemLocator:
def ConnectServer(self, name, namespace = "", user = "", passwd = "", locale = "", authority = "", flags = 0, valueset = None):
@@ -62,7 +61,7 @@
def __init__(self, enum):
self.enum = enum
def __del__(self):
-# print >> sys.stderr, "SWbemEventSource.__del__(%s)" % self.enum
+ print >> sys.stderr, "SWbemEventSource.__del__(%s)" % self.enum
pywmi.IUnknown_Release(self.enum)
def NextEvent(self, iTimeoutMs = wbemTimeoutInfinite):
try:
|
|
From: <sv...@ze...> - 2007-05-01 13:27:16
|
Author: ecn Date: 2007-05-01 09:27:15 -0400 (Tue, 01 May 2007) New Revision: 4986 Modified: trunk/wmi/GNUmakefile Log: try to support DESTDIR for rpm building goodness Modified: trunk/wmi/GNUmakefile =================================================================== --- trunk/wmi/GNUmakefile 2007-05-01 13:26:44 UTC (rev 4985) +++ trunk/wmi/GNUmakefile 2007-05-01 13:27:15 UTC (rev 4986) @@ -7,9 +7,9 @@ endif DESTDIR= / -PYLIBDIR= $(ZENHOME)/lib/python -ZENBIN= $(ZENHOME)/bin -PYINCLUDE= $(shell $(PYTHON) pyinclude.py) +PYLIBDIR= $(DESTDIR)$(ZENHOME)/lib/python +ZENBIN= $(DESTDIR)$(ZENHOME)/bin +PYINCLUDE= $(DESTDIR)$(shell $(PYTHON) pyinclude.py) pywmi-installed: cd Samba/source && \ @@ -22,6 +22,7 @@ clean: cd pycom && rm -rf build cd Samba/source && make clean + rm -f ./Samba/source/wmi/_pywmi.so pycom-installed: cd pycom && \ @@ -30,5 +31,10 @@ --install-scripts="$(ZENBIN)" \ --root="$(DESTDIR)" +tarball: clean + tar --exclude=".svn" \ + --exclude='*~' \ + --transform "s%^\.%wmi-`date +%Y%m%d`%" \ + -cjf "../wmi-`date +%Y%m%d`.tar.bz2" \ + . - |
|
From: <sv...@ze...> - 2007-05-01 13:26:43
|
Author: ecn Date: 2007-05-01 09:26:44 -0400 (Tue, 01 May 2007) New Revision: 4985 Modified: trunk/wmi/README Log: we have run it on python2.3... no problem Modified: trunk/wmi/README =================================================================== --- trunk/wmi/README 2007-05-01 13:25:15 UTC (rev 4984) +++ trunk/wmi/README 2007-05-01 13:26:44 UTC (rev 4985) @@ -10,7 +10,7 @@ The same as for Samba (gcc ???, autoconf ???). SWIG >= 1.3 (I am using version 1.3.25). -Python >= 2.4. +Python >= 2.3. COMPILATION |
|
From: <sv...@ze...> - 2007-05-01 13:25:14
|
Author: marc
Date: 2007-05-01 09:25:15 -0400 (Tue, 01 May 2007)
New Revision: 4984
Modified:
trunk/Products/ZenEvents/EventClassInst.py
trunk/Products/ZenModel/migrate/menus.py
Log:
* Sequence is now a tab and removed as a menu item
Modified: trunk/Products/ZenEvents/EventClassInst.py
===================================================================
--- trunk/Products/ZenEvents/EventClassInst.py 2007-05-01 13:17:52 UTC (rev 4983)
+++ trunk/Products/ZenEvents/EventClassInst.py 2007-05-01 13:25:15 UTC (rev 4984)
@@ -113,11 +113,11 @@
, 'action' : 'eventClassInstEdit'
, 'permissions' : ("Manage DMD", )
},
- #{ 'id' : 'sequence'
- #, 'name' : 'Sequence'
- #, 'action' : 'eventClassInstSequence'
- #, 'permissions' : (Permissions.view,)
- #},
+ { 'id' : 'sequence'
+ , 'name' : 'Sequence'
+ , 'action' : 'eventClassInstSequence'
+ , 'permissions' : (Permissions.view,)
+ },
{ 'id' : 'config'
, 'name' : 'zProperties'
, 'action' : 'zPropertyEdit'
Modified: trunk/Products/ZenModel/migrate/menus.py
===================================================================
--- trunk/Products/ZenModel/migrate/menus.py 2007-05-01 13:17:52 UTC (rev 4983)
+++ trunk/Products/ZenModel/migrate/menus.py 2007-05-01 13:25:15 UTC (rev 4984)
@@ -210,13 +210,13 @@
id='deviceManagement_os',
permissions=('Change Device',)
),
- dict(action='eventClassInstSequence',
- allowed_classes=['EventClassInst'],
- description='Sequence',
- ordering=20.0,
- id='eventClassInstSequence',
- permissions=('View',)
- ),
+ #dict(action='eventClassInstSequence',
+ # allowed_classes=['EventClassInst'],
+ # description='Sequence',
+ # ordering=20.0,
+ # id='eventClassInstSequence',
+ # permissions=('View',)
+ # ),
dict(action='performanceTemplates',
allowed_classes=['DeviceClass'],
description='All Templates',
|
|
From: <sv...@ze...> - 2007-05-01 13:17:53
|
Author: marc
Date: 2007-05-01 09:17:52 -0400 (Tue, 01 May 2007)
New Revision: 4983
Modified:
trunk/Products/ZenModel/skins/zenmodel/dialog_addFileSystem.pt
trunk/Products/ZenModel/skins/zenmodel/dialog_addIpInterface.pt
trunk/Products/ZenModel/skins/zenmodel/dialog_addIpRouteEntry.pt
trunk/Products/ZenModel/skins/zenmodel/dialog_addIpService.pt
trunk/Products/ZenModel/skins/zenmodel/dialog_addMenuItem.pt
trunk/Products/ZenModel/skins/zenmodel/dialog_addOIDMapping.pt
trunk/Products/ZenModel/skins/zenmodel/dialog_addOSProcess.pt
trunk/Products/ZenModel/skins/zenmodel/dialog_addOSProcessClass.pt
trunk/Products/ZenModel/skins/zenmodel/dialog_addReport.pt
trunk/Products/ZenModel/skins/zenmodel/dialog_addReportClass.pt
trunk/Products/ZenModel/skins/zenmodel/dialog_addTemplate.pt
trunk/Products/ZenModel/skins/zenmodel/dialog_addTrap.pt
trunk/Products/ZenModel/skins/zenmodel/dialog_addUser.pt
trunk/Products/ZenModel/skins/zenmodel/dialog_addWinService.pt
trunk/Products/ZenModel/skins/zenmodel/dialog_changeClass.pt
trunk/Products/ZenModel/skins/zenmodel/dialog_copyTemplates.pt
trunk/Products/ZenModel/skins/zenmodel/dialog_deleteComponent.pt
trunk/Products/ZenModel/skins/zenmodel/dialog_deleteDevice.pt
trunk/Products/ZenModel/skins/zenmodel/dialog_deleteIpAddress.pt
trunk/Products/ZenModel/skins/zenmodel/dialog_deleteMenuItems.pt
trunk/Products/ZenModel/skins/zenmodel/dialog_deleteNetwork.pt
trunk/Products/ZenModel/skins/zenmodel/dialog_deleteOIDMapping.pt
trunk/Products/ZenModel/skins/zenmodel/dialog_deleteReportClasses.pt
trunk/Products/ZenModel/skins/zenmodel/dialog_deleteReports.pt
trunk/Products/ZenModel/skins/zenmodel/dialog_deleteTemplates.pt
trunk/Products/ZenModel/skins/zenmodel/dialog_deleteTrap.pt
trunk/Products/ZenModel/skins/zenmodel/dialog_deleteUsers.pt
trunk/Products/ZenModel/skins/zenmodel/dialog_exportTemplates.pt
trunk/Products/ZenModel/skins/zenmodel/dialog_moveReports.pt
trunk/Products/ZenModel/skins/zenmodel/dialog_pasteTemplates.pt
trunk/Products/ZenModel/skins/zenmodel/dialog_renameDevice.pt
trunk/Products/ZenModel/skins/zenmodel/dialog_resetIp.pt
trunk/Products/ZenModel/skins/zenmodel/dialog_saveOrdering.pt
trunk/Products/ZenModel/skins/zenmodel/dialog_setPriority.pt
trunk/Products/ZenModel/skins/zenmodel/dialog_setProductionState.pt
Log:
* dialogs are now of the format "OK" "Cancel"
Modified: trunk/Products/ZenModel/skins/zenmodel/dialog_addFileSystem.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/dialog_addFileSystem.pt 2007-05-01 13:02:26 UTC (rev 4982)
+++ trunk/Products/ZenModel/skins/zenmodel/dialog_addFileSystem.pt 2007-05-01 13:17:52 UTC (rev 4983)
@@ -14,7 +14,7 @@
</p>
<div id="dialog_buttons">
<input type="submit" name="addFileSystem:method"
- value="Yes, Create this FileSystem" />
+ value="OK" />
<input id="dialog_cancel" type="button" value="Cancel"
onclick="$('dialog').hide()"/>
</div>
Modified: trunk/Products/ZenModel/skins/zenmodel/dialog_addIpInterface.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/dialog_addIpInterface.pt 2007-05-01 13:02:26 UTC (rev 4982)
+++ trunk/Products/ZenModel/skins/zenmodel/dialog_addIpInterface.pt 2007-05-01 13:17:52 UTC (rev 4983)
@@ -14,7 +14,7 @@
</p>
<div id="dialog_buttons">
<input type="submit" name="addIpInterface:method"
- value="Yes, Create this IpInterface" />
+ value="OK" />
<input id="dialog_cancel" type="button" value="Cancel"
onclick="$('dialog').hide()"/>
</div>
Modified: trunk/Products/ZenModel/skins/zenmodel/dialog_addIpRouteEntry.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/dialog_addIpRouteEntry.pt 2007-05-01 13:02:26 UTC (rev 4982)
+++ trunk/Products/ZenModel/skins/zenmodel/dialog_addIpRouteEntry.pt 2007-05-01 13:17:52 UTC (rev 4983)
@@ -31,7 +31,7 @@
</p>
<div id="dialog_buttons">
<input type="submit" name="addIpRouteEntry:method"
- value="Yes, Create this Route" />
+ value="OK" />
<input id="dialog_cancel" type="button" value="Cancel"
onclick="$('dialog').hide()"/>
</div>
Modified: trunk/Products/ZenModel/skins/zenmodel/dialog_addIpService.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/dialog_addIpService.pt 2007-05-01 13:02:26 UTC (rev 4982)
+++ trunk/Products/ZenModel/skins/zenmodel/dialog_addIpService.pt 2007-05-01 13:17:52 UTC (rev 4983)
@@ -18,7 +18,7 @@
</p>
<div id="dialog_buttons">
<input type="submit" name="addIpService:method"
- value="Yes, Create this IpService" />
+ value="OK" />
<input id="dialog_cancel" type="button" value="Cancel"
onclick="$('dialog').hide()"/>
</div>
Modified: trunk/Products/ZenModel/skins/zenmodel/dialog_addMenuItem.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/dialog_addMenuItem.pt 2007-05-01 13:02:26 UTC (rev 4982)
+++ trunk/Products/ZenModel/skins/zenmodel/dialog_addMenuItem.pt 2007-05-01 13:17:52 UTC (rev 4983)
@@ -15,7 +15,7 @@
</p>
<div id="dialog_buttons">
<input type="submit" name="manage_addZenMenuItem:method"
- value="Create Menu Item"
+ value="OK"
tal:attributes="onclick string:return $$('dialog').submit_form(
'${here/absolute_url_path}')" />
<input id="dialog_cancel" type="button" value="Cancel"
Modified: trunk/Products/ZenModel/skins/zenmodel/dialog_addOIDMapping.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/dialog_addOIDMapping.pt 2007-05-01 13:02:26 UTC (rev 4982)
+++ trunk/Products/ZenModel/skins/zenmodel/dialog_addOIDMapping.pt 2007-05-01 13:17:52 UTC (rev 4983)
@@ -15,7 +15,7 @@
</p>
<div id="dialog_buttons">
<input type="submit" name="addMibNode:method"
- value="Yes, Create this OID Mapping" />
+ value="OK" />
<input id="dialog_cancel" type="button" value="Cancel"
onclick="$('dialog').hide()"/>
</div>
Modified: trunk/Products/ZenModel/skins/zenmodel/dialog_addOSProcess.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/dialog_addOSProcess.pt 2007-05-01 13:02:26 UTC (rev 4982)
+++ trunk/Products/ZenModel/skins/zenmodel/dialog_addOSProcess.pt 2007-05-01 13:17:52 UTC (rev 4983)
@@ -20,7 +20,7 @@
</p>
<div id="dialog_buttons">
<input type="submit" name="addOSProcess:method"
- value="Yes, Create this OSProcess" />
+ value="OK" />
<input id="dialog_cancel" type="button" value="Cancel"
onclick="$('dialog').hide()"/>
</div>
Modified: trunk/Products/ZenModel/skins/zenmodel/dialog_addOSProcessClass.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/dialog_addOSProcessClass.pt 2007-05-01 13:02:26 UTC (rev 4982)
+++ trunk/Products/ZenModel/skins/zenmodel/dialog_addOSProcessClass.pt 2007-05-01 13:17:52 UTC (rev 4983)
@@ -13,7 +13,7 @@
</p>
<div id="dialog_buttons">
<input type="submit" name="manage_addOSProcessClass:method"
- value="Yes, Create this OSProcess" />
+ value="OK" />
<input id="dialog_cancel" type="button" value="Cancel"
onclick="$('dialog').hide()"/>
</div>
Modified: trunk/Products/ZenModel/skins/zenmodel/dialog_addReport.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/dialog_addReport.pt 2007-05-01 13:02:26 UTC (rev 4982)
+++ trunk/Products/ZenModel/skins/zenmodel/dialog_addReport.pt 2007-05-01 13:17:52 UTC (rev 4983)
@@ -12,7 +12,7 @@
</p>
<div id="dialog_buttons">
<input type="submit" name="manage_addDeviceReport:method"
- value="Yes, Create this Report"
+ value="OK"
tal:attributes="onclick string:return $$('dialog').submit_form(
'${here/getPrimaryUrlPath}', 'reportForm')" />
<input id="dialog_cancel" type="button" value="Cancel"
Modified: trunk/Products/ZenModel/skins/zenmodel/dialog_addReportClass.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/dialog_addReportClass.pt 2007-05-01 13:02:26 UTC (rev 4982)
+++ trunk/Products/ZenModel/skins/zenmodel/dialog_addReportClass.pt 2007-05-01 13:17:52 UTC (rev 4983)
@@ -12,7 +12,7 @@
</p>
<div id="dialog_buttons">
<input type="submit" name="manage_addReportClass:method"
- value="Yes, Create this Report Organizer"
+ value="OK"
tal:attributes="onclick string:return $$('dialog').submit_form(
'${here/getPrimaryUrlPath}', 'reportClassForm')" />
<input id="dialog_cancel" type="button" value="Cancel"
Modified: trunk/Products/ZenModel/skins/zenmodel/dialog_addTemplate.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/dialog_addTemplate.pt 2007-05-01 13:02:26 UTC (rev 4982)
+++ trunk/Products/ZenModel/skins/zenmodel/dialog_addTemplate.pt 2007-05-01 13:17:52 UTC (rev 4983)
@@ -12,7 +12,7 @@
</p>
<div id="dialog_buttons">
<input type="submit" name="manage_addRRDTemplate:method"
- value="Yes, Create this Template"
+ value="OK"
tal:attributes="onclick string:return $$('dialog').submit_form(
'${here/absolute_url_path}')"/>
<input id="dialog_cancel" type="button" value="Cancel"
Modified: trunk/Products/ZenModel/skins/zenmodel/dialog_addTrap.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/dialog_addTrap.pt 2007-05-01 13:02:26 UTC (rev 4982)
+++ trunk/Products/ZenModel/skins/zenmodel/dialog_addTrap.pt 2007-05-01 13:17:52 UTC (rev 4983)
@@ -15,7 +15,7 @@
</p>
<div id="dialog_buttons">
<input type="submit" name="addMibNotification:method"
- value="Yes, Create this Trap" />
+ value="OK" />
<input id="dialog_cancel" type="button" value="Cancel"
onclick="$('dialog').hide()"/>
</div>
Modified: trunk/Products/ZenModel/skins/zenmodel/dialog_addUser.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/dialog_addUser.pt 2007-05-01 13:02:26 UTC (rev 4982)
+++ trunk/Products/ZenModel/skins/zenmodel/dialog_addUser.pt 2007-05-01 13:17:52 UTC (rev 4983)
@@ -11,7 +11,7 @@
</p>
<div id="dialog_buttons">
<input type="submit" name="manage_addUser:method"
- value="Yes, Create this User" />
+ value="OK" />
<input id="dialog_cancel" type="button" value="Cancel"
onclick="$('dialog').hide()"/>
</div>
Modified: trunk/Products/ZenModel/skins/zenmodel/dialog_addWinService.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/dialog_addWinService.pt 2007-05-01 13:02:26 UTC (rev 4982)
+++ trunk/Products/ZenModel/skins/zenmodel/dialog_addWinService.pt 2007-05-01 13:17:52 UTC (rev 4983)
@@ -15,7 +15,7 @@
</p>
<div id="dialog_buttons">
<input type="submit" name="addWinService:method"
- value="Yes, Create this WinService" />
+ value="OK" />
<input id="dialog_cancel" type="button" value="Cancel"
onclick="$('dialog').hide()"/>
</div>
Modified: trunk/Products/ZenModel/skins/zenmodel/dialog_changeClass.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/dialog_changeClass.pt 2007-05-01 13:02:26 UTC (rev 4982)
+++ trunk/Products/ZenModel/skins/zenmodel/dialog_changeClass.pt 2007-05-01 13:17:52 UTC (rev 4983)
@@ -20,7 +20,7 @@
<br/>
<div id="dialog_buttons">
<input type="submit" name="moveDevices:method"
- value="Change" />
+ value="OK" />
<input id="dialog_cancel" type="button" value="Cancel"
onclick="$('dialog').hide()"/>
</div>
Modified: trunk/Products/ZenModel/skins/zenmodel/dialog_copyTemplates.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/dialog_copyTemplates.pt 2007-05-01 13:02:26 UTC (rev 4982)
+++ trunk/Products/ZenModel/skins/zenmodel/dialog_copyTemplates.pt 2007-05-01 13:17:52 UTC (rev 4983)
@@ -7,7 +7,7 @@
<br/>
<div id="dialog_buttons">
<input type="submit" name="manage_copyRRDTemplates:method"
- value="Yes"
+ value="OK"
tal:attributes="onclick string:return $$('dialog').submit_form(
'${here/absolute_url_path}')" />
<input id="dialog_cancel" type="button" value="Cancel"
Modified: trunk/Products/ZenModel/skins/zenmodel/dialog_deleteComponent.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/dialog_deleteComponent.pt 2007-05-01 13:02:26 UTC (rev 4982)
+++ trunk/Products/ZenModel/skins/zenmodel/dialog_deleteComponent.pt 2007-05-01 13:17:52 UTC (rev 4983)
@@ -5,7 +5,7 @@
</p>
<div id="dialog_buttons">
<input type="submit" name="manage_deleteComponent:method"
- value="Yes, Delete this object" />
+ value="OK" />
<input id="dialog_cancel" type="button" value="Cancel"
onclick="$('dialog').hide()"/>
</div>
Modified: trunk/Products/ZenModel/skins/zenmodel/dialog_deleteDevice.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/dialog_deleteDevice.pt 2007-05-01 13:02:26 UTC (rev 4982)
+++ trunk/Products/ZenModel/skins/zenmodel/dialog_deleteDevice.pt 2007-05-01 13:17:52 UTC (rev 4983)
@@ -9,7 +9,7 @@
</p>
<br/>
<div id="dialog_buttons">
-<input type="submit" name="deleteDevice:method" value="Delete Device" />
+<input type="submit" name="deleteDevice:method" value="OK" />
<input id="dialog_cancel" type="button" value="Cancel"
onclick="$('dialog').hide()"/>
</div>
Modified: trunk/Products/ZenModel/skins/zenmodel/dialog_deleteIpAddress.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/dialog_deleteIpAddress.pt 2007-05-01 13:02:26 UTC (rev 4982)
+++ trunk/Products/ZenModel/skins/zenmodel/dialog_deleteIpAddress.pt 2007-05-01 13:17:52 UTC (rev 4983)
@@ -4,7 +4,7 @@
</p>
<div id="dialog_buttons">
<input type="submit" name="manage_deleteIpAddresses:method"
- value="Yes, Delete these IP Addresses"
+ value="OK"
tal:attributes="onclick string:return $$('dialog').submit_form(
'${here/absolute_url_path}')" />
<input id="dialog_cancel" type="button" value="Cancel"
Modified: trunk/Products/ZenModel/skins/zenmodel/dialog_deleteMenuItems.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/dialog_deleteMenuItems.pt 2007-05-01 13:02:26 UTC (rev 4982)
+++ trunk/Products/ZenModel/skins/zenmodel/dialog_deleteMenuItems.pt 2007-05-01 13:17:52 UTC (rev 4983)
@@ -4,7 +4,7 @@
</p>
<div id="dialog_buttons">
<input type="submit" name="manage_deleteZenMenuItem:method"
- value="Yes, Delete these Menu Items"
+ value="OK"
tal:attributes="onclick string:return $$('dialog').submit_form(
'${here/absolute_url_path}')"/>
<input id="dialog_cancel" type="button" value="Cancel"
Modified: trunk/Products/ZenModel/skins/zenmodel/dialog_deleteNetwork.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/dialog_deleteNetwork.pt 2007-05-01 13:02:26 UTC (rev 4982)
+++ trunk/Products/ZenModel/skins/zenmodel/dialog_deleteNetwork.pt 2007-05-01 13:17:52 UTC (rev 4983)
@@ -4,7 +4,7 @@
</p>
<div id="dialog_buttons">
<input type="submit" name="manage_deleteOrganizers:method"
- value="Yes, Delete these networks"
+ value="OK"
tal:attributes="onclick string:return $$('dialog').submit_form(
'${here/absolute_url_path}')" />
<input id="dialog_cancel" type="button" value="Cancel"
Modified: trunk/Products/ZenModel/skins/zenmodel/dialog_deleteOIDMapping.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/dialog_deleteOIDMapping.pt 2007-05-01 13:02:26 UTC (rev 4982)
+++ trunk/Products/ZenModel/skins/zenmodel/dialog_deleteOIDMapping.pt 2007-05-01 13:17:52 UTC (rev 4983)
@@ -4,7 +4,7 @@
</p>
<div id="dialog_buttons">
<input type="submit" name="deleteMibNodes:method"
- value="Yes, Delete these OID Mappings"
+ value="OK"
tal:attributes="onclick string:return $$('dialog').submit_form(
'${here/absolute_url_path}')"/>
<input id="dialog_cancel" type="button" value="Cancel"
Modified: trunk/Products/ZenModel/skins/zenmodel/dialog_deleteReportClasses.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/dialog_deleteReportClasses.pt 2007-05-01 13:02:26 UTC (rev 4982)
+++ trunk/Products/ZenModel/skins/zenmodel/dialog_deleteReportClasses.pt 2007-05-01 13:17:52 UTC (rev 4983)
@@ -5,7 +5,7 @@
<br/>
<div id="dialog_buttons">
<input type="submit" name="manage_deleteOrganizers:method"
- value="Yes, Delete these Report Classes"
+ value="OK"
tal:attributes="onclick string:return $$('dialog').submit_form(
'${here/getPrimaryUrlPath}', 'reportClassForm')" />
<input id="dialog_cancel" type="button" value="Cancel"
Modified: trunk/Products/ZenModel/skins/zenmodel/dialog_deleteReports.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/dialog_deleteReports.pt 2007-05-01 13:02:26 UTC (rev 4982)
+++ trunk/Products/ZenModel/skins/zenmodel/dialog_deleteReports.pt 2007-05-01 13:17:52 UTC (rev 4983)
@@ -5,7 +5,7 @@
<br/>
<div id="dialog_buttons">
<input type="submit" name="zmanage_delObjects:method"
- value="Yes, Delete these Reports"
+ value="OK"
tal:attributes="onclick string:return $$('dialog').submit_form(
'${here/getPrimaryUrlPath}', 'reportForm')" />
<input id="dialog_cancel" type="button" value="Cancel"
Modified: trunk/Products/ZenModel/skins/zenmodel/dialog_deleteTemplates.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/dialog_deleteTemplates.pt 2007-05-01 13:02:26 UTC (rev 4982)
+++ trunk/Products/ZenModel/skins/zenmodel/dialog_deleteTemplates.pt 2007-05-01 13:17:52 UTC (rev 4983)
@@ -7,7 +7,7 @@
<br/>
<div id="dialog_buttons">
<input type="submit" name="manage_deleteRRDTemplates:method"
- value="Yes"
+ value="OK"
tal:attributes="onclick string:return $$('dialog').submit_form(
'${here/absolute_url_path}')" />
<input id="dialog_cancel" type="button" value="Cancel"
Modified: trunk/Products/ZenModel/skins/zenmodel/dialog_deleteTrap.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/dialog_deleteTrap.pt 2007-05-01 13:02:26 UTC (rev 4982)
+++ trunk/Products/ZenModel/skins/zenmodel/dialog_deleteTrap.pt 2007-05-01 13:17:52 UTC (rev 4983)
@@ -4,7 +4,7 @@
</p>
<div id="dialog_buttons">
<input type="submit" name="deleteMibNotifications:method"
- value="Yes, Delete these Traps"
+ value="OK"
tal:attributes="onclick string:return $$('dialog').submit_form(
'${here/absolute_url_path}')"/>
<input id="dialog_cancel" type="button" value="Cancel"
Modified: trunk/Products/ZenModel/skins/zenmodel/dialog_deleteUsers.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/dialog_deleteUsers.pt 2007-05-01 13:02:26 UTC (rev 4982)
+++ trunk/Products/ZenModel/skins/zenmodel/dialog_deleteUsers.pt 2007-05-01 13:17:52 UTC (rev 4983)
@@ -7,7 +7,7 @@
<br/>
<div id="dialog_buttons">
<input type="submit" name="manage_deleteUsers:method"
- value="Yes"
+ value="OK"
tal:attributes="onclick string:return $$('dialog').submit_form(
'${here/absolute_url_path}')" />
<input id="dialog_cancel" type="button" value="Cancel"
Modified: trunk/Products/ZenModel/skins/zenmodel/dialog_exportTemplates.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/dialog_exportTemplates.pt 2007-05-01 13:02:26 UTC (rev 4982)
+++ trunk/Products/ZenModel/skins/zenmodel/dialog_exportTemplates.pt 2007-05-01 13:17:52 UTC (rev 4983)
@@ -10,7 +10,7 @@
<br/>
<div id="dialog_buttons">
<input type="submit" name="manage_exportRRDTemplates:method"
- value="Export"
+ value="OK"
tal:attributes="onclick string:return $$('dialog').submit_form(
'${here/absolute_url_path}')" />
<input id="dialog_cancel" type="button" value="Cancel"
Modified: trunk/Products/ZenModel/skins/zenmodel/dialog_moveReports.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/dialog_moveReports.pt 2007-05-01 13:02:26 UTC (rev 4982)
+++ trunk/Products/ZenModel/skins/zenmodel/dialog_moveReports.pt 2007-05-01 13:17:52 UTC (rev 4983)
@@ -14,7 +14,7 @@
</p>
<div id="dialog_buttons">
<input type="submit" name="moveReports:method"
- value="Move"
+ value="OK"
tal:attributes="onclick string:return $$('dialog').submit_form(
'${here/absolute_url_path}', 'reportForm')" />
<input id="dialog_cancel" type="button" value="Cancel"
Modified: trunk/Products/ZenModel/skins/zenmodel/dialog_pasteTemplates.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/dialog_pasteTemplates.pt 2007-05-01 13:02:26 UTC (rev 4982)
+++ trunk/Products/ZenModel/skins/zenmodel/dialog_pasteTemplates.pt 2007-05-01 13:17:52 UTC (rev 4983)
@@ -14,7 +14,7 @@
<br/>
<div id="dialog_buttons">
<input type="submit" name="manage_pasteRRDTemplates:method"
- value="Yes"
+ value="OK"
tal:attributes="onclick string:return $$('dialog').submit_form(
'${here/absolute_url_path}')" />
<input id="dialog_cancel" type="button" value="Cancel"
Modified: trunk/Products/ZenModel/skins/zenmodel/dialog_renameDevice.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/dialog_renameDevice.pt 2007-05-01 13:02:26 UTC (rev 4982)
+++ trunk/Products/ZenModel/skins/zenmodel/dialog_renameDevice.pt 2007-05-01 13:17:52 UTC (rev 4983)
@@ -16,7 +16,7 @@
</p>
<br/>
<div id="dialog_buttons">
-<input type="submit" name="renameDevice:method" value="Rename Device" />
+<input type="submit" name="renameDevice:method" value="OK" />
<input id="dialog_cancel" type="button" value="Cancel"
onclick="$('dialog').hide()"/>
</div>
Modified: trunk/Products/ZenModel/skins/zenmodel/dialog_resetIp.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/dialog_resetIp.pt 2007-05-01 13:02:26 UTC (rev 4982)
+++ trunk/Products/ZenModel/skins/zenmodel/dialog_resetIp.pt 2007-05-01 13:17:52 UTC (rev 4983)
@@ -12,7 +12,7 @@
</p>
<br/>
<div id="dialog_buttons">
-<input type="submit" name="setManageIp:method" value="Reset IP" />
+<input type="submit" name="setManageIp:method" value="OK" />
<input id="dialog_cancel" type="button" value="Cancel"
onclick="$('dialog').hide()"/>
</div>
Modified: trunk/Products/ZenModel/skins/zenmodel/dialog_saveOrdering.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/dialog_saveOrdering.pt 2007-05-01 13:02:26 UTC (rev 4982)
+++ trunk/Products/ZenModel/skins/zenmodel/dialog_saveOrdering.pt 2007-05-01 13:17:52 UTC (rev 4983)
@@ -4,7 +4,7 @@
</p>
<div id="dialog_buttons">
<input type="submit" name="manage_saveMenuItemOrdering:method"
- value="Save Ordering"
+ value="OK"
tal:attributes="onclick string:return $$('dialog').submit_form(
'${here/absolute_url_path}')"/>
<input id="dialog_cancel" type="button" value="Cancel"
Modified: trunk/Products/ZenModel/skins/zenmodel/dialog_setPriority.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/dialog_setPriority.pt 2007-05-01 13:02:26 UTC (rev 4982)
+++ trunk/Products/ZenModel/skins/zenmodel/dialog_setPriority.pt 2007-05-01 13:17:52 UTC (rev 4983)
@@ -20,7 +20,7 @@
<br/>
<div id="dialog_buttons">
<input type="submit" name="setPriority:method"
- value="Change" />
+ value="OK" />
<input id="dialog_cancel" type="button" value="Cancel"
onclick="$('dialog').hide()"/>
</div>
Modified: trunk/Products/ZenModel/skins/zenmodel/dialog_setProductionState.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/dialog_setProductionState.pt 2007-05-01 13:02:26 UTC (rev 4982)
+++ trunk/Products/ZenModel/skins/zenmodel/dialog_setProductionState.pt 2007-05-01 13:17:52 UTC (rev 4983)
@@ -20,7 +20,7 @@
<br/>
<div id="dialog_buttons">
<input type="submit" name="setProdState:method"
- value="Change" />
+ value="OK" />
<input id="dialog_cancel" type="button" value="Cancel"
onclick="$('dialog').hide()"/>
</div>
|
|
From: <sv...@ze...> - 2007-05-01 13:02:25
|
Author: ian
Date: 2007-05-01 09:02:26 -0400 (Tue, 01 May 2007)
New Revision: 4982
Modified:
trunk/Products/ZenUtils/js/zenui.js
Log:
* Fixed z-indexing issue with the left pane
Modified: trunk/Products/ZenUtils/js/zenui.js
===================================================================
--- trunk/Products/ZenUtils/js/zenui.js 2007-05-01 12:40:29 UTC (rev 4981)
+++ trunk/Products/ZenUtils/js/zenui.js 2007-05-01 13:02:26 UTC (rev 4982)
@@ -141,12 +141,15 @@
var paneToggle = $('paneToggle');
var leftPaneToggle = $('leftPaneToggle');
var lpPopup = leftPane;
+ setStyle(paneToggle, {
+ 'z-index':'10000'
+ });
setStyle(lpPopup, {
'position':'absolute',
// 'background-color':'white',
// 'padding':'2px',
// 'padding-top':'2px',
- 'z-index':'3000'
+ 'z-index':'10000'
});
connect(leftPane, 'onmouseover', function(){
clearTimeout(t);
@@ -192,6 +195,8 @@
var leftPane = $('leftPane');
var paneToggle = $('paneToggle');
if (leftPane && paneToggle) {
+ setStyle(paneToggle, {'z-index':'1'});
+ setStyle(leftPane, {'z-index':'1'});
disconnectAll(paneToggle);
disconnectAll(leftPane);
disconnectAll('leftPaneToggle');
|
|
From: <sv...@ze...> - 2007-05-01 12:41:21
|
Author: ian
Date: 2007-05-01 08:40:29 -0400 (Tue, 01 May 2007)
New Revision: 4981
Modified:
trunk/Products/ZenModel/ZenMenuable.py
trunk/Products/ZenModel/skins/zenmodel/templates.pt
Log:
* Ensured that menus without items will not show up.
Modified: trunk/Products/ZenModel/ZenMenuable.py
===================================================================
--- trunk/Products/ZenModel/ZenMenuable.py 2007-05-01 09:24:49 UTC (rev 4980)
+++ trunk/Products/ZenModel/ZenMenuable.py 2007-05-01 12:40:29 UTC (rev 4981)
@@ -161,6 +161,7 @@
keys = menus.keys()
for key in keys:
menus[key] = menus[key].values()
+ if not menus[key]: del menus[key]
if not menus:
return None
elif len(menus.keys())==1:
Modified: trunk/Products/ZenModel/skins/zenmodel/templates.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/templates.pt 2007-05-01 09:24:49 UTC (rev 4980)
+++ trunk/Products/ZenModel/skins/zenmodel/templates.pt 2007-05-01 12:40:29 UTC (rev 4981)
@@ -272,8 +272,10 @@
tabnames python:[x['name'] for x in ztabs]">
<table class="tabtable" cellpadding="0" cellspacing="0"
tal:condition="python:(ztabs and not getattr(request, 'notabs', False))">
- <tr>
- <td class="contextmenutab">
+ <tr tal:define="menu_ids menu_ids |
+ python:['Actions','Add','Manage','More']">
+ <td class="contextmenutab"
+ tal:condition="python:here.getMenus(menu_ids, here)">
<span metal:use-macro="here/zenuimacros/macros/basemenu"/>
</td>
<td tal:repeat="tab ztabs"
|
|
From: <sv...@ze...> - 2007-05-01 09:24:48
|
Author: ahajda
Date: 2007-05-01 05:24:49 -0400 (Tue, 01 May 2007)
New Revision: 4980
Modified:
trunk/wmi/Samba/source/lib/com/dcom/dcom.h
trunk/wmi/Samba/source/lib/com/dcom/main.c
trunk/wmi/Samba/source/libcli/util/errormap.c
trunk/wmi/Samba/source/librpc/idl/dcom_wmi.inc
trunk/wmi/Samba/source/librpc/ndr/ndr_dcom.c
trunk/wmi/Samba/source/pidl/lib/Parse/Pidl/Samba4/COM/Proxy.pm
trunk/wmi/Samba/source/wmi/wmicore.c
Log:
Fixed bug causing memory fault when wbem instance has no class definition.
Status codes are the same as in MSWin if there is network error.
Modified: trunk/wmi/Samba/source/lib/com/dcom/dcom.h
===================================================================
--- trunk/wmi/Samba/source/lib/com/dcom/dcom.h 2007-05-01 04:29:58 UTC (rev 4979)
+++ trunk/wmi/Samba/source/lib/com/dcom/dcom.h 2007-05-01 09:24:49 UTC (rev 4980)
@@ -29,6 +29,8 @@
#include "lib/com/com.h"
#include "librpc/gen_ndr/orpc.h"
+#define NT_STATUS_RPC_NT_CALL_FAILED NT_STATUS(0xC002001BL)
+
typedef NTSTATUS (*marshal_fn)(struct IUnknown *pv, struct OBJREF *o);
typedef NTSTATUS (*unmarshal_fn)(struct OBJREF *o, struct IUnknown **pv);
Modified: trunk/wmi/Samba/source/lib/com/dcom/main.c
===================================================================
--- trunk/wmi/Samba/source/lib/com/dcom/main.c 2007-05-01 04:29:58 UTC (rev 4979)
+++ trunk/wmi/Samba/source/lib/com/dcom/main.c 2007-05-01 09:24:49 UTC (rev 4980)
@@ -178,6 +178,8 @@
if (DEBUGLVL(9))
(*p)->conn->flags |= DCERPC_DEBUG_PRINT_BOTH;
goto end;
+ } else {
+ DEBUG(1,(__location__": dcom_connect_host : %s\n", get_friendly_nt_error_msg(status)));
}
}
@@ -392,6 +394,12 @@
iid = iface->vtable->iid;
+ if (p && p->last_fault_code) {
+DEBUG(0,(__location__":dcom_get_pipe: freeing because of 0x%08X\n", p->last_fault_code));
+ free(p);
+ ox->pipe = p = NULL;
+ }
+
if (p) {
if (!GUID_equal(&p->syntax.uuid, &iid)) {
ox->pipe->syntax.uuid = iid;
@@ -636,7 +644,7 @@
status = dcom_get_pipe_recv(c_pipe, &p);
if (!NT_STATUS_IS_OK(status)) {
- composite_error(c, status);
+ composite_error(c, NT_STATUS_RPC_NT_CALL_FAILED);
return;
}
Modified: trunk/wmi/Samba/source/libcli/util/errormap.c
===================================================================
--- trunk/wmi/Samba/source/libcli/util/errormap.c 2007-05-01 04:29:58 UTC (rev 4979)
+++ trunk/wmi/Samba/source/libcli/util/errormap.c 2007-05-01 09:24:49 UTC (rev 4980)
@@ -1156,6 +1156,7 @@
{NT_STATUS(0x80000025), W_ERROR(0x962)},
{NT_STATUS(0x80000288), W_ERROR(0x48d)},
{NT_STATUS(0x80000289), W_ERROR(0x48e)},
+ {NT_STATUS(0xC002001B), W_ERROR(0x6be)},
{NT_STATUS_OK, WERR_OK}};
Modified: trunk/wmi/Samba/source/librpc/idl/dcom_wmi.inc
===================================================================
--- trunk/wmi/Samba/source/librpc/idl/dcom_wmi.inc 2007-05-01 04:29:58 UTC (rev 4979)
+++ trunk/wmi/Samba/source/librpc/idl/dcom_wmi.inc 2007-05-01 09:24:49 UTC (rev 4980)
@@ -25,6 +25,8 @@
{
typedef [v1_enum] enum
{
+ RPC_S_CALL_FAILED = 1726,
+
WBEM_NO_ERROR = 0,
WBEM_S_NO_ERROR = 0,
WBEM_S_SAME = 0,
Modified: trunk/wmi/Samba/source/librpc/ndr/ndr_dcom.c
===================================================================
--- trunk/wmi/Samba/source/librpc/ndr/ndr_dcom.c 2007-05-01 04:29:58 UTC (rev 4979)
+++ trunk/wmi/Samba/source/librpc/ndr/ndr_dcom.c 2007-05-01 09:24:49 UTC (rev 4980)
@@ -471,6 +471,11 @@
NTSTATUS ndr_pull_WbemInstance_priv(struct ndr_pull *ndr, int ndr_flags, const struct WbemClassObject *r)
{
int i;
+
+ if (!r->obj_class) {
+DEBUG(1,("ndr_pull_WbemInstance_priv: There is no class for given instance\n"));
+ return NT_STATUS_NO_SUCH_FILE;
+ }
ndr_set_flags(&ndr->flags, LIBNDR_FLAG_NOALIGN);
if (ndr_flags & NDR_SCALARS) {
uint32_t ofs, vofs;
Modified: trunk/wmi/Samba/source/pidl/lib/Parse/Pidl/Samba4/COM/Proxy.pm
===================================================================
--- trunk/wmi/Samba/source/pidl/lib/Parse/Pidl/Samba4/COM/Proxy.pm 2007-05-01 04:29:58 UTC (rev 4979)
+++ trunk/wmi/Samba/source/pidl/lib/Parse/Pidl/Samba4/COM/Proxy.pm 2007-05-01 09:24:49 UTC (rev 4980)
@@ -170,7 +170,7 @@
$res .=("\t" x $n)."\t\t(${varname})->size = sizeof(struct OBJREF);\n";
$res .=sprintf(("\t" x $n)."\t\tstatus = dcom_OBJREF_from_IUnknown(&(*$varname).obj, (struct IUnknown *)%s$a->{NAME});\n", ("*" x ($a->{POINTERS}-1)));
$res .= ("\t" x $n)."\t\tif (!NT_STATUS_IS_OK(status)) {\n"
- . ("\t" x $n)."\t\t\tcomposite_error(c, status);\n"
+ . ("\t" x $n)."\t\t\tcomposite_error(c, NT_STATUS_RPC_NT_CALL_FAILED);\n"
. ("\t" x $n)."\t\t\treturn c;\n"
. ("\t" x $n)."\t\t}\n";
for ($n =$a->{POINTERS}; $n > 0; --$n) {
@@ -234,7 +234,7 @@
$res.="
status = dcerpc_ndr_request_recv(req);
if (!NT_STATUS_IS_OK(status)) {
- composite_error(c, status);
+ composite_error(c, NT_STATUS_RPC_NT_CALL_FAILED);
return;
}
@@ -282,7 +282,7 @@
talloc_free(c);
return";
if ($fn->{RETURN_TYPE} eq "WERROR") {
- $res.=" ntstatus_to_werror(status)";
+ $res.=" ntstatus_to_werror(NT_STATUS_RPC_NT_CALL_FAILED)";
} elsif($fn->{RETURN_TYPE} eq "uint32") {
$res.=" 0";
}
Modified: trunk/wmi/Samba/source/wmi/wmicore.c
===================================================================
--- trunk/wmi/Samba/source/wmi/wmicore.c 2007-05-01 04:29:58 UTC (rev 4979)
+++ trunk/wmi/Samba/source/wmi/wmicore.c 2007-05-01 09:24:49 UTC (rev 4980)
@@ -58,6 +58,8 @@
static const struct werror_code_struct wmi_errs[] =
{
+ { "RPC_S_CALL_FAILED", W_ERROR(RPC_S_CALL_FAILED) },
+
{ "WBEM_NO_ERROR", W_ERROR(WBEM_NO_ERROR) },
{ "WBEM_S_NO_ERROR", W_ERROR(WBEM_S_NO_ERROR) },
{ "WBEM_S_SAME", W_ERROR(WBEM_S_SAME) },
|
|
From: <sv...@ze...> - 2007-05-01 04:29:57
|
Author: ian
Date: 2007-05-01 00:29:58 -0400 (Tue, 01 May 2007)
New Revision: 4979
Added:
trunk/Products/ZenWidgets/skins/zenui/img/tab_bg_selected_cont.gif
Modified:
trunk/Products/ZenModel/skins/zenmodel/templates.pt
trunk/Products/ZenModel/skins/zenmodel/zenoss.css
trunk/Products/ZenWidgets/skins/zenui/img/tab_bg_selected.gif
Log:
* Fixes #1341: Made selected tabs variable width
Modified: trunk/Products/ZenModel/skins/zenmodel/templates.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/templates.pt 2007-05-01 04:29:41 UTC (rev 4978)
+++ trunk/Products/ZenModel/skins/zenmodel/templates.pt 2007-05-01 04:29:58 UTC (rev 4979)
@@ -281,14 +281,29 @@
and 'tabletitleselected'">
+ <tal:block tal:condition="python:tab.get('selected', None)">
+ <div class="tableft">
+ <div class="tabright">
+ <div class="tabcenter">
<a class="tabletitle" tal:content="tab/name"
tal:attributes="href python:
'%s/%s'% (here.absolute_url_path(),tab['action']);"
>TabName</a>
+ </div>
+ </div>
+ </div>
+ </tal:block>
+ <tal:block condition="python:not tab.get('selected', None)">
+ <a class="tabletitle" tal:content="tab/name"
+ tal:attributes="href python:
+ '%s/%s'% (here.absolute_url_path(),tab['action']);"
+ >TabName</a>
+ </tal:block>
+
<div id="selectedtablinehider"
- tal:condition="python:tab.get('selected',None)">
+ tal:condition="python:tab.get('selected',None)">
</div>
</td>
Modified: trunk/Products/ZenModel/skins/zenmodel/zenoss.css
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/zenoss.css 2007-05-01 04:29:41 UTC (rev 4978)
+++ trunk/Products/ZenModel/skins/zenmodel/zenoss.css 2007-05-01 04:29:58 UTC (rev 4979)
@@ -354,15 +354,28 @@
table.tabtable td.tabletitleselected {
color: #333333;
- height:32px;
+ height: 29px;
font-size:8pt;
padding: 0px;
border: 0px;
- line-height: 26px;
- width: 101px;
- background: transparent url(img/tab_bg_selected.gif) no-repeat bottom left;
}
-
+table.tabtable div.tableft {
+ background: transparent url(img/tab_bg_selected.gif) no-repeat left 0pt;
+ height: 30px;
+ overflow: hidden;
+}
+table.tabtable div.tabright {
+ background: transparent url(img/tab_bg_selected.gif) no-repeat right 0pt;
+ height: 30px;
+ overflow: hidden;
+}
+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 {
@@ -370,10 +383,8 @@
display: block;
padding: 0pt;
border: 0pt;
- width: 100%;
- height: 100%;
font-size:10pt;
- line-height: 34px;
+ margin-top: 3px;
background: none;
}
@@ -423,12 +434,11 @@
}
#selectedtablinehider {
- width: 99px;
- background-color: #E0E0E0;
+ background-color: blue;
height: 3px;
z-index: 2999;
position: absolute;
- margin-top: -2px;
+ margin-top: 0px;
margin-left: 1px;
}
Modified: trunk/Products/ZenWidgets/skins/zenui/img/tab_bg_selected.gif
===================================================================
(Binary files differ)
Added: trunk/Products/ZenWidgets/skins/zenui/img/tab_bg_selected_cont.gif
Property changes on: trunk/Products/ZenWidgets/skins/zenui/img/tab_bg_selected_cont.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
|
|
From: <sv...@ze...> - 2007-05-01 04:29:43
|
Author: jstevens
Date: 2007-05-01 00:29:41 -0400 (Tue, 01 May 2007)
New Revision: 4978
Modified:
trunk/Products/ZenModel/IpService.py
trunk/Products/ZenModel/IpServiceClass.py
trunk/Products/ZenModel/OSProcess.py
trunk/Products/ZenModel/OSProcessClass.py
trunk/Products/ZenModel/OSProcessOrganizer.py
trunk/Products/ZenModel/ServiceClass.py
trunk/Products/ZenModel/ServiceOrganizer.py
trunk/Products/ZenModel/WinService.py
trunk/Products/ZenModel/skins/zenmodel/ipProcessManage.pt
trunk/Products/ZenModel/skins/zenmodel/ipServiceClassManage.pt
trunk/Products/ZenModel/skins/zenmodel/ipServiceManage.pt
trunk/Products/ZenModel/skins/zenmodel/osProcessClassManage.pt
trunk/Products/ZenModel/skins/zenmodel/osProcessManage.pt
trunk/Products/ZenModel/skins/zenmodel/osProcessOrganizerManage.pt
trunk/Products/ZenModel/skins/zenmodel/serviceClassManage.pt
trunk/Products/ZenModel/skins/zenmodel/serviceManage.pt
trunk/Products/ZenModel/skins/zenmodel/serviceOrganizerManage.pt
trunk/Products/ZenModel/skins/zenmodel/winProcessManage.pt
trunk/Products/ZenModel/skins/zenmodel/winServiceManage.pt
Log:
refs #1120
* Removing user commands from several classes
* Removing the now empty Administration tab from most of same classes
Modified: trunk/Products/ZenModel/IpService.py
===================================================================
--- trunk/Products/ZenModel/IpService.py 2007-05-01 03:50:15 UTC (rev 4977)
+++ trunk/Products/ZenModel/IpService.py 2007-05-01 04:29:41 UTC (rev 4978)
@@ -86,11 +86,11 @@
, 'permissions' : (
Permissions.view, )
},
- { 'id' : 'manage'
- , 'name' : 'Administration'
- , 'action' : 'ipServiceManage'
- , 'permissions' : ("Manage DMD",)
- },
+# { 'id' : 'manage'
+# , 'name' : 'Administration'
+# , 'action' : 'ipServiceManage'
+# , 'permissions' : ("Manage DMD",)
+# },
{ 'id' : 'viewHistory'
, 'name' : 'Modifications'
, 'action' : 'viewHistory'
Modified: trunk/Products/ZenModel/IpServiceClass.py
===================================================================
--- trunk/Products/ZenModel/IpServiceClass.py 2007-05-01 03:50:15 UTC (rev 4977)
+++ trunk/Products/ZenModel/IpServiceClass.py 2007-05-01 04:29:41 UTC (rev 4978)
@@ -69,11 +69,11 @@
, 'action' : 'ipServiceClassEdit'
, 'permissions' : ("Manage DMD", )
},
- { 'id' : 'manage'
- , 'name' : 'Administration'
- , 'action' : 'ipServiceClassManage'
- , 'permissions' : ("Manage DMD",)
- },
+# { 'id' : 'manage'
+# , 'name' : 'Administration'
+# , 'action' : 'ipServiceClassManage'
+# , 'permissions' : ("Manage DMD",)
+# },
{ 'id' : 'zproperties'
, 'name' : 'zProperties'
, 'action' : 'zPropertyEdit'
Modified: trunk/Products/ZenModel/OSProcess.py
===================================================================
--- trunk/Products/ZenModel/OSProcess.py 2007-05-01 03:50:15 UTC (rev 4977)
+++ trunk/Products/ZenModel/OSProcess.py 2007-05-01 04:29:41 UTC (rev 4978)
@@ -74,11 +74,11 @@
# , 'action' : 'objRRDTemplate'
# , 'permissions' : ("Change Device", )
# },
- { 'id' : 'manage'
- , 'name' : 'Administration'
- , 'action' : 'osProcessManage'
- , 'permissions' : ("Manage DMD",)
- },
+# { 'id' : 'manage'
+# , 'name' : 'Administration'
+# , 'action' : 'osProcessManage'
+# , 'permissions' : ("Manage DMD",)
+# },
{ 'id' : 'viewHistory'
, 'name' : 'Modifications'
, 'action' : 'viewHistory'
Modified: trunk/Products/ZenModel/OSProcessClass.py
===================================================================
--- trunk/Products/ZenModel/OSProcessClass.py 2007-05-01 03:50:15 UTC (rev 4977)
+++ trunk/Products/ZenModel/OSProcessClass.py 2007-05-01 04:29:41 UTC (rev 4978)
@@ -74,11 +74,11 @@
, 'action' : 'osProcessClassEdit'
, 'permissions' : ("Manage DMD", )
},
- { 'id' : 'manage'
- , 'name' : 'Administration'
- , 'action' : 'osProcessClassManage'
- , 'permissions' : ("Manage DMD",)
- },
+# { 'id' : 'manage'
+# , 'name' : 'Administration'
+# , 'action' : 'osProcessClassManage'
+# , 'permissions' : ("Manage DMD",)
+# },
{ 'id' : 'zproperties'
, 'name' : 'zProperties'
, 'action' : 'zPropertyEdit'
Modified: trunk/Products/ZenModel/OSProcessOrganizer.py
===================================================================
--- trunk/Products/ZenModel/OSProcessOrganizer.py 2007-05-01 03:50:15 UTC (rev 4977)
+++ trunk/Products/ZenModel/OSProcessOrganizer.py 2007-05-01 04:29:41 UTC (rev 4978)
@@ -70,11 +70,11 @@
, 'permissions' : (
Permissions.view, )
},
- { 'id' : 'manage'
- , 'name' : 'Administration'
- , 'action' : 'osProcessOrganizerManage'
- , 'permissions' : ("Manage DMD",)
- },
+# { 'id' : 'manage'
+# , 'name' : 'Administration'
+# , 'action' : 'osProcessOrganizerManage'
+# , 'permissions' : ("Manage DMD",)
+# },
{ 'id' : 'zproperties'
, 'name' : 'zProperties'
, 'action' : 'zPropertyEdit'
Modified: trunk/Products/ZenModel/ServiceClass.py
===================================================================
--- trunk/Products/ZenModel/ServiceClass.py 2007-05-01 03:50:15 UTC (rev 4977)
+++ trunk/Products/ZenModel/ServiceClass.py 2007-05-01 04:29:41 UTC (rev 4978)
@@ -90,11 +90,11 @@
, 'action' : 'serviceClassEdit'
, 'permissions' : ("Manage DMD", )
},
- { 'id' : 'manage'
- , 'name' : 'Administration'
- , 'action' : 'serviceClassManage'
- , 'permissions' : ("Manage DMD",)
- },
+# { 'id' : 'manage'
+# , 'name' : 'Administration'
+# , 'action' : 'serviceClassManage'
+# , 'permissions' : ("Manage DMD",)
+# },
{ 'id' : 'zproperties'
, 'name' : 'zProperties'
, 'action' : 'zPropertyEdit'
Modified: trunk/Products/ZenModel/ServiceOrganizer.py
===================================================================
--- trunk/Products/ZenModel/ServiceOrganizer.py 2007-05-01 03:50:15 UTC (rev 4977)
+++ trunk/Products/ZenModel/ServiceOrganizer.py 2007-05-01 04:29:41 UTC (rev 4978)
@@ -69,11 +69,11 @@
, 'permissions' : (
Permissions.view, )
},
- { 'id' : 'manage'
- , 'name' : 'Administration'
- , 'action' : 'serviceOrganizerManage'
- , 'permissions' : ("Manage DMD",)
- },
+# { 'id' : 'manage'
+# , 'name' : 'Administration'
+# , 'action' : 'serviceOrganizerManage'
+# , 'permissions' : ("Manage DMD",)
+# },
{ 'id' : 'zproperties'
, 'name' : 'zProperties'
, 'action' : 'zPropertyEdit'
Modified: trunk/Products/ZenModel/WinService.py
===================================================================
--- trunk/Products/ZenModel/WinService.py 2007-05-01 03:50:15 UTC (rev 4977)
+++ trunk/Products/ZenModel/WinService.py 2007-05-01 04:29:41 UTC (rev 4978)
@@ -69,11 +69,11 @@
, 'permissions' : (
Permissions.view, )
},
- { 'id' : 'manage'
- , 'name' : 'Administration'
- , 'action' : 'winServiceManage'
- , 'permissions' : ("Manage DMD",)
- },
+# { 'id' : 'manage'
+# , 'name' : 'Administration'
+# , 'action' : 'winServiceManage'
+# , 'permissions' : ("Manage DMD",)
+# },
{ 'id' : 'viewHistory'
, 'name' : 'Modifications'
, 'action' : 'viewHistory'
Modified: trunk/Products/ZenModel/skins/zenmodel/ipProcessManage.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/ipProcessManage.pt 2007-05-01 03:50:15 UTC (rev 4977)
+++ trunk/Products/ZenModel/skins/zenmodel/ipProcessManage.pt 2007-05-01 04:29:41 UTC (rev 4978)
@@ -21,9 +21,7 @@
<tal:block metal:fill-slot="zentablecontents">
<!-- BEGIN TABLE CONTENTS -->
-
- <tal:block metal:use-macro="here/userCommandsMacros/macros/runCommand" />
-
+
<!-- END TABLE CONTENTS -->
</tal:block>
@@ -33,9 +31,5 @@
</form>
-<span metal:use-macro="here/templates/macros/contentSeparator"/>
-
-<span metal:use-macro="here/userCommandsMacros/macros/userCommandsTable" />
-
</tal:block>
</tal:block>
Modified: trunk/Products/ZenModel/skins/zenmodel/ipServiceClassManage.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/ipServiceClassManage.pt 2007-05-01 03:50:15 UTC (rev 4977)
+++ trunk/Products/ZenModel/skins/zenmodel/ipServiceClassManage.pt 2007-05-01 04:29:41 UTC (rev 4978)
@@ -21,9 +21,7 @@
<tal:block metal:fill-slot="zentablecontents">
<!-- BEGIN TABLE CONTENTS -->
-
- <tal:block metal:use-macro="here/userCommandsMacros/macros/runCommand" />
-
+
<!-- END TABLE CONTENTS -->
</tal:block>
@@ -33,9 +31,5 @@
</form>
-<span metal:use-macro="here/templates/macros/contentSeparator"/>
-
-<span metal:use-macro="here/userCommandsMacros/macros/userCommandsTable" />
-
</tal:block>
</tal:block>
Modified: trunk/Products/ZenModel/skins/zenmodel/ipServiceManage.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/ipServiceManage.pt 2007-05-01 03:50:15 UTC (rev 4977)
+++ trunk/Products/ZenModel/skins/zenmodel/ipServiceManage.pt 2007-05-01 04:29:41 UTC (rev 4978)
@@ -21,9 +21,7 @@
<tal:block metal:fill-slot="zentablecontents">
<!-- BEGIN TABLE CONTENTS -->
-
- <tal:block metal:use-macro="here/userCommandsMacros/macros/runCommand" />
-
+
<!-- END TABLE CONTENTS -->
</tal:block>
@@ -33,9 +31,5 @@
</form>
-<span metal:use-macro="here/templates/macros/contentSeparator"/>
-
-<span metal:use-macro="here/userCommandsMacros/macros/userCommandsTable" />
-
</tal:block>
</tal:block>
Modified: trunk/Products/ZenModel/skins/zenmodel/osProcessClassManage.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/osProcessClassManage.pt 2007-05-01 03:50:15 UTC (rev 4977)
+++ trunk/Products/ZenModel/skins/zenmodel/osProcessClassManage.pt 2007-05-01 04:29:41 UTC (rev 4978)
@@ -21,9 +21,7 @@
<tal:block metal:fill-slot="zentablecontents">
<!-- BEGIN TABLE CONTENTS -->
-
- <tal:block metal:use-macro="here/userCommandsMacros/macros/runCommand" />
-
+
<!-- END TABLE CONTENTS -->
</tal:block>
@@ -33,9 +31,5 @@
</form>
-<span metal:use-macro="here/templates/macros/contentSeparator"/>
-
-<span metal:use-macro="here/userCommandsMacros/macros/userCommandsTable" />
-
</tal:block>
</tal:block>
Modified: trunk/Products/ZenModel/skins/zenmodel/osProcessManage.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/osProcessManage.pt 2007-05-01 03:50:15 UTC (rev 4977)
+++ trunk/Products/ZenModel/skins/zenmodel/osProcessManage.pt 2007-05-01 04:29:41 UTC (rev 4978)
@@ -21,9 +21,7 @@
<tal:block metal:fill-slot="zentablecontents">
<!-- BEGIN TABLE CONTENTS -->
-
- <tal:block metal:use-macro="here/userCommandsMacros/macros/runCommand" />
-
+
<!-- END TABLE CONTENTS -->
</tal:block>
@@ -33,9 +31,5 @@
</form>
-<span metal:use-macro="here/templates/macros/contentSeparator"/>
-
-<span metal:use-macro="here/userCommandsMacros/macros/userCommandsTable" />
-
</tal:block>
</tal:block>
Modified: trunk/Products/ZenModel/skins/zenmodel/osProcessOrganizerManage.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/osProcessOrganizerManage.pt 2007-05-01 03:50:15 UTC (rev 4977)
+++ trunk/Products/ZenModel/skins/zenmodel/osProcessOrganizerManage.pt 2007-05-01 04:29:41 UTC (rev 4978)
@@ -9,7 +9,7 @@
<tal:block metal:fill-slot="zentablecontents">
<!-- BEGIN TABLE CONTENTS -->
- <tal:block metal:use-macro="here/userCommandsMacros/macros/runCommand" />
+
<!-- END TABLE CONTENTS -->
</tal:block>
@@ -17,9 +17,5 @@
</tal:block>
</form>
-<span metal:use-macro="here/templates/macros/contentSeparator"/>
-
-<span metal:use-macro="here/userCommandsMacros/macros/userCommandsTable" />
-
</tal:block>
</tal:block>
Modified: trunk/Products/ZenModel/skins/zenmodel/serviceClassManage.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/serviceClassManage.pt 2007-05-01 03:50:15 UTC (rev 4977)
+++ trunk/Products/ZenModel/skins/zenmodel/serviceClassManage.pt 2007-05-01 04:29:41 UTC (rev 4978)
@@ -21,9 +21,7 @@
<tal:block metal:fill-slot="zentablecontents">
<!-- BEGIN TABLE CONTENTS -->
-
- <tal:block metal:use-macro="here/userCommandsMacros/macros/runCommand" />
-
+
<!-- END TABLE CONTENTS -->
</tal:block>
@@ -33,9 +31,5 @@
</form>
-<span metal:use-macro="here/templates/macros/contentSeparator"/>
-
-<span metal:use-macro="here/userCommandsMacros/macros/userCommandsTable" />
-
</tal:block>
</tal:block>
Modified: trunk/Products/ZenModel/skins/zenmodel/serviceManage.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/serviceManage.pt 2007-05-01 03:50:15 UTC (rev 4977)
+++ trunk/Products/ZenModel/skins/zenmodel/serviceManage.pt 2007-05-01 04:29:41 UTC (rev 4978)
@@ -21,9 +21,7 @@
<tal:block metal:fill-slot="zentablecontents">
<!-- BEGIN TABLE CONTENTS -->
-
- <tal:block metal:use-macro="here/userCommandsMacros/macros/runCommand" />
-
+
<!-- END TABLE CONTENTS -->
</tal:block>
@@ -33,9 +31,5 @@
</form>
-<span metal:use-macro="here/templates/macros/contentSeparator"/>
-
-<span metal:use-macro="here/userCommandsMacros/macros/userCommandsTable" />
-
</tal:block>
</tal:block>
Modified: trunk/Products/ZenModel/skins/zenmodel/serviceOrganizerManage.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/serviceOrganizerManage.pt 2007-05-01 03:50:15 UTC (rev 4977)
+++ trunk/Products/ZenModel/skins/zenmodel/serviceOrganizerManage.pt 2007-05-01 04:29:41 UTC (rev 4978)
@@ -9,7 +9,7 @@
<tal:block metal:fill-slot="zentablecontents">
<!-- BEGIN TABLE CONTENTS -->
- <tal:block metal:use-macro="here/userCommandsMacros/macros/runCommand" />
+
<!-- END TABLE CONTENTS -->
</tal:block>
@@ -17,9 +17,5 @@
</tal:block>
</form>
-<span metal:use-macro="here/templates/macros/contentSeparator"/>
-
-<span metal:use-macro="here/userCommandsMacros/macros/userCommandsTable" />
-
</tal:block>
</tal:block>
Modified: trunk/Products/ZenModel/skins/zenmodel/winProcessManage.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/winProcessManage.pt 2007-05-01 03:50:15 UTC (rev 4977)
+++ trunk/Products/ZenModel/skins/zenmodel/winProcessManage.pt 2007-05-01 04:29:41 UTC (rev 4978)
@@ -21,9 +21,7 @@
<tal:block metal:fill-slot="zentablecontents">
<!-- BEGIN TABLE CONTENTS -->
-
- <tal:block metal:use-macro="here/userCommandsMacros/macros/runCommand" />
-
+
<!-- END TABLE CONTENTS -->
</tal:block>
@@ -33,9 +31,5 @@
</form>
-<span metal:use-macro="here/templates/macros/contentSeparator"/>
-
-<span metal:use-macro="here/userCommandsMacros/macros/userCommandsTable" />
-
</tal:block>
</tal:block>
Modified: trunk/Products/ZenModel/skins/zenmodel/winServiceManage.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/winServiceManage.pt 2007-05-01 03:50:15 UTC (rev 4977)
+++ trunk/Products/ZenModel/skins/zenmodel/winServiceManage.pt 2007-05-01 04:29:41 UTC (rev 4978)
@@ -21,9 +21,7 @@
<tal:block metal:fill-slot="zentablecontents">
<!-- BEGIN TABLE CONTENTS -->
-
- <tal:block metal:use-macro="here/userCommandsMacros/macros/runCommand" />
-
+
<!-- END TABLE CONTENTS -->
</tal:block>
@@ -33,9 +31,5 @@
</form>
-<span metal:use-macro="here/templates/macros/contentSeparator"/>
-
-<span metal:use-macro="here/userCommandsMacros/macros/userCommandsTable" />
-
</tal:block>
</tal:block>
|
|
From: <sv...@ze...> - 2007-05-01 03:50:13
|
Author: jstevens
Date: 2007-04-30 23:50:15 -0400 (Mon, 30 Apr 2007)
New Revision: 4977
Modified:
trunk/Products/ZenModel/skins/zenmodel/monitorList.pt
Log:
Removed Select All buttons per ead email
Modified: trunk/Products/ZenModel/skins/zenmodel/monitorList.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/monitorList.pt 2007-05-01 03:49:38 UTC (rev 4976)
+++ trunk/Products/ZenModel/skins/zenmodel/monitorList.pt 2007-05-01 03:50:15 UTC (rev 4977)
@@ -67,13 +67,6 @@
'%Y/%m/%d %H:%M:%S')"/>
</tr>
</tal:block>
- <tr tal:condition="here/isManager">
- <td class="tableheader" colspan="3">
- <input class="tableheader" type="submit"
- name="SelectButton" value="Select All"
- onClick="toggleSelect(this.form);return false"/>
- </td>
- </tr>
<!-- END TABLE CONTENTS -->
|
|
From: <sv...@ze...> - 2007-05-01 03:49:38
|
Author: jstevens
Date: 2007-04-30 23:49:38 -0400 (Mon, 30 Apr 2007)
New Revision: 4976
Modified:
trunk/Products/ZenEvents/skins/zenevents/addEvent.pt
Log:
Removing Summary field per ead email
Modified: trunk/Products/ZenEvents/skins/zenevents/addEvent.pt
===================================================================
--- trunk/Products/ZenEvents/skins/zenevents/addEvent.pt 2007-04-30 23:00:12 UTC (rev 4975)
+++ trunk/Products/ZenEvents/skins/zenevents/addEvent.pt 2007-05-01 03:49:38 UTC (rev 4976)
@@ -18,16 +18,6 @@
<!-- BEGIN TABLE CONTENTS -->
<tr>
<td class="tableheader" align="left">
- Summary
- </td>
- <td class="tablevalues" align="left">
- <input class="tablevalues" type="text"
- size="50" name="summary" maxlen="128"
- tal:attributes="value event/summary | nothing" />
- </td>
- </tr>
- <tr>
- <td class="tableheader" align="left">
Message
</td>
<td class="tablevalues" align="left">
|
|
From: <sv...@ze...> - 2007-04-30 23:00:14
|
Author: ecn
Date: 2007-04-30 19:00:12 -0400 (Mon, 30 Apr 2007)
New Revision: 4975
Modified:
trunk/Products/ZenModel/PerformanceConf.py
Log:
convert url parts to strings to avoid unicode
Modified: trunk/Products/ZenModel/PerformanceConf.py
===================================================================
--- trunk/Products/ZenModel/PerformanceConf.py 2007-04-30 22:49:28 UTC (rev 4974)
+++ trunk/Products/ZenModel/PerformanceConf.py 2007-04-30 23:00:12 UTC (rev 4975)
@@ -363,12 +363,14 @@
def performanceCustomSummary(self, gopts):
"fill out full path for custom gopts and call to server"
gopts = self._fullPerformancePath(gopts)
- if self.renderurl.startswith("http"):
- url = basicAuthUrl(self.renderuser, self.renderpass,
- self.renderurl)
+ renderurl = str(self.renderurl)
+ if renderurl.startswith("http"):
+ url = basicAuthUrl(str(self.renderuser),
+ str(self.renderpass),
+ renderurl)
server = xmlrpclib.Server(url)
else:
- server = self.getObjByPath(self.renderurl)
+ server = self.getObjByPath(renderurl)
return server.summary(gopts)
|
|
From: <sv...@ze...> - 2007-04-30 22:49:27
|
Author: ecn
Date: 2007-04-30 18:49:28 -0400 (Mon, 30 Apr 2007)
New Revision: 4974
Modified:
trunk/Products/ZenReports/reports/Performance_Reports/Availability_Report.rpt
Log:
* put component and missing component td condition together
Modified: trunk/Products/ZenReports/reports/Performance_Reports/Availability_Report.rpt
===================================================================
--- trunk/Products/ZenReports/reports/Performance_Reports/Availability_Report.rpt 2007-04-30 22:20:09 UTC (rev 4973)
+++ trunk/Products/ZenReports/reports/Performance_Reports/Availability_Report.rpt 2007-04-30 22:49:28 UTC (rev 4974)
@@ -118,12 +118,12 @@
tal:condition="not:comp"
tal:content="avail/component"/>
<td class="tablevalues"
- tal:content="avail/systems" />
- <td class="tablevalues"
tal:condition="comp">
<a tal:content="avail/component"
tal:attributes="href comp/getPrimaryUrlPath"/>
</td>
+ <td class="tablevalues"
+ tal:content="avail/systems" />
<td class="tablevalues" tal:content="avail/floatStr"/>
</tr>
</tal:block>
|
|
From: <sv...@ze...> - 2007-04-30 22:20:08
|
Author: ecn
Date: 2007-04-30 18:20:09 -0400 (Mon, 30 Apr 2007)
New Revision: 4973
Modified:
trunk/Products/DataCollector/zenmodeler.py
Log:
* ignore named plugins if --collect is given
Modified: trunk/Products/DataCollector/zenmodeler.py
===================================================================
--- trunk/Products/DataCollector/zenmodeler.py 2007-04-30 22:17:39 UTC (rev 4972)
+++ trunk/Products/DataCollector/zenmodeler.py 2007-04-30 22:20:09 UTC (rev 4973)
@@ -101,7 +101,7 @@
try:
if ignoreTest(name):
self.log.debug("ignoring %s on %s",name, device.id)
- elif name in names:
+ elif name in names and not self.options.collectPlugins:
self.log.debug("using %s on %s",name, device.id)
result.append(plugin)
elif collectTest(name):
|
|
From: <sv...@ze...> - 2007-04-30 22:17:38
|
Author: ian
Date: 2007-04-30 18:17:39 -0400 (Mon, 30 Apr 2007)
New Revision: 4972
Modified:
trunk/Products/ZenModel/skins/zenmodel/templates.pt
trunk/Products/ZenModel/skins/zenmodel/zenoss.css
trunk/Products/ZenWidgets/skins/zenui/css/tables.css
trunk/Products/ZenWidgets/skins/zenui/javascript/menus.js
Log:
* Moved global menu to the left side
Modified: trunk/Products/ZenModel/skins/zenmodel/templates.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/templates.pt 2007-04-30 22:05:10 UTC (rev 4971)
+++ trunk/Products/ZenModel/skins/zenmodel/templates.pt 2007-04-30 22:17:39 UTC (rev 4972)
@@ -273,6 +273,9 @@
<table class="tabtable" cellpadding="0" cellspacing="0"
tal:condition="python:(ztabs and not getattr(request, 'notabs', False))">
<tr>
+ <td class="contextmenutab">
+ <span metal:use-macro="here/zenuimacros/macros/basemenu"/>
+ </td>
<td tal:repeat="tab ztabs"
tal:attributes="class python:tab.get('selected', None)
and 'tabletitleselected'">
@@ -295,9 +298,6 @@
Other Page
</div>
</td>
- <td class="contextmenutab">
- <span metal:use-macro="here/zenuimacros/macros/basemenu"/>
- </td>
</tr>
</table>
</div>
Modified: trunk/Products/ZenModel/skins/zenmodel/zenoss.css
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/zenoss.css 2007-04-30 22:05:10 UTC (rev 4971)
+++ trunk/Products/ZenModel/skins/zenmodel/zenoss.css 2007-04-30 22:17:39 UTC (rev 4972)
@@ -341,14 +341,15 @@
width: 53px;
height: 25px;
padding: 0pt;
+ border: 0;
border-top: 0pt;
border-right: 0pt;
+ margin-right: -1px;
margin-bottom: -1px;
- margin-left: -1px;
- background-image: url('img/contextmenu_tab.gif');
+ background-image: url('img/actions_button_left.gif');
}
table.tabtable td.contextmenutab a.tabletitle:hover {
- background-image: url('img/contextmenu_tab_depressed.gif');
+ background-image: url('img/actions_button_depressed_left.gif');
}
table.tabtable td.tabletitleselected {
Modified: trunk/Products/ZenWidgets/skins/zenui/css/tables.css
===================================================================
--- trunk/Products/ZenWidgets/skins/zenui/css/tables.css 2007-04-30 22:05:10 UTC (rev 4971)
+++ trunk/Products/ZenWidgets/skins/zenui/css/tables.css 2007-04-30 22:17:39 UTC (rev 4972)
@@ -25,7 +25,6 @@
font-size: 8pt;
}
-
.zentable_selectionbar {
height:14px;
font-size: 10px;
@@ -41,11 +40,13 @@
text-align: left;
background: transparent url('img/stripe.png');
}
+
.zentable_selectionbar ul {
list-style-type: none;
display: inline;
margin: 0; padding: 0;
}
+
.zentable_selectionbar li {
display:inline;
text-decoration: underline;
Modified: trunk/Products/ZenWidgets/skins/zenui/javascript/menus.js
===================================================================
--- trunk/Products/ZenWidgets/skins/zenui/javascript/menus.js 2007-04-30 22:05:10 UTC (rev 4971)
+++ trunk/Products/ZenWidgets/skins/zenui/javascript/menus.js 2007-04-30 22:17:39 UTC (rev 4972)
@@ -26,7 +26,7 @@
var vPos = getViewportPosition();
finalDims = $(menu).className=='devmovemenuitems'?{x:0, y:0}:{x:0, y:24};
totalX = pPos.x + mDims.w;
- finalDims.x = totalX>=vDims.w+vPos.x?pDims.w-mDims.w:finalDims.x;
+ finalDims.x = totalX>=vDims.w+vPos.x?pDims.w-mDims.w:3+finalDims.x;
finalDims.x = $(menu).className=='devmovemenuitems'?4-pDims.w:finalDims.x;
totalY = pPos.y + pDims.h + mDims.h;
var topmenu = getElementsByTagAndClassName('div', 'menu_top', menu)[0];
|
|
From: <sv...@ze...> - 2007-04-30 22:05:19
|
Author: ecn
Date: 2007-04-30 18:05:10 -0400 (Mon, 30 Apr 2007)
New Revision: 4971
Added:
trunk/Products/ZenModel/skins/zenmodel/zSortableProperty.pt
Modified:
trunk/Products/ZenModel/skins/zenmodel/zPropertyEdit.pt
Log:
* move the swoopy to its own page
Modified: trunk/Products/ZenModel/skins/zenmodel/zPropertyEdit.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/zPropertyEdit.pt 2007-04-30 21:59:34 UTC (rev 4970)
+++ trunk/Products/ZenModel/skins/zenmodel/zPropertyEdit.pt 2007-04-30 22:05:10 UTC (rev 4971)
@@ -4,9 +4,6 @@
<tal:block tal:condition="not:msie">
<script src="/zport/js/MochiKit.js"></script>
- <script src="/zport/js/DragAndDrop.js"></script>
- <script src="/zport/js/Sortable.js"></script>
- <script src="zendragdrop.js"></script>
</tal:block>
<form method="post"
@@ -57,26 +54,11 @@
tal:define="propName python:prop+':'+ptype;
ta python:'ta_' + prop;
ul python:'ul_' + prop;">
- <div style="float:left;">
- <textarea tal:content="pvalue"
- tal:attributes="name propName; id ta"/>
- <h5>Plugins (drag to change order)</h5>
- </div>
- <div style="float:left;">
- <ul tal:attributes="name propName; id ul"
- class="sortable_list fieldlist">
- <li class="sortable_item fieldlist"
- tal:repeat="plugin python:
- [x for x in popts if x not in here.zCollectorPlugins]"
- tal:content="plugin"/>
- </ul>
- <h5>Available fields (drag to other list to add)</h5>
- </div>
- <script tal:content="
- python:'''var x = new ZenDragDropList('%s', '%s');''' % (ta, ul)
- "/>
- <!-- =========== swoopy sortable selector =============== -->
+ <a tal:attributes="href string:${request/URL1}/zSortableProperty?prop=${prop}">
+ Edit
+ </a>
</tal:block>
+ <!-- =========== swoopy sortable selector =============== -->
</span>
<span tal:condition="python: prop=='zEventSeverity'">
<select class="tablevalues"
Added: trunk/Products/ZenModel/skins/zenmodel/zSortableProperty.pt
|
