You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(3) |
Dec
(16) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(48) |
Feb
(19) |
Mar
(8) |
Apr
(26) |
May
(52) |
Jun
(18) |
Jul
(68) |
Aug
(77) |
Sep
(103) |
Oct
(21) |
Nov
(32) |
Dec
(13) |
| 2008 |
Jan
(47) |
Feb
(27) |
Mar
(5) |
Apr
(28) |
May
(18) |
Jun
(22) |
Jul
(5) |
Aug
(3) |
Sep
(9) |
Oct
(41) |
Nov
(13) |
Dec
(10) |
| 2009 |
Jan
(2) |
Feb
(12) |
Mar
(7) |
Apr
(6) |
May
(4) |
Jun
(16) |
Jul
(12) |
Aug
(43) |
Sep
|
Oct
(22) |
Nov
(24) |
Dec
(25) |
| 2010 |
Jan
(8) |
Feb
(11) |
Mar
(15) |
Apr
(2) |
May
(4) |
Jun
|
Jul
|
Aug
(10) |
Sep
(2) |
Oct
|
Nov
(8) |
Dec
(7) |
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
(1) |
Aug
|
Sep
(4) |
Oct
(2) |
Nov
(4) |
Dec
(6) |
| 2016 |
Jan
(2) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <haw...@us...> - 2016-01-18 09:40:20
|
Revision: 1135
http://sourceforge.net/p/zkforge/svn/1135
Author: hawkhero
Date: 2016-01-18 09:40:19 +0000 (Mon, 18 Jan 2016)
Log Message:
-----------
remove for empty
Removed Paths:
-------------
trunk/openflashchart/ZKofc/doc/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <haw...@us...> - 2016-01-18 09:38:40
|
Revision: 1134
http://sourceforge.net/p/zkforge/svn/1134
Author: hawkhero
Date: 2016-01-18 09:38:39 +0000 (Mon, 18 Jan 2016)
Log Message:
-----------
remove for its package contains a company name
Removed Paths:
-------------
trunk/openflashchart/ZKofc/doc/ZKRichletTest.java
Deleted: trunk/openflashchart/ZKofc/doc/ZKRichletTest.java
===================================================================
--- trunk/openflashchart/ZKofc/doc/ZKRichletTest.java 2011-12-13 01:33:03 UTC (rev 1133)
+++ trunk/openflashchart/ZKofc/doc/ZKRichletTest.java 2016-01-18 09:38:39 UTC (rev 1134)
@@ -1,57 +0,0 @@
-package ar.com.osde.test;
-
-import java.util.Date;
-
-import jofc2.model.Chart;
-import jofc2.model.elements.FilledBarChart;
-import ofc.OFC;
-
-import org.zkoss.zk.ui.Component;
-import org.zkoss.zk.ui.GenericRichlet;
-import org.zkoss.zk.ui.Page;
-import org.zkoss.zul.Iframe;
-import org.zkoss.zul.SimpleCategoryModel;
-import org.zkoss.zul.Window;
-
-public class ZKRichletTest extends GenericRichlet {
- // Richlet//
- public void service(Page page) {
- test1(page);
- }
-
- /**
- * Test using the component and setting the chart type
- *
- */
- private void test1(Page page) {
- OFC ofc = new OFC();
- ofc.setType(org.zkoss.zul.Chart.BAR);
- ofc.setAutoplay(true);
- ofc.setWidth("300px");
- ofc.setHeight("300px");
- ofc.setWmode("transparent");
- ofc.setModel(new SimpleCategoryModel());
- ofc.setPage(page);
- }
-
- /**
- * Test using the component and setting the json chart data
- *
- */
- private void test2(Page page) {
- OFC ofc = new OFC();
- Chart chart;
- chart = new Chart(new Date().toString()).addElements(
- new FilledBarChart().setOutlineColour("#577261").setColour(
- "#E2D66A").addValues(9, 8, 7, 6, 5, 4, 3, 2, 1))
- .setBackgroundColour("#FFFFFF");
- String json = chart.toDebugString();
-
- ofc.setChart(json);
- ofc.setAutoplay(true);
- ofc.setWidth("300px");
- ofc.setHeight("300px");
- ofc.setWmode("transparent");
- ofc.setPage(page);
- }
-}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vin...@us...> - 2011-12-13 01:33:09
|
Revision: 1133
http://zkforge.svn.sourceforge.net/zkforge/?rev=1133&view=rev
Author: vincentjian
Date: 2011-12-13 01:33:03 +0000 (Tue, 13 Dec 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/zkcss3theme/WebContent/listbox-css3sample.zul
Modified: trunk/zkcss3theme/WebContent/listbox-css3sample.zul
===================================================================
--- trunk/zkcss3theme/WebContent/listbox-css3sample.zul 2011-12-03 20:46:54 UTC (rev 1132)
+++ trunk/zkcss3theme/WebContent/listbox-css3sample.zul 2011-12-13 01:33:03 UTC (rev 1133)
@@ -3,7 +3,7 @@
<vlayout>
<separator spacing="2px"/>
Default Mold
- <listbox id="box1">
+ <listbox id="box1" width="200px">
<listhead sizable="true">
<listheader label="name" />
<listheader label="gender" sort="auto" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sim...@us...> - 2011-12-03 20:47:00
|
Revision: 1132
http://zkforge.svn.sourceforge.net/zkforge/?rev=1132&view=rev
Author: simon_massey
Date: 2011-12-03 20:46:54 +0000 (Sat, 03 Dec 2011)
Log Message:
-----------
THE ZkToDo2 SUBPROJECT HAS MOVED TO GitHub https://github.com/simbo1905/ZkToDo2
Modified Paths:
--------------
trunk/zktodo2/pom.xml
trunk/zktodo2/readme.txt
trunk/zktodo2/src/main/webapp/index.jsp
Modified: trunk/zktodo2/pom.xml
===================================================================
--- trunk/zktodo2/pom.xml 2011-12-01 04:13:24 UTC (rev 1131)
+++ trunk/zktodo2/pom.xml 2011-12-03 20:46:54 UTC (rev 1132)
@@ -6,6 +6,7 @@
<packaging>war</packaging>
<version>1.4</version>
<name>zktodo2</name>
+ <description>This project has moved to https://github.com/simbo1905/ZkToDo2</description>
<url>http://java.dzone.com/articles/using-desktop-model-view</url>
<repositories>
<repository>
Modified: trunk/zktodo2/readme.txt
===================================================================
--- trunk/zktodo2/readme.txt 2011-12-01 04:13:24 UTC (rev 1131)
+++ trunk/zktodo2/readme.txt 2011-12-03 20:46:54 UTC (rev 1132)
@@ -1,3 +1,10 @@
+
+~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=
+~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=
+THIS PROJECT HAS MOVED TO https://github.com/simbo1905/ZkToDo2
+~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=
+~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=
+
Installation:
1 Deploy this application to Tomcat by copying the zktodo2-X.X.war file to the directory $TOMCAT_HOME/webapps/. Tomcat will handle the rest of work, including unzipping and deploying.
Modified: trunk/zktodo2/src/main/webapp/index.jsp
===================================================================
--- trunk/zktodo2/src/main/webapp/index.jsp 2011-12-01 04:13:24 UTC (rev 1131)
+++ trunk/zktodo2/src/main/webapp/index.jsp 2011-12-03 20:46:54 UTC (rev 1132)
@@ -1,4 +1,10 @@
<br/>
+~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=
+~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=
+THIS PROJECT HAS MOVED TO https://github.com/simbo1905/ZkToDo2
+~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=
+~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=
+<br/>
Click <a href="zktodo_c.zul">here</a> for the MVB aka MVVM version based on the approach
presented at the
<a href="http://dl.dropbox.com/u/2622674/zk/zk-mvvm.pdf">2010 UK ZK Users Group</a>.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vin...@us...> - 2011-12-01 04:13:30
|
Revision: 1131
http://zkforge.svn.sourceforge.net/zkforge/?rev=1131&view=rev
Author: vincentjian
Date: 2011-12-01 04:13:24 +0000 (Thu, 01 Dec 2011)
Log Message:
-----------
commit war file
Added Paths:
-----------
trunk/zkcss3theme/css3theme.war
Added: trunk/zkcss3theme/css3theme.war
===================================================================
(Binary files differ)
Property changes on: trunk/zkcss3theme/css3theme.war
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vin...@us...> - 2011-12-01 04:09:56
|
Revision: 1130
http://zkforge.svn.sourceforge.net/zkforge/?rev=1130&view=rev
Author: vincentjian
Date: 2011-12-01 04:09:50 +0000 (Thu, 01 Dec 2011)
Log Message:
-----------
Added Paths:
-----------
trunk/css3breezetheme/css3breezetheme.war
Added: trunk/css3breezetheme/css3breezetheme.war
===================================================================
(Binary files differ)
Property changes on: trunk/css3breezetheme/css3breezetheme.war
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vin...@us...> - 2011-12-01 04:06:11
|
Revision: 1129
http://zkforge.svn.sourceforge.net/zkforge/?rev=1129&view=rev
Author: vincentjian
Date: 2011-12-01 04:06:03 +0000 (Thu, 01 Dec 2011)
Log Message:
-----------
commit all project
Added Paths:
-----------
trunk/css3breezetheme/.classpath
trunk/css3breezetheme/.project
trunk/css3breezetheme/.settings/
trunk/css3breezetheme/.settings/.jsdtscope
trunk/css3breezetheme/.settings/org.eclipse.jdt.core.prefs
trunk/css3breezetheme/.settings/org.eclipse.wst.common.component
trunk/css3breezetheme/.settings/org.eclipse.wst.common.project.facet.core.xml
trunk/css3breezetheme/.settings/org.eclipse.wst.jsdt.ui.superType.container
trunk/css3breezetheme/.settings/org.eclipse.wst.jsdt.ui.superType.name
trunk/css3breezetheme/.settings/org.zkoss.eclipse.preferences.prefs
trunk/css3breezetheme/WebContent/
trunk/css3breezetheme/WebContent/META-INF/
trunk/css3breezetheme/WebContent/META-INF/MANIFEST.MF
trunk/css3breezetheme/WebContent/WEB-INF/
trunk/css3breezetheme/WebContent/WEB-INF/lib/
trunk/css3breezetheme/WebContent/WEB-INF/lib/breeze.jar
trunk/css3breezetheme/WebContent/WEB-INF/lib/bsh.jar
trunk/css3breezetheme/WebContent/WEB-INF/lib/commons-collections.jar
trunk/css3breezetheme/WebContent/WEB-INF/lib/commons-fileupload.jar
trunk/css3breezetheme/WebContent/WEB-INF/lib/commons-io.jar
trunk/css3breezetheme/WebContent/WEB-INF/lib/commons-logging.jar
trunk/css3breezetheme/WebContent/WEB-INF/lib/mvel.jar
trunk/css3breezetheme/WebContent/WEB-INF/lib/ognl.jar
trunk/css3breezetheme/WebContent/WEB-INF/lib/zcommon.jar
trunk/css3breezetheme/WebContent/WEB-INF/lib/zcommons-el.jar
trunk/css3breezetheme/WebContent/WEB-INF/lib/zhtml.jar
trunk/css3breezetheme/WebContent/WEB-INF/lib/zk.jar
trunk/css3breezetheme/WebContent/WEB-INF/lib/zkex.jar
trunk/css3breezetheme/WebContent/WEB-INF/lib/zkmax.jar
trunk/css3breezetheme/WebContent/WEB-INF/lib/zkplus.jar
trunk/css3breezetheme/WebContent/WEB-INF/lib/zml.jar
trunk/css3breezetheme/WebContent/WEB-INF/lib/zul.jar
trunk/css3breezetheme/WebContent/WEB-INF/lib/zuljsp.jar
trunk/css3breezetheme/WebContent/WEB-INF/lib/zweb.jar
trunk/css3breezetheme/WebContent/WEB-INF/web.xml
trunk/css3breezetheme/WebContent/WEB-INF/zk.xml
trunk/css3breezetheme/WebContent/button-css3sample.zul
trunk/css3breezetheme/WebContent/combobox-css3sample.zul
trunk/css3breezetheme/WebContent/css/
trunk/css3breezetheme/WebContent/css/button.css.dsp
trunk/css3breezetheme/WebContent/css/combobox.css.dsp
trunk/css3breezetheme/WebContent/css/listbox.css.dsp
trunk/css3breezetheme/WebContent/css/window.css.dsp
trunk/css3breezetheme/WebContent/img/
trunk/css3breezetheme/WebContent/img/combobtn.gif
trunk/css3breezetheme/WebContent/img/wnd-icon.png
trunk/css3breezetheme/WebContent/index.zul
trunk/css3breezetheme/WebContent/listbox-css3sample.zul
trunk/css3breezetheme/WebContent/timeout.zul
trunk/css3breezetheme/WebContent/window-css3sample.zul
trunk/css3breezetheme/src/
Added: trunk/css3breezetheme/.classpath
===================================================================
--- trunk/css3breezetheme/.classpath (rev 0)
+++ trunk/css3breezetheme/.classpath 2011-12-01 04:06:03 UTC (rev 1129)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.6.0_29">
+ <attributes>
+ <attribute name="owner.project.facets" value="java"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v6.0">
+ <attributes>
+ <attribute name="owner.project.facets" value="jst.web"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
+ <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
+ <classpathentry kind="output" path="build/classes"/>
+</classpath>
Added: trunk/css3breezetheme/.project
===================================================================
--- trunk/css3breezetheme/.project (rev 0)
+++ trunk/css3breezetheme/.project 2011-12-01 04:06:03 UTC (rev 1129)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>css3breezetheme</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.zkoss.eclipse.zknature</nature>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+ <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.wst.jsdt.core.jsNature</nature>
+ </natures>
+</projectDescription>
Added: trunk/css3breezetheme/.settings/.jsdtscope
===================================================================
--- trunk/css3breezetheme/.settings/.jsdtscope (rev 0)
+++ trunk/css3breezetheme/.settings/.jsdtscope 2011-12-01 04:06:03 UTC (rev 1129)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="WebContent"/>
+ <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
+ <attributes>
+ <attribute name="hide" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
+ <classpathentry kind="output" path=""/>
+</classpath>
Added: trunk/css3breezetheme/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/css3breezetheme/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/css3breezetheme/.settings/org.eclipse.jdt.core.prefs 2011-12-01 04:06:03 UTC (rev 1129)
@@ -0,0 +1,8 @@
+#Thu Dec 01 10:50:18 CST 2011
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
Added: trunk/css3breezetheme/.settings/org.eclipse.wst.common.component
===================================================================
--- trunk/css3breezetheme/.settings/org.eclipse.wst.common.component (rev 0)
+++ trunk/css3breezetheme/.settings/org.eclipse.wst.common.component 2011-12-01 04:06:03 UTC (rev 1129)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-modules id="moduleCoreId" project-version="1.5.0">
+ <wb-module deploy-name="css3breezetheme">
+ <wb-resource deploy-path="/" source-path="/WebContent" tag="defaultRootSource"/>
+ <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
+ <property name="context-root" value="css3breezetheme"/>
+ <property name="java-output-path" value="/css3breezetheme/build/classes"/>
+ </wb-module>
+</project-modules>
Added: trunk/css3breezetheme/.settings/org.eclipse.wst.common.project.facet.core.xml
===================================================================
--- trunk/css3breezetheme/.settings/org.eclipse.wst.common.project.facet.core.xml (rev 0)
+++ trunk/css3breezetheme/.settings/org.eclipse.wst.common.project.facet.core.xml 2011-12-01 04:06:03 UTC (rev 1129)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+ <runtime name="Apache Tomcat v6.0"/>
+ <fixed facet="wst.jsdt.web"/>
+ <fixed facet="org.zkoss.eclipse.project.zksupports"/>
+ <fixed facet="java"/>
+ <fixed facet="jst.web"/>
+ <installed facet="java" version="1.6"/>
+ <installed facet="jst.web" version="2.5"/>
+ <installed facet="org.zkoss.eclipse.project.zksupports" version="1.0.1"/>
+ <installed facet="wst.jsdt.web" version="1.0"/>
+</faceted-project>
Added: trunk/css3breezetheme/.settings/org.eclipse.wst.jsdt.ui.superType.container
===================================================================
--- trunk/css3breezetheme/.settings/org.eclipse.wst.jsdt.ui.superType.container (rev 0)
+++ trunk/css3breezetheme/.settings/org.eclipse.wst.jsdt.ui.superType.container 2011-12-01 04:06:03 UTC (rev 1129)
@@ -0,0 +1 @@
+org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
Added: trunk/css3breezetheme/.settings/org.eclipse.wst.jsdt.ui.superType.name
===================================================================
--- trunk/css3breezetheme/.settings/org.eclipse.wst.jsdt.ui.superType.name (rev 0)
+++ trunk/css3breezetheme/.settings/org.eclipse.wst.jsdt.ui.superType.name 2011-12-01 04:06:03 UTC (rev 1129)
@@ -0,0 +1 @@
+Window
\ No newline at end of file
Added: trunk/css3breezetheme/.settings/org.zkoss.eclipse.preferences.prefs
===================================================================
--- trunk/css3breezetheme/.settings/org.zkoss.eclipse.preferences.prefs (rev 0)
+++ trunk/css3breezetheme/.settings/org.zkoss.eclipse.preferences.prefs 2011-12-01 04:06:03 UTC (rev 1129)
@@ -0,0 +1,3 @@
+#Thu Dec 01 10:50:22 CST 2011
+eclipse.preferences.version=1
+setting.zk_facet_install_history=<history>\n<module name\="base Module" pid\="zk-bin-eval-5.0.7.1" type\="ZK_RELEASE" >\n<resource prjRelativePath\="WebContent" pseudo\="true" />\n<resource prjRelativePath\="WEB-INF" pseudo\="true" />\n<resource prjRelativePath\="lib" pseudo\="true" />\n<resource size\="272" lastModified\="1320658691550" type\="zxml" pseudo\="false" prjRelativePath\="WebContent/WEB-INF/zk.xml" />\n<resource size\="1955" lastModified\="1322707822658" type\="wxml" pseudo\="false" prjRelativePath\="WebContent/WEB-INF/web.xml" />\n<resource size\="83613" lastModified\="1320658690472" type\="W_R" pseudo\="false" prjRelativePath\="WebContent/WEB-INF/lib/commons-io.jar" />\n<resource size\="57779" lastModified\="1320658690465" type\="W_R" pseudo\="false" prjRelativePath\="WebContent/WEB-INF/lib/commons-fileupload.jar" />\n<resource size\="246565" lastModified\="1320658691340" type\="W_R" pseudo\="false" prjRelativePath\="WebContent/WEB-INF/lib/silvertail.jar" />\n<resource size\="60841" lastModified\="1320658690475" type\="W_R" pseudo\="false" prjRelativePath\="WebContent/WEB-INF/lib/commons-logging.jar" />\n<resource size\="1130070" lastModified\="1320658690788" type\="W_R" pseudo\="false" prjRelativePath\="WebContent/WEB-INF/lib/itext.jar" />\n<resource size\="359025" lastModified\="1320658690415" type\="W_R" pseudo\="false" prjRelativePath\="WebContent/WEB-INF/lib/Filters.jar" />\n<resource size\="1879318" lastModified\="1320658691290" type\="W_R" pseudo\="false" prjRelativePath\="WebContent/WEB-INF/lib/ckez.jar" />\n<resource size\="102009" lastModified\="1320658691380" type\="W_R" pseudo\="false" prjRelativePath\="WebContent/WEB-INF/lib/zcommons-el.jar" />\n<resource size\="234207" lastModified\="1320658691410" type\="W_R" pseudo\="false" prjRelativePath\="WebContent/WEB-INF/lib/zkex.jar" />\n<resource size\="5091376" lastModified\="1320658690549" type\="W_R" pseudo\="false" prjRelativePath\="WebContent/WEB-INF/lib/groovy.jar" />\n<resource size\="289374" lastModified\="1320658691350" type\="W_R" pseudo\="false" prjRelativePath\="WebContent/WEB-INF/lib/timelinez.jar" />\n<resource size\="725735" lastModified\="1320658691080" type\="W_R" pseudo\="false" prjRelativePath\="WebContent/WEB-INF/lib/jxl.jar" />\n<resource size\="8580107" lastModified\="1320658691200" type\="W_R" pseudo\="false" prjRelativePath\="WebContent/WEB-INF/lib/jython.jar" />\n<resource size\="1425744" lastModified\="1320658690904" type\="W_R" pseudo\="false" prjRelativePath\="WebContent/WEB-INF/lib/jfreechart.jar" />\n<resource size\="108375" lastModified\="1320658691410" type\="W_R" pseudo\="false" prjRelativePath\="WebContent/WEB-INF/lib/zkmax.jar" />\n<resource size\="440791" lastModified\="1320658691370" type\="W_R" pseudo\="false" prjRelativePath\="WebContent/WEB-INF/lib/zcommon.jar" />\n<resource size\="1404306" lastModified\="1320658691450" type\="W_R" pseudo\="false" prjRelativePath\="WebContent/WEB-INF/lib/zul.jar" />\n<resource size\="114196" lastModified\="1320658691350" type\="W_R" pseudo\="false" prjRelativePath\="WebContent/WEB-INF/lib/timeplotz.jar" />\n<resource size\="205337" lastModified\="1320658691460" type\="W_R" pseudo\="false" prjRelativePath\="WebContent/WEB-INF/lib/zweb.jar" />\n<resource size\="137539" lastModified\="1320658691360" type\="W_R" pseudo\="false" prjRelativePath\="WebContent/WEB-INF/lib/zuljsp.jar" />\n<resource size\="1428690" lastModified\="1320658691250" type\="W_R" pseudo\="false" prjRelativePath\="WebContent/WEB-INF/lib/poi.jar" />\n<resource size\="13788" lastModified\="1320658691430" type\="W_R" pseudo\="false" prjRelativePath\="WebContent/WEB-INF/lib/zml.jar" />\n<resource size\="309293" lastModified\="1320658690875" type\="W_R" pseudo\="false" prjRelativePath\="WebContent/WEB-INF/lib/jcommon.jar" />\n<resource size\="8801103" lastModified\="1320658691046" type\="W_R" pseudo\="false" prjRelativePath\="WebContent/WEB-INF/lib/jruby.jar" />\n<resource size\="130552" lastModified\="1320658691420" type\="W_R" pseudo\="false" prjRelativePath\="WebContent/WEB-INF/lib/zkplus.jar" />\n<resource size\="1121269" lastModified\="1320658691210" type\="W_R" pseudo\="false" prjRelativePath\="WebContent/WEB-INF/lib/mvel.jar" />\n<resource size\="245279" lastModified\="1320658691260" type\="W_R" pseudo\="false" prjRelativePath\="WebContent/WEB-INF/lib/breeze.jar" />\n<resource size\="1113836" lastModified\="1320658691400" type\="W_R" pseudo\="false" prjRelativePath\="WebContent/WEB-INF/lib/zk.jar" />\n<resource size\="575389" lastModified\="1320658690461" type\="W_R" pseudo\="false" prjRelativePath\="WebContent/WEB-INF/lib/commons-collections.jar" />\n<resource size\="236263" lastModified\="1320658691330" type\="W_R" pseudo\="false" prjRelativePath\="WebContent/WEB-INF/lib/sapphire.jar" />\n<resource size\="97044" lastModified\="1320658691320" type\="W_R" pseudo\="false" prjRelativePath\="WebContent/WEB-INF/lib/gmapsz.jar" />\n<resource size\="1486031" lastModified\="1320658691320" type\="W_R" pseudo\="false" prjRelativePath\="WebContent/WEB-INF/lib/fckez.jar" />\n<resource size\="167958" lastModified\="1320658691220" type\="W_R" pseudo\="false" prjRelativePath\="WebContent/WEB-INF/lib/ognl.jar" />\n<resource size\="59344" lastModified\="1320658691380" type\="W_R" pseudo\="false" prjRelativePath\="WebContent/WEB-INF/lib/zhtml.jar" />\n<resource size\="2635773" lastModified\="1320658690864" type\="W_R" pseudo\="false" prjRelativePath\="WebContent/WEB-INF/lib/jasperreports.jar" />\n<resource size\="281694" lastModified\="1320658690445" type\="W_R" pseudo\="false" prjRelativePath\="WebContent/WEB-INF/lib/bsh.jar" />\n<resource size\="871260" lastModified\="1320658691060" type\="W_R" pseudo\="false" prjRelativePath\="WebContent/WEB-INF/lib/js.jar" />\n</module>\n\n</history>\n
Added: trunk/css3breezetheme/WebContent/META-INF/MANIFEST.MF
===================================================================
--- trunk/css3breezetheme/WebContent/META-INF/MANIFEST.MF (rev 0)
+++ trunk/css3breezetheme/WebContent/META-INF/MANIFEST.MF 2011-12-01 04:06:03 UTC (rev 1129)
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path:
+
Added: trunk/css3breezetheme/WebContent/WEB-INF/lib/breeze.jar
===================================================================
(Binary files differ)
Property changes on: trunk/css3breezetheme/WebContent/WEB-INF/lib/breeze.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/css3breezetheme/WebContent/WEB-INF/lib/bsh.jar
===================================================================
(Binary files differ)
Property changes on: trunk/css3breezetheme/WebContent/WEB-INF/lib/bsh.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/css3breezetheme/WebContent/WEB-INF/lib/commons-collections.jar
===================================================================
(Binary files differ)
Property changes on: trunk/css3breezetheme/WebContent/WEB-INF/lib/commons-collections.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/css3breezetheme/WebContent/WEB-INF/lib/commons-fileupload.jar
===================================================================
(Binary files differ)
Property changes on: trunk/css3breezetheme/WebContent/WEB-INF/lib/commons-fileupload.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/css3breezetheme/WebContent/WEB-INF/lib/commons-io.jar
===================================================================
(Binary files differ)
Property changes on: trunk/css3breezetheme/WebContent/WEB-INF/lib/commons-io.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/css3breezetheme/WebContent/WEB-INF/lib/commons-logging.jar
===================================================================
(Binary files differ)
Property changes on: trunk/css3breezetheme/WebContent/WEB-INF/lib/commons-logging.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/css3breezetheme/WebContent/WEB-INF/lib/mvel.jar
===================================================================
(Binary files differ)
Property changes on: trunk/css3breezetheme/WebContent/WEB-INF/lib/mvel.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/css3breezetheme/WebContent/WEB-INF/lib/ognl.jar
===================================================================
(Binary files differ)
Property changes on: trunk/css3breezetheme/WebContent/WEB-INF/lib/ognl.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/css3breezetheme/WebContent/WEB-INF/lib/zcommon.jar
===================================================================
(Binary files differ)
Property changes on: trunk/css3breezetheme/WebContent/WEB-INF/lib/zcommon.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/css3breezetheme/WebContent/WEB-INF/lib/zcommons-el.jar
===================================================================
(Binary files differ)
Property changes on: trunk/css3breezetheme/WebContent/WEB-INF/lib/zcommons-el.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/css3breezetheme/WebContent/WEB-INF/lib/zhtml.jar
===================================================================
(Binary files differ)
Property changes on: trunk/css3breezetheme/WebContent/WEB-INF/lib/zhtml.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/css3breezetheme/WebContent/WEB-INF/lib/zk.jar
===================================================================
(Binary files differ)
Property changes on: trunk/css3breezetheme/WebContent/WEB-INF/lib/zk.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/css3breezetheme/WebContent/WEB-INF/lib/zkex.jar
===================================================================
(Binary files differ)
Property changes on: trunk/css3breezetheme/WebContent/WEB-INF/lib/zkex.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/css3breezetheme/WebContent/WEB-INF/lib/zkmax.jar
===================================================================
(Binary files differ)
Property changes on: trunk/css3breezetheme/WebContent/WEB-INF/lib/zkmax.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/css3breezetheme/WebContent/WEB-INF/lib/zkplus.jar
===================================================================
(Binary files differ)
Property changes on: trunk/css3breezetheme/WebContent/WEB-INF/lib/zkplus.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/css3breezetheme/WebContent/WEB-INF/lib/zml.jar
===================================================================
(Binary files differ)
Property changes on: trunk/css3breezetheme/WebContent/WEB-INF/lib/zml.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/css3breezetheme/WebContent/WEB-INF/lib/zul.jar
===================================================================
(Binary files differ)
Property changes on: trunk/css3breezetheme/WebContent/WEB-INF/lib/zul.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/css3breezetheme/WebContent/WEB-INF/lib/zuljsp.jar
===================================================================
(Binary files differ)
Property changes on: trunk/css3breezetheme/WebContent/WEB-INF/lib/zuljsp.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/css3breezetheme/WebContent/WEB-INF/lib/zweb.jar
===================================================================
(Binary files differ)
Property changes on: trunk/css3breezetheme/WebContent/WEB-INF/lib/zweb.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/css3breezetheme/WebContent/WEB-INF/web.xml
===================================================================
--- trunk/css3breezetheme/WebContent/WEB-INF/web.xml (rev 0)
+++ trunk/css3breezetheme/WebContent/WEB-INF/web.xml 2011-12-01 04:06:03 UTC (rev 1129)
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ id="WebApp_ID" version="2.5">
+ <display-name>css3breezetheme</display-name>
+ <listener>
+ <description>Used to cleanup when a session is destroyed</description>
+ <display-name>ZK Session cleaner</display-name>
+ <listener-class>org.zkoss.zk.ui.http.HttpSessionListener</listener-class>
+ </listener>
+ <servlet>
+ <description>The ZK loader for ZUML pages</description>
+ <servlet-name>zkLoader</servlet-name>
+ <servlet-class>org.zkoss.zk.ui.http.DHtmlLayoutServlet</servlet-class>
+ <init-param>
+ <param-name>update-uri</param-name>
+ <param-value>/zkau</param-value>
+ </init-param>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+ <servlet>
+ <description>The asynchronous update engine for ZK</description>
+ <servlet-name>auEngine</servlet-name>
+ <servlet-class>org.zkoss.zk.au.http.DHtmlUpdateServlet</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>zkLoader</servlet-name>
+ <url-pattern>*.zul</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>zkLoader</servlet-name>
+ <url-pattern>*.zhtml</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>auEngine</servlet-name>
+ <url-pattern>/zkau/*</url-pattern>
+ </servlet-mapping>
+ <servlet>
+ <servlet-name>dspLoader</servlet-name>
+ <servlet-class>org.zkoss.web.servlet.dsp.InterpreterServlet</servlet-class>
+ <init-param>
+ <param-name>class-resource</param-name>
+ <param-value>true</param-value>
+ </init-param>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>dspLoader</servlet-name>
+ <url-pattern>*.dsp</url-pattern>
+ </servlet-mapping>
+ <welcome-file-list>
+ <welcome-file>index.html</welcome-file>
+ <welcome-file>index.htm</welcome-file>
+ <welcome-file>index.jsp</welcome-file>
+ <welcome-file>default.html</welcome-file>
+ <welcome-file>default.htm</welcome-file>
+ <welcome-file>default.jsp</welcome-file>
+ <welcome-file>index.zul</welcome-file>
+ </welcome-file-list>
+</web-app>
\ No newline at end of file
Added: trunk/css3breezetheme/WebContent/WEB-INF/zk.xml
===================================================================
--- trunk/css3breezetheme/WebContent/WEB-INF/zk.xml (rev 0)
+++ trunk/css3breezetheme/WebContent/WEB-INF/zk.xml 2011-12-01 04:06:03 UTC (rev 1129)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Created by ZK Studio
+-->
+
+<zk>
+ <device-config>
+ <device-type>ajax</device-type>
+ <timeout-uri>/timeout.zul</timeout-uri><!-- An empty URL can cause the browser to reload the same URL -->
+ </device-config>
+</zk>
Added: trunk/css3breezetheme/WebContent/button-css3sample.zul
===================================================================
--- trunk/css3breezetheme/WebContent/button-css3sample.zul (rev 0)
+++ trunk/css3breezetheme/WebContent/button-css3sample.zul 2011-12-01 04:06:03 UTC (rev 1129)
@@ -0,0 +1,10 @@
+<?link rel="stylesheet" type="text/css" href="/css/button.css.dsp"?>
+<zk>
+ <vlayout>
+ <separator spacing="1px" />
+ <button label="os mold" mold="os" width="200px" height="50px"/>
+ <separator spacing="1px" />
+ <button label="os mold disabled" mold="os" width="200px" height="50px" disabled="true" />
+ <a href="index.zul">back</a>
+ </vlayout>
+</zk>
\ No newline at end of file
Added: trunk/css3breezetheme/WebContent/combobox-css3sample.zul
===================================================================
--- trunk/css3breezetheme/WebContent/combobox-css3sample.zul (rev 0)
+++ trunk/css3breezetheme/WebContent/combobox-css3sample.zul 2011-12-01 04:06:03 UTC (rev 1129)
@@ -0,0 +1,27 @@
+<?link rel="stylesheet" type="text/css" href="css/combobox.css.dsp"?>
+<zk>
+ <vlayout>
+ <separator spacing="2px"/>
+ Default Mold
+ <combobox>
+ <comboitem label="Simple and Rich"/>
+ <comboitem label="Cool!"/>
+ <comboitem label="Ajax and RIA"/>
+ </combobox>
+ <separator spacing="2px"/>
+ Default Mold: read-only
+ <combobox readonly="true">
+ <comboitem label="Simple and Rich"/>
+ <comboitem label="Cool!"/>
+ <comboitem label="Ajax and RIA"/>
+ </combobox>
+ <separator spacing="2px"/>
+ Default Mold: disabled
+ <combobox disabled="true">
+ <comboitem label="Simple and Rich"/>
+ <comboitem label="Cool!"/>
+ <comboitem label="Ajax and RIA"/>
+ </combobox>
+ <a href="index.zul">back</a>
+ </vlayout>
+</zk>
\ No newline at end of file
Added: trunk/css3breezetheme/WebContent/css/button.css.dsp
===================================================================
--- trunk/css3breezetheme/WebContent/css/button.css.dsp (rev 0)
+++ trunk/css3breezetheme/WebContent/css/button.css.dsp 2011-12-01 04:06:03 UTC (rev 1129)
@@ -0,0 +1,54 @@
+<%@ taglib uri="http://www.zkoss.org/dsp/web/core" prefix="c" %>
+<c:if test="${c:browser('gecko2') || c:browser('ie9') || c:browser('opera') || c:browser('safari')}">
+.z-button-os,
+.z-button-os:focus,
+.z-button-os.z-button-os-disd:hover,
+.z-button-os.z-button-os-disd:active {
+ border: 1px solid #C7C7C7;
+ border-radius: 3px;
+ -moz-border-radius: 3px;
+ -webkit-border-radius: 3px;
+ /* IE9 SVG, needs conditional override of 'filter' to 'none' */
+ background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZjZmNmYyIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNlZWVlZWUiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+);
+ background: -moz-linear-gradient(top, #FCFCFC 0%, #EEEEEE 100%); /* FF3.6+ */
+ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#FCFCFC), color-stop(100%,#EEEEEE)); /* Chrome,Safari4+ */
+ background: -webkit-linear-gradient(top, #FCFCFC 0%, #EEEEEE 100%); /* Chrome10+,Safari5.1+ */
+ background: -o-linear-gradient(top, #FCFCFC 0%, #EEEEEE 100%); /* Opera 11.10+ */
+ background: -ms-linear-gradient(top, #FCFCFC 0%, #EEEEEE 100%); /* IE10+ */
+ background: linear-gradient(top, #FCFCFC 0%, #EEEEEE 100%); /* W3C */
+ filter: none\0/; /*IE9 hack*/
+}
+.z-button-os:focus {
+ border-color: #00B9FF;
+}
+.z-button-os:hover {
+ /* IE9 SVG, needs conditional override of 'filter' to 'none' */
+ background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2U1ZjVmZCIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNjN2U5ZmEiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+) repeat-y;
+ background: -moz-linear-gradient(top, #E5F5FD 0%, #C7E9FA 100%); /* FF3.6+ */
+ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #E5F5FD), color-stop(100%, #C7E9FA)); /* Chrome,Safari4+ */
+ background: -webkit-linear-gradient(top, #E5F5FD 0%, #C7E9FA 100%); /* Chrome10+,Safari5.1+ */
+ background: -o-linear-gradient(top, #E5F5FD 0%, #C7E9FA 100%); /* Opera 11.10+ */
+ background: -ms-linear-gradient(top, #E5F5FD 0%, #C7E9FA 100%); /* IE10+ */
+ background: linear-gradient(top, #E5F5FD 0%, #C7E9FA 100%); /* W3C */
+ filter: none\0/; /* IE9 hack */
+}
+.z-button-os:active {
+ border-color: #499EB3;
+ /* IE9 SVG, needs conditional override of 'filter' to 'none' */
+ background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2M3ZjZmZSIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiM4NGUxZjgiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+) repeat-y;
+ background: -moz-linear-gradient(top, #C7F6FE 0%, #84E1F8 100%); /* FF3.6+ */
+ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #C7F6FE), color-stop(100%, #84E1F8)); /* Chrome,Safari4+ */
+ background: -webkit-linear-gradient(top, #C7F6FE 0%, #84E1F8 100%); /* Chrome10+,Safari5.1+ */
+ background: -o-linear-gradient(top, #C7F6FE 0%, #84E1F8 100%); /* Opera 11.10+ */
+ background: -ms-linear-gradient(top, #C7F6FE 0%, #84E1F8 100%); /* IE10+ */
+ background: linear-gradient(top, #C7F6FE 0%, #84E1F8 100%); /* W3C */
+ filter: none\0/; /*IE9 hack*/
+}
+.z-button-os.z-button-os-disd {
+ cursor: default;
+ color: gray;
+ box-shadow: none;
+ -moz-box-shadow: none;
+ -webkit-box-shadow: none;
+}
+</c:if>
\ No newline at end of file
Added: trunk/css3breezetheme/WebContent/css/combobox.css.dsp
===================================================================
--- trunk/css3breezetheme/WebContent/css/combobox.css.dsp (rev 0)
+++ trunk/css3breezetheme/WebContent/css/combobox.css.dsp 2011-12-01 04:06:03 UTC (rev 1129)
@@ -0,0 +1,90 @@
+<%@ taglib uri="http://www.zkoss.org/dsp/web/core" prefix="c" %>
+<c:if test="${c:browser('gecko2') || c:browser('ie9') || c:browser('opera') || c:browser('safari')}">
+.z-combobox-inp {
+ height: 20px;
+ border-color: #B0B0B0;
+ border-radius: 4px 0 0 4px;
+ -moz-border-radius: 4px 0 0 4px;
+ -webkit-border-radius: 4px 0 0 4px;
+ padding: 2px 0 2px 4px;
+ background-color: #FDFDFD;
+}
+.z-combobox-inp:focus,
+.z-combobox-readonly {
+ /* IE9 SVG, needs conditional override of 'filter' to 'none' */
+ background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZmZmZmZiIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNlZWVlZWUiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+);
+ background: -moz-linear-gradient(top, #FFFFFF 0%, #EEEEEE 100%); /* FF3.6+ */
+ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#FFFFFF), color-stop(100%,#EEEEEE)); /* Chrome,Safari4+ */
+ background: -webkit-linear-gradient(top, #FFFFFF 0%,#EEEEEE 100%); /* Chrome10+,Safari5.1+ */
+ background: -o-linear-gradient(top, #FFFFFF 0%,#EEEEEE 100%); /* Opera 11.10+ */
+ background: -ms-linear-gradient(top, #FFFFFF 0%,#EEEEEE 100%); /* IE10+ */
+ background: linear-gradient(top, #FFFFFF 0%,#EEEEEE 100%); /* W3C */
+ filter: none\0/; /* IE9 hack */
+}
+.z-combobox .z-combobox-btn {
+ background: url('../img/combobtn.gif') no-repeat scroll 0 3px, #FDFDFD;
+ height: 24px;
+ border: 1px solid #B0B0B0;
+ border-left: 0px;
+ border-radius: 0 4px 4px 0;
+ -moz-border-radius: 0 4px 4px 0;
+ -webkit-border-radius: 0 4px 4px 0;
+}
+.z-combobox .z-combobox-btn-over {
+ border: 1px solid #8FB9D0;
+ /* IE9 SVG, needs conditional override of 'filter' to 'none' */
+ background: url('../img/combobtn.gif') no-repeat scroll 0 3px, url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2U4ZjZmZCIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNjNmU4ZmEiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+) no-repeat;
+ background: url('../img/combobtn.gif') no-repeat scroll 0 3px, -moz-linear-gradient(top, #ADB7BC 0%, #D4E2E9 2%, #C5E8F9 100%); /* FF3.6+ */
+ background: url('../img/combobtn.gif') no-repeat scroll 0 3px, -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ADB7BC), color-stop(2%,#D4E2E9), color-stop(100%,#C5E8F9)); /* Chrome,Safari4+ */
+ background: url('../img/combobtn.gif') no-repeat scroll 0 3px, -webkit-linear-gradient(top, #ADB7BC 0%,#D4E2E9 2%,#C5E8F9 100%); /* Chrome10+,Safari5.1+ */
+ background: url('../img/combobtn.gif') no-repeat scroll 0 3px, -o-linear-gradient(top, #ADB7BC 0%,#D4E2E9 2%,#C5E8F9 100%); /* Opera 11.10+ */
+ background: url('../img/combobtn.gif') no-repeat scroll 0 3px, -ms-linear-gradient(top, #ADB7BC 0%,#D4E2E9 2%,#C5E8F9 100%); /* IE10+ */
+ background: url('../img/combobtn.gif') no-repeat scroll 0 3px, linear-gradient(top, #ADB7BC 0%,#D4E2E9 2%,#C5E8F9 100%); /* W3C */
+ filter: none\0/; /* IE9 hack */
+}
+.z-combobox-focus .z-combobox-btn-clk, .z-combobox .z-combobox-btn-clk {
+ border-left: 1px solid #ADB7BC;
+ /* IE9 SVG, needs conditional override of 'filter' to 'none' */
+ background: url('../img/combobtn.gif') no-repeat scroll 0 3px, url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2FkYjdiYyIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjIlIiBzdG9wLWNvbG9yPSIjZDRlMmU5IiBzdG9wLW9wYWNpdHk9IjEiLz4KICAgIDxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI2M1ZThmOSIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgPC9saW5lYXJHcmFkaWVudD4KICA8cmVjdCB4PSIwIiB5PSIwIiB3aWR0aD0iMSIgaGVpZ2h0PSIxIiBmaWxsPSJ1cmwoI2dyYWQtdWNnZy1nZW5lcmF0ZWQpIiAvPgo8L3N2Zz4=) no-repeat;
+ background: url('../img/combobtn.gif') no-repeat scroll 0 3px, -moz-linear-gradient(top, #ADB7BC 0%, #D4E2E9 2%, #C5E8F9 100%); /* FF3.6+ */
+ background: url('../img/combobtn.gif') no-repeat scroll 0 3px, -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ADB7BC), color-stop(2%,#D4E2E9), color-stop(100%,#C5E8F9)); /* Chrome,Safari4+ */
+ background: url('../img/combobtn.gif') no-repeat scroll 0 3px, -webkit-linear-gradient(top, #ADB7BC 0%,#D4E2E9 2%,#C5E8F9 100%); /* Chrome10+,Safari5.1+ */
+ background: url('../img/combobtn.gif') no-repeat scroll 0 3px, -o-linear-gradient(top, #ADB7BC 0%,#D4E2E9 2%,#C5E8F9 100%); /* Opera 11.10+ */
+ background: url('../img/combobtn.gif') no-repeat scroll 0 3px, -ms-linear-gradient(top, #ADB7BC 0%,#D4E2E9 2%,#C5E8F9 100%); /* IE10+ */
+ background: url('../img/combobtn.gif') no-repeat scroll 0 3px, linear-gradient(top, #ADB7BC 0%,#D4E2E9 2%,#C5E8F9 100%); /* W3C */
+ filter: none\0/; /* IE9 hack */
+}
+.z-combobox-focus .z-combobox-btn,
+.z-combobox-readonly ~ .z-combobox-btn {
+ border: 1px solid #8FB9D0;
+ border-left: 0px;
+ /* IE9 SVG, needs conditional override of 'filter' to 'none' */
+ background: url('../img/combobtn.gif') no-repeat scroll 0 3px, url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZmZmZmZiIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNlZWVlZWUiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+);
+ background: url('../img/combobtn.gif') no-repeat scroll 0 3px, -moz-linear-gradient(top, #FFFFFF 0%, #EEEEEE 100%); /* FF3.6+ */
+ background: url('../img/combobtn.gif') no-repeat scroll 0 3px, -webkit-gradient(linear, left top, left bottom, color-stop(0%,#FFFFFF), color-stop(100%,#EEEEEE)); /* Chrome,Safari4+ */
+ background: url('../img/combobtn.gif') no-repeat scroll 0 3px, -webkit-linear-gradient(top, #FFFFFF 0%,#EEEEEE 100%); /* Chrome10+,Safari5.1+ */
+ background: url('../img/combobtn.gif') no-repeat scroll 0 3px, -o-linear-gradient(top, #FFFFFF 0%,#EEEEEE 100%); /* Opera 11.10+ */
+ background: url('../img/combobtn.gif') no-repeat scroll 0 3px, -ms-linear-gradient(top, #FFFFFF 0%,#EEEEEE 100%); /* IE10+ */
+ background: url('../img/combobtn.gif') no-repeat scroll 0 3px, linear-gradient(top, #FFFFFF 0%,#EEEEEE 100%); /* W3C */
+ filter: none\0/; /* IE9 hack */
+}
+.z-combobox-focus .z-combobox-btn-over,
+.z-combobox-readonly ~ .z-combobox-btn-over {
+ border: 1px solid #8FB9D0;
+ /* IE9 SVG, needs conditional override of 'filter' to 'none' */
+ background: url('../img/combobtn.gif') no-repeat scroll 0 3px, url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2U4ZjZmZCIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNjNmU4ZmEiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+) no-repeat;
+ background: url('../img/combobtn.gif') no-repeat scroll 0 3px, -moz-linear-gradient(top, #ADB7BC 0%, #D4E2E9 2%, #C5E8F9 100%); /* FF3.6+ */
+ background: url('../img/combobtn.gif') no-repeat scroll 0 3px, -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ADB7BC), color-stop(2%,#D4E2E9), color-stop(100%,#C5E8F9)); /* Chrome,Safari4+ */
+ background: url('../img/combobtn.gif') no-repeat scroll 0 3px, -webkit-linear-gradient(top, #ADB7BC 0%,#D4E2E9 2%,#C5E8F9 100%); /* Chrome10+,Safari5.1+ */
+ background: url('../img/combobtn.gif') no-repeat scroll 0 3px, -o-linear-gradient(top, #ADB7BC 0%,#D4E2E9 2%,#C5E8F9 100%); /* Opera 11.10+ */
+ background: url('../img/combobtn.gif') no-repeat scroll 0 3px, -ms-linear-gradient(top, #ADB7BC 0%,#D4E2E9 2%,#C5E8F9 100%); /* IE10+ */
+ background: url('../img/combobtn.gif') no-repeat scroll 0 3px, linear-gradient(top, #ADB7BC 0%,#D4E2E9 2%,#C5E8F9 100%); /* W3C */
+ filter: none\0/; /* IE9 hack */
+}
+.z-combobox-readonly {
+ border-color: #8FB9D0;
+}
+.z-combobox-focus .z-combobox-readonly {
+ padding-right: 0px;
+}
+</c:if>
\ No newline at end of file
Added: trunk/css3breezetheme/WebContent/css/listbox.css.dsp
===================================================================
--- trunk/css3breezetheme/WebContent/css/listbox.css.dsp (rev 0)
+++ trunk/css3breezetheme/WebContent/css/listbox.css.dsp 2011-12-01 04:06:03 UTC (rev 1129)
@@ -0,0 +1,87 @@
+<%@ taglib uri="http://www.zkoss.org/dsp/web/core" prefix="c" %>
+<c:if test="${c:browser('gecko2') || c:browser('ie9') || c:browser('opera') || c:browser('safari')}">
+div.z-listbox,
+div.z-listbox-header tr.z-listhead, div.z-listbox-header tr.z-auxhead {
+ /* IE9 SVG, needs conditional override of 'filter' to 'none' */
+ background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZmZmZmZiIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNlZGVkZWQiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+);
+ background: -moz-linear-gradient(top, #FFFFFF 0%, #EDEDED 100%); /* FF3.6+ */
+ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #FFFFFF), color-stop(100%, #EDEDED)); /* Chrome,Safari4+ */
+ background: -webkit-linear-gradient(top, #FFFFFF 0%, #EDEDED 100%); /* Chrome10+,Safari5.1+ */
+ background: -o-linear-gradient(top, #FFFFFF 0%, #EDEDED 100%); /* Opera 11.10+ */
+ background: -ms-linear-gradient(top, #FFFFFF 0%, #EDEDED 100%); /* IE10+ */
+ background: linear-gradient(top, #FFFFFF 0%, #EDEDED 100%); /* W3C */
+ filter: none\0/; /* IE9 hack */
+}
+.z-listbox-header-bg {
+ background-image: none;
+ background-color: #CFCFCF;
+}
+tr.z-listitem-seld {
+ /* IE9 SVG, needs conditional override of 'filter' to 'none' */
+ background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2U1ZjRmYiIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNkM2VkZmEiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+);
+ background: -moz-linear-gradient(top, #E5F4FB 0%, #D3EDFA 100%); /* FF3.6+ */
+ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #E5F4FB), color-stop(100%, #D3EDFA)); /* Chrome,Safari4+ */
+ background: -webkit-linear-gradient(top, #E5F4FB 0%, #D3EDFA 100%); /* Chrome10+,Safari5.1+ */
+ background: -o-linear-gradient(top, #E5F4FB 0%, #D3EDFA 100%); /* Opera 11.10+ */
+ background: -ms-linear-gradient(top, #E5F4FB 0%, #D3EDFA 100%); /* IE10+ */
+ background: linear-gradient(top, #E5F4FB 0%, #D3EDFA 100%); /* W3C */
+ filter: none\0/; /* IE9 hack */
+}
+tr.z-listitem-over,
+tr.z-listgroup-over,
+div.z-listbox-header th.z-listheader-sort-over {
+ /* IE9 SVG, needs conditional override of 'filter' to 'none' */
+ background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2Y1ZmNmZSIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNkZGY1ZmQiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+);
+ background: -moz-linear-gradient(top, #F5FCFE 0%, #DDF5FD 100%); /* FF3.6+ */
+ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #F5FCFE), color-stop(100%, #DDF5FD)); /* Chrome,Safari4+ */
+ background: -webkit-linear-gradient(top, #F5FCFE 0%, #DDF5FD 100%); /* Chrome10+,Safari5.1+ */
+ background: -o-linear-gradient(top, #F5FCFE 0%, #DDF5FD 100%); /* Opera 11.10+ */
+ background: -ms-linear-gradient(top, #F5FCFE 0%, #DDF5FD 100%); /* IE10+ */
+ background: linear-gradient(top, #F5FCFE 0%, #DDF5FD 100%); /* W3C */
+ filter: none\0/; /* IE9 hack */
+}
+tr.z-listgroup {
+ /* IE9 SVG, needs conditional override of 'filter' to 'none' */
+ background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZmZmZmZiIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNlOWYyZmIiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+);
+ background: -moz-linear-gradient(top, #FFFFFF 0%, #E9F2FB 100%); /* FF3.6+ */
+ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #FFFFFF), color-stop(100%, #E9F2FB)); /* Chrome,Safari4+ */
+ background: -webkit-linear-gradient(top, #FFFFFF 0%, #E9F2FB 100%); /* Chrome10+,Safari5.1+ */
+ background: -o-linear-gradient(top, #FFFFFF 0%, #E9F2FB 100%); /* Opera 11.10+ */
+ background: -ms-linear-gradient(top, #FFFFFF 0%, #E9F2FB 100%); /* IE10+ */
+ background: linear-gradient(top, #FFFFFF 0%, #E9F2FB 100%); /* W3C */
+ filter: none\0/; /* IE9 hack */
+}
+tr.z-listgroup-seld {
+ /* IE9 SVG, needs conditional override of 'filter' to 'none' */
+ background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2YxZmFmZSIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNkNGYxZmMiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+);
+ background: -moz-linear-gradient(top, #F1FAFE 0%, #D4F1FC 100%); /* FF3.6+ */
+ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #F1FAFE), color-stop(100%, #D4F1FC)); /* Chrome,Safari4+ */
+ background: -webkit-linear-gradient(top, #F1FAFE 0%, #D4F1FC 100%); /* Chrome10+,Safari5.1+ */
+ background: -o-linear-gradient(top, #F1FAFE 0%, #D4F1FC 100%); /* Opera 11.10+ */
+ background: -ms-linear-gradient(top, #F1FAFE 0%, #D4F1FC 100%); /* IE10+ */
+ background: linear-gradient(top, #F1FAFE 0%, #D4F1FC 100%); /* W3C */
+ filter: none\0/; /* IE9 hack */
+}
+tr.z-listgroup-over-seld {
+ /* IE9 SVG, needs conditional override of 'filter' to 'none' */
+ background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2U4ZjZmZCIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNjNmU4ZmEiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+);
+ background: -moz-linear-gradient(top, #E8F6FD 0%, #C6E8FA 100%); /* FF3.6+ */
+ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #E8F6FD), color-stop(100%, #C6E8FA)); /* Chrome,Safari4+ */
+ background: -webkit-linear-gradient(top, #E8F6FD 0%, #C6E8FA 100%); /* Chrome10+,Safari5.1+ */
+ background: -o-linear-gradient(top, #E8F6FD 0%, #C6E8FA 100%); /* Opera 11.10+ */
+ background: -ms-linear-gradient(top, #E8F6FD 0%, #C6E8FA 100%); /* IE10+ */
+ background: linear-gradient(top, #E8F6FD 0%, #C6E8FA 100%); /* W3C */
+ filter: none\0/; /* IE9 hack */
+}
+.z-listgroupfoot {
+ /* IE9 SVG, needs conditional override of 'filter' to 'none' */
+ background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2U5ZjJmYiIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNmZmZmZmYiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+);
+ background: -moz-linear-gradient(top, #E9F2FB 0%, #FFFFFF 100%); /* FF3.6+ */
+ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #E9F2FB), color-stop(100%, #FFFFFF)); /* Chrome,Safari4+ */
+ background: -webkit-linear-gradient(top, #E9F2FB 0%, #FFFFFF 100%); /* Chrome10+,Safari5.1+ */
+ background: -o-linear-gradient(top, #E9F2FB 0%, #FFFFFF 100%); /* Opera 11.10+ */
+ background: -ms-linear-gradient(top, #E9F2FB 0%, #FFFFFF 100%); /* IE10+ */
+ background: linear-gradient(top, #E9F2FB 0%, #FFFFFF 100%); /* W3C */
+ filter: none\0/; /* IE9 hack */
+}
+</c:if>
\ No newline at end of file
Added: trunk/css3breezetheme/WebContent/css/window.css.dsp
===================================================================
--- trunk/css3breezetheme/WebContent/css/window.css.dsp (rev 0)
+++ trunk/css3breezetheme/WebContent/css/window.css.dsp 2011-12-01 04:06:03 UTC (rev 1129)
@@ -0,0 +1,237 @@
+<%@ taglib uri="http://www.zkoss.org/dsp/web/core" prefix="c" %>
+<c:if test="${c:browser('gecko2') || c:browser('ie9') || c:browser('opera') || c:browser('safari')}">
+.z-window-embedded-tl,
+.z-window-overlapped-tl,
+.z-window-popup-tl,
+.z-window-highlighted-tl,
+.z-window-modal-tl,
+.z-window-embedded-tr,
+.z-window-overlapped-tr,
+.z-window-popup-tr,
+.z-window-highlighted-tr,
+.z-window-modal-tr {
+ height: 0;
+ margin: 0;
+ background: none;
+}
+.z-window-embedded-hl,
+.z-window-modal-hl,
+.z-window-highlighted-hl,
+.z-window-overlapped-hl,
+.z-window-popup-hl,
+.z-window-embedded-hr,
+.z-window-modal-hr,
+.z-window-highlighted-hr,
+.z-window-overlapped-hr,
+.z-window-popup-hr {
+ background: none;
+ margin: 0;
+ padding: 0;
+}
+.z-window-embedded-hm,
+.z-window-overlapped-hm,
+.z-window-popup-hm,
+.z-window-highlighted-hm,
+.z-window-modal-hm {
+ border-width: 1px 1px 0;
+ border-style: solid;
+ border-color: rgba(17, 17, 17, 0.4);
+ box-shadow: inset 0 1px 0 #FFFFFF;
+ -moz-box-shadow: inset 0 1px 0 #FFFFFF;
+ -webkit-box-shadow: inset 0 1px 0 #FFFFFF;
+ padding-top: 5px;
+ background: rgba(214, 227, 238, 0.89);
+}
+.z-window-embedded-header,
+.z-window-overlapped-header,
+.z-window-popup-header,
+.z-window-highlighted-header,
+.z-window-modal-header {
+ overflow: hidden;
+ padding: 0 6px 4px;
+ color: #363636;
+ font-weight: bold;
+}
+.z-window-embedded-icon,
+.z-window-overlapped-icon,
+.z-window-popup-icon,
+.z-window-highlighted-icon,
+.z-window-modal-icon {
+ height: 14px;
+ width: 26px;
+ border: 1px solid #CFCFCF;
+ border-radius: 3px;
+ -moz-border-radius: 3px;
+ float: right;
+}
+.z-window-embedded-close,
+.z-window-overlapped-close,
+.z-window-popup-close,
+.z-window-highlighted-close,
+.z-window-modal-close {
+ /* IE9 SVG, needs conditional override of 'filter' to 'none' */
+ background: url('../img/wnd-icon.png') no-repeat scroll -1px -53px, url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZmZmZmZiIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNlZWVlZWUiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+) no-repeat;
+ background: url('../img/wnd-icon.png') no-repeat scroll -1px -53px, -moz-linear-gradient(top, #ffffff 0%, #eeeeee 100%); /* FF3.6+ */
+ background: url('../img/wnd-icon.png') no-repeat scroll -1px -53px, -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(100%,#eeeeee)); /* Chrome,Safari4+ */
+ background: url('../img/wnd-icon.png') no-repeat scroll -1px -53px, -webkit-linear-gradient(top, #ffffff 0%,#eeeeee 100%); /* Chrome10+,Safari5.1+ */
+ background: url('../img/wnd-icon.png') no-repeat scroll -1px -53px, -o-linear-gradient(top, #ffffff 0%,#eeeeee 100%); /* Opera 11.10+ */
+ background: url('../img/wnd-icon.png') no-repeat scroll -1px -53px, -ms-linear-gradient(top, #ffffff 0%,#eeeeee 100%); /* IE10+ */
+ background: url('../img/wnd-icon.png') no-repeat scroll -1px -53px, linear-gradient(top, #ffffff 0%,#eeeeee 100%); /* W3C */
+ filter: none\0/;
+}
+.z-window-embedded-close-over,
+.z-window-overlapped-close-over,
+.z-window-popup-close-over,
+.z-window-highlighted-close-over,
+.z-window-modal-close-over {
+ /* IE9 SVG, needs conditional override of 'filter' to 'none' */
+ background: url('../img/wnd-icon.png') no-repeat scroll -1px -53px, url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2YwZjlmZSIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNkOWYxZmMiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+);
+ background: url('../img/wnd-icon.png') no-repeat scroll -1px -53px, -moz-linear-gradient(top, #f0f9fe 0%, #d9f1fc 100%); /* FF3.6+ */
+ background: url('../img/wnd-icon.png') no-repeat scroll -1px -53px, -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f0f9fe), color-stop(100%,#d9f1fc)); /* Chrome,Safari4+ */
+ background: url('../img/wnd-icon.png') no-repeat scroll -1px -53px, -webkit-linear-gradient(top, #f0f9fe 0%,#d9f1fc 100%); /* Chrome10+,Safari5.1+ */
+ background: url('../img/wnd-icon.png') no-repeat scroll -1px -53px, -o-linear-gradient(top, #f0f9fe 0%,#d9f1fc 100%); /* Opera 11.10+ */
+ background: url('../img/wnd-icon.png') no-repeat scroll -1px -53px, -ms-linear-gradient(top, #f0f9fe 0%,#d9f1fc 100%); /* IE10+ */
+ background: url('../img/wnd-icon.png') no-repeat scroll -1px -53px, linear-gradient(top, #f0f9fe 0%,#d9f1fc 100%); /* W3C */
+ filter: none\0/;
+}
+.z-window-embedded-max,
+.z-window-overlapped-max,
+.z-window-popup-max,
+.z-window-highlighted-max,
+.z-window-modal-max {
+ /* IE9 SVG, needs conditional override of 'filter' to 'none' */
+ background: url('../img/wnd-icon.png') no-repeat scroll -1px -18px, url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZmZmZmZiIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNlZWVlZWUiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+) no-repeat;
+ background: url('../img/wnd-icon.png') no-repeat scroll -1px -18px, -moz-linear-gradient(top, #ffffff 0%, #eeeeee 100%); /* FF3.6+ */
+ background: url('../img/wnd-icon.png') no-repeat scroll -1px -18px, -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(100%,#eeeeee)); /* Chrome,Safari4+ */
+ background: url('../img/wnd-icon.png') no-repeat scroll -1px -18px, -webkit-linear-gradient(top, #ffffff 0%,#eeeeee 100%); /* Chrome10+,Safari5.1+ */
+ background: url('../img/wnd-icon.png') no-repeat scroll -1px -18px, -o-linear-gradient(top, #ffffff 0%,#eeeeee 100%); /* Opera 11.10+ */
+ background: url('../img/wnd-icon.png') no-repeat scroll -1px -18px, ...
[truncated message content] |
|
From: <vin...@us...> - 2011-12-01 03:56:21
|
Revision: 1128
http://zkforge.svn.sourceforge.net/zkforge/?rev=1128&view=rev
Author: vincentjian
Date: 2011-12-01 03:56:15 +0000 (Thu, 01 Dec 2011)
Log Message:
-----------
Initial import.
Added Paths:
-----------
trunk/css3breezetheme/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vin...@us...> - 2011-11-29 08:28:26
|
Revision: 1126
http://zkforge.svn.sourceforge.net/zkforge/?rev=1126&view=rev
Author: vincentjian
Date: 2011-11-29 08:28:16 +0000 (Tue, 29 Nov 2011)
Log Message:
-----------
delete extra files
Removed Paths:
-------------
trunk/zkcss3theme/WebContent/WEB-INF/lib/ckez.jar
trunk/zkcss3theme/WebContent/css/button.css.zip
Deleted: trunk/zkcss3theme/WebContent/WEB-INF/lib/ckez.jar
===================================================================
(Binary files differ)
Deleted: trunk/zkcss3theme/WebContent/css/button.css.zip
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vin...@us...> - 2011-11-29 08:26:12
|
Revision: 1125
http://zkforge.svn.sourceforge.net/zkforge/?rev=1125&view=rev
Author: vincentjian
Date: 2011-11-29 08:26:04 +0000 (Tue, 29 Nov 2011)
Log Message:
-----------
Added Paths:
-----------
trunk/zkcss3theme/.classpath
trunk/zkcss3theme/.project
trunk/zkcss3theme/.settings/
trunk/zkcss3theme/.settings/.jsdtscope
trunk/zkcss3theme/.settings/org.eclipse.jdt.core.prefs
trunk/zkcss3theme/.settings/org.eclipse.wst.common.component
trunk/zkcss3theme/.settings/org.eclipse.wst.common.project.facet.core.xml
trunk/zkcss3theme/.settings/org.eclipse.wst.jsdt.ui.superType.container
trunk/zkcss3theme/.settings/org.eclipse.wst.jsdt.ui.superType.name
trunk/zkcss3theme/.settings/org.zkoss.eclipse.preferences.prefs
trunk/zkcss3theme/WebContent/
trunk/zkcss3theme/WebContent/META-INF/
trunk/zkcss3theme/WebContent/META-INF/MANIFEST.MF
trunk/zkcss3theme/WebContent/WEB-INF/
trunk/zkcss3theme/WebContent/WEB-INF/lib/
trunk/zkcss3theme/WebContent/WEB-INF/lib/breeze.jar
trunk/zkcss3theme/WebContent/WEB-INF/lib/bsh.jar
trunk/zkcss3theme/WebContent/WEB-INF/lib/ckez.jar
trunk/zkcss3theme/WebContent/WEB-INF/lib/commons-collections.jar
trunk/zkcss3theme/WebContent/WEB-INF/lib/commons-fileupload.jar
trunk/zkcss3theme/WebContent/WEB-INF/lib/commons-io.jar
trunk/zkcss3theme/WebContent/WEB-INF/lib/commons-logging.jar
trunk/zkcss3theme/WebContent/WEB-INF/lib/mvel.jar
trunk/zkcss3theme/WebContent/WEB-INF/lib/ognl.jar
trunk/zkcss3theme/WebContent/WEB-INF/lib/zcommon.jar
trunk/zkcss3theme/WebContent/WEB-INF/lib/zcommons-el.jar
trunk/zkcss3theme/WebContent/WEB-INF/lib/zhtml.jar
trunk/zkcss3theme/WebContent/WEB-INF/lib/zk.jar
trunk/zkcss3theme/WebContent/WEB-INF/lib/zkex.jar
trunk/zkcss3theme/WebContent/WEB-INF/lib/zkmax.jar
trunk/zkcss3theme/WebContent/WEB-INF/lib/zkplus.jar
trunk/zkcss3theme/WebContent/WEB-INF/lib/zml.jar
trunk/zkcss3theme/WebContent/WEB-INF/lib/zul.jar
trunk/zkcss3theme/WebContent/WEB-INF/lib/zuljsp.jar
trunk/zkcss3theme/WebContent/WEB-INF/lib/zweb.jar
trunk/zkcss3theme/WebContent/WEB-INF/web.xml
trunk/zkcss3theme/WebContent/WEB-INF/zk.xml
trunk/zkcss3theme/WebContent/button-css3sample.zul
trunk/zkcss3theme/WebContent/combobox-css3sample.zul
trunk/zkcss3theme/WebContent/css/
trunk/zkcss3theme/WebContent/css/button.css.dsp
trunk/zkcss3theme/WebContent/css/button.css.zip
trunk/zkcss3theme/WebContent/css/combobox.css.dsp
trunk/zkcss3theme/WebContent/css/listbox.css.dsp
trunk/zkcss3theme/WebContent/css/window.css.dsp
trunk/zkcss3theme/WebContent/img/
trunk/zkcss3theme/WebContent/img/arrow-toggle.png
trunk/zkcss3theme/WebContent/img/arrows.png
trunk/zkcss3theme/WebContent/img/combo-btn.png
trunk/zkcss3theme/WebContent/img/wnd-icon-old.png
trunk/zkcss3theme/WebContent/img/wnd-icon.png
trunk/zkcss3theme/WebContent/index.zul
trunk/zkcss3theme/WebContent/listbox-css3sample.zul
trunk/zkcss3theme/WebContent/test.zul
trunk/zkcss3theme/WebContent/timeout.zul
trunk/zkcss3theme/WebContent/window-css3sample.zul
trunk/zkcss3theme/src/
Added: trunk/zkcss3theme/.classpath
===================================================================
--- trunk/zkcss3theme/.classpath (rev 0)
+++ trunk/zkcss3theme/.classpath 2011-11-29 08:26:04 UTC (rev 1125)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.6.0_29">
+ <attributes>
+ <attribute name="owner.project.facets" value="java"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v6.0">
+ <attributes>
+ <attribute name="owner.project.facets" value="jst.web"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
+ <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
+ <classpathentry kind="output" path="build/classes"/>
+</classpath>
Added: trunk/zkcss3theme/.project
===================================================================
--- trunk/zkcss3theme/.project (rev 0)
+++ trunk/zkcss3theme/.project 2011-11-29 08:26:04 UTC (rev 1125)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>css3theme</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.zkoss.eclipse.zknature</nature>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+ <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.wst.jsdt.core.jsNature</nature>
+ </natures>
+</projectDescription>
Added: trunk/zkcss3theme/.settings/.jsdtscope
===================================================================
--- trunk/zkcss3theme/.settings/.jsdtscope (rev 0)
+++ trunk/zkcss3theme/.settings/.jsdtscope 2011-11-29 08:26:04 UTC (rev 1125)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="WebContent"/>
+ <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
+ <attributes>
+ <attribute name="hide" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
+ <classpathentry kind="output" path=""/>
+</classpath>
Added: trunk/zkcss3theme/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/zkcss3theme/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/zkcss3theme/.settings/org.eclipse.jdt.core.prefs 2011-11-29 08:26:04 UTC (rev 1125)
@@ -0,0 +1,8 @@
+#Fri Nov 18 16:08:01 CST 2011
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
Added: trunk/zkcss3theme/.settings/org.eclipse.wst.common.component
===================================================================
--- trunk/zkcss3theme/.settings/org.eclipse.wst.common.component (rev 0)
+++ trunk/zkcss3theme/.settings/org.eclipse.wst.common.component 2011-11-29 08:26:04 UTC (rev 1125)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-modules id="moduleCoreId" project-version="1.5.0">
+ <wb-module deploy-name="css3theme">
+ <wb-resource deploy-path="/" source-path="/WebContent" tag="defaultRootSource"/>
+ <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
+ <property name="context-root" value="css3theme"/>
+ <property name="java-output-path" value="/css3theme/build/classes"/>
+ </wb-module>
+</project-modules>
Added: trunk/zkcss3theme/.settings/org.eclipse.wst.common.project.facet.core.xml
===================================================================
--- trunk/zkcss3theme/.settings/org.eclipse.wst.common.project.facet.core.xml (rev 0)
+++ trunk/zkcss3theme/.settings/org.eclipse.wst.common.project.facet.core.xml 2011-11-29 08:26:04 UTC (rev 1125)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+ <runtime name="Apache Tomcat v6.0"/>
+ <fixed facet="jst.web"/>
+ <fixed facet="java"/>
+ <fixed facet="org.zkoss.eclipse.project.zksupports"/>
+ <fixed facet="wst.jsdt.web"/>
+ <installed facet="java" version="1.6"/>
+ <installed facet="jst.web" version="2.5"/>
+ <installed facet="org.zkoss.eclipse.project.zksupports" version="1.0.1"/>
+ <installed facet="wst.jsdt.web" version="1.0"/>
+</faceted-project>
Added: trunk/zkcss3theme/.settings/org.eclipse.wst.jsdt.ui.superType.container
===================================================================
--- trunk/zkcss3theme/.settings/org.eclipse.wst.jsdt.ui.superType.container (rev 0)
+++ trunk/zkcss3theme/.settings/org.eclipse.wst.jsdt.ui.superType.container 2011-11-29 08:26:04 UTC (rev 1125)
@@ -0,0 +1 @@
+org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
Added: trunk/zkcss3theme/.settings/org.eclipse.wst.jsdt.ui.superType.name
===================================================================
--- trunk/zkcss3theme/.settings/org.eclipse.wst.jsdt.ui.superType.name (rev 0)
+++ trunk/zkcss3theme/.settings/org.eclipse.wst.jsdt.ui.superType.name 2011-11-29 08:26:04 UTC (rev 1125)
@@ -0,0 +1 @@
+Window
\ No newline at end of file
Added: trunk/zkcss3theme/.settings/org.zkoss.eclipse.preferences.prefs
===================================================================
--- trunk/zkcss3theme/.settings/org.zkoss.eclipse.preferences.prefs (rev 0)
+++ trunk/zkcss3theme/.settings/org.zkoss.eclipse.preferences.prefs 2011-11-29 08:26:04 UTC (rev 1125)
@@ -0,0 +1,3 @@
+#Fri Nov 18 16:08:02 CST 2011
+eclipse.preferences.version=1
+setting.zk_facet_install_history=<history>\n<module name\="base Module" pid\="zk-bin-eval-5.0.7.1" type\="ZK_RELEASE" >\n<resource prjRelativePath\="WebContent" pseudo\="true" />\n<resource prjRelativePath\="WEB-INF" pseudo\="true" />\n<resource prjRelativePath\="lib" pseudo\="true" />\n<resource size\="272" lastModified\="1320658691550" type\="zxml" pseudo\="false" prjRelativePath\="WebContent/WEB-INF/zk.xml" />\n<resource size\="1949" lastModified\="1321603682509" type\="wxml" pseudo\="false" prjRelativePath\="WebContent/WEB-INF/web.xml" />\n<resource size\="83613" lastModified\="1320658690472" type\="W_R" pseudo\="false" prjRelativePath\="WebContent/WEB-INF/lib/commons-io.jar" />\n<resource size\="57779" lastModified\="1320658690465" type\="W_R" pseudo\="false" prjRelativePath\="WebContent/WEB-INF/lib/commons-fileupload.jar" />\n<resource size\="246565" lastModified\="1320658691340" type\="W_R" pseudo\="false" prjRelativePath\="WebContent/WEB-INF/lib/silvertail.jar" />\n<resource size\="60841" lastModified\="1320658690475" type\="W_R" pseudo\="false" prjRelativePath\="WebContent/WEB-INF/lib/commons-logging.jar" />\n<resource size\="1130070" lastModified\="1320658690788" type\="W_R" pseudo\="false" prjRelativePath\="WebContent/WEB-INF/lib/itext.jar" />\n<resource size\="359025" lastModified\="1320658690415" type\="W_R" pseudo\="false" prjRelativePath\="WebContent/WEB-INF/lib/Filters.jar" />\n<resource size\="1879318" lastModified\="1320658691290" type\="W_R" pseudo\="false" prjRelativePath\="WebContent/WEB-INF/lib/ckez.jar" />\n<resource size\="102009" lastModified\="1320658691380" type\="W_R" pseudo\="false" prjRelativePath\="WebContent/WEB-INF/lib/zcommons-el.jar" />\n<resource size\="234207" lastModified\="1320658691410" type\="W_R" pseudo\="false" prjRelativePath\="WebContent/WEB-INF/lib/zkex.jar" />\n<resource size\="5091376" lastModified\="1320658690549" type\="W_R" pseudo\="false" prjRelativePath\="WebContent/WEB-INF/lib/groovy.jar" />\n<resource size\="289374" lastModified\="1320658691350" type\="W_R" pseudo\="false" prjRelativePath\="WebContent/WEB-INF/lib/timelinez.jar" />\n<resource size\="725735" lastModified\="1320658691080" type\="W_R" pseudo\="false" prjRelativePath\="WebContent/WEB-INF/lib/jxl.jar" />\n<resource size\="8580107" lastModified\="1320658691200" type\="W_R" pseudo\="false" prjRelativePath\="WebContent/WEB-INF/lib/jython.jar" />\n<resource size\="1425744" lastModified\="1320658690904" type\="W_R" pseudo\="false" prjRelativePath\="WebContent/WEB-INF/lib/jfreechart.jar" />\n<resource size\="108375" lastModified\="1320658691410" type\="W_R" pseudo\="false" prjRelativePath\="WebContent/WEB-INF/lib/zkmax.jar" />\n<resource size\="440791" lastModified\="1320658691370" type\="W_R" pseudo\="false" prjRelativePath\="WebContent/WEB-INF/lib/zcommon.jar" />\n<resource size\="1404306" lastModified\="1320658691450" type\="W_R" pseudo\="false" prjRelativePath\="WebContent/WEB-INF/lib/zul.jar" />\n<resource size\="114196" lastModified\="1320658691350" type\="W_R" pseudo\="false" prjRelativePath\="WebContent/WEB-INF/lib/timeplotz.jar" />\n<resource size\="205337" lastModified\="1320658691460" type\="W_R" pseudo\="false" prjRelativePath\="WebContent/WEB-INF/lib/zweb.jar" />\n<resource size\="137539" lastModified\="1320658691360" type\="W_R" pseudo\="false" prjRelativePath\="WebContent/WEB-INF/lib/zuljsp.jar" />\n<resource size\="1428690" lastModified\="1320658691250" type\="W_R" pseudo\="false" prjRelativePath\="WebContent/WEB-INF/lib/poi.jar" />\n<resource size\="13788" lastModified\="1320658691430" type\="W_R" pseudo\="false" prjRelativePath\="WebContent/WEB-INF/lib/zml.jar" />\n<resource size\="309293" lastModified\="1320658690875" type\="W_R" pseudo\="false" prjRelativePath\="WebContent/WEB-INF/lib/jcommon.jar" />\n<resource size\="8801103" lastModified\="1320658691046" type\="W_R" pseudo\="false" prjRelativePath\="WebContent/WEB-INF/lib/jruby.jar" />\n<resource size\="130552" lastModified\="1320658691420" type\="W_R" pseudo\="false" prjRelativePath\="WebContent/WEB-INF/lib/zkplus.jar" />\n<resource size\="1121269" lastModified\="1320658691210" type\="W_R" pseudo\="false" prjRelativePath\="WebContent/WEB-INF/lib/mvel.jar" />\n<resource size\="245279" lastModified\="1320658691260" type\="W_R" pseudo\="false" prjRelativePath\="WebContent/WEB-INF/lib/breeze.jar" />\n<resource size\="1113836" lastModified\="1320658691400" type\="W_R" pseudo\="false" prjRelativePath\="WebContent/WEB-INF/lib/zk.jar" />\n<resource size\="575389" lastModified\="1320658690461" type\="W_R" pseudo\="false" prjRelativePath\="WebContent/WEB-INF/lib/commons-collections.jar" />\n<resource size\="236263" lastModified\="1320658691330" type\="W_R" pseudo\="false" prjRelativePath\="WebContent/WEB-INF/lib/sapphire.jar" />\n<resource size\="97044" lastModified\="1320658691320" type\="W_R" pseudo\="false" prjRelativePath\="WebContent/WEB-INF/lib/gmapsz.jar" />\n<resource size\="1486031" lastModified\="1320658691320" type\="W_R" pseudo\="false" prjRelativePath\="WebContent/WEB-INF/lib/fckez.jar" />\n<resource size\="167958" lastModified\="1320658691220" type\="W_R" pseudo\="false" prjRelativePath\="WebContent/WEB-INF/lib/ognl.jar" />\n<resource size\="59344" lastModified\="1320658691380" type\="W_R" pseudo\="false" prjRelativePath\="WebContent/WEB-INF/lib/zhtml.jar" />\n<resource size\="2635773" lastModified\="1320658690864" type\="W_R" pseudo\="false" prjRelativePath\="WebContent/WEB-INF/lib/jasperreports.jar" />\n<resource size\="281694" lastModified\="1320658690445" type\="W_R" pseudo\="false" prjRelativePath\="WebContent/WEB-INF/lib/bsh.jar" />\n<resource size\="871260" lastModified\="1320658691060" type\="W_R" pseudo\="false" prjRelativePath\="WebContent/WEB-INF/lib/js.jar" />\n</module>\n\n</history>\n
Added: trunk/zkcss3theme/WebContent/META-INF/MANIFEST.MF
===================================================================
--- trunk/zkcss3theme/WebContent/META-INF/MANIFEST.MF (rev 0)
+++ trunk/zkcss3theme/WebContent/META-INF/MANIFEST.MF 2011-11-29 08:26:04 UTC (rev 1125)
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path:
+
Added: trunk/zkcss3theme/WebContent/WEB-INF/lib/breeze.jar
===================================================================
(Binary files differ)
Property changes on: trunk/zkcss3theme/WebContent/WEB-INF/lib/breeze.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/zkcss3theme/WebContent/WEB-INF/lib/bsh.jar
===================================================================
(Binary files differ)
Property changes on: trunk/zkcss3theme/WebContent/WEB-INF/lib/bsh.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/zkcss3theme/WebContent/WEB-INF/lib/ckez.jar
===================================================================
(Binary files differ)
Property changes on: trunk/zkcss3theme/WebContent/WEB-INF/lib/ckez.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/zkcss3theme/WebContent/WEB-INF/lib/commons-collections.jar
===================================================================
(Binary files differ)
Property changes on: trunk/zkcss3theme/WebContent/WEB-INF/lib/commons-collections.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/zkcss3theme/WebContent/WEB-INF/lib/commons-fileupload.jar
===================================================================
(Binary files differ)
Property changes on: trunk/zkcss3theme/WebContent/WEB-INF/lib/commons-fileupload.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/zkcss3theme/WebContent/WEB-INF/lib/commons-io.jar
===================================================================
(Binary files differ)
Property changes on: trunk/zkcss3theme/WebContent/WEB-INF/lib/commons-io.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/zkcss3theme/WebContent/WEB-INF/lib/commons-logging.jar
===================================================================
(Binary files differ)
Property changes on: trunk/zkcss3theme/WebContent/WEB-INF/lib/commons-logging.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/zkcss3theme/WebContent/WEB-INF/lib/mvel.jar
===================================================================
(Binary files differ)
Property changes on: trunk/zkcss3theme/WebContent/WEB-INF/lib/mvel.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/zkcss3theme/WebContent/WEB-INF/lib/ognl.jar
===================================================================
(Binary files differ)
Property changes on: trunk/zkcss3theme/WebContent/WEB-INF/lib/ognl.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/zkcss3theme/WebContent/WEB-INF/lib/zcommon.jar
===================================================================
(Binary files differ)
Property changes on: trunk/zkcss3theme/WebContent/WEB-INF/lib/zcommon.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/zkcss3theme/WebContent/WEB-INF/lib/zcommons-el.jar
===================================================================
(Binary files differ)
Property changes on: trunk/zkcss3theme/WebContent/WEB-INF/lib/zcommons-el.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/zkcss3theme/WebContent/WEB-INF/lib/zhtml.jar
===================================================================
(Binary files differ)
Property changes on: trunk/zkcss3theme/WebContent/WEB-INF/lib/zhtml.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/zkcss3theme/WebContent/WEB-INF/lib/zk.jar
===================================================================
(Binary files differ)
Property changes on: trunk/zkcss3theme/WebContent/WEB-INF/lib/zk.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/zkcss3theme/WebContent/WEB-INF/lib/zkex.jar
===================================================================
(Binary files differ)
Property changes on: trunk/zkcss3theme/WebContent/WEB-INF/lib/zkex.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/zkcss3theme/WebContent/WEB-INF/lib/zkmax.jar
===================================================================
(Binary files differ)
Property changes on: trunk/zkcss3theme/WebContent/WEB-INF/lib/zkmax.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/zkcss3theme/WebContent/WEB-INF/lib/zkplus.jar
===================================================================
(Binary files differ)
Property changes on: trunk/zkcss3theme/WebContent/WEB-INF/lib/zkplus.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/zkcss3theme/WebContent/WEB-INF/lib/zml.jar
===================================================================
(Binary files differ)
Property changes on: trunk/zkcss3theme/WebContent/WEB-INF/lib/zml.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/zkcss3theme/WebContent/WEB-INF/lib/zul.jar
===================================================================
(Binary files differ)
Property changes on: trunk/zkcss3theme/WebContent/WEB-INF/lib/zul.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/zkcss3theme/WebContent/WEB-INF/lib/zuljsp.jar
===================================================================
(Binary files differ)
Property changes on: trunk/zkcss3theme/WebContent/WEB-INF/lib/zuljsp.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/zkcss3theme/WebContent/WEB-INF/lib/zweb.jar
===================================================================
(Binary files differ)
Property changes on: trunk/zkcss3theme/WebContent/WEB-INF/lib/zweb.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/zkcss3theme/WebContent/WEB-INF/web.xml
===================================================================
--- trunk/zkcss3theme/WebContent/WEB-INF/web.xml (rev 0)
+++ trunk/zkcss3theme/WebContent/WEB-INF/web.xml 2011-11-29 08:26:04 UTC (rev 1125)
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ id="WebApp_ID" version="2.5">
+ <display-name>css3theme</display-name>
+ <listener>
+ <description>Used to cleanup when a session is destroyed</description>
+ <display-name>ZK Session cleaner</display-name>
+ <listener-class>org.zkoss.zk.ui.http.HttpSessionListener</listener-class>
+ </listener>
+ <servlet>
+ <description>The ZK loader for ZUML pages</description>
+ <servlet-name>zkLoader</servlet-name>
+ <servlet-class>org.zkoss.zk.ui.http.DHtmlLayoutServlet</servlet-class>
+ <init-param>
+ <param-name>update-uri</param-name>
+ <param-value>/zkau</param-value>
+ </init-param>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+ <servlet>
+ <description>The asynchronous update engine for ZK</description>
+ <servlet-name>auEngine</servlet-name>
+ <servlet-class>org.zkoss.zk.au.http.DHtmlUpdateServlet</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>zkLoader</servlet-name>
+ <url-pattern>*.zul</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>zkLoader</servlet-name>
+ <url-pattern>*.zhtml</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>auEngine</servlet-name>
+ <url-pattern>/zkau/*</url-pattern>
+ </servlet-mapping>
+ <servlet>
+ <servlet-name>dspLoader</servlet-name>
+ <servlet-class>org.zkoss.web.servlet.dsp.InterpreterServlet</servlet-class>
+ <init-param>
+ <param-name>class-resource</param-name>
+ <param-value>true</param-value>
+ </init-param>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>dspLoader</servlet-name>
+ <url-pattern>*.dsp</url-pattern>
+ </servlet-mapping>
+ <welcome-file-list>
+ <welcome-file>index.html</welcome-file>
+ <welcome-file>index.htm</welcome-file>
+ <welcome-file>index.jsp</welcome-file>
+ <welcome-file>default.html</welcome-file>
+ <welcome-file>default.htm</welcome-file>
+ <welcome-file>default.jsp</welcome-file>
+ <welcome-file>index.zul</welcome-file>
+ </welcome-file-list>
+</web-app>
\ No newline at end of file
Added: trunk/zkcss3theme/WebContent/WEB-INF/zk.xml
===================================================================
--- trunk/zkcss3theme/WebContent/WEB-INF/zk.xml (rev 0)
+++ trunk/zkcss3theme/WebContent/WEB-INF/zk.xml 2011-11-29 08:26:04 UTC (rev 1125)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Created by ZK Studio
+-->
+
+<zk>
+ <device-config>
+ <device-type>ajax</device-type>
+ <timeout-uri>/timeout.zul</timeout-uri><!-- An empty URL can cause the browser to reload the same URL -->
+ </device-config>
+</zk>
Added: trunk/zkcss3theme/WebContent/button-css3sample.zul
===================================================================
--- trunk/zkcss3theme/WebContent/button-css3sample.zul (rev 0)
+++ trunk/zkcss3theme/WebContent/button-css3sample.zul 2011-11-29 08:26:04 UTC (rev 1125)
@@ -0,0 +1,10 @@
+<?link rel="stylesheet" type="text/css" href="css/button.css.dsp"?>
+<zk>
+ <vlayout>
+ <separator spacing="1px" />
+ <button label="os mold" mold="os" width="200px" height="50px"/>
+ <separator spacing="1px" />
+ <button label="os mold disabled" mold="os" width="200px" height="50px" disabled="true" />
+ <a href="index.zul">back</a>
+ </vlayout>
+</zk>
\ No newline at end of file
Added: trunk/zkcss3theme/WebContent/combobox-css3sample.zul
===================================================================
--- trunk/zkcss3theme/WebContent/combobox-css3sample.zul (rev 0)
+++ trunk/zkcss3theme/WebContent/combobox-css3sample.zul 2011-11-29 08:26:04 UTC (rev 1125)
@@ -0,0 +1,27 @@
+<?link rel="stylesheet" type="text/css" href="css/combobox.css.dsp"?>
+<zk>
+ <vlayout>
+ <separator spacing="2px"/>
+ Default Mold
+ <combobox>
+ <comboitem label="Simple and Rich"/>
+ <comboitem label="Cool!"/>
+ <comboitem label="Ajax and RIA"/>
+ </combobox>
+ <separator spacing="2px"/>
+ Default Mold: read-only
+ <combobox readonly="true">
+ <comboitem label="Simple and Rich"/>
+ <comboitem label="Cool!"/>
+ <comboitem label="Ajax and RIA"/>
+ </combobox>
+ <separator spacing="2px"/>
+ Default Mold: disabled
+ <combobox disabled="true">
+ <comboitem label="Simple and Rich"/>
+ <comboitem label="Cool!"/>
+ <comboitem label="Ajax and RIA"/>
+ </combobox>
+ <a href="index.zul">back</a>
+ </vlayout>
+</zk>
\ No newline at end of file
Added: trunk/zkcss3theme/WebContent/css/button.css.dsp
===================================================================
--- trunk/zkcss3theme/WebContent/css/button.css.dsp (rev 0)
+++ trunk/zkcss3theme/WebContent/css/button.css.dsp 2011-11-29 08:26:04 UTC (rev 1125)
@@ -0,0 +1,68 @@
+<%@ taglib uri="http://www.zkoss.org/dsp/web/core" prefix="c" %>
+<c:if test="${c:browser('gecko2') || c:browser('ie9') || c:browser('opera') || c:browser('safari')}">
+.z-button-os {
+ color: #FFFFFF;
+ font-weight: bold;
+ text-shadow: 0 -1px 0 rgba(0,0,0,1), 0 0 0 rgba(252,0,21,0);
+ padding: 7px 17px;
+ border: 1px solid #000000;
+ border-radius: 3px;
+ -moz-border-radius: 3px;
+ -webkit-border-radius: 3px;
+ /* IE9 SVG, needs conditional override of 'filter' to 'none' */
+ background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzJlMmUyZSIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiMwMzAzMDMiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+);
+ background: -moz-linear-gradient(top, rgba(46,46,46,1) 0%, rgba(3,3,3,1) 100%); /* FF3.6+ */
+ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(46,46,46,1)), color-stop(100%,rgba(3,3,3,1))); /* Chrome,Safari4+ */
+ background: -webkit-linear-gradient(top, rgba(46,46,46,1) 0%,rgba(3,3,3,1) 100%); /* Chrome10+,Safari5.1+ */
+ background: -o-linear-gradient(top, rgba(46,46,46,1) 0%,rgba(3,3,3,1) 100%); /* Opera 11.10+ */
+ background: -ms-linear-gradient(top, rgba(46,46,46,1) 0%,rgba(3,3,3,1) 100%); /* IE10+ */
+ background: linear-gradient(top, rgba(46,46,46,1) 0%,rgba(3,3,3,1) 100%); /* W3C */
+ filter: none\0/;
+ box-shadow: 0 3px 0 rgba(0,0,0,1), inset 0 0 1px rgba(255,255,255,0.6);
+ -moz-box-shadow: 0 3px 0 rgba(0,0,0,1), inset 0 0 1px rgba(255,255,255,0.6);
+ -webkit-box-shadow: 0 3px 0 rgba(0,0,0,1), inset 0 0 1px rgba(255,255,255,0.6);
+ cursor: pointer;
+}
+.z-button-os:hover {
+ color: #61e7f3;
+ background: rgb(64,64,64); /* Old browsers */
+ /* IE9 SVG, needs conditional override of 'filter' to 'none' */
+ background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzQwNDA0MCIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiMwZTBlMGUiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+);
+ background: -moz-linear-gradient(top, rgba(64,64,64,1) 0%, rgba(14,14,14,1) 100%); /* FF3.6+ */
+ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(64,64,64,1)), color-stop(100%,rgba(14,14,14,1))); /* Chrome,Safari4+ */
+ background: -webkit-linear-gradient(top, rgba(64,64,64,1) 0%,rgba(14,14,14,1) 100%); /* Chrome10+,Safari5.1+ */
+ background: -o-linear-gradient(top, rgba(64,64,64,1) 0%,rgba(14,14,14,1) 100%); /* Opera 11.10+ */
+ background: -ms-linear-gradient(top, rgba(64,64,64,1) 0%,rgba(14,14,14,1) 100%); /* IE10+ */
+ background: linear-gradient(top, rgba(64,64,64,1) 0%,rgba(14,14,14,1) 100%); /* W3C */
+ filter: none\0/; /* IE9 */
+}
+.z-button-os:active {
+ margin: 3px 0 -3px 0;
+ padding: 7px 17px;
+ background: rgb(23,23,23); /* Old browsers */
+ /* IE9 SVG, needs conditional override of 'filter' to 'none' */
+ background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzE3MTcxNyIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiMyNjI2MjYiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+);
+ background: -moz-linear-gradient(top, rgba(23,23,23,1) 0%, rgba(38,38,38,1) 100%); /* FF3.6+ */
+ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(23,23,23,1)), color-stop(100%,rgba(38,38,38,1))); /* Chrome,Safari4+ */
+ background: -webkit-linear-gradient(top, rgba(23,23,23,1) 0%,rgba(38,38,38,1) 100%); /* Chrome10+,Safari5.1+ */
+ background: -o-linear-gradient(top, rgba(23,23,23,1) 0%,rgba(38,38,38,1) 100%); /* Opera 11.10+ */
+ background: -ms-linear-gradient(top, rgba(23,23,23,1) 0%,rgba(38,38,38,1) 100%); /* IE10+ */
+ background: linear-gradient(top, rgba(23,23,23,1) 0%,rgba(38,38,38,1) 100%); /* W3C */
+ filter: none\0/; /* IE9 */
+ box-shadow: 0 1px 0 rgba(255,255,255,0.5), inset 0 0 1px rgba(255,255,255,0.6);
+ -moz-box-shadow: 0 1px 0 rgba(255,255,255,0.5), inset 0 0 1px rgba(255,255,255,0.6);
+ -webkit-box-shadow: 0 1px 0 rgba(255,255,255,0.5), inset 0 0 1px rgba(255,255,255,0.6);
+}
+.z-button-os.z-button-os-disd {
+ cursor: default;
+ color: #2e2e2e;
+ background: #151515;
+ box-shadow: none;
+ -moz-box-shadow: none;
+ -webkit-box-shadow: none;
+}
+.z-button-os.z-button-os-disd:active {
+ margin: 0;
+ left: 0;
+}
+</c:if>
\ No newline at end of file
Added: trunk/zkcss3theme/WebContent/css/button.css.zip
===================================================================
(Binary files differ)
Property changes on: trunk/zkcss3theme/WebContent/css/button.css.zip
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/zkcss3theme/WebContent/css/combobox.css.dsp
===================================================================
--- trunk/zkcss3theme/WebContent/css/combobox.css.dsp (rev 0)
+++ trunk/zkcss3theme/WebContent/css/combobox.css.dsp 2011-11-29 08:26:04 UTC (rev 1125)
@@ -0,0 +1,97 @@
+<%@ taglib uri="http://www.zkoss.org/dsp/web/core" prefix="c" %>
+<c:if test="${c:browser('gecko2') || c:browser('ie9') || c:browser('opera') || c:browser('safari')}">
+.z-combobox {
+ background: none;
+}
+.z-combobox-inp,
+.z-combobox-focus .z-combobox-readonly {
+ /* IE9 SVG, needs conditional override of 'filter' to 'none' */
+ background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzNmM2YzZiIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjYwJSIgc3RvcC1jb2xvcj0iIzEzMTMxMyIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiMwMDAwMDAiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+);
+ background: -moz-linear-gradient(top, #3f3f3f 0%, #131313 60%, #000000 100%); /* FF3.6+ */
+ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#3f3f3f), color-stop(60%,#131313), color-stop(100%,#000000)); /* Chrome,Safari4+ */
+ background: -webkit-linear-gradient(top, #3f3f3f 0%,#131313 60%,#000000 100%); /* Chrome10+,Safari5.1+ */
+ background: -o-linear-gradient(top, #3f3f3f 0%,#131313 60%,#000000 100%); /* Opera 11.10+ */
+ background: -ms-linear-gradient(top, #3f3f3f 0%,#131313 60%,#000000 100%); /* IE10+ */
+ background: linear-gradient(top, #3f3f3f 0%,#131313 60%,#000000 100%); /* W3C */
+ filter: none\0/; /* IE9 hack */
+}
+.z-combobox .z-combobox-btn,
+.z-combobox .z-combobox-btn-over,
+.z-combobox-focus .z-combobox-btn-clk, .z-combobox .z-combobox-btn-clk,
+.z-combobox-focus .z-combobox-btn,
+.z-combobox-readonly ~ .z-combobox-btn
+.z-combobox-focus .z-combobox-btn-over,
+.z-combobox-readonly ~ .z-combobox-btn-over {
+ /* IE9 SVG, needs conditional override of 'filter' to 'none' */
+ background: url('../img/combo-btn.png') no-repeat 13px 9px, url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzNmM2YzZiIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjYwJSIgc3RvcC1jb2xvcj0iIzEzMTMxMyIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiMwMzAzMDMiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+);
+ background: url('../img/combo-btn.png') no-repeat 13px 9px, -moz-linear-gradient(top, #3f3f3f 0%, #131313 60%, #030303 100%); /* FF3.6+ */
+ background: url('../img/combo-btn.png') no-repeat 13px 9px, -webkit-gradient(linear, left top, left bottom, color-stop(0%,#3f3f3f), color-stop(60%,#131313), color-stop(100%,#030303)); /* Chrome,Safari4+ */
+ background: url('../img/combo-btn.png') no-repeat 13px 9px, -webkit-linear-gradient(top, #3f3f3f 0%,#131313 60%,#030303 100%); /* Chrome10+,Safari5.1+ */
+ background: url('../img/combo-btn.png') no-repeat 13px 9px, -o-linear-gradient(top, #3f3f3f 0%,#131313 60%,#030303 100%); /* Opera 11.10+ */
+ background: url('../img/combo-btn.png') no-repeat 13px 9px, -ms-linear-gradient(top, #3f3f3f 0%,#131313 60%,#030303 100%); /* IE10+ */
+ background: url('../img/combo-btn.png') no-repeat 13px 9px, linear-gradient(top, #3f3f3f 0%,#131313 60%,#030303 100%); /* W3C */
+ filter: none\0/; /* IE9 hack */
+}
+.z-combobox-inp {
+ height: 30px;
+ padding: 2px 0 2px 4px;
+ font-size: 20px;
+ color: #FFFFFF;
+ border: 1px solid #000000;
+ border-radius: 3px 0 0 3px;
+ -moz-border-radius: 3px 0 0 3px;
+ -webkit-border-radius: 3px 0 0 3px;
+ -moz-box-shadow: inset 1px 1px 0 #585858, inset -1px -1px 0 #0F0F0F;
+ -webkit-box-shadow: inset 1px 1px 0 #585858, inset -1px -1px 0 #0F0F0F;
+ box-shadow: inset 1px 1px 0 #585858, inset -1px -1px 0 #0F0F0F;
+}
+.z-combobox-focus .z-combobox-inp {
+ border: 1px solid #000000;
+ margin: 0;
+}
+.z-combobox .z-combobox-btn {
+ height: 34px;
+ width: 30px;
+ border: 1px solid #000000;
+ border-left: 0;
+ border-radius: 0 3px 3px 0;
+ -moz-border-radius: 0 3px 3px 0;
+ -webkit-border-radius: 0 3px 3px 0;
+ -moz-box-shadow: inset 1px 1px 0 #585858, inset -1px -1px 0 #0F0F0F;
+ -webkit-box-shadow: inset 1px 1px 0 #585858, inset -1px -1px 0 #0F0F0F;
+ box-shadow: inset 1px 1px 0 #585858, inset -1px -1px 0 #0F0F0F;
+}
+.z-combobox .z-combobox-btn-over {
+ margin: 0;
+}
+.z-combobox-focus .z-combobox-btn,
+.z-combobox-readonly ~ .z-combobox-btn {
+ border-left: 0px;
+}
+.z-combobox-readonly {
+ border-color: #000000;
+}
+.z-combobox-focus .z-combobox-readonly {
+ border: 1px solid #000000;
+ padding-right: 0px;
+}
+.z-combobox-pp {
+ border: 1px solid #000000;
+ background-color: rgba(19,19,19,0.9);
+}
+.z-combobox-pp .z-comboitem,
+.z-combobox-pp .z-comboitem a,
+.z-combobox-pp .z-comboitem a:visited {
+ color: #FFFFFF;
+ background-color: rgba(19,19,19,0.9);
+}
+.z-comboitem .z-comboitem-text {
+ border: 1px solid #1F1F1F;
+ padding: 4px 0;
+}
+.z-combobox-pp .z-comboitem-over,
+.z-combobox-pp .z-comboitem-seld {
+ color: #2BCCDA;
+ background-color: #000000;
+}
+</c:if>
\ No newline at end of file
Added: trunk/zkcss3theme/WebContent/css/listbox.css.dsp
===================================================================
--- trunk/zkcss3theme/WebContent/css/listbox.css.dsp (rev 0)
+++ trunk/zkcss3theme/WebContent/css/listbox.css.dsp 2011-11-29 08:26:04 UTC (rev 1125)
@@ -0,0 +1,131 @@
+<%@ taglib uri="http://www.zkoss.org/dsp/web/core" prefix="c" %>
+<c:if test="${c:browser('gecko2') || c:browser('ie9') || c:browser('opera') || c:browser('safari')}">
+div.z-listbox,
+div.z-listbox-header tr.z-listhead, div.z-listbox-header tr.z-auxhead {
+ border: 1px solid #000000;
+ /* IE9 SVG, needs conditional override of 'filter' to 'none' */
+ background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzNmM2YzZiIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjYwJSIgc3RvcC1jb2xvcj0iIzEzMTMxMyIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiMwMDAwMDAiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+);
+ background: -moz-linear-gradient(top, #3F3F3F 0%, #131313 60%, #000000 100%); /* FF3.6+ */
+ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#3F3F3F), color-stop(60%,#131313), color-stop(100%,#000000)); /* Chrome,Safari4+ */
+ background: -webkit-linear-gradient(top, #3F3F3F 0%, #131313 60%, #000000 100%); /* Chrome10+,Safari5.1+ */
+ background: -o-linear-gradient(top, #3F3F3F 0%, #131313 60%, #000000 100%); /* Opera 11.10+ */
+ background: -ms-linear-gradient(top, #3F3F3F 0%, #131313 60%, #000000 100%); /* IE10+ */
+ background: linear-gradient(top, #3F3F3F 0%, #131313 60%, #000000 100%); /* W3C */
+ filter: none\0/; /* IE9 hack */
+}
+div.z-listbox-header th.z-listheader, div.z-listbox-header th.z-auxheader {
+ border-color: #585858 #1F1F1F;
+ border-style: solid solid none;
+ border-width: 1px 1px 0 0;
+}
+div.z-listfooter-cnt,
+div.z-listcell-cnt,
+div.z-listheader-cnt,
+td.z-listgroup-inner div.z-listcell-cnt,
+td.z-listgroupfoot-inner div.z-listcell-cnt {
+ color: #D0D0D0;
+}
+div.z-listbox-header th.z-listheader-sort-over div.z-listheader-cnt,
+tr.z-listitem-over div.z-listfooter-cnt,
+tr.z-listitem-over div.z-listcell-cnt,
+tr.z-listitem-over div.z-listheader-cnt,
+tr.z-listitem-seld div.z-listfooter-cnt,
+tr.z-listitem-seld div.z-listcell-cnt,
+tr.z-listitem-seld div.z-listheader-cnt {
+ color: #61E6F3;
+}
+.z-listheader-sort .z-listheader-sort-img {
+ margin-top: 0;
+ height: 0;
+ width: 0;
+}
+.z-listheader-sort-asc .z-listheader-sort-img,
+.z-listheader-sort-dsc .z-listheader-sort-img {
+ background: none;
+ border-style: solid;
+ border-width: 4px;
+ height: 0;
+ width: 0;
+}
+.z-listheader-sort-asc .z-listheader-sort-img {
+ margin-top: -8px;
+ border-color: transparent transparent #D0D0D0 transparent;
+}
+.z-listheader-sort-dsc .z-listheader-sort-img {
+ margin-top: -3px;
+ border-color: #D0D0D0 transparent transparent transparent;
+}
+.z-listbox-header-bg {
+ background-image: none;
+ background-color: #1F1F1F;
+}
+.z-listitem {
+ background: #131313;
+}
+tr.z-listbox-odd {
+ background: #0D0D0D;
+}
+td.z-listcell,
+tr.z-listgroup td.z-listgroup-inner {
+ border: 1px solid #000000;
+ -moz-box-shadow: 1px 1px 0 #1F1F1F;
+ -webkit-box-shadow: 1px 1px 0 #1F1F1F;
+ box-shadow: inset 1px 1px 0 #1F1F1F;
+}
+tr.z-listitem-seld,
+tr.z-listbox-odd tr.z-listitem-seld {
+ background: #000000;
+}
+tr.z-listitem-over,
+tr.z-listgroup-over,
+
+tr.z-listbox-odd tr.z-listitem-over,
+tr.z-listbox-odd tr.z-listgroup-over {
+ background: #000000;
+}
+div.z-listbox-header th.z-listheader-sort-over,
+tr.z-listbox-odd div.z-listbox-header th.z-listheader-sort-over {
+ /* IE9 SVG, needs conditional override of 'filter' to 'none' */
+ background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzRmNGY0ZiIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjYwJSIgc3RvcC1jb2xvcj0iIzFjMWMxYyIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiMwMDAwMDAiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+);
+ background: -moz-linear-gradient(top, #4f4f4f 0%, #1c1c1c 60%, #000000 100%); /* FF3.6+ */
+ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#4f4f4f), color-stop(60%,#1c1c1c), color-stop(100%,#000000)); /* Chrome,Safari4+ */
+ background: -webkit-linear-gradient(top, #4f4f4f 0%,#1c1c1c 60%,#000000 100%); /* Chrome10+,Safari5.1+ */
+ background: -o-linear-gradient(top, #4f4f4f 0%,#1c1c1c 60%,#000000 100%); /* Opera 11.10+ */
+ background: -ms-linear-gradient(top, #4f4f4f 0%,#1c1c1c 60%,#000000 100%); /* IE10+ */
+ background: linear-gradient(top, #4f4f4f 0%,#1c1c1c 60%,#000000 100%); /* W3C */
+ filter: none\0/; /* IE9 hack */
+}
+tr.z-listgroup,
+.z-listgroupfoot {
+ /* IE9 SVG, needs conditional override of 'filter' to 'none' */
+ background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzQ1NDg0ZCIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiMwMDAwMDAiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+);
+ background: -moz-linear-gradient(top, #45484d 0%, #000000 100%); /* FF3.6+ */
+ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#45484d), color-stop(100%,#000000)); /* Chrome,Safari4+ */
+ background: -webkit-linear-gradient(top, #45484d 0%,#000000 100%); /* Chrome10+,Safari5.1+ */
+ background: -o-linear-gradient(top, #45484d 0%,#000000 100%); /* Opera 11.10+ */
+ background: -ms-linear-gradient(top, #45484d 0%,#000000 100%); /* IE10+ */
+ background: linear-gradient(top, #45484d 0%,#000000 100%); /* W3C */
+ filter: none\0/; /* IE9 hack */
+}
+tr.z-listgroup-seld {
+ background-color: #000000;
+ background-image: none;
+}
+tr.z-listgroup-over-seld {
+ background-color: #000000;
+ background-image: none;
+}
+.z-listgroup-img {
+ background-image: url('../img/arrow-toggle.png');
+}
+tr.z-listitem-over > td.z-listcell {
+ border: 1px solid #000000;
+}
+div.z-listbox-footer {
+ border-top: 2px solid #3B3F39;
+}
+div.z-listbox-footer .z-listfooter {
+ background-image: none;
+ background-color: #0F0F0F;
+}
+</c:if>
\ No newline at end of file
Added: trunk/zkcss3theme/WebContent/css/window.css.dsp
===================================================================
--- trunk/zkcss3theme/WebContent/css/window.css.dsp (rev 0)
+++ trunk/zkcss3theme/WebContent/css/window.css.dsp 2011-11-29 08:26:04 UTC (rev 1125)
@@ -0,0 +1,213 @@
+<%@ taglib uri="http://www.zkoss.org/dsp/web/core" prefix="c" %>
+<c:if test="${c:browser('gecko2') || c:browser('ie9') || c:browser('opera') || c:browser('safari')}">
+.z-window-embedded-tl,
+.z-window-overlapped-tl,
+.z-window-popup-tl,
+.z-window-highlighted-tl,
+.z-window-modal-tl,
+.z-window-embedded-tr,
+.z-window-overlapped-tr,
+.z-window-popup-tr,
+.z-window-highlighted-tr,
+.z-window-modal-tr {
+ height: 5px;
+ margin: 0;
+ background: none;
+}
+.z-window-embedded-tl,
+.z-window-overlapped-tl,
+.z-window-popup-tl,
+.z-window-highlighted-tl,
+.z-window-modal-tl {
+ border-width: 1px 1px 0;
+ border-style: solid;
+ border-color: #000000;
+ border-radius: 5px 5px 0 0;
+ -moz-border-radius: 5px 5px 0 0;
+ -webkit-border-radius: 5px 5px 0 0;
+}
+.z-window-embedded-tr,
+.z-window-overlapped-tr,
+.z-window-popup-tr,
+.z-window-highlighted-tr,
+.z-window-modal-tr {
+ border-width: 1px 1px 0;
+ border-style: solid;
+ border-color: #595959 #0C0C0C;
+ border-radius: 5px 5px 0 0;
+ -moz-border-radius: 5px 5px 0 0;
+ -webkit-border-radius: 5px 5px 0 0;
+ background-color: #2f2f2f;
+}
+.z-window-embedded-hl,
+.z-window-modal-hl,
+.z-window-highlighted-hl,
+.z-window-overlapped-hl,
+.z-window-popup-hl {
+ border-width: 0 1px;
+ border-style: solid;
+ border-color: #000000;
+ padding-left: 0;
+}
+.z-window-embedded-hr,
+.z-window-modal-hr,
+.z-window-highlighted-hr,
+.z-window-overlapped-hr,
+.z-window-popup-hr {
+ border-width: 0 1px 1px;
+ border-style: solid;
+ border-color: #595959 #0C0C0C #0C0C0C;
+ padding-right: 0;
+}
+.z-window-embedded-hm,
+.z-window-overlapped-hm,
+.z-window-popup-hm,
+.z-window-highlighted-hm,
+.z-window-modal-hm {
+ /* IE9 SVG, needs conditional override of 'filter' to 'none' */
+ background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzJmMmYyZiIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjI1JSIgc3RvcC1jb2xvcj0iIzFkMWQxZCIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiMwMjAyMDIiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+) no-repeat;
+ background: -moz-linear-gradient(top, #2f2f2f 0%, #1d1d1d 25%, #020202 100%); /* FF3.6+ */
+ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#2f2f2f), color-stop(25%,#1d1d1d), color-stop(100%,#020202)); /* Chrome,Safari4+ */
+ background: -webkit-linear-gradient(top, #2f2f2f 0%,#1d1d1d 25%,#020202 100%); /* Chrome10+,Safari5.1+ */
+ background: -o-linear-gradient(top, #2f2f2f 0%,#1d1d1d 25%,#020202 100%); /* Opera 11.10+ */
+ background: -ms-linear-gradient(top, #2f2f2f 0%,#1d1d1d 25%,#020202 100%); /* IE10+ */
+ background: linear-gradient(top, #2f2f2f 0%,#1d1d1d 25%,#020202 100%); /* W3C */
+ filter: none\0/; /*IE9 hack*/
+}
+.z-window-embedded-header,
+.z-window-overlapped-header,
+.z-window-popup-header,
+.z-window-highlighted-header,
+.z-window-modal-header {
+ overflow: hidden;
+ padding: 0 8px 4px;
+ color: #D0D0D0;
+ font-weight: bold;
+ text-align: center;
+}
+.z-window-embedded-icon,
+.z-window-overlapped-icon,
+.z-window-popup-icon,
+.z-window-highlighted-icon,
+.z-window-modal-icon {
+ width: 16px;
+ height: 16px;
+ float: left;
+}
+.z-window-embedded-close,
+.z-window-overlapped-close,
+.z-window-popup-close,
+.z-window-highlighted-close,
+.z-window-modal-close {
+ background: url('../img/wnd-icon.png') no-repeat scroll 0 0;
+}
+.z-window-embedded-close-over,
+.z-window-overlapped-close-over,
+.z-window-popup-close-over,
+.z-window-highlighted-close-over,
+.z-window-modal-close-over {
+ background: url('../img/wnd-icon.png') no-repeat scroll 0 -16px;
+}
+.z-window-embedded-max,
+.z-window-overlapped-max,
+.z-window-popup-max,
+.z-window-highlighted-max,
+.z-window-modal-max,
+.z-window-embedded-maxd,
+.z-window-overlapped-maxd,
+.z-window-popup-maxd,
+.z-window-highlighted-maxd,
+.z-window-modal-maxd {
+ background: url('../img/wnd-icon.png') no-repeat scroll -16px 0;
+}
+.z-window-embedded-max-over,
+.z-window-overlapped-max-over,
+.z-window-popup-max-over,
+.z-window-highlighted-max-over,
+.z-window-modal-max-over,
+.z-window-embedded-maxd-over,
+.z-window-overlapped-maxd-over,
+.z-window-popup-maxd-over,
+.z-window-highlighted-maxd-over,
+.z-window-modal-maxd-over {
+ background: url('../img/wnd-icon.png') no-repeat scroll -16px -16px;
+}
+.z-window-embedded-min,
+.z-window-overlapped-min,
+.z-window-popup-min,
+.z-window-highlighted-min,
+.z-window-modal-min {
+ background: url('../img/wnd-icon.png') no-repeat scroll -32px 0;
+}
+.z-window-embedded-min-over,
+.z-window-overlapped-min-over,
+.z-window-popup-min-over,
+.z-window-highlighted-min-over,
+.z-window-modal-min-over {
+ background: url('../img/wnd-icon.png') no-repeat scroll -32px -16px;
+}
+.z-window-embedded-cl,
+.z-window-overlapped-cl,
+.z-window-highlighted-cl,
+.z-window-modal-cl {
+ border-width: 1px 1px 0;
+ border-style: solid;
+ border-color: #000000;
+ background: #000000;
+ padding-left: 0;
+}
+.z-window-embedded-cr,
+.z-window-overlapped-cr,
+.z-window-highlighted-cr,
+.z-window-modal-cr {
+ padding-right: 0px;
+}
+.z-window-embedded-cm,
+.z-window-overlapped-cm,
+.z-window-highlighted-cm,
+.z-window-modal-cm {
+ background-color: #141414;
+ border: none;
+ padding: 1px 1px 0;
+ margin: 0;
+}
+.z-window-embedded-cnt,
+.z-window-overlapped-cnt,
+.z-window-popup-cnt,
+.z-window-highlighted-cnt,
+.z-window-modal-cnt {
+ background-color: #141414;
+ border-width: 1px 1px 1px 60px;
+ border-style: solid;
+ border-color: #000000;
+ padding: 4px;
+ overflow: hidden;
+ color: #FFFFFF;
+ word-wrap: break-word;
+ margin: 0;
+}
+.z-window-popup-cnt {
+ border: 1px solid rgba(17, 17, 17, 0.4);
+}
+.z-window-embedded-bl,
+.z-window-overlapped-bl,
+.z-window-highlighted-bl,
+.z-window-modal-bl,
+.z-window-embedded-br,
+.z-window-overlapped-br,
+.z-window-highlighted-br,
+.z-window-modal-br {
+ margin: 0;
+ background: none;
+}
+.z-window-embedded-br,
+.z-window-overlapped-br,
+.z-window-highlighted-br,
+.z-window-modal-br {
+ border-width: 0 1px 1px;
+ border-style: solid;
+ border-color: #000000;
+ background-color: #141414;
+ height: 1px;
+}
+</c:if>
\ No newline at end of file
Added: trunk/zkcss3theme/WebContent/img/arrow-toggle.png
===================================================================
(Binary files differ)
Property changes on: trunk/zkcss3theme/WebContent/img/arrow-toggle.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/zkcss3theme/WebContent/img/arrows.png
===================================================================
(Binary files differ)
Property changes on: trunk/zkcss3theme/WebContent/img/arrows.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/zkcss3theme/WebContent/img/combo-btn.png
===================================================================
(Binary files differ)
Property changes on: trunk/zkcss3theme/WebContent/img/combo-btn.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/zkcss3theme/WebContent/img/wnd-icon-old.png
===================================================================
(Binary files differ)
Property changes on: trunk/zkcss3theme/WebContent/img/wnd-icon-old.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/zkcss3theme/WebContent/img/wnd-icon.png
===================================================================
(Binary files differ)
Property changes on: trunk/zkcss3theme/WebContent/img/wnd-icon.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/zkcss3theme/WebContent/index.zul
===================================================================
--- trunk/zkcss3theme/WebContent/index.zul (rev 0)
+++ trunk/zkcss3theme/WebContent/index.zul 2011-11-29 08:26:04 UTC (rev 1125)
@@ -0,0 +1,9 @@
+<window title="CSS3 Dark Theme" border="normal" width="200px">
+ <vlayout>
+ <a href="button-css3sample.zul">button sample</a>
+ <a href="window-css3sample.zul">window sample</a>
+ <a href="combobox-css3sample.zul">combobox sample</a>
+ <a href="listbox-css3sample.zul">listbox sample</a>
+ <a href="test.zul">combine all in window</a>
+ </vlayout>
+</window>
\ No newline at end of file
Added: trunk/zkcss3theme/WebContent/listbox-css3sample.zul
===================================================================
--- trunk/zkcss3theme/WebContent/listbox-css3sample.zul (rev 0)
+++ trunk/zkcss3theme/WebContent/listbox-css3sample.zul 2011-11-29 08:26:04 UTC (rev 1125)
@@ -0,0 +1,42 @@
+<?link rel="stylesheet" type="text/css" href="css/listbox.css.dsp"?>
+<zk>
+ <vlayout>
+ <separator spacing="2px"/>
+ Default Mold
+ <listbox id="box1">
+ <listhead sizable="true">
+ <listheader label="name" />
+ <listheader label="gender" sort="auto" />
+ </listhead>
+ <listgroup label="Person"/>
+ <listitem>
+ <listcell label="Mary" />
+ <listcell label="FEMALE" />
+ </listitem>
+ <listitem>
+ <listcell label="John" />
+ <listcell label="MALE" />
+ </listitem>
+ <listitem>
+ <listcell label="John" />
+ <listcell label="MALE" />
+ </listitem>
+ <listitem>
+ <listcell label="John" />
+ <listcell label="MALE" />
+ </listitem>
+ <listgroupfoot>
+ <listcell span="2" label="Total 4 persons"/>
+ </listgroupfoot>
+ <listfoot>
+ <listfooter>
+ <label value="This is footer1" />
+ </listfooter>
+ <listfooter>
+ <label value="This is footer2" />
+ </listfooter>
+ </listfoot>
+ </listbox>
+ <a href="index.zul">back</a>
+ </vlayout>
+</zk>
\ No newline at end of file
Added: trunk/zkcss3theme/WebContent/test.zul
===================================================================
--- trunk/zkcss3theme/WebContent/test.zul (rev 0)
+++ trunk/zkcss3theme/WebContent/test.zul 2011-11-29 08:26:04 UTC (rev 1125)
@@ -0,0 +1,52 @@
+<?link rel="stylesheet" type="text/css" href="css/window.css.dsp"?>
+<?link rel="stylesheet" type="text/css" href="css/button.css.dsp"?>
+<?link rel="stylesheet" type="text/css" href="css/combobox.css.dsp"?>
+<?link rel="stylesheet" type="text/css" href="css/listbox.css.dsp"?>
+<zk>
+<window id="win" title="dark theme" border="normal">
+ <vlayout>
+ <label id="lbl" value="Label: CSS3 Dark Theme" />
+ <button label="Button" mold="os"/>
+ <combobox value="Combobox">
+ <comboitem label="Simple and Rich"/>
+ <comboitem label="Cool!"/>
+ <comboitem label="Ajax and RIA"/>
+ </combobox>
+ <listbox id="box1">
+ <listhead sizable="true">
+ <listheader label="name" />
+ <listheader label="gender" sort="auto" />
+ </listhead>
+ <listgroup label="Person"/>
+ <listitem>
+ <listcell label="Mary" />
+ <listcell label="FEMALE" />
+ </listitem>
+ <listitem>
+ <listcell label="John" />
+ <listcell label="MALE" />
+ </listitem>
+ <listitem>
+ <listcell label="John" />
+ <listcell label="MALE" />
+ </listitem>
+ <listitem>
+ <listcell label="John" />
+ <listcell label="MALE" />
+ </listitem>
+ <listgroupfoot>
+ <listcell span="2" label="Total 4 persons"/>
+ </listgroupfoot>
+ <listfoot>
+ <listfooter>
+ <label value="This is footer1" />
+ </listfooter>
+ <listfooter>
+ <label value="This is footer2" />
+ </listfooter>
+ </listfoot>
+ </listbox>
+ </vlayout>
+</window>
+<a href="index.zul">back</a>
+</zk>
\ No newline at end of file
Added: trunk/zkcss3theme/WebContent/timeout.zul
===================================================================
--- trunk/zkcss3theme/WebContent/timeout.zul (rev 0)
+++ trunk/zkcss3theme/WebContent/timeout.zul 2011-11-29 08:26:04 UTC (rev 1125)
@@ -0,0 +1,7 @@
+<window width="80%" title="Session Timeout" border="normal">
+...
[truncated message content] |
|
From: <sim...@us...> - 2011-11-28 23:31:47
|
Revision: 1123
http://zkforge.svn.sourceforge.net/zkforge/?rev=1123&view=rev
Author: simon_massey
Date: 2011-11-28 23:31:40 +0000 (Mon, 28 Nov 2011)
Log Message:
-----------
upgraded zkfoodtogo to zk5.0.8
Modified Paths:
--------------
trunk/foodToGo/README.txt
trunk/foodToGo/pom.xml
Modified: trunk/foodToGo/README.txt
===================================================================
--- trunk/foodToGo/README.txt 2011-11-22 04:46:32 UTC (rev 1122)
+++ trunk/foodToGo/README.txt 2011-11-28 23:31:40 UTC (rev 1123)
@@ -3,14 +3,14 @@
You need Maven2.2.1 (does not compile with Maven3!) from http://maven.apache.org/ and add it to your PATH environment variable:
-1. Extract the zip file Extract the zip file pia-zk-1.zip that is in the folder foodToGo/dist/pia
+1. Extract the zip file Extract the zip file pia-zk-1.zip that is in the folder foodToGo/dist/pia (e.g. your zip tool might have created another layer of folders)
2. Open a shell (cmd.exe or bash) and cd down into the pia-zk-1.0 folder extracted from the zip which contains a pom.xml
-3. Install pia with "mvn install" (note you will get errors on building some modules but enough builds)
+3. Install pia with "mvn -Dmaven.test.skip=true install" (note you will get errors on building some modules but enough builds)
4. cd back up to the top level folder which contains a pom.xml and build with "mvn install"
5. to run the webapp type "mvn jetty:run" which will leave jetty up and browse to http://localhost:8080 and follow the link
[to kill jetty press Ctrl+c]
-The output of stoep 4 will tell you where it placed the war file.
+The output of step 4 will tell you where it placed the war file.
Simon Massey
Modified: trunk/foodToGo/pom.xml
===================================================================
--- trunk/foodToGo/pom.xml 2011-11-22 04:46:32 UTC (rev 1122)
+++ trunk/foodToGo/pom.xml 2011-11-28 23:31:40 UTC (rev 1123)
@@ -1,5 +1,5 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.zkforge.ftg</groupId>
<artifactId>ZkFoodToGo</artifactId>
@@ -7,61 +7,111 @@
<version>1.0-SNAPSHOT</version>
<name>ZK Food To Go Demo</name>
<url>http://zkforge.sourceforge.net</url>
+ <repositories>
+ <repository>
+ <id>zk repository</id>
+ <url>http://mavensync.zkoss.org/maven2</url>
+ </repository>
+ <repository>
+ <id>jboss-maven2-repository</id>
+ <url>https://repository.jboss.org/nexus/content/groups/public/</url>
+ </repository>
+ <repository>
+ <id>com.springsource.repository.bundles.release</id>
+ <name>SpringSource Enterprise Bundle Repository - SpringSource Bundle Releases</name>
+ <url>http://repository.springsource.com/maven/bundles/release</url>
+ </repository>
+
+ <repository>
+ <id>com.springsource.repository.bundles.external</id>
+ <name>SpringSource Enterprise Bundle Repository - External Bundle Releases</name>
+ <url>http://repository.springsource.com/maven/bundles/external</url>
+ </repository>
+ </repositories>
<properties>
- <zk.version>3.0.5</zk.version>
- <zkel.version>1.0.1</zkel.version>
+ <zk.version>5.0.8</zk.version>
+ <hsqldb.version>1.8.0.10</hsqldb.version>
+ <bsh.version>2.0b4</bsh.version>
+ <hibernate.version>3.6.8.Final</hibernate.version>
+ <javassist.version>3.9.0.GA</javassist.version>
+ <geronimo-spec-jta.version>1.0.1B-rc4</geronimo-spec-jta.version>
+ <spring.version>3.0.6.RELEASE</spring.version>
+ <commons-dbcp.version>1.4</commons-dbcp.version>
</properties>
<dependencies>
<dependency>
<groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
- <version>1.8.0.7</version>
+ <version>${hsqldb.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.beanshell</groupId>
<artifactId>bsh</artifactId>
- <version>2.0b4</version>
+ <version>${bsh.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
- <artifactId>hibernate</artifactId>
- <version>3.2.5.ga</version>
+ <artifactId>hibernate-core</artifactId>
+ <version>${hibernate.version}</version>
<exclusions>
<exclusion>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>${javassist.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-jta</artifactId>
- <version>1.0-M1</version>
+ <version>${geronimo-spec-jta.version}</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
- <version>2.0.7</version>
+ <artifactId>org.springframework.web</artifactId>
+ <version>${spring.version}</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
- <version>1.2.2</version>
+ <version>${commons-dbcp.version}</version>
<exclusions>
<exclusion>
- <groupId>javax.sql</groupId>
- <artifactId>jdbc-stdext</artifactId>
+ <groupId>javax.sql</groupId>
+ <artifactId>jdbc-stdext</artifactId>
</exclusion>
<exclusion>
- <artifactId>jdbc</artifactId>
- <groupId>jdbc</groupId>
+ <artifactId>jdbc</artifactId>
+ <groupId>jdbc</groupId>
</exclusion>
</exclusions>
<scope>runtime</scope>
</dependency>
<dependency>
+ <groupId>org.zkoss.zk</groupId>
+ <artifactId>zkplus</artifactId>
+ <version>${zk.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.zkoss.zk</groupId>
+ <artifactId>zul</artifactId>
+ <version>${zk.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <!-- To avoid any license issues I ask that you build the following from
+ source. To do that unzip dist/pia/pia-zk-1.zip and run "mvn -Dmaven.test.skip=true
+ install" in the folder that has the main pom.xml (e.g. on mac it unzips to
+ dist/pia/pia-zk-1.0) -->
+ <dependency>
<groupId>net.chrisrichardson</groupId>
<artifactId>pia-ch-06-hibernate</artifactId>
<version>1.0-zk-200611005</version>
@@ -93,35 +143,6 @@
<version>1.0-zk-200611005</version>
<scope>runtime</scope>
</dependency>
- <dependency>
- <groupId>org.zkoss.zk</groupId>
- <artifactId>zk</artifactId>
- <version>${zk.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.zkoss.zk</groupId>
- <artifactId>zkplus</artifactId>
- <version>${zk.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.zkoss.zk</groupId>
- <artifactId>zul</artifactId>
- <version>${zk.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.zkoss.zk</groupId>
- <artifactId>zhtml</artifactId>
- <version>${zk.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.zkoss.zkforge.el</groupId>
- <artifactId>zcommons-el</artifactId>
- <version>1.0.1</version>
- </dependency>
</dependencies>
<build>
<finalName>ZkFoodToGo</finalName>
@@ -134,8 +155,8 @@
<target>1.5</target>
</configuration>
</plugin>
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
</plugin>
</plugins>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jim...@us...> - 2011-11-22 04:46:39
|
Revision: 1122
http://zkforge.svn.sourceforge.net/zkforge/?rev=1122&view=rev
Author: jimmyshiau
Date: 2011-11-22 04:46:32 +0000 (Tue, 22 Nov 2011)
Log Message:
-----------
update license
Modified Paths:
--------------
trunk/fckez/pom.xml
Modified: trunk/fckez/pom.xml
===================================================================
--- trunk/fckez/pom.xml 2011-10-24 04:56:37 UTC (rev 1121)
+++ trunk/fckez/pom.xml 2011-11-22 04:46:32 UTC (rev 1122)
@@ -11,10 +11,11 @@
<description>The FCKeditor Component for ZK 2.4.0 or later</description>
<licenses>
<license>
- <name>GNU General Public License, Version 2.0</name>
- <url>http://www.gnu.org/licenses/gpl.html</url>
- <distribution>repo</distribution>
+ <name>GNU Lesser General Public License (LGPL), Version 2.1</name>
+ <url>http://www.gnu.org/licenses/lgpl-2.1.html</url>
+ <distribution>repo</distribution>
</license>
+</licenses>
</licenses>
<scm>
<url>http://zkforge.svn.sourceforge.net/viewvc/zkforge/trunk/fckez</url>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fl...@us...> - 2011-10-24 04:56:43
|
Revision: 1121
http://zkforge.svn.sourceforge.net/zkforge/?rev=1121&view=rev
Author: flynew
Date: 2011-10-24 04:56:37 +0000 (Mon, 24 Oct 2011)
Log Message:
-----------
update web.xml
Modified Paths:
--------------
trunk/zkmail/WEB-INF/web.xml
Modified: trunk/zkmail/WEB-INF/web.xml
===================================================================
--- trunk/zkmail/WEB-INF/web.xml 2011-10-24 04:21:19 UTC (rev 1120)
+++ trunk/zkmail/WEB-INF/web.xml 2011-10-24 04:56:37 UTC (rev 1121)
@@ -1,136 +1,48 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- web.xml
- Purpose:
-
- Description:
-
- History:
- Wed Dec 29 12:13:00 2004, Created by tomyeh
-
-Copyright (C) 2004 Potix Corporation. All Rights Reserved.
--->
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:javaee="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4">
- <javaee:description>ZK Demo</javaee:description>
- <javaee:display-name>zkdemo</javaee:display-name>
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" id="WebApp_ID" version="2.5">
+ <display-name>ewrhse</display-name>
<listener>
- <javaee:description>Used to cleanup when a session is destroyed</javaee:description>
- <javaee:display-name>ZK Session Cleaner</javaee:display-name>
- <javaee:listener-class>org.zkoss.zk.ui.http.HttpSessionListener</javaee:listener-class>
+ <description>
+ Used to cleanup when a session is destroyed</description>
+ <display-name>ZK Session cleaner</display-name>
+ <listener-class>org.zkoss.zk.ui.http.HttpSessionListener</listener-class>
</listener>
<servlet>
- <javaee:description>ZK loader for ZUML pages</javaee:description>
- <servlet-name>zkLoader</servlet-name>
- <servlet-class>org.zkoss.zk.ui.http.DHtmlLayoutServlet</servlet-class>
- <init-param>
- <javaee:param-name>update-uri</javaee:param-name>
- <javaee:param-value>/zkau</javaee:param-value>
- </init-param>
- <load-on-startup>1</load-on-startup>
+ <description>
+ The ZK loader for ZUML pages</description>
+ <servlet-name>zkLoader</servlet-name>
+ <servlet-class>org.zkoss.zk.ui.http.DHtmlLayoutServlet</servlet-class>
+ <init-param>
+ <param-name>update-uri</param-name>
+ <param-value>/zkau</param-value>
+ </init-param>
+ <load-on-startup>1</load-on-startup>
</servlet>
+ <servlet>
+ <description>
+ The asynchronous update engine for ZK</description>
+ <servlet-name>auEngine</servlet-name>
+ <servlet-class>org.zkoss.zk.au.http.DHtmlUpdateServlet</servlet-class>
+ </servlet>
<servlet-mapping>
- <servlet-name>zkLoader</servlet-name>
- <url-pattern>*.zul</url-pattern>
+ <servlet-name>zkLoader</servlet-name>
+ <url-pattern>*.zul</url-pattern>
</servlet-mapping>
<servlet-mapping>
- <servlet-name>zkLoader</servlet-name>
- <url-pattern>*.zhtml</url-pattern>
+ <servlet-name>zkLoader</servlet-name>
+ <url-pattern>*.zhtml</url-pattern>
</servlet-mapping>
<servlet-mapping>
- <servlet-name>zkLoader</servlet-name>
- <url-pattern>/zk/*</url-pattern>
+ <servlet-name>auEngine</servlet-name>
+ <url-pattern>/zkau/*</url-pattern>
</servlet-mapping>
- <servlet>
- <javaee:description>The asynchronous update engine for ZK</javaee:description>
- <servlet-name>auEngine</servlet-name>
- <servlet-class>org.zkoss.zk.au.http.DHtmlUpdateServlet</servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>auEngine</servlet-name>
- <url-pattern>/zkau/*</url-pattern>
- </servlet-mapping>
- <session-config>
- <session-timeout>60</session-timeout>
- </session-config>
- <mime-mapping>
- <extension>doc</extension>
- <mime-type>application/vnd.ms-word</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>gif</extension>
- <mime-type>image/gif</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>htm</extension>
- <mime-type>text/html</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>html</extension>
- <mime-type>text/html</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>jad</extension>
- <mime-type>text/vnd.sun.j2me.app-descriptor</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>jnlp</extension>
- <mime-type>application/x-java-jnlp-file</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>jpeg</extension>
- <mime-type>image/jpeg</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>jpg</extension>
- <mime-type>image/jpeg</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>js</extension>
- <mime-type>application/x-javascript</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>pdf</extension>
- <mime-type>application/pdf</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>png</extension>
- <mime-type>image/png</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>rar</extension>
- <mime-type>application/x-rar-compressed</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>txt</extension>
- <mime-type>text/plain</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>xls</extension>
- <mime-type>application/vnd.ms-excel</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>xml</extension>
- <mime-type>text/xml</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>xul</extension>
- <mime-type>application/vnd.mozilla.xul-xml</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>zhtml</extension>
- <mime-type>text/html</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>zip</extension>
- <mime-type>application/x-zip</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>zul</extension>
- <mime-type>text/html</mime-type>
- </mime-mapping>
<welcome-file-list>
- <welcome-file>index.zul</welcome-file>
- <welcome-file>index.zhtml</welcome-file>
<welcome-file>index.html</welcome-file>
<welcome-file>index.htm</welcome-file>
+ <welcome-file>index.jsp</welcome-file>
+ <welcome-file>default.html</welcome-file>
+ <welcome-file>default.htm</welcome-file>
+ <welcome-file>default.jsp</welcome-file>
+ <welcome-file>index.zul</welcome-file>
</welcome-file-list>
</web-app>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fl...@us...> - 2011-10-24 04:21:26
|
Revision: 1120
http://zkforge.svn.sourceforge.net/zkforge/?rev=1120&view=rev
Author: flynew
Date: 2011-10-24 04:21:19 +0000 (Mon, 24 Oct 2011)
Log Message:
-----------
upgrade to 5.0.9 / add theme selector / fine tune UI
Modified Paths:
--------------
trunk/zkmail/WEB-INF/lib/zcommon.jar
trunk/zkmail/WEB-INF/lib/zcommons-el.jar
trunk/zkmail/WEB-INF/lib/zhtml.jar
trunk/zkmail/WEB-INF/lib/zk.jar
trunk/zkmail/WEB-INF/lib/zkex.jar
trunk/zkmail/WEB-INF/lib/zkmax.jar
trunk/zkmail/WEB-INF/lib/zkplus.jar
trunk/zkmail/WEB-INF/lib/zml.jar
trunk/zkmail/WEB-INF/lib/zul.jar
trunk/zkmail/WEB-INF/lib/zweb.jar
trunk/zkmail/WEB-INF/web.xml
trunk/zkmail/WEB-INF/zk.xml
trunk/zkmail/index.zul
Added Paths:
-----------
trunk/zkmail/WEB-INF/lib/breeze.jar
trunk/zkmail/WEB-INF/lib/sapphire.jar
trunk/zkmail/WEB-INF/lib/silvertail.jar
trunk/zkmail/ga.zul
Removed Paths:
-------------
trunk/zkmail/Mail.zs
trunk/zkmail/WEB-INF/lib/fckez.jar
trunk/zkmail/WEB-INF/lib/gmapsz.jar
trunk/zkmail/WEB-INF/lib/hibernate-annotations.jar
trunk/zkmail/WEB-INF/lib/hibernate3.jar
trunk/zkmail/WEB-INF/lib/jasperreports.jar
trunk/zkmail/WEB-INF/lib/jfreechart.jar
trunk/zkmail/WEB-INF/lib/timelinez.jar
trunk/zkmail/footer.dsp
trunk/zkmail/footer.zul
trunk/zkmail/header.zul
Deleted: trunk/zkmail/Mail.zs
===================================================================
--- trunk/zkmail/Mail.zs 2011-09-25 22:24:47 UTC (rev 1119)
+++ trunk/zkmail/Mail.zs 2011-10-24 04:21:19 UTC (rev 1120)
@@ -1,33 +0,0 @@
-public class Mail{
- String _sender, _email, _subject, _path;
- public Mail(String sender, String email, String subject, String path){
- _sender = sender;
- _email = email;
- _subject = subject;
- _path = path;
- }
- public void setSender(String sender){
- _sender = sender;
- }
- public String getSender(){
- return _sender;
- }
- public String getEmail(){
- return _email;
- }
- public void setEmail(String email){
- _email = email;
- }
- public String getSubject(){
- return _subject;
- }
- public void setSubject(String subject){
- _subject = subject;
- }
- public String getPath(){
- return _path;
- }
- public void setPath(String path){
- _path = path;
- }
-}
Added: trunk/zkmail/WEB-INF/lib/breeze.jar
===================================================================
(Binary files differ)
Property changes on: trunk/zkmail/WEB-INF/lib/breeze.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: trunk/zkmail/WEB-INF/lib/fckez.jar
===================================================================
(Binary files differ)
Deleted: trunk/zkmail/WEB-INF/lib/gmapsz.jar
===================================================================
(Binary files differ)
Deleted: trunk/zkmail/WEB-INF/lib/hibernate-annotations.jar
===================================================================
(Binary files differ)
Deleted: trunk/zkmail/WEB-INF/lib/hibernate3.jar
===================================================================
(Binary files differ)
Deleted: trunk/zkmail/WEB-INF/lib/jasperreports.jar
===================================================================
(Binary files differ)
Deleted: trunk/zkmail/WEB-INF/lib/jfreechart.jar
===================================================================
(Binary files differ)
Added: trunk/zkmail/WEB-INF/lib/sapphire.jar
===================================================================
(Binary files differ)
Property changes on: trunk/zkmail/WEB-INF/lib/sapphire.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/zkmail/WEB-INF/lib/silvertail.jar
===================================================================
(Binary files differ)
Property changes on: trunk/zkmail/WEB-INF/lib/silvertail.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: trunk/zkmail/WEB-INF/lib/timelinez.jar
===================================================================
(Binary files differ)
Modified: trunk/zkmail/WEB-INF/lib/zcommon.jar
===================================================================
(Binary files differ)
Modified: trunk/zkmail/WEB-INF/lib/zcommons-el.jar
===================================================================
(Binary files differ)
Modified: trunk/zkmail/WEB-INF/lib/zhtml.jar
===================================================================
(Binary files differ)
Modified: trunk/zkmail/WEB-INF/lib/zk.jar
===================================================================
(Binary files differ)
Modified: trunk/zkmail/WEB-INF/lib/zkex.jar
===================================================================
(Binary files differ)
Modified: trunk/zkmail/WEB-INF/lib/zkmax.jar
===================================================================
(Binary files differ)
Modified: trunk/zkmail/WEB-INF/lib/zkplus.jar
===================================================================
(Binary files differ)
Modified: trunk/zkmail/WEB-INF/lib/zml.jar
===================================================================
(Binary files differ)
Modified: trunk/zkmail/WEB-INF/lib/zul.jar
===================================================================
(Binary files differ)
Modified: trunk/zkmail/WEB-INF/lib/zweb.jar
===================================================================
(Binary files differ)
Modified: trunk/zkmail/WEB-INF/web.xml
===================================================================
--- trunk/zkmail/WEB-INF/web.xml 2011-09-25 22:24:47 UTC (rev 1119)
+++ trunk/zkmail/WEB-INF/web.xml 2011-10-24 04:21:19 UTC (rev 1120)
@@ -1,231 +1,136 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- web.xml
- Purpose:
-
- Description:
-
- History:
- Wed Dec 29 12:13:00 2004, Created by tomyeh
-
-Copyright (C) 2004 Potix Corporation. All Rights Reserved.
--->
-
-<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-
- <description><![CDATA[ZK Demo]]></description>
- <display-name>zkdemo</display-name>
- <!--
- <icon>
- <small-icon></small-icon>
- <large-icon></large-icon>
- </icon>
- -->
- <!-- Spring ApplicationContext -->
- <!--
- <context-param>
- <param-name>contextConfigLocation</param-name>
- <param-value>/WEB-INF/spring-config.xml</param-value>
- </context-param>
- <listener>
- <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
- </listener>
- -->
- <!-- //// -->
- <!-- ZK -->
- <listener>
- <description>Used to cleanup when a session is destroyed</description>
- <display-name>ZK Session Cleaner</display-name>
- <listener-class>org.zkoss.zk.ui.http.HttpSessionListener</listener-class>
- </listener>
- <servlet>
- <description>ZK loader for ZUML pages</description>
- <servlet-name>zkLoader</servlet-name>
- <servlet-class>org.zkoss.zk.ui.http.DHtmlLayoutServlet</servlet-class>
- <!-- Must. Specifies URI of the update engine (DHtmlUpdateServlet).
- It must be the same as <url-pattern> for the update engine.
- -->
- <init-param>
- <param-name>update-uri</param-name>
- <param-value>/zkau</param-value>
- </init-param>
- <!-- Optional. Specifies whether to compress the output
- of the ZK loader. It speeds up the transmission over slow Internet.
- However, if you configure a filter to post-processing the
- output, you might have to disable it.
-
- Default: true
- <init-param>
- <param-name>compress</param-name>
- <param-value>true</param-value>
- </init-param>
- -->
- <!-- Optional. Specifies the default log level: OFF, ERROR, WARNING,
- INFO, DEBUG and FINER. If not specified, the system default is used.
- <init-param>
- <param-name>log-level</param-name>
- <param-value>OFF</param-value>
- </init-param>
- -->
- <load-on-startup>1</load-on-startup><!-- Must -->
- </servlet>
- <servlet-mapping>
- <servlet-name>zkLoader</servlet-name>
- <url-pattern>*.zul</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>zkLoader</servlet-name>
- <url-pattern>*.zhtml</url-pattern>
- </servlet-mapping>
-
- <!-- Optional. Uncomment it if you want to use richlets.
- -->
- <servlet-mapping>
- <servlet-name>zkLoader</servlet-name>
- <url-pattern>/zk/*</url-pattern>
- </servlet-mapping>
-
- <servlet>
- <description>The asynchronous update engine for ZK</description>
- <servlet-name>auEngine</servlet-name>
- <servlet-class>org.zkoss.zk.au.http.DHtmlUpdateServlet</servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>auEngine</servlet-name>
- <url-pattern>/zkau/*</url-pattern>
- </servlet-mapping>
-
- <!-- Uncomment if you want to use the ZK filter to post process the HTML output
- generated by other technology, such as JSP and velocity.
- <filter>
- <filter-name>zkFilter</filter-name>
- <filter-class>org.zkoss.zk.ui.http.DHtmlLayoutFilter</filter-class>
- <init-param>
- <param-name>extension</param-name>
- <param-value>html</param-value>
- </init-param>
- <init-param>
- <param-name>compress</param-name>
- <param-value>true</param-value>
- </init-param>
- </filter>
- <filter-mapping>
- <filter-name>zkFilter</filter-name>
- <url-pattern>/test/filter.dsp</url-pattern>
- </filter-mapping>
- <filter-mapping>
- <filter-name>zkFilter</filter-name>
- <url-pattern>/test/filter2.dsp</url-pattern>
- </filter-mapping>
- -->
-
- <!-- ///////////// -->
- <!-- DSP (optional) -->
- <!-- Uncomment if you want to use Potix DSP in your Website
- <servlet>
- <servlet-name>dspLoader</servlet-name>
- <servlet-class>org.zkoss.web.servlet.dsp.InterpreterServlet</servlet-class>
- <init-param>
- <param-name>class-resource</param-name>
- <param-value>true</param-value>
- </init-param>
- </servlet>
- <servlet-mapping>
- <servlet-name>dspLoader</servlet-name>
- <url-pattern>*.dsp</url-pattern>
- </servlet-mapping>
- -->
-
- <!-- /////////// -->
- <!-- Miscellaneous -->
- <session-config>
- <session-timeout>60</session-timeout>
- </session-config>
-
- <!-- MIME mapping -->
- <mime-mapping>
- <extension>doc</extension>
- <mime-type>application/vnd.ms-word</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>gif</extension>
- <mime-type>image/gif</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>htm</extension>
- <mime-type>text/html</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>html</extension>
- <mime-type>text/html</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>jad</extension>
- <mime-type>text/vnd.sun.j2me.app-descriptor</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>jnlp</extension>
- <mime-type>application/x-java-jnlp-file</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>jpeg</extension>
- <mime-type>image/jpeg</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>jpg</extension>
- <mime-type>image/jpeg</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>js</extension>
- <mime-type>application/x-javascript</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>pdf</extension>
- <mime-type>application/pdf</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>png</extension>
- <mime-type>image/png</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>rar</extension>
- <mime-type>application/x-rar-compressed</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>txt</extension>
- <mime-type>text/plain</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>xls</extension>
- <mime-type>application/vnd.ms-excel</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>xml</extension>
- <mime-type>text/xml</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>xul</extension>
- <mime-type>application/vnd.mozilla.xul-xml</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>zhtml</extension>
- <mime-type>text/html</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>zip</extension>
- <mime-type>application/x-zip</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>zul</extension>
- <mime-type>text/html</mime-type>
- </mime-mapping>
-
- <welcome-file-list>
- <welcome-file>index.zul</welcome-file>
- <welcome-file>index.zhtml</welcome-file>
- <welcome-file>index.html</welcome-file>
- <welcome-file>index.htm</welcome-file>
- </welcome-file-list>
-</web-app>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- web.xml
+ Purpose:
+
+ Description:
+
+ History:
+ Wed Dec 29 12:13:00 2004, Created by tomyeh
+
+Copyright (C) 2004 Potix Corporation. All Rights Reserved.
+-->
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:javaee="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4">
+ <javaee:description>ZK Demo</javaee:description>
+ <javaee:display-name>zkdemo</javaee:display-name>
+ <listener>
+ <javaee:description>Used to cleanup when a session is destroyed</javaee:description>
+ <javaee:display-name>ZK Session Cleaner</javaee:display-name>
+ <javaee:listener-class>org.zkoss.zk.ui.http.HttpSessionListener</javaee:listener-class>
+ </listener>
+ <servlet>
+ <javaee:description>ZK loader for ZUML pages</javaee:description>
+ <servlet-name>zkLoader</servlet-name>
+ <servlet-class>org.zkoss.zk.ui.http.DHtmlLayoutServlet</servlet-class>
+ <init-param>
+ <javaee:param-name>update-uri</javaee:param-name>
+ <javaee:param-value>/zkau</javaee:param-value>
+ </init-param>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>zkLoader</servlet-name>
+ <url-pattern>*.zul</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>zkLoader</servlet-name>
+ <url-pattern>*.zhtml</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>zkLoader</servlet-name>
+ <url-pattern>/zk/*</url-pattern>
+ </servlet-mapping>
+ <servlet>
+ <javaee:description>The asynchronous update engine for ZK</javaee:description>
+ <servlet-name>auEngine</servlet-name>
+ <servlet-class>org.zkoss.zk.au.http.DHtmlUpdateServlet</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>auEngine</servlet-name>
+ <url-pattern>/zkau/*</url-pattern>
+ </servlet-mapping>
+ <session-config>
+ <session-timeout>60</session-timeout>
+ </session-config>
+ <mime-mapping>
+ <extension>doc</extension>
+ <mime-type>application/vnd.ms-word</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>gif</extension>
+ <mime-type>image/gif</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>htm</extension>
+ <mime-type>text/html</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>html</extension>
+ <mime-type>text/html</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>jad</extension>
+ <mime-type>text/vnd.sun.j2me.app-descriptor</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>jnlp</extension>
+ <mime-type>application/x-java-jnlp-file</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>jpeg</extension>
+ <mime-type>image/jpeg</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>jpg</extension>
+ <mime-type>image/jpeg</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>js</extension>
+ <mime-type>application/x-javascript</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>pdf</extension>
+ <mime-type>application/pdf</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>png</extension>
+ <mime-type>image/png</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>rar</extension>
+ <mime-type>application/x-rar-compressed</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>txt</extension>
+ <mime-type>text/plain</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>xls</extension>
+ <mime-type>application/vnd.ms-excel</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>xml</extension>
+ <mime-type>text/xml</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>xul</extension>
+ <mime-type>application/vnd.mozilla.xul-xml</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>zhtml</extension>
+ <mime-type>text/html</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>zip</extension>
+ <mime-type>application/x-zip</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>zul</extension>
+ <mime-type>text/html</mime-type>
+ </mime-mapping>
+ <welcome-file-list>
+ <welcome-file>index.zul</welcome-file>
+ <welcome-file>index.zhtml</welcome-file>
+ <welcome-file>index.html</welcome-file>
+ <welcome-file>index.htm</welcome-file>
+ </welcome-file-list>
+</web-app>
\ No newline at end of file
Modified: trunk/zkmail/WEB-INF/zk.xml
===================================================================
--- trunk/zkmail/WEB-INF/zk.xml 2011-09-25 22:24:47 UTC (rev 1119)
+++ trunk/zkmail/WEB-INF/zk.xml 2011-10-24 04:21:19 UTC (rev 1120)
@@ -74,25 +74,12 @@
This demo application maps all richlet to /zk (see web.xml),
so the richlet path will be, say, /zk/test/some
-->
- <richlet>
- <richlet-name>Test</richlet-name>
- <richlet-class>org.zkoss.zkdemo.test.TestRichlet</richlet-class>
- <!-- Any number of initial parameters.
- <init-param>
- <param-name>any</param-name>
- <param-value>any</param-value>
- </init-param>
- -->
- </richlet>
- <richlet-mapping>
- <richlet-name>Test</richlet-name>
- <url-pattern>/test/*</url-pattern>
- </richlet-mapping>
+
<!-- Optional -->
<device-config>
<device-type>ajax</device-type>
- <timeout-uri>/timeout.zul</timeout-uri>
+ <timeout-uri></timeout-uri>
<!-- An empty URL can cause the browser to reload the same URL -->
</device-config>
Deleted: trunk/zkmail/footer.dsp
===================================================================
--- trunk/zkmail/footer.dsp 2011-09-25 22:24:47 UTC (rev 1119)
+++ trunk/zkmail/footer.dsp 2011-10-24 04:21:19 UTC (rev 1120)
@@ -1,29 +0,0 @@
-
-<div id="footer" align="center">
-<table width="100%" id="footer-table">
- <tr>
- <td width="35%" align="left"><a title="All Browsers" class="browsers">
- <img src="img/browsers.png" alt="All support browsers" >
- </td>
- <td width="40%" align="center"><span
- style="color: gray; font: Verdana, Arial, Helvetica, sans-serif; font-size: 8pt;">
- <![CDATA[
- Copyright© 2005-2008 Potix Corporation. All rights reserved.
- ]]>
- </span></td>
- <td width="25%" align="right"><a class="footer-refer"
- href="http://del.icio.us/post?url=http://www.zkoss.org/&title=ZK%20-%20%231%20Ajax%20project%20in%20SourceForge.net"
- onclick="pageTracker._trackPageview('/ext/delicious')" target="_blank"><img
- src="img/delicious.gif" width="16" height="16" title="del.icio.us" /></a>
- <a class="footer-refer" href="http://www.java.net"
- onclick="pageTracker._trackPageview('/ext/java.net/logo')" title="java.net"><img
- src="http://today.java.net/images/javanet_button_90.gif" width="90"
- height="25" border="0" title="java.net"></a> <a
- class="footer-refer" href="http://sourceforge.net/projects/zk1/"
- onclick="pageTracker._trackPageview('/sf/logo')" title="SourceForge.net"><img
- src="http://sourceforge.net/sflogo.php?group_id=152762&type=1"
- width="88" height="31" border="0" title="ZK at SourceForge.net" /></a></td>
- </tr>
-
-</table>
-</div>
Deleted: trunk/zkmail/footer.zul
===================================================================
--- trunk/zkmail/footer.zul 2011-09-25 22:24:47 UTC (rev 1119)
+++ trunk/zkmail/footer.zul 2011-10-24 04:21:19 UTC (rev 1120)
@@ -1,7 +0,0 @@
-<zk>
- <toolbarbutton
- style="font-size: 9px; color: rgb(150, 165, 170); font-family: Verdana,Arial,Helvetica,sans-serif;"
- label="Contact us" href="mailto:in...@zk..." />
- <label
- value="Copyright © 2005-2007 Potix Corporation. All rights reserved." />
-</zk>
\ No newline at end of file
Added: trunk/zkmail/ga.zul
===================================================================
--- trunk/zkmail/ga.zul (rev 0)
+++ trunk/zkmail/ga.zul 2011-10-24 04:21:19 UTC (rev 1120)
@@ -0,0 +1,9 @@
+<zk>
+<script><![CDATA[
+ var z_n = "null",
+ z_i = "${execution.remoteHost }" ;
+ var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+ document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+ document.write(unescape("%3Cscript src='http://www.zkoss.org/resource/js/page/gaz.js' type='text/javascript'%3E%3C/script%3E"));
+]]></script>
+</zk>
\ No newline at end of file
Deleted: trunk/zkmail/header.zul
===================================================================
--- trunk/zkmail/header.zul 2011-09-25 22:24:47 UTC (rev 1119)
+++ trunk/zkmail/header.zul 2011-10-24 04:21:19 UTC (rev 1120)
@@ -1,21 +0,0 @@
-<zk width="100%">
- <div xmlns:h="http://www.zkoss.org/2005/zk/native">
- <h:table cellspacing="0" width="100%">
- <h:tr>
- <h:td width="969px" id="zk_head"
- style="width: 969px; height: 92px; background: transparent url(img/ZK-header.jpg) no-repeat scroll 0 0;">
- <h:a href="/" alt="ZK Home" title="ZK Home">
- <h:div id="zk_logo"
- style="width:137px;height: 89px; background: transparent url('img/ZK-Logo.gif') no-repeat 30px 0; float:left;"></h:div>
- </h:a>
- <h:div id="zk_mail" style="float:left;padding:30px 0px 0px 30px;color: white; font-size: 12pt; font-weight: bold; font-family: Verdana, Arial, Helvetica, sans-serif;">
- ZK Mail
- </h:div>
- </h:td>
- <h:td id="zk_search"
- style="background: transparent url(img/ZK-header-r.jpg) repeat-x scroll 0 0;height:89px ;padding-right:1px;">
- </h:td>
- </h:tr>
-</h:table>
-</div>
-</zk>
\ No newline at end of file
Modified: trunk/zkmail/index.zul
===================================================================
--- trunk/zkmail/index.zul 2011-09-25 22:24:47 UTC (rev 1119)
+++ trunk/zkmail/index.zul 2011-10-24 04:21:19 UTC (rev 1120)
@@ -1,24 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
-<?page id="userGuide" title="ZK Live Demo"?>
+<?page id="userGuide" title="ZK Mail | Demo | ZK"?>
<?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit"?>
<?link rel="stylesheet" type="text/css" href="layout.css"?>
<?link rel="stylesheet" type="text/css" href="~./zul/css/ext.css.dsp"?>
- <!--
- index.zul {{IS_NOTE Purpose: Description: History: Tue Oct 4 11:31:13
- 2005, Created by henrichen }}IS_NOTE Copyright (C) 2005 Potix
- Corporation. All Rights Reserved. {{IS_RIGHT }}IS_RIGHT
- -->
<zk>
- <zscript src="Mail.zs" />
- <zscript src="Comparator.zs" />
<zscript>
<![CDATA[
import java.util.*;
+ import zkmail.*;
List mails = new LinkedList();
String[][] datas = new String[][]{
- new String[]{"markboland","ma...@ex...","URGENT - [Mon, 24 Apr 2007 05:17:27 +0000]","data/content1.zul"},
- new String[]{"Hollie Voss","ho...@ex...","URGENT TRANSACTION -[Tue, 21 Aug 2007 16:31:27 +0000]","data/content2.zul"},
+ new String[]{"markboland","ma...@ex...","URGENT - [Mon, 24 Apr 2012 05:17:27 +0000]","data/content1.zul"},
+ new String[]{"Hollie Voss","ho...@ex...","URGENT TRANSACTION -[Tue, 21 Aug 2012 16:31:27 +0000]","data/content2.zul"},
new String[]{"boticario","bot...@ex...","fw: Here it comes","data/content3.zul"},
new String[]{"Emerson Milton","em...@ex...","voce ganho um vale presente Boticario","data/content4.zul"},
new String[]{"Healy Colette","he...@ex...","Read this ASAP","data/content5.zul"},
@@ -42,26 +36,21 @@
]]>
</zscript>
+
<borderlayout height="100%">
- <north splittable="false" size="92px">
- <include id="np" sclass="header" src="header.zul" />
- </north>
- <south splittable="false" size="40px">
- <include id="sp" sclass="footer" src="footer.dsp" />
- </south>
- <west size="20%" title="Mail" flex="true" splittable="true"
+ <west size="20%" title="Mail" flex="true" splittable="true" minsize="150" maxsize="500"
collapsible="true" border="0">
<borderlayout width="100%">
<center autoscroll="true" flex="true" border="0">
- <tabbox id="tabbox" mold="accordion-lite">
- <tabs>
+ <tabbox id="tabbox" mold="accordion-lite">
+ <tabs>
<tab label="All Mail Items" />
<tab id="tab2" label="Contacts" />
<tab id="tab3" label="Tasks" />
</tabs>
<tabpanels>
<tabpanel height="320px">
- <tree id="tree" width="100%" rows="5" height="320px">
+ <tree id="tree" width="100%" rows="5" vflex="1">
<treechildren>
<treeitem>
<treerow>
@@ -240,6 +229,12 @@
<tab label="Tile Vertically" />
<tab label="Tile Horizontally" />
</tabs>
+ <toolbar>
+ <hlayout>
+ Themes :
+ <listbox id="themeSelectListbox" rows="1" mold="select" apply="zkmail.ThemeSelectionCtrl"></listbox>
+ </hlayout>
+ </toolbar>
<tabpanels height="80%">
<tabpanel>
<borderlayout>
@@ -305,4 +300,5 @@
</tabbox>
</center>
</borderlayout>
+ <include src="ga.zul" />
</zk>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sim...@us...> - 2011-09-25 22:24:53
|
Revision: 1119
http://zkforge.svn.sourceforge.net/zkforge/?rev=1119&view=rev
Author: simon_massey
Date: 2011-09-25 22:24:47 +0000 (Sun, 25 Sep 2011)
Log Message:
-----------
a link to the draft article.
Modified Paths:
--------------
trunk/zktodo2/src/main/webapp/index.jsp
Modified: trunk/zktodo2/src/main/webapp/index.jsp
===================================================================
--- trunk/zktodo2/src/main/webapp/index.jsp 2011-09-24 23:09:12 UTC (rev 1118)
+++ trunk/zktodo2/src/main/webapp/index.jsp 2011-09-25 22:24:47 UTC (rev 1119)
@@ -12,4 +12,29 @@
<br/>
<br/>
Click <a href="mvvm-demo/weather-station-mvvm.zul">here</a> for the weather station MVVM demo which is mentioned in the presentation at the link above.
-
\ No newline at end of file
+<br/>
+<h2>References</h2>
+<ul>
+ <li>Preview of up comming MVVM article <a href="http://dl.dropbox.com/u/2622674/zk/Test%20Driving%20The%20MVVM%20Pattern%20With%20The%20ZK%20Java%20Ajax%20Framework.html">Test
+Driving The MVVM Pattern With The ZK Java Ajax Framework</a><br>
+ </li>
+<li>MVC article <a
+href="http://java.dzone.com/articles/using-desktop-model-view">Desktop
+MVC Patterns ZK, Spring & JPA</a></li>
+<li>Original MVP article <a
+href="http://books.zkoss.org/wiki/Small_Talks/2008/June/Best_Model-View-Controller_Patterns">SmallTalks
+2008 Best MVC Patterns</a></li>
+<li>Book on how to build a layered domain model with Spring <a
+href="http://www.manning.com/crichardson/">POJOs In Action</a></li>
+<li>ZK MVC Screen for POJOs In Action book code <a
+href="http://books.zkoss.org/wiki/Small_Talks/2007/January/Test_Driving_the_%27ZkFoodToGo%27_Example_Application">Test
+Driving ZK FoodToGo</a></li>
+<li>Book on designing 'domain objects first' for supple code <a
+href="http://www.amazon.com/Domain-Driven-Design-Tackling-Complexity-Software/dp/0321125215">Evans
+Domain Driven Design</a></li>
+<li>Martin Fowler GUI Patterns pages <a
+href="http://martinfowler.com/eaaDev/uiArchs.html">UI Architectures</a></li>
+<li>Josh Smith's inspirational <a
+href="http://msdn.microsoft.com/en-us/magazine/dd419663.aspx">Microsoft
+.Net MVVM Article</a></li>
+</ul>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sim...@us...> - 2011-09-24 23:09:18
|
Revision: 1118
http://zkforge.svn.sourceforge.net/zkforge/?rev=1118&view=rev
Author: simon_massey
Date: 2011-09-24 23:09:12 +0000 (Sat, 24 Sep 2011)
Log Message:
-----------
nothing much.
Modified Paths:
--------------
trunk/zktodo2/src/main/java/org/zkforge/zktodo2/ZkToDoViewModel.java
trunk/zktodo2/src/main/webapp/index.jsp
trunk/zktodo2/src/main/webapp/zktodo_c.zul
Modified: trunk/zktodo2/src/main/java/org/zkforge/zktodo2/ZkToDoViewModel.java
===================================================================
--- trunk/zktodo2/src/main/java/org/zkforge/zktodo2/ZkToDoViewModel.java 2011-09-24 14:44:54 UTC (rev 1117)
+++ trunk/zktodo2/src/main/java/org/zkforge/zktodo2/ZkToDoViewModel.java 2011-09-24 23:09:12 UTC (rev 1118)
@@ -62,7 +62,7 @@
this.selectedReminder = new Reminder();
}
}
-
+
/**
* The following date method can be called by binder in response to
*
Modified: trunk/zktodo2/src/main/webapp/index.jsp
===================================================================
--- trunk/zktodo2/src/main/webapp/index.jsp 2011-09-24 14:44:54 UTC (rev 1117)
+++ trunk/zktodo2/src/main/webapp/index.jsp 2011-09-24 23:09:12 UTC (rev 1118)
@@ -1,5 +1,5 @@
<br/>
-Click <a href="zktodo_c.zul">here</a> for the MVB aka MVVM version based on the appraoch
+Click <a href="zktodo_c.zul">here</a> for the MVB aka MVVM version based on the approach
presented at the
<a href="http://dl.dropbox.com/u/2622674/zk/zk-mvvm.pdf">2010 UK ZK Users Group</a>.
<br/>
Modified: trunk/zktodo2/src/main/webapp/zktodo_c.zul
===================================================================
--- trunk/zktodo2/src/main/webapp/zktodo_c.zul 2011-09-24 14:44:54 UTC (rev 1117)
+++ trunk/zktodo2/src/main/webapp/zktodo_c.zul 2011-09-24 23:09:12 UTC (rev 1118)
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- ZK.forge is distributed under Lesser GPL Version see also http://www.gnu.org/licenses/lgpl.html -->
-<?page title="ZkTodo2 - MVB aka MVVM Example"?>
+<?page title="ZkTodo2 - MVVM Example"?>
<?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
<?init class="org.zkforge.zktodo2.binding.CommandBinderInit"?>
<?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver" ?>
<zk xmlns="http://www.zkoss.org/2005/zul">
-<window title="To Do List :: Model-View-Binder (MVB/MVVM)" width="640px" border="normal">
+<window title="To Do List :: Model-View-ViewModel MVVM" width="640px" border="normal">
<listbox id="list" multiple="true" rows="12"
model="@{toDoViewModel.reminders, load-after='add.onClick,update.onClick,delete.onClick'}"
selectedItem="@{toDoViewModel.selectedReminder}">
@@ -34,8 +34,7 @@
<hbox id="buttons">
<button id="add" label="Add" width="36px" height="24px" onClick="@{toDoViewModel}"/>
<button id="update" label="Update" width="46px" height="24px" onClick="@{toDoViewModel}"/>
- <button id="delete" label="Delete" width="46px" height="24px" onClick="@{toDoViewModel}"
- />
+ <button id="delete" label="Delete" width="46px" height="24px" onClick="@{toDoViewModel}"/>
</hbox>
</vbox>
</window>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sim...@us...> - 2011-09-24 14:45:03
|
Revision: 1117
http://zkforge.svn.sourceforge.net/zkforge/?rev=1117&view=rev
Author: simon_massey
Date: 2011-09-24 14:44:54 +0000 (Sat, 24 Sep 2011)
Log Message:
-----------
Better documentation around the Model-View-Binder (MVB) aka Model-View-ViewModel (MVVM) with ZK RIA Ajax Java.
Modified Paths:
--------------
trunk/zktodo2/src/main/java/org/zkforge/zktodo2/DateFormatConverter.java
trunk/zktodo2/src/main/java/org/zkforge/zktodo2/Reminder.java
trunk/zktodo2/src/main/java/org/zkforge/zktodo2/ReminderService.java
trunk/zktodo2/src/main/java/org/zkforge/zktodo2/ZkToDoControllerV1.java
trunk/zktodo2/src/main/java/org/zkforge/zktodo2/ZkToDoControllerV2.java
trunk/zktodo2/src/main/java/org/zkforge/zktodo2/ZkToDoModel.java
trunk/zktodo2/src/main/java/org/zkforge/zktodo2/ZkToDoModelImpl.java
trunk/zktodo2/src/main/java/org/zkforge/zktodo2/ZkToDoViewModel.java
trunk/zktodo2/src/main/java/org/zkforge/zktodo2/binding/CommandBinder.java
trunk/zktodo2/src/main/java/org/zkforge/zktodo2/binding/CommandBinderInit.java
trunk/zktodo2/src/main/java/org/zkforge/zktodo2/binding/CommandConverter.java
trunk/zktodo2/src/main/java/org/zkforge/zktodo2/binding/InputEventCommandConverter.java
trunk/zktodo2/src/main/java/org/zkforge/zktodo2/mvvm/demo/Station.java
trunk/zktodo2/src/main/java/org/zkforge/zktodo2/mvvm/demo/WeathStationViewModel.java
trunk/zktodo2/src/main/webapp/index.jsp
trunk/zktodo2/src/main/webapp/mvvm-demo/weather-station-mvvm.zul
trunk/zktodo2/src/main/webapp/zktodo_a.zul
trunk/zktodo2/src/main/webapp/zktodo_b.zul
trunk/zktodo2/src/main/webapp/zktodo_c.zul
Modified: trunk/zktodo2/src/main/java/org/zkforge/zktodo2/DateFormatConverter.java
===================================================================
--- trunk/zktodo2/src/main/java/org/zkforge/zktodo2/DateFormatConverter.java 2011-09-15 04:33:13 UTC (rev 1116)
+++ trunk/zktodo2/src/main/java/org/zkforge/zktodo2/DateFormatConverter.java 2011-09-24 14:44:54 UTC (rev 1117)
@@ -1,3 +1,6 @@
+/*
+ZK.forge is distributed under Lesser GPL Version see also http://www.gnu.org/licenses/lgpl.html
+ */
package org.zkforge.zktodo2;
import java.util.Date;
Modified: trunk/zktodo2/src/main/java/org/zkforge/zktodo2/Reminder.java
===================================================================
--- trunk/zktodo2/src/main/java/org/zkforge/zktodo2/Reminder.java 2011-09-15 04:33:13 UTC (rev 1116)
+++ trunk/zktodo2/src/main/java/org/zkforge/zktodo2/Reminder.java 2011-09-24 14:44:54 UTC (rev 1117)
@@ -1,3 +1,6 @@
+/*
+ZK.forge is distributed under Lesser GPL Version see also http://www.gnu.org/licenses/lgpl.html
+ */
package org.zkforge.zktodo2;
import java.util.Date;
Modified: trunk/zktodo2/src/main/java/org/zkforge/zktodo2/ReminderService.java
===================================================================
--- trunk/zktodo2/src/main/java/org/zkforge/zktodo2/ReminderService.java 2011-09-15 04:33:13 UTC (rev 1116)
+++ trunk/zktodo2/src/main/java/org/zkforge/zktodo2/ReminderService.java 2011-09-24 14:44:54 UTC (rev 1117)
@@ -5,6 +5,9 @@
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
+/*
+ZK.forge is distributed under Lesser GPL Version see also http://www.gnu.org/licenses/lgpl.html
+ */
public class ReminderService {
protected BasicDao basicDao;
Modified: trunk/zktodo2/src/main/java/org/zkforge/zktodo2/ZkToDoControllerV1.java
===================================================================
--- trunk/zktodo2/src/main/java/org/zkforge/zktodo2/ZkToDoControllerV1.java 2011-09-15 04:33:13 UTC (rev 1116)
+++ trunk/zktodo2/src/main/java/org/zkforge/zktodo2/ZkToDoControllerV1.java 2011-09-24 14:44:54 UTC (rev 1117)
@@ -1,3 +1,6 @@
+/*
+ZK.forge is distributed under Lesser GPL Version see also http://www.gnu.org/licenses/lgpl.html
+ */
package org.zkforge.zktodo2;
import static java.lang.System.out;
Modified: trunk/zktodo2/src/main/java/org/zkforge/zktodo2/ZkToDoControllerV2.java
===================================================================
--- trunk/zktodo2/src/main/java/org/zkforge/zktodo2/ZkToDoControllerV2.java 2011-09-15 04:33:13 UTC (rev 1116)
+++ trunk/zktodo2/src/main/java/org/zkforge/zktodo2/ZkToDoControllerV2.java 2011-09-24 14:44:54 UTC (rev 1117)
@@ -1,3 +1,6 @@
+/*
+ZK.forge is distributed under Lesser GPL Version see also http://www.gnu.org/licenses/lgpl.html
+ */
package org.zkforge.zktodo2;
import static java.lang.System.out;
Modified: trunk/zktodo2/src/main/java/org/zkforge/zktodo2/ZkToDoModel.java
===================================================================
--- trunk/zktodo2/src/main/java/org/zkforge/zktodo2/ZkToDoModel.java 2011-09-15 04:33:13 UTC (rev 1116)
+++ trunk/zktodo2/src/main/java/org/zkforge/zktodo2/ZkToDoModel.java 2011-09-24 14:44:54 UTC (rev 1117)
@@ -1,3 +1,6 @@
+/*
+ZK.forge is distributed under Lesser GPL Version see also http://www.gnu.org/licenses/lgpl.html
+ */
package org.zkforge.zktodo2;
import java.util.List;
Modified: trunk/zktodo2/src/main/java/org/zkforge/zktodo2/ZkToDoModelImpl.java
===================================================================
--- trunk/zktodo2/src/main/java/org/zkforge/zktodo2/ZkToDoModelImpl.java 2011-09-15 04:33:13 UTC (rev 1116)
+++ trunk/zktodo2/src/main/java/org/zkforge/zktodo2/ZkToDoModelImpl.java 2011-09-24 14:44:54 UTC (rev 1117)
@@ -1,3 +1,6 @@
+/*
+ZK.forge is distributed under Lesser GPL Version see also http://www.gnu.org/licenses/lgpl.html
+ */
package org.zkforge.zktodo2;
import java.util.List;
Modified: trunk/zktodo2/src/main/java/org/zkforge/zktodo2/ZkToDoViewModel.java
===================================================================
--- trunk/zktodo2/src/main/java/org/zkforge/zktodo2/ZkToDoViewModel.java 2011-09-15 04:33:13 UTC (rev 1116)
+++ trunk/zktodo2/src/main/java/org/zkforge/zktodo2/ZkToDoViewModel.java 2011-09-24 14:44:54 UTC (rev 1117)
@@ -1,5 +1,9 @@
+/*
+ZK.forge is distributed under Lesser GPL Version see also http://www.gnu.org/licenses/lgpl.html
+ */
package org.zkforge.zktodo2;
+import java.util.Date;
import java.util.List;
public class ZkToDoViewModel {
@@ -51,11 +55,30 @@
}
}
}
-
+
public void add() {
if( this.selectedReminder.getId() == null ){
this.reminderService.persist(this.selectedReminder);
this.selectedReminder = new Reminder();
}
}
+
+ /**
+ * The following date method can be called by binder in response to
+ *
+ * <datebox id="date"
+ * onChange="@{toDoViewModel, converter='org.zkforge.zktodo2.binding.InputEventCommandConverter'}"/>
+ *
+ * It therefore demonstrates that CommandBinder can use a converter to
+ * pass state known by the View down to the ViewModel.
+ *
+ * As it is our View input components are bound to the properties of the
+ * ViewModel.seletectedReminder detached JPA entity; so we don't need to be
+ * passed such state. But for the sake of making an example this vaguely
+ * named method which does nothing shows how you would have components which
+ * are not bound to any Model pass data down into the ViewModel
+ */
+ public void date(Date date ){
+ System.out.println("The date has changed to "+date);
+ }
}
Modified: trunk/zktodo2/src/main/java/org/zkforge/zktodo2/binding/CommandBinder.java
===================================================================
--- trunk/zktodo2/src/main/java/org/zkforge/zktodo2/binding/CommandBinder.java 2011-09-15 04:33:13 UTC (rev 1116)
+++ trunk/zktodo2/src/main/java/org/zkforge/zktodo2/binding/CommandBinder.java 2011-09-24 14:44:54 UTC (rev 1117)
@@ -1,3 +1,6 @@
+/**
+ZK.forge is distributed under Lesser GPL Version see also http://www.gnu.org/licenses/lgpl.html
+*/
package org.zkforge.zktodo2.binding;
import java.lang.reflect.Method;
@@ -6,6 +9,21 @@
import org.zkoss.zk.ui.event.Event;
import org.zkoss.zk.ui.event.EventListener;
+/**
+ * CommandBinder bind events such as "onClick"/"onChange" onto a POJO business object.
+ *
+ * An optional converter class can be specified. The converter bridges the View world of the
+ * onX Event into the POJO business world. This is because we don't want the POJO business
+ * object to be compiled against the ZK view classes.
+ *
+ * See the presentation at {@link http://dl.dropbox.com/u/2622674/zk/zk-mvvm.pdf}
+ * for more information about the Model-View-Binder (MVB) pattern (also know as the
+ * Model-View-View-Model (MVVM) pattern.
+
+ * @see org.zkforge.zktodo2.binding.CommandBinderInit
+ * @see org.zkforge.zktodo2.binding.CommandConverter
+ * @author simon
+ */
public class CommandBinder {
public CommandBinder(Component comp, String eventName, final Object target, String methodName, final CommandConverter converter) {
Modified: trunk/zktodo2/src/main/java/org/zkforge/zktodo2/binding/CommandBinderInit.java
===================================================================
--- trunk/zktodo2/src/main/java/org/zkforge/zktodo2/binding/CommandBinderInit.java 2011-09-15 04:33:13 UTC (rev 1116)
+++ trunk/zktodo2/src/main/java/org/zkforge/zktodo2/binding/CommandBinderInit.java 2011-09-24 14:44:54 UTC (rev 1117)
@@ -1,3 +1,6 @@
+/**
+ZK.forge is distributed under Lesser GPL Version see also http://www.gnu.org/licenses/lgpl.html
+*/
package org.zkforge.zktodo2.binding;
import java.util.Iterator;
@@ -13,6 +16,19 @@
import org.zkoss.zkplus.databind.DataBinder;
/**
+ * This class resolves annotations such as onClick="@{targetBean}" and creates a
+ * CommandBinder which maps a method on the target bean to an event handler on the
+ * annotated component. The "id" of the component is used as the method name to invoke
+ * on the target bean.
+ *
+ * There can be an optional converter such as
+ *
+ * <datebox id="date"
+ * onChange="@{toDoViewModel, converter='org.zkforge.zktodo2.binding.InputEventCommandConverter'}"/>
+ *
+ * If a converter is specified then the method coerceToModelParameters will be called
+ * which can resolve the business objects to pass into the method of the target bean.
+ *
* AnnotateDataBinderInit and AnnotateDataBinder have private rather than protected
* methods so are not extensible. This class therefore has some cut and paste from
* those classes.
@@ -48,7 +64,11 @@
}
/**
- * The logic to resolve the component follows the logic documented for AnnotateDataBinderInit
+ * The logic to resolve the component follows the logic documented for AnnotateDataBinderInit.
+ * You can pass the name of the component to scan for annotations to speed up page loading:
+ *
+ * <?init class="org.zkforge.zktodo2.binding.CommandBinderInit" root="./buttons"?>
+ *
*/
public void doAfterCompose(Page page, Component[] components) throws Exception {
if( root == null ){
@@ -88,8 +108,8 @@
protected void loadComponentPropertyAnnotationByAnnotName(Component comp,
String annotName) {
- String id = comp.getId();
- if (id == null && "".equals(id)) {
+ String methodName = comp.getId();
+ if (methodName == null && "".equals(methodName)) {
return;
}
ComponentCtrl compCtrl = (ComponentCtrl) comp;
@@ -100,15 +120,15 @@
for (@SuppressWarnings("unchecked")
final Iterator it = props.iterator(); it.hasNext();) {
- final String propName = (String) it.next();
+ final String eventName = (String) it.next();
- if (propName.startsWith("on") ) {
+ if (eventName.startsWith("on") ) {
final Object[] annotationDetails = loadPropertyAnnotation(comp,
- propName, annotName);
+ eventName, annotName);
String targetName = (String) annotationDetails[0];
- final Object variable = page.getXelVariable(targetName);
+ final Object target = page.getXelVariable(targetName);
CommandConverter converter = null;
@@ -126,7 +146,7 @@
}
}
- new CommandBinder(comp, propName, variable, id, converter);
+ new CommandBinder(comp, eventName, target, methodName, converter);
}
}
Modified: trunk/zktodo2/src/main/java/org/zkforge/zktodo2/binding/CommandConverter.java
===================================================================
--- trunk/zktodo2/src/main/java/org/zkforge/zktodo2/binding/CommandConverter.java 2011-09-15 04:33:13 UTC (rev 1116)
+++ trunk/zktodo2/src/main/java/org/zkforge/zktodo2/binding/CommandConverter.java 2011-09-24 14:44:54 UTC (rev 1117)
@@ -1,3 +1,6 @@
+/**
+ZK.forge is distributed under Lesser GPL Version see also http://www.gnu.org/licenses/lgpl.html
+*/
package org.zkforge.zktodo2.binding;
import java.lang.reflect.Method;
@@ -4,6 +7,15 @@
import org.zkoss.zk.ui.event.Event;
+/**
+ * CommandConverter can be used to bridge the intentional divide between
+ * the POJO business object (i.e. ViewModel) and the ZK framework. The
+ * event can be used to resolve business state held within the ZK desktop
+ * (i.e. the View) which is returned as an array list of arguments which
+ * will be invoked on the specified method of the ViewModel.
+ *
+ * @author simon
+ */
public interface CommandConverter {
Object[] coerceToModelParameters( Event e, Method m );
}
\ No newline at end of file
Modified: trunk/zktodo2/src/main/java/org/zkforge/zktodo2/binding/InputEventCommandConverter.java
===================================================================
--- trunk/zktodo2/src/main/java/org/zkforge/zktodo2/binding/InputEventCommandConverter.java 2011-09-15 04:33:13 UTC (rev 1116)
+++ trunk/zktodo2/src/main/java/org/zkforge/zktodo2/binding/InputEventCommandConverter.java 2011-09-24 14:44:54 UTC (rev 1117)
@@ -1,3 +1,6 @@
+/*
+ZK.forge is distributed under Lesser GPL Version see also http://www.gnu.org/licenses/lgpl.html
+ */
package org.zkforge.zktodo2.binding;
import java.lang.reflect.Method;
@@ -5,10 +8,11 @@
import org.zkoss.zk.ui.Component;
import org.zkoss.zk.ui.event.Event;
import org.zkoss.zk.ui.event.InputEvent;
+import org.zkoss.zkplus.databind.TypeConverter;
import org.zkoss.zul.api.Datebox;
import org.zkoss.zul.api.Intbox;
-public class InputEventCommandConverter implements CommandConverter {
+public class InputEventCommandConverter implements CommandConverter, TypeConverter {
public Object[] coerceToModelParameters(Event e, Method m) {
Component target = e.getTarget();
@@ -27,4 +31,12 @@
return new Object[]{data};
}
+ public Object coerceToBean(Object val, Component comp) {
+ return TypeConverter.IGNORE;
+ }
+
+ public Object coerceToUi(Object val, Component comp) {
+ return TypeConverter.IGNORE;
+ }
+
}
Modified: trunk/zktodo2/src/main/java/org/zkforge/zktodo2/mvvm/demo/Station.java
===================================================================
--- trunk/zktodo2/src/main/java/org/zkforge/zktodo2/mvvm/demo/Station.java 2011-09-15 04:33:13 UTC (rev 1116)
+++ trunk/zktodo2/src/main/java/org/zkforge/zktodo2/mvvm/demo/Station.java 2011-09-24 14:44:54 UTC (rev 1117)
@@ -4,6 +4,9 @@
import java.util.GregorianCalendar;
import java.util.Random;
+/*
+ZK.forge is distributed under Lesser GPL Version see also http://www.gnu.org/licenses/lgpl.html
+ */
public class Station {
private String name = "";
private Date date = new Date();
Modified: trunk/zktodo2/src/main/java/org/zkforge/zktodo2/mvvm/demo/WeathStationViewModel.java
===================================================================
--- trunk/zktodo2/src/main/java/org/zkforge/zktodo2/mvvm/demo/WeathStationViewModel.java 2011-09-15 04:33:13 UTC (rev 1116)
+++ trunk/zktodo2/src/main/java/org/zkforge/zktodo2/mvvm/demo/WeathStationViewModel.java 2011-09-24 14:44:54 UTC (rev 1117)
@@ -3,6 +3,9 @@
import java.util.ArrayList;
import java.util.List;
+/*
+ZK.forge is distributed under Lesser GPL Version see also http://www.gnu.org/licenses/lgpl.html
+ */
public class WeathStationViewModel {
public WeathStationViewModel(){
Modified: trunk/zktodo2/src/main/webapp/index.jsp
===================================================================
--- trunk/zktodo2/src/main/webapp/index.jsp 2011-09-15 04:33:13 UTC (rev 1116)
+++ trunk/zktodo2/src/main/webapp/index.jsp 2011-09-24 14:44:54 UTC (rev 1117)
@@ -1,6 +1,15 @@
-Click <a href="zktodo_a.zul">here</a> for the original MVP version of the zul from the <a href="http://www.zkoss.org/smalltalks/mvc4/">mvc4 article</a>.
<br/>
-Click <a href="zktodo_b.zul">here</a> for the databindings MVC version of the zul with an explicit model class.
+Click <a href="zktodo_c.zul">here</a> for the MVB aka MVVM version based on the appraoch
+presented at the
+<a href="http://dl.dropbox.com/u/2622674/zk/zk-mvvm.pdf">2010 UK ZK Users Group</a>.
<br/>
-Click <a href="zktodo_c.zul">here</a> for the MVVM version.
-
+<br/>
+Click <a href="zktodo_b.zul">here</a> for the databindings MVC version of the zul with an explicit model class
+which was written up in the <a href="http://java.dzone.com/articles/using-desktop-model-view">Using Desktop MVC Patterns with ZK, Spring & JPA</a>
+<br/>
+<br/>
+Click <a href="zktodo_a.zul">here</a> for the original MVP version of the zul from the original article <a href="http://books.zkoss.org/wiki/Small%20Talks/2008/November/ZK%20With%20Spring%20JPA%20And%20A%20Model-View-Controller%20Pattern">ZK With Spring JPA And A Model-View-Controller Pattern</a>.
+<br/>
+<br/>
+Click <a href="mvvm-demo/weather-station-mvvm.zul">here</a> for the weather station MVVM demo which is mentioned in the presentation at the link above.
+
\ No newline at end of file
Modified: trunk/zktodo2/src/main/webapp/mvvm-demo/weather-station-mvvm.zul
===================================================================
--- trunk/zktodo2/src/main/webapp/mvvm-demo/weather-station-mvvm.zul 2011-09-15 04:33:13 UTC (rev 1116)
+++ trunk/zktodo2/src/main/webapp/mvvm-demo/weather-station-mvvm.zul 2011-09-24 14:44:54 UTC (rev 1117)
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<?page title="Weather Station MVVM Demo - Inspired By "?>
+<!-- ZK.forge is distributed under Lesser GPL Version see also http://www.gnu.org/licenses/lgpl.html -->
+<?page title="Weather Station MVVM Demo"?>
<?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
<?init class="org.zkforge.zktodo2.binding.CommandBinderInit" root="./buttons"?>
<?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver" ?>
@@ -13,7 +14,7 @@
.z-intbox-disd, .z-intbox-disd * { color: black !important; background: #fff !important;}
.z-textbox-disd, .z-textbox-disd * { color: black !important; background: #fff !important;}
</style>
- <window title="Databindings, Statebindings & CommandBindings" width="640px" border="normal">
+ <window title="Model-View-Binder (MVB) aka MVVM with Databindings, Statebindings & CommandBindings" width="640px" border="normal">
<hbox width="100px">
<div width="200px">
@@ -54,7 +55,7 @@
<checkbox id="confirmedCheckbox" checked="@{testBean.station.confirmed, load-after='create.onClick'}" />
</row>
<row id="buttons">
- <div>
+ <div>
</div>
<div>
<button id="create" label="New" onClick="@{testBean}"/>
@@ -64,5 +65,6 @@
</rows>
</grid>
</hbox>
+ <label value="This was inspired by Martin Fowler's Weather Station example at http://martinfowler.com/eaaDev/uiArchs.html"/>
</window>
</zk>
Modified: trunk/zktodo2/src/main/webapp/zktodo_a.zul
===================================================================
--- trunk/zktodo2/src/main/webapp/zktodo_a.zul 2011-09-15 04:33:13 UTC (rev 1116)
+++ trunk/zktodo2/src/main/webapp/zktodo_a.zul 2011-09-24 14:44:54 UTC (rev 1117)
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- ZK.forge is distributed under Lesser GPL Version see also http://www.gnu.org/licenses/lgpl.html -->
<?page title="ZkTodo2 - MVP Example"?>
<?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
<zk xmlns="http://www.zkoss.org/2005/zul">
-<window title="To Do List" width="640px" border="normal" apply="${toDoControllerV1}">
+<window title="To Do List :: Model-View-Presenter (MVP)" width="640px" border="normal" apply="${toDoControllerV1}">
<listbox id="list" multiple="true" rows="12">
<listhead>
<listheader label="Item" />
Modified: trunk/zktodo2/src/main/webapp/zktodo_b.zul
===================================================================
--- trunk/zktodo2/src/main/webapp/zktodo_b.zul 2011-09-15 04:33:13 UTC (rev 1116)
+++ trunk/zktodo2/src/main/webapp/zktodo_b.zul 2011-09-24 14:44:54 UTC (rev 1117)
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- ZK.forge is distributed under Lesser GPL Version see also http://www.gnu.org/licenses/lgpl.html -->
<?page title="ZkTodo2 - MVC Example"?>
<?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
<?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
<zk xmlns="http://www.zkoss.org/2005/zul">
-<window title="To Do List" width="640px" border="normal" apply="${toDoControllerV2}">
+<window title="To Do List :: Model-View-Controller" width="640px" border="normal" apply="${toDoControllerV2}">
<listbox id="list" multiple="true" rows="12" model="@{toDoModel.reminders}" selectedItem="@{toDoModel.selectedReminder}">
<listhead>
<listheader label="Item" />
Modified: trunk/zktodo2/src/main/webapp/zktodo_c.zul
===================================================================
--- trunk/zktodo2/src/main/webapp/zktodo_c.zul 2011-09-15 04:33:13 UTC (rev 1116)
+++ trunk/zktodo2/src/main/webapp/zktodo_c.zul 2011-09-24 14:44:54 UTC (rev 1117)
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
-<?page title="ZkTodo2 - MVVM Example"?>
+<!-- ZK.forge is distributed under Lesser GPL Version see also http://www.gnu.org/licenses/lgpl.html -->
+<?page title="ZkTodo2 - MVB aka MVVM Example"?>
<?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
-<?init class="org.zkforge.zktodo2.binding.CommandBinderInit" root="./buttons"?>
+<?init class="org.zkforge.zktodo2.binding.CommandBinderInit"?>
<?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver" ?>
<zk xmlns="http://www.zkoss.org/2005/zul">
-<window title="To Do List" width="640px" border="normal">
-<listbox id="list" multiple="true" rows="12" model="@{toDoViewModel.reminders, load-after='add.onClick,update.onClick,delete.onClick'}" selectedItem="@{toDoViewModel.selectedReminder}">
+<window title="To Do List :: Model-View-Binder (MVB/MVVM)" width="640px" border="normal">
+<listbox id="list" multiple="true" rows="12"
+ model="@{toDoViewModel.reminders, load-after='add.onClick,update.onClick,delete.onClick'}"
+ selectedItem="@{toDoViewModel.selectedReminder}">
<listhead>
<listheader label="Item" />
<listheader label="Priority" width="80px" />
@@ -22,14 +25,17 @@
Item:<textbox cols="40" constraint="no empty"
value="@{toDoViewModel.selectedReminder.name, load-after='add.onClick,delete.onClick'}"/>
Priority:<intbox id="priority" cols="1" constraint="no empty"
- value="@{toDoViewModel.selectedReminder.priority, load-after='add.onClick,delete.onClick'}"/>
+ value="@{toDoViewModel.selectedReminder.priority, load-after='add.onClick,delete.onClick'}"
+ />
Date:<datebox id="date" cols="14" constraint="no empty"
- value="@{toDoViewModel.selectedReminder.date, load-after='add.onClick,delete.onClick'}"/>
+ value="@{toDoViewModel.selectedReminder.date, load-after='add.onClick,delete.onClick'}"
+ onChange="@{toDoViewModel, converter='org.zkforge.zktodo2.binding.InputEventCommandConverter'}"/>
</hbox>
<hbox id="buttons">
<button id="add" label="Add" width="36px" height="24px" onClick="@{toDoViewModel}"/>
<button id="update" label="Update" width="46px" height="24px" onClick="@{toDoViewModel}"/>
- <button id="delete" label="Delete" width="46px" height="24px" onClick="@{toDoViewModel}"/>
+ <button id="delete" label="Delete" width="46px" height="24px" onClick="@{toDoViewModel}"
+ />
</hbox>
</vbox>
</window>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jim...@us...> - 2011-09-15 04:33:23
|
Revision: 1116
http://zkforge.svn.sourceforge.net/zkforge/?rev=1116&view=rev
Author: jimmyshiau
Date: 2011-09-15 04:33:13 +0000 (Thu, 15 Sep 2011)
Log Message:
-----------
add zk-archetype
Added Paths:
-----------
trunk/zk-archetype/
trunk/zk-archetype/.project
trunk/zk-archetype/.settings/
trunk/zk-archetype/.settings/org.maven.ide.eclipse.prefs
trunk/zk-archetype/pom.xml
trunk/zk-archetype/zk-archetype-component/
trunk/zk-archetype/zk-archetype-component/.classpath
trunk/zk-archetype/zk-archetype-component/.project
trunk/zk-archetype/zk-archetype-component/.settings/
trunk/zk-archetype/zk-archetype-component/.settings/org.eclipse.jdt.core.prefs
trunk/zk-archetype/zk-archetype-component/.settings/org.maven.ide.eclipse.prefs
trunk/zk-archetype/zk-archetype-component/assembly/
trunk/zk-archetype/zk-archetype-component/assembly/bundle.xml
trunk/zk-archetype/zk-archetype-component/pom.xml
trunk/zk-archetype/zk-archetype-component/src/
trunk/zk-archetype/zk-archetype-component/src/main/
trunk/zk-archetype/zk-archetype-component/src/main/resources/
trunk/zk-archetype/zk-archetype-component/src/main/resources/META-INF/
trunk/zk-archetype/zk-archetype-component/src/main/resources/META-INF/maven/
trunk/zk-archetype/zk-archetype-component/src/main/resources/META-INF/maven/archetype-metadata.xml
trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/
trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/.classpath
trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/.project
trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/.settings/
trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/.settings/org.eclipse.jdt.core.prefs
trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/.settings/org.eclipse.m2e.core.prefs
trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/.settings/org.maven.ide.eclipse.prefs
trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/assembly/
trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/assembly/bin.xml
trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/assembly/bundle.xml
trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/assembly/source.xml
trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/assembly/src.xml
trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/pom.xml
trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/src/
trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/src/main/
trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/src/main/java/
trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/src/main/java/Version.java
trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/src/main/java/__component-class__.java
trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/src/main/resources/
trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/src/main/resources/metainfo/
trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/src/main/resources/metainfo/zk/
trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/src/main/resources/metainfo/zk/lang-addon.xml
trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/src/main/resources/web/
trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/src/main/resources/web/js/
trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/src/main/resources/web/js/__artifactId__/
trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/src/main/resources/web/js/__artifactId__/__component-class__.js
trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/src/main/resources/web/js/__artifactId__/css/
trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/src/main/resources/web/js/__artifactId__/css/__component-name__.css.dsp
trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/src/main/resources/web/js/__artifactId__/mold/
trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/src/main/resources/web/js/__artifactId__/mold/__component-name__.js
trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/src/main/resources/web/js/__artifactId__/zk.wpd
trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/src/test/
trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/src/test/java/
trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/src/test/java/ctrl/
trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/src/test/java/ctrl/DemoWindowComposer.java
trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/src/test/webapp/
trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/src/test/webapp/META-INF/
trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/src/test/webapp/META-INF/MANIFEST.MF
trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/src/test/webapp/WEB-INF/
trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/src/test/webapp/WEB-INF/web.xml
trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/src/test/webapp/WEB-INF/zk.xml
trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/src/test/webapp/index.zul
trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/src/test/webapp/timeout.zul
trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/zkdoc/
trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/zkdoc/COPYING
trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/zkdoc/release-note
trunk/zk-archetype/zk-archetype-component/target/
trunk/zk-archetype/zk-archetype-component/target/archive-tmp/
trunk/zk-archetype/zk-archetype-component/target/classes/
trunk/zk-archetype/zk-archetype-component/target/classes/META-INF/
trunk/zk-archetype/zk-archetype-component/target/classes/META-INF/maven/
trunk/zk-archetype/zk-archetype-component/target/classes/META-INF/maven/archetype-metadata.xml
trunk/zk-archetype/zk-archetype-component/target/classes/archetype-resources/
trunk/zk-archetype/zk-archetype-component/target/classes/archetype-resources/.classpath
trunk/zk-archetype/zk-archetype-component/target/classes/archetype-resources/.project
trunk/zk-archetype/zk-archetype-component/target/classes/archetype-resources/.settings/
trunk/zk-archetype/zk-archetype-component/target/classes/archetype-resources/.settings/org.eclipse.jdt.core.prefs
trunk/zk-archetype/zk-archetype-component/target/classes/archetype-resources/.settings/org.eclipse.m2e.core.prefs
trunk/zk-archetype/zk-archetype-component/target/classes/archetype-resources/.settings/org.maven.ide.eclipse.prefs
trunk/zk-archetype/zk-archetype-component/target/classes/archetype-resources/assembly/
trunk/zk-archetype/zk-archetype-component/target/classes/archetype-resources/assembly/bin.xml
trunk/zk-archetype/zk-archetype-component/target/classes/archetype-resources/assembly/bundle.xml
trunk/zk-archetype/zk-archetype-component/target/classes/archetype-resources/assembly/source.xml
trunk/zk-archetype/zk-archetype-component/target/classes/archetype-resources/assembly/src.xml
trunk/zk-archetype/zk-archetype-component/target/classes/archetype-resources/pom.xml
trunk/zk-archetype/zk-archetype-component/target/classes/archetype-resources/src/
trunk/zk-archetype/zk-archetype-component/target/classes/archetype-resources/src/main/
trunk/zk-archetype/zk-archetype-component/target/classes/archetype-resources/src/main/java/
trunk/zk-archetype/zk-archetype-component/target/classes/archetype-resources/src/main/java/Version.java
trunk/zk-archetype/zk-archetype-component/target/classes/archetype-resources/src/main/java/__component-class__.java
trunk/zk-archetype/zk-archetype-component/target/classes/archetype-resources/src/main/resources/
trunk/zk-archetype/zk-archetype-component/target/classes/archetype-resources/src/main/resources/metainfo/
trunk/zk-archetype/zk-archetype-component/target/classes/archetype-resources/src/main/resources/metainfo/zk/
trunk/zk-archetype/zk-archetype-component/target/classes/archetype-resources/src/main/resources/metainfo/zk/lang-addon.xml
trunk/zk-archetype/zk-archetype-component/target/classes/archetype-resources/src/main/resources/web/
trunk/zk-archetype/zk-archetype-component/target/classes/archetype-resources/src/main/resources/web/js/
trunk/zk-archetype/zk-archetype-component/target/classes/archetype-resources/src/main/resources/web/js/__artifactId__/
trunk/zk-archetype/zk-archetype-component/target/classes/archetype-resources/src/main/resources/web/js/__artifactId__/__component-class__.js
trunk/zk-archetype/zk-archetype-component/target/classes/archetype-resources/src/main/resources/web/js/__artifactId__/css/
trunk/zk-archetype/zk-archetype-component/target/classes/archetype-resources/src/main/resources/web/js/__artifactId__/css/__component-name__.css.dsp
trunk/zk-archetype/zk-archetype-component/target/classes/archetype-resources/src/main/resources/web/js/__artifactId__/mold/
trunk/zk-archetype/zk-archetype-component/target/classes/archetype-resources/src/main/resources/web/js/__artifactId__/mold/__component-name__.js
trunk/zk-archetype/zk-archetype-component/target/classes/archetype-resources/src/main/resources/web/js/__artifactId__/zk.wpd
trunk/zk-archetype/zk-archetype-component/target/classes/archetype-resources/src/test/
trunk/zk-archetype/zk-archetype-component/target/classes/archetype-resources/src/test/java/
trunk/zk-archetype/zk-archetype-component/target/classes/archetype-resources/src/test/java/ctrl/
trunk/zk-archetype/zk-archetype-component/target/classes/archetype-resources/src/test/java/ctrl/DemoWindowComposer.java
trunk/zk-archetype/zk-archetype-component/target/classes/archetype-resources/src/test/webapp/
trunk/zk-archetype/zk-archetype-component/target/classes/archetype-resources/src/test/webapp/META-INF/
trunk/zk-archetype/zk-archetype-component/target/classes/archetype-resources/src/test/webapp/META-INF/MANIFEST.MF
trunk/zk-archetype/zk-archetype-component/target/classes/archetype-resources/src/test/webapp/WEB-INF/
trunk/zk-archetype/zk-archetype-component/target/classes/archetype-resources/src/test/webapp/WEB-INF/web.xml
trunk/zk-archetype/zk-archetype-component/target/classes/archetype-resources/src/test/webapp/WEB-INF/zk.xml
trunk/zk-archetype/zk-archetype-component/target/classes/archetype-resources/src/test/webapp/index.zul
trunk/zk-archetype/zk-archetype-component/target/classes/archetype-resources/src/test/webapp/timeout.zul
trunk/zk-archetype/zk-archetype-component/target/classes/archetype-resources/zkdoc/
trunk/zk-archetype/zk-archetype-component/target/classes/archetype-resources/zkdoc/COPYING
trunk/zk-archetype/zk-archetype-component/target/classes/archetype-resources/zkdoc/release-note
trunk/zk-archetype/zk-archetype-component/target/zk-archetype-component-0.8.1-bundle.jar
trunk/zk-archetype/zk-archetype-component/target/zk-archetype-component-0.8.1.jar
trunk/zk-archetype/zk-archetype-webapp/
trunk/zk-archetype/zk-archetype-webapp/.classpath
trunk/zk-archetype/zk-archetype-webapp/.project
trunk/zk-archetype/zk-archetype-webapp/.settings/
trunk/zk-archetype/zk-archetype-webapp/.settings/org.eclipse.jdt.core.prefs
trunk/zk-archetype/zk-archetype-webapp/.settings/org.maven.ide.eclipse.prefs
trunk/zk-archetype/zk-archetype-webapp/assembly/
trunk/zk-archetype/zk-archetype-webapp/assembly/bundle.xml
trunk/zk-archetype/zk-archetype-webapp/pom.xml
trunk/zk-archetype/zk-archetype-webapp/src/
trunk/zk-archetype/zk-archetype-webapp/src/main/
trunk/zk-archetype/zk-archetype-webapp/src/main/resources/
trunk/zk-archetype/zk-archetype-webapp/src/main/resources/META-INF/
trunk/zk-archetype/zk-archetype-webapp/src/main/resources/META-INF/maven/
trunk/zk-archetype/zk-archetype-webapp/src/main/resources/META-INF/maven/archetype-metadata.xml
trunk/zk-archetype/zk-archetype-webapp/src/main/resources/archetype-resources/
trunk/zk-archetype/zk-archetype-webapp/src/main/resources/archetype-resources/.classpath
trunk/zk-archetype/zk-archetype-webapp/src/main/resources/archetype-resources/.project
trunk/zk-archetype/zk-archetype-webapp/src/main/resources/archetype-resources/.settings/
trunk/zk-archetype/zk-archetype-webapp/src/main/resources/archetype-resources/.settings/org.eclipse.jdt.core.prefs
trunk/zk-archetype/zk-archetype-webapp/src/main/resources/archetype-resources/.settings/org.eclipse.m2e.core.prefs
trunk/zk-archetype/zk-archetype-webapp/src/main/resources/archetype-resources/.settings/org.maven.ide.eclipse.prefs
trunk/zk-archetype/zk-archetype-webapp/src/main/resources/archetype-resources/assembly/
trunk/zk-archetype/zk-archetype-webapp/src/main/resources/archetype-resources/assembly/demo.xml
trunk/zk-archetype/zk-archetype-webapp/src/main/resources/archetype-resources/pom.xml
trunk/zk-archetype/zk-archetype-webapp/src/main/resources/archetype-resources/src/
trunk/zk-archetype/zk-archetype-webapp/src/main/resources/archetype-resources/src/main/
trunk/zk-archetype/zk-archetype-webapp/src/main/resources/archetype-resources/src/main/java/
trunk/zk-archetype/zk-archetype-webapp/src/main/resources/archetype-resources/src/main/java/DemoWindowComposer.java
trunk/zk-archetype/zk-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/
trunk/zk-archetype/zk-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/META-INF/
trunk/zk-archetype/zk-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/META-INF/MANIFEST.MF
trunk/zk-archetype/zk-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/
trunk/zk-archetype/zk-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
trunk/zk-archetype/zk-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/zk.xml
trunk/zk-archetype/zk-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/index.zul
trunk/zk-archetype/zk-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/timeout.zul
trunk/zk-archetype/zk-archetype-webapp/target/
trunk/zk-archetype/zk-archetype-webapp/target/archive-tmp/
trunk/zk-archetype/zk-archetype-webapp/target/classes/
trunk/zk-archetype/zk-archetype-webapp/target/classes/META-INF/
trunk/zk-archetype/zk-archetype-webapp/target/classes/META-INF/maven/
trunk/zk-archetype/zk-archetype-webapp/target/classes/META-INF/maven/archetype-metadata.xml
trunk/zk-archetype/zk-archetype-webapp/target/classes/archetype-resources/
trunk/zk-archetype/zk-archetype-webapp/target/classes/archetype-resources/.classpath
trunk/zk-archetype/zk-archetype-webapp/target/classes/archetype-resources/.project
trunk/zk-archetype/zk-archetype-webapp/target/classes/archetype-resources/.settings/
trunk/zk-archetype/zk-archetype-webapp/target/classes/archetype-resources/.settings/org.eclipse.jdt.core.prefs
trunk/zk-archetype/zk-archetype-webapp/target/classes/archetype-resources/.settings/org.eclipse.m2e.core.prefs
trunk/zk-archetype/zk-archetype-webapp/target/classes/archetype-resources/.settings/org.maven.ide.eclipse.prefs
trunk/zk-archetype/zk-archetype-webapp/target/classes/archetype-resources/assembly/
trunk/zk-archetype/zk-archetype-webapp/target/classes/archetype-resources/assembly/demo.xml
trunk/zk-archetype/zk-archetype-webapp/target/classes/archetype-resources/pom.xml
trunk/zk-archetype/zk-archetype-webapp/target/classes/archetype-resources/src/
trunk/zk-archetype/zk-archetype-webapp/target/classes/archetype-resources/src/main/
trunk/zk-archetype/zk-archetype-webapp/target/classes/archetype-resources/src/main/java/
trunk/zk-archetype/zk-archetype-webapp/target/classes/archetype-resources/src/main/java/DemoWindowComposer.java
trunk/zk-archetype/zk-archetype-webapp/target/classes/archetype-resources/src/main/webapp/
trunk/zk-archetype/zk-archetype-webapp/target/classes/archetype-resources/src/main/webapp/META-INF/
trunk/zk-archetype/zk-archetype-webapp/target/classes/archetype-resources/src/main/webapp/META-INF/MANIFEST.MF
trunk/zk-archetype/zk-archetype-webapp/target/classes/archetype-resources/src/main/webapp/WEB-INF/
trunk/zk-archetype/zk-archetype-webapp/target/classes/archetype-resources/src/main/webapp/WEB-INF/web.xml
trunk/zk-archetype/zk-archetype-webapp/target/classes/archetype-resources/src/main/webapp/WEB-INF/zk.xml
trunk/zk-archetype/zk-archetype-webapp/target/classes/archetype-resources/src/main/webapp/index.zul
trunk/zk-archetype/zk-archetype-webapp/target/classes/archetype-resources/src/main/webapp/timeout.zul
trunk/zk-archetype/zk-archetype-webapp/target/zk-archetype-webapp-0.8.1-bundle.jar
trunk/zk-archetype/zk-archetype-webapp/target/zk-archetype-webapp-0.8.1.jar
Added: trunk/zk-archetype/.project
===================================================================
--- trunk/zk-archetype/.project (rev 0)
+++ trunk/zk-archetype/.project 2011-09-15 04:33:13 UTC (rev 1116)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>zk-archetype</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ </natures>
+</projectDescription>
Added: trunk/zk-archetype/.settings/org.maven.ide.eclipse.prefs
===================================================================
--- trunk/zk-archetype/.settings/org.maven.ide.eclipse.prefs (rev 0)
+++ trunk/zk-archetype/.settings/org.maven.ide.eclipse.prefs 2011-09-15 04:33:13 UTC (rev 1116)
@@ -0,0 +1,8 @@
+#Mon Jul 18 12:38:12 CST 2011
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
+version=1
Added: trunk/zk-archetype/pom.xml
===================================================================
--- trunk/zk-archetype/pom.xml (rev 0)
+++ trunk/zk-archetype/pom.xml 2011-09-15 04:33:13 UTC (rev 1116)
@@ -0,0 +1,14 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.zkoss</groupId>
+ <artifactId>zk-archetype</artifactId>
+ <version>0.8.1-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <name>ZK Archetype Project</name>
+ <description>ZK Archetype Project</description>
+ <modules>
+ <module>zk-archetype-component</module>
+ <module>zk-archetype-webapp</module>
+ </modules>
+</project>
\ No newline at end of file
Added: trunk/zk-archetype/zk-archetype-component/.classpath
===================================================================
--- trunk/zk-archetype/zk-archetype-component/.classpath (rev 0)
+++ trunk/zk-archetype/zk-archetype-component/.classpath 2011-09-15 04:33:13 UTC (rev 1116)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Added: trunk/zk-archetype/zk-archetype-component/.project
===================================================================
--- trunk/zk-archetype/zk-archetype-component/.project (rev 0)
+++ trunk/zk-archetype/zk-archetype-component/.project 2011-09-15 04:33:13 UTC (rev 1116)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>zk-archetype-component</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ </natures>
+</projectDescription>
Added: trunk/zk-archetype/zk-archetype-component/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/zk-archetype/zk-archetype-component/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/zk-archetype/zk-archetype-component/.settings/org.eclipse.jdt.core.prefs 2011-09-15 04:33:13 UTC (rev 1116)
@@ -0,0 +1,6 @@
+#Wed Jul 13 17:27:28 CST 2011
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.5
Added: trunk/zk-archetype/zk-archetype-component/.settings/org.maven.ide.eclipse.prefs
===================================================================
--- trunk/zk-archetype/zk-archetype-component/.settings/org.maven.ide.eclipse.prefs (rev 0)
+++ trunk/zk-archetype/zk-archetype-component/.settings/org.maven.ide.eclipse.prefs 2011-09-15 04:33:13 UTC (rev 1116)
@@ -0,0 +1,8 @@
+#Wed Jul 13 17:27:12 CST 2011
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
+version=1
Added: trunk/zk-archetype/zk-archetype-component/assembly/bundle.xml
===================================================================
--- trunk/zk-archetype/zk-archetype-component/assembly/bundle.xml (rev 0)
+++ trunk/zk-archetype/zk-archetype-component/assembly/bundle.xml 2011-09-15 04:33:13 UTC (rev 1116)
@@ -0,0 +1,19 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+ <id>bundle</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <files>
+ <file>
+ <source>pom.xml</source>
+ <outputDirectory>/</outputDirectory>
+ </file>
+ <file>
+ <source>${project.build.directory}/${project.artifactId}-${project.version}.jar</source>
+ <outputDirectory>/</outputDirectory>
+ </file>
+ </files>
+</assembly>
Added: trunk/zk-archetype/zk-archetype-component/pom.xml
===================================================================
--- trunk/zk-archetype/zk-archetype-component/pom.xml (rev 0)
+++ trunk/zk-archetype/zk-archetype-component/pom.xml 2011-09-15 04:33:13 UTC (rev 1116)
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.zkoss</groupId>
+ <artifactId>zk-archetype-component</artifactId>
+ <version>0.8.1</version>
+ <packaging>maven-archetype</packaging>
+
+ <name>zk-archetype-component</name>
+
+ <build>
+ <extensions>
+ <extension>
+ <groupId>org.apache.maven.archetype</groupId>
+ <artifactId>archetype-packaging</artifactId>
+ <version>2.0</version>
+ </extension>
+ </extensions>
+
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-archetype-plugin</artifactId>
+ <version>2.0</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2</version>
+ <executions>
+ <execution>
+ <id>bundle</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>assembly/bundle.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Added: trunk/zk-archetype/zk-archetype-component/src/main/resources/META-INF/maven/archetype-metadata.xml
===================================================================
--- trunk/zk-archetype/zk-archetype-component/src/main/resources/META-INF/maven/archetype-metadata.xml (rev 0)
+++ trunk/zk-archetype/zk-archetype-component/src/main/resources/META-INF/maven/archetype-metadata.xml 2011-09-15 04:33:13 UTC (rev 1116)
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archetype-descriptor xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0 http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd" name="zkcomponent"
+ xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <requiredProperties>
+ <requiredProperty key="zk-version-since">
+ <defaultValue>5.0.6</defaultValue>
+ </requiredProperty>
+ <requiredProperty key="component-name"/>
+ <requiredProperty key="component-class"/>
+ </requiredProperties>
+
+ <fileSets>
+ <fileSet encoding="UTF-8">
+ <directory>assembly</directory>
+ <includes>
+ <include>**/*.xml</include>
+ </includes>
+ </fileSet>
+ <fileSet encoding="UTF-8">
+ <directory>zkdoc</directory>
+ <includes>
+ <include>COPYING</include>
+ </includes>
+ </fileSet>
+ <fileSet filtered="true" encoding="UTF-8">
+ <directory>zkdoc</directory>
+ <includes>
+ <include>release-note</include>
+ </includes>
+ </fileSet>
+ <fileSet filtered="true" packaged="true" encoding="UTF-8">
+ <directory>src/main/java</directory>
+ <includes>
+ <include>**/*.java</include>
+ </includes>
+ </fileSet>
+ <fileSet filtered="true" encoding="UTF-8">
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>**/*.xml</include>
+ <include>**/zk.wpd</include>
+ <include>**/__component-class__.js</include>
+ <include>**/__component-name__.js</include>
+ <include>**/__component-name__.css.dsp</include>
+ </includes>
+ </fileSet>
+ <!-- webapp test -->
+ <fileSet filtered="true" encoding="UTF-8">
+ <directory>src/test/java</directory>
+ <includes>
+ <include>**/*.java</include>
+ </includes>
+ </fileSet>
+ <fileSet encoding="UTF-8">
+ <directory>src/test/webapp</directory>
+ <includes>
+ <include>timeout.zul</include>
+ </includes>
+ </fileSet>
+ <fileSet filtered="true" encoding="UTF-8">
+ <directory>src/test/webapp</directory>
+ <includes>
+ <include>index.zul</include>
+ </includes>
+ </fileSet>
+ <fileSet encoding="UTF-8">
+ <directory>src/test/webapp/META-INF</directory>
+ <includes>
+ <include>MANIFEST.MF</include>
+ </includes>
+ </fileSet>
+ <fileSet encoding="UTF-8">
+ <directory>src/test/webapp/WEB-INF</directory>
+ <includes>
+ <include>zk.xml</include>
+ </includes>
+ </fileSet>
+ <fileSet filtered="true" encoding="UTF-8">
+ <directory>src/test/webapp/WEB-INF</directory>
+ <includes>
+ <include>web.xml</include>
+ </includes>
+ </fileSet>
+ <!-- eclipse project setting -->
+ <fileSet encoding="UTF-8">
+ <directory>.settings</directory>
+ <includes>
+ <include>**/*.prefs</include>
+ </includes>
+ </fileSet>
+ <fileSet filtered="true" encoding="UTF-8">
+ <directory></directory>
+ <includes>
+ <include>.project</include>
+ </includes>
+ </fileSet>
+ <fileSet encoding="UTF-8">
+ <directory></directory>
+ <includes>
+ <include>.classpath</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</archetype-descriptor>
Added: trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/.classpath
===================================================================
--- trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/.classpath (rev 0)
+++ trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/.classpath 2011-09-15 04:33:13 UTC (rev 1116)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" output="target/classes" path="src/main/java"/>
+ <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
+ <classpathentry kind="src" output="target/classes" path="src/test/java"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Added: trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/.project
===================================================================
--- trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/.project (rev 0)
+++ trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/.project 2011-09-15 04:33:13 UTC (rev 1116)
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>${artifactId}</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
+ </natures>
+</projectDescription>
Added: trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/.settings/org.eclipse.jdt.core.prefs 2011-09-15 04:33:13 UTC (rev 1116)
@@ -0,0 +1,6 @@
+#Wed Jul 13 15:02:00 CST 2011
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.5
Added: trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/.settings/org.eclipse.m2e.core.prefs
===================================================================
--- trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/.settings/org.eclipse.m2e.core.prefs (rev 0)
+++ trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/.settings/org.eclipse.m2e.core.prefs 2011-09-15 04:33:13 UTC (rev 1116)
@@ -0,0 +1,5 @@
+#Mon Sep 05 16:36:01 CST 2011
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
Added: trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/.settings/org.maven.ide.eclipse.prefs
===================================================================
--- trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/.settings/org.maven.ide.eclipse.prefs (rev 0)
+++ trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/.settings/org.maven.ide.eclipse.prefs 2011-09-15 04:33:13 UTC (rev 1116)
@@ -0,0 +1,8 @@
+#Wed Jul 13 15:02:00 CST 2011
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
+version=1
Added: trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/assembly/bin.xml
===================================================================
--- trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/assembly/bin.xml (rev 0)
+++ trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/assembly/bin.xml 2011-09-15 04:33:13 UTC (rev 1116)
@@ -0,0 +1,34 @@
+<assembly
+ xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+ <id>bin</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <fileSets>
+ <fileSet>
+ <directory>${project.build.directory}/javadoc</directory>
+ <outputDirectory>/javadoc</outputDirectory>
+ </fileSet>
+ </fileSets>
+ <files>
+ <file>
+ <source>${project.build.directory}/${project.artifactId}-${version}.jar</source>
+ <destName>${project.artifactId}.jar</destName>
+ <outputDirectory>/dist/lib</outputDirectory>
+ </file>
+ <file>
+ <source>${project.build.directory}/${project.artifactId}-source.jar</source>
+ <outputDirectory>/dist/src</outputDirectory>
+ </file>
+ <file>
+ <source>${project.basedir}/zkdoc/COPYING</source>
+ <outputDirectory>/doc</outputDirectory>
+ </file>
+ <file>
+ <source>${project.basedir}/zkdoc/release-note</source>
+ <outputDirectory>/doc</outputDirectory>
+ </file>
+ </files>
+</assembly>
Added: trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/assembly/bundle.xml
===================================================================
--- trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/assembly/bundle.xml (rev 0)
+++ trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/assembly/bundle.xml 2011-09-15 04:33:13 UTC (rev 1116)
@@ -0,0 +1,23 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+ <id>bundle</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <files>
+ <file>
+ <source>pom.xml</source>
+ <outputDirectory>/</outputDirectory>
+ </file>
+ <file>
+ <source>${project.build.directory}/${project.artifactId}-${project.version}.jar</source>
+ <outputDirectory>/</outputDirectory>
+ </file>
+ <file>
+ <source>${project.build.directory}/${project.artifactId}-${project.version}-source.jar</source>
+ <outputDirectory>/</outputDirectory>
+ </file>
+ </files>
+</assembly>
Added: trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/assembly/source.xml
===================================================================
--- trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/assembly/source.xml (rev 0)
+++ trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/assembly/source.xml 2011-09-15 04:33:13 UTC (rev 1116)
@@ -0,0 +1,16 @@
+<assembly
+ xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+ <id>source</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>${project.basedir}/src/main/java</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ </fileSets>
+</assembly>
Added: trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/assembly/src.xml
===================================================================
--- trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/assembly/src.xml (rev 0)
+++ trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/assembly/src.xml 2011-09-15 04:33:13 UTC (rev 1116)
@@ -0,0 +1,28 @@
+<assembly
+ xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+ <id>src</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <fileSets>
+ <fileSet>
+ <directory>${project.basedir}</directory>
+ <excludes>
+ <exclude>${project.build.directory}/</exclude>
+ </excludes>
+ <outputDirectory>/${project.artifactId}</outputDirectory>
+ </fileSet>
+ </fileSets>
+ <files>
+ <file>
+ <source>${project.basedir}/zkdoc/COPYING</source>
+ <outputDirectory>/doc</outputDirectory>
+ </file>
+ <file>
+ <source>${project.basedir}/zkdoc/release-note</source>
+ <outputDirectory>/doc</outputDirectory>
+ </file>
+ </files>
+</assembly>
Added: trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/pom.xml
===================================================================
--- trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/pom.xml (rev 0)
+++ trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/pom.xml 2011-09-15 04:33:13 UTC (rev 1116)
@@ -0,0 +1,216 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>${groupId}</groupId>
+ <artifactId>${artifactId}</artifactId>
+ <version>${version}</version>
+ <properties>
+ <zk.version>${zk-version-since}</zk.version>
+ <maven.build.timestamp.format>yyyy-MM-dd</maven.build.timestamp.format>
+ <packname>-${version}-FL-${maven.build.timestamp}</packname>
+ </properties>
+ <packaging>jar</packaging>
+ <name>The ${artifactId} library</name>
+ <description>The ${artifactId} library</description>
+ <licenses>
+ <license>
+ <name>GNU General Public License, Version 2.0</name>
+ <url>http://www.gnu.org/licenses/gpl.html</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <repositories>
+ <repository>
+ <id>zk repository</id>
+ <url>http://mavensync.zkoss.org/maven2</url>
+ </repository>
+ <repository>
+ <id>ZK EE Evaluation</id>
+ <url>http://mavensync.zkoss.org/zk/ee-eval</url>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>zkmaven</id>
+ <name>zk maven repository</name>
+ <url>http://mavensync.zkoss.org/maven2/</url>
+ </pluginRepository>
+ </pluginRepositories>
+ <dependencies>
+ <dependency>
+ <groupId>org.zkoss.theme</groupId>
+ <artifactId>breeze</artifactId>
+ <version>${zk.version}</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.zkoss.zk</groupId>
+ <artifactId>zkmax</artifactId>
+ <version>${zk.version}</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.zkoss.zk</groupId>
+ <artifactId>zkplus</artifactId>
+ <version>${zk.version}</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.zkoss.zk</groupId>
+ <artifactId>zhtml</artifactId>
+ <version>${zk.version}</version>
+ <optional>true</optional>
+ </dependency>
+ </dependencies>
+ <build>
+ <testOutputDirectory>${project.build.directory}/classes</testOutputDirectory>
+ <plugins>
+ <plugin>
+ <groupId>org.zkoss.maven</groupId>
+ <artifactId>yuicompressor-maven-plugin-zk</artifactId>
+ <version>1.1.6</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>compress</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.2</version>
+ <configuration>
+ <source>1.4</source>
+ <target>1.4</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.3.1</version>
+ <configuration>
+ <excludes>
+ <exclude>**/ctrl/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.7</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ <charset>UTF-8</charset>
+ <reportOutputDirectory>${project.basedir}/target/javadoc</reportOutputDirectory>
+ <destDir>${artifactId}</destDir>
+ <show>protected</show>
+ </configuration>
+ <goals>
+ <goal>javadoc</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2</version>
+ <executions>
+ <execution>
+ <id>source</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <finalName>${project.artifactId}</finalName>
+ <descriptors>
+ <descriptor>assembly/source.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ <execution>
+ <id>bin</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <finalName>${project.artifactId}-bin${packname}</finalName>
+ <appendAssemblyId>false</appendAssemblyId>
+ <descriptors>
+ <descriptor>assembly/bin.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ <execution>
+ <id>bundle</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>assembly/source.xml</descriptor>
+ <descriptor>assembly/bundle.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ <execution>
+ <id>src</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <finalName>${project.artifactId}-src${packname}</finalName>
+ <appendAssemblyId>false</appendAssemblyId>
+ <descriptors>
+ <descriptor>assembly/src.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ <pluginManagement>
+ <plugins>
+ <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>
+ org.zkoss.maven
+ </groupId>
+ <artifactId>
+ yuicompressor-maven-plugin-zk
+ </artifactId>
+ <versionRange>
+ [1.1.6,)
+ </versionRange>
+ <goals>
+ <goal>compress</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+</project>
Added: trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/src/main/java/Version.java
===================================================================
--- trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/src/main/java/Version.java (rev 0)
+++ trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/src/main/java/Version.java 2011-09-15 04:33:13 UTC (rev 1116)
@@ -0,0 +1,7 @@
+package ${package};
+
+public class Version {
+ /** Returns the version UID.
+ */
+ public static final String UID = "${version}";
+}
Added: trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/src/main/java/__component-class__.java
===================================================================
--- trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/src/main/java/__component-class__.java (rev 0)
+++ trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/src/main/java/__component-class__.java 2011-09-15 04:33:13 UTC (rev 1116)
@@ -0,0 +1,40 @@
+package ${package};
+
+import org.zkoss.lang.Objects;
+import org.zkoss.zul.impl.XulElement;
+
+public class ${component-class} extends XulElement {
+
+ /* Here's a simple example for how to implements a member field */
+
+ private String _text;
+
+ public String getText() {
+ return _text;
+ }
+
+ public void setText(String text) {
+
+ if (!Objects.equals(_text, text)) {
+ _text = text;
+ smartUpdate("text", _text);
+ }
+ }
+
+
+ //super//
+ protected void renderProperties(org.zkoss.zk.ui.sys.ContentRenderer renderer)
+ throws java.io.IOException {
+ super.renderProperties(renderer);
+
+ render(renderer, "text", _text);
+ }
+
+ /**
+ * The default zclass is "z-${component-name}"
+ */
+ public String getZclass() {
+ return (this._zclass != null ? this._zclass : "z-${component-name}");
+ }
+}
+
Added: trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/src/main/resources/metainfo/zk/lang-addon.xml
===================================================================
--- trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/src/main/resources/metainfo/zk/lang-addon.xml (rev 0)
+++ trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/src/main/resources/metainfo/zk/lang-addon.xml 2011-09-15 04:33:13 UTC (rev 1116)
@@ -0,0 +1,32 @@
+<language-addon>
+ <addon-name>${artifactId}</addon-name>
+ <version>
+ <version-class>${package}.Version</version-class>
+ <version-uid>${version}</version-uid>
+ <zk-version>${zk-version-since}</zk-version><!-- or later -->
+ </version>
+
+ <language-name>xul/html</language-name>
+ <component>
+ <component-name>${component-name}</component-name> <!-- required -->
+ <component-class>${package}.${component-class}</component-class> <!-- required -->
+ <widget-class>${artifactId}.${component-class}</widget-class> <!-- required -->
+ <mold>
+ <mold-name>default</mold-name>
+ <mold-uri>mold/${component-name}.js</mold-uri>
+
+ <!--
+ == Tip in advance ==
+ You don't have to specify a css.dsp if you need not ,
+ but usually you need it.
+
+ You could assign a .css file ,too.
+
+ The css.dsp is almost as same as CSS file ,
+ but have more powerful enhancement. (like EL support.)
+ ====
+ -->
+ <css-uri>css/${component-name}.css.dsp</css-uri>
+ </mold>
+ </component>
+</language-addon>
\ No newline at end of file
Added: trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/src/main/resources/web/js/__artifactId__/__component-class__.js
===================================================================
--- trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/src/main/resources/web/js/__artifactId__/__component-class__.js (rev 0)
+++ trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/src/main/resources/web/js/__artifactId__/__component-class__.js 2011-09-15 04:33:13 UTC (rev 1116)
@@ -0,0 +1,103 @@
+/**
+ *
+ * Base naming rule:
+ * The stuff start with "_" means private , end with "_" means protect ,
+ * others mean public.
+ *
+ * All the member field should be private.
+ *
+ * Life cycle: (It's very important to know when we bind the event)
+ * A widget will do this by order :
+ * 1. $init
+ * 2. set attributes (setters)
+ * 3. rendering mold (@see mold/${artifactId}.js )
+ * 4. call bind_ to bind the event to dom .
+ *
+ * this.deskop will be assigned after super bind_ is called,
+ * so we use it to determine whether we need to update view
+ * manually in setter or not.
+ * If this.desktop exist , means it's after mold rendering.
+ *
+ */
+${artifactId}.${component-class} = zk.$extends(zul.Widget, {
+ _text:'', //default value for text attribute
+
+ /**
+ * Don't use array/object as a member field, it's a restriction for ZK object,
+ * it will work like a static , share with all the same Widget class instance.
+ *
+ * if you really need this , assign it in bind_ method to prevent any trouble.
+ *
+ * TODO:check array or object , must be one of them ...I forgot. -_- by Tony
+ */
+
+ $define: {
+ /**
+ * The member in $define means that it has its own setter/getter.
+ * (It's a coding sugar.)
+ *
+ * If you don't get this ,
+ * you could see the comment below for another way to do this.
+ *
+ * It's more clear.
+ *
+ */
+ text: function() { //this function will be called after setText() .
+
+ if(this.desktop) {
+ //updated UI here.
+ }
+ }
+ },
+ /**
+ * If you don't like the way in $define ,
+ * you could do the setter/getter by yourself here.
+ *
+ * Like the example below, they are the same as we mentioned in $define section.
+ */
+ /*
+ getText:function(){ return this._text; },
+ setText:function(val){
+ this._text = val;
+ if(this.desktop){
+ //update the UI here.
+ }
+ },
+ */
+
+ bind_: function () {
+ /**
+ * For widget lifecycle , the super bind_ should be called
+ * as FIRST STATEMENT in the function.
+ * DONT'T forget to call supers in bind_ , or you will get error.
+ */
+ this.$supers(${artifactId}.${component-class},'bind_', arguments);
+
+ //A example for domListen_ , REMEMBER to do domUnlisten in unbind_.
+ //this.domListen_(this.$n("cave"), "onClick", "_doItemsClick");
+ },
+
+ /*
+ A example for domListen_ listener.
+ */
+ /*
+ _doItemsClick: function (evt) {
+ alert("item click event fired");
+ },
+ */
+ unbind_: function () {
+
+ // A example for domUnlisten_ , should be paired with bind_
+ // this.domUnlisten_(this.$n("cave"), "onClick", "_doItemsClick");
+
+ /*
+ * For widget lifecycle , the super unbind_ should be called
+ * as LAST STATEMENT in the function.
+ */
+ this.$supers(${artifactId}.${component-class},'unbind_', arguments);
+ },
+
+ getZclass: function () {
+ return this._zclass != null ? this._zclass: "z-${component-name}";
+ }
+});
\ No newline at end of file
Added: trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/src/main/resources/web/js/__artifactId__/css/__component-name__.css.dsp
===================================================================
--- trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/src/main/resources/web/js/__artifactId__/css/__component-name__.css.dsp (rev 0)
+++ trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/src/main/resources/web/js/__artifactId__/css/__component-name__.css.dsp 2011-09-15 04:33:13 UTC (rev 1116)
@@ -0,0 +1,8 @@
+<%--
+ Here you could do any styling job you want , all CSS stuff.
+--%>
+<%@ taglib uri="http://www.zkoss.org/dsp/web/core" prefix="c" %>
+
+.z-${component-name}{
+ color:black;
+}
\ No newline at end of file
Added: trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/src/main/resources/web/js/__artifactId__/mold/__component-name__.js
===================================================================
--- trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/src/main/resources/web/js/__artifactId__/mold/__component-name__.js (rev 0)
+++ trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/src/main/resources/web/js/__artifactId__/mold/__component-name__.js 2011-09-15 04:33:13 UTC (rev 1116)
@@ -0,0 +1,21 @@
+/**
+* Here's the mold file , a mold means a HTML struct that the widget really presented.
+* yep, we build html in Javascript , that make it more clear and powerful.
+*/
+function (out) {
+
+ //Here you call the "this" means the widget instance. (@see ${component-xlass}.js)
+
+ var zcls = this.getZclass(),
+ uuid = this.uuid;
+
+ //The this.domAttrs_() means it will prepare some dom attributes,
+ //like the pseudo code below
+ /*
+ class="${zcls} ${this.getSclass()}" id="${uuid}"
+ */
+ out.push('<span ', this.domAttrs_(), '>');
+ out.push(this._text);
+ out.push('</span>');
+
+}
\ No newline at end of file
Added: trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/src/main/resources/web/js/__artifactId__/zk.wpd
===================================================================
--- trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/src/main/resources/web/js/__artifactId__/zk.wpd (rev 0)
+++ trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/src/main/resources/web/js/__artifactId__/zk.wpd 2011-09-15 04:33:13 UTC (rev 1116)
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ZK Widget Package Definition
+
+ ZK will load javascript by WPD , (i.e. zk.wpd , zul.inp.wpd ...etc )
+ that means all the widget definition in the package will be packed into single file in runtime ,
+ and be loaded when the component is accessed.
+
+ == Tip in advance ==
+ To prevent too many client Javascript requests for speeding up the loading,
+ sometimes you will consider to merge multiple packages in lang-addon.xml .
+ (@see lang-addon.xml)
+
+ We are not promising anything about the merging config ,
+ you have to check the order and dependency carefully when you merge it,
+ especially the dependency for "zul.lang" , it couldn't be merged with any package.
+ ====
+
+
+ Options:
+
+ * depends
+
+ If you are developing your own package ,
+ and you need to access a existing widget (ex.zul.db.Datebox) ,
+ which your widget inherit from or need to instance for ,
+
+ that means your package count on the package (ex. "zul.db") ,
+ then you have to specify the package as "depends".
+
+ i.e.
+ <package name="my.package.name" language="xul/html" depends="zul.db">
+ <widget name="MyWidget" />
+ </package>
+
+ You might depend multiple packages , use comma to separate them.
+ i.e. depends="zk.fmt,zul.inp"
+
+ When ZK try to load the package , it will load the dependency first.
+
+-->
+<package name="${artifactId}" language="xul/html" depends="zul" >
+
+ <!--
+
+ == Tip in advance ==
+ You could also specify a general javascript file here,
+ it's not always required to be a widget definition.
+
+ For example , if you try to wrap some jQuery plug-in as a Widget ,
+ you might need to load some plug-in source code before you writing your widget.
+
+ Just place JS files in the package folder , and write the definition
+ <script src="js-file-a.js" />
+ <script src="js-file-b.js" />
+ ====
+
+ -->
+
+ <widget name="${component-class}" />
+</package>
\ No newline at end of file
Added: trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/src/test/java/ctrl/DemoWindowComposer.java
===================================================================
--- trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/src/test/java/ctrl/DemoWindowComposer.java (rev 0)
+++ trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/src/test/java/ctrl/DemoWindowComposer.java 2011-09-15 04:33:13 UTC (rev 1116)
@@ -0,0 +1,22 @@
+package ctrl;
+
+import ${package}.${component-class};
+import org.zkoss.zk.ui.Component;
+import org.zkoss.zk.ui.event.ForwardEvent;
+import org.zkoss.zk.ui.event.MouseEvent;
+import org.zkoss.zk.ui.util.GenericForwardComposer;
+
+public class DemoWindowComposer extends GenericForwardComposer {
+
+ private ${component-class} myComp;
+
+ public void doAfterCompose(Component comp) throws Exception {
+ super.doAfterCompose(comp);
+ myComp.setText("Hello ZK Component!! Please click me.");
+ }
+
+ public void onClick$myComp (ForwardEvent event) {
+ MouseEvent mouseEvent = (MouseEvent) event.getOrigin();
+ alert("You listen onClick: " + mouseEvent.getTarget());
+ }
+}
\ No newline at end of file
Added: trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/src/test/webapp/META-INF/MANIFEST.MF
===================================================================
--- trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/src/test/webapp/META-INF/MANIFEST.MF (rev 0)
+++ trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/src/test/webapp/META-INF/MANIFEST.MF 2011-09-15 04:33:13 UTC (rev 1116)
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path:
+
Added: trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/src/test/webapp/WEB-INF/web.xml
===================================================================
--- trunk/zk-archetype/zk-archetype-component/src/main/resources/archetype-resources/src/test/webapp/WEB-INF/web.xml (rev 0)
+++ trunk/zk-archetype/zk-archetype-component/src/main/resources/arche...
[truncated message content] |
|
From: <whk...@us...> - 2011-07-12 07:20:24
|
Revision: 1115
http://zkforge.svn.sourceforge.net/zkforge/?rev=1115&view=rev
Author: whkuoattaiwan
Date: 2011-07-12 07:20:18 +0000 (Tue, 12 Jul 2011)
Log Message:
-----------
fix bug 3361148
Modified Paths:
--------------
trunk/todo/src/org/zkforge/todo/event/EventDAO.java
Modified: trunk/todo/src/org/zkforge/todo/event/EventDAO.java
===================================================================
--- trunk/todo/src/org/zkforge/todo/event/EventDAO.java 2011-05-22 20:25:05 UTC (rev 1114)
+++ trunk/todo/src/org/zkforge/todo/event/EventDAO.java 2011-07-12 07:20:18 UTC (rev 1115)
@@ -73,9 +73,9 @@
// get connection
conn = DriverManager.getConnection(url, user, pwd);
stmt = conn.createStatement();
- if (stmt.executeUpdate("delete from event where id = '" + evt.getId() + "'") > 0);
- result = true;
-
+ if (stmt.executeUpdate("delete from event where id = '" + evt.getId() + "'") > 0){
+ result = true;
+ }
} catch (SQLException e) {
e.printStackTrace();
}finally {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sim...@us...> - 2011-05-22 20:25:11
|
Revision: 1114
http://zkforge.svn.sourceforge.net/zkforge/?rev=1114&view=rev
Author: simon_massey
Date: 2011-05-22 20:25:05 +0000 (Sun, 22 May 2011)
Log Message:
-----------
some comments building four years later
Modified Paths:
--------------
trunk/foodToGo/README.txt
trunk/foodToGo/src/main/java/org/zkforge/ftg/RestaurantFacade.java
Modified: trunk/foodToGo/README.txt
===================================================================
--- trunk/foodToGo/README.txt 2010-12-24 06:34:56 UTC (rev 1113)
+++ trunk/foodToGo/README.txt 2011-05-22 20:25:05 UTC (rev 1114)
@@ -1,15 +1,16 @@
See http://www.zkoss.org/smalltalks/foodtogo/zkfoodtogo.dsp for a detailed guide.
-You need Maven2 from http://maven.apache.org/ and add it to your PATH environment variable:
+You need Maven2.2.1 (does not compile with Maven3!) from http://maven.apache.org/ and add it to your PATH environment variable:
-1. Extract the zip file Extract the zip file pia-zk-1.zip that is with the folder foodToGo/dist/pia
-2. Opem a shell (cmd.exe or bash) and cd to the lowest pia-zk-1.0 folder extracted from the zip file where the main pom.xml is located
-3. mvn install
-4. cd back up to the footToGo folder
-5. mvn install
+1. Extract the zip file Extract the zip file pia-zk-1.zip that is in the folder foodToGo/dist/pia
+2. Open a shell (cmd.exe or bash) and cd down into the pia-zk-1.0 folder extracted from the zip which contains a pom.xml
+3. Install pia with "mvn install" (note you will get errors on building some modules but enough builds)
+4. cd back up to the top level folder which contains a pom.xml and build with "mvn install"
+5. to run the webapp type "mvn jetty:run" which will leave jetty up and browse to http://localhost:8080 and follow the link
+[to kill jetty press Ctrl+c]
-The output will tell you where it placed the war file.
+The output of stoep 4 will tell you where it placed the war file.
Simon Massey
Modified: trunk/foodToGo/src/main/java/org/zkforge/ftg/RestaurantFacade.java
===================================================================
--- trunk/foodToGo/src/main/java/org/zkforge/ftg/RestaurantFacade.java 2010-12-24 06:34:56 UTC (rev 1113)
+++ trunk/foodToGo/src/main/java/org/zkforge/ftg/RestaurantFacade.java 2011-05-22 20:25:05 UTC (rev 1114)
@@ -29,19 +29,19 @@
/*
* A method to add a new restaurant to the system.
* @param restaurant The Restaurant to add to the system.
- * @returns A result object that has a status to indicate success or falure.
+ * @returns A result object that has a status to indicate success or failure.
*/
public RestaurantFacadeResult addRestaurant(Restaurant restaurant);
/*
* A method to save a restaurant into the system.
* @param restaurant The Restaurant to save.
- * @returns A result object that has a status to indicate success or falure.
+ * @returns A result object that has a status to indicate success or failure.
*/
public RestaurantFacadeResult saveRestaurant(Restaurant restaurant);
/*
- * A method to list all of the restaurants within the systme.
+ * A method to list all of the restaurants within the system.
* @returns A collection of all of the restaurants in the system.
*/
public RestaurantFacadeResult listRestaurants();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sim...@us...> - 2010-12-24 06:35:02
|
Revision: 1113
http://zkforge.svn.sourceforge.net/zkforge/?rev=1113&view=rev
Author: simon_massey
Date: 2010-12-24 06:34:56 +0000 (Fri, 24 Dec 2010)
Log Message:
-----------
bumped version of zktodo2 for mvvm example.
Modified Paths:
--------------
trunk/zktodo2/pom.xml
Modified: trunk/zktodo2/pom.xml
===================================================================
--- trunk/zktodo2/pom.xml 2010-12-11 21:35:06 UTC (rev 1112)
+++ trunk/zktodo2/pom.xml 2010-12-24 06:34:56 UTC (rev 1113)
@@ -4,7 +4,7 @@
<groupId>org.zkforge.zktodo2</groupId>
<artifactId>zktodo2</artifactId>
<packaging>war</packaging>
- <version>1.3</version>
+ <version>1.4</version>
<name>zktodo2</name>
<url>http://java.dzone.com/articles/using-desktop-model-view</url>
<repositories>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sim...@us...> - 2010-12-11 21:35:13
|
Revision: 1112
http://zkforge.svn.sourceforge.net/zkforge/?rev=1112&view=rev
Author: simon_massey
Date: 2010-12-11 21:35:06 +0000 (Sat, 11 Dec 2010)
Log Message:
-----------
MVVM Databindings, Statebindings and Commandbindings weather station demo.
Modified Paths:
--------------
trunk/zktodo2/src/main/java/org/zkforge/zktodo2/binding/CommandBinderInit.java
trunk/zktodo2/src/main/resources/test-context.xml
trunk/zktodo2/src/main/webapp/zktodo_c.zul
Added Paths:
-----------
trunk/zktodo2/src/main/java/org/zkforge/zktodo2/mvvm/
trunk/zktodo2/src/main/java/org/zkforge/zktodo2/mvvm/demo/
trunk/zktodo2/src/main/java/org/zkforge/zktodo2/mvvm/demo/Station.java
trunk/zktodo2/src/main/java/org/zkforge/zktodo2/mvvm/demo/WeathStationViewModel.java
trunk/zktodo2/src/main/webapp/mvvm-demo/
trunk/zktodo2/src/main/webapp/mvvm-demo/weather-station-mvvm.zul
Removed Paths:
-------------
trunk/zktodo2/src/main/java/org/zkforge/zktodo2/mvvm/demo/CommandBindingDemoTarget.java
trunk/zktodo2/src/main/java/org/zkforge/zktodo2/other/
trunk/zktodo2/src/main/webapp/demo/
trunk/zktodo2/src/main/webapp/mvvm-demo/commandBinderDemo.zul
Modified: trunk/zktodo2/src/main/java/org/zkforge/zktodo2/binding/CommandBinderInit.java
===================================================================
--- trunk/zktodo2/src/main/java/org/zkforge/zktodo2/binding/CommandBinderInit.java 2010-12-05 16:50:56 UTC (rev 1111)
+++ trunk/zktodo2/src/main/java/org/zkforge/zktodo2/binding/CommandBinderInit.java 2010-12-11 21:35:06 UTC (rev 1112)
@@ -102,7 +102,7 @@
final String propName = (String) it.next();
- if (propName.startsWith("on")) {
+ if (propName.startsWith("on") ) {
final Object[] annotationDetails = loadPropertyAnnotation(comp,
propName, annotName);
Deleted: trunk/zktodo2/src/main/java/org/zkforge/zktodo2/mvvm/demo/CommandBindingDemoTarget.java
===================================================================
--- trunk/zktodo2/src/main/java/org/zkforge/zktodo2/other/CommandBindingDemoTarget.java 2010-12-05 15:20:38 UTC (rev 1109)
+++ trunk/zktodo2/src/main/java/org/zkforge/zktodo2/mvvm/demo/CommandBindingDemoTarget.java 2010-12-11 21:35:06 UTC (rev 1112)
@@ -1,32 +0,0 @@
-package org.zkforge.zktodo2.other;
-
-import java.util.Date;
-
-import org.zkoss.zk.ui.Component;
-import org.zkoss.zk.ui.util.Composer;
-import org.zkoss.zul.api.Textbox;
-
-public class CommandBindingDemoTarget implements Composer {
-
- private Textbox output;
-
- public void doAfterCompose(Component comp) throws Exception {
- this.output = (Textbox) comp;
- }
-
- public void date( Date d ){
- output.setValue("Date is "+d);
- }
-
- public void integer( int i ){
- output.setValue("int is "+i);
- }
-
- public void text( String s){
- output.setValue("text is "+s);
- }
-
- public void click( ){
- output.setValue("clicked");
- }
-}
Added: trunk/zktodo2/src/main/java/org/zkforge/zktodo2/mvvm/demo/Station.java
===================================================================
--- trunk/zktodo2/src/main/java/org/zkforge/zktodo2/mvvm/demo/Station.java (rev 0)
+++ trunk/zktodo2/src/main/java/org/zkforge/zktodo2/mvvm/demo/Station.java 2010-12-11 21:35:06 UTC (rev 1112)
@@ -0,0 +1,82 @@
+package org.zkforge.zktodo2.mvvm.demo;
+
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.Random;
+
+public class Station {
+ private String name = "";
+ private Date date = new Date();
+ private int target = 0;
+ private int actual = 0;
+ private boolean confirmed = false;
+ public boolean getConfirmed() {
+ return confirmed;
+ }
+
+ public void setConfirmed(boolean confirmed) {
+ this.confirmed = confirmed;
+ }
+
+ public int getVariance() {
+ return Math.abs(target-actual);
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public Date getDate() {
+ return date;
+ }
+
+ public void setDate(Date date) {
+ this.date = date;
+ }
+
+ public int getTarget() {
+ return target;
+ }
+
+ public void setTarget(int target) {
+ this.target = target;
+ }
+
+ public int getActual() {
+ return actual;
+ }
+
+ public void setActual(int actual) {
+ this.actual = actual;
+ }
+
+ public static Station random() {
+ Random random = new Random();
+ Station station = new Station();
+ StringBuilder builder = new StringBuilder();
+ for( int i = 0; i < 2; i++ ){
+ char randC = randomUpperCaseLetter();
+ builder.append(randC);
+ }
+ builder.append((int) (Math.random() * 999));
+ station.name = builder.toString();
+ station.date = new GregorianCalendar(2010, random.nextInt(12), random.nextInt(29)).getTime();
+ station.target = random.nextInt(80);
+ station.actual = random.nextInt(80);
+ station.confirmed = (random.nextInt(100) >= 50)?true:false;
+ return station;
+ }
+ private static char randomUpperCaseLetter() {
+ final int asciiUpperMax = 90;
+ final int asciiUpperMin = 65;
+ int range = asciiUpperMax-asciiUpperMin;
+ int rand = (int) (Math.random() * range) + asciiUpperMin;
+ char[] randCs = Character.toChars(rand);
+ char randC = randCs[0];
+ return randC;
+ }
+}
Copied: trunk/zktodo2/src/main/java/org/zkforge/zktodo2/mvvm/demo/WeathStationViewModel.java (from rev 1109, trunk/zktodo2/src/main/java/org/zkforge/zktodo2/other/CommandBindingDemoTarget.java)
===================================================================
--- trunk/zktodo2/src/main/java/org/zkforge/zktodo2/mvvm/demo/WeathStationViewModel.java (rev 0)
+++ trunk/zktodo2/src/main/java/org/zkforge/zktodo2/mvvm/demo/WeathStationViewModel.java 2010-12-11 21:35:06 UTC (rev 1112)
@@ -0,0 +1,67 @@
+package org.zkforge.zktodo2.mvvm.demo;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class WeathStationViewModel {
+
+ public WeathStationViewModel(){
+ for( int i = 0; i < 10; i++ ) {
+ Station s = Station.random();
+ stations.add(s);
+ }
+ }
+
+ Station station = new Station();
+
+ public boolean getStationIsNotNew(){
+ return this.stations.contains(station);
+ }
+
+ public Station getStation() {
+ return station;
+ }
+
+ public void setStation(Station station) {
+ this.station = station;
+ }
+
+ List<Station> stations = new ArrayList<Station>();
+
+ public List<Station> getStations() {
+ return stations;
+ }
+
+ public void setStations(List<Station> stations) {
+ this.stations = stations;
+ }
+
+ public void create() {
+ this.station = new Station();
+ return;
+ }
+
+ public void add(){
+ if( !this.stations.contains(station)) {
+ this.stations.add(this.station);
+ }
+ return;
+ }
+
+ public boolean isValidToAdd(){
+ boolean validToAdd = false;
+ if( this.station != null ){
+ if( this.station.getName() != null ){
+ if( !this.station.getName().equals("")){
+ validToAdd = true;
+ }
+ }
+ }
+ return validToAdd;
+ }
+
+ public boolean isNotValidToAdd(){
+ return !this.isValidToAdd();
+ }
+
+}
Modified: trunk/zktodo2/src/main/resources/test-context.xml
===================================================================
--- trunk/zktodo2/src/main/resources/test-context.xml 2010-12-05 16:50:56 UTC (rev 1111)
+++ trunk/zktodo2/src/main/resources/test-context.xml 2010-12-11 21:35:06 UTC (rev 1112)
@@ -9,7 +9,7 @@
http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
">
- <bean id="testBean" class="org.zkforge.zktodo2.other.CommandBindingDemoTarget" scope="desktop" />
+ <bean id="testBean" class="org.zkforge.zktodo2.mvvm.demo.WeathStationViewModel" scope="desktop" />
</beans>
Deleted: trunk/zktodo2/src/main/webapp/mvvm-demo/commandBinderDemo.zul
===================================================================
--- trunk/zktodo2/src/main/webapp/demo/commandBinderDemo.zul 2010-12-05 15:20:38 UTC (rev 1109)
+++ trunk/zktodo2/src/main/webapp/mvvm-demo/commandBinderDemo.zul 2010-12-11 21:35:06 UTC (rev 1112)
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?page title="Test Command Binder"?>
-<?init class="org.zkforge.zktodo2.binding.CommandBinderInit" root="./buttons" ?>
-<?init class="org.zkforge.zktodo2.binding.CommandBinderInit" root="./inputs" commandClass="org.zkforge.zktodo2.binding.OnChangeCommandBinder"?>
-<?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver" ?>
-<zk xmlns="http://www.zkoss.org/2005/zul">
-<window title="Test Command Binder" width="640px" border="normal">
-<vbox>
- <hbox id="inputs">
- Textbox:<textbox id="text" cols="40" onChanging="@{testBean}"/>
- Intbox:<intbox id="integer" cols="1" onChange="@{testBean}"/>
- Datebox:<datebox id="date" cols="14" onChange="@{testBean}"/>
- </hbox>
- <hbox id="buttons">
- <button id="click" label="ClickMe" width="36px" height="24px" onClick="@{testBean}"/>
- </hbox>
- Output: <textbox apply="${testBean}"/>
-</vbox>
-</window>
-</zk>
Copied: trunk/zktodo2/src/main/webapp/mvvm-demo/weather-station-mvvm.zul (from rev 1109, trunk/zktodo2/src/main/webapp/demo/commandBinderDemo.zul)
===================================================================
--- trunk/zktodo2/src/main/webapp/mvvm-demo/weather-station-mvvm.zul (rev 0)
+++ trunk/zktodo2/src/main/webapp/mvvm-demo/weather-station-mvvm.zul 2010-12-11 21:35:06 UTC (rev 1112)
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?page title="Weather Station MVVM Demo - Inspired By "?>
+<?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
+<?init class="org.zkforge.zktodo2.binding.CommandBinderInit" root="./buttons"?>
+<?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver" ?>
+<!--
+This example is inspired by Martin Fowler's Weather Station example at
+http://martinfowler.com/eaaDev/uiArchs.html
+ -->
+<zk xmlns="http://www.zkoss.org/2005/zul">
+<style>
+.z-intbox { color: red; }
+.z-intbox-disd, .z-intbox-disd * { color: black !important; background: #fff !important;}
+.z-textbox-disd, .z-textbox-disd * { color: black !important; background: #fff !important;}
+</style>
+ <window title="Databindings, Statebindings & CommandBindings" width="640px" border="normal">
+ <hbox width="100px">
+
+ <div width="200px">
+ <listbox id="list" multiple="true" rows="12"
+ model="@{testBean.stations, load-after='add.onClick'}" selectedItem="@{testBean.station}">
+ <listhead>
+ <listheader label="Station" />
+ </listhead>
+ <listitem self="@{each=station}">
+ <listcell label="@{station.name}" />
+ </listitem>
+ </listbox>
+ </div>
+ <grid width="350px">
+ <rows>
+ <row>
+ Station
+ <textbox id="nameTextbox" value="@{testBean.station.name, load-after='create.onClick'}" disabled="@{testBean.stationIsNotNew, load-after='create.onClick,add.onClick,list.onSelect'}" />
+ </row>
+ <row>
+ Date
+ <datebox value="@{testBean.station.date, load-after='create.onClick'}"/>
+ </row>
+ <row>
+ Target
+ <intbox value="@{testBean.station.target, load-after='create.onClick'}" disabled="@{testBean.stationIsNotNew, load-after='create.onClick,list.onSelect'}" />
+ </row>
+ <row>
+ Actual
+ <intbox id="actualIntbox" value="@{testBean.station.actual, load-after='create.onClick'}" disabled="@{testBean.station.confirmed, load-after='confirmedCheckbox.onChange'}" />
+ </row>
+ <row>
+ Variance
+ <intbox value="@{testBean.station.variance, load-after='actualIntbox.onChange,create.onClick'}" disabled="true" />
+ </row>
+ <row>
+ Confirmed
+ <checkbox id="confirmedCheckbox" checked="@{testBean.station.confirmed, load-after='create.onClick'}" />
+ </row>
+ <row id="buttons">
+ <div>
+ </div>
+ <div>
+ <button id="create" label="New" onClick="@{testBean}"/>
+ <button id="add" label="Add" onClick="@{testBean}" disabled="@{testBean.isNotValidToAdd, load-after='nameTextbox.onChange'}"/>
+ </div>
+ </row>
+ </rows>
+ </grid>
+ </hbox>
+ </window>
+</zk>
Modified: trunk/zktodo2/src/main/webapp/zktodo_c.zul
===================================================================
--- trunk/zktodo2/src/main/webapp/zktodo_c.zul 2010-12-05 16:50:56 UTC (rev 1111)
+++ trunk/zktodo2/src/main/webapp/zktodo_c.zul 2010-12-11 21:35:06 UTC (rev 1112)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?page title="ZkTodo2 - MVVM Example"?>
<?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
-<?init class="org.zkforge.zktodo2.binding.CommandBinderInit" root="./buttons" commandClass="x.y.z"?>
+<?init class="org.zkforge.zktodo2.binding.CommandBinderInit" root="./buttons"?>
<?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver" ?>
<zk xmlns="http://www.zkoss.org/2005/zul">
<window title="To Do List" width="640px" border="normal">
@@ -27,7 +27,6 @@
value="@{toDoViewModel.selectedReminder.date, load-after='add.onClick,delete.onClick'}"/>
</hbox>
<hbox id="buttons">
- <button id="getSelectedReminder" label="broken" width="46px" height="24px" onClick="@{toDoViewModel}"/>
<button id="add" label="Add" width="36px" height="24px" onClick="@{toDoViewModel}"/>
<button id="update" label="Update" width="46px" height="24px" onClick="@{toDoViewModel}"/>
<button id="delete" label="Delete" width="46px" height="24px" onClick="@{toDoViewModel}"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sim...@us...> - 2010-12-05 16:51:03
|
Revision: 1111
http://zkforge.svn.sourceforge.net/zkforge/?rev=1111&view=rev
Author: simon_massey
Date: 2010-12-05 16:50:56 +0000 (Sun, 05 Dec 2010)
Log Message:
-----------
typo in comment.
Modified Paths:
--------------
trunk/zktodo2/src/main/java/org/zkforge/zktodo2/binding/CommandBinder.java
Modified: trunk/zktodo2/src/main/java/org/zkforge/zktodo2/binding/CommandBinder.java
===================================================================
--- trunk/zktodo2/src/main/java/org/zkforge/zktodo2/binding/CommandBinder.java 2010-12-05 16:33:48 UTC (rev 1110)
+++ trunk/zktodo2/src/main/java/org/zkforge/zktodo2/binding/CommandBinder.java 2010-12-05 16:50:56 UTC (rev 1111)
@@ -14,7 +14,7 @@
if (m.getName().equals(methodName)) {
comp.addEventListener(eventName, new EventListener() {
public void onEvent(Event event) throws Exception {
- Object[] parameters = new Object[]{}; // default is void method signiture
+ Object[] parameters = new Object[]{}; // default is void method signature
if( converter != null ){
parameters = converter.coerceToModelParameters(event, m);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sim...@us...> - 2010-12-05 16:33:54
|
Revision: 1110
http://zkforge.svn.sourceforge.net/zkforge/?rev=1110&view=rev
Author: simon_massey
Date: 2010-12-05 16:33:48 +0000 (Sun, 05 Dec 2010)
Log Message:
-----------
CommandBinder now had converter.
Modified Paths:
--------------
trunk/zktodo2/src/main/java/org/zkforge/zktodo2/binding/CommandBinder.java
trunk/zktodo2/src/main/java/org/zkforge/zktodo2/binding/CommandBinderInit.java
trunk/zktodo2/src/main/webapp/demo/commandBinderDemo.zul
Added Paths:
-----------
trunk/zktodo2/src/main/java/org/zkforge/zktodo2/binding/CommandConverter.java
trunk/zktodo2/src/main/java/org/zkforge/zktodo2/binding/InputEventCommandConverter.java
Removed Paths:
-------------
trunk/zktodo2/src/main/java/org/zkforge/zktodo2/binding/OnChangeCommandBinder.java
Modified: trunk/zktodo2/src/main/java/org/zkforge/zktodo2/binding/CommandBinder.java
===================================================================
--- trunk/zktodo2/src/main/java/org/zkforge/zktodo2/binding/CommandBinder.java 2010-12-05 15:20:38 UTC (rev 1109)
+++ trunk/zktodo2/src/main/java/org/zkforge/zktodo2/binding/CommandBinder.java 2010-12-05 16:33:48 UTC (rev 1110)
@@ -8,17 +8,16 @@
public class CommandBinder {
- protected Object[] extractMethodParametersFromEvent( Event e ){
- return new Object[]{};
- }
-
- public CommandBinder(Component comp, String eventName, final Object target, String methodName) {
+ public CommandBinder(Component comp, String eventName, final Object target, String methodName, final CommandConverter converter) {
Method[] methods = target.getClass().getDeclaredMethods();
for (final Method m : methods) {
if (m.getName().equals(methodName)) {
comp.addEventListener(eventName, new EventListener() {
public void onEvent(Event event) throws Exception {
- Object[] parameters = extractMethodParametersFromEvent(event);
+ Object[] parameters = new Object[]{}; // default is void method signiture
+ if( converter != null ){
+ parameters = converter.coerceToModelParameters(event, m);
+ }
try {
m.invoke(target, parameters);
} catch (Exception e) {
Modified: trunk/zktodo2/src/main/java/org/zkforge/zktodo2/binding/CommandBinderInit.java
===================================================================
--- trunk/zktodo2/src/main/java/org/zkforge/zktodo2/binding/CommandBinderInit.java 2010-12-05 15:20:38 UTC (rev 1109)
+++ trunk/zktodo2/src/main/java/org/zkforge/zktodo2/binding/CommandBinderInit.java 2010-12-05 16:33:48 UTC (rev 1110)
@@ -1,6 +1,5 @@
package org.zkforge.zktodo2.binding;
-import java.lang.reflect.Constructor;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -41,20 +40,10 @@
protected String root = null;
- protected Class<? extends CommandBinder> commandClass = CommandBinder.class;
-
@SuppressWarnings("unchecked")
public void doInit(Page page, Map args) throws Exception {
this.page = page;
-
root = (String) args.get("root");
-
- String commandClassName = (String) args.get("commandClass");
-
- if( commandClassName != null && !"".equals(commandClassName) ){
- commandClass = (Class<? extends CommandBinder>) Class.forName(commandClassName, true, CommandBinderInit.class.getClassLoader());
- }
-
return;
}
@@ -116,18 +105,29 @@
if (propName.startsWith("on")) {
final Object[] annotationDetails = loadPropertyAnnotation(comp,
propName, annotName);
- String value = (String) annotationDetails[0];
- final Object variable = page.getXelVariable(value);
+
+ String targetName = (String) annotationDetails[0];
- try {
- Constructor<? extends CommandBinder> constructor = commandClass.getConstructor(Component.class, String.class, Object.class, String.class);
- CommandBinder binder = constructor.newInstance(comp, propName, variable, id);
- System.out.println(binder);
- } catch (Exception e) {
- System.err.println("Cannot find constructor with signiture (Component, String, Object, String) for class "+commandClass.getCanonicalName());
- e.printStackTrace();
- }
+ final Object variable = page.getXelVariable(targetName);
+
+ CommandConverter converter = null;
+ String converterClassName = (String) annotationDetails[4];
+
+ if( converterClassName != null && !"".equals(converterClassName)) {
+
+ try {
+ @SuppressWarnings("unchecked")
+ Class<? extends CommandConverter> converterClass = (Class<? extends CommandConverter>)
+ Class.forName(converterClassName, true, CommandBinderInit.class.getClassLoader());
+ converter = converterClass.newInstance();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ new CommandBinder(comp, propName, variable, id, converter);
+
}
}
}
Added: trunk/zktodo2/src/main/java/org/zkforge/zktodo2/binding/CommandConverter.java
===================================================================
--- trunk/zktodo2/src/main/java/org/zkforge/zktodo2/binding/CommandConverter.java (rev 0)
+++ trunk/zktodo2/src/main/java/org/zkforge/zktodo2/binding/CommandConverter.java 2010-12-05 16:33:48 UTC (rev 1110)
@@ -0,0 +1,9 @@
+package org.zkforge.zktodo2.binding;
+
+import java.lang.reflect.Method;
+
+import org.zkoss.zk.ui.event.Event;
+
+public interface CommandConverter {
+ Object[] coerceToModelParameters( Event e, Method m );
+}
\ No newline at end of file
Copied: trunk/zktodo2/src/main/java/org/zkforge/zktodo2/binding/InputEventCommandConverter.java (from rev 1109, trunk/zktodo2/src/main/java/org/zkforge/zktodo2/binding/OnChangeCommandBinder.java)
===================================================================
--- trunk/zktodo2/src/main/java/org/zkforge/zktodo2/binding/InputEventCommandConverter.java (rev 0)
+++ trunk/zktodo2/src/main/java/org/zkforge/zktodo2/binding/InputEventCommandConverter.java 2010-12-05 16:33:48 UTC (rev 1110)
@@ -0,0 +1,30 @@
+package org.zkforge.zktodo2.binding;
+
+import java.lang.reflect.Method;
+
+import org.zkoss.zk.ui.Component;
+import org.zkoss.zk.ui.event.Event;
+import org.zkoss.zk.ui.event.InputEvent;
+import org.zkoss.zul.api.Datebox;
+import org.zkoss.zul.api.Intbox;
+
+public class InputEventCommandConverter implements CommandConverter {
+
+ public Object[] coerceToModelParameters(Event e, Method m) {
+ Component target = e.getTarget();
+ InputEvent ie = (InputEvent) e;
+
+ Object data = null;
+ if( target instanceof Intbox ){
+ data = Integer.parseInt(ie.getValue());
+ } else if ( target instanceof Datebox ) {
+ Datebox db = (Datebox)target;
+ data = db.getValue();
+ } else {
+ data = ie.getValue();
+ }
+
+ return new Object[]{data};
+ }
+
+}
Deleted: trunk/zktodo2/src/main/java/org/zkforge/zktodo2/binding/OnChangeCommandBinder.java
===================================================================
--- trunk/zktodo2/src/main/java/org/zkforge/zktodo2/binding/OnChangeCommandBinder.java 2010-12-05 15:20:38 UTC (rev 1109)
+++ trunk/zktodo2/src/main/java/org/zkforge/zktodo2/binding/OnChangeCommandBinder.java 2010-12-05 16:33:48 UTC (rev 1110)
@@ -1,34 +0,0 @@
-package org.zkforge.zktodo2.binding;
-
-import org.zkoss.zk.ui.Component;
-import org.zkoss.zk.ui.event.Event;
-import org.zkoss.zk.ui.event.InputEvent;
-import org.zkoss.zul.api.Datebox;
-import org.zkoss.zul.api.Intbox;
-
-public class OnChangeCommandBinder extends CommandBinder {
-
- public OnChangeCommandBinder(Component comp, String eventName,
- Object target, String methodName) {
- super(comp, eventName, target, methodName);
- }
-
- @Override
- protected Object[] extractMethodParametersFromEvent(Event e) {
- Component target = e.getTarget();
- InputEvent ie = (InputEvent) e;
-
- Object data = null;
- if( target instanceof Intbox ){
- data = Integer.parseInt(ie.getValue());
- } else if ( target instanceof Datebox ) {
- Datebox db = (Datebox)target;
- data = db.getValue();
- } else {
- data = ie.getValue();
- }
-
- return new Object[]{data};
- }
-
-}
Modified: trunk/zktodo2/src/main/webapp/demo/commandBinderDemo.zul
===================================================================
--- trunk/zktodo2/src/main/webapp/demo/commandBinderDemo.zul 2010-12-05 15:20:38 UTC (rev 1109)
+++ trunk/zktodo2/src/main/webapp/demo/commandBinderDemo.zul 2010-12-05 16:33:48 UTC (rev 1110)
@@ -1,15 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<?page title="Test Command Binder"?>
-<?init class="org.zkforge.zktodo2.binding.CommandBinderInit" root="./buttons" ?>
-<?init class="org.zkforge.zktodo2.binding.CommandBinderInit" root="./inputs" commandClass="org.zkforge.zktodo2.binding.OnChangeCommandBinder"?>
+<?init class="org.zkforge.zktodo2.binding.CommandBinderInit" ?>
<?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver" ?>
<zk xmlns="http://www.zkoss.org/2005/zul">
<window title="Test Command Binder" width="640px" border="normal">
<vbox>
<hbox id="inputs">
- Textbox:<textbox id="text" cols="40" onChanging="@{testBean}"/>
- Intbox:<intbox id="integer" cols="1" onChange="@{testBean}"/>
- Datebox:<datebox id="date" cols="14" onChange="@{testBean}"/>
+ Textbox:<textbox id="text" cols="40" onChanging="@{testBean, converter='org.zkforge.zktodo2.binding.InputEventCommandConverter'}"/>
+ Intbox:<intbox id="integer" cols="1" onChange="@{testBean, converter='org.zkforge.zktodo2.binding.InputEventCommandConverter'}"/>
+ Datebox:<datebox id="date" cols="14" onChange="@{testBean, converter='org.zkforge.zktodo2.binding.InputEventCommandConverter'}"/>
</hbox>
<hbox id="buttons">
<button id="click" label="ClickMe" width="36px" height="24px" onClick="@{testBean}"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sim...@us...> - 2010-12-05 15:20:45
|
Revision: 1109
http://zkforge.svn.sourceforge.net/zkforge/?rev=1109&view=rev
Author: simon_massey
Date: 2010-12-05 15:20:38 +0000 (Sun, 05 Dec 2010)
Log Message:
-----------
beefed up CommandBinderInit.
Modified Paths:
--------------
trunk/zktodo2/src/main/resources/spring-context.xml
trunk/zktodo2/src/main/webapp/WEB-INF/web.xml
trunk/zktodo2/src/main/webapp/zktodo_c.zul
Added Paths:
-----------
trunk/zktodo2/src/main/java/org/zkforge/zktodo2/ZkToDoViewModel.java
trunk/zktodo2/src/main/java/org/zkforge/zktodo2/binding/CommandBinder.java
trunk/zktodo2/src/main/java/org/zkforge/zktodo2/binding/CommandBinderInit.java
trunk/zktodo2/src/main/java/org/zkforge/zktodo2/binding/OnChangeCommandBinder.java
trunk/zktodo2/src/main/java/org/zkforge/zktodo2/other/
trunk/zktodo2/src/main/java/org/zkforge/zktodo2/other/CommandBindingDemoTarget.java
trunk/zktodo2/src/main/resources/test-context.xml
trunk/zktodo2/src/main/webapp/demo/
trunk/zktodo2/src/main/webapp/demo/commandBinderDemo.zul
Removed Paths:
-------------
trunk/zktodo2/src/main/java/org/zkforge/zktodo2/ZkToDoViewModelImpl.java
trunk/zktodo2/src/main/java/org/zkforge/zktodo2/binding/Command.java
trunk/zktodo2/src/main/java/org/zkforge/zktodo2/binding/CommandInit.java
trunk/zktodo2/src/main/java/org/zkforge/zktodo2/binding/CommandSource.java
Copied: trunk/zktodo2/src/main/java/org/zkforge/zktodo2/ZkToDoViewModel.java (from rev 1107, trunk/zktodo2/src/main/java/org/zkforge/zktodo2/ZkToDoViewModelImpl.java)
===================================================================
--- trunk/zktodo2/src/main/java/org/zkforge/zktodo2/ZkToDoViewModel.java (rev 0)
+++ trunk/zktodo2/src/main/java/org/zkforge/zktodo2/ZkToDoViewModel.java 2010-12-05 15:20:38 UTC (rev 1109)
@@ -0,0 +1,61 @@
+package org.zkforge.zktodo2;
+
+import java.util.List;
+
+public class ZkToDoViewModel {
+
+ public ZkToDoViewModel(){
+ this.selectedReminder = new Reminder();
+ }
+
+ protected Reminder selectedReminder;
+
+ public Reminder getSelectedReminder() {
+ return selectedReminder;
+ }
+
+ public void setSelectedReminder(Reminder reminder) {
+ this.selectedReminder = reminder;
+ if( this.selectedReminder == null ){
+ this.selectedReminder = new Reminder();
+ }
+ }
+
+ protected ReminderService reminderService;
+
+ public void setReminderService(ReminderService reminderService) {
+ this.reminderService = reminderService;
+ }
+
+ public List<Reminder> getReminders() {
+ return this.reminderService.findAll();
+ }
+
+ public void delete() {
+ if( this.selectedReminder.getId() != null ){
+ try {
+ this.reminderService.delete(selectedReminder);
+ this.selectedReminder = new Reminder();
+ } catch (EntityNotFoundException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+
+ public void update() {
+ if( this.selectedReminder.getId() != null ){
+ try {
+ this.reminderService.merge(selectedReminder);
+ } catch (EntityNotFoundException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+
+ public void add() {
+ if( this.selectedReminder.getId() == null ){
+ this.reminderService.persist(this.selectedReminder);
+ this.selectedReminder = new Reminder();
+ }
+ }
+}
Deleted: trunk/zktodo2/src/main/java/org/zkforge/zktodo2/ZkToDoViewModelImpl.java
===================================================================
--- trunk/zktodo2/src/main/java/org/zkforge/zktodo2/ZkToDoViewModelImpl.java 2010-12-05 11:04:42 UTC (rev 1108)
+++ trunk/zktodo2/src/main/java/org/zkforge/zktodo2/ZkToDoViewModelImpl.java 2010-12-05 15:20:38 UTC (rev 1109)
@@ -1,86 +0,0 @@
-package org.zkforge.zktodo2;
-
-import java.util.List;
-
-import org.zkforge.zktodo2.binding.Command;
-import org.zkforge.zktodo2.binding.CommandSource;
-
-public class ZkToDoViewModelImpl implements CommandSource {
-
- public ZkToDoViewModelImpl(){
- this.selectedReminder = new Reminder();
- }
-
- protected Reminder selectedReminder;
-
- public Reminder getSelectedReminder() {
- return selectedReminder;
- }
-
- public void setSelectedReminder(Reminder reminder) {
- this.selectedReminder = reminder;
- if( this.selectedReminder == null ){
- this.selectedReminder = new Reminder();
- }
- }
-
- protected ReminderService reminderService;
-
- public void setReminderService(ReminderService reminderService) {
- this.reminderService = reminderService;
- }
-
- public List<Reminder> getReminders() {
- return this.reminderService.findAll();
- }
-
- public Command getCommand(final String name) {
- Command command = null;
- if( name.equals("add")){
- command = new Command() {
- public void execute(Object... parameters) {
- add();
- }
- };
- } else if( name.equals("update")){
- command = new Command() {
- public void execute(Object... parameters) {
- update();
- }
- };
- } else if( name.equals("delete")) {
- command = new Command() {
- public void execute(Object... parameters) {
- delete();
- }
- };
- } return command;
- }
- protected void delete() {
- if( this.selectedReminder.getId() != null ){
- try {
- this.reminderService.delete(selectedReminder);
- this.selectedReminder = new Reminder();
- } catch (EntityNotFoundException e) {
- e.printStackTrace();
- }
- }
- }
-
- protected void update() {
- if( this.selectedReminder.getId() != null ){
- try {
- this.reminderService.merge(selectedReminder);
- } catch (EntityNotFoundException e) {
- e.printStackTrace();
- }
- }
- }
-
- protected void add() {
- if( this.selectedReminder.getId() == null ){
- this.reminderService.persist(this.selectedReminder);
- this.selectedReminder = new Reminder();
- }
- }
-}
Deleted: trunk/zktodo2/src/main/java/org/zkforge/zktodo2/binding/Command.java
===================================================================
--- trunk/zktodo2/src/main/java/org/zkforge/zktodo2/binding/Command.java 2010-12-05 11:04:42 UTC (rev 1108)
+++ trunk/zktodo2/src/main/java/org/zkforge/zktodo2/binding/Command.java 2010-12-05 15:20:38 UTC (rev 1109)
@@ -1,5 +0,0 @@
-package org.zkforge.zktodo2.binding;
-
-public interface Command {
- void execute(Object... parameters);
-}
Copied: trunk/zktodo2/src/main/java/org/zkforge/zktodo2/binding/CommandBinder.java (from rev 1107, trunk/zktodo2/src/main/java/org/zkforge/zktodo2/binding/Command.java)
===================================================================
--- trunk/zktodo2/src/main/java/org/zkforge/zktodo2/binding/CommandBinder.java (rev 0)
+++ trunk/zktodo2/src/main/java/org/zkforge/zktodo2/binding/CommandBinder.java 2010-12-05 15:20:38 UTC (rev 1109)
@@ -0,0 +1,55 @@
+package org.zkforge.zktodo2.binding;
+
+import java.lang.reflect.Method;
+
+import org.zkoss.zk.ui.Component;
+import org.zkoss.zk.ui.event.Event;
+import org.zkoss.zk.ui.event.EventListener;
+
+public class CommandBinder {
+
+ protected Object[] extractMethodParametersFromEvent( Event e ){
+ return new Object[]{};
+ }
+
+ public CommandBinder(Component comp, String eventName, final Object target, String methodName) {
+ Method[] methods = target.getClass().getDeclaredMethods();
+ for (final Method m : methods) {
+ if (m.getName().equals(methodName)) {
+ comp.addEventListener(eventName, new EventListener() {
+ public void onEvent(Event event) throws Exception {
+ Object[] parameters = extractMethodParametersFromEvent(event);
+ try {
+ m.invoke(target, parameters);
+ } catch (Exception e) {
+ final String message = new StringBuilder()
+ .append(this.getClass().getName())
+ .append(" exception on reflective invokation of ")
+ .append(target.getClass().getCanonicalName())
+ .append(".")
+ .append(m.getName())
+ .append(" using parameters ")
+ .append(format(parameters))
+ .toString();
+ System.err.println(message);
+ }
+ }
+
+ private String format(Object[] parameters) {
+ StringBuilder builder = new StringBuilder("{");
+ for( Object o : parameters ){
+ builder.append(" ")
+ .append(o.getClass().getName())
+ .append(":")
+ .append(o)
+ .append(",");
+ }
+ String s = builder.toString().substring(0, builder.toString().length() -1);
+ return s+" }";
+ }
+
+ });
+ }
+ }
+ }
+}
Copied: trunk/zktodo2/src/main/java/org/zkforge/zktodo2/binding/CommandBinderInit.java (from rev 1107, trunk/zktodo2/src/main/java/org/zkforge/zktodo2/binding/CommandInit.java)
===================================================================
--- trunk/zktodo2/src/main/java/org/zkforge/zktodo2/binding/CommandBinderInit.java (rev 0)
+++ trunk/zktodo2/src/main/java/org/zkforge/zktodo2/binding/CommandBinderInit.java 2010-12-05 15:20:38 UTC (rev 1109)
@@ -0,0 +1,134 @@
+package org.zkforge.zktodo2.binding;
+
+import java.lang.reflect.Constructor;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.zkoss.zk.ui.Component;
+import org.zkoss.zk.ui.Page;
+import org.zkoss.zk.ui.Path;
+import org.zkoss.zk.ui.sys.ComponentCtrl;
+import org.zkoss.zk.ui.util.Initiator;
+import org.zkoss.zk.ui.util.InitiatorExt;
+import org.zkoss.zkplus.databind.DataBinder;
+
+/**
+ * AnnotateDataBinderInit and AnnotateDataBinder have private rather than protected
+ * methods so are not extensible. This class therefore has some cut and paste from
+ * those classes.
+ *
+ * @author simon
+ *
+ */
+public class CommandBinderInit extends DataBinder implements Initiator, InitiatorExt {
+
+ private static final long serialVersionUID = 1L;
+
+ public boolean doCatch(Throwable t) throws Exception {
+ return false;
+ }
+
+ public void doFinally() throws Exception {
+ // nothing to do
+ }
+
+ public void doAfterCompose(Page p) throws Exception {
+ // nothing to do
+ }
+
+ protected Page page = null;
+
+ protected String root = null;
+
+ protected Class<? extends CommandBinder> commandClass = CommandBinder.class;
+
+ @SuppressWarnings("unchecked")
+ public void doInit(Page page, Map args) throws Exception {
+ this.page = page;
+
+ root = (String) args.get("root");
+
+ String commandClassName = (String) args.get("commandClass");
+
+ if( commandClassName != null && !"".equals(commandClassName) ){
+ commandClass = (Class<? extends CommandBinder>) Class.forName(commandClassName, true, CommandBinderInit.class.getClassLoader());
+ }
+
+ return;
+ }
+
+ /**
+ * The logic to resolve the component follows the logic documented for AnnotateDataBinderInit
+ */
+ public void doAfterCompose(Page page, Component[] components) throws Exception {
+ if( root == null ){
+ // load for everything on the page
+ for( final Component c : components ){
+ loadAnnotations(c);
+ }
+ } else {
+ if( root.startsWith("/") ) { // absolute path
+ final Component comp = Path.getComponent(root);
+ if( comp != null ) {
+ loadAnnotations(comp);
+ }
+ } else if( root.startsWith("./") || root.startsWith("../") ) { // scan relative paths
+ for( Component vroot : components ) {
+ final Component comp = Path.getComponent(vroot.getSpaceOwner(), root);
+ if( comp != null ){
+ loadAnnotations(comp);
+ }
+ }
+ }
+ }
+ return;
+ }
+
+ protected void loadAnnotations(Component comp) {
+
+ loadComponentPropertyAnnotationByAnnotName(comp, "default");
+
+ @SuppressWarnings("unchecked")
+ final List<Component> children = comp.getChildren();
+ for (final Iterator<Component> it = children.iterator(); it.hasNext(); ) {
+ loadAnnotations((Component) it.next()); //recursive
+ }
+ return;
+ }
+
+ protected void loadComponentPropertyAnnotationByAnnotName(Component comp,
+ String annotName) {
+ String id = comp.getId();
+ if (id == null && "".equals(id)) {
+ return;
+ }
+ ComponentCtrl compCtrl = (ComponentCtrl) comp;
+
+ @SuppressWarnings("unchecked")
+ final List<String> props = compCtrl.getAnnotatedPropertiesBy(annotName);
+
+ for (@SuppressWarnings("unchecked")
+ final Iterator it = props.iterator(); it.hasNext();) {
+
+ final String propName = (String) it.next();
+
+ if (propName.startsWith("on")) {
+ final Object[] annotationDetails = loadPropertyAnnotation(comp,
+ propName, annotName);
+ String value = (String) annotationDetails[0];
+ final Object variable = page.getXelVariable(value);
+
+ try {
+ Constructor<? extends CommandBinder> constructor = commandClass.getConstructor(Component.class, String.class, Object.class, String.class);
+ CommandBinder binder = constructor.newInstance(comp, propName, variable, id);
+ System.out.println(binder);
+ } catch (Exception e) {
+ System.err.println("Cannot find constructor with signiture (Component, String, Object, String) for class "+commandClass.getCanonicalName());
+ e.printStackTrace();
+ }
+
+ }
+ }
+ }
+}
Deleted: trunk/zktodo2/src/main/java/org/zkforge/zktodo2/binding/CommandInit.java
===================================================================
--- trunk/zktodo2/src/main/java/org/zkforge/zktodo2/binding/CommandInit.java 2010-12-05 11:04:42 UTC (rev 1108)
+++ trunk/zktodo2/src/main/java/org/zkforge/zktodo2/binding/CommandInit.java 2010-12-05 15:20:38 UTC (rev 1109)
@@ -1,90 +0,0 @@
-package org.zkforge.zktodo2.binding;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.zkoss.zk.ui.Component;
-import org.zkoss.zk.ui.Page;
-import org.zkoss.zk.ui.event.Event;
-import org.zkoss.zk.ui.event.EventListener;
-import org.zkoss.zk.ui.sys.ComponentCtrl;
-import org.zkoss.zk.ui.util.Initiator;
-import org.zkoss.zk.ui.util.InitiatorExt;
-import org.zkoss.zkplus.databind.DataBinder;
-import org.zkoss.zul.api.Window;
-
-public class CommandInit extends DataBinder implements Initiator, InitiatorExt {
-
- private static final long serialVersionUID = 1L;
-
- public boolean doCatch(Throwable t) throws Exception {
- return false;
- }
-
- public void doFinally() throws Exception {
- // nothing to do
- }
-
- @SuppressWarnings("unchecked")
- public void doInit(Page p, Map args) throws Exception {
- // nothing to do
- }
-
- public void doAfterCompose(Page p) throws Exception {
- // nothing to do
- }
-
- protected Page page = null;
-
- public void doAfterCompose(Page page, Component[] components) throws Exception {
- this.page = page;
- for( Component c : components ){
- if( Window.class.isAssignableFrom(c.getClass() )){
- for (@SuppressWarnings("unchecked")
- final Iterator<Component> it = page.getRoots().iterator(); it.hasNext(); ) {
- loadAnnotations((Component) it.next());
- }
- return;
- }
- }
- return;
- }
-
- private void loadAnnotations(Component comp) {
-
- loadComponentPropertyAnnotationByAnnotName(comp, "default");
-
- @SuppressWarnings("unchecked")
- final List<Component> children = comp.getChildren();
- for (final Iterator<Component> it = children.iterator(); it.hasNext(); ) {
- loadAnnotations((Component) it.next()); //recursive
- }
- return;
- }
-
- protected void loadComponentPropertyAnnotationByAnnotName(Component comp, String annotName) {
- ComponentCtrl compCtrl = (ComponentCtrl) comp;
- @SuppressWarnings("unchecked")
- final List<String> props = compCtrl.getAnnotatedPropertiesBy(annotName);
- for (@SuppressWarnings("unchecked")
- final Iterator it = props.iterator(); it.hasNext(); ) {
- final String propName = (String) it.next();
- if( propName.startsWith("on") ){
- final Object[] annotationDetails = loadPropertyAnnotation(comp, propName, annotName);
- String value = (String)annotationDetails[0];
- Object variable = page.getXelVariable(value);
- CommandSource commandSource = (CommandSource) variable;
- final Command command = commandSource.getCommand(comp.getId());
- if( command != null ){
- comp.addEventListener(propName, new EventListener() {
- public void onEvent(Event event) throws Exception {
- command.execute((Object[])null);
- }
- });
- }
- }
- }
- }
-
-}
Deleted: trunk/zktodo2/src/main/java/org/zkforge/zktodo2/binding/CommandSource.java
===================================================================
--- trunk/zktodo2/src/main/java/org/zkforge/zktodo2/binding/CommandSource.java 2010-12-05 11:04:42 UTC (rev 1108)
+++ trunk/zktodo2/src/main/java/org/zkforge/zktodo2/binding/CommandSource.java 2010-12-05 15:20:38 UTC (rev 1109)
@@ -1,5 +0,0 @@
-package org.zkforge.zktodo2.binding;
-
-public interface CommandSource {
- Command getCommand(String name);
-}
Added: trunk/zktodo2/src/main/java/org/zkforge/zktodo2/binding/OnChangeCommandBinder.java
===================================================================
--- trunk/zktodo2/src/main/java/org/zkforge/zktodo2/binding/OnChangeCommandBinder.java (rev 0)
+++ trunk/zktodo2/src/main/java/org/zkforge/zktodo2/binding/OnChangeCommandBinder.java 2010-12-05 15:20:38 UTC (rev 1109)
@@ -0,0 +1,34 @@
+package org.zkforge.zktodo2.binding;
+
+import org.zkoss.zk.ui.Component;
+import org.zkoss.zk.ui.event.Event;
+import org.zkoss.zk.ui.event.InputEvent;
+import org.zkoss.zul.api.Datebox;
+import org.zkoss.zul.api.Intbox;
+
+public class OnChangeCommandBinder extends CommandBinder {
+
+ public OnChangeCommandBinder(Component comp, String eventName,
+ Object target, String methodName) {
+ super(comp, eventName, target, methodName);
+ }
+
+ @Override
+ protected Object[] extractMethodParametersFromEvent(Event e) {
+ Component target = e.getTarget();
+ InputEvent ie = (InputEvent) e;
+
+ Object data = null;
+ if( target instanceof Intbox ){
+ data = Integer.parseInt(ie.getValue());
+ } else if ( target instanceof Datebox ) {
+ Datebox db = (Datebox)target;
+ data = db.getValue();
+ } else {
+ data = ie.getValue();
+ }
+
+ return new Object[]{data};
+ }
+
+}
Added: trunk/zktodo2/src/main/java/org/zkforge/zktodo2/other/CommandBindingDemoTarget.java
===================================================================
--- trunk/zktodo2/src/main/java/org/zkforge/zktodo2/other/CommandBindingDemoTarget.java (rev 0)
+++ trunk/zktodo2/src/main/java/org/zkforge/zktodo2/other/CommandBindingDemoTarget.java 2010-12-05 15:20:38 UTC (rev 1109)
@@ -0,0 +1,32 @@
+package org.zkforge.zktodo2.other;
+
+import java.util.Date;
+
+import org.zkoss.zk.ui.Component;
+import org.zkoss.zk.ui.util.Composer;
+import org.zkoss.zul.api.Textbox;
+
+public class CommandBindingDemoTarget implements Composer {
+
+ private Textbox output;
+
+ public void doAfterCompose(Component comp) throws Exception {
+ this.output = (Textbox) comp;
+ }
+
+ public void date( Date d ){
+ output.setValue("Date is "+d);
+ }
+
+ public void integer( int i ){
+ output.setValue("int is "+i);
+ }
+
+ public void text( String s){
+ output.setValue("text is "+s);
+ }
+
+ public void click( ){
+ output.setValue("clicked");
+ }
+}
Modified: trunk/zktodo2/src/main/resources/spring-context.xml
===================================================================
--- trunk/zktodo2/src/main/resources/spring-context.xml 2010-12-05 11:04:42 UTC (rev 1108)
+++ trunk/zktodo2/src/main/resources/spring-context.xml 2010-12-05 15:20:38 UTC (rev 1109)
@@ -85,7 +85,7 @@
MVVM version
-->
- <bean id="toDoViewModel" class="org.zkforge.zktodo2.ZkToDoViewModelImpl"
+ <bean id="toDoViewModel" class="org.zkforge.zktodo2.ZkToDoViewModel"
p:reminderService-ref="reminderService" scope="desktop" />
Added: trunk/zktodo2/src/main/resources/test-context.xml
===================================================================
--- trunk/zktodo2/src/main/resources/test-context.xml (rev 0)
+++ trunk/zktodo2/src/main/resources/test-context.xml 2010-12-05 15:20:38 UTC (rev 1109)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tx="http://www.springframework.org/schema/tx"
+ xmlns:p="http://www.springframework.org/schema/p" xmlns:aop="http://www.springframework.org/schema/aop"
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+ http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
+ ">
+
+ <bean id="testBean" class="org.zkforge.zktodo2.other.CommandBindingDemoTarget" scope="desktop" />
+
+
+</beans>
Modified: trunk/zktodo2/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/zktodo2/src/main/webapp/WEB-INF/web.xml 2010-12-05 11:04:42 UTC (rev 1108)
+++ trunk/zktodo2/src/main/webapp/WEB-INF/web.xml 2010-12-05 15:20:38 UTC (rev 1109)
@@ -5,7 +5,7 @@
<display-name>zktodo2</display-name>
<context-param>
<param-name>contextConfigLocation</param-name>
- <param-value>classpath:dataSourceContext.xml,classpath:spring-context.xml</param-value>
+ <param-value>classpath:dataSourceContext.xml,classpath:spring-context.xml,classpath:test-context.xml</param-value>
</context-param>
<!-- Spring -->
<listener>
Added: trunk/zktodo2/src/main/webapp/demo/commandBinderDemo.zul
===================================================================
--- trunk/zktodo2/src/main/webapp/demo/commandBinderDemo.zul (rev 0)
+++ trunk/zktodo2/src/main/webapp/demo/commandBinderDemo.zul 2010-12-05 15:20:38 UTC (rev 1109)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?page title="Test Command Binder"?>
+<?init class="org.zkforge.zktodo2.binding.CommandBinderInit" root="./buttons" ?>
+<?init class="org.zkforge.zktodo2.binding.CommandBinderInit" root="./inputs" commandClass="org.zkforge.zktodo2.binding.OnChangeCommandBinder"?>
+<?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver" ?>
+<zk xmlns="http://www.zkoss.org/2005/zul">
+<window title="Test Command Binder" width="640px" border="normal">
+<vbox>
+ <hbox id="inputs">
+ Textbox:<textbox id="text" cols="40" onChanging="@{testBean}"/>
+ Intbox:<intbox id="integer" cols="1" onChange="@{testBean}"/>
+ Datebox:<datebox id="date" cols="14" onChange="@{testBean}"/>
+ </hbox>
+ <hbox id="buttons">
+ <button id="click" label="ClickMe" width="36px" height="24px" onClick="@{testBean}"/>
+ </hbox>
+ Output: <textbox apply="${testBean}"/>
+</vbox>
+</window>
+</zk>
Modified: trunk/zktodo2/src/main/webapp/zktodo_c.zul
===================================================================
--- trunk/zktodo2/src/main/webapp/zktodo_c.zul 2010-12-05 11:04:42 UTC (rev 1108)
+++ trunk/zktodo2/src/main/webapp/zktodo_c.zul 2010-12-05 15:20:38 UTC (rev 1109)
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<?page title="ZkTodo2 - MVVM Example"?>
<?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
-<?init class="org.zkforge.zktodo2.binding.CommandInit" ?>
-<?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
+<?init class="org.zkforge.zktodo2.binding.CommandBinderInit" root="./buttons" commandClass="x.y.z"?>
+<?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver" ?>
<zk xmlns="http://www.zkoss.org/2005/zul">
<window title="To Do List" width="640px" border="normal">
<listbox id="list" multiple="true" rows="12" model="@{toDoViewModel.reminders, load-after='add.onClick,update.onClick,delete.onClick'}" selectedItem="@{toDoViewModel.selectedReminder}">
@@ -26,7 +26,8 @@
Date:<datebox id="date" cols="14" constraint="no empty"
value="@{toDoViewModel.selectedReminder.date, load-after='add.onClick,delete.onClick'}"/>
</hbox>
- <hbox>
+ <hbox id="buttons">
+ <button id="getSelectedReminder" label="broken" width="46px" height="24px" onClick="@{toDoViewModel}"/>
<button id="add" label="Add" width="36px" height="24px" onClick="@{toDoViewModel}"/>
<button id="update" label="Update" width="46px" height="24px" onClick="@{toDoViewModel}"/>
<button id="delete" label="Delete" width="46px" height="24px" onClick="@{toDoViewModel}"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|