From 28a528f5349e07f44601bb56c8ec41a338165ebf Mon Sep 17 00:00:00 2001
From: Kevin Roast <kevin.roast@alfresco.com>
Date: Fri, 2 Feb 2007 13:37:36 +0000
Subject: [PATCH] . Fix for Alfresco logo image on About page . Manage Deleted
 Items action moved from browse header area to User Console screen

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5015 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 config/alfresco/messages/webclient.properties |   1 +
 config/alfresco/web-client-config-actions.xml |   3 ++-
 .../web/app/servlet/AuthenticationHelper.java |   9 +++------
 .../web/images/logo/AlfrescoLogo32_bluebg.gif | Bin 0 -> 1694 bytes
 source/web/jsp/dialog/about.jsp               |   2 +-
 source/web/jsp/users/user-console.jsp         |  19 +++++++++++++-----
 6 files changed, 21 insertions(+), 13 deletions(-)
 create mode 100644 source/web/images/logo/AlfrescoLogo32_bluebg.gif

diff --git a/config/alfresco/messages/webclient.properties b/config/alfresco/messages/webclient.properties
index eb108b08e1..c5c6b46190 100644
--- a/config/alfresco/messages/webclient.properties
+++ b/config/alfresco/messages/webclient.properties
@@ -1178,6 +1178,7 @@ start_location=Start Location
 interface_language=Interface Language
 content_language_filter=Content Language Filter
 content_all_languages=All Languages
+user_management=Management
 
 # Delete Space Dialog messages
 select_delete_operation=What do you want to delete?
diff --git a/config/alfresco/web-client-config-actions.xml b/config/alfresco/web-client-config-actions.xml
index 5cc8ed411d..d0d836b2ee 100644
--- a/config/alfresco/web-client-config-actions.xml
+++ b/config/alfresco/web-client-config-actions.xml
@@ -640,7 +640,8 @@
             <action idref="paste_all" />
             <action idref="manage_space_users" />
             <action idref="manage_space_rules" />
-            <action idref="manage_deleted_items" />
+            <!-- NOTE: now found on the User Console
+            <action idref="manage_deleted_items" />-->
          </action-group>
          
          <!-- Actions Menu for Document Details screen -->
diff --git a/source/java/org/alfresco/web/app/servlet/AuthenticationHelper.java b/source/java/org/alfresco/web/app/servlet/AuthenticationHelper.java
index 2d540804e7..1b87ddab6a 100644
--- a/source/java/org/alfresco/web/app/servlet/AuthenticationHelper.java
+++ b/source/java/org/alfresco/web/app/servlet/AuthenticationHelper.java
@@ -156,13 +156,10 @@ public final class AuthenticationHelper
                   
                   // store the User object in the Session - the authentication servlet will then proceed
                   session.setAttribute(AuthenticationHelper.AUTHENTICATION_USER, user);
-               
+                  
                   // Set the current locale
                   I18NUtil.setLocale(Application.getLanguage(httpRequest.getSession()));
                   
-                  // remove the session invalidated flag
-                  session.removeAttribute(AuthenticationHelper.SESSION_INVALIDATED);
-
                   // remove the session invalidated flag
                   session.removeAttribute(AuthenticationHelper.SESSION_INVALIDATED);
                   
@@ -220,10 +217,10 @@ public final class AuthenticationHelper
          // Set the current locale
          I18NUtil.setLocale(Application.getLanguage(httpRequest.getSession()));
          
-         /* setup face context */
+         // setup faces context
          FacesHelper.getFacesContext(httpRequest, httpResponse, context);
          
-         if (loginBean != null && (loginBean.getUserPreferencesBean() != null) )
+         if (loginBean != null && (loginBean.getUserPreferencesBean() != null))
          {
             String contentFilterLanguageStr = loginBean.getUserPreferencesBean().getContentFilterLanguage();
             if (contentFilterLanguageStr != null)
diff --git a/source/web/images/logo/AlfrescoLogo32_bluebg.gif b/source/web/images/logo/AlfrescoLogo32_bluebg.gif
new file mode 100644
index 0000000000000000000000000000000000000000..f4774eec9c3c1f51084c8f3ae2d3e5f81408ac27
GIT binary patch
literal 1694
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

literal 0
HcmV?d00001

diff --git a/source/web/jsp/dialog/about.jsp b/source/web/jsp/dialog/about.jsp
index afb7196ded..39d6a9ef72 100644
--- a/source/web/jsp/dialog/about.jsp
+++ b/source/web/jsp/dialog/about.jsp
@@ -67,7 +67,7 @@
                      <table cellspacing="4" cellpadding="0" width="100%">
                         <tr>
                            <td width=32>
-                              <h:graphicImage id="logo" url="/images/logo/AlfrescoLogo32.gif" width="32" height="32" />
+                              <h:graphicImage id="logo" url="/images/logo/AlfrescoLogo32_bluebg.gif" width="32" height="32" />
                            </td>
                            <td>
                               <div class="mainTitle"><h:outputText value="#{msg.title_about}" /></div>
diff --git a/source/web/jsp/users/user-console.jsp b/source/web/jsp/users/user-console.jsp
index 317a4140b0..55910bc70b 100644
--- a/source/web/jsp/users/user-console.jsp
+++ b/source/web/jsp/users/user-console.jsp
@@ -132,13 +132,9 @@
                                  <%-- context for current user is setup on entry to user console --%>
                                  <a:actionLink id="change-password" value="#{msg.change_password}" action="dialog:changePassword" image="/images/icons/change_password.gif" rendered="#{NavigationBean.isGuest == false}" />
                               </a:panel>
+                              
                               <div style="padding:4px"></div>
                               
-                              <%--<h:panelGroup id="pref-panel-facets">
-                                 <f:facet name="title">
-                                    <a:actionLink  value="#{msg.modify}" action="" showLink="false" image="/images/icons/Change_details.gif" rendered="#{NavigationBean.isGuest == false}" />
-                                 </f:facet>
-                              </h:panelGroup>--%>
                               <a:panel label="#{msg.general_pref}" id="pref-panel" rendered="#{NavigationBean.isGuest == false}"
                                        border="white" bgcolor="white" titleBorder="lbgrey" expandedTitleBorder="dotted" titleBgcolor="white">
                                  <table cellspacing=2 cellpadding=2 border=0>
@@ -177,6 +173,19 @@
                                     </tr>
                                  </table>
                               </a:panel>
+                              
+                              <div style="padding:4px"></div>
+                              
+                              <a:panel label="#{msg.user_management}" id="man-panel" rendered="#{NavigationBean.isGuest == false}"
+                                       border="white" bgcolor="white" titleBorder="lbgrey" expandedTitleBorder="dotted" titleBgcolor="white">
+                                 <table cellspacing=2 cellpadding=2 border=0>
+                                    <tr>
+                                       <td>
+                                          <a:actionLink id="manage-deleted-items" value="#{msg.manage_deleted_items}" action="dialog:manageDeletedItems" image="/images/icons/trashcan.gif" />
+                                       </td>
+                                    </tr>
+                                 </table>
+                              </a:panel>
                            </td>
                            
                            <td valign="top">