ALF-19863 Partially revert r49154: Enterprise overlay had been wrongly committed where it shouldn't

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54630 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/web/ui/repo/tag/PageTag.java

@@ -17,7 +17,9 @@
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
  
-/* Enterprise overlay */
+/*
+ * There is an Enterprise overlay for this file
+ */
 
 package org.alfresco.web.ui.repo.tag;
 
@@ -72,8 +74,8 @@ public class PageTag extends TagSupport
       // ajax pickers
       "/scripts/ajax/picker.js",
       "/scripts/ajax/tagger.js",
-      // validation handling
+       // validation handling
-      "/scripts/validation.js"
+       "/scripts/validation.js"
    };
    
    private final static String[] CSS = 
@@ -86,10 +88,20 @@ 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-4.2.png";
+   private final static String ALF_LOGO_HTTPS = "https://www.alfresco.com/assets/images/logos/community-4.2.png";
    private final static String ALF_URL   = "http://www.alfresco.com";
-   private final static String ALF_LOGO  = "/images/logo/alfresco_enterprise.gif";
+   private final static String ALF_TEXT  = "Alfresco Community";
-   private final static String ALF_TEXT  = "Alfresco Enterprise";
+   private final static String ALF_COPY  = "Supplied free of charge with " +
-   private final static String ALF_COPY  = "Certified and supported. Alfresco Software Inc. &copy; 2005-2013 All rights reserved.";
+        "<a class='footer' href='http://www.alfresco.com/services/support/communityterms/#support'>no support</a>, " +
+        "<a class='footer' href='http://www.alfresco.com/services/support/communityterms/#certification'>no certification</a>, " +
+        "<a class='footer' href='http://www.alfresco.com/services/support/communityterms/#maintenance'>no maintenance</a>, " +
+        "<a class='footer' href='http://www.alfresco.com/services/support/communityterms/#warranty'>no warranty</a> and " +
+        "<a class='footer' href='http://www.alfresco.com/services/support/communityterms/#indemnity'>no indemnity</a> by " +
+        "<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-2013 All rights reserved.";
    
    private final static Log logger = LogFactory.getLog(PageTag.class);
    private static String alfresco = null;
@@ -328,12 +340,12 @@ public class PageTag extends TagSupport
    {
       if (PageTag.alfresco == null)
       {
-         final String reqPath = ((HttpServletRequest)pageContext.getRequest()).getContextPath();
+         final HttpServletRequest req = (HttpServletRequest)pageContext.getRequest();
          PageTag.alfresco = ("<center><table style='margin: 0px auto;'><tr><td>" +
                              "<a href='" + ALF_URL + "'>" +
-                             "<img style='vertical-align:middle;border-width:0px;' width='164' height='26' alt='' title='" + ALF_TEXT + 
+                             "<img style='vertical-align:middle;border-width:0px;' width='176' height='26' alt='' title='" + ALF_TEXT + 
-                             "' src='" + reqPath + ALF_LOGO + "'/>" +
+                             "' src='" + ("http".equals(req.getScheme()) ? ALF_LOGO_HTTP : ALF_LOGO_HTTPS) + 
-                             "</a></td><td align='center'>" +
+                             "'>" +"</a></td><td align='center'>" +
                              "<span class='footer'>" + ALF_COPY +
                              "</span></td><td></td></tr></table></center>");
       }

source/web/jsp/dialog/about.jsp

@@ -177,11 +177,27 @@
                            </tr>
                            <tr>
                               <td width="50%" align="right">
-                                 Supported language packs:
+                                 Language and translation packs:
                               </td>
                               <td>&nbsp;&#8226;&nbsp;</td>
                               <td width="50%">
-                                 French, German, Italian, (European) Spanish and Japanese.
+                                 Camille B&eacute;gnis,
+                                 Andrejus Chaliapinas,
+                                 Laurent Genier,
+                                 Antti Jokipii,
+                                 Henning Kristensen,
+                                 Betty Mai,
+                                 Fabian Mandelbaum,
+                                 Theodoros Papageorgiou,
+                                 Helio Silvio Piccinatto,
+                                 Gian Luca Farina Perseu,
+                                 Alex Revesz,
+                                 Christian Roy,
+                                 Philippe Seillier,
+                                 Frank Shipley,
+                                 Michiel Steltman,
+                                 Gert Thiel,
+                                 cnalfresco
                               </td>
                            </tr>
                         </table>