date:20120729

svn commit: r1366884 - in /struts/struts2/trunk: apps/showcase/src/main/java/org/apache/struts2/showcase/ apps/showcase/src/main/resources/ apps/showcase/src/main/webapp/tags/ui/ core/src/main/java/or

2012-07-29 Thread jogep

Author: jogep
Date: Sun Jul 29 18:23:06 2012
New Revision: 1366884

URL: http://svn.apache.org/viewvc?rev=1366884&view=rev
Log:
WW-3846 Add a new attributes for optionsCollection

Modified:

struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/UITagExample.java
struts/struts2/trunk/apps/showcase/src/main/resources/log4j.properties
struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/example.jsp

struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/DoubleListUIBean.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ListUIBean.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractListTag.java
struts/struts2/trunk/core/src/main/resources/template/simple/combobox.ftl

struts/struts2/trunk/core/src/main/resources/template/simple/doubleselect.ftl
struts/struts2/trunk/core/src/main/resources/template/simple/radiomap.ftl
struts/struts2/trunk/core/src/main/resources/template/simple/select.ftl
struts/struts2/trunk/core/src/site/resources/tags/checkboxlist.html
struts/struts2/trunk/core/src/site/resources/tags/doubleselect.html
struts/struts2/trunk/core/src/site/resources/tags/inputtransferselect.html
struts/struts2/trunk/core/src/site/resources/tags/optiontransferselect.html
struts/struts2/trunk/core/src/site/resources/tags/radio.html
struts/struts2/trunk/core/src/site/resources/tags/select.html
struts/struts2/trunk/core/src/site/resources/tags/updownselect.html

Modified: 
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/UITagExample.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/UITagExample.java?rev=1366884&r1=1366883&r2=1366884&view=diff
==
--- 
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/UITagExample.java
 (original)
+++ 
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/UITagExample.java
 Sun Jul 29 18:23:06 2012
@@ -26,12 +26,7 @@ import com.opensymphony.xwork2.util.Valu
 import org.apache.struts2.ServletActionContext;
 
 import java.io.File;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  */
