From 48fa124735710cfebdda84bb16a798f7f2c13a3f Mon Sep 17 00:00:00 2001
From: Derek Hulley <derek.hulley@alfresco.com>
Date: Mon, 10 Sep 2007 13:09:30 +0000
Subject: [PATCH] Merged V2.1 to HEAD    6327: Drops alfresco-deployment.zip in
 build/dist instead of build.    6328:Set AVM file name requirements as
 lenient as possible.    6329: Fixed DNS name restriction to allow 1-char host
 labels.    6330: Setting read-only flag for start up components (AR-1621 and
 AR-193)    6331: Minor formatting    6332: Implementation of a read-only,
 HTTP-based ContentStore.    6333: AR-1619: A debug message needed changing as
 the FileFolderService now supports adding children onto system nodes.   
 6334: Build fix    6335: Fix for AWC-1447 (Office Add-In - Create
 Collaboration Space)    6337: Fixed AR-1622: WebService requests must be
 wrapped in retries

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6721 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 config/alfresco/messages/webclient.properties               | 2 +-
 .../webscripts/org/alfresco/office/myAlfresco.get.html.ftl  | 3 +--
 source/web/jsp/wcm/create-website-wizard/details.jsp        | 6 +++---
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/config/alfresco/messages/webclient.properties b/config/alfresco/messages/webclient.properties
index c7aed6ae27..c25c34d157 100644
--- a/config/alfresco/messages/webclient.properties
+++ b/config/alfresco/messages/webclient.properties
@@ -973,7 +973,7 @@ create_website_step1_title=Step One - Web Project Details
 create_website_step1_desc=Enter the information about the web project.
 website_dnsname=DNS name
 website_deployto=Deploy To
-validation_invalid_dns_name=Invalid website DNS name, a minimum of 2 alpha-numeric characters are accepted.
+validation_invalid_dns_name=Invalid website DNS name: only alpha-numeric and non-initial/final hyphen characters are allowed (max length < 64).
 website_webapp=Default Webapp
 website_selected_forms=Selected Web Content Forms
 website_web_content_forms=Web Content Forms
diff --git a/config/alfresco/templates/webscripts/org/alfresco/office/myAlfresco.get.html.ftl b/config/alfresco/templates/webscripts/org/alfresco/office/myAlfresco.get.html.ftl
index 8bc01eccd2..cd74faa0e9 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/office/myAlfresco.get.html.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/office/myAlfresco.get.html.ftl
@@ -1,6 +1,5 @@
 <#assign doc_actions="${url.serviceContext}/office/docActions">
 <#if args.p?exists><#assign path=args.p><#else><#assign path=""></#if>
-<#if args.n?exists><#assign node=args.n><#else><#assign node=companyhome></#if>
 <#if args.e?exists><#assign extn=args.e><#else><#assign extn="doc"></#if>
 <#if args.n?exists><#assign nav=args.n><#else><#assign nav=""></#if>
 <#-- resolve the path (from Company Home) into a node -->
@@ -131,7 +130,7 @@
          </li>
 </#if>
          <li>
-            <a title="Create Collaboration Space" href="${url.serviceContext}/office/navigation?p=${path?url}&amp;n=${d.id}&amp;cc=true">
+            <a title="Create Collaboration Space" href="${url.serviceContext}/office/navigation?p=${path?url}&amp;n=${nav}&amp;cc=true">
                <img src="${url.context}/images/office/create_space.gif" alt="Create Collaboration Space" />
                Create Collaboration Space
             </a>
diff --git a/source/web/jsp/wcm/create-website-wizard/details.jsp b/source/web/jsp/wcm/create-website-wizard/details.jsp
index 976fe09577..9a8faae7ec 100644
--- a/source/web/jsp/wcm/create-website-wizard/details.jsp
+++ b/source/web/jsp/wcm/create-website-wizard/details.jsp
@@ -48,7 +48,7 @@
    function checkButtonState()
    {
       if (document.getElementById("wizard:wizard-body:name").value.length == 0 ||
-          document.getElementById("wizard:wizard-body:dnsname").value.length < 2)
+          document.getElementById("wizard:wizard-body:dnsname").value.length < 1)
       {
          document.getElementById("wizard:next-button").disabled = true;
       }
@@ -69,7 +69,7 @@
          if (valid == true)
          {
             valid = validateRegex(document.getElementById("wizard:wizard-body:dnsname"),
-                  "^[a-zA-Z0-9][a-zA-Z0-9-]{0,61}[a-zA-Z0-9]$", true, null,
+                  "^[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?$", true, null,
                   '</f:verbatim><a:outputText value="#{msg.validation_invalid_dns_name}" /><f:verbatim>', true);
          }
          return valid;
@@ -194,4 +194,4 @@
       </td>
    </tr>
 </table>
-</f:verbatim>
\ No newline at end of file
+</f:verbatim>