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.2 to HEAD

Browse Source 
18306: ETHREEOH-4047 - Failure adding comment to a file or a folder in Repository
      ETHREEOH-4051 - Incorrect icon is displayed near the new added tag
      ETHREEOH-4053 - Inline action is not working via details page
   18312: Visible year updates (Explorer and Share clients)
   18313: ETHREEOH-4020 - Internet Explorer fixes for Repo DocLib & associated refactoring (first pass)
   18330: ETHREEOH-4020 - Internet Explorer fixes for Repo DocLib & associated refactoring (second pass, mostly IE7)
      ETHREEOH-4063 - It's impossible to upoad new version via documents details page
   18347: *RECORD ONLY* ETHREEOH-4070 - Update the Help URLs for 3.2r (Part 2 of 2)
   18348: *RECORD ONLY* ETHREEOH-4070 - Update the Help URLs for 3.2r (Part 1 of 2)
   18349: ETHREEOH-4068 - Diffrent behaviour after clicking Category Root link
      ETHREEOH-4067 - Incorrect behaviour after clicking the last category in breadcrumbs
      ETHREEOH-4073 - Issues with Forms in Share pop-ups (destroy old instances)
   18350: ETHREEOH-4073 - Issues with Forms in Share pop-ups (tabbing)
   18351: ALFCOM-3798 - Form Validation for Picker controls like category never fires

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18353 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mike Hatfield
2010-01-28 17:57:35 +00:00
parent 693fdad12a
commit 974b578395
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
source/java/org/alfresco/web/ui/repo/tag/PageTag.java
View File

@@ -35,7 +35,7 @@ import javax.servlet.jsp.tagext.TagSupport;
import org.alfresco.web.app.Application; import org.alfresco.web.app.Application;
import org.alfresco.web.app.servlet.FacesHelper; import org.alfresco.web.app.servlet.FacesHelper;
import org.alfresco.web.bean.coci.CCProperties; import org.alfresco.web.bean.coci.CCProperties;
import org.alfresco.web.config.ClientConfigElement; import org.alfresco.web.config.ClientConfigElement;
import org.alfresco.web.ui.common.Utils; import org.alfresco.web.ui.common.Utils;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
@@ -87,8 +87,8 @@ public class PageTag extends TagSupport
* Please ensure you understand the terms of the license before changing the contents of this file. * Please ensure you understand the terms of the license before changing the contents of this file.
*/ */
private final static String ALF_LOGO_HTTP = "http://www.alfresco.com/assets/images/logos/community-edition-3.2r.png"; private final static String ALF_LOGO_HTTP = "http://www.alfresco.com/assets/images/logos/community-edition-3.3.png";
private final static String ALF_LOGO_HTTPS = "https://www.alfresco.com/assets/images/logos/community-edition-3.2r.png"; private final static String ALF_LOGO_HTTPS = "https://www.alfresco.com/assets/images/logos/community-edition-3.3.png";
private final static String ALF_URL = "http://www.alfresco.com"; private final static String ALF_URL = "http://www.alfresco.com";
private final static String ALF_TEXT = "Alfresco Community"; private final static String ALF_TEXT = "Alfresco Community";
private final static String ALF_COPY = "Supplied free of charge with " + private final static String ALF_COPY = "Supplied free of charge with " +
@@ -100,7 +100,7 @@ public class PageTag extends TagSupport
"<a class='footer' href='http://www.alfresco.com'>Alfresco</a> or its " + "<a class='footer' href='http://www.alfresco.com'>Alfresco</a> or its " +
"<a class='footer' href='http://www.alfresco.com/partners/'>Certified Partners</a>. " + "<a class='footer' href='http://www.alfresco.com/partners/'>Certified Partners</a>. " +
"<a class='footer' href='http://www.alfresco.com/services/support/'>Click here for support</a>. " + "<a class='footer' href='http://www.alfresco.com/services/support/'>Click here for support</a>. " +
"Alfresco Software Inc. &copy; 2005-2009 All rights reserved."; "Alfresco Software Inc. &copy; 2005-2010 All rights reserved.";
private final static Log logger = LogFactory.getLog(PageTag.class); private final static Log logger = LogFactory.getLog(PageTag.class);
private static String alfresco = null; private static String alfresco = null;
@@ -257,14 +257,14 @@ public class PageTag extends TagSupport
out.write("<script type=\"text/javascript\">"); // start - generate naked javascript code out.write("<script type=\"text/javascript\">"); // start - generate naked javascript code
// get client config to determine how the JavaScript setContextPath should behave // get client config to determine how the JavaScript setContextPath should behave
ClientConfigElement clientConfig = Application.getClientConfig(pageContext.getServletContext()); ClientConfigElement clientConfig = Application.getClientConfig(pageContext.getServletContext());
// set the context path used by some Alfresco script objects // set the context path used by some Alfresco script objects
if (clientConfig != null && clientConfig.getCheckContextAgainstPath()) if (clientConfig != null && clientConfig.getCheckContextAgainstPath())
{ {
out.write("setCheckContextAgainstPath(true);"); out.write("setCheckContextAgainstPath(true);");
} }
out.write("setContextPath('"); out.write("setContextPath('");
out.write(reqPath); out.write(reqPath);
out.write("');"); out.write("');");