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 V3.2 to HEAD

Browse Source 
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
This commit is contained in:
Kevin Roast
2009-10-15 10:38:44 +00:00
parent 755abcca82
commit c350b0140a
14 changed files with 193 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
source/web/jsp/wcm/create-form-wizard/configure-rendering-engines.jsp
View File

@@ -57,6 +57,28 @@
rendering_engine_template_file_input.value = filename;
rendering_engine_template_file_input.form.submit();
}
function refresh_add_to_list_button()
{
var wizard = document.forms["wizard"]["wizard:wizard-body:rendering-engine"];
var count = wizard.length;
var checked = false;
while (count > 0)
{
count--;
if (wizard[count].checked) checked = true;
}
var name = document.getElementById("wizard:wizard-body:name").value;
var output_path_pattern = document.getElementById("wizard:wizard-body:output-path-pattern").value;
if (name.length == 0 || output_path_pattern.length == 0 || !checked)
{
document.getElementById("wizard:wizard-body:add-to-list-button").disabled = true;
}
else
{
document.getElementById("wizard:wizard-body:add-to-list-button").disabled = false;
}
}
</script>
</f:verbatim>
@@ -86,6 +108,7 @@
type="file"
size="35"
name="alfFileInput"
contentEditable="false"
onchange="javascript:handle_upload(this)"/></f:verbatim>
</h:column>
@@ -127,7 +150,8 @@
value="#{msg.rendering_engine}:"/>
<h:selectOneRadio id="rendering-engine"
value="#{WizardManager.bean.renderingEngineName}"
disabled="#{WizardManager.bean.renderingEngineTemplateFileName == null}">
disabled="#{WizardManager.bean.renderingEngineTemplateFileName == null}"
onchange="refresh_add_to_list_button();">
<f:selectItems id="rendering-engine-choices"
value="#{WizardManager.bean.renderingEngineChoices}"/>
</h:selectOneRadio>
@@ -146,7 +170,9 @@
value="#{WizardManager.bean.renderingEngineTemplateName}"
disabled="#{WizardManager.bean.renderingEngineTemplateFileName == null}"
maxlength="1024"
size="35"/>
size="35"
onkeyup="refresh_add_to_list_button();"
onchange="refresh_add_to_list_button();"/>
<h:column id="name-help"/>
<h:outputText id="no_graphic_image_title" value=""/>
@@ -199,7 +225,9 @@
<h:inputText id="output-path-pattern"
disabled="#{WizardManager.bean.renderingEngineTemplateFileName == null}"
value="#{WizardManager.bean.outputPathPatternForRendition}"
style="width:100%;"/>
style="width:100%;"
onkeyup="refresh_add_to_list_button();"
onchange="refresh_add_to_list_button();"/>
<h:graphicImage id="graphic_image_output_path_pattern_help"
value="/images/icons/Help_icon.gif" style="cursor:help"
onclick="javascript:toggleOutputPathPatternHelp()" />
@@ -207,7 +235,7 @@
<h:column id="output_path_pattern_help_empty_col_1"/>
<h:column id="output_path_pattern_help_empty_col_2"/>
<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:column id="output_path_pattern_help_empty_col_3"/>
</h:panelGrid>
@@ -218,7 +246,11 @@
value="#{msg.add_to_list_button}"
actionListener="#{WizardManager.bean.addSelectedRenderingEngineTemplate}"
styleClass="wizardButton"
disabled="#{WizardManager.bean.addToListDisabled}" />
disabled="#{WizardManager.bean.renderingEngineTemplateFileName == null ||
WizardManager.bean.renderingEngineName == null ||
WizardManager.bean.renderingEngineTemplateName == null ||
WizardManager.bean.mimetypeForRendition == null ||
WizardManager.bean.outputPathPatternForRendition}" />
</h:panelGroup>
<h:panelGroup id="data-table-panel-group">
<h:dataTable id="rendering-engine-template-data-table"