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-02-28 17:10:29
|
Author: edahl Date: 2007-02-28 11:10:27 -0600 (Wed, 28 Feb 2007) New Revision: 4145 Added: trunk/inst/externallibs/pycrypto-2.0.1.tar.gz Modified: trunk/inst/docs/INSTALL_UBUNTU.txt Log: * add pycrypto * update install readme for ubuntu Modified: trunk/inst/docs/INSTALL_UBUNTU.txt =================================================================== --- trunk/inst/docs/INSTALL_UBUNTU.txt 2007-02-28 04:17:13 UTC (rev 4144) +++ trunk/inst/docs/INSTALL_UBUNTU.txt 2007-02-28 17:10:27 UTC (rev 4145) @@ -138,11 +138,11 @@ nano /etc/init.d/zenoss (add the following line to ensure all scripts can find ZENHOME) export ZENHOME=/usr/local/zenoss - update-rc.d zenoss 95 + update-rc.d zenoss defaults 95 26. Thanks to the following useful ubuntu / mysql / zenoss sites: www.howtoforge.com/perfect_setup_ubuntu_6.06 ubuntuguide.org/wiki/Ubuntu_dapper packages.ubuntu.com dev.mysql.com/doc/refman/5.0/en/resetting-permissions.html - www.zenoss.com/download/install + www.zenoss.com/download/install Added: trunk/inst/externallibs/pycrypto-2.0.1.tar.gz Property changes on: trunk/inst/externallibs/pycrypto-2.0.1.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream |
|
From: <sv...@ze...> - 2007-02-28 04:17:18
|
Author: chris
Date: 2007-02-27 22:17:13 -0600 (Tue, 27 Feb 2007)
New Revision: 4144
Modified:
trunk/inst/install-functions.sh
Log:
don't use --commit when running zenmigrate
Modified: trunk/inst/install-functions.sh
===================================================================
--- trunk/inst/install-functions.sh 2007-02-27 22:12:29 UTC (rev 4143)
+++ trunk/inst/install-functions.sh 2007-02-28 04:17:13 UTC (rev 4144)
@@ -150,7 +150,7 @@
run_zenmigrate()
{
echo Migrating data
- $ZENHOME/bin/zenmigrate run --commit
+ $ZENHOME/bin/zenmigrate run
}
# starts the zope server
|
|
From: <sv...@ze...> - 2007-02-27 22:12:55
|
Author: ian
Date: 2007-02-27 16:12:29 -0600 (Tue, 27 Feb 2007)
New Revision: 4143
Modified:
trunk/Products/ZenWidgets/skins/zenui/actions_button_depressed.gif
trunk/Products/ZenWidgets/skins/zenui/filter_box_bg.gif
trunk/Products/ZenWidgets/skins/zenui/filterbox.css
trunk/Products/ZenWidgets/skins/zenui/zenuimacros.pt
Log:
* More CSS tweaks, and added a filter label
Modified: trunk/Products/ZenWidgets/skins/zenui/actions_button_depressed.gif
===================================================================
(Binary files differ)
Modified: trunk/Products/ZenWidgets/skins/zenui/filter_box_bg.gif
===================================================================
(Binary files differ)
Modified: trunk/Products/ZenWidgets/skins/zenui/filterbox.css
===================================================================
--- trunk/Products/ZenWidgets/skins/zenui/filterbox.css 2007-02-27 21:34:58 UTC (rev 4142)
+++ trunk/Products/ZenWidgets/skins/zenui/filterbox.css 2007-02-27 22:12:29 UTC (rev 4143)
@@ -5,7 +5,7 @@
width: 126px;
top: 0px;
padding-top: 5px;
- right: 110px;
+ right: 60px;
}
.filterbox input[type="text"] {
Modified: trunk/Products/ZenWidgets/skins/zenui/zenuimacros.pt
===================================================================
--- trunk/Products/ZenWidgets/skins/zenui/zenuimacros.pt 2007-02-27 21:34:58 UTC (rev 4142)
+++ trunk/Products/ZenWidgets/skins/zenui/zenuimacros.pt 2007-02-27 22:12:29 UTC (rev 4143)
@@ -62,6 +62,7 @@
<tal:block metal:define-macro="filterbox">
<link href="filterbox.css" rel="stylesheet" type="text/css" />
+<span style="position:absolute;right:190px;font-weight:normal;">Filter:</span>
<div class="filterbox"
tal:define="ts python:here.ZenTableManager.getTableState(tableName);
message request/SESSION/message | nothing;">
|
|
From: <sv...@ze...> - 2007-02-27 21:35:04
|
Author: ian
Date: 2007-02-27 15:34:58 -0600 (Tue, 27 Feb 2007)
New Revision: 4142
Added:
trunk/Products/ZenWidgets/skins/zenui/actions_button.gif
trunk/Products/ZenWidgets/skins/zenui/actions_button_depressed.gif
Modified:
trunk/Products/ZenWidgets/skins/zenui/filter_box_bg.gif
trunk/Products/ZenWidgets/skins/zenui/menus.css
trunk/Products/ZenWidgets/skins/zenui/zenuimacros.pt
Log:
* Made a new actions button
Added: trunk/Products/ZenWidgets/skins/zenui/actions_button.gif
Property changes on: trunk/Products/ZenWidgets/skins/zenui/actions_button.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/Products/ZenWidgets/skins/zenui/actions_button_depressed.gif
Property changes on: trunk/Products/ZenWidgets/skins/zenui/actions_button_depressed.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/Products/ZenWidgets/skins/zenui/filter_box_bg.gif
===================================================================
(Binary files differ)
Modified: trunk/Products/ZenWidgets/skins/zenui/menus.css
===================================================================
--- trunk/Products/ZenWidgets/skins/zenui/menus.css 2007-02-27 20:34:49 UTC (rev 4141)
+++ trunk/Products/ZenWidgets/skins/zenui/menus.css 2007-02-27 21:34:58 UTC (rev 4142)
@@ -100,7 +100,7 @@
}
div.devmovemenu {
- width: 103px;
+ width: 52px;
color: white;
text-align:left;
z-index: 2000;
@@ -112,6 +112,7 @@
height:32px;
line-height: 2.5em;
float: right;
+ background: #E0E0E0 url('actions_button.gif') no-repeat;
}
div.devmovemenu span {
@@ -120,7 +121,7 @@
}
div.devmovemenu:hover {
- background-color: #666;
+ background: #E0E0E0 url('actions_button_depressed.gif') no-repeat;
}
/* IE HACKS */
Modified: trunk/Products/ZenWidgets/skins/zenui/zenuimacros.pt
===================================================================
--- trunk/Products/ZenWidgets/skins/zenui/zenuimacros.pt 2007-02-27 20:34:49 UTC (rev 4141)
+++ trunk/Products/ZenWidgets/skins/zenui/zenuimacros.pt 2007-02-27 21:34:58 UTC (rev 4142)
@@ -87,7 +87,7 @@
tal:condition="menuitems">
<div class="devmovemenu" tal:attributes="id string:${menu_id}_btn">
- Actions
+
</div>
<div class="devmovemenuitems invisible"
|
|
From: <sv...@ze...> - 2007-02-27 20:34:51
|
Author: ian
Date: 2007-02-27 14:34:49 -0600 (Tue, 27 Feb 2007)
New Revision: 4141
Added:
trunk/Products/ZenWidgets/skins/zenui/filter_box_bg.gif
trunk/Products/ZenWidgets/skins/zenui/filterbox.css
trunk/Products/ZenWidgets/skins/zenui/table_header_bg.gif
Modified:
trunk/Products/ZenModel/skins/zenmodel/deviceList.pt
trunk/Products/ZenModel/skins/zenmodel/zenoss.css
trunk/Products/ZenWidgets/skins/zenui/menus.css
trunk/Products/ZenWidgets/skins/zenui/zenuimacros.pt
Log:
* Created a template macro that moves the filter box up into the table header
Modified: trunk/Products/ZenModel/skins/zenmodel/deviceList.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/deviceList.pt 2007-02-27 18:54:06 UTC (rev 4140)
+++ trunk/Products/ZenModel/skins/zenmodel/deviceList.pt 2007-02-27 20:34:49 UTC (rev 4141)
@@ -13,18 +13,20 @@
<input type="hidden" name="tableName" tal:attributes="value tableName"/>
<table class="zentable" cellpadding=3 cellspacing=1>
- <tr>
- <th class="tabletitle" colspan="5">Device List
- </th>
- <div class="devmovemenu"
- metal:use-macro="here/zenuimacros/macros/devmovemenu"/>
+ <tr tal:define="tabletitle string:Device List;
+ tblcolspan string:5">
+ <tal:block metal:use-macro="here/zenuimacros/macros/tabletitle">
+ Device List
+ </tal:block>
</tr>
+ <!--
<tr>
<td colspan="5" class="tableheader" align='center'>
<tal:block
metal:use-macro="here/zenTableNavigation/macros/navbodyfilterdevice"/>
</td>
</tr>
+ -->
<span metal:use-macro="here/deviceListMacro/macros/devListBody"/>
<tr>
<td colspan="5" class="tableheader" align='center'>
Modified: trunk/Products/ZenModel/skins/zenmodel/zenoss.css
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/zenoss.css 2007-02-27 18:54:06 UTC (rev 4140)
+++ trunk/Products/ZenModel/skins/zenmodel/zenoss.css 2007-02-27 20:34:49 UTC (rev 4141)
@@ -1,3 +1,4 @@
+
body {
/*background: #fff url(../images/bg_app.gif) repeat-y 8.6em 0em;*/
color: black;
@@ -311,13 +312,18 @@
}
th.tabletitle {
+ height: 2em;
+ line-height: 2em;
+ background: transparent url('table_header_bg.gif') top left repeat-x;
color: white;
- background-color: #5a6f8f;
- background-image: url(subtitle_bkgrd.gif);
- background-repeat: repeat-X;
+ font-weight: bold;
+ font-size: 1.2em;
+ padding-right: 0px;
+ margin-right: 0px;
text-align: left;
- font-weight: normal;
+ padding-left: 2em;
}
+
.tabletitleselected {
color: #333333;
background-color: #E0E0E0;
@@ -537,3 +543,6 @@
z-index: 1000;
cursor: pointer;
}
+
+@import url('filterbox.css');
+@import url('menus.css');
Added: trunk/Products/ZenWidgets/skins/zenui/filter_box_bg.gif
Property changes on: trunk/Products/ZenWidgets/skins/zenui/filter_box_bg.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/Products/ZenWidgets/skins/zenui/filterbox.css
Modified: trunk/Products/ZenWidgets/skins/zenui/menus.css
===================================================================
--- trunk/Products/ZenWidgets/skins/zenui/menus.css 2007-02-27 18:54:06 UTC (rev 4140)
+++ trunk/Products/ZenWidgets/skins/zenui/menus.css 2007-02-27 20:34:49 UTC (rev 4141)
@@ -15,6 +15,9 @@
position: relative;
cursor:pointer;
}
+.littlemenu {
+ top: 3px;
+}
td.contextmenutab {
width: 176px;
}
@@ -63,8 +66,8 @@
}
.devmovemenuitems {
- top: 20px;
- right: 2px;
+ top: 0px;
+ right: 0px;
}
ul.zenMenu {
list-style-type: none;
@@ -97,21 +100,27 @@
}
div.devmovemenu {
- float: right;
- padding: 3px 1em;
- margin: 3px;
- line-height: 100%;
- cursor: pointer;
+ width: 103px;
color: white;
text-align:left;
- background: transparent url('arrow.d.gif') left no-repeat;
- margin-left: 1.1em;
z-index: 2000;
- position:relative;
- right:-1px;
+ border-left: 1px inset #666;
+ position:absolute;
+ text-align: center;
+ right:0px;
+ bottom:0px;
+ height:32px;
+ line-height: 2.5em;
+ float: right;
}
+
+div.devmovemenu span {
+ line-height: 2.5em;
+ margin-left: 3em;
+}
+
div.devmovemenu:hover {
- background-color: #222;
+ background-color: #666;
}
/* IE HACKS */
Added: trunk/Products/ZenWidgets/skins/zenui/table_header_bg.gif
Property changes on: trunk/Products/ZenWidgets/skins/zenui/table_header_bg.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/Products/ZenWidgets/skins/zenui/zenuimacros.pt
===================================================================
--- trunk/Products/ZenWidgets/skins/zenui/zenuimacros.pt 2007-02-27 18:54:06 UTC (rev 4140)
+++ trunk/Products/ZenWidgets/skins/zenui/zenuimacros.pt 2007-02-27 20:34:49 UTC (rev 4141)
@@ -50,8 +50,30 @@
</div>
</tal:block>
+<tal:block metal:define-macro="tabletitle">
+<th class="tabletitle" tal:attributes="colspan tblcolspan">
+<div class="tabletitlecontainer">
+ <span class="tabletitletext" tal:content="tabletitle">Title</span>
+ <tal:block metal:use-macro="here/zenuimacros/macros/filterbox"/>
+ <tal:block metal:use-macro="here/zenuimacros/macros/devmovemenu"/>
+</div>
+</th>
+</tal:block>
+
+<tal:block metal:define-macro="filterbox">
+<link href="filterbox.css" rel="stylesheet" type="text/css" />
+<div class="filterbox"
+ tal:define="ts python:here.ZenTableManager.getTableState(tableName);
+ message request/SESSION/message | nothing;">
+<input type="text" name="filter"
+ onkeypress="submitViaEnter(event)"
+ onfocus="select(this)"
+ tal:attributes="value ts/filter" />
+</div>
+</tal:block>
+
<tal:block metal:define-macro="devmovemenu"
- tal:define="menu_id string:Device">
+ tal:define="menu_id menu_id | string:Device">
<link href="menus.css" rel="stylesheet" type="text/css" />
@@ -64,10 +86,8 @@
pathtrans)"
tal:condition="menuitems">
- <div class="devmovemenu"
- tal:attributes="id string:${menu_id}_btn"
- tal:content="string:Actions">
- BUTTON
+ <div class="devmovemenu" tal:attributes="id string:${menu_id}_btn">
+ Actions
</div>
<div class="devmovemenuitems invisible"
@@ -105,10 +125,3 @@
</tal:block>
-<tal:block metal:define-macro="tabletitle_with_menu">
-<th class="tabletitle" colspan="5">
- <span metal:use-macro="here/zenuimacros/macros/devmovemenu"/>
- <span class="tbl_title" tal:content="tabletitle|nothing">Table Title</span>
- <span class="tbl_filter" tal:content="string:">Filter</span>
-</th>
-</tal:block>
|
|
From: <sv...@ze...> - 2007-02-27 18:54:40
|
Author: jstevens Date: 2007-02-27 12:54:06 -0600 (Tue, 27 Feb 2007) New Revision: 4140 Modified: trunk/bin/zenbackup.py Log: testing svn sync Modified: trunk/bin/zenbackup.py =================================================================== --- trunk/bin/zenbackup.py 2007-02-27 03:44:31 UTC (rev 4139) +++ trunk/bin/zenbackup.py 2007-02-27 18:54:06 UTC (rev 4140) @@ -5,7 +5,6 @@ # ################################################################# -#Change saved at 11:52 __doc__='''zenbackup Creates backup of zope data files, zenoss conf files and the events database. |
|
From: <sv...@ze...> - 2007-02-27 03:44:34
|
Author: marc
Date: 2007-02-26 21:44:31 -0600 (Mon, 26 Feb 2007)
New Revision: 4139
Modified:
trunk/Products/ZenModel/Device.py
Log:
#1012
* catching non-unicode id in device rename, now using prepId
Modified: trunk/Products/ZenModel/Device.py
===================================================================
--- trunk/Products/ZenModel/Device.py 2007-02-26 23:11:55 UTC (rev 4138)
+++ trunk/Products/ZenModel/Device.py 2007-02-27 03:44:31 UTC (rev 4139)
@@ -1231,6 +1231,8 @@
def renameDevice(self, newId=None, REQUEST=None):
"""Rename device from the DMD"""
if newId:
+ if not isinstance(newId, unicode):
+ newId = self.prepId(newId)
parent = self.getPrimaryParent()
parent.manage_renameObject(self.getId(), newId)
self.setLastChange()
|
|
From: <sv...@ze...> - 2007-02-26 23:11:57
|
Author: chris Date: 2007-02-26 17:11:55 -0600 (Mon, 26 Feb 2007) New Revision: 4138 Added: trunk/inst/docs/INSTALL_Solaris10.txt Log: added. not sure how well these work. we'll give them a shot when we have a clean 64 bit box to test it on Added: trunk/inst/docs/INSTALL_Solaris10.txt |
|
From: <sv...@ze...> - 2007-02-26 22:23:33
|
Author: edahl
Date: 2007-02-26 16:23:31 -0600 (Mon, 26 Feb 2007)
New Revision: 4137
Modified:
trunk/zenwin/StatusTest.py
trunk/zenwin/etc/zenwinmodeler.cfg
Log:
* minor fixes to zenwin
Modified: trunk/zenwin/StatusTest.py
===================================================================
--- trunk/zenwin/StatusTest.py 2007-02-26 20:44:22 UTC (rev 4136)
+++ trunk/zenwin/StatusTest.py 2007-02-26 22:23:31 UTC (rev 4137)
@@ -18,7 +18,7 @@
self.zem = zem
self.svcs = svcs
self.lastpoll = {}
- self.debug = debug
+ self.debug = debug
self._plugins = []
self._wmi = None
self.failed = False
Modified: trunk/zenwin/etc/zenwinmodeler.cfg
===================================================================
--- trunk/zenwin/etc/zenwinmodeler.cfg 2007-02-26 20:44:22 UTC (rev 4136)
+++ trunk/zenwin/etc/zenwinmodeler.cfg 2007-02-26 22:23:31 UTC (rev 4137)
@@ -2,4 +2,4 @@
zopeusername zenoss
zopepassword zenoss
zem http://zenoss:8081/
-cycle 1
+cycle 60
|
|
From: <sv...@ze...> - 2007-02-26 20:44:27
|
Author: jstevens
Date: 2007-02-26 14:44:22 -0600 (Mon, 26 Feb 2007)
New Revision: 4136
Modified:
trunk/Products/ZenUtils/Utils.py
Log:
fixes #1024
* Catch smtp exceptions and report to user when sending email
Modified: trunk/Products/ZenUtils/Utils.py
===================================================================
--- trunk/Products/ZenUtils/Utils.py 2007-02-26 19:25:07 UTC (rev 4135)
+++ trunk/Products/ZenUtils/Utils.py 2007-02-26 20:44:22 UTC (rev 4136)
@@ -439,7 +439,7 @@
# EOF error on quit, so the email gets sent over and over
try: server.quit()
except: pass
- except socket.error: # Might be others we want to catch too.
+ except (smtplib.SMTPException, socket.error):
result = (False, '%s - %s' % tuple(sys.exc_info()[:2]))
else:
result = (True, '')
|
|
From: <sv...@ze...> - 2007-02-26 19:25:12
|
Author: jstevens
Date: 2007-02-26 13:25:07 -0600 (Mon, 26 Feb 2007)
New Revision: 4135
Modified:
trunk/Products/ZenModel/migrate/Migrate.py
Log:
Added --commit back in for backwards compat, though it does nothing.
Modified: trunk/Products/ZenModel/migrate/Migrate.py
===================================================================
--- trunk/Products/ZenModel/migrate/Migrate.py 2007-02-26 19:18:04 UTC (rev 4134)
+++ trunk/Products/ZenModel/migrate/Migrate.py 2007-02-26 19:25:07 UTC (rev 4135)
@@ -216,6 +216,10 @@
action='append',
dest="steps",
help="Run the given step")
+ self.parser.add_option('--commit',
+ help='DEPRECATED - now default behavior.'
+ ' See --dont-commit')
+ # NB: The flag for this setting indicates a false value for the setting.
self.parser.add_option('--dont-commit',
dest="commit",
action='store_false',
|
|
From: <sv...@ze...> - 2007-02-26 19:18:05
|
Author: jstevens
Date: 2007-02-26 13:18:04 -0600 (Mon, 26 Feb 2007)
New Revision: 4134
Modified:
trunk/Products/ZenModel/migrate/Migrate.py
Log:
fixes #955
* zenmigrate now by default commits changes
* --dont-commit added to enable previous non-committing default behavior
Modified: trunk/Products/ZenModel/migrate/Migrate.py
===================================================================
--- trunk/Products/ZenModel/migrate/Migrate.py 2007-02-26 19:01:04 UTC (rev 4133)
+++ trunk/Products/ZenModel/migrate/Migrate.py 2007-02-26 19:18:04 UTC (rev 4134)
@@ -216,11 +216,11 @@
action='append',
dest="steps",
help="Run the given step")
- self.parser.add_option('--commit',
+ self.parser.add_option('--dont-commit',
dest="commit",
- action='store_true',
- default=False,
- help="Commit changes to the database")
+ action='store_false',
+ default=True,
+ help="Don't commit changes to the database")
self.parser.add_option('--list',
action='store_true',
default=False,
|
|
From: <sv...@ze...> - 2007-02-26 19:01:10
|
Author: jstevens
Date: 2007-02-26 13:01:04 -0600 (Mon, 26 Feb 2007)
New Revision: 4133
Modified:
trunk/bin/zenbackup.py
Log:
fixes #736
* --stdout will send output to stdout instead of to a file
Modified: trunk/bin/zenbackup.py
===================================================================
--- trunk/bin/zenbackup.py 2007-02-26 17:23:07 UTC (rev 4132)
+++ trunk/bin/zenbackup.py 2007-02-26 19:01:04 UTC (rev 4133)
@@ -124,6 +124,11 @@
help='File to backup to.'
' Backups will by default be placed'
' in $ZENHOME/backups/')
+ self.parser.add_option('--stdout',
+ dest="stdout",
+ default=False,
+ action='store_true',
+ help='Send backup to stdout instead of a file')
self.parser.add_option('--dont-save-settings',
dest='saveSettings',
default=True,
@@ -191,14 +196,15 @@
# tar, gzip and send to outfile
if self.options.file:
- if self.options.file == '-':
- outfile = sys.stdout
- else:
- outfile = self.options.file
+ outfile = self.options.file
else:
outfile = self.getDefaultBackupFile()
tempHead, tempTail = os.path.split(tempDir)
- cmd = 'tar czfC %s %s %s' % (outfile, tempHead, tempTail)
+ if self.options.stdout:
+ cmd = 'tar czC %s %s' % (tempHead, tempTail)
+ else:
+ cmd = 'tar czfC %s %s %s' % (outfile, tempHead, tempTail)
+
if os.system(cmd): return -1
# clean up
|
|
From: <sv...@ze...> - 2007-02-26 17:23:13
|
Author: ian
Date: 2007-02-26 11:23:07 -0600 (Mon, 26 Feb 2007)
New Revision: 4132
Modified:
trunk/Products/ZenModel/skins/zenmodel/templates.pt
trunk/Products/ZenWidgets/skins/zenui/menus.css
trunk/Products/ZenWidgets/skins/zenui/zenuimacros.pt
Log:
* Made context menu tab a static size.
Modified: trunk/Products/ZenModel/skins/zenmodel/templates.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/templates.pt 2007-02-26 17:02:45 UTC (rev 4131)
+++ trunk/Products/ZenModel/skins/zenmodel/templates.pt 2007-02-26 17:23:07 UTC (rev 4132)
@@ -206,7 +206,9 @@
'%s/%s'% (here.getPrimaryUrlPath(),tab['action']);"
>TabName</a>
</td>
+ <td class="contextmenutab">
<span metal:use-macro="here/zenuimacros/macros/contextmenu"/>
+ </td>
</tr>
</table>
</div>
Modified: trunk/Products/ZenWidgets/skins/zenui/menus.css
===================================================================
--- trunk/Products/ZenWidgets/skins/zenui/menus.css 2007-02-26 17:02:45 UTC (rev 4131)
+++ trunk/Products/ZenWidgets/skins/zenui/menus.css 2007-02-26 17:23:07 UTC (rev 4132)
@@ -15,6 +15,9 @@
position: relative;
cursor:pointer;
}
+td.contextmenutab {
+ width: 176px;
+}
.contextmenubutton {
display: inline;
min-width: 5em;
Modified: trunk/Products/ZenWidgets/skins/zenui/zenuimacros.pt
===================================================================
--- trunk/Products/ZenWidgets/skins/zenui/zenuimacros.pt 2007-02-26 17:02:45 UTC (rev 4131)
+++ trunk/Products/ZenWidgets/skins/zenui/zenuimacros.pt 2007-02-26 17:23:07 UTC (rev 4132)
@@ -4,7 +4,6 @@
<link href="menus.css" rel="stylesheet" type="text/css" />
-<td>
<div class="contextmenu" tal:attributes="id menu_id"
tal:define="menuitems python:here.getMenus(menu_id, here);
pathtrans here/REQUEST/PATH_TRANSLATED;
@@ -49,7 +48,6 @@
">
</script>
</div>
-</td>
</tal:block>
<tal:block metal:define-macro="devmovemenu"
|
|
From: <sv...@ze...> - 2007-02-26 17:02:48
|
Author: ian
Date: 2007-02-26 11:02:45 -0600 (Mon, 26 Feb 2007)
New Revision: 4131
Added:
trunk/Products/ZenWidgets/skins/zenui/menu_bottom.gif
trunk/Products/ZenWidgets/skins/zenui/menu_top.gif
Modified:
trunk/Products/ZenWidgets/skins/zenui/menus.css
trunk/Products/ZenWidgets/skins/zenui/zenuimacros.pt
Log:
* Made menus prettier, and stand out more.
Added: trunk/Products/ZenWidgets/skins/zenui/menu_bottom.gif
Property changes on: trunk/Products/ZenWidgets/skins/zenui/menu_bottom.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/Products/ZenWidgets/skins/zenui/menu_top.gif
Property changes on: trunk/Products/ZenWidgets/skins/zenui/menu_top.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/Products/ZenWidgets/skins/zenui/menus.css
===================================================================
--- trunk/Products/ZenWidgets/skins/zenui/menus.css 2007-02-26 16:52:41 UTC (rev 4130)
+++ trunk/Products/ZenWidgets/skins/zenui/menus.css 2007-02-26 17:02:45 UTC (rev 4131)
@@ -28,35 +28,66 @@
border: 1px solid #5A6F8F;
border-bottom-width: 0px;
}
+
.devmovemenuitems,
.contextmenuitems {
position: absolute;
right: 2px;
- width: 12em;
+ width: 172px;
top: 22px;
- border: 1px solid #5A6F8F;
- background-color: white;
z-index: 3000;
+ padding-bottom: 10px;
+ padding-top: 10px;
}
+
+div.menu_bottom {
+ background: transparent url('menu_bottom.gif') bottom left no-repeat;
+ position: absolute;
+ bottom: 0px;
+ left: -2px;
+ height: 20px;
+ z-index: 2000;
+ width: 174px;
+}
+div.menu_top {
+ background: transparent url('menu_top.gif') top left no-repeat;
+ position: absolute;
+ top: 0px;
+ left: -2px;
+ height: 20px;
+ z-index: 2000;
+ width: 174px;
+}
+
.devmovemenuitems {
top: 20px;
right: 2px;
}
ul.zenMenu {
list-style-type: none;
+ border-left: 1px solid #5A6F8F;
+ border-right: 1px solid #5A6F8F;
+ width: 172px;
+ position: relative;
+ left: -2px;
+ z-index: 2001;
+ background-color: #666;
}
-ul.zenMenu li {
- border-bottom: 1px dotted grey;
-}
ul.zenMenu li a {
+ padding-left: 1em;
text-align: justify;
text-decoration: none;
display:block;
+ color: white;
padding: 5px;
height: 100%;
}
+ul.zenMenu li {
+ border-bottom: 1px dotted grey;
+}
ul.zenMenu li a:hover {
background-color: #DEDEFF;
+ color: black;
}
div.menuselected {
Modified: trunk/Products/ZenWidgets/skins/zenui/zenuimacros.pt
===================================================================
--- trunk/Products/ZenWidgets/skins/zenui/zenuimacros.pt 2007-02-26 16:52:41 UTC (rev 4130)
+++ trunk/Products/ZenWidgets/skins/zenui/zenuimacros.pt 2007-02-26 17:02:45 UTC (rev 4131)
@@ -20,6 +20,8 @@
<div class="contextmenuitems invisible"
tal:attributes="id string:${menu_id}_items">
+ <div class="menu_top"> </div>
+ <div class="menu_bottom"> </div>
<ul class="zenMenu" tal:attributes="id string:${menu_id}_list">
<li tal:repeat="i menuitems">
<a tal:attributes="href string:${basepath}/${i/action}"
@@ -72,6 +74,8 @@
<div class="devmovemenuitems invisible"
tal:attributes="id string:${menu_id}_items">
+ <div class="menu_top"> </div>
+ <div class="menu_bottom"> </div>
<ul class="zenMenu" tal:attributes="id string:${menu_id}_list">
<li tal:repeat="i menuitems">
<a tal:attributes="href
|
|
From: <sv...@ze...> - 2007-02-26 16:52:47
|
Author: jstevens Date: 2007-02-26 10:52:41 -0600 (Mon, 26 Feb 2007) New Revision: 4130 Modified: trunk/bin/zenbackup.py Log: testing svn sync Modified: trunk/bin/zenbackup.py =================================================================== --- trunk/bin/zenbackup.py 2007-02-26 16:43:12 UTC (rev 4129) +++ trunk/bin/zenbackup.py 2007-02-26 16:52:41 UTC (rev 4130) @@ -5,7 +5,7 @@ # ################################################################# -#Change saved at 11:43 +#Change saved at 11:52 __doc__='''zenbackup Creates backup of zope data files, zenoss conf files and the events database. |
|
From: <sv...@ze...> - 2007-02-26 16:43:26
|
Author: jstevens Date: 2007-02-26 10:43:12 -0600 (Mon, 26 Feb 2007) New Revision: 4129 Modified: trunk/bin/zenbackup.py Log: testing svn sync Modified: trunk/bin/zenbackup.py =================================================================== --- trunk/bin/zenbackup.py 2007-02-26 16:35:34 UTC (rev 4128) +++ trunk/bin/zenbackup.py 2007-02-26 16:43:12 UTC (rev 4129) @@ -5,7 +5,7 @@ # ################################################################# -#Change saved at 11:35 +#Change saved at 11:43 __doc__='''zenbackup Creates backup of zope data files, zenoss conf files and the events database. |
|
From: <sv...@ze...> - 2007-02-26 16:35:36
|
Author: jstevens Date: 2007-02-26 10:35:34 -0600 (Mon, 26 Feb 2007) New Revision: 4128 Modified: trunk/bin/zenbackup.py Log: testing svn sync Modified: trunk/bin/zenbackup.py =================================================================== --- trunk/bin/zenbackup.py 2007-02-26 16:26:31 UTC (rev 4127) +++ trunk/bin/zenbackup.py 2007-02-26 16:35:34 UTC (rev 4128) @@ -5,7 +5,7 @@ # ################################################################# -#Change saved at 11:26 +#Change saved at 11:35 __doc__='''zenbackup Creates backup of zope data files, zenoss conf files and the events database. |
|
From: <sv...@ze...> - 2007-02-26 16:26:33
|
Author: jstevens Date: 2007-02-26 10:26:31 -0600 (Mon, 26 Feb 2007) New Revision: 4127 Modified: trunk/bin/zenbackup.py Log: testing svn sync Modified: trunk/bin/zenbackup.py =================================================================== --- trunk/bin/zenbackup.py 2007-02-26 16:06:34 UTC (rev 4126) +++ trunk/bin/zenbackup.py 2007-02-26 16:26:31 UTC (rev 4127) @@ -5,7 +5,7 @@ # ################################################################# -#Change saved at 11:05 +#Change saved at 11:26 __doc__='''zenbackup Creates backup of zope data files, zenoss conf files and the events database. |
|
From: <sv...@ze...> - 2007-02-26 16:06:55
|
Author: jstevens Date: 2007-02-26 10:06:34 -0600 (Mon, 26 Feb 2007) New Revision: 4126 Modified: trunk/bin/zenbackup.py Log: Testing the svn sync committed at 11:06 macbook time Modified: trunk/bin/zenbackup.py =================================================================== --- trunk/bin/zenbackup.py 2007-02-26 15:12:52 UTC (rev 4125) +++ trunk/bin/zenbackup.py 2007-02-26 16:06:34 UTC (rev 4126) @@ -5,6 +5,7 @@ # ################################################################# +#Change saved at 11:05 __doc__='''zenbackup Creates backup of zope data files, zenoss conf files and the events database. |
|
From: <sv...@ze...> - 2007-02-26 15:12:53
|
Author: ian
Date: 2007-02-26 09:12:52 -0600 (Mon, 26 Feb 2007)
New Revision: 4125
Modified:
trunk/Products/ZenModel/DeviceClass.py
Log:
* Removed "Custom Schema" tab from /Devices
Modified: trunk/Products/ZenModel/DeviceClass.py
===================================================================
--- trunk/Products/ZenModel/DeviceClass.py 2007-02-26 15:08:53 UTC (rev 4124)
+++ trunk/Products/ZenModel/DeviceClass.py 2007-02-26 15:12:52 UTC (rev 4125)
@@ -151,11 +151,11 @@
[{'name':'Name','action':'template','selected':False},...]
"""
tabs = super(DeviceClass, self).zentinelTabs(templateName)
- if self.getPrimaryId() == "/zport/dmd/Devices" and self.isManager():
- tab = {'action': 'editCustSchema', 'name':'Custom Schema'}
- if templateName == tab['action']:
- tab['selected'] = True
- tabs.insert(-1, tab)
+ #if self.getPrimaryId() == "/zport/dmd/Devices" and self.isManager():
+ # tab = {'action': 'editCustSchema', 'name':'Custom Schema'}
+ # if templateName == tab['action']:
+ # tab['selected'] = True
+ # tabs.insert(-1, tab)
return tabs
|
|
From: <sv...@ze...> - 2007-02-26 15:08:57
|
Author: ian
Date: 2007-02-26 09:08:53 -0600 (Mon, 26 Feb 2007)
New Revision: 4124
Added:
trunk/Products/ZenWidgets/skins/zenui/arrow.d.gif
Modified:
trunk/Products/ZenWidgets/skins/zenui/menus.css
trunk/Products/ZenWidgets/skins/zenui/zenuimacros.pt
Log:
* Made Actions menu more noticeable, added image, renamed to Actions
Added: trunk/Products/ZenWidgets/skins/zenui/arrow.d.gif
Property changes on: trunk/Products/ZenWidgets/skins/zenui/arrow.d.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/Products/ZenWidgets/skins/zenui/menus.css
===================================================================
--- trunk/Products/ZenWidgets/skins/zenui/menus.css 2007-02-26 14:39:38 UTC (rev 4123)
+++ trunk/Products/ZenWidgets/skins/zenui/menus.css 2007-02-26 15:08:53 UTC (rev 4124)
@@ -69,9 +69,9 @@
line-height: 100%;
cursor: pointer;
color: white;
- text-align:center;
- border-left: 2px dotted darkgrey;
- background-color: grey;
+ text-align:left;
+ background: transparent url('arrow.d.gif') left no-repeat;
+ margin-left: 1.1em;
z-index: 2000;
position:relative;
right:-1px;
Modified: trunk/Products/ZenWidgets/skins/zenui/zenuimacros.pt
===================================================================
--- trunk/Products/ZenWidgets/skins/zenui/zenuimacros.pt 2007-02-26 14:39:38 UTC (rev 4123)
+++ trunk/Products/ZenWidgets/skins/zenui/zenuimacros.pt 2007-02-26 15:08:53 UTC (rev 4124)
@@ -66,7 +66,7 @@
<div class="devmovemenu"
tal:attributes="id string:${menu_id}_btn"
- tal:content="menu_id">
+ tal:content="string:Actions">
BUTTON
</div>
|
|
From: <sv...@ze...> - 2007-02-26 14:40:04
|
Author: ian
Date: 2007-02-26 08:39:38 -0600 (Mon, 26 Feb 2007)
New Revision: 4123
Modified:
trunk/Products/ZenModel/Device.py
trunk/Products/ZenModel/DeviceClass.py
trunk/Products/ZenModel/migrate/menus.py
trunk/Products/ZenWidgets/skins/zenui/dialog.js
trunk/Products/ZenWidgets/skins/zenui/menus.css
trunk/Products/ZenWidgets/skins/zenui/zenuimacros.pt
Log:
* Several changes to menuing.
* Removed redundant tabs on Devices and DeviceClasses
* CSS tweaks
* Altered menus migrate script to use a single Context menu
* Began creating a universal table header format
Modified: trunk/Products/ZenModel/Device.py
===================================================================
--- trunk/Products/ZenModel/Device.py 2007-02-26 14:37:26 UTC (rev 4122)
+++ trunk/Products/ZenModel/Device.py 2007-02-26 14:39:38 UTC (rev 4123)
@@ -289,36 +289,36 @@
, 'action' : 'viewDevicePerformance'
, 'permissions' : (permissions.view, )
},
- { 'id' : 'perfConf'
- , 'name' : 'PerfConf'
- , 'action' : 'objRRDTemplate'
- , 'permissions' : ("Change Device", )
- },
+# { 'id' : 'perfConf'
+# , 'name' : 'PerfConf'
+# , 'action' : 'objRRDTemplate'
+# , 'permissions' : ("Change Device", )
+# },
{ 'id' : 'edit'
, 'name' : 'Edit'
, 'action' : 'editDevice'
, 'permissions' : ("Change Device",)
},
- { 'id' : 'management'
- , 'name' : 'Manage'
- , 'action' : 'deviceManagement'
- , 'permissions' : ("Change Device",)
- },
- { 'id' : 'custom'
- , 'name' : 'Custom'
- , 'action' : 'deviceCustomEdit'
- , 'permissions' : (permissions.view, )
- },
- { 'id' : 'config'
- , 'name' : 'zProperties'
- , 'action' : 'zPropertyEdit'
- , 'permissions' : (permissions.view,)
- },
- { 'id' : 'viewHistory'
- , 'name' : 'Changes'
- , 'action' : 'viewHistory'
- , 'permissions' : (permissions.view, )
- },
+# { 'id' : 'management'
+# , 'name' : 'Manage'
+# , 'action' : 'deviceManagement'
+# , 'permissions' : ("Change Device",)
+# },
+# { 'id' : 'custom'
+# , 'name' : 'Custom'
+# , 'action' : 'deviceCustomEdit'
+# , 'permissions' : (permissions.view, )
+# },
+# { 'id' : 'config'
+# , 'name' : 'zProperties'
+# , 'action' : 'zPropertyEdit'
+# , 'permissions' : (permissions.view,)
+# },
+# { 'id' : 'viewHistory'
+# , 'name' : 'Changes'
+# , 'action' : 'viewHistory'
+# , 'permissions' : (permissions.view, )
+# },
)
},
)
Modified: trunk/Products/ZenModel/DeviceClass.py
===================================================================
--- trunk/Products/ZenModel/DeviceClass.py 2007-02-26 14:37:26 UTC (rev 4122)
+++ trunk/Products/ZenModel/DeviceClass.py 2007-02-26 14:39:38 UTC (rev 4123)
@@ -117,27 +117,27 @@
, 'action' : 'viewHistoryEvents'
, 'permissions' : ( permissions.view, )
},
- { 'id' : 'perfConfig'
- , 'name' : 'PerfConf'
- , 'action' : 'perfConfig'
- , 'permissions' : ("Change Device",)
- },
- { 'id' : 'config'
- , 'name' : 'zProperties'
- , 'action' : 'zPropertyEdit'
- , 'permissions' : ("Change Device",)
- },
- { 'id' : 'manage'
- , 'name' : 'Manage'
- , 'action' : 'deviceOrganizerManage'
- , 'permissions' : (
- permissions.view, )
- },
- { 'id' : 'viewHistory'
- , 'name' : 'Changes'
- , 'action' : 'viewHistory'
- , 'permissions' : ( permissions.view, )
- },
+ #{ 'id' : 'perfConfig'
+ #, 'name' : 'PerfConf'
+ #, 'action' : 'perfConfig'
+ #, 'permissions' : ("Change Device",)
+ #},
+ #{ 'id' : 'config'
+ #, 'name' : 'zProperties'
+ #, 'action' : 'zPropertyEdit'
+ #, 'permissions' : ("Change Device",)
+ #},
+ #{ 'id' : 'manage'
+ #, 'name' : 'Manage'
+ #, 'action' : 'deviceOrganizerManage'
+ #, 'permissions' : (
+ # permissions.view, )
+ #},
+ #{ 'id' : 'viewHistory'
+ #, 'name' : 'Changes'
+ #, 'action' : 'viewHistory'
+ #, 'permissions' : ( permissions.view, )
+ #},
)
},
)
Modified: trunk/Products/ZenModel/migrate/menus.py
===================================================================
--- trunk/Products/ZenModel/migrate/menus.py 2007-02-26 14:37:26 UTC (rev 4122)
+++ trunk/Products/ZenModel/migrate/menus.py 2007-02-26 14:39:38 UTC (rev 4123)
@@ -50,16 +50,14 @@
# Add menus.
dmd.buildMenus(
- {'Edit':[
+ {'Context':[
dict(
id= 'manageob',
description='Manage',
action= 'dataRootManage',
permissions=('View',),
isglobal= False
- )
- ],
- 'View':[
+ ),
dict(
id= 'viewHistory',
description='Changes',
@@ -71,7 +69,7 @@
dmd.Devices.buildMenus(
- {'Edit':[
+ {'Context':[
dict(
id= 'manageob',
description='Manage',
@@ -105,41 +103,6 @@
permissions=('Change Device',)
),
],
- 'View':[
- dict(
- id= 'devicelist',
- description='Devices',
- action= 'deviceList',
- permissions=('View',),
- allowed_classes=('DeviceClass',)
- ),
- dict(
- id= 'events',
- description='Events',
- action= 'viewEvents',
- permissions=('View',)
- ),
- dict(
- id= 'historyEvents',
- description='History',
- action= 'viewHistoryEvents',
- permissions=('View',)
- ),
- dict(
- id= 'classes',
- description='Classes',
- action= 'deviceOrganizerStatus',
- permissions=('View',),
- allowed_classes=('DeviceClass',)
- ),
- dict(
- id= 'status',
- description='Status',
- action= 'deviceStatus',
- permissions=('View',),
- allowed_classes=('Device',)
- ),
- ],
'Device':[
dict(
id= 'moveclass',
@@ -182,7 +145,7 @@
dmd.Networks.buildMenus(
- {'Tools':[
+ {'Context':[
dict(
id= 'discover',
description= 'Discover Devices',
Modified: trunk/Products/ZenWidgets/skins/zenui/dialog.js
===================================================================
--- trunk/Products/ZenWidgets/skins/zenui/dialog.js 2007-02-26 14:37:26 UTC (rev 4122)
+++ trunk/Products/ZenWidgets/skins/zenui/dialog.js 2007-02-26 14:39:38 UTC (rev 4123)
@@ -1,4 +1,3 @@
-
var Class={
create:function(){
return function(){
Modified: trunk/Products/ZenWidgets/skins/zenui/menus.css
===================================================================
--- trunk/Products/ZenWidgets/skins/zenui/menus.css 2007-02-26 14:37:26 UTC (rev 4122)
+++ trunk/Products/ZenWidgets/skins/zenui/menus.css 2007-02-26 14:39:38 UTC (rev 4123)
@@ -58,6 +58,7 @@
ul.zenMenu li a:hover {
background-color: #DEDEFF;
}
+
div.menuselected {
}
@@ -69,8 +70,11 @@
cursor: pointer;
color: white;
text-align:center;
- border-left: 1px dotted darkgrey;
+ border-left: 2px dotted darkgrey;
+ background-color: grey;
z-index: 2000;
+ position:relative;
+ right:-1px;
}
div.devmovemenu:hover {
background-color: #222;
Modified: trunk/Products/ZenWidgets/skins/zenui/zenuimacros.pt
===================================================================
--- trunk/Products/ZenWidgets/skins/zenui/zenuimacros.pt 2007-02-26 14:37:26 UTC (rev 4122)
+++ trunk/Products/ZenWidgets/skins/zenui/zenuimacros.pt 2007-02-26 14:39:38 UTC (rev 4123)
@@ -1,10 +1,9 @@
<tal:block metal:define-macro="contextmenu"
tal:condition="python:hasattr(here, 'getMenus')"
- tal:define="menu_ids menu_ids | python:['View','Edit','Tools']">
+ tal:define="menu_id string:Context">
<link href="menus.css" rel="stylesheet" type="text/css" />
-<tal:block tal:repeat="menu_id menu_ids">
<td>
<div class="contextmenu" tal:attributes="id menu_id"
tal:define="menuitems python:here.getMenus(menu_id, here);
@@ -16,7 +15,7 @@
tal:condition="menuitems">
<div tal:attributes="id string:${menu_id}_btn">
- <a class="tabletitle" tal:content="string:${menu_id}...">Stuff</a>
+ <a class="tabletitle">>>></a>
</div>
<div class="contextmenuitems invisible"
@@ -49,7 +48,6 @@
</script>
</div>
</td>
- </tal:block>
</tal:block>
<tal:block metal:define-macro="devmovemenu"
@@ -103,3 +101,12 @@
</script>
</div>
</tal:block>
+
+
+<tal:block metal:define-macro="tabletitle_with_menu">
+<th class="tabletitle" colspan="5">
+ <span metal:use-macro="here/zenuimacros/macros/devmovemenu"/>
+ <span class="tbl_title" tal:content="tabletitle|nothing">Table Title</span>
+ <span class="tbl_filter" tal:content="string:">Filter</span>
+</th>
+</tal:block>
|
|
From: <sv...@ze...> - 2007-02-26 14:38:11
|
Author: jstevens
Date: 2007-02-26 08:37:26 -0600 (Mon, 26 Feb 2007)
New Revision: 4122
Modified:
trunk/bin/zenbackup.py
Log:
fixes #1021
* refactored one function to use commands module instead of popen.
Modified: trunk/bin/zenbackup.py
===================================================================
--- trunk/bin/zenbackup.py 2007-02-23 21:36:16 UTC (rev 4121)
+++ trunk/bin/zenbackup.py 2007-02-26 14:37:26 UTC (rev 4122)
@@ -20,11 +20,8 @@
from datetime import date
import getpass
import ConfigParser
-import select
-import popen2
-import signal
-import fcntl
import time
+import commands
from zenbackupcommon import *
MAX_UNIQUE_NAME_ATTEMPTS = 1000
@@ -42,31 +39,10 @@
''' Returns True is zeo appears to be running, false otherwise.
'''
cmd = '%s/bin/zeoup.py -p 8100' % self.zenhome
- child = popen2.Popen4(cmd)
- read = ''
- try:
- flags = fcntl.fcntl(child.fromchild, fcntl.F_GETFL)
- fcntl.fcntl(child.fromchild, fcntl.F_SETFL, flags | os.O_NDELAY)
- timeout = 10
- endtime = time.time() + timeout
- pollPeriod = 1
- firstPass = True
- out = ''
- while time.time() < endtime and (firstPass or child.poll() == -1):
- firstPass = False
- r, w, e = select.select([child.fromchild], [], [], pollPeriod)
- if r:
- t = child.fromchild.read()
- if t:
- read += t
- finally:
- if child.poll() == -1:
- os.kill(child.pid, signal.SIGKILL)
-
- return read.startswith('Elapsed time:')
+ output = commands.getoutput(cmd)
+ return output.startswith('Elapsed time:')
-
def readSettingsFromZeo(self):
''' Return dbname, dbuser, dbpass from saved settings
'''
@@ -168,9 +144,9 @@
if self.options.dbname == None:
self.options.dbname = 'events'
if self.options.dbuser == None:
- self.options.dbuser = 'root'
+ self.options.dbuser = 'zenoss'
if self.options.dbpass == None:
- self.options.dbpass = ''
+ self.options.dbpass = 'zenoss'
# Create temp backup dir
rootTempDir = tempfile.mkdtemp()
|
|
From: <sv...@ze...> - 2007-02-23 21:36:45
|
Author: jstevens Date: 2007-02-23 15:36:16 -0600 (Fri, 23 Feb 2007) New Revision: 4121 Modified: trunk/Products/ZenModel/skins/zenmodel/editSettings.pt Log: added blank line. testing svn sync Modified: trunk/Products/ZenModel/skins/zenmodel/editSettings.pt =================================================================== --- trunk/Products/ZenModel/skins/zenmodel/editSettings.pt 2007-02-23 20:54:50 UTC (rev 4120) +++ trunk/Products/ZenModel/skins/zenmodel/editSettings.pt 2007-02-23 21:36:16 UTC (rev 4121) @@ -1,3 +1,4 @@ + <tal:block metal:use-macro="here/templates/macros/page2"> <tal:block metal:fill-slot="contentPane"> |
