projects / lgpl / argeo-commons.git / blobdiff
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Improve icons
[lgpl/argeo-commons.git] / org.argeo.cms.ui.workbench / plugin.xml
diff --git a/org.argeo.cms.ui.workbench/plugin.xml b/org.argeo.cms.ui.workbench/plugin.xml
index cb50d4909d275aaf8ce1dd1db79dce3598a19394..423be7aa3aa7ce64590016d38f2b36d2c73d4e6b 100644 (file)
--- a/org.argeo.cms.ui.workbench/plugin.xml
+++ b/org.argeo.cms.ui.workbench/plugin.xml
@@ -12,7 +12,7 @@
       <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" 
@@ -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"
@@ -120,9 +131,15 @@
                </view>
                <!-- Data Explorer -->
                <view
-          name="JCR Browser"
+          name="JCR"
           id="org.argeo.cms.ui.workbench.jcrBrowserView"
           icon="icons/browser.gif"
+          class="org.argeo.eclipse.spring.SpringExtensionFactory">
+          </view>
+               <view
+          name="Files"
+          id="org.argeo.cms.ui.workbench.nodeFsBrowserView"
+          icon="icons/browser.gif"
           class="org.argeo.eclipse.spring.SpringExtensionFactory">
           </view>
     </extension> 
@@ -311,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"
@@ -352,7 +389,7 @@
             locationURI="toolbar:org.argeo.cms.ui.workbench.usersView">
             <command
                   commandId="org.argeo.cms.ui.workbench.deleteUsers"
-                  icon="icons/remove.gif"
+                  icon="icons/delete.png"
                   label="Delete User"
                   tooltip="Delete selected users">
             </command>
@@ -364,7 +401,7 @@
             </command>
             <command
                   commandId="org.argeo.cms.ui.workbench.newUser"
-                  icon="icons/add.gif"
+                  icon="icons/add.png"
                   label="Add User"
                   tooltip="Create a new user">
             </command>
@@ -653,40 +690,62 @@
        <!-- ACTIVITIES -->
        <extension
                point="org.eclipse.ui.activities">
-               <!-- group admin is intended to make all user and group maintenance operations -->
-               <!--<activityPatternBinding
-                       activityId="org.argeo.cms.ui.workbench.userAdminActivity"
-                       isEqualityPattern="true"
-                       pattern="org.argeo.cms.ui.workbench.admin/org.argeo.cms.ui.workbench.admin.adminSecurityPerspective">
-               </activityPatternBinding>-->
+
+               <!-- Admin -->
                <activityPatternBinding
-                       activityId="org.argeo.cms.ui.workbench.groupAdminActivity"
-                       isEqualityPattern="true"
-                       pattern="org.argeo.cms.ui.workbench/org.argeo.cms.ui.workbench.adminSecurityPerspective">
-               </activityPatternBinding>
-                <activityPatternBinding
                        pattern="org.argeo.cms.ui.workbench/org.argeo.cms.ui.workbench.osgiPerspective"
                        isEqualityPattern="true"
                        activityId="org.argeo.cms.ui.workbench.adminActivity">
-        </activityPatternBinding>
-        <activityPatternBinding
+               </activityPatternBinding>
+               <activityPatternBinding
                        pattern="org.argeo.cms.ui.workbench/org.argeo.cms.ui.workbench.jcrBrowserPerspective"
                        isEqualityPattern="true"
                        activityId="org.argeo.cms.ui.workbench.adminActivity">
                </activityPatternBinding>
+        <activityPatternBinding
+              pattern="org.argeo.cms.ui.workbench/org.argeo.cms.ui.workbench.adminMaintenancePerspective"
+              isEqualityPattern="true"
+              activityId="org.argeo.cms.ui.workbench.adminActivity">
+        </activityPatternBinding>
+        <activityPatternBinding
+              pattern="org.argeo.cms.ui.workbench/org.argeo.cms.ui.workbench.adminLogView"
+              isEqualityPattern="true"
+              activityId="org.argeo.cms.ui.workbench.adminActivity">
+        </activityPatternBinding>
                
