This is an automated email from the ASF dual-hosted git repository.
git-site-role pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/struts-site.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 27bc573 Updates production by Jenkins
27bc573 is described below
commit 27bc57307517a397a17bcdba1261e335fa492818
Author: jenkins <bui...@apache.org>
AuthorDate: Tue Mar 13 16:45:53 2018 +0000
Updates production by Jenkins
---
content/tag-developers/component-tag.html | 138 ++++++++++++++----------------
content/tag-developers/tag-reference.html | 4 +-
2 files changed, 65 insertions(+), 77 deletions(-)
diff --git a/content/tag-developers/component-tag.html
b/content/tag-developers/component-tag.html
index da8b997..6d6ae30 100644
--- a/content/tag-developers/component-tag.html
+++ b/content/tag-developers/component-tag.html
@@ -131,49 +131,39 @@
<p><strong>Description</strong></p>
-<p> <p>
- Renders an custom UI widget using the specified templates. Additional objects
can be passed in to the template
- using the param tags.
- </p>
-
- <p><b>Freemarker:</b></p>
- <pre>Objects provided can be retrieve from within the template via
$parameters._paramname_.</pre>
-
- <p><b>JSP:</b></p>
- <pre>Objects provided can be retrieve from within the template via
<s:property value="%{parameters._paramname_}" /></pre>
-
- <p>
- In the bottom JSP and Velocity samples, two parameters are being passed in to
the component. From within the
- component, they can be accessed as:
- </p>
-
- <p><b>Freemarker:</b></p>
- <pre>$parameters.get('key1') and $parameters.get('key2') or $parameters.key1
and $parameters.key2</pre>
-
- <p><b>JSP:</b></p>
- <pre>
- <s:property value="%{parameters.key1}" /> and <s:property
value="%{'parameters.key2'}" /> or
- <s:property value="%{parameters.get('key1')}" /> and <s:property
value="%{parameters.get('key2')}" />
- </pre>
-
- <p>
- Currently, your custom UI components can be written in Velocity, JSP, or
Freemarker, and the correct rendering
- engine will be found based on file extension.
- </p>
-
- <p>
- <b>Remember:</b> the value params will always be resolved against the
ValueStack so if you mean to pass a
- string literal to your component, make sure to wrap it in single quotes i.e.
value="'value1'" (note the opening "' and closing '" otherwise, the the value
- stack will search for an Object on the stack with a method of getValue1().
- </p>
-</p>
+<p>Renders an custom UI widget using the specified templates. Additional
objects can be passed in to the template
+ using the <code class="highlighter-rouge">param</code> tags.</p>
-<p>
- If Jsp is used as the template, the jsp template itself must lie within the
- webapp itself and not the classpath. Unlike Freemarker or Velocity, JSP
template
- could not be picked up from the classpath.
+<h3 id="freemarker">Freemarker:</h3>
-</p>
+<p>Objects provided can be retrieve from within the template via <code
class="highlighter-rouge">$parameters._paramname_</code>.</p>
+
+<h3 id="jsp">JSP:</h3>
+
+<p>Objects provided can be retrieve from within the template via <code
class="highlighter-rouge"><s:property value="%{parameters._paramname_}"
/></code></p>
+
+<p>In the bottom JSP and Velocity samples, two parameters are being passed in
to the component. From within the
+ component, they can be accessed as:</p>
+
+<h3 id="freemarker-1">Freemarker:</h3>
+
+<p><code class="highlighter-rouge">$parameters.get('key1')</code> and <code
class="highlighter-rouge">$parameters.get('key2')</code> or <code
class="highlighter-rouge">$parameters.key1</code> and <code
class="highlighter-rouge">$parameters.key2</code></p>
+
+<h3 id="jsp-1">JSP:</h3>
+
+<p><code class="highlighter-rouge"><s:property value="%{parameters.key1}"
/></code> and <code class="highlighter-rouge"><s:property
value="%{'parameters.key2'}" /></code> or
+ <code class="highlighter-rouge"><s:property
value="%{parameters.get('key1')}" /></code> and <code
class="highlighter-rouge"><s:property value="%{parameters.get('key2')}"
/></code></p>
+
+<p>Currently, your custom UI components can be written in Velocity, JSP, or
Freemarker, and the correct rendering
+ engine will be found based on file extension.</p>
+
+<p><strong>Remember:</strong> the value <code
class="highlighter-rouge">params</code> will always be resolved against the
ValueStack so if you mean to pass a
+ string literal to your component, make sure to wrap it in single quotes i.e.
<code class="highlighter-rouge">value="'value1'"</code> (note the opening <code
class="highlighter-rouge">"'</code> and closing <code
class="highlighter-rouge">'"</code> otherwise, the value
+ stack will search for an Object on the stack with a method of <code
class="highlighter-rouge">getValue1()</code>.</p>
+
+<p>If JSP is used as the template, the JSP template itself must lie within the
+ webapp itself and not the classpath. Unlike Freemarker or Velocity, JSP
template
+ could not be picked up from the classpath.</p>
<p><strong>(!) templateDir and theme attribute</strong></p>
@@ -931,49 +921,47 @@
<p><strong>Examples</strong></p>
-<pre><code class="language-ftl"> <p>
- JSP
- </p>
- <pre>
- <s:component template="/my/custom/component.vm"/>
-
- or
+<h3 id="jsp-2">JSP</h3>
- <s:component template="/my/custom/component.vm">
- <s:param name="key1" value="value1"/>
- <s:param name="key2" value="value2"/>
- </s:component>
- </pre>
+<div class="highlighter-rouge"><pre class="highlight"><code><s:component
template="/my/custom/component.vm"/>
+</code></pre>
+</div>
+<p>or</p>
- <p>
- Velocity
- </p>
- <pre>
- #s-component( "template=/my/custom/component.vm" )
+<div class="highlighter-rouge"><pre class="highlight"><code><s:component
template="/my/custom/component.vm">
+ <s:param name="key1" value="value1"/>
+ <s:param name="key2" value="value2"/>
+</s:component>
+</code></pre>
+</div>
- or
+<h3 id="velocity">Velocity</h3>
- #s-component( "template=/my/custom/component.vm" )
- #s-param( "name=key1" "value=value1" )
- #s-param( "name=key2" "value=value2" )
- #end
- </pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>#s-component(
"template=/my/custom/component.vm" )
+</code></pre>
+</div>
+<p>or</p>
- <p>
- Freemarker
- </p>
- <pre>
- <@s..component template="/my/custom/component.ftl" />
+<div class="highlighter-rouge"><pre class="highlight"><code>#s-component(
"template=/my/custom/component.vm" )
+ #s-param( "name=key1" "value=value1" )
+ #s-param( "name=key2" "value=value2" )
+#end
+</code></pre>
+</div>
- or
+<h3 id="freemarker-2">Freemarker</h3>
- <@s..component template="/my/custom/component.ftl">
- <@s..param name="key1" value="%{'value1'}" />
- <@s..param name="key2" value="%{'value2'}" />
- </@s..component>
- </pre>
+<div class="highlighter-rouge"><pre class="highlight"><code><@s..component
template="/my/custom/component.ftl" />
+</code></pre>
+</div>
+<p>or</p>
+<div class="highlighter-rouge"><pre class="highlight"><code><@s..component
template="/my/custom/component.ftl">
+ <@s..param name="key1" value="%{'value1'}" />
+ <@s..param name="key2" value="%{'value2'}" />
+</@s..component>
</code></pre>
+</div>
</section>
diff --git a/content/tag-developers/tag-reference.html
b/content/tag-developers/tag-reference.html
index 5df4db3..7ac11a5 100644
--- a/content/tag-developers/tag-reference.html
+++ b/content/tag-developers/tag-reference.html
@@ -274,13 +274,13 @@ or action executions.</p>
<td> </td>
<td><a href="datetextfield-tag.html">datetextfield</a></td>
<td> </td>
- <td><a href="div-tag.html">div</a></td>
+ <td><a href="fielderror-tag.html">fielderror</a></td>
</tr>
<tr>
<td> </td>
<td><a href="doubleselect-tag.html">doubleselect</a></td>
<td> </td>
- <td><a href="fielderror-tag.html">fielderror</a></td>
+ <td> </td>
</tr>
<tr>
<td> </td>
--
To stop receiving notification emails like this one, please contact
git-site-r...@apache.org.
