Merged V3.2 to HEAD

16841: Fix for ETHREEOH-3046 - discussion post replies and further post content now all set to UTF-8 encoding format.
   16853: Merged V3.1 to V3.2
      13681: Disable CMIS Web Services.
      13958: ETHREEOH-1625 - Incorrect save file process via Office Addin
      14026: ETHREEOH-1805 - update GET login web script description to recommend use of POST login web script instead.
   16861: Merged V3.1 to V3.2
      14162: ETHREEOH-1733 - multiday events display correctly
      14273: fix for ETHREEOH-2031
      14274: fix for event not adjusted by height issue in week view, after adding
   16867: Merged V3.1 to V3.2
      15429: The solution is to remove 'label' and 'description attributes' and add appropriate 'label-id' and 'description-id' attributes in 
   web-client\config\alfresco\web-client-config.xml for dashlets. Appropriate ids were added into webclient.properties.
      16677: ETHREEOH-1208 - Upload/recall documents with apostrophe/accent via Alfresco Office plugin
   16869: Merged V3.1 to V3.2
      16848: Merged V2.2 to V3.1
         15217: Fix for ETWOTWO-1268. Check for existence of desired control on first step of the dialog.
         15218: Fix for ETWOTWO-1269. Remove node.hasPermission(PermissionService.CREATE_CHILDREN) from CheckoutDocEvaluator#evaluate method (like 3.2 version).
      16849: Merged V2.2 to V3.1
         15424: ETWOTWO-1349
      16851: Merged V2.2 to V3.1
         15432: **RECORD ONLY** Input characters validation script was modified to disallow  !@#$%^&*().
         15433: This check-in fixes ETWOTWO-1351, ETWOTWO-1352, ETWOTWO-1353 because their behaviour is similar.
   16874: Merged DEV/TEMPORARY to V3.2
      16789: ETHREEOH-1895: Incorrect working of Link Destination Details
      16790: ETHREEOH-2372: Incorrect working of Link Destination Details
      16791: ETHREEOH-2342: Error message appear when "Coordinator" try to remove himself from the space
      16793: ETHREEOH-1364 & ETHREEOH-1367
      16794: ETHREEOH-2358: Letters and special symbols can be typed in Date value of property while creation of Content Rule and it leads to error
      16837: ETHREEOH-2631: two jsp:root elements cause compilation error in Weblogic 10.3.1

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

source/web/jsp/wcm/create-website-wizard/form-details.jsp

@@ -31,6 +31,9 @@
 <%@ page isELIgnored="false" %>
 
 <f:verbatim>
+
+<script type="text/javascript" src="<%=request.getContextPath()%>/scripts/validation.js"> </script>
+
 <script type="text/javascript">
    window.onload = pageLoaded;
    
@@ -42,7 +45,11 @@
 
    function checkButtonState()
    {
-      if (document.getElementById("dialog:dialog-body:title").value.length == 0)
+	  var name = document.getElementById("dialog:dialog-body:title");
+	  var filepattern = document.getElementById("dialog:dialog-body:filepattern");
+	  var description = document.getElementById("dialog:dialog-body:description");
+
+	  if (!validateName(name, "", false) || filepattern.value.length == 0 || description.value.length > 1024)
       {
          document.getElementById("dialog:finish-button").disabled = true;
       }
@@ -52,6 +59,7 @@
       }
    }
    
+   
 </script>
 </f:verbatim>
 
@@ -82,7 +90,7 @@
             </td>
             <td>
                </f:verbatim>
-               <h:inputText id="title" value="#{DialogManager.bean.title}" size="45" maxlength="1024" onkeyup="javascript:checkButtonState();" />
+               <h:inputText id="title" value="#{DialogManager.bean.title}" size="45" maxlength="1024" onchange="javascript:checkButtonState();" onkeyup="javascript:checkButtonState();" />
                <f:verbatim>
             </td>
          </tr>
@@ -95,7 +103,7 @@
             </td>
             <td>
                </f:verbatim>
-               <h:inputTextarea id="description" value="#{DialogManager.bean.description}" rows="3" cols="42" />
+               <h:inputTextarea id="description" value="#{DialogManager.bean.description}" rows="3" cols="42" onchange="javascript:checkButtonState();" onkeyup="javascript:checkButtonState();" />
                <f:verbatim>
             </td>
          </tr>
