inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

. Fix for Alfresco logo image on About page

Browse Source 
. 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
This commit is contained in:
Kevin Roast
2007-02-02 13:37:36 +00:00
parent 09c7da5cef
commit 28a528f534
6 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/alfresco/messages/webclient.properties
View File

@@ -1178,6 +1178,7 @@ start_location=Start Location
interface_language=Interface Language interface_language=Interface Language
content_language_filter=Content Language Filter content_language_filter=Content Language Filter
content_all_languages=All Languages content_all_languages=All Languages
user_management=Management
# Delete Space Dialog messages # Delete Space Dialog messages
select_delete_operation=What do you want to delete? select_delete_operation=What do you want to delete?

3
config/alfresco/web-client-config-actions.xml
View File

@@ -640,7 +640,8 @@
<action idref="paste_all" /> <action idref="paste_all" />
<action idref="manage_space_users" /> <action idref="manage_space_users" />
<action idref="manage_space_rules" /> <action idref="manage_space_rules" />
<action idref="manage_deleted_items" /> <!-- NOTE: now found on the User Console
<action idref="manage_deleted_items" />-->
</action-group> </action-group>
<!-- Actions Menu for Document Details screen --> <!-- Actions Menu for Document Details screen -->

5
source/java/org/alfresco/web/app/servlet/AuthenticationHelper.java
View File

@@ -163,9 +163,6 @@ public final class AuthenticationHelper
// remove the session invalidated flag // remove the session invalidated flag
session.removeAttribute(AuthenticationHelper.SESSION_INVALIDATED); session.removeAttribute(AuthenticationHelper.SESSION_INVALIDATED);
// remove the session invalidated flag
session.removeAttribute(AuthenticationHelper.SESSION_INVALIDATED);
// it is the responsibilty of the caller to handle the Guest return status // it is the responsibilty of the caller to handle the Guest return status
return AuthenticationStatus.Guest; return AuthenticationStatus.Guest;
} }
@@ -220,7 +217,7 @@ public final class AuthenticationHelper
// Set the current locale // Set the current locale
I18NUtil.setLocale(Application.getLanguage(httpRequest.getSession())); I18NUtil.setLocale(Application.getLanguage(httpRequest.getSession()));
/* setup face context */ // setup faces context
FacesHelper.getFacesContext(httpRequest, httpResponse, context); FacesHelper.getFacesContext(httpRequest, httpResponse, context);
if (loginBean != null && (loginBean.getUserPreferencesBean() != null)) if (loginBean != null && (loginBean.getUserPreferencesBean() != null))

BIN
source/web/images/logo/AlfrescoLogo32_bluebg.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

2
source/web/jsp/dialog/about.jsp
View File

@@ -67,7 +67,7 @@
<table cellspacing="4" cellpadding="0" width="100%"> <table cellspacing="4" cellpadding="0" width="100%">
<tr> <tr>
<td width=32> <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>
<td> <td>
<div class="mainTitle"><h:outputText value="#{msg.title_about}" /></div> <div class="mainTitle"><h:outputText value="#{msg.title_about}" /></div>

19
source/web/jsp/users/user-console.jsp
View File

@@ -132,13 +132,9 @@
<%-- context for current user is setup on entry to user console --%> <%-- 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:actionLink id="change-password" value="#{msg.change_password}" action="dialog:changePassword" image="/images/icons/change_password.gif" rendered="#{NavigationBean.isGuest == false}" />
</a:panel> </a:panel>
<div style="padding:4px"></div> <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}" <a:panel label="#{msg.general_pref}" id="pref-panel" rendered="#{NavigationBean.isGuest == false}"
border="white" bgcolor="white" titleBorder="lbgrey" expandedTitleBorder="dotted" titleBgcolor="white"> border="white" bgcolor="white" titleBorder="lbgrey" expandedTitleBorder="dotted" titleBgcolor="white">
<table cellspacing=2 cellpadding=2 border=0> <table cellspacing=2 cellpadding=2 border=0>
@@ -177,6 +173,19 @@
</tr> </tr>
</table> </table>
</a:panel> </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>
<td valign="top"> <td valign="top">