- Update to 2.1.9

- Use USE_RC_SUBR
- Use SUB_FILES
- Remove USE_REINPLACE

PR:		95627
Submitted by:	maintainer

1 files changed, 134 insertions, 0 deletions

diff --git a/www/cocoon/files/patch-src-blocks-forms-samples b/www/cocoon/files/patch-src-blocks-forms-samples
new file mode 100644
index 000000000000..6bfa833ed38e
--- /dev/null
+++ b/www/cocoon/files/patch-src-blocks-forms-samples
@@ -0,0 +1,134 @@
+Index: src/blocks/forms/samples/forms/inplace_edit_form.xml
+===================================================================
+--- src/blocks/forms/samples/forms/inplace_edit_form.xml	(revision 0)
++++ src/blocks/forms/samples/forms/inplace_edit_form.xml	(revision 393475)
+@@ -0,0 +1,51 @@
++<?xml version="1.0"?>
++<!--
++  Copyright 1999-2004 The Apache Software Foundation
++
++  Licensed under the Apache License, Version 2.0 (the "License");
++  you may not use this file except in compliance with the License.
++  You may obtain a copy of the License at
++
++      http://www.apache.org/licenses/LICENSE-2.0
++
++  Unless required by applicable law or agreed to in writing, software
++  distributed under the License is distributed on an "AS IS" BASIS,
++  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++  See the License for the specific language governing permissions and
++  limitations under the License.
++-->
++
++<!--
++  @version $Id: inplace_edit_form.xml 393475 2006-04-12 14:48:00Z jbq $
++-->
++
++<fd:form xmlns:fd="http://apache.org/cocoon/forms/1.0#definition">
++  <fd:widgets>
++
++	<fd:field id="name">
++	  <fd:datatype base="string"/>
++	  <fd:hint>Your name</fd:hint>
++	</fd:field>
++
++	<fd:field id="occupation">
++	  <fd:initial-value>Cocoon user</fd:initial-value>
++	  <fd:datatype base="string"/>
++	  <fd:hint>Occupation</fd:hint>
++	</fd:field>
++
++	<fd:field id="comments">
++	  <fd:datatype base="string"/>
++	  <fd:hint>Comments</fd:hint>
++	</fd:field>
++	
++	<fd:action id="check">
++	  <fd:label>Check</fd:label>
++	  <fd:hint>Redisplays the page so you can see the various renderings of inplace inputs depending on their values.</fd:hint>
++	</fd:action>
++
++	<fd:submit id="ok">
++	  <fd:label>OK</fd:label>
++	</fd:submit>
++
++  </fd:widgets>
++</fd:form>
+\ No newline at end of file
+Index: src/blocks/forms/samples/forms/inplace_edit_template.xml
+===================================================================
+--- src/blocks/forms/samples/forms/inplace_edit_template.xml	(revision 0)
++++ src/blocks/forms/samples/forms/inplace_edit_template.xml	(revision 393475)
+@@ -0,0 +1,72 @@
++<?xml version="1.0"?>
++<!--
++  Copyright 1999-2004 The Apache Software Foundation
++
++  Licensed under the Apache License, Version 2.0 (the "License");
++  you may not use this file except in compliance with the License.
++  You may obtain a copy of the License at
++
++      http://www.apache.org/licenses/LICENSE-2.0
++
++  Unless required by applicable law or agreed to in writing, software
++  distributed under the License is distributed on an "AS IS" BASIS,
++  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++  See the License for the specific language governing permissions and
++  limitations under the License.
++-->
++<page xmlns:ft="http://apache.org/cocoon/forms/1.0#template"
++      xmlns:fi="http://apache.org/cocoon/forms/1.0#instance"
++      xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
++
++  <!-- Import the macros that define CForms template elements -->
++  <jx:import uri="resource://org/apache/cocoon/forms/generation/jx-macros.xml"/>
++  <h4 class="samplesGroup">Inline editing</h4>
++  <title>Inline editing</title>
++  <script type="text/javascript">
++     //cocoon.ajax.BrowserUpdater.highlight = cocoon.ajax.Fader.fade;
++  </script>
++  <content>
++    <ft:form-template action="#{$cocoon/continuation/id}.continue" method="POST" ajax="true">
++      <p>The fields below show the various features of in-place editing. "In place" means that inputs are rendered as normal text, and become editable once you click on them.
++	  </p>
++	  <table width="100%" border="1">
++		<tbody>
++		  <tr>
++			<td>
++		      Your name:<br/>
++		      <small>An inplace input with no initial value. The displayed text is
++			         the input's hint</small>
++			</td>
++			<td>
++			  <ft:widget id="name" fi:type="inplace"/>
++			</td>
++		  </tr>
++		  <tr>
++			<td>
++		      Your occupation:<br/>
++		      <small>An inplace input with an initial value.</small>
++			</td>
++			<td>
++			  <ft:widget id="occupation" fi:type="inplace"/>
++			</td>
++		  </tr>
++		  <tr>
++			<td>
++		      Comments:<br/>
++		      <small>An multiline inplace input.</small>
++			</td>
++			<td>
++			  <ft:widget id="comments" fi:type="inplace-area"/>
++			</td>
++		  </tr>
++		</tbody>
++	  </table>
++	  <br/>
++	  <ft:widget id="check"/>
++      <ft:widget id="ok"/>
++      <br/>
++      <a href="./do-inplace.flow">Restart this sample</a> -  <a href="./">Back to Forms samples</a>
++
++    </ft:form-template>
++  </content>
++</page>