JBoss Rich Faces SVN: r13764 - in trunk/examples/photoalbum/web/src/main/webapp/includes: image and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: Alex.Kolonitsky
Date: 2009-04-22 10:32:52 -0400 (Wed, 22 Apr 2009)
New Revision: 13764
Modified:
trunk/examples/photoalbum/web/src/main/webapp/includes/album/albumEditInfo.xhtml
trunk/examples/photoalbum/web/src/main/webapp/includes/image/imageEditInfo.xhtml
trunk/examples/photoalbum/web/src/main/webapp/includes/shelf/shelfEditInfo.xhtml
trunk/examples/photoalbum/web/src/main/webapp/includes/userPrefs/userPrefsEdit.xhtml
Log:
Date validation
Modified: trunk/examples/photoalbum/web/src/main/webapp/includes/album/albumEditInfo.xhtml
===================================================================
(Binary files differ)
Modified: trunk/examples/photoalbum/web/src/main/webapp/includes/image/imageEditInfo.xhtml
===================================================================
(Binary files differ)
Modified: trunk/examples/photoalbum/web/src/main/webapp/includes/shelf/shelfEditInfo.xhtml
===================================================================
--- trunk/examples/photoalbum/web/src/main/webapp/includes/shelf/shelfEditInfo.xhtml 2009-04-22 14:22:05 UTC (rev 13763)
+++ trunk/examples/photoalbum/web/src/main/webapp/includes/shelf/shelfEditInfo.xhtml 2009-04-22 14:32:52 UTC (rev 13764)
@@ -16,26 +16,28 @@
<h:inputText id="shelf_name"
value="#{model.selectedShelf.name}"
styleClass="shelf-edit-input"
- required="true"/>
+ required="true">
+ <rich:ajaxValidator event="onblur"/>
+ </h:inputText>
</td>
</tr>
<tr>
<td style="padding:0; margin:0;" />
- <td style="padding:0; margin:0;" ><rich:message for="shelf_name" /></td>
+ <td style="padding:0; margin:0;" class="errors" ><rich:message for="shelf_name" /></td>
</tr>
<tr>
<td valign="top" nowrap="true" style="padding-top : 8px">
#{messages['creation_date']}
</td>
<td valign="top">
- <a4j:outputPanel id="calendar" layout="block">
+ <a4j:outputPanel id="calendar" layout="block" >
<rich:calendar id="shelf_date"
styleClass="shelf-edit-calendar"
enableManualInput="true"
value="#{model.selectedShelf.created}"
cellWidth="24px"
- cellHeight="22px">
- <rich:ajaxValidator event="onchange"/>
+ cellHeight="22px" >
+ <rich:ajaxValidator event="oninputblur" />
</rich:calendar>
</a4j:outputPanel>
<rich:message for="calendar" />
@@ -43,7 +45,7 @@
</tr>
<tr>
<td style="padding:0; margin:0;" />
- <td style="padding:0; margin:0;" ><rich:message for="shelf_date" /></td>
+ <td style="padding:0; margin:0;" class="errors" ><rich:message for="shelf_date" /></td>
</tr>
<tr>
<td valign="top" nowrap="true" style="padding-top : 8px">
Modified: trunk/examples/photoalbum/web/src/main/webapp/includes/userPrefs/userPrefsEdit.xhtml
===================================================================
(Binary files differ)
17 years
JBoss Rich Faces SVN: r13763 - trunk/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/tiny_mce.
by richfaces-svn-commits＠lists.jboss.org
Author: pyaschenko
Date: 2009-04-22 10:22:05 -0400 (Wed, 22 Apr 2009)
New Revision: 13763
Modified:
trunk/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/tiny_mce/tiny_mce_src.js
Log:
https://jira.jboss.org/jira/browse/RF-6083
Modified: trunk/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/tiny_mce/tiny_mce_src.js
===================================================================
--- trunk/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/tiny_mce/tiny_mce_src.js 2009-04-22 13:47:21 UTC (rev 13762)
+++ trunk/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/tiny_mce/tiny_mce_src.js 2009-04-22 14:22:05 UTC (rev 13763)
@@ -374,6 +374,7 @@
// to execute if the user presses cancel in an onbeforeunload
// confirm dialog and then presses the browser stop button
window.setTimeout(function() {
+ if (d)//RF: added by PY, RF-6083
d.detachEvent('onstop', stop);
}, 0);
}
17 years
JBoss Rich Faces SVN: r13762 - Plan and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: tkuprevich
Date: 2009-04-22 09:47:21 -0400 (Wed, 22 Apr 2009)
New Revision: 13762
Modified:
trunk/test-applications/qa/Test Plan/TestPlan-RF.doc
Log:
Modified: trunk/test-applications/qa/Test Plan/TestPlan-RF.doc
===================================================================
(Binary files differ)
17 years
JBoss Rich Faces SVN: r13761 - trunk/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: msorokin
Date: 2009-04-22 09:23:15 -0400 (Wed, 22 Apr 2009)
New Revision: 13761
Modified:
trunk/docs/userguide/en/src/main/docbook/included/dataTable.xml
Log:
https://jira.jboss.org/jira/browse/RF-6534
Updated the guide: added .rich-table-firstrow class
Modified: trunk/docs/userguide/en/src/main/docbook/included/dataTable.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/dataTable.xml 2009-04-22 13:15:47 UTC (rev 13760)
+++ trunk/docs/userguide/en/src/main/docbook/included/dataTable.xml 2009-04-22 13:23:15 UTC (rev 13761)
@@ -448,10 +448,10 @@
<entry>rich-table-row</entry>
<entry>Defines styles for a table row</entry>
</row>
- <!--row>
+ <row>
<entry>rich-table-firstrow</entry>
- <entry>Defines styles for a table start row</entry>
- </row-->
+ <entry>Defines styles for a table's first row</entry>
+ </row>
<row>
<entry>rich-table-footercell</entry>
17 years
JBoss Rich Faces SVN: r13760 - in trunk/examples/photoalbum/web/src/main: webapp/includes/album and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: Alex.Kolonitsky
Date: 2009-04-22 09:15:47 -0400 (Wed, 22 Apr 2009)
New Revision: 13760
Modified:
trunk/examples/photoalbum/web/src/main/resources/messages_en.properties
trunk/examples/photoalbum/web/src/main/resources/messages_ru.properties
trunk/examples/photoalbum/web/src/main/webapp/includes/album/albumInfo.xhtml
trunk/examples/photoalbum/web/src/main/webapp/includes/shelf/shelfInfo.xhtml
Log:
realworld/ui: "photo" and "picture" should be renamed to "image"
https://jira.jboss.org/jira/browse/RF-6819
Modified: trunk/examples/photoalbum/web/src/main/resources/messages_en.properties
===================================================================
--- trunk/examples/photoalbum/web/src/main/resources/messages_en.properties 2009-04-22 12:23:19 UTC (rev 13759)
+++ trunk/examples/photoalbum/web/src/main/resources/messages_en.properties 2009-04-22 13:15:47 UTC (rev 13760)
@@ -105,9 +105,7 @@
confirm.ok=OK
confirm.cancel=Cancel
shelf.edit=Edit shelf properties
-image.edit=Edit image
shelf.delete=Delete shelf
-image.delete=Delete album
album.edit=Edit album properties
album.delete=Delete album
album.delete.confirm=Are you sure? All images associated with this album will also dropped! Click OK to proceed, else click Cancel.
@@ -225,7 +223,7 @@
pics_into=pics into
new=new
shelf.albums=albums
-pics=pics
+images_=images
tags=Tags
original_size=Original size
@@ -235,16 +233,16 @@
shelf=Shelf:
choose_album=Choose album
error_during_upload=Error During upload:
-photo_upload_progress=Photo upload progress:
-photos_was_uploaded_to=photos was uploaded to
-photo_upload_complete=Photo upload complete:
+photo_upload_progress=Image upload progress:
+photos_was_uploaded_to=images was uploaded to
+photo_upload_complete=Image upload complete:
comments_for_this_photo_is_not_allowed=Comments for this photo is not allowed
-photo_name=Photo name
+photo_name=Image name
upload_date=Upload date
show_meta_information=Show meta information
popular_tags=Popular tags
direct_link=Direct link
-use_this_photo_like_current_album_cover=Use this photo like current album cover
+use_this_photo_like_current_album_cover=Use this image like current album cover
allow_commennts=Allow commennts
terms_and_conditions=Terms And Conditions
privacy_statement=Privacy Statement
Modified: trunk/examples/photoalbum/web/src/main/resources/messages_ru.properties
===================================================================
--- trunk/examples/photoalbum/web/src/main/resources/messages_ru.properties 2009-04-22 12:23:19 UTC (rev 13759)
+++ trunk/examples/photoalbum/web/src/main/resources/messages_ru.properties 2009-04-22 13:15:47 UTC (rev 13760)
@@ -147,7 +147,7 @@
pics_into=\u0438\u0437\u043E\u0431\u0440\u0430\u0436\u0435\u043D\u0438\u0439 \u0432
new=\u043D\u043E\u0432\u044B\u0445
shelf.albums=\u0430\u043B\u044C\u0431\u043E\u043C\u0435(\u0430\u0445)
-pics=\u0438\u0437\u043E\u0431\u0440\u0430\u0436\u0435\u043D\u0438\u0439
+images_=\u0438\u0437\u043E\u0431\u0440\u0430\u0436\u0435\u043D\u0438\u0439
tags=\u0422\u044D\u0433\u0438
comment.comments=\u041A\u043E\u043C\u0435\u043D\u0442\u0430\u0440\u0438\u0438
original_size=\u041E\u0440\u0438\u0433\u0438\u043D\u0430\u043B
Modified: trunk/examples/photoalbum/web/src/main/webapp/includes/album/albumInfo.xhtml
===================================================================
(Binary files differ)
Modified: trunk/examples/photoalbum/web/src/main/webapp/includes/shelf/shelfInfo.xhtml
===================================================================
(Binary files differ)
17 years
JBoss Rich Faces SVN: r13759 - trunk/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: msorokin
Date: 2009-04-22 08:23:19 -0400 (Wed, 22 Apr 2009)
New Revision: 13759
Modified:
trunk/docs/userguide/en/src/main/docbook/included/queue.xml
Log:
https://jira.jboss.org/jira/browse/RF-5952
New functionality of ignoreDupResponses is documented
Modified: trunk/docs/userguide/en/src/main/docbook/included/queue.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/queue.xml 2009-04-22 11:38:59 UTC (rev 13758)
+++ trunk/docs/userguide/en/src/main/docbook/included/queue.xml 2009-04-22 12:23:19 UTC (rev 13759)
@@ -119,8 +119,9 @@
</para>
<para>
- The <emphasis><property>"ignoreDupResponses"</property></emphasis> attribute that takes a boolean value can also help optimize your Ajax requests. The idea of the attribute is to cancel
- similar events and send the latest one to the server. This works only if similar events come sequentially.
+ The <emphasis><property>"ignoreDupResponses"</property></emphasis> attribute that takes a boolean value can also help optimize your Ajax requests.
+ If set to true, response processing for request will not occur if a similar request is already waiting in the queue. New request will be fired immediately when the response from the previous one returns.
+
</para>
<para>
@@ -137,7 +138,7 @@
<para>In this example, the requests are glued together and only the last one is submitted.</para>
- <para>Another key attribute that easies revers load is <emphasis><property
+ <para>Another key attribute that easies server load is <emphasis><property
>"timeout"</property></emphasis>.
The attribute specifies the amount of time an item can be in the queue before the sent event is be aborted and dropped from the queue.
</para>
17 years
JBoss Rich Faces SVN: r13758 - trunk/examples/photoalbum/tests/src/test/java/org/richfaces/photoalbum.
by richfaces-svn-commits＠lists.jboss.org
Author: Alex.Kolonitsky
Date: 2009-04-22 07:38:59 -0400 (Wed, 22 Apr 2009)
New Revision: 13758
Added:
trunk/examples/photoalbum/tests/src/test/java/org/richfaces/photoalbum/RealWorldHelper.java
Log:
add helper
Added: trunk/examples/photoalbum/tests/src/test/java/org/richfaces/photoalbum/RealWorldHelper.java
===================================================================
--- trunk/examples/photoalbum/tests/src/test/java/org/richfaces/photoalbum/RealWorldHelper.java (rev 0)
+++ trunk/examples/photoalbum/tests/src/test/java/org/richfaces/photoalbum/RealWorldHelper.java 2009-04-22 11:38:59 UTC (rev 13758)
@@ -0,0 +1,207 @@
+/**
+ *
+ */
+package org.richfaces.photoalbum;
+
+import org.testng.Assert;
+
+import com.thoughtworks.selenium.Selenium;
+
+/**
+ * @author Andrey Markavtsov
+ *
+ */
+public class RealWorldHelper {
+
+
+ private static final String WINDOW_JS_RESOLVER = "selenium.browserbot.getCurrentWindow().";
+ private static final String STATUS_START_ID = "_viewRoot:status.start";
+ private static final int TIMEOUT = 20000;
+
+ public static interface UserInfoConstants {
+ String LOGIN_NAME = "amarkhel";
+ String LOGIN_PASSWORD = "12345";
+ }
+
+ public static interface HtmlConstants {
+
+ public static interface IndexPage {
+ String MAIN_FORM_ID = "mainform";
+ //String shelfCountPath = "//table[@id='menuform:menu']/tbody/tr/td[2]";
+ //int SHELF_COUNT = 2;
+ }
+
+ public static interface LoginPage {
+ String LOGIN_FORM_ID = "loginPanelForm";
+ String usernameId = LOGIN_FORM_ID + ":username";
+ String passwordId = LOGIN_FORM_ID + ":password";
+ String loginButtonPath= "//*[@class='login-table-col']//*[@type='image']";
+
+ }
+
+ public static interface LogInOutArea {
+ String LOGIN_LINK_ID = "loginPanelShowlink";
+ String LOGOUT_LINK_PATH = "//*[@id='logInOutMenu']//div/a";
+ String USER_INFO_LINK_PATH = "//a[@class='logged-user']";
+ }
+
+ public static interface ToolBarArea {
+ String TOOLBAR_PATH = "//*[@class='dr-toolbar-int rich-toolbar-item main-menu-toolbar-content']";
+ String VIEW_SHELFS_PATH = TOOLBAR_PATH + "/div[2]";
+ String VIEW_ALBUMS_PATH = TOOLBAR_PATH + "/div[3]";
+ String VIEW_IMAGES_PATH = TOOLBAR_PATH + "/div[4]";
+ String ADD_IMAGE_LINK_PATH = TOOLBAR_PATH + "/*[@id='menuform:add_icons_div_id']/a[3]";
+ }
+
+ public static interface ShelfArea {
+ String HEADER_PATH = "//*[@class='shelf-header-table']";
+ String SHELF_NAME_PATH = HEADER_PATH + "//h1";
+ String ALBUM_PATH = "//*[@class='preview_box_album_120']";
+ String ALBUM_LINK_PATH = ALBUM_PATH + "//a";
+ String ALBUM_NAME_PATH = ALBUM_PATH + "/*[@class='album_name']";
+ }
+
+ public static interface AlbumArea {
+ String HEADER_PATH = "//*[@class='album-header-table']";
+ String ALBUM_NAME_PATH = HEADER_PATH + "//h1";
+ String IMAGE_PATH = "//*[@class='preview_box_photo_120']";
+ String IMAGE_LINK_PATH = IMAGE_PATH + "//a";
+ String IMAGE_NAME_PATH = IMAGE_PATH + "/*[@class='photo_name']";
+ //String IMAGES_CONTAINER = "//span[@id='mainform:userAlbumImages']";
+ }
+
+ public static interface ImageArea {
+ String HEADER_PATH = "//*[@class='image-header-table']";
+ String IMAGE_NAME_PATH = HEADER_PATH + "//h1";
+ }
+
+ public static interface UserProfileArea {
+ String NAME_INPUT_ID = IndexPage.MAIN_FORM_ID + ":loginName";
+ }
+
+ public static interface FilesUploadArea {
+ String FILE_UPLOAD_ID = IndexPage.MAIN_FORM_ID + ":fileUpload";
+ }
+
+ public static interface TreeArea {
+
+ }
+ }
+
+
+ public static void login(Selenium selenium) {
+ selenium.click(HtmlConstants.LogInOutArea.LOGIN_LINK_ID);
+ try {
+ Thread.sleep(5000);
+ }catch (Exception e) {
+ Assert.fail("Test failed caused by: " + e);
+ }
+
+ Assert.assertTrue(selenium.isVisible(HtmlConstants.LoginPage.usernameId), "Input for username in not visible");
+ Assert.assertTrue(selenium.isVisible(HtmlConstants.LoginPage.passwordId), "Input for password in not visible");
+
+ String type = selenium.getAttribute("//*[@id='"+HtmlConstants.LoginPage.passwordId+"']/@type");
+ if (!"password".equals(type)) {
+ Assert.fail("Password input should be of 'password' type");
+ }
+
+ selenium.type(HtmlConstants.LoginPage.usernameId, UserInfoConstants.LOGIN_NAME);
+ selenium.type(HtmlConstants.LoginPage.passwordId, UserInfoConstants.LOGIN_PASSWORD);
+
+ selenium.click(HtmlConstants.LoginPage.loginButtonPath);
+ selenium.waitForPageToLoad("10000");
+
+ if (!isLogined(selenium, UserInfoConstants.LOGIN_NAME)) {
+ Assert.fail("Authentication was not succesfull. Logged user text should contain typed login name");
+ }
+
+ }
+
+ public static void logout(Selenium selenium) {
+ selenium.click(HtmlConstants.LogInOutArea.LOGOUT_LINK_PATH);
+ selenium.waitForPageToLoad(String.valueOf(TIMEOUT));
+ Assert.assertFalse(isLogined(selenium), "Logout was not succesfull.");
+ }
+
+ public static void testUserProfile(Selenium selenium) {
+ String name = selenium.getValue(HtmlConstants.UserProfileArea.NAME_INPUT_ID);
+ Assert.assertEquals(name, UserInfoConstants.LOGIN_NAME);
+ }
+
+ public static void testFilesUpload(Selenium selenium) {
+ Assert.assertTrue(selenium.isVisible(HtmlConstants.FilesUploadArea.FILE_UPLOAD_ID));
+ }
+
+ public static void testShelfArea(Selenium selenium) {
+ testShelfArea(selenium, null);
+ }
+
+ public static void testShelfArea(Selenium selenium, String shelfName) {
+ Assert.assertTrue(selenium.isVisible(HtmlConstants.ShelfArea.HEADER_PATH));
+ if (shelfName != null) {
+ String text = selenium.getText(RealWorldHelper.HtmlConstants.ShelfArea.SHELF_NAME_PATH);
+ Assert.assertTrue(text.contains(shelfName), "Incorrect data was opened after click by album");
+ }
+ }
+
+ public static void openAlbumFromShelfArea(Selenium selenium) {
+ String albumName = selenium.getText(RealWorldHelper.HtmlConstants.ShelfArea.ALBUM_NAME_PATH);
+
+ selenium.click(RealWorldHelper.HtmlConstants.ShelfArea.ALBUM_LINK_PATH);
+ waitForAjaxCompletion(selenium);
+
+ testAlbumArea(selenium, albumName);
+ }
+
+ public static void testAlbumArea(Selenium selenium) {
+ testAlbumArea(selenium, null);
+ }
+
+ public static void testAlbumArea(Selenium selenium, String albumName) {
+ Assert.assertTrue(selenium.isVisible(HtmlConstants.AlbumArea.HEADER_PATH));
+ if (albumName != null) {
+ String text = selenium.getText(RealWorldHelper.HtmlConstants.AlbumArea.ALBUM_NAME_PATH);
+ Assert.assertTrue(text.contains(albumName), "Incorrect data was opened after click by album");
+ }
+ }
+
+ public static void openImageFromAlbumArea(Selenium selenium) {
+ String imageName = selenium.getText(RealWorldHelper.HtmlConstants.AlbumArea.IMAGE_NAME_PATH);
+
+ selenium.click(RealWorldHelper.HtmlConstants.AlbumArea.IMAGE_LINK_PATH);
+ waitForAjaxCompletion(selenium);
+
+ testImageArea(selenium, imageName);
+ }
+
+ public static void testImageArea(Selenium selenium) {
+ testImageArea(selenium, null);
+ }
+
+ public static void testImageArea(Selenium selenium, String imageName) {
+ Assert.assertTrue(selenium.isVisible(HtmlConstants.ImageArea.HEADER_PATH));
+ if (imageName != null) {
+ String text = selenium.getText(RealWorldHelper.HtmlConstants.ImageArea.IMAGE_NAME_PATH);
+ Assert.assertTrue(text.contains(imageName), "Incorrect data was opened after click by image");
+ }
+ }
+
+ public static void waitForAjaxCompletion(Selenium selenium) {
+ waitForAjaxCompletion(selenium, TIMEOUT);
+ }
+ public static void waitForAjaxCompletion(Selenium selenium, int miliseconds) {
+ selenium.waitForCondition(WINDOW_JS_RESOLVER + "document.getElementById('" + STATUS_START_ID + "').style.display == 'none'", String.valueOf(miliseconds));
+ }
+
+ public static boolean isLogined(Selenium selenium) {
+ return isLogined(selenium, null);
+ }
+
+ public static boolean isLogined(Selenium selenium, String name) {
+ boolean logined = !selenium.getXpathCount(HtmlConstants.LogInOutArea.USER_INFO_LINK_PATH).equals(0);
+ if (logined && name != null) {
+ logined = selenium.getText(HtmlConstants.LogInOutArea.USER_INFO_LINK_PATH).contains(name);
+ }
+ return logined;
+ }
+}
17 years
JBoss Rich Faces SVN: r13757 - trunk/docs/common-resources/en/src/main/xslt.
by richfaces-svn-commits＠lists.jboss.org
Author: artdaw
Date: 2009-04-22 07:12:12 -0400 (Wed, 22 Apr 2009)
New Revision: 13757
Added:
trunk/docs/common-resources/en/src/main/xslt/pdf-common.xsl
Log:
https://jira.jboss.org/jira/browse/RF-5655 - XSL files were fixed. pdf-common.xsl was added as the stylesheet for PDF generation
Added: trunk/docs/common-resources/en/src/main/xslt/pdf-common.xsl
===================================================================
--- trunk/docs/common-resources/en/src/main/xslt/pdf-common.xsl (rev 0)
+++ trunk/docs/common-resources/en/src/main/xslt/pdf-common.xsl 2009-04-22 11:12:12 UTC (rev 13757)
@@ -0,0 +1,28 @@
+<?xml version='1.0'?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version="1.0"
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ xmlns:fo="http://www.w3.org/1999/XSL/Format"
+ xmlns:jbh="java:org.jboss.highlight.renderer.FORenderer"
+ exclude-result-prefixes="jbh">
+
+<xsl:import href="classpath:/xslt/org/jboss/pdf.xsl" />
+<xsl:attribute-set name="book.titlepage.recto.style">
+ <xsl:attribute name="font-family">
+ <xsl:value-of select="$title.fontset"/>
+ </xsl:attribute>
+ <xsl:attribute name="color"><xsl:value-of select="$titlepage.color"/></xsl:attribute>
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
+ <xsl:attribute name="font-size">12pt</xsl:attribute>
+ <xsl:attribute name="text-align">center</xsl:attribute>
+</xsl:attribute-set>
+
+ <!--avoid page sequence to generate blank pages after even page numbers -->
+
+ <xsl:template name="force.page.count">
+ <xsl:param name="element" select="local-name(.)"/>
+ <xsl:param name="master-reference" select="''"/>
+ <xsl:text>no-force</xsl:text>
+ </xsl:template>
+
+</xsl:stylesheet>
Property changes on: trunk/docs/common-resources/en/src/main/xslt/pdf-common.xsl
___________________________________________________________________
Name: svn:executable
+ *
17 years
JBoss Rich Faces SVN: r13756 - trunk/test-applications/jsp/src/main/java/listShuttle.
by richfaces-svn-commits＠lists.jboss.org
Author: Vadim Mikovoz
Date: 2009-04-22 06:47:38 -0400 (Wed, 22 Apr 2009)
New Revision: 13756
Modified:
trunk/test-applications/jsp/src/main/java/listShuttle/ListShuttle.java
Log:
Modified: trunk/test-applications/jsp/src/main/java/listShuttle/ListShuttle.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/listShuttle/ListShuttle.java 2009-04-22 10:46:56 UTC (rev 13755)
+++ trunk/test-applications/jsp/src/main/java/listShuttle/ListShuttle.java 2009-04-22 10:47:38 UTC (rev 13756)
@@ -39,6 +39,8 @@
private String targetListWidth;
private String sourceListWidth;
private String listsHeight;
+ private String controlsType;
+ private String controlsVerticalAlign;
private String sourceCaptionLabel;
private String targetCaptionLabel;
private HtmlListShuttle htmlListShuttle = null;
@@ -68,19 +70,21 @@
this.showButtonLabels = true;
this.sourceRequired = false;
this.targetRequired = false;
- this.bottomControlLabel = "bottom";
- this.copyAllControlLabel = "copy all";
- this.copyControlLabel = "copy";
- this.downControlLabel = "down";
- this.removeAllControlLabel = "remove all";
- this.removeControlLabel = "remove";
- this.topControlLabel = "top";
- this.upControlLabel = "up";
+ this.bottomControlLabel = "bottomTest";
+ this.copyAllControlLabel = "copy allTest";
+ this.copyControlLabel = "copyTest";
+ this.downControlLabel = "downTest";
+ this.controlsType = "button";
+ this.removeAllControlLabel = "remove allTest";
+ this.removeControlLabel = "removeTest";
+ this.topControlLabel = "topTest";
+ this.upControlLabel = "upTest";
this.info = new ArrayList<String>();
this.switchByClick = false;
this.targetListWidth = "450";
this.sourceListWidth = "450";
this.listsHeight = "300";
+ this.controlsVerticalAlign = "middle";
this.sourceCaptionLabel = "sourceCaptionLabel";
this.targetCaptionLabel = "targetCaptionLabel";
this.targetValue = new ArrayList<Data>();
@@ -103,7 +107,7 @@
public void setFastOrderControlsVisible(boolean fastOrderControlsVisible) {
this.fastOrderControlsVisible = fastOrderControlsVisible;
- }
+ }
public boolean isMoveControlsVisible() {
return moveControlsVisible;
@@ -148,6 +152,14 @@
public void setBottomControlLabel(String bottomControlLabel) {
this.bottomControlLabel = bottomControlLabel;
}
+
+ public String getControlsType() {
+ return controlsType;
+ }
+
+ public void setControlsType(String controlsType) {
+ this.controlsType = controlsType;
+ }
public String getCopyAllControlLabel() {
return copyAllControlLabel;
@@ -319,6 +331,14 @@
public void setListsHeight(String listsHeight) {
this.listsHeight = listsHeight;
}
+
+ public String getControlsVerticalAlign() {
+ return controlsVerticalAlign;
+ }
+
+ public void setControlsVerticalAlign(String controlsVerticalAlign) {
+ this.controlsVerticalAlign = controlsVerticalAlign;
+ }
public String getSourceCaptionLabel() {
return sourceCaptionLabel;
17 years
JBoss Rich Faces SVN: r13755 - trunk/test-applications/jsp/src/main/webapp/ListShuttle.
by richfaces-svn-commits＠lists.jboss.org
Author: Vadim Mikovoz
Date: 2009-04-22 06:46:56 -0400 (Wed, 22 Apr 2009)
New Revision: 13755
Modified:
trunk/test-applications/jsp/src/main/webapp/ListShuttle/ListShuttle.jsp
trunk/test-applications/jsp/src/main/webapp/ListShuttle/ListShuttleProperty.jsp
Log:
Modified: trunk/test-applications/jsp/src/main/webapp/ListShuttle/ListShuttle.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/ListShuttle/ListShuttle.jsp 2009-04-22 10:33:12 UTC (rev 13754)
+++ trunk/test-applications/jsp/src/main/webapp/ListShuttle/ListShuttle.jsp 2009-04-22 10:46:56 UTC (rev 13755)
@@ -34,6 +34,8 @@
upControlLabel="#{listShuttle.upControlLabel}"
onmousemove="#{event.onmousemove}"
onclick="#{event.onclick}"
+ controlsVerticalAlign="#{listShuttle.controlsVerticalAlign}"
+ controlsType="#{listShuttle.controlsType}"
ondblclick="#{event.ondblclick}"
onmouseout="#{event.onmouseout}"
onmouseover="#{event.onmouseover}"
Modified: trunk/test-applications/jsp/src/main/webapp/ListShuttle/ListShuttleProperty.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/ListShuttle/ListShuttleProperty.jsp 2009-04-22 10:33:12 UTC (rev 13754)
+++ trunk/test-applications/jsp/src/main/webapp/ListShuttle/ListShuttleProperty.jsp 2009-04-22 10:46:56 UTC (rev 13755)
@@ -175,7 +175,25 @@
<h:outputText value="upControlLabel" />
<h:inputText value="#{listShuttle.upControlLabel}" onchange="submit()" />
+
+ <h:outputText value="controlsVerticalAlign" />
+ <h:panelGroup>
+ <h:selectOneRadio value="#{listShuttle.controlsVerticalAlign}" onchange="submit()">
+ <f:selectItem itemValue="top"/>
+ <f:selectItem itemValue="middle"/>
+ <f:selectItem itemValue="bottom"/>
+ </h:selectOneRadio>
+ </h:panelGroup>
+
+ <h:outputText value="controlsType" />
+ <h:panelGroup>
+ <h:selectOneRadio value="#{listShuttle.controlsType}" onchange="submit()">
+ <f:selectItem itemValue="none" itemLabel="none"/>
+ <f:selectItem itemValue="button" itemLabel="button"/>
+ </h:selectOneRadio>
+ </h:panelGroup>
</h:panelGrid>
+
<br />
<br />
17 years