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

Merged V3.1 to HEAD

Browse Source 
13084: Merged V2.1-A to V3.1
      7984: *RECORD-ONLY* Final part of fix for ACT 819, by default the web-client now generates WebScript content download API based URLs to allow relative paths to be resolved in HTML content files
   13086: Merged V2.1-A to V3.1
      7986: *RECORD-ONLY* Additional for ACT 819, View In Browser details page links and cm:link objects to content now output Content API webscript urls
   13090: Merged V2.1-A to V3.1
      7986: Language locale auto-selection based on browser locale - see ACT 1053
      NOTE: a web-client-config setting has been added to enable this - it is off by default.
   13093: Merged V2.1-A to V3.1
      8255: Filetypes and PanelGenerator enhancements
   13094: Merged V2.1-A to V3.1
      8547: Branding changes from Mike [just filetypes merged]
   13095: Merged V2.1-A to V3.1
      8555: Webdav path support for ExternalAccessServlet browse navigation
   13103: Merged V2.1-A to V3.1
      8592: Fix for login page issue with language locale auto-selection - see ACT 1053

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13559 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2009-03-11 11:16:01 +00:00
parent 3af6eec220
commit 57afebd2cd
26 changed files with 223 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
source/java/org/alfresco/web/config/ClientConfigElement.java
View File

@@ -81,6 +81,8 @@ public class ClientConfigElement extends ConfigElementAdapter
private int minPasswordLength = 3;
private String breadcrumbMode = BREADCRUMB_PATH;
private String cifsURLSuffix;
private boolean languageSelect = true;
/**
* Default Constructor
@@ -256,6 +258,11 @@ public class ClientConfigElement extends ConfigElementAdapter
combinedElement.setBreadcrumbMode(newElement.getBreadcrumbMode());
}
if (newElement.isLanguageSelect() != combinedElement.isLanguageSelect())
{
combinedElement.setLanguageSelect(newElement.isLanguageSelect());
}
return combinedElement;
}
@@ -700,7 +707,7 @@ public class ClientConfigElement extends ConfigElementAdapter
breadcrumbMode = mode;
}
}
/**
* Get the CIFs URL suffix
*
@@ -708,9 +715,9 @@ public class ClientConfigElement extends ConfigElementAdapter
*/
public final String getCifsURLSuffix()
{
return cifsURLSuffix;
return cifsURLSuffix;
}
/**
* Set the CIFS URL suffix
*
@@ -718,6 +725,23 @@ public class ClientConfigElement extends ConfigElementAdapter
*/
void setCifsURLSuffix(String suffix)
{
cifsURLSuffix = suffix;
cifsURLSuffix = suffix;
}
/**
* @return the language select flag - true to display language selection, false to
* get the language from the client browser locale instead
*/
public final boolean isLanguageSelect()
{
return this.languageSelect;
}
/**
* @param value the language select flag
*/
/*package*/ void setLanguageSelect(boolean value)
{
this.languageSelect = value;
}
}