+               <!-- UserAdmin -->
+               <activityPatternBinding
+                       pattern="org.argeo.cms.ui.workbench/org.argeo.cms.ui.workbench.adminSecurityPerspective"
+                       activityId="org.argeo.cms.ui.workbench.userAdminActivity"
+                       isEqualityPattern="true">
+               </activityPatternBinding>
+
+               <!-- Users -->
+        <activityPatternBinding
+              pattern="org.argeo.cms.ui.workbench/org.argeo.cms.ui.workbench.userHomePerspective"
+              isEqualityPattern="true"
+              activityId="org.argeo.cms.ui.workbench.userActivity">
+        </activityPatternBinding>
+        <activityPatternBinding
+              pattern="org.argeo.cms.ui.workbench/org.argeo.cms.ui.workbench.userProfile"
+              isEqualityPattern="true"
+              activityId="org.argeo.cms.ui.workbench.userActivity">
+        </activityPatternBinding>
+
+
+               <!-- Activity declaration -->
                <activity
-              description="Authenticated users"
-              id="org.argeo.cms.ui.workbench.userActivity"
-              name="User">
-                 <enabledWhen>
-                   <with variable="roles">
-                     <iterate ifEmpty="false" operator="or">
-                       <equals value="cn=user,ou=roles,ou=node" />
-                     </iterate>
-                   </with>
-                 </enabledWhen>
-        </activity>
+                       description="Authenticated users"
+                       id="org.argeo.cms.ui.workbench.userActivity"
+                       name="User">
+                       <enabledWhen>
+                               <with variable="roles">
+                                       <iterate ifEmpty="false" operator="or">
+                                               <equals value="cn=user,ou=roles,ou=node" />
+                                       </iterate>
+                               </with>
+                       </enabledWhen>
+               </activity>
         <activity
               description="Admins"
               id="org.argeo.cms.ui.workbench.adminActivity"
@@ -711,18 +770,6 @@
                    </with>
                  </enabledWhen>
         </activity>
-        <activity
-              description="Group Admins"
-              id="org.argeo.cms.ui.workbench.groupAdminActivity"
-              name="User Admin">
-                 <enabledWhen>
-                   <with variable="roles">
-                     <iterate ifEmpty="false" operator="or">
-                       <equals value="cn=groupAdmin,ou=roles,ou=node" />
-                     </iterate>
-                   </with>
-                 </enabledWhen>
-        </activity>
         <activity
               description="Non admins"
               id="org.argeo.cms.ui.workbench.notAdminActivity"
@@ -751,26 +798,6 @@
                        </not>
                  </enabledWhen>
         </activity>
-        <activityPatternBinding
-              activityId="org.argeo.cms.ui.workbench.adminActivity"
-              isEqualityPattern="true"
-              pattern="org.argeo.cms.ui.workbench/org.argeo.cms.ui.workbench.adminMaintenancePerspective">
-        </activityPatternBinding>
-        <activityPatternBinding
-              activityId="org.argeo.cms.ui.workbench.adminActivity"
-              isEqualityPattern="true"
-              pattern="org.argeo.cms.ui.workbench/org.argeo.cms.ui.workbench.adminLogView">
-        </activityPatternBinding>
-        <activityPatternBinding
-              activityId="org.argeo.cms.ui.workbench.userActivity"
-              isEqualityPattern="true"
-              pattern="org.argeo.cms.ui.workbench/org.argeo.cms.ui.workbench.userHomePerspective">
-        </activityPatternBinding>
-        <activityPatternBinding
-              activityId="org.argeo.cms.ui.workbench.userActivity"
-              isEqualityPattern="true"
-              pattern="org.argeo.cms.ui.workbench/org.argeo.cms.ui.workbench.userProfile">
-        </activityPatternBinding>
        </extension>
        
        <!-- STARTUP  --> 
Argeo Commons - Lightweight integration framework in pure Java/OSGi