Merged V3.2 to HEAD

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

View File

@@ -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.
*/
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_HTTPS = "https://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.3.png";
private final static String ALF_URL = "http://www.alfresco.com";
private final static String ALF_TEXT = "Alfresco Community";
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/partners/'>Certified Partners</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 static String alfresco = null;