From: Bruno Sinou <bsinou@argeo.org>
Date: Fri, 1 Nov 2013 17:39:27 +0000 (+0000)
Subject: 2.x specific - Fix default branding and other cosmetic issues to be compliant with... 
X-Git-Tag: argeo-commons-2.1.30~641
X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=1faa47d5111f93bcf168f68bcc8d820c02d98e2c;p=lgpl%2Fargeo-commons.git

2.x specific - Fix default branding and other cosmetic issues to be compliant with Rap 2.x APIs.
https://www.argeo.org/bugzilla/show_bug.cgi?id=187


git-svn-id: https://svn.argeo.org/commons/trunk@6579 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/security/plugins/org.argeo.security.ui.rap/plugin.xml b/security/plugins/org.argeo.security.ui.rap/plugin.xml
index 416b67aa7..e39be0fb5 100644
--- a/security/plugins/org.argeo.security.ui.rap/plugin.xml
+++ b/security/plugins/org.argeo.security.ui.rap/plugin.xml
@@ -6,22 +6,26 @@
       <entrypoint
             id="org.argeo.security.ui.rap.secureEntryPoint"
             class="org.argeo.security.ui.rap.SecureEntryPoint"
-            path="/node">
+            path="/node"
+            brandingId="org.argeo.security.ui.rap.defaultBranding">
       </entrypoint>
       <entrypoint
             id="org.argeo.security.ui.rap.secureEntryPoint"
             class="org.argeo.security.ui.rap.SecureEntryPoint"
-            path="/secureWebUi">
+            path="/secureWebUi"
+            brandingId="org.argeo.security.ui.rap.defaultBranding">
       </entrypoint>
       <entrypoint
             id="org.argeo.security.ui.rap.anonymousEntryPoint"
             class="org.argeo.security.ui.rap.AnonymousEntryPoint"
-            path="/publicWebUi">
+            path="/publicWebUi"
+            brandingId="org.argeo.security.ui.rap.defaultBranding">
       </entrypoint>
       <entrypoint
             id="org.argeo.security.ui.rap.logoutEntryPoint"
             class="org.argeo.security.ui.rap.LogoutEntryPoint"
-            path="/logout">
+            path="/logout"
+            brandingId="org.argeo.security.ui.rap.logoutBranding">
       </entrypoint>
       <entrypoint
             id="org.argeo.security.ui.rap.nullEntryPoint"
@@ -32,56 +36,35 @@
 
 	<extension
          point="org.eclipse.rap.ui.branding">
-    	<branding
-			id="org.argeo.security.ui.rap.branding"
-            title="Argeo Web UI"
-            favicon="branding/favicon.ico"
-            body="branding/login.html">
-      	</branding>
-    	<branding
-			id="org.argeo.security.ui.rap.branding"
+    	<!-- themeId attribute is by default set to this value.
+    			Left anyway to provide the pattern when defining a later 
+    			own default theme for Argeo Rap UIs. 
+    			corresponding theme is found in spite of the warning -->  
+		<branding
+			id="org.argeo.security.ui.rap.defaultBranding"
+            themeId="org.eclipse.rap.rwt.theme.Default"
             title="Argeo Web UI"
             favicon="branding/favicon.ico"
             body="branding/login.html">
       	</branding>
+      	<!-- we need a servlet with this name j_spring_security_logout
+      		 for the logout filter -->
     	<branding
-			id="org.argeo.security.ui.rap.branding"
-            title="Argeo Web UI"
-            favicon="branding/favicon.ico"
-            body="branding/login.html">
-      	</branding>
-    	<branding
-			id="org.argeo.security.ui.rap.branding"
-            title="Argeo Web UI"
-            favicon="branding/favicon.ico"
-            body="branding/login.html">
-      	</branding>
-    	<branding
-			id="org.argeo.security.ui.rap.branding"
-            title="Argeo Web UI"
-            favicon="branding/favicon.ico"
-            body="branding/login.html">
-      	</branding>
-    	<branding
-			id="org.argeo.security.ui.rap.branding"
-            title="Argeo Public Web UI"
-            favicon="branding/favicon.ico"
-            body="branding/public.html">
-      	</branding>
-    	<branding
-			id="org.argeo.security.ui.rap.branding"
-            title="Argeo Logout"
-            favicon="branding/favicon.ico"
-            body="branding/afterLogout.html">
-      	</branding>
-      	<!-- we need a servlet with thios name j_spring_security_logout for the logout filter -->
-    	<branding
-			id="org.argeo.security.ui.rap.branding"
+			id="org.argeo.security.ui.rap.logoutBranding"
             title="Argeo Logout"
             favicon="branding/favicon.ico"
             body="branding/empty.html">
       	</branding>
    	</extension>
+   	
+   	<!-- LOCAL THEMES - Use the following to extend or overwrite default theme --> 
+<!--	<extension
+		point="org.eclipse.rap.ui.themes">
+		<themeContribution
+			themeId="org.eclipse.rap.rwt.theme.Default"
+			file="theme/defaultExt.css" /> 
+	</extension> -->
+   	
 
    <extension
          point="org.eclipse.equinox.security.callbackHandlerMapping">
@@ -119,7 +102,7 @@
         </toolbar>
      </menuContribution>
      <menuContribution locationURI="menu:org.argeo.security.ui.rap.mainMenu">
-        <command
+	 <command
               commandId="org.argeo.security.ui.rap.userMenuCommand"
               icon="icons/home.gif"
               id="org.argeo.security.ui.rap.userMenu">