X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.ui.workbench%2Fplugin.xml;h=758a9e339ea48439255d7211c7272581a4cd59db;hb=2af62c95bf8ba23905d703dcb0610bc8025d067a;hp=d89ce60b011318aaf28ec44e0f0cc55c90dc8ce5;hpb=e0b74f76a331289a476fb3b9bac117385e7435fe;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms.ui.workbench/plugin.xml b/org.argeo.cms.ui.workbench/plugin.xml
index d89ce60b0..758a9e339 100644
--- a/org.argeo.cms.ui.workbench/plugin.xml
+++ b/org.argeo.cms.ui.workbench/plugin.xml
@@ -6,13 +6,13 @@
       <perspective
             id="org.argeo.cms.ui.workbench.adminSecurityPerspective"
             class="org.argeo.cms.ui.workbench.SecurityAdminPerspective"
-            icon="icons/security.gif"
+            icon="icons/group.png"
             name="Security">
       </perspective>
       <perspective
             id="org.argeo.cms.ui.workbench.userHomePerspective"
             class="org.argeo.cms.ui.workbench.UserHomePerspective"
-            icon="icons/home.gif"
+            icon="icons/home.png"
             name="Home">
       </perspective>
       <perspective
@@ -39,12 +39,17 @@
     <extension point="org.eclipse.ui.perspectiveExtensions"> 
         <perspectiveExtension targetID="org.argeo.cms.ui.workbench.osgiPerspective"> 
             <view 
-            	id="org.argeo.cms.ui.workbench.modulesView" 
+            	id="org.argeo.cms.ui.workbench.cmsSessionsView" 
             	minimized="false"
              	ratio="0.5" 
              	relationship="left" 
              	relative="org.eclipse.ui.editorss"/> 
             <view 
+            	id="org.argeo.cms.ui.workbench.modulesView" 
+            	minimized="false"
+             	relationship="stack"
+             	relative="org.argeo.cms.ui.workbench.cmsSessionsView"/> 
+             <view 
             	id="org.argeo.cms.ui.workbench.bundlesView" 
             	minimized="false"
              	relationship="stack" 
@@ -65,13 +70,13 @@
 		<view
 			id="org.argeo.cms.ui.workbench.usersView"
 			class="org.argeo.eclipse.spring.SpringExtensionFactory"
-			icon="icons/users.gif"
+			icon="icons/person.png"
 			name="Users"
 			restorable="true">
 		</view>
 		<view
 			class="org.argeo.eclipse.spring.SpringExtensionFactory"
-			icon="icons/role.gif"
+			icon="icons/group.png"
 			id="org.argeo.cms.ui.workbench.groupsView"
 			name="Groups"
 			restorable="false">
@@ -80,7 +85,7 @@
 		<view
 			id="org.argeo.cms.ui.workbench.userProfile"
 			class="org.argeo.cms.ui.workbench.useradmin.UserProfile"
-			icon="icons/user.gif"
+			icon="icons/person-logged-in.png"
 			name="Profile"
 			restorable="true">
 		</view>
@@ -107,6 +112,12 @@
 			class="org.argeo.cms.ui.workbench.osgi.ModulesView">
 		</view>
 		<view
+      		name="CMS Session"
+            id="org.argeo.cms.ui.workbench.cmsSessionsView"
+            icon="icons/service_published.gif"
+			class="org.argeo.cms.ui.workbench.osgi.CmsSessionsView">
+		</view>
+		<view
       		name="Bundles"
             id="org.argeo.cms.ui.workbench.bundlesView" 
             icon="icons/bundles.gif"
@@ -141,14 +152,14 @@
 			class="org.argeo.eclipse.spring.SpringExtensionFactory"
             id="org.argeo.cms.ui.workbench.userEditor"
             name="User"
-            icon="icons/user.gif"
+            icon="icons/person.png"
             default="false">
 		</editor>
 		<editor
 			class="org.argeo.eclipse.spring.SpringExtensionFactory"
             id="org.argeo.cms.ui.workbench.groupEditor"
             name="User"
-            icon="icons/users.gif"
+            icon="icons/group.png"
             default="false">
 		</editor>
 		<!-- Data Explorer -->
@@ -317,13 +328,33 @@
 				</class> -->
 			</state>
 		</command>
+		<!-- Utility to provide sub menues when we don't want to define a default command for this menu -->
+		<command
+			id="org.argeo.cms.ui.workbench.doNothing"
+			defaultHandler="org.argeo.cms.ui.workbench.commands.DoNothing"
+			name="Open menu">
+		</command>    
 	</extension>
 	
 	<!-- MENU CONTRIBUTIONS -->
 	<extension
 		point="org.eclipse.ui.menus">
+    	<!-- Main tool bar menu
+    	<menuContribution locationURI="toolbar:org.eclipse.ui.main.toolbar">
+        	<toolbar id="org.argeo.cms.ui.workbench.userToolbar">
+				<command
+					commandId="org.argeo.cms.ui.workbench.rap.mainMenuCommand"
+					icon="icons/home.png"
+					id="org.argeo.cms.ui.workbench.rap.mainMenu"
+					style="pulldown">
+				</command>
+				<command commandId="org.eclipse.ui.file.save" icon="icons/save.png"/>
+				<command commandId="org.eclipse.ui.file.saveAll" icon="icons/save-all.png"/>
+			</toolbar>
+		</menuContribution>
+		-->
 		<menuContribution
-			locationURI="toolbar:org.argeo.cms.ui.workbench.rap.userToolbar?after=org.eclipse.ui.file.saveAll"> 
+			locationURI="toolbar:org.argeo.cms.ui.workbench.userToolbar?after=org.eclipse.ui.file.saveAll"> 
 			<!-- Transaction management --> 
  			<command
 				commandId="org.argeo.cms.ui.workbench.userTransactionHandler"
@@ -358,20 +389,20 @@
             locationURI="toolbar:org.argeo.cms.ui.workbench.usersView">
             <command
                   commandId="org.argeo.cms.ui.workbench.deleteUsers"
-                  icon="icons/remove.gif"
-                  label="Delete User"
+                  icon="icons/delete.png"
+                  label="Delete"
                   tooltip="Delete selected users">
             </command>
             <command
                   commandId="org.argeo.cms.ui.workbench.forceRefresh"
                   icon="icons/refresh.png"
-                  label="Refresh list"
+                  label="Refresh"
                   tooltip="Force the full refresh of the user list">
             </command>
             <command
                   commandId="org.argeo.cms.ui.workbench.newUser"
-                  icon="icons/add.gif"
-                  label="Add User"
+                  icon="icons/add.png"
+                  label="Add"
                   tooltip="Create a new user">
             </command>
             <command
@@ -387,7 +418,7 @@
             locationURI="toolbar:org.argeo.cms.ui.workbench.groupsView">
             <command
                   commandId="org.argeo.cms.ui.workbench.deleteGroups"
-                  icon="icons/remove.gif"
+                  icon="icons/delete.png"
                   label="Delete Group"
                   tooltip="Delete selected groups">
             </command>
@@ -399,7 +430,7 @@
             </command>
             <command
                   commandId="org.argeo.cms.ui.workbench.newGroup"
-                  icon="icons/add.gif"
+                  icon="icons/add.png"
                   label="Add Group"
                   tooltip="Create a new group">
             </command>