svn commit: r1508338 - in /roller/trunk/app/src/main/resources/template/roller: checkboxlist.ftl radiomap.ftl

[gh...@apache.org]

Author: ghuber
Date: Tue Jul 30 08:13:53 2013
New Revision: 1508338

URL: http://svn.apache.org/r1508338
Log:
Upgrade to struts latest.

Modified:
    roller/trunk/app/src/main/resources/template/roller/checkboxlist.ftl
    roller/trunk/app/src/main/resources/template/roller/radiomap.ftl

Modified: roller/trunk/app/src/main/resources/template/roller/checkboxlist.ftl
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/template/roller/checkboxlist.ftl?rev=1508338&r1=1508337&r2=1508338&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/template/roller/checkboxlist.ftl (original)
+++ roller/trunk/app/src/main/resources/template/roller/checkboxlist.ftl Tue Jul 30 08:13:53 2013
@@ -1,33 +1,106 @@
+<#--
+/*
+ * Roller Modifications
+ * ====================
+ *   Add <br/> to the end
+ *
+ * $Id: checkboxlist.ftl 1366934 2012-07-29 20:10:06Z jogep $
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+-->
 <#assign itemCount = 0/>
-<#if parameters.list?exists>
-    <@s.iterator value="parameters.list">
-        <#assign itemCount = itemCount + 1/>
-        <#if parameters.listKey?exists>
-            <#assign itemKey = stack.findValue(parameters.listKey)/>
+<#if parameters.list??>
+<@s.iterator value="parameters.list">
+    <#assign itemCount = itemCount + 1/>
+    <#if parameters.listKey??>
+        <#assign itemKey = stack.findValue(parameters.listKey)/>
         <#else>
             <#assign itemKey = stack.findValue('top')/>
-        </#if>
-        <#if parameters.listValue?exists>
-            <#assign itemValue = stack.findString(parameters.listValue)/>
+    </#if>
+    <#if parameters.listValue??>
+        <#assign itemValue = stack.findString(parameters.listValue)?default("")/>
         <#else>
             <#assign itemValue = stack.findString('top')/>
+    </#if>
+    <#if parameters.listCssClass??>
+        <#if stack.findString(parameters.listCssClass)??>
+          <#assign itemCssClass= stack.findString(parameters.listCssClass)/>
+        <#else>
+          <#assign itemCssClass = ''/>
+        </#if>
+    </#if>
+    <#if parameters.listCssStyle??>
+        <#if stack.findString(parameters.listCssStyle)??>
+          <#assign itemCssStyle= stack.findString(parameters.listCssStyle)/>
+        <#else>
+          <#assign itemCssStyle = ''/>
+        </#if>
+    </#if>
+    <#if parameters.listTitle??>
+        <#if stack.findString(parameters.listTitle)??>
+          <#assign itemTitle= stack.findString(parameters.listTitle)/>
+        <#else>
+          <#assign itemTitle = ''/>
+        </#if>
+    </#if>
+    <#assign itemKeyStr=itemKey.toString() />
+<input type="checkbox" name="${parameters.name?html}" value="${itemKeyStr?html}"
+       id="${parameters.name?html}-${itemCount}"<#rt/>
+    <#if tag.contains(parameters.nameValue, itemKey)>
+       checked="checked"<#rt/>
+    </#if>
+    <#if parameters.disabled?default(false)>
+       disabled="disabled"<#rt/>
+    </#if>
+    <#if itemCssClass?if_exists != "">
+     class="${itemCssClass?html}"<#rt/>
+    <#else>
+        <#if parameters.cssClass??>
+     class="${parameters.cssClass?html}"<#rt/>
+        </#if>
+    </#if>
+    <#if itemCssStyle?if_exists != "">
+     style="${itemCssStyle?html}"<#rt/>
+    <#else>
+        <#if parameters.cssStyle??>
+     style="${parameters.cssStyle?html}"<#rt/>
         </#if>
-<#assign itemKeyStr=itemKey.toString() />
-<input type="checkbox" name="${parameters.name?html}" value="${itemKeyStr?html}" id="${parameters.name?html}-${itemCount}"<#rt/>
-        <#if tag.contains(parameters.nameValue, itemKey)>
- checked="checked"<#rt/>
-        </#if>
-        <#if parameters.disabled?default(false)>
- disabled="disabled"<#rt/>
-        </#if>
-        <#if parameters.title?exists>
- title="${parameters.title?html}"<#rt/>
-        </#if>
-        <#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
-        <#include "/${parameters.templateDir}/simple/common-attributes.ftl" />
-/>
-<label for="${parameters.name?html}-${itemCount}" class="checkboxLabel">${itemValue?html}</label><br/>
-    </...@s.iterator>
-<#else>
-  &nbsp;
+    </#if>
+    <#if itemTitle?if_exists != "">
+     title="${itemTitle?html}"<#rt/>
+    <#else>
+        <#if parameters.title??>
+     title="${parameters.title?html}"<#rt/>
+        </#if>
+    </#if>
+    <#include "/${parameters.templateDir}/simple/css.ftl" />
+    <#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
+    <#include "/${parameters.templateDir}/simple/common-attributes.ftl" />
+        />
+<label for="${parameters.name?html}-${itemCount}" class="checkboxLabel">${itemValue?html}</label><br/><#-- Roller + <br/> -->
+</...@s.iterator>
+    <#else>
+    &nbsp;
+</#if>
+<input type="hidden" id="__multiselect_${parameters.id?html}" name="__multiselect_${parameters.name?html}"
+       value=""<#rt/>
+<#if parameters.disabled?default(false)>
+       disabled="disabled"<#rt/>
 </#if>
+        />
\ No newline at end of file

Modified: roller/trunk/app/src/main/resources/template/roller/radiomap.ftl
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/template/roller/radiomap.ftl?rev=1508338&r1=1508337&r2=1508338&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/template/roller/radiomap.ftl (original)
+++ roller/trunk/app/src/main/resources/template/roller/radiomap.ftl Tue Jul 30 08:13:53 2013
@@ -1,42 +1,107 @@
+<#--
+/*
+ * Roller Modifications
+ * ====================
+ *   Add <br/> to the end
+ * 
+ * $Id: radiomap.ftl 1379561 2012-08-31 19:40:40Z lukaszlenart $
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+-->
 <@s.iterator value="parameters.list">
-    <#if parameters.listKey?exists>
+    <#if parameters.listKey??>
         <#assign itemKey = stack.findValue(parameters.listKey)/>
     <#else>
         <#assign itemKey = stack.findValue('top')/>
     </#if>
     <#assign itemKeyStr = itemKey.toString() />
-    <#if parameters.listValue?exists>
+    <#if parameters.listValue??>
         <#assign itemValue = stack.findString(parameters.listValue)/>
     <#else>
         <#assign itemValue = stack.findString('top')/>
     </#if>
-<input type="radio" name="${parameters.name?html}" id="${parameters.id?html}${itemKeyStr?html}"<#rt/>
-<#if tag.contains(parameters.nameValue, itemKey)>
+    <#if parameters.listCssClass??>
+        <#if stack.findString(parameters.listCssClass)??>
+          <#assign itemCssClass= stack.findString(parameters.listCssClass)/>
+        <#else>
+          <#assign itemCssClass = ''/>
+        </#if>
+    </#if>
+    <#if parameters.listCssStyle??>
+        <#if stack.findString(parameters.listCssStyle)??>
+          <#assign itemCssStyle= stack.findString(parameters.listCssStyle)/>
+        <#else>
+          <#assign itemCssStyle = ''/>
+        </#if>
+    </#if>
+    <#if parameters.listTitle??>
+        <#if stack.findString(parameters.listTitle)??>
+          <#assign itemTitle= stack.findString(parameters.listTitle)/>
+        <#else>
+          <#assign itemTitle = ''/>
+        </#if>
+    </#if>
+<input type="radio"<#rt/>
+<#if parameters.name??>
+ name="${parameters.name?html}"<#rt/>
+</#if>
+ id="${parameters.id?html}${itemKeyStr?html}"<#rt/>
+<#if tag.contains(parameters.nameValue?default(''), itemKeyStr)>
  checked="checked"<#rt/>
 </#if>
-<#if itemKey?exists>
+<#if itemKey??>
  value="${itemKeyStr?html}"<#rt/>
 </#if>
 <#if parameters.disabled?default(false)>
  disabled="disabled"<#rt/>
 </#if>
-<#if parameters.tabindex?exists>
+<#if parameters.tabindex??>
  tabindex="${parameters.tabindex?html}"<#rt/>
 </#if>
-<#if parameters.cssClass?exists>
+<#if itemCssClass?if_exists != "">
+ class="${itemCssClass?html}"<#rt/>
+<#else>
+    <#if parameters.cssClass??>
  class="${parameters.cssClass?html}"<#rt/>
+    </#if>
 </#if>
-<#if parameters.cssStyle?exists>
+<#if itemCssStyle?if_exists != "">
+ style="${itemCssStyle?html}"<#rt/>
+<#else>
+    <#if parameters.cssStyle??>
  style="${parameters.cssStyle?html}"<#rt/>
+    </#if>
 </#if>
-<#if parameters.title?exists>
+<#if itemTitle?if_exists != "">
+ title="${itemTitle?html}"<#rt/>
+<#else>
+    <#if parameters.title??>
  title="${parameters.title?html}"<#rt/>
+    </#if>
 </#if>
+<#include "/${parameters.templateDir}/simple/css.ftl" />
 <#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
 <#include "/${parameters.templateDir}/simple/common-attributes.ftl" />
+<#include "/${parameters.templateDir}/simple/dynamic-attributes.ftl" />
 /><#rt/>
-<label for="${parameters.id?html}${itemKeyStr?html}"><#rt/>
+<label for="${parameters.id?html}${itemKeyStr?html}"<#include "/${parameters.templateDir}/simple/css.ftl"/>><#rt/>
     ${itemValue}<#t/>
 </label>
-<br/>
-</...@s.iterator>
+<br/><#-- Roller + <br/> -->
+</...@s.iterator>
\ No newline at end of file