taylor 2004/11/15 10:40:14 Modified: applications/rss/src/webapp/WEB-INF/velocity velocity-macros.vm Log: *** keyword substitution change *** Revision Changes Path 1.2 +103 -103 jakarta-jetspeed-2/applications/rss/src/webapp/WEB-INF/velocity/velocity-macros.vm Index: velocity-macros.vm =================================================================== RCS file: /home/cvs/jakarta-jetspeed-2/applications/rss/src/webapp/WEB-INF/velocity/velocity-macros.vm,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- velocity-macros.vm 15 Nov 2004 06:06:42 -0000 1.1 +++ velocity-macros.vm 15 Nov 2004 18:40:14 -0000 1.2 @@ -1,103 +1,103 @@ -#macro (headerCell $body)
- <th class="portlet-section-header"> - <b> - $body - </b> - </th> -#end - -#macro (entryCell $body) - <td class='portlet-section-body'> - $body - </td> -#end - -#macro (entryCell2 $body $count) -#if (($count % 2) == 0) - <td class='portlet-section-body'> -#else - <td class='portlet-section-alternate'> -#end - $body - </td> -#end - - -#macro (formField $label $value $size $id $MESSAGES $ERRORS) -#if ($ERRORS) -#set ($eflag = "$!ERRORS.get($id)") -#else -#set ($eflag = "") -#end - <tr colspan="4" align="right"> - #if ($!eflag == "") - <td width="5%" align="left"> </td> - #else - <td width="5%" class="portlet-msg-error" align="left"> </td> - #end - <td nowrap class="portlet-section-alternate" align="right">$!MESSAGES.getString($label): </td> - <td class="portlet-section-body" align="left"> - <input id="$!id" type="text" name="$!id" size="$!size" value="$!value" class="portlet-form-label-field"> - </td> - <td width="5%" class="portlet-form-label" align="left"> </td> - </tr> -#end - -#macro (ErrorMessages $ERRORS) -#if ($ERRORS) -#if ($ERRORS.size() > 0) -#foreach ($msg in $ERRORS) -<div class="portlet-msg-error"> -$msg<br/> -</div> -#end -<br/> -#end -#end -#end - -#macro (OnePref $pf) -#set ($pv = $pf.Value) -#foreach ($x in $pv) -#set ($extr = $x) -#end -$pf.Key $!extr -#end - -#macro (prefField $key $values $size) -#if ($ERRORS) -#set ($eflag = "$!ERRORS.get($id)") -#else -#set ($eflag = "") -#end -#set ($pv = $pf.Value) -#foreach ($x in $pv) -#set ($extr = $x) -#end -#foreach ($x in $values) -#set ($extr = $x) -#end - <tr colspan="4" align="right"> - #if ($!eflag == "") - <td width="5%" align="left"> </td> - #else - <td width="5%" class="portlet-msg-error" align="left"> </td> - #end - <td nowrap class="portlet-section-alternate" align="right">$!key: </td> - <td class="portlet-section-body" align="left"> - <input id="$!id" type="text" name="$!key" size="$!size" value="$!extr" class="portlet-form-label-field"> - </td> - <td width="5%" class="portlet-form-label" align="left"> </td> - </tr> -#end - -#macro (form4ColumnCell $label $value $size $id) - <tr colspan="4" align="right"> - <td width="5%" class="portlet-form-label" align="left"> </td> - <td nowrap class="portlet-form-field-label" align="right">$!label: </td> - <td class="portlet-form-input-field" align="left"> - <input id="$!id" type="text" name="$!id" size="$!size" value="$!value"> - </td> - <td width="5%" class="portlet-form-label" align="left"> </td> - </tr> -#end +#macro (headerCell $body) + <th class="portlet-section-header"> + <b> + $body + </b> + </th> +#end + +#macro (entryCell $body) + <td class='portlet-section-body'> + $body + </td> +#end + +#macro (entryCell2 $body $count) +#if (($count % 2) == 0) + <td class='portlet-section-body'> +#else + <td class='portlet-section-alternate'> +#end + $body + </td> +#end + + +#macro (formField $label $value $size $id $MESSAGES $ERRORS) +#if ($ERRORS) +#set ($eflag = "$!ERRORS.get($id)") +#else +#set ($eflag = "") +#end + <tr colspan="4" align="right"> + #if ($!eflag == "") + <td width="5%" align="left"> </td> + #else + <td width="5%" class="portlet-msg-error" align="left"> </td> + #end + <td nowrap class="portlet-section-alternate" align="right">$!MESSAGES.getString($label): </td> + <td class="portlet-section-body" align="left"> + <input id="$!id" type="text" name="$!id" size="$!size" value="$!value" class="portlet-form-label-field"> + </td> + <td width="5%" class="portlet-form-label" align="left"> </td> + </tr> +#end + +#macro (ErrorMessages $ERRORS) +#if ($ERRORS) +#if ($ERRORS.size() > 0) +#foreach ($msg in $ERRORS) +<div class="portlet-msg-error"> +$msg<br/> +</div> +#end +<br/> +#end +#end +#end + +#macro (OnePref $pf) +#set ($pv = $pf.Value) +#foreach ($x in $pv) +#set ($extr = $x) +#end +$pf.Key $!extr +#end + +#macro (prefField $key $values $size) +#if ($ERRORS) +#set ($eflag = "$!ERRORS.get($id)") +#else +#set ($eflag = "") +#end +#set ($pv = $pf.Value) +#foreach ($x in $pv) +#set ($extr = $x) +#end +#foreach ($x in $values) +#set ($extr = $x) +#end + <tr colspan="4" align="right"> + #if ($!eflag == "") + <td width="5%" align="left"> </td> + #else + <td width="5%" class="portlet-msg-error" align="left"> </td> + #end + <td nowrap class="portlet-section-alternate" align="right">$!key: </td> + <td class="portlet-section-body" align="left"> + <input id="$!id" type="text" name="$!key" size="$!size" value="$!extr" class="portlet-form-label-field"> + </td> + <td width="5%" class="portlet-form-label" align="left"> </td> + </tr> +#end + +#macro (form4ColumnCell $label $value $size $id) + <tr colspan="4" align="right"> + <td width="5%" class="portlet-form-label" align="left"> </td> + <td nowrap class="portlet-form-field-label" align="right">$!label: </td> + <td class="portlet-form-input-field" align="left"> + <input id="$!id" type="text" name="$!id" size="$!size" value="$!value"> + </td> + <td width="5%" class="portlet-form-label" align="left"> </td> + </tr> +#end --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]