Menu
▾
▴
[Zenoss-commit] r4123 - in trunk/Products: ZenModel ZenModel/migrate ZenWidgets/skins/zenui
|
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>
|