@@ -67,9 +62,9 @@ public class UITagExample extends Action
 String thoughts;
 
 public UITagExample() {
-favouriteLanguages.add(new Language("EnglishKey", "English Language"));
-favouriteLanguages.add(new Language("FrenchKey", "French Language"));
-favouriteLanguages.add(new Language("SpanishKey", "Spanish Language"));
+favouriteLanguages.add(new Language("EnglishKey", "English Language", 
"color: blue; font-style: italic;"));
+favouriteLanguages.add(new Language("FrenchKey", "French Language", 
"color: grey;"));
+favouriteLanguages.add(new Language("SpanishKey", "Spanish Language", 
"color: red; font-wight: bold;"));
 
 VehicalType car = new VehicalType("CarKey", "Car");
 VehicalType motorcycle = new VehicalType("MotorcycleKey", 
"Motorcycle");
@@ -268,10 +263,12 @@ public class UITagExample extends Action
 public static class Language {
 String description;
 String key;
+String style;
 
-public Language(String key, String description) {
+public Language(String key, String description, String style) {
 this.key = key;
 this.description = description;
+this.style = style;
 }
 
 public String getKey() {
@@ -280,6 +277,9 @@ public class UITagExample extends Action
 public String getDescription() {
 return description;
 }
+public String getStyle() {
+return style;
+}
 
 }
 

Modified: struts/struts2/trunk/apps/showcase/src/main/resources/log4j.properties
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/log4j.properties?rev=1366884&r1=1366883&r2=1366884&view=diff
==
--- struts/struts2/trunk/apps/showcase/src/main/resources/log4j.properties 
(original)
+++ struts/struts2/trunk/apps/showcase/src/main/resources/log4j.properties Sun 
Jul 29 18:23:06 2012
@@ -24,7 +24,7 @@ log4j.logger.noModule=FATAL
 
 # OpenSymphony Stuff
 log4j.logger.com.opensymphony=INFO
-log4j.logger.org.apache.struts2=DEBUG
+log4j.logger.org.apache.struts2=INFO
 
 # Spring Stuff
 log4j.logger.org.springframework=INFO

Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/example.jsp
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/example.jsp?rev=1366884&r1=1366883&r2=1366884&view=diff
===

svn commit: r1366934 - /struts/struts2/trunk/core/src/main/resources/template/simple/checkboxlist.ftl

2012-07-29 Thread jogep

Author: jogep
Date: Sun Jul 29 20:10:06 2012
New Revision: 1366934

URL: http://svn.apache.org/viewvc?rev=1366934&view=rev
Log:
WW-3846 Add a new attributes for optionsCollection

Modified:

struts/struts2/trunk/core/src/main/resources/template/simple/checkboxlist.ftl

Modified: 
struts/struts2/trunk/core/src/main/resources/template/simple/checkboxlist.ftl
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/checkboxlist.ftl?rev=1366934&r1=1366933&r2=1366934&view=diff
==
--- 
struts/struts2/trunk/core/src/main/resources/template/simple/checkboxlist.ftl 
(original)
+++ 
struts/struts2/trunk/core/src/main/resources/template/simple/checkboxlist.ftl 
Sun Jul 29 20:10:06 2012
@@ -34,6 +34,27 @@
 <#else>
 <#assign itemValue = stack.findString('top')/>
 
+<#if parameters.listCssClass??>
+<#if stack.findString(parameters.listCssClass)??>
+  <#assign itemCssClass= stack.findString(parameters.listCssClass)/>
+<#else>
+  <#assign itemCssClass = ''/>
+
+
+<#if parameters.listCssStyle??>
+<#if stack.findString(parameters.listCssStyle)??>
+  <#assign itemCssStyle= stack.findString(parameters.listCssStyle)/>
+<#else>
+  <#assign itemCssStyle = ''/>
+
+
+<#if parameters.listTitle??>
+<#if stack.findString(parameters.listTitle)??>
+  <#assign itemTitle= stack.findString(parameters.listTitle)/>
+<#else>
+  <#assign itemTitle = ''/>
+
+
 <#assign itemKeyStr=itemKey.toString() />
 
@@ -43,8 +64,26 @@
 <#if parameters.disabled?default(false)>
disabled="disabled"<#rt/>
 
-<#if parameters.title??>
-   title="${parameters.title?html}"<#rt/>
+<#if itemCssClass?if_exists != "">
+ class="${itemCssClass?html}"<#rt/>
+<#else>
+<#if parameters.cssClass??>
+ class="${parameters.cssClass?html}"<#rt/>
+
+
+<#if itemCssStyle?if_exists != "">
+ style="${itemCssStyle?html}"<#rt/>
+<#else>
+<#if parameters.cssStyle??>
+ style="${parameters.cssStyle?html}"<#rt/>
+
+
+<#if itemTitle?if_exists != "">
+ title="${itemTitle?html}"<#rt/>
+<#else>
+<#if parameters.title??>
+ title="${parameters.title?html}"<#rt/>
+
 
 <#include "/${parameters.templateDir}/simple/css.ftl" />
 <#include "/${parameters.templateDir}/simple/scripting-events.ftl" />

[CONF] Confluence Changes in the last 24 hours

2012-07-29 Thread confluence

This is a daily summary of all recent changes in Confluence.

-
Updated Spaces:
-


OFBiz (Open For Business) Project Open Wiki 
(https://cwiki.apache.org/confluence/display/OFBIZ)

Pages
-
Main New Features edited by  adrianc  (06:23 AM)
https://cwiki.apache.org/confluence/display/OFBIZ/Main+New+Features



Apache OpenOffice Community 
(https://cwiki.apache.org/confluence/display/OOOUSERS)

Pages
-
AOO 3.4.1 Distribution Tasks edited by  mla  (05:26 PM)
https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+3.4.1+Distribution+Tasks



Apache Openmeetings (https://cwiki.apache.org/confluence/display/OPENMEETINGS)

Pages
-
Tutorials related to OpenMeetings edited by  megatronic  (09:37 AM)
https://cwiki.apache.org/confluence/display/OPENMEETINGS/Tutorials+related+to+OpenMeetings



Apache Shiro (https://cwiki.apache.org/confluence/display/SHIRO)

Pages
-
Performing a Release edited by  lhazlewood  (06:57 PM)
https://cwiki.apache.org/confluence/display/SHIRO/Performing+a+Release

Apache Shiro 1.2.1 Released created by lhazlewood (06:30 PM)
https://cwiki.apache.org/confluence/display/SHIRO/2012/07/29/Apache+Shiro+1.2.1+Released

Download edited by  lhazlewood  (02:55 PM)
https://cwiki.apache.org/confluence/display/SHIRO/Download



Apache ZooKeeper (https://cwiki.apache.org/confluence/display/ZOOKEEPER)

Pages
-
HowToRelease edited by  phunt  (02:28 AM)
https://cwiki.apache.org/confluence/display/ZOOKEEPER/HowToRelease




Change your notification preferences: 
https://cwiki.apache.org/confluence/users/viewnotifications.action

svn commit: r1366884 - in /struts/struts2/trunk: apps/showcase/src/main/java/org/apache/struts2/showcase/ apps/showcase/src/main/resources/ apps/showcase/src/main/webapp/tags/ui/ core/src/main/java/or

svn commit: r1366934 - /struts/struts2/trunk/core/src/main/resources/template/simple/checkboxlist.ftl

[CONF] Confluence Changes in the last 24 hours

3 matches

Site Navigation

Mail list logo

Footer information