X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.ui.workbench.rap%2Fplugin.xml;h=3dfbf2dc19c7fb00c598e8181ef90668e47bde49;hb=5b444174cd13680f99944026877f6cac2e1faba1;hp=6dc4ba0ef3e3a088852e6b29176b5e3166265979;hpb=c149774fa220fe69f430f7b230ac4c442ea6d0fe;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms.ui.workbench.rap/plugin.xml b/org.argeo.cms.ui.workbench.rap/plugin.xml
index 6dc4ba0ef..3dfbf2dc1 100644
--- a/org.argeo.cms.ui.workbench.rap/plugin.xml
+++ b/org.argeo.cms.ui.workbench.rap/plugin.xml
@@ -15,6 +15,12 @@
             path="/public"
             brandingId="org.argeo.cms.ui.workbench.rap.defaultBranding">
       </entrypoint>
+      <entrypoint
+            brandingId="org.argeo.cms.ui.workbench.rap.defaultBranding"
+            class="org.argeo.cms.ui.workbench.rap.SpnegoWorkbenchLogin"
+            id="org.argeo.cms.ui.workbench.rap.loginEntryPoint"
+            path="/login">
+      </entrypoint>
 <!--      <entrypoint
             id="org.argeo.cms.ui.workbench.rap.secureEntryPoint"
             class="org.argeo.security.ui.rap.RapWorkbenchLogin"
@@ -54,6 +60,7 @@
 	<!-- MENUS --> 
 	<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.rap.userToolbar">
 				<command
@@ -66,6 +73,19 @@
 				<command commandId="org.eclipse.ui.file.saveAll"/>
 			</toolbar>
 		</menuContribution>
+		-->
+    	<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>
 		
 		<!-- User drop down default menu -->
 		<menuContribution locationURI="menu:org.argeo.cms.ui.workbench.rap.mainMenu">
@@ -73,7 +93,7 @@
 			     the display of the current logged-in user id -->
 			<command
 				commandId="org.argeo.cms.ui.workbench.rap.userMenuCommand"
-				icon="icons/main.gif"
+				icon="icons/person-logged-in.png"
 				id="org.argeo.cms.ui.workbench.rap.userMenu">
 			</command>
 			<!-- Still unused
@@ -82,20 +102,18 @@
 				icon="icons/preferences.png"/> -->
         	<command
 				commandId="org.argeo.cms.ui.workbench.rap.openChangePasswordDialog"
-				icon="icons/password.gif"
+				icon="icons/security.gif"
 				label="%changePassword"/>
 			<separator
 				name="org.argeo.cms.ui.workbench.rap.beforeFile"
 				visible="true">
 			</separator>
-			<command
-				commandId="org.eclipse.ui.file.closeAll"
-				icon="icons/closeAll.gif"/>
-			<command commandId="org.eclipse.ui.file.save"/>
-			<command commandId="org.eclipse.ui.file.saveAll"/>
+			<command commandId="org.eclipse.ui.file.closeAll" icon="icons/close-all.png"/>
+			<command commandId="org.eclipse.ui.file.save" icon="icons/save.png"/>
+			<command commandId="org.eclipse.ui.file.saveAll" icon="icons/save-all.png"/>
 	
 			<!--<command commandId="org.eclipse.ui.views.showView"/>-->
-    		<!--<command commandId="org.eclipse.ui.perspectives.showPerspective"/>-->
+    		<command commandId="org.eclipse.ui.perspectives.showPerspective"/>
 			<separator
 				name="org.argeo.cms.ui.workbench.rap.beforeExit"
 				visible="true">