From 94e890e1fff6369b0d89307cb1a68f8b4b21c10c Mon Sep 17 00:00:00 2001 From: Ahmed Owian Date: Tue, 10 Nov 2015 06:02:45 +0000 Subject: [PATCH] Merged SHA-SIMP-2 (5.1.0) to HEAD (5.1) 115891 aowian: ACE-4500: Updating links to the help from within Alfresco - Added docsEdition to admin-template - Updated docs urls in property files to allow for docsEdition replacement - Made message formatting replace placeholders with docsEdition in docs urls from freemarker files - TODO: Share in the Cloud docs work git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@116660 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../webscripts/org/alfresco/repository/admin/admin-template.ftl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/admin/admin-template.ftl b/config/alfresco/templates/webscripts/org/alfresco/repository/admin/admin-template.ftl index 0a5a17579e..0a419006c9 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/repository/admin/admin-template.ftl +++ b/config/alfresco/templates/webscripts/org/alfresco/repository/admin/admin-template.ftl @@ -821,3 +821,5 @@ Admin.addEventListener(window, 'load', function() { id="${id?html}" <#if style?has_content>style="${style?html}" type="button" value="${label?html}" onclick="${onclick?html}" <#if disabled="true">disabled="true" /> <#if description?has_content>${description?html} + +<#assign docsEdition = server.getVersionMajor() + "." + server.getVersionMinor() /> \ No newline at end of file