Author: bbrossaud Date: 2010-06-30 12:03:45 +0200 (Wed, 30 Jun 2010) New Revision: 174 Url: http://nuiton.org/repositories/revision/wikitty/174 Log: addition paging to the wikitty list Modified: trunk/wikitty-ui-zk/pom.xml trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/WikittyController.java trunk/wikitty-ui-zk/src/main/webapp/index.zul trunk/wikitty-ui-zk/src/main/webapp/wikitty.zul Modified: trunk/wikitty-ui-zk/pom.xml =================================================================== --- trunk/wikitty-ui-zk/pom.xml 2010-06-29 16:47:37 UTC (rev 173) +++ trunk/wikitty-ui-zk/pom.xml 2010-06-30 10:03:45 UTC (rev 174) @@ -93,57 +93,21 @@ <dependency> <groupId>org.zkoss.zk</groupId> <artifactId>zk</artifactId> - <version>3.6.3</version> + <version>5.0.2</version> </dependency> <dependency> <groupId>org.zkoss.zk</groupId> - <artifactId>zhtml</artifactId> - <version>3.6.3</version> - </dependency> - - <dependency> - <groupId>org.zkoss.zk</groupId> - <artifactId>zkex</artifactId> - <version>3.6.3</version> - </dependency> - - <dependency> - <groupId>org.zkoss.zk</groupId> - <artifactId>zkmax</artifactId> - <version>3.6.3</version> - </dependency> - - <dependency> - <groupId>org.zkoss.zk</groupId> <artifactId>zkplus</artifactId> - <version>3.6.3</version> + <version>5.0.2</version> </dependency> <dependency> <groupId>org.zkoss.zk</groupId> - <artifactId>zml</artifactId> - <version>3.6.3</version> - </dependency> - - <dependency> - <groupId>org.zkoss.zk</groupId> <artifactId>zul</artifactId> - <version>3.6.3</version> + <version>5.0.2</version> </dependency> - <dependency> - <groupId>org.zkoss.zk</groupId> - <artifactId>zuljsf</artifactId> - <version>0.8.1</version> - </dependency> - - <dependency> - <groupId>org.zkoss.zk</groupId> - <artifactId>zuljsp</artifactId> - <version>1.0.0</version> - </dependency> - </dependencies> <!-- ************************************************************* --> Modified: trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/WikittyController.java =================================================================== --- trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/WikittyController.java 2010-06-29 16:47:37 UTC (rev 173) +++ trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/WikittyController.java 2010-06-30 10:03:45 UTC (rev 174) @@ -24,6 +24,7 @@ import org.zkoss.zul.Listcell; import org.zkoss.zul.Listitem; import org.zkoss.zul.ListitemRenderer; +import org.zkoss.zul.Popup; import org.zkoss.zul.Textbox; import org.zkoss.zul.Window; Modified: trunk/wikitty-ui-zk/src/main/webapp/index.zul =================================================================== --- trunk/wikitty-ui-zk/src/main/webapp/index.zul 2010-06-29 16:47:37 UTC (rev 173) +++ trunk/wikitty-ui-zk/src/main/webapp/index.zul 2010-06-30 10:03:45 UTC (rev 174) @@ -16,9 +16,9 @@ <label value="Password" /> <textbox id="selectPassword" /> </groupbox> - <button id="select" label="Select" width="36px" height="24px" /> - <button id="delete" label="Delete" width="36px" height="24px" /> - <button id="modify" label="Modify" width="36px" height="24px" /> + <button id="select" label="Select" height="24px" /> + <button id="delete" label="Delete" height="24px" /> + <button id="modify" label="Modify" height="24px" /> </groupbox> <groupbox> @@ -40,8 +40,8 @@ <label value="Password" /> <textbox id="password" /> </vbox> - <button id="add" label="Add" width="36px" height="24px" /> - <button id="update" label="Update" width="36px" height="24px" /> + <button id="add" label="Add" height="24px" /> + <button id="update" label="Update" height="24px" /> </groupbox> <groupbox> @@ -55,8 +55,8 @@ <label value="Password" /> <textbox id="distantPassword" /> </vbox> - <button id="distantAdd" label="Add" width="36px" height="24px" /> - <button id="distantUpdate" label="Update" width="36px" height="24px" /> + <button id="distantAdd" label="Add" height="24px" /> + <button id="distantUpdate" label="Update" height="24px" /> </groupbox> </window> \ No newline at end of file Modified: trunk/wikitty-ui-zk/src/main/webapp/wikitty.zul =================================================================== --- trunk/wikitty-ui-zk/src/main/webapp/wikitty.zul 2010-06-29 16:47:37 UTC (rev 173) +++ trunk/wikitty-ui-zk/src/main/webapp/wikitty.zul 2010-06-30 10:03:45 UTC (rev 174) @@ -4,7 +4,7 @@ Search: <textbox id="Search" /> <toolbarbutton id="home" label="Select another proxy"/> - <listbox id="extensionListBox" rows="8" model="@{win$composer.extensions}" + <listbox autopaging="true" mold="paging" id="extensionListBox" rows="5" model="@{win$composer.extensions}" selectedItem="@{win$composer.selectedExtension}"> <listhead> @@ -20,36 +20,35 @@ </listbox> <groupbox> - <caption label="wikitties" /> - <listbox multiple="true" id="wikittiesListBox" rows="8" model="@{win$composer.wikittyModel}" itemRenderer="@{win$composer.wikittyRenderer}" selectedItem="@{win$composer.selectedWikitty}"> + <listbox autopaging="true" mold="paging" id="wikittiesListBox" multiple="true" rows="10" model="@{win$composer.wikittyModel}" itemRenderer="@{win$composer.wikittyRenderer}" selectedItem="@{win$composer.selectedWikitty}"> <listhead sizable="true"> <listheader label="ID" /> <listheader label="Extensions" /> </listhead> </listbox> - <button id="delete" label="Delete" width="46px" height="24px"/> + <button id="delete" label="Delete" height="24px"/> </groupbox> <groupbox> <caption label="extensions" /> - <listbox id="formListBox" rows="10" model="@{win$composer.wikittyForm.formModel}" itemRenderer="@{win$composer.wikittyForm.fieldExtensionRenderer}"> + <listbox id="formListBox" model="@{win$composer.wikittyForm.formModel}" rows="7" itemRenderer="@{win$composer.wikittyForm.fieldExtensionRenderer}"> <listhead sizable="true"> <listheader label="Extension" /> <listheader label="Type" /> <listheader label="Content" /> </listhead> </listbox> - <button id="add" label="Add" width="36px" height="24px"/> - <button id="update" label="Update" width="46px" height="24px"/> - <button id="addNewInput" label="New input" width="56px" height="24px" /> - <button id="deleteInput" label="Delete input" width="56px" height="24px" /> + <button id="add" label="Add" height="24px"/> + <button id="update" label="Update" height="24px"/> + <button id="addNewInput" label="New input" height="24px" /> + <button id="deleteInput" label="Delete input" height="24px" /> <listbox id="newExtension" rows="1" mold="select" model="@{win$composer.extensions}" selectedItem="@{win$composer.selectedNewExtension}"> <listitem self="@{each='newExtension'}"> <listcell label="@{newExtension.name}"/> </listitem> </listbox> - <button id="addNewExtension" label="Add extension" width="66px" height="24px"/> + <button id="addNewExtension" label="Add extension" height="24px" /> </groupbox> </window> \ No newline at end of file