@@ -124,6 +132,11 @@
       </table>
       <table cellpadding="3" cellspacing="2" border="0">
          <tr>
+            <td align="left" width=16>
+               </f:verbatim>
+               <h:graphicImage value="/images/icons/required_field.gif" alt="#{msg.required_field}" />
+               <f:verbatim>
+            </td>
             <td>
                <nobr>
                </f:verbatim>
@@ -133,7 +146,7 @@
             </td>
             <td>
                </f:verbatim>
-               <h:inputText id="filepattern" value="#{DialogManager.bean.outputPathPattern}" size="70" maxlength="1024" />
+               <h:inputText id="filepattern" value="#{DialogManager.bean.outputPathPattern}" size="70" maxlength="1024" onchange="javascript:checkButtonState();" onkeyup="javascript:checkButtonState();" />
                <h:graphicImage value="/images/icons/Help_icon.gif" style="vertical-align:-20%;padding-left:8px;cursor:help" onclick="javascript:toggleOutputPathPatternHelp()" />
                <f:verbatim>
             </td>
@@ -141,7 +154,7 @@
          <tr>
             <td></td>
             <td>
-               <jsp:directive.include file="/jsp/wcm/output-path-pattern-help.jsp"/>
+               <c:import url="/jsp/wcm/output-path-pattern-help.jsp" />
             </td>
          </tr>
       </table>

source/web/jsp/wcm/create-website-wizard/form-templates.jsp

@@ -30,6 +30,52 @@
 <%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
 <%@ page isELIgnored="false" %>
 
+
+<f:verbatim>
+
+<script type="text/javascript" src="<%=request.getContextPath()%>/scripts/validation.js"> </script>
+
+<script type="text/javascript">
+   window.onload = pageLoaded;
+   
+   function pageLoaded()
+   {
+      checkButtonState();
+   }
+
+   function checkButtonState(control)
+   {
+        var outputPatterns = $("dialog:dialog-body:templates").getElements('input[name^=dialog:dialog-body:templates]');
+
+        var disable = false;
+        for (var i = 0; i < outputPatterns.length; i++)
+        {
+            if (outputPatterns[i].value.length == 0)
+            {
+                disable = true;
+                break;
+            }
+        }
+	  
+	  
+        if (disable)
+        {
+            document.getElementById("dialog:finish-button").disabled = true;
+        }
+        else
+        {
+            document.getElementById("dialog:finish-button").disabled = false;
+        }
+    }
+
+   
+</script>
+</f:verbatim>
+
+
+
+
+
 <h:panelGrid id="grid-1" columns="1" cellpadding="2" cellpadding="2" width="100%">
    <%-- Template selection list --%>
    <h:outputText id="msg-select" styleClass="mainSubText" value="#{msg.website_select_templates}:" />
@@ -60,11 +106,16 @@
             <h:column id="col2">
                <h:outputText id="msg-01" value="#{row.title}" />
             </h:column>
+            <h:column>
+               <h:graphicImage value="/images/icons/required_field.gif" alt="#{msg.required_field}" />
+            </h:column>
             <h:column>
                <f:facet name="header">
                   <h:outputText id="head-2" value="#{msg.output_path_pattern}" />
                </f:facet>
-               <h:inputText id="in-01" value="#{row.outputPathPattern}" size="70" maxlength="1024" />
+               <h:inputText id="in-01" value="#{row.outputPathPattern}" size="70" maxlength="1024" 
+                                       onchange="javascript:checkButtonState(this);"
+                                       onkeyup="javascript:checkButtonState(this);" />
             </h:column>
             <h:column>
                <a:actionLink id="act-01" actionListener="#{DialogManager.bean.removeTemplate}" image="/images/icons/delete.gif"
@@ -74,7 +125,7 @@
          <h:graphicImage id="img-help" value="/images/icons/Help_icon.gif" style="vertical-align:-20%;padding-left:8px;cursor:help" onclick="javascript:toggleOutputPathPatternHelp()" />
       </h:panelGrid>
       <f:verbatim>
-         <jsp:directive.include file="/jsp/wcm/output-path-pattern-help.jsp"/>
+         <c:import url="/jsp/wcm/output-path-pattern-help.jsp" />
       </f:verbatim>
    </h:panelGroup>