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 V2.1 to HEAD

Browse Source 
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
This commit is contained in:
Derek Hulley
2007-09-10 13:09:30 +00:00
parent f9bad97b04
commit 48fa124735
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/alfresco/messages/webclient.properties
View File

@@ -973,7 +973,7 @@ create_website_step1_title=Step One - Web Project Details
create_website_step1_desc=Enter the information about the web project. create_website_step1_desc=Enter the information about the web project.
website_dnsname=DNS name website_dnsname=DNS name
website_deployto=Deploy To 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_webapp=Default Webapp
website_selected_forms=Selected Web Content Forms website_selected_forms=Selected Web Content Forms
website_web_content_forms=Web Content Forms website_web_content_forms=Web Content Forms

3
config/alfresco/templates/webscripts/org/alfresco/office/myAlfresco.get.html.ftl
View File

@@ -1,6 +1,5 @@
<#assign doc_actions="${url.serviceContext}/office/docActions"> <#assign doc_actions="${url.serviceContext}/office/docActions">
<#if args.p?exists><#assign path=args.p><#else><#assign path=""></#if> <#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.e?exists><#assign extn=args.e><#else><#assign extn="doc"></#if>
<#if args.n?exists><#assign nav=args.n><#else><#assign nav=""></#if> <#if args.n?exists><#assign nav=args.n><#else><#assign nav=""></#if>
<#-- resolve the path (from Company Home) into a node --> <#-- resolve the path (from Company Home) into a node -->
@@ -131,7 +130,7 @@
</li> </li>
</#if> </#if>
<li> <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" /> <img src="${url.context}/images/office/create_space.gif" alt="Create Collaboration Space" />
Create Collaboration Space Create Collaboration Space
</a> </a>

4
source/web/jsp/wcm/create-website-wizard/details.jsp
View File

@@ -48,7 +48,7 @@
function checkButtonState() function checkButtonState()
{ {
if (document.getElementById("wizard:wizard-body:name").value.length == 0 || 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; document.getElementById("wizard:next-button").disabled = true;
} }
@@ -69,7 +69,7 @@
if (valid == true) if (valid == true)
{ {
valid = validateRegex(document.getElementById("wizard:wizard-body:dnsname"), 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); '</f:verbatim><a:outputText value="#{msg.validation_invalid_dns_name}" /><f:verbatim>', true);
} }
return valid; return valid;