richfaces-svn-commits
February 2011
richfaces-svn-commits@lists.jboss.org
- 1 participants
- 648 discussions
JBoss Rich Faces SVN: r21603 - in trunk: core/impl/src/main/resources/META-INF/richfaces and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2011-02-10 09:02:04 -0500 (Thu, 10 Feb 2011)
New Revision: 21603
Modified:
trunk/core/impl/src/main/resources/META-INF/resources/skinning.ecss
trunk/core/impl/src/main/resources/META-INF/resources/skinning_classes.ecss
trunk/core/impl/src/main/resources/META-INF/richfaces/resource-mappings.properties
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/Autocomplete.ecss
trunk/ui/input/ui/src/main/resources/META-INF/richfaces/resource-mappings.properties
Log:
RF-10145 Update core & component images
Modified: trunk/core/impl/src/main/resources/META-INF/resources/skinning.ecss
===================================================================
--- trunk/core/impl/src/main/resources/META-INF/resources/skinning.ecss 2011-02-10 13:59:03 UTC (rev 21602)
+++ trunk/core/impl/src/main/resources/META-INF/resources/skinning.ecss 2011-02-10 14:02:04 UTC (rev 21603)
@@ -45,20 +45,20 @@
background-repeat: repeat-x;
background-position: top left;
background-color: '#{richSkin.headerBackgroundColor}';
- background-image: "url(#{resource['org.richfaces.renderkit.html.images.ButtonBackgroundImage']})";
+ background-image: "url(#{resource['org.richfaces.images:buttonBackgroundImage.png']})";
}
button:hover, input[type="reset"]:hover, input[type="submit"]:hover, input[type="button"]:hover {
background-position: bottom left;
background-repeat: repeat-x;
- background-image: "url(#{resource['org.richfaces.renderkit.html.images.ButtonHoverBackgroundImage']})";
+ background-image: "url(#{resource['org.richfaces.images:buttonHoverBackgroundImage.png']})";
}
button[disabled], input[type="reset"][disabled], input[type="submit"][disabled], input[type="button"][disabled] {
color: '#{richSkin.tabDisabledTextColor}';
border-color: '#{richSkin.tableFooterBackgroundColor}';
background-color: '#{richSkin.tableFooterBackgroundColor}';
- background-image: "url(#{resource['org.richfaces.renderkit.html.images.ButtonDisabledBackgroundImage']})";
+ background-image: "url(#{resource['org.richfaces.images:buttonDisabledBackgroundImage.png']})";
background-position: top left;
}
@@ -74,7 +74,7 @@
background-repeat: no-repeat;
background-position: 1px 1px;
background-color: '#{richSkin.controlBackgroundColor}';
- background-image: "url(#{resource['org.richfaces.renderkit.html.images.InputBackgroundImage']})";
+ background-image: "url(#{resource['org.richfaces.images:inputBackgroundImage.png']})";
}
textarea[disabled], input[type="text"][disabled], input[type="password"][disabled], select[disabled] {
Modified: trunk/core/impl/src/main/resources/META-INF/resources/skinning_classes.ecss
===================================================================
--- trunk/core/impl/src/main/resources/META-INF/resources/skinning_classes.ecss 2011-02-10 13:59:03 UTC (rev 21602)
+++ trunk/core/impl/src/main/resources/META-INF/resources/skinning_classes.ecss 2011-02-10 14:02:04 UTC (rev 21603)
@@ -67,7 +67,7 @@
.rfs-field{
background-color : '#{richSkin.controlBackgroundColor}';
- background-image : "url(#{resource['org.richfaces.renderkit.html.images.ButtonBackgroundImage']})";
+ background-image : "url(#{resource['org.richfaces.images:buttonBackgroundImage.png']})";
background-repeat : no-repeat;
background-position : 1px 1px;
}
@@ -78,7 +78,7 @@
.rfs-field-error{
background-color : '#{richSkin.warningBackgroundColor}';
- background-image : "url(#{resource['org.richfaces.renderkit.html.images.InputErrorIcon']})";
+ background-image : "url(#{resource['org.richfaces.images:inputErrorIcon.png']})";
background-repeat : no-repeat;
background-position : center left;
padding-left : 7px;
@@ -97,19 +97,19 @@
}
.rfs-btn{
- background-image : "url(#{resource['org.richfaces.renderkit.html.images.StandardButtonBgImage']})";
+ background-image : "url(#{resource['org.richfaces.images:standardButtonBgImage.png']})";
}
.rfs-btn-disabled{
- background-image : "url(#{resource['org.richfaces.renderkit.html.images.StandardButtonBgImage']})";
+ background-image : "url(#{resource['org.richfaces.images:standardButtonBgImage.png']})";
}
.rfs-btn-over{
- background-image : "url(#{resource['org.richfaces.renderkit.html.images.StandardButtonBgImage']})";
+ background-image : "url(#{resource['org.richfaces.images:standardButtonBgImage.png']})";
}
.rfs-btn-press{
- background-image : "url(#{resource['org.richfaces.renderkit.html.images.StandardButtonPressedBgImage']})";
+ background-image : "url(#{resource['org.richfaces.images:standardButtonPressedBgImage.png']})";
background-position : bottom left;
}
@@ -337,7 +337,7 @@
background-repeat : repeat-x;
background-position : top left;
background-color:'#{richSkin.headerBackgroundColor}';
- background-image:"url(#{resource['org.richfaces.renderkit.html.images.ButtonBackgroundImage']})";
+ background-image:"url(#{resource['org.richfaces.images:buttonBackgroundImage.png']})";
font-size:'#{richSkin.generalSizeFont}';
font-family:'#{richSkin.generalFamilyFont}';
@@ -353,7 +353,7 @@
.rfs-ctn input[type="button"]:hover, .rfs-input-btn:hover {
background-position: bottom left;
background-repeat: repeat-x;
- background-image: "url(#{resource['org.richfaces.renderkit.html.images.ButtonHoverBackgroundImage']})";
+ background-image: "url(#{resource['org.richfaces.images:buttonHoverBackgroundImage.png']})";
}
.rfs-ctn button[disabled], .rfs-btn-disabled,
@@ -366,7 +366,7 @@
color: '#{richSkin.tabDisabledTextColor}';
background-color: '#{richSkin.tableFooterBackgroundColor}';
border-color: '#{richSkin.tableFooterBackgroundColor}';
- background-image: "url(#{resource['org.richfaces.renderkit.html.images.ButtonDisabledBackgroundImage']})";
+ background-image: "url(#{resource['org.richfaces.images:buttonDisabledBackgroundImage.png']})";
background-position: top left;
}
@@ -383,7 +383,7 @@
background-repeat : no-repeat;
background-position : 1px 1px;
background-color:'#{richSkin.controlBackgroundColor}';
- background-image:"url(#{resource['org.richfaces.renderkit.html.images.InputBackgroundImage']})";
+ background-image:"url(#{resource['org.richfaces.images:inputBackgroundImage.png']})";
font-size:'#{richSkin.generalSizeFont}';
font-family:'#{richSkin.generalFamilyFont}';
Modified: trunk/core/impl/src/main/resources/META-INF/richfaces/resource-mappings.properties
===================================================================
--- trunk/core/impl/src/main/resources/META-INF/richfaces/resource-mappings.properties 2011-02-10 13:59:03 UTC (rev 21602)
+++ trunk/core/impl/src/main/resources/META-INF/richfaces/resource-mappings.properties 2011-02-10 14:02:04 UTC (rev 21603)
@@ -1,5 +1,11 @@
+org.richfaces.images\:inputBackgroundImage.png=org.richfaces.renderkit.html.images.InputBackgroundImage
+org.richfaces.images\:buttonBackgroundImage.png=org.richfaces.renderkit.html.images.ButtonBackgroundImage
+org.richfaces.images\:buttonHoverBackgroundImage.png=org.richfaces.renderkit.html.images.ButtonHoverBackgroundImage
+org.richfaces.images\:buttonDisabledBackgroundImage.png=org.richfaces.renderkit.html.images.ButtonDisabledBackgroundImage
+org.richfaces.images\:inputErrorIcon.png=org.richfaces.renderkit.html.images.InputErrorIcon
+org.richfaces.images\:standardButtonBgImage.png=org.richfaces.renderkit.html.images.StandardButtonBgImage
+org.richfaces.images\:standardButtonPressedBgImage.png=org.richfaces.renderkit.html.images.StandardButtonPressedBgImage
+
org.richfaces.images\:gradientA.png=org.richfaces.renderkit.html.BaseGradient\
{baseColorParam=headerGradientColor, gradientColorParam=headerBackgroundColor}
-
-org.richfaces.images\:inputBackgroundImage.png=org.richfaces.renderkit.html.images.InputBackgroundImage
-org.richfaces.images\:buttonBackgroundImage.png=org.richfaces.renderkit.html.images.ButtonBackgroundImage
\ No newline at end of file
+
\ No newline at end of file
Modified: trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/Autocomplete.ecss
===================================================================
--- trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/Autocomplete.ecss 2011-02-10 13:59:03 UTC (rev 21602)
+++ trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/Autocomplete.ecss 2011-02-10 14:02:04 UTC (rev 21603)
@@ -6,7 +6,7 @@
input.rf-au-inp {
background-color: '#{richSkin.controlBackgroundColor}';
- background-image: url("#{resource['org.richfaces.images.inputBackgroundImage.png']}");
+ background-image: url("#{resource['org.richfaces.images:inputBackgroundImage.png']}");
background-position:1px 1px;
background-repeat:no-repeat;
border: 0px;
Modified: trunk/ui/input/ui/src/main/resources/META-INF/richfaces/resource-mappings.properties
===================================================================
--- trunk/ui/input/ui/src/main/resources/META-INF/richfaces/resource-mappings.properties 2011-02-10 13:59:03 UTC (rev 21602)
+++ trunk/ui/input/ui/src/main/resources/META-INF/richfaces/resource-mappings.properties 2011-02-10 14:02:04 UTC (rev 21603)
@@ -51,8 +51,4 @@
org.richfaces.images\:sliderSelectedArrowRight.png=org.richfaces.renderkit.html.images.SliderArrowRight\
{colorParam=tipBorderColor}
-org.richfaces.images\:inputBackgroundImage.png=org.richfaces.renderkit.html.images.InputBackgroundImage
-org.richfaces.images\:buttonBackgroundImage.png=org.richfaces.renderkit.html.images.ButtonBackgroundImage
-
-
\ No newline at end of file
15 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r21602 - in modules/tests/metamer/trunk: application and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: lfryc(a)redhat.com
Date: 2011-02-10 08:59:03 -0500 (Thu, 10 Feb 2011)
New Revision: 21602
Modified:
modules/tests/metamer/trunk/application/pom.xml
modules/tests/metamer/trunk/ftest-source/pom.xml
modules/tests/metamer/trunk/ftest/pom.xml
modules/tests/metamer/trunk/pom.xml
Log:
[maven-release-plugin] prepare for next development iteration
Modified: modules/tests/metamer/trunk/application/pom.xml
===================================================================
--- modules/tests/metamer/trunk/application/pom.xml 2011-02-10 13:58:50 UTC (rev 21601)
+++ modules/tests/metamer/trunk/application/pom.xml 2011-02-10 13:59:03 UTC (rev 21602)
@@ -19,7 +19,7 @@
<parent>
<groupId>org.richfaces.tests</groupId>
<artifactId>metamer-root</artifactId>
- <version>4.0.0.20110209-M6</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<groupId>org.richfaces.tests</groupId>
Modified: modules/tests/metamer/trunk/ftest/pom.xml
===================================================================
--- modules/tests/metamer/trunk/ftest/pom.xml 2011-02-10 13:58:50 UTC (rev 21601)
+++ modules/tests/metamer/trunk/ftest/pom.xml 2011-02-10 13:59:03 UTC (rev 21602)
@@ -30,14 +30,14 @@
<groupId>org.richfaces.tests</groupId>
<artifactId>metamer-ftest</artifactId>
- <version>4.0.0.20110209-M6</version>
+ <version>4.0.0-SNAPSHOT</version>
<name>Metamer: RichFaces Testing Application - Functional Test</name>
<packaging>pom</packaging>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/modules/tests/metamer/ta...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/modules/tests/metamer/tags/...</developerConnection>
- <url>http://fisheye.jboss.org/browse/RichFaces/modules/tests/metamer/tags/meta...</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/modules/tests/metamer/tr...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/modules/tests/metamer/trunk...</developerConnection>
+ <url>http://fisheye.jboss.org/browse/RichFaces/modules/tests/metamer/trunk/ftest</url>
</scm>
<licenses>
Modified: modules/tests/metamer/trunk/ftest-source/pom.xml
===================================================================
--- modules/tests/metamer/trunk/ftest-source/pom.xml 2011-02-10 13:58:50 UTC (rev 21601)
+++ modules/tests/metamer/trunk/ftest-source/pom.xml 2011-02-10 13:59:03 UTC (rev 21602)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.richfaces.tests</groupId>
<artifactId>metamer-root</artifactId>
- <version>4.0.0.20110209-M6</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<groupId>org.richfaces.tests</groupId>
Modified: modules/tests/metamer/trunk/pom.xml
===================================================================
--- modules/tests/metamer/trunk/pom.xml 2011-02-10 13:58:50 UTC (rev 21601)
+++ modules/tests/metamer/trunk/pom.xml 2011-02-10 13:59:03 UTC (rev 21602)
@@ -31,7 +31,7 @@
<groupId>org.richfaces.tests</groupId>
<artifactId>metamer-root</artifactId>
- <version>4.0.0.20110209-M6</version>
+ <version>4.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Metamer: RichFaces Testing Application - Project Root</name>
@@ -50,9 +50,9 @@
</licenses>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/modules/tests/metamer/ta...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/modules/tests/metamer/tags/...</developerConnection>
- <url>http://fisheye.jboss.org/browse/RichFaces/modules/tests/metamer/tags/meta...</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/modules/tests/metamer/trunk</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/modules/tests/metamer/trunk</developerConnection>
+ <url>http://fisheye.jboss.org/browse/RichFaces/modules/tests/metamer/trunk</url>
</scm>
<distributionManagement>
15 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r21601 - modules/tests/metamer/tags.
by richfaces-svn-commits＠lists.jboss.org
Author: lfryc(a)redhat.com
Date: 2011-02-10 08:58:50 -0500 (Thu, 10 Feb 2011)
New Revision: 21601
Added:
modules/tests/metamer/tags/metamer-4.0.0.20110209-M6/
Log:
[maven-scm] copy for tag metamer-4.0.0.20110209-M6
Copied: modules/tests/metamer/tags/metamer-4.0.0.20110209-M6 (from rev 21600, modules/tests/metamer/trunk)
15 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r21600 - in modules/tests/metamer/trunk: application and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: lfryc(a)redhat.com
Date: 2011-02-10 08:58:28 -0500 (Thu, 10 Feb 2011)
New Revision: 21600
Modified:
modules/tests/metamer/trunk/application/pom.xml
modules/tests/metamer/trunk/ftest-source/pom.xml
modules/tests/metamer/trunk/ftest/pom.xml
modules/tests/metamer/trunk/pom.xml
Log:
[maven-release-plugin] prepare release metamer-4.0.0.20110209-M6
Modified: modules/tests/metamer/trunk/application/pom.xml
===================================================================
--- modules/tests/metamer/trunk/application/pom.xml 2011-02-10 13:36:22 UTC (rev 21599)
+++ modules/tests/metamer/trunk/application/pom.xml 2011-02-10 13:58:28 UTC (rev 21600)
@@ -19,7 +19,7 @@
<parent>
<groupId>org.richfaces.tests</groupId>
<artifactId>metamer-root</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.20110209-M6</version>
</parent>
<groupId>org.richfaces.tests</groupId>
Modified: modules/tests/metamer/trunk/ftest/pom.xml
===================================================================
--- modules/tests/metamer/trunk/ftest/pom.xml 2011-02-10 13:36:22 UTC (rev 21599)
+++ modules/tests/metamer/trunk/ftest/pom.xml 2011-02-10 13:58:28 UTC (rev 21600)
@@ -30,14 +30,14 @@
<groupId>org.richfaces.tests</groupId>
<artifactId>metamer-ftest</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.20110209-M6</version>
<name>Metamer: RichFaces Testing Application - Functional Test</name>
<packaging>pom</packaging>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/modules/tests/metamer/tr...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/modules/tests/metamer/trunk...</developerConnection>
- <url>http://fisheye.jboss.org/browse/RichFaces/modules/tests/metamer/trunk/ftest</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/modules/tests/metamer/ta...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/modules/tests/metamer/tags/...</developerConnection>
+ <url>http://fisheye.jboss.org/browse/RichFaces/modules/tests/metamer/tags/meta...</url>
</scm>
<licenses>
@@ -80,8 +80,8 @@
<properties>
<context.path>/metamer/</context.path>
<deployable.classifier>mojarra</deployable.classifier>
- <deployable.version>4.0.0-SNAPSHOT</deployable.version>
- <ftest.source.version>4.0.0-SNAPSHOT</ftest.source.version>
+ <deployable.version>4.0.0.20110209-M6</deployable.version>
+ <ftest.source.version>4.0.0.20110209-M6</ftest.source.version>
<testng.suite.xml>src/test/resources/testng.xml</testng.suite.xml>
<container.home>target/installs/${container.dir.deflatted}/${container.dir.unflatted}</container.home>
<jsf.config>Mojarra-2.0</jsf.config>
Modified: modules/tests/metamer/trunk/ftest-source/pom.xml
===================================================================
--- modules/tests/metamer/trunk/ftest-source/pom.xml 2011-02-10 13:36:22 UTC (rev 21599)
+++ modules/tests/metamer/trunk/ftest-source/pom.xml 2011-02-10 13:58:28 UTC (rev 21600)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.richfaces.tests</groupId>
<artifactId>metamer-root</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.20110209-M6</version>
</parent>
<groupId>org.richfaces.tests</groupId>
Modified: modules/tests/metamer/trunk/pom.xml
===================================================================
--- modules/tests/metamer/trunk/pom.xml 2011-02-10 13:36:22 UTC (rev 21599)
+++ modules/tests/metamer/trunk/pom.xml 2011-02-10 13:58:28 UTC (rev 21600)
@@ -31,7 +31,7 @@
<groupId>org.richfaces.tests</groupId>
<artifactId>metamer-root</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.20110209-M6</version>
<packaging>pom</packaging>
<name>Metamer: RichFaces Testing Application - Project Root</name>
@@ -50,9 +50,9 @@
</licenses>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/modules/tests/metamer/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/modules/tests/metamer/trunk</developerConnection>
- <url>http://fisheye.jboss.org/browse/RichFaces/modules/tests/metamer/trunk</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/modules/tests/metamer/ta...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/modules/tests/metamer/tags/...</developerConnection>
+ <url>http://fisheye.jboss.org/browse/RichFaces/modules/tests/metamer/tags/meta...</url>
</scm>
<distributionManagement>
15 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r21599 - in trunk/examples/richfaces-showcase/src/main: webapp/WEB-INF and 3 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2011-02-10 08:36:22 -0500 (Thu, 10 Feb 2011)
New Revision: 21599
Added:
trunk/examples/richfaces-showcase/src/main/webapp/resources/css/application.xcss
Removed:
trunk/examples/richfaces-showcase/src/main/webapp/css/
trunk/examples/richfaces-showcase/src/main/webapp/resources/css/application.css
Modified:
trunk/examples/richfaces-showcase/src/main/webapp-gae/WEB-INF/web.xml
trunk/examples/richfaces-showcase/src/main/webapp/WEB-INF/web.xml
trunk/examples/richfaces-showcase/src/main/webapp/templates/main.xhtml
Log:
new design.
Modified: trunk/examples/richfaces-showcase/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/examples/richfaces-showcase/src/main/webapp/WEB-INF/web.xml 2011-02-10 13:34:25 UTC (rev 21598)
+++ trunk/examples/richfaces-showcase/src/main/webapp/WEB-INF/web.xml 2011-02-10 13:36:22 UTC (rev 21599)
@@ -48,6 +48,10 @@
<welcome-file>default.htm</welcome-file>
<welcome-file>default.jsp</welcome-file>
</welcome-file-list>
+ <mime-mapping>
+ <extension>xcss</extension>
+ <mime-type>text/css</mime-type>
+ </mime-mapping>
<login-config>
<auth-method>BASIC</auth-method>
</login-config>
Deleted: trunk/examples/richfaces-showcase/src/main/webapp/resources/css/application.css
===================================================================
--- trunk/examples/richfaces-showcase/src/main/webapp/resources/css/application.css 2011-02-10 13:34:25 UTC (rev 21598)
+++ trunk/examples/richfaces-showcase/src/main/webapp/resources/css/application.css 2011-02-10 13:36:22 UTC (rev 21599)
@@ -1,142 +0,0 @@
-html{
- height:100%;
-}
-body{
- margin:0;
- padding:0;
- background:#94aebc url('#{facesContext.externalContext.requestContextPath}/images/body-bg.jpg') left bottom repeat;
- font:normal 12px "Lucida Sans Unicode", "Lucida Grande", Geneva,Verdana,Arial,sans-serif;
- height:100%;
-}
-fieldset{
- margin:0;
-}
-ul.layout{
- list-style:none;
-}
-a{
- color:#5a8eba;
- outline:none;
- text-decoration:none;
-}
-a:hover{
- text-decoration:underline;
-}
-p{
- margin:0;
- padding:0 0 6px;
-}
-#page{
- margin:0 auto;
- width:987px;
-}
-#header{
- background:url('#{facesContext.externalContext.requestContextPath}/images/header-bg.png') no-repeat top left;
- height:90px;
-}
-#header .logo{
- float:left;
- margin-left:7px;
- text-decoration:none;
-}
-#header .logo img{
- border:none;
-}
-#header .right-controls{
- float:right;
-}
-#header ul.top-links{
- margin:5px 15px 0 0;
- text-align:right;
-}
-#header ul.top-links li{
- display:inline;
- font-size:11px;
-}
-#header ul.top-links li a{
- background:url('#{facesContext.externalContext.requestContextPath}/images/sep.gif') center right no-repeat;
- color:#fff;
- padding:0 8px 0 3px;
- font:11px "Lucida Sans Unicode", "Lucida Grande", Geneva,Verdana,Arial,sans-serif';
-}
-#header ul.top-links li.last a{
- background:none;
- padding:0 0 0 3px;
-}
-#header ul.top-links li.download-link a{
- color:#eccb7b;
-}
-#header ul#skin-menu{
- color:#89a0be;
- cursor:default;
- font-weight:bold;
- margin:38px 15px 0 0;
- text-align:right;
-}
-#header ul#skin-menu li{
- cursor:pointer;
- display:inline-block;
- float:right;
- height:25px;
- margin-left:4px;
- padding-left:5px;
-}
-#header ul#skin-menu li span{
- height:25px;
- padding:3px 5px 0 0;
- display:inline-block;
- font:normal 12px "Lucida Sans Unicode", "Lucida Grande", Geneva,Verdana,Arial,sans-serif';
-}
-
-#header ul#skin-menu li span:hover{
- text-decoration:underline;
-}
-#header ul#skin-menu li.label{
- color:#999999;
- cursor:default;
- font-weight:normal;
-}
-
-#header ul#skin-menu li.current-skin{
- background:url('#{facesContext.externalContext.requestContextPath}/images/select-skin-button.png') left -75px no-repeat;
- color:#fff;
-}
-#header ul#skin-menu li.current-skin span{
- background:url('#{facesContext.externalContext.requestContextPath}/images/select-skin-button.png') right 0 repeat-x;
-}
-#header ul#skin-menu li.label span:hover,
-#header ul#skin-menu li.current-skin span:hover{
- text-decoration:none;
-}
-#page-content{
- background:url('#{facesContext.externalContext.requestContextPath}/images/page-bg.png') 0 0 repeat-y;
- height:100%;
- min-height:520px;
- padding:10px 20px 0;
-}
-#page-content .left-menu{
- float:left;
- margin-right:10px;
- min-height:450px;
- width:210px;
-}
-#page-content .content-container {
- float:left;
- width:720px;
-}
-
-.clear{
- clear:both;
- height:0%;
-}
-
-#footer{
- background:url('#{facesContext.externalContext.requestContextPath}/images/footer.png') top left no-repeat;
- color:#2d4351;
- text-align:center;
- padding:15px 20px 10px;
-}
-
-.source .syntaxhighlighter .line{
- white-space: normal !important;
-}
\ No newline at end of file
Copied: trunk/examples/richfaces-showcase/src/main/webapp/resources/css/application.xcss (from rev 21592, trunk/examples/richfaces-showcase/src/main/webapp/resources/css/application.css)
===================================================================
--- trunk/examples/richfaces-showcase/src/main/webapp/resources/css/application.xcss (rev 0)
+++ trunk/examples/richfaces-showcase/src/main/webapp/resources/css/application.xcss 2011-02-10 13:36:22 UTC (rev 21599)
@@ -0,0 +1,142 @@
+html{
+ height:100%;
+}
+body{
+ margin:0;
+ padding:0;
+ background:#94aebc url('#{facesContext.externalContext.requestContextPath}/images/body-bg.jpg') left bottom repeat;
+ font:normal 12px "Lucida Sans Unicode", "Lucida Grande", Geneva,Verdana,Arial,sans-serif;
+ height:100%;
+}
+fieldset{
+ margin:0;
+}
+ul.layout{
+ list-style:none;
+}
+a{
+ color:#5a8eba;
+ outline:none;
+ text-decoration:none;
+}
+a:hover{
+ text-decoration:underline;
+}
+p{
+ margin:0;
+ padding:0 0 6px;
+}
+#page{
+ margin:0 auto;
+ width:987px;
+}
+#header{
+ background:url('#{facesContext.externalContext.requestContextPath}/images/header-bg.png') no-repeat top left;
+ height:90px;
+}
+#header .logo{
+ float:left;
+ margin-left:7px;
+ text-decoration:none;
+}
+#header .logo img{
+ border:none;
+}
+#header .right-controls{
+ float:right;
+}
+#header ul.top-links{
+ margin:5px 15px 0 0;
+ text-align:right;
+}
+#header ul.top-links li{
+ display:inline;
+ font-size:11px;
+}
+#header ul.top-links li a{
+ background:url('#{facesContext.externalContext.requestContextPath}/images/sep.gif') center right no-repeat;
+ color:#fff;
+ padding:0 8px 0 3px;
+ font:11px "Lucida Sans Unicode", "Lucida Grande", Geneva,Verdana,Arial,sans-serif';
+}
+#header ul.top-links li.last a{
+ background:none;
+ padding:0 0 0 3px;
+}
+#header ul.top-links li.download-link a{
+ color:#eccb7b;
+}
+#header ul#skin-menu{
+ color:#89a0be;
+ cursor:default;
+ font-weight:bold;
+ margin:38px 15px 0 0;
+ text-align:right;
+}
+#header ul#skin-menu li{
+ cursor:pointer;
+ display:inline-block;
+ float:right;
+ height:25px;
+ margin-left:4px;
+ padding-left:5px;
+}
+#header ul#skin-menu li span{
+ height:25px;
+ padding:3px 5px 0 0;
+ display:inline-block;
+ font:normal 12px "Lucida Sans Unicode", "Lucida Grande", Geneva,Verdana,Arial,sans-serif';
+}
+
+#header ul#skin-menu li span:hover{
+ text-decoration:underline;
+}
+#header ul#skin-menu li.label{
+ color:#999999;
+ cursor:default;
+ font-weight:normal;
+}
+
+#header ul#skin-menu li.current-skin{
+ background:url('#{facesContext.externalContext.requestContextPath}/images/select-skin-button.png') left -75px no-repeat;
+ color:#fff;
+}
+#header ul#skin-menu li.current-skin span{
+ background:url('#{facesContext.externalContext.requestContextPath}/images/select-skin-button.png') right 0 repeat-x;
+}
+#header ul#skin-menu li.label span:hover,
+#header ul#skin-menu li.current-skin span:hover{
+ text-decoration:none;
+}
+#page-content{
+ background:url('#{facesContext.externalContext.requestContextPath}/images/page-bg.png') 0 0 repeat-y;
+ height:100%;
+ min-height:520px;
+ padding:10px 20px 0;
+}
+#page-content .left-menu{
+ float:left;
+ margin-right:10px;
+ min-height:450px;
+ width:210px;
+}
+#page-content .content-container {
+ float:left;
+ width:720px;
+}
+
+.clear{
+ clear:both;
+ height:0%;
+}
+
+#footer{
+ background:url('#{facesContext.externalContext.requestContextPath}/images/footer.png') top left no-repeat;
+ color:#2d4351;
+ text-align:center;
+ padding:15px 20px 10px;
+}
+
+.source .syntaxhighlighter .line{
+ white-space: normal !important;
+}
\ No newline at end of file
Modified: trunk/examples/richfaces-showcase/src/main/webapp/templates/main.xhtml
===================================================================
--- trunk/examples/richfaces-showcase/src/main/webapp/templates/main.xhtml 2011-02-10 13:34:25 UTC (rev 21598)
+++ trunk/examples/richfaces-showcase/src/main/webapp/templates/main.xhtml 2011-02-10 13:36:22 UTC (rev 21599)
@@ -19,7 +19,7 @@
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
})();
</script>
-<h:outputStylesheet library="css" name="application.css"/>
+<h:outputStylesheet library="css" name="application.xcss"/>
</h:head>
<h:body>
<div id="page">
Modified: trunk/examples/richfaces-showcase/src/main/webapp-gae/WEB-INF/web.xml
===================================================================
--- trunk/examples/richfaces-showcase/src/main/webapp-gae/WEB-INF/web.xml 2011-02-10 13:34:25 UTC (rev 21598)
+++ trunk/examples/richfaces-showcase/src/main/webapp-gae/WEB-INF/web.xml 2011-02-10 13:36:22 UTC (rev 21599)
@@ -86,6 +86,10 @@
<param-name>org.richfaces.executeAWTInitializer</param-name>
<param-value>false</param-value>
</context-param>
+ <mime-mapping>
+ <extension>xcss</extension>
+ <mime-type>text/css</mime-type>
+ </mime-mapping>
<servlet>
<servlet-name>Faces Servlet</servlet-name>
<servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
15 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r21598 - in modules/tests/metamer/trunk: ftest and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: lfryc(a)redhat.com
Date: 2011-02-10 08:34:25 -0500 (Thu, 10 Feb 2011)
New Revision: 21598
Modified:
modules/tests/metamer/trunk/ftest-source/pom.xml
modules/tests/metamer/trunk/ftest/pom.xml
modules/tests/metamer/trunk/pom.xml
Log:
tied on release versions richfaces-selenium:1.5.2.SP4 / richfaces:4.0.0.20110209-M6
Modified: modules/tests/metamer/trunk/ftest/pom.xml
===================================================================
--- modules/tests/metamer/trunk/ftest/pom.xml 2011-02-10 13:28:04 UTC (rev 21597)
+++ modules/tests/metamer/trunk/ftest/pom.xml 2011-02-10 13:34:25 UTC (rev 21598)
@@ -25,7 +25,7 @@
<parent>
<artifactId>functional-test-jboss-ci-template</artifactId>
<groupId>org.jboss.test.richfaces-selenium</groupId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.2.SP4</version>
</parent>
<groupId>org.richfaces.tests</groupId>
Modified: modules/tests/metamer/trunk/ftest-source/pom.xml
===================================================================
--- modules/tests/metamer/trunk/ftest-source/pom.xml 2011-02-10 13:28:04 UTC (rev 21597)
+++ modules/tests/metamer/trunk/ftest-source/pom.xml 2011-02-10 13:34:25 UTC (rev 21598)
@@ -37,7 +37,7 @@
<dependency>
<artifactId>root</artifactId>
<groupId>org.jboss.test.richfaces-selenium</groupId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.2.SP4</version>
<scope>import</scope>
<type>pom</type>
</dependency>
Modified: modules/tests/metamer/trunk/pom.xml
===================================================================
--- modules/tests/metamer/trunk/pom.xml 2011-02-10 13:28:04 UTC (rev 21597)
+++ modules/tests/metamer/trunk/pom.xml 2011-02-10 13:34:25 UTC (rev 21598)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.richfaces.examples</groupId>
<artifactId>richfaces-example-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.20110209-M6</version>
</parent>
<groupId>org.richfaces.tests</groupId>
@@ -124,7 +124,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<richfaces.checkstyle.version>2</richfaces.checkstyle.version>
- <version.richfaces>4.0.0-SNAPSHOT</version.richfaces>
+ <version.richfaces>4.0.0.20110209-M6</version.richfaces>
</properties>
<dependencyManagement>
15 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r21597 - in modules/tests/metamer/trunk: ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenu and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: lfryc(a)redhat.com
Date: 2011-02-10 08:28:04 -0500 (Thu, 10 Feb 2011)
New Revision: 21597
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/components/richPanelMenu/simple.xhtml
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenu/TestPanelMenuSimple.java
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuGroup/TestPanelMenuGroupSimple.java
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuItem/TestPanelMenuItemClientSideHandlers.java
Log:
rich:panelMenu - tests fixed and added issue tracking (RF-10158, RF-10302, RF-10485, RF-10486)
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richPanelMenu/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richPanelMenu/simple.xhtml 2011-02-10 12:54:41 UTC (rev 21596)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richPanelMenu/simple.xhtml 2011-02-10 13:28:04 UTC (rev 21597)
@@ -64,7 +64,7 @@
groupExpandedRightIcon="#{richPanelMenuBean.attributes['groupExpandedRightIcon'].value}"
groupMode="#{richPanelMenuBean.attributes['groupMode'].value}"
immediate="#{richPanelMenuBean.attributes['immediate'].value}"
- itemClass="#{richPanelMenuBean.attributes['topItemClass'].value}"
+ itemClass="#{richPanelMenuBean.attributes['itemClass'].value}"
itemDisabledClass="#{richPanelMenuBean.attributes['itemDisabledClass'].value}"
itemDisabledLeftIcon="#{richPanelMenuBean.attributes['itemDisabledLeftIcon'].value}"
itemDisabledRightIcon="#{richPanelMenuBean.attributes['itemDisabledRightIcon'].value}"
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenu/TestPanelMenuSimple.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenu/TestPanelMenuSimple.java 2011-02-10 12:54:41 UTC (rev 21596)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenu/TestPanelMenuSimple.java 2011-02-10 13:28:04 UTC (rev 21597)
@@ -28,6 +28,7 @@
import org.jboss.test.selenium.css.CssProperty;
import org.richfaces.PanelMenuMode;
import org.richfaces.tests.metamer.ftest.annotations.Inject;
+import org.richfaces.tests.metamer.ftest.annotations.IssueTracking;
import org.richfaces.tests.metamer.ftest.annotations.Use;
import org.testng.annotations.Test;
@@ -42,6 +43,7 @@
Boolean expandSingle;
@Test
+ @IssueTracking("https://issues.jboss.org/browse/RF-10158")
public void testDisabled() {
attributes.setGroupMode(PanelMenuMode.client);
attributes.setDisabled(false);
@@ -118,8 +120,9 @@
public void testTopItemClass() {
super.testStyleClass(item3, "topItemClass");
}
-
+
@Test
+ @IssueTracking("https://issues.jboss.org/browse/RF-10302")
public void testWidth() {
attributes.setWidth("300px");
assertEquals(selenium.getStyle(menu, CssProperty.WIDTH), "300px");
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuGroup/TestPanelMenuGroupSimple.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuGroup/TestPanelMenuGroupSimple.java 2011-02-10 12:54:41 UTC (rev 21596)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuGroup/TestPanelMenuGroupSimple.java 2011-02-10 13:28:04 UTC (rev 21597)
@@ -6,6 +6,8 @@
import org.jboss.test.selenium.GuardRequest;
import org.jboss.test.selenium.request.RequestType;
+import org.richfaces.PanelMenuMode;
+import org.richfaces.tests.metamer.ftest.annotations.IssueTracking;
import org.testng.annotations.Test;
/**
@@ -32,6 +34,7 @@
@Test
public void testDisabled() {
+ menu.setGroupMode(null);
assertFalse(topGroup.isDisabled());
attributes.setDisabled(true);
@@ -152,24 +155,14 @@
@Test
public void testSelectable() {
- attributes.setSelectable(false);
+ menu.setGroupMode(PanelMenuMode.ajax);
- new GuardRequest(RequestType.XHR) {
- public void command() {
- topGroup.toggle();
- }
- }.waitRequest();
-
+ attributes.setSelectable(false);
+ topGroup.toggle();
assertFalse(topGroup.isSelected());
attributes.setSelectable(true);
-
- new GuardRequest(RequestType.XHR) {
- public void command() {
- topGroup.toggle();
- }
- }.waitRequest();
-
+ topGroup.toggle();
assertTrue(topGroup.isSelected());
}
@@ -183,6 +176,7 @@
}
@Test
+ @IssueTracking("https://issues.jboss.org/browse/RF-10485")
public void testStyle() {
super.testStyle(topGroup, "style");
}
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuItem/TestPanelMenuItemClientSideHandlers.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuItem/TestPanelMenuItemClientSideHandlers.java 2011-02-10 12:54:41 UTC (rev 21596)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuItem/TestPanelMenuItemClientSideHandlers.java 2011-02-10 13:28:04 UTC (rev 21597)
@@ -28,10 +28,9 @@
import java.net.URL;
-import org.jboss.test.selenium.GuardRequest;
-import org.jboss.test.selenium.request.RequestType;
import org.richfaces.tests.metamer.ftest.AbstractMetamerTest;
import org.richfaces.tests.metamer.ftest.annotations.Inject;
+import org.richfaces.tests.metamer.ftest.annotations.IssueTracking;
import org.richfaces.tests.metamer.ftest.annotations.Use;
import org.richfaces.tests.metamer.ftest.model.PanelMenu;
import org.testng.annotations.Test;
@@ -59,6 +58,7 @@
}
@Test
+ @IssueTracking("https://issues.jboss.org/browse/RF-10486")
@Use(field = "event", value = "ajaxEvents")
public void testClientSideEvent() {
attributes.setMode(ajax);
@@ -69,6 +69,7 @@
}
@Test
+ @IssueTracking("https://issues.jboss.org/browse/RF-10486")
public void testClientSideEventsOrderClient() {
attributes.setMode(client);
menu.setItemMode(client);
@@ -78,6 +79,7 @@
}
@Test
+ @IssueTracking("https://issues.jboss.org/browse/RF-10486")
public void testClientSideEventsOrderAjax() {
attributes.setMode(ajax);
menu.setItemMode(ajax);
15 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r21596 - trunk/ui/input/ui/src/main/java/org/richfaces/component.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2011-02-10 07:54:41 -0500 (Thu, 10 Feb 2011)
New Revision: 21596
Modified:
trunk/ui/input/ui/src/main/java/org/richfaces/component/AbstractSelect.java
Log:
https://issues.jboss.org/browse/RF-10479 Select: class attributes ignored
Modified: trunk/ui/input/ui/src/main/java/org/richfaces/component/AbstractSelect.java
===================================================================
--- trunk/ui/input/ui/src/main/java/org/richfaces/component/AbstractSelect.java 2011-02-10 12:34:05 UTC (rev 21595)
+++ trunk/ui/input/ui/src/main/java/org/richfaces/component/AbstractSelect.java 2011-02-10 12:54:41 UTC (rev 21596)
@@ -40,4 +40,17 @@
@Attribute()
public abstract String getMaxListHeight();
+
+ @Attribute(hidden = true)
+ public abstract String getReadyStateClass();
+
+ @Attribute(hidden = true)
+ public abstract String getEditStateClass();
+
+ @Attribute(hidden = true)
+ public abstract String getChangedStateClass();
+
+ @Attribute(hidden = true)
+ public abstract String getDisabledStateClass();
+
}
15 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r21595 - in trunk: core/impl/src/main/resources/META-INF/richfaces and 5 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2011-02-10 07:34:05 -0500 (Thu, 10 Feb 2011)
New Revision: 21595
Added:
trunk/core/impl/src/main/resources/META-INF/richfaces/
trunk/core/impl/src/main/resources/META-INF/richfaces/resource-mappings.properties
trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/AutocompleteGradient.java
Removed:
trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/AutocompleteBaseGradient.java
trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/AutocompleteButtonGradient.java
trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/AutocompleteFieldGradient.java
trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/ComboButtonBase.java
trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/ComboDisabledDownButton.java
trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SliderDisabledArrowBottom.java
trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SliderDisabledArrowLeft.java
trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SliderDisabledArrowRight.java
trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SliderSelectedArrowBottom.java
trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SliderSelectedArrowLeft.java
trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SliderSelectedArrowRight.java
trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SpinnerDisabledArrowBottom.java
trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SpinnerDisabledArrowTop.java
Modified:
trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/ArrowBase.java
trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/ComboDownButton.java
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/Autocomplete.ecss
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/calendar.ecss
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/fileupload.ecss
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inputNumberSlider.ecss
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inputNumberSpinner.ecss
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/select.ecss
trunk/ui/input/ui/src/main/resources/META-INF/richfaces/resource-mappings.properties
trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/accordion.ecss
trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/collapsiblePanel.ecss
trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/dropdownmenu.ecss
trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panel.ecss
trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/popupPanel.ecss
trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/toolbar.ecss
trunk/ui/output/ui/src/main/resources/META-INF/richfaces/resource-mappings.properties
Log:
RF-10145 Update core & component images
Added: trunk/core/impl/src/main/resources/META-INF/richfaces/resource-mappings.properties
===================================================================
--- trunk/core/impl/src/main/resources/META-INF/richfaces/resource-mappings.properties (rev 0)
+++ trunk/core/impl/src/main/resources/META-INF/richfaces/resource-mappings.properties 2011-02-10 12:34:05 UTC (rev 21595)
@@ -0,0 +1,5 @@
+org.richfaces.images\:gradientA.png=org.richfaces.renderkit.html.BaseGradient\
+ {baseColorParam=headerGradientColor, gradientColorParam=headerBackgroundColor}
+
+org.richfaces.images\:inputBackgroundImage.png=org.richfaces.renderkit.html.images.InputBackgroundImage
+org.richfaces.images\:buttonBackgroundImage.png=org.richfaces.renderkit.html.images.ButtonBackgroundImage
\ No newline at end of file
Modified: trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/ArrowBase.java
===================================================================
--- trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/ArrowBase.java 2011-02-10 12:23:27 UTC (rev 21594)
+++ trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/ArrowBase.java 2011-02-10 12:34:05 UTC (rev 21595)
@@ -35,6 +35,7 @@
import org.richfaces.resource.AbstractJava2DUserResource;
import org.richfaces.resource.DynamicUserResource;
import org.richfaces.resource.PostConstructResource;
+import org.richfaces.resource.ResourceParameter;
import org.richfaces.resource.StateHolderResource;
import org.richfaces.skin.Skin;
import org.richfaces.skin.SkinFactory;
@@ -47,7 +48,7 @@
public abstract class ArrowBase extends AbstractJava2DUserResource implements StateHolderResource {
private Integer color;
- private String colorName = Skin.GENERAL_TEXT_COLOR;
+ private String colorParam;
public ArrowBase(Dimension dimension) {
super(dimension);
@@ -59,14 +60,15 @@
Skin skin = SkinFactory.getInstance(context).getSkin(context);
Skin defaultSkin = SkinFactory.getInstance(context).getDefaultSkin(context);
- this.color = skin.getColorParameter(context, colorName);
+ this.color = skin.getColorParameter(context, colorParam);
if (this.color == null) {
- this.color = defaultSkin.getColorParameter(context, colorName);
+ this.color = defaultSkin.getColorParameter(context, colorParam);
}
}
- protected final void setColorName(String colorName) {
- this.colorName = colorName;
+ @ResourceParameter(defaultValue = Skin.GENERAL_TEXT_COLOR)
+ public void setColorParam(String colorParam) {
+ this.colorParam = colorParam;
}
public void paint(Graphics2D graphics2d) {
Deleted: trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/AutocompleteBaseGradient.java
===================================================================
--- trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/AutocompleteBaseGradient.java 2011-02-10 12:23:27 UTC (rev 21594)
+++ trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/AutocompleteBaseGradient.java 2011-02-10 12:34:05 UTC (rev 21595)
@@ -1,114 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc. and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.richfaces.renderkit.html.images;
-
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.GradientPaint;
-import java.awt.Graphics2D;
-import java.awt.Rectangle;
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import javax.faces.context.FacesContext;
-
-import org.richfaces.resource.AbstractJava2DUserResource;
-import org.richfaces.resource.DynamicUserResource;
-import org.richfaces.resource.PostConstructResource;
-import org.richfaces.resource.StateHolderResource;
-import org.richfaces.skin.Skin;
-import org.richfaces.skin.SkinFactory;
-
-/**
- * @author Nick Belaevski
- *
- */
-@DynamicUserResource
-public abstract class AutocompleteBaseGradient extends AbstractJava2DUserResource implements StateHolderResource {
-
- private static final Dimension DIMENSION = new Dimension(18, 8);
-
- private String topColorSkinParameter;
-
- private String bottomColorSkinParameter;
-
- private Integer topColor;
-
- private Integer bottomColor;
-
- public AutocompleteBaseGradient() {
- super(DIMENSION);
- }
-
- @PostConstructResource
- public void initialize() {
- FacesContext context = FacesContext.getCurrentInstance();
- Skin skin = SkinFactory.getInstance(context).getSkin(context);
-
- topColor = skin.getColorParameter(context, topColorSkinParameter);
- bottomColor = skin.getColorParameter(context, bottomColorSkinParameter);
- }
-
- public void paint(Graphics2D graphics2d) {
- if (topColor == null || bottomColor == null) {
- return;
- }
- Dimension dimension = getDimension();
-
- GradientPaint paint = new GradientPaint(0, 0, new Color(topColor), 0, dimension.height, new Color(bottomColor));
- graphics2d.setPaint(paint);
- graphics2d.fill(new Rectangle(dimension));
- }
-
- public void writeState(FacesContext context, DataOutput dataOutput) throws IOException {
- if (topColor != null && bottomColor != null) {
- dataOutput.writeBoolean(true);
- dataOutput.writeInt(topColor);
- dataOutput.writeInt(bottomColor);
- } else {
- dataOutput.writeBoolean(false);
- }
- }
-
- public void readState(FacesContext context, DataInput dataInput) throws IOException {
- if (dataInput.readBoolean()) {
- topColor = dataInput.readInt();
- bottomColor = dataInput.readInt();
- } else {
- topColor = null;
- bottomColor = null;
- }
- }
-
- public boolean isTransient() {
- return false;
- }
-
- protected void setTopColorSkinParameter(String topColorSkinParameter) {
- this.topColorSkinParameter = topColorSkinParameter;
- }
-
- protected void setBottomColorSkinParameter(String bottomColorSkinParameter) {
- this.bottomColorSkinParameter = bottomColorSkinParameter;
- }
-}
Deleted: trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/AutocompleteButtonGradient.java
===================================================================
--- trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/AutocompleteButtonGradient.java 2011-02-10 12:23:27 UTC (rev 21594)
+++ trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/AutocompleteButtonGradient.java 2011-02-10 12:34:05 UTC (rev 21595)
@@ -1,36 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc. and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.richfaces.renderkit.html.images;
-
-import org.richfaces.skin.Skin;
-
-/**
- * @author Nick Belaevski
- *
- */
-public class AutocompleteButtonGradient extends AutocompleteBaseGradient {
-
- public AutocompleteButtonGradient() {
- setTopColorSkinParameter(Skin.HEADER_GRADIENT_COLOR);
- setBottomColorSkinParameter(Skin.HEADER_BACKGROUND_COLOR);
- }
-}
Deleted: trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/AutocompleteFieldGradient.java
===================================================================
--- trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/AutocompleteFieldGradient.java 2011-02-10 12:23:27 UTC (rev 21594)
+++ trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/AutocompleteFieldGradient.java 2011-02-10 12:34:05 UTC (rev 21595)
@@ -1,36 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc. and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.richfaces.renderkit.html.images;
-
-import org.richfaces.skin.Skin;
-
-/**
- * @author Nick Belaevski
- *
- */
-public class AutocompleteFieldGradient extends AutocompleteBaseGradient {
-
- public AutocompleteFieldGradient() {
- setTopColorSkinParameter(Skin.ADDITIONAL_BACKGROUND_COLOR);
- setBottomColorSkinParameter(Skin.CONTROL_BACKGROUND_COLOR);
- }
-}
Added: trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/AutocompleteGradient.java
===================================================================
--- trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/AutocompleteGradient.java (rev 0)
+++ trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/AutocompleteGradient.java 2011-02-10 12:34:05 UTC (rev 21595)
@@ -0,0 +1,117 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc. and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.richfaces.renderkit.html.images;
+
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.GradientPaint;
+import java.awt.Graphics2D;
+import java.awt.Rectangle;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
+import javax.faces.context.FacesContext;
+
+import org.richfaces.resource.AbstractJava2DUserResource;
+import org.richfaces.resource.DynamicUserResource;
+import org.richfaces.resource.PostConstructResource;
+import org.richfaces.resource.ResourceParameter;
+import org.richfaces.resource.StateHolderResource;
+import org.richfaces.skin.Skin;
+import org.richfaces.skin.SkinFactory;
+
+/**
+ * @author Nick Belaevski
+ *
+ */
+@DynamicUserResource
+public class AutocompleteGradient extends AbstractJava2DUserResource implements StateHolderResource {
+
+ private static final Dimension DIMENSION = new Dimension(18, 8);
+
+ private String topColorParam;
+
+ private String bottomColorParam;
+
+ private Integer topColor;
+
+ private Integer bottomColor;
+
+ public AutocompleteGradient() {
+ super(DIMENSION);
+ }
+
+ @PostConstructResource
+ public void initialize() {
+ FacesContext context = FacesContext.getCurrentInstance();
+ Skin skin = SkinFactory.getInstance(context).getSkin(context);
+
+ topColor = skin.getColorParameter(context, topColorParam);
+ bottomColor = skin.getColorParameter(context, bottomColorParam);
+ }
+
+ public void paint(Graphics2D graphics2d) {
+ if (topColor == null || bottomColor == null) {
+ return;
+ }
+ Dimension dimension = getDimension();
+
+ GradientPaint paint = new GradientPaint(0, 0, new Color(topColor), 0, dimension.height, new Color(bottomColor));
+ graphics2d.setPaint(paint);
+ graphics2d.fill(new Rectangle(dimension));
+ }
+
+ public void writeState(FacesContext context, DataOutput dataOutput) throws IOException {
+ if (topColor != null && bottomColor != null) {
+ dataOutput.writeBoolean(true);
+ dataOutput.writeInt(topColor);
+ dataOutput.writeInt(bottomColor);
+ } else {
+ dataOutput.writeBoolean(false);
+ }
+ }
+
+ public void readState(FacesContext context, DataInput dataInput) throws IOException {
+ if (dataInput.readBoolean()) {
+ topColor = dataInput.readInt();
+ bottomColor = dataInput.readInt();
+ } else {
+ topColor = null;
+ bottomColor = null;
+ }
+ }
+
+ public boolean isTransient() {
+ return false;
+ }
+
+ @ResourceParameter(defaultValue = Skin.HEADER_GRADIENT_COLOR)
+ public void setTopColorParam(String topColorSkinParameter) {
+ this.topColorParam = topColorSkinParameter;
+ }
+
+ @ResourceParameter(defaultValue = Skin.HEADER_BACKGROUND_COLOR)
+ public void setBottomColorParam(String bottomColorSkinParameter) {
+ this.bottomColorParam = bottomColorSkinParameter;
+ }
+}
Deleted: trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/ComboButtonBase.java
===================================================================
--- trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/ComboButtonBase.java 2011-02-10 12:23:27 UTC (rev 21594)
+++ trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/ComboButtonBase.java 2011-02-10 12:34:05 UTC (rev 21595)
@@ -1,98 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc. and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.richfaces.renderkit.html.images;
-
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.Graphics2D;
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import javax.faces.context.FacesContext;
-
-import org.richfaces.resource.AbstractJava2DUserResource;
-import org.richfaces.resource.DynamicUserResource;
-import org.richfaces.resource.PostConstructResource;
-import org.richfaces.resource.StateHolderResource;
-import org.richfaces.skin.Skin;
-import org.richfaces.skin.SkinFactory;
-
-@DynamicUserResource
-public abstract class ComboButtonBase extends AbstractJava2DUserResource implements StateHolderResource {
-
- private static final Dimension DIMENSION = new Dimension(15, 15);
-
- private Integer arrowColor;
- private String colorName = Skin.GENERAL_TEXT_COLOR;
-
- public ComboButtonBase() {
- super(DIMENSION);
- }
-
- @PostConstructResource
- public final void initialize() {
- FacesContext context = FacesContext.getCurrentInstance();
- Skin skin = SkinFactory.getInstance(context).getSkin(context);
- Skin defaultSkin = SkinFactory.getInstance(context).getDefaultSkin(context);
-
- this.arrowColor = skin.getColorParameter(context, Skin.TABLE_BORDER_COLOR);
- this.arrowColor = skin.getColorParameter(context, colorName);
- if (this.arrowColor == null) {
- this.arrowColor = defaultSkin.getColorParameter(context, colorName);
- }
- }
-
- protected final void setColorName(String colorName) {
- this.colorName = colorName;
- }
-
- public boolean isTransient() {
- return false;
- }
-
- public void writeState(FacesContext context, DataOutput dataOutput) throws IOException {
- dataOutput.writeInt(this.arrowColor);
- }
-
- public void readState(FacesContext context, DataInput dataInput) throws IOException {
- this.arrowColor = dataInput.readInt();
- }
-
- public void paint(Graphics2D graphics2d) {
- graphics2d.setColor(Color.WHITE);
- graphics2d.drawLine(4, 5, 10, 5);
- graphics2d.drawLine(3, 6, 11, 6);
- graphics2d.drawLine(4, 7, 10, 7);
- graphics2d.drawLine(5, 8, 9, 8);
- graphics2d.drawLine(6, 9, 8, 9);
- graphics2d.drawLine(7, 10, 7, 10);
-
- Color arrowColor = new Color(this.arrowColor);
- graphics2d.setColor(arrowColor);
- graphics2d.drawLine(4, 6, 10, 6);
- graphics2d.drawLine(5, 7, 9, 7);
- graphics2d.drawLine(6, 8, 8, 8);
- graphics2d.drawLine(7, 9, 7, 9);
- }
-}
Deleted: trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/ComboDisabledDownButton.java
===================================================================
--- trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/ComboDisabledDownButton.java 2011-02-10 12:23:27 UTC (rev 21594)
+++ trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/ComboDisabledDownButton.java 2011-02-10 12:34:05 UTC (rev 21595)
@@ -1,32 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc. and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.richfaces.renderkit.html.images;
-
-import org.richfaces.skin.Skin;
-
-public class ComboDisabledDownButton extends ComboButtonBase {
-
- public ComboDisabledDownButton() {
- setColorName(Skin.TABLE_BORDER_COLOR);
- }
-}
Modified: trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/ComboDownButton.java
===================================================================
--- trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/ComboDownButton.java 2011-02-10 12:23:27 UTC (rev 21594)
+++ trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/ComboDownButton.java 2011-02-10 12:34:05 UTC (rev 21595)
@@ -22,11 +22,79 @@
package org.richfaces.renderkit.html.images;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Graphics2D;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
+import javax.faces.context.FacesContext;
+
+import org.richfaces.resource.AbstractJava2DUserResource;
+import org.richfaces.resource.DynamicUserResource;
+import org.richfaces.resource.PostConstructResource;
+import org.richfaces.resource.ResourceParameter;
+import org.richfaces.resource.StateHolderResource;
import org.richfaces.skin.Skin;
+import org.richfaces.skin.SkinFactory;
-public class ComboDownButton extends ComboButtonBase {
+@DynamicUserResource
+public class ComboDownButton extends AbstractJava2DUserResource implements StateHolderResource {
+ private static final Dimension DIMENSION = new Dimension(15, 15);
+
+ private Integer arrowColor;
+
+ private boolean disabled;
+
public ComboDownButton() {
- setColorName(Skin.GENERAL_TEXT_COLOR);
+ super(DIMENSION);
}
+
+ @PostConstructResource
+ public final void initialize() {
+ FacesContext context = FacesContext.getCurrentInstance();
+ Skin skin = SkinFactory.getInstance(context).getSkin(context);
+ Skin defaultSkin = SkinFactory.getInstance(context).getDefaultSkin(context);
+
+ this.arrowColor = skin.getColorParameter(context, disabled ? Skin.TABLE_BORDER_COLOR : Skin.GENERAL_TEXT_COLOR);
+ if (this.arrowColor == null) {
+ this.arrowColor = defaultSkin.getColorParameter(context, disabled ? Skin.TABLE_BORDER_COLOR : Skin.GENERAL_TEXT_COLOR);
+ }
+ }
+
+ @ResourceParameter(defaultValue = "false")
+ public void setDisabled(boolean disabled) {
+ this.disabled = disabled;
+ }
+
+ public boolean isTransient() {
+ return false;
+ }
+
+ public void writeState(FacesContext context, DataOutput dataOutput) throws IOException {
+ dataOutput.writeInt(this.arrowColor);
+ }
+
+ public void readState(FacesContext context, DataInput dataInput) throws IOException {
+ this.arrowColor = dataInput.readInt();
+ }
+
+ public void paint(Graphics2D graphics2d) {
+ graphics2d.setColor(Color.WHITE);
+ graphics2d.drawLine(4, 5, 10, 5);
+ graphics2d.drawLine(3, 6, 11, 6);
+ graphics2d.drawLine(4, 7, 10, 7);
+ graphics2d.drawLine(5, 8, 9, 8);
+ graphics2d.drawLine(6, 9, 8, 9);
+ graphics2d.drawLine(7, 10, 7, 10);
+
+ Color arrowColor = new Color(this.arrowColor);
+ graphics2d.setColor(arrowColor);
+ graphics2d.drawLine(4, 6, 10, 6);
+ graphics2d.drawLine(5, 7, 9, 7);
+ graphics2d.drawLine(6, 8, 8, 8);
+ graphics2d.drawLine(7, 9, 7, 9);
+ }
}
Deleted: trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SliderDisabledArrowBottom.java
===================================================================
--- trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SliderDisabledArrowBottom.java 2011-02-10 12:23:27 UTC (rev 21594)
+++ trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SliderDisabledArrowBottom.java 2011-02-10 12:34:05 UTC (rev 21595)
@@ -1,35 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright ${year}, Red Hat, Inc. and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.richfaces.renderkit.html.images;
-
-
-/**
- * @author Konstantin Mishin
- *
- */
-public class SliderDisabledArrowBottom extends SliderArrowBottom {
-
- public SliderDisabledArrowBottom() {
- setColorName("tabDisabledTextColor");
- }
-}
Deleted: trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SliderDisabledArrowLeft.java
===================================================================
--- trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SliderDisabledArrowLeft.java 2011-02-10 12:23:27 UTC (rev 21594)
+++ trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SliderDisabledArrowLeft.java 2011-02-10 12:34:05 UTC (rev 21595)
@@ -1,35 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright ${year}, Red Hat, Inc. and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.richfaces.renderkit.html.images;
-
-
-/**
- * @author Konstantin Mishin
- *
- */
-public class SliderDisabledArrowLeft extends SliderArrowLeft {
-
- public SliderDisabledArrowLeft() {
- setColorName("tabDisabledTextColor");
- }
-}
Deleted: trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SliderDisabledArrowRight.java
===================================================================
--- trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SliderDisabledArrowRight.java 2011-02-10 12:23:27 UTC (rev 21594)
+++ trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SliderDisabledArrowRight.java 2011-02-10 12:34:05 UTC (rev 21595)
@@ -1,35 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright ${year}, Red Hat, Inc. and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.richfaces.renderkit.html.images;
-
-
-/**
- * @author Konstantin Mishin
- *
- */
-public class SliderDisabledArrowRight extends SliderArrowRight {
-
- public SliderDisabledArrowRight() {
- setColorName("tabDisabledTextColor");
- }
-}
Deleted: trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SliderSelectedArrowBottom.java
===================================================================
--- trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SliderSelectedArrowBottom.java 2011-02-10 12:23:27 UTC (rev 21594)
+++ trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SliderSelectedArrowBottom.java 2011-02-10 12:34:05 UTC (rev 21595)
@@ -1,35 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright ${year}, Red Hat, Inc. and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.richfaces.renderkit.html.images;
-
-
-/**
- * @author Konstantin Mishin
- *
- */
-public class SliderSelectedArrowBottom extends SliderArrowBottom {
-
- public SliderSelectedArrowBottom() {
- setColorName("tipBorderColor");
- }
-}
Deleted: trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SliderSelectedArrowLeft.java
===================================================================
--- trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SliderSelectedArrowLeft.java 2011-02-10 12:23:27 UTC (rev 21594)
+++ trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SliderSelectedArrowLeft.java 2011-02-10 12:34:05 UTC (rev 21595)
@@ -1,35 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright ${year}, Red Hat, Inc. and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.richfaces.renderkit.html.images;
-
-
-/**
- * @author Konstantin Mishin
- *
- */
-public class SliderSelectedArrowLeft extends SliderArrowLeft {
-
- public SliderSelectedArrowLeft() {
- setColorName("tipBorderColor");
- }
-}
Deleted: trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SliderSelectedArrowRight.java
===================================================================
--- trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SliderSelectedArrowRight.java 2011-02-10 12:23:27 UTC (rev 21594)
+++ trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SliderSelectedArrowRight.java 2011-02-10 12:34:05 UTC (rev 21595)
@@ -1,35 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright ${year}, Red Hat, Inc. and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.richfaces.renderkit.html.images;
-
-
-/**
- * @author Konstantin Mishin
- *
- */
-public class SliderSelectedArrowRight extends SliderArrowRight {
-
- public SliderSelectedArrowRight() {
- setColorName("tipBorderColor");
- }
-}
Deleted: trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SpinnerDisabledArrowBottom.java
===================================================================
--- trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SpinnerDisabledArrowBottom.java 2011-02-10 12:23:27 UTC (rev 21594)
+++ trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SpinnerDisabledArrowBottom.java 2011-02-10 12:34:05 UTC (rev 21595)
@@ -1,35 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright ${year}, Red Hat, Inc. and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.richfaces.renderkit.html.images;
-
-
-/**
- * @author Konstantin Mishin
- *
- */
-public class SpinnerDisabledArrowBottom extends SpinnerArrowBottom {
-
- public SpinnerDisabledArrowBottom() {
- setColorName("tabDisabledTextColor");
- }
-}
Deleted: trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SpinnerDisabledArrowTop.java
===================================================================
--- trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SpinnerDisabledArrowTop.java 2011-02-10 12:23:27 UTC (rev 21594)
+++ trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/SpinnerDisabledArrowTop.java 2011-02-10 12:34:05 UTC (rev 21595)
@@ -1,35 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright ${year}, Red Hat, Inc. and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.richfaces.renderkit.html.images;
-
-
-/**
- * @author Konstantin Mishin
- *
- */
-public class SpinnerDisabledArrowTop extends SpinnerArrowTop {
-
- public SpinnerDisabledArrowTop() {
- setColorName("tabDisabledTextColor");
- }
-}
Modified: trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/Autocomplete.ecss
===================================================================
--- trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/Autocomplete.ecss 2011-02-10 12:23:27 UTC (rev 21594)
+++ trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/Autocomplete.ecss 2011-02-10 12:34:05 UTC (rev 21595)
@@ -6,7 +6,7 @@
input.rf-au-inp {
background-color: '#{richSkin.controlBackgroundColor}';
- background-image: url("#{resource['org.richfaces.renderkit.html.images.InputBackgroundImage']}");
+ background-image: url("#{resource['org.richfaces.images.inputBackgroundImage.png']}");
background-position:1px 1px;
background-repeat:no-repeat;
border: 0px;
@@ -21,7 +21,7 @@
border-style: solid;
border-color: '#{richSkin.panelBorderColor}';
display: inline-block;
- background-image: "url(#{resource['org.richfaces.renderkit.html.images.AutocompleteFieldGradient']})";
+ background-image: "url(#{resource['org.richfaces.images:autocompleteFieldGradient.png']})";
background-repeat: repeat-x;
background-position: top left;
background-color: '#{richSkin.controlBackgroundColor}';
@@ -34,7 +34,7 @@
}
.rf-au-btn{
- background-image: "url(#{resource['org.richfaces.renderkit.html.images.AutocompleteButtonGradient']})";
+ background-image: "url(#{resource['org.richfaces.images:autocompleteButtonGradient.png']})";
background-repeat: repeat-x;
background-position: top left;
background-color: '#{richSkin.headerBackgroundColor}';
@@ -48,7 +48,7 @@
.rf-au-btn-arrow, .rf-au-btn-arrow-dis{
background-position: center;
background-repeat: no-repeat;
- background-image: "url(#{resource['org.richfaces:combo_down_button.gif']})";
+ background-image: "url(#{resource['org.richfaces.images:comboDownButton.png']})";
cursor: pointer;
width: 15px;
height: 16px;
@@ -56,7 +56,7 @@
}
.rf-au-btn-arrow-dis{
- background-image: "url(#{resource['org.richfaces.renderkit.html.images.ComboDisabledDownButton']})";
+ background-image: "url(#{resource['org.richfaces.images:comboDisabledDownButton.png']})";
cursor: default;
}
Modified: trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/calendar.ecss
===================================================================
--- trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/calendar.ecss 2011-02-10 12:23:27 UTC (rev 21594)
+++ trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/calendar.ecss 2011-02-10 12:34:05 UTC (rev 21595)
@@ -153,7 +153,7 @@
background-position: left top;
background-repeat: repeat-x;
border: 1px solid;
- background-image: url("#{resource['org.richfaces.renderkit.html.images.InputBackgroundImage']}");
+ background-image: url("#{resource['org.richfaces.images:inputBackgroundImage.png']}");
background-color: '#{richSkin.controlBackgroundColor}';
border-color: '#{richSkin.panelBorderColor}';
border-bottom-color: '#{richSkin.subBorderColor}';
@@ -168,7 +168,7 @@
font-size: 0px;
background-color: '#{richSkin.headerBackgroundColor}';
border-color: '#{richSkin.headerBackgroundColor}';
- background-image: "url(#{resource['org.richfaces.renderkit.html.images.ButtonBackgroundImage']})";
+ background-image: "url(#{resource['org.richfaces.images:buttonBackgroundImage.png']})";
}
@@ -339,11 +339,11 @@
}
.rf-cal-sp-up {
- background-image: "url(#{resource['org.richfaces.renderkit.html.images.SpinnerArrowTop']})";
+ background-image: "url(#{resource['org.richfaces.images:spinnerArrowTop.png']})";
}
.rf-cal-sp-down {
- background-image: "url(#{resource['org.richfaces.renderkit.html.images.SpinnerArrowBottom']})";
+ background-image: "url(#{resource['org.richfaces.images:spinnerArrowBottom.png']})";
}
.rf-cal-sp-press {
@@ -353,7 +353,7 @@
.rf-cal-sp-btn {
background-color: '#{richSkin.headerBackgroundColor}';
border-color: '#{richSkin.headerBackgroundColor}';
- background-image: "url(#{resource['org.richfaces.renderkit.html.images.ButtonBackgroundImage']})";
+ background-image: "url(#{resource['org.richfaces.images:buttonBackgroundImage.png']})";
}
.rf-cal-edtr-layout-shdw {
Modified: trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/fileupload.ecss
===================================================================
--- trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/fileupload.ecss 2011-02-10 12:23:27 UTC (rev 21594)
+++ trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/fileupload.ecss 2011-02-10 12:34:05 UTC (rev 21595)
@@ -29,7 +29,7 @@
.rf-fu-hdr {
background-color: '#{richSkin.headerBackgroundColor}';
- background-image: url("#{resource['org.richfaces.renderkit.html.GradientA']}");
+ background-image: url("#{resource['org.richfaces.images:gradientA.png']}");
border-color: '#{richSkin.headerBackgroundColor}';
border-style: solid;
border-width: 1px;
Modified: trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inputNumberSlider.ecss
===================================================================
--- trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inputNumberSlider.ecss 2011-02-10 12:23:27 UTC (rev 21594)
+++ trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inputNumberSlider.ecss 2011-02-10 12:34:05 UTC (rev 21595)
@@ -109,37 +109,37 @@
.rf-insl-hnd {
- background-image: url("#{resource['org.richfaces.renderkit.html.images.SliderArrowBottom']}");
+ background-image: url("#{resource['org.richfaces.images:sliderArrowBottom.png']}");
}
.rf-insl-hnd-sel {
- background-image: url("#{resource['org.richfaces.renderkit.html.images.SliderSelectedArrowBottom']}");
+ background-image: url("#{resource['org.richfaces.images:sliderSelectedArrowBottom.png']}");
}
.rf-insl-hnd-dis {
- background-image: url("#{resource['org.richfaces.renderkit.html.images.SliderDisabledArrowBottom']}");
+ background-image: url("#{resource['org.richfaces.images:sliderDisabledArrowBottom.png']}");
}
.rf-insl-dec {
- background-image: url("#{resource['org.richfaces.renderkit.html.images.SliderArrowLeft']}");
+ background-image: url("#{resource['org.richfaces.images:sliderArrowLeft.png']}");
}
.rf-insl-dec-sel {
- background-image: url("#{resource['org.richfaces.renderkit.html.images.SliderSelectedArrowLeft']}");
+ background-image: url("#{resource['org.richfaces.images:sliderSelectedArrowLeft.png']}");
}
.rf-insl-dec-dis {
- background-image: url("#{resource['org.richfaces.renderkit.html.images.SliderDisabledArrowLeft']}");
+ background-image: url("#{resource['org.richfaces.images:sliderDisabledArrowLeft.png']}");
}
.rf-insl-inc {
- background-image: url("#{resource['org.richfaces.renderkit.html.images.SliderArrowRight']}");
+ background-image: url("#{resource['org.richfaces.images:sliderArrowRight.png']}");
}
.rf-insl-inc-sel {
- background-image: url("#{resource['org.richfaces.renderkit.html.images.SliderSelectedArrowRight']}");
+ background-image: url("#{resource['org.richfaces.images:sliderSelectedArrowRight.png']}");
}
.rf-insl-inc-dis {
- background-image: url("#{resource['org.richfaces.renderkit.html.images.SliderDisabledArrowRight']}");
+ background-image: url("#{resource['org.richfaces.images:sliderDisabledArrowRight.png']}");
}
\ No newline at end of file
Modified: trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inputNumberSpinner.ecss
===================================================================
--- trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inputNumberSpinner.ecss 2011-02-10 12:23:27 UTC (rev 21594)
+++ trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inputNumberSpinner.ecss 2011-02-10 12:34:05 UTC (rev 21595)
@@ -30,7 +30,7 @@
input.rf-insp-inp[type="text"] {
background-color: '#{richSkin.controlBackgroundColor}';
- background-image: url("#{resource['org.richfaces.renderkit.html.images.InputBackgroundImage']}");
+ background-image: url("#{resource['org.richfaces.images:inputBackgroundImage.png']}");
background-position:1px 1px;
background-repeat:no-repeat;
border: 0px;
@@ -44,7 +44,7 @@
.rf-insp-btns {
background-color: '#{richSkin.headerBackgroundColor}';
- background-image: "url(#{resource['org.richfaces.renderkit.html.images.ButtonBackgroundImage']})";
+ background-image: "url(#{resource['org.richfaces.images:buttonBackgroundImage.png']})";
background-position: top left;
background-repeat: repeat-x;
border-left-width: 1px;
@@ -64,17 +64,17 @@
}
.rf-insp-dec {
- background-image: url("#{resource['org.richfaces.renderkit.html.images.SpinnerArrowBottom']}");
+ background-image: url("#{resource['org.richfaces.images:spinnerArrowBottom.png']}");
}
.rf-insp-inc {
- background-image: url("#{resource['org.richfaces.renderkit.html.images.SpinnerArrowTop']}");
+ background-image: url("#{resource['org.richfaces.images:spinnerArrowTop.png']}");
}
.rf-insp-dec-dis {
- background-image: url("#{resource['org.richfaces.renderkit.html.images.SpinnerDisabledArrowBottom']}");
+ background-image: url("#{resource['org.richfaces.images:spinnerDisabledArrowBottom.png']}");
}
.rf-insp-inc-dis {
- background-image: url("#{resource['org.richfaces.renderkit.html.images.SpinnerDisabledArrowTop']}");
+ background-image: url("#{resource['org.richfaces.images:spinnerDisabledArrowTop.png']}");
}
\ No newline at end of file
Modified: trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/select.ecss
===================================================================
--- trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/select.ecss 2011-02-10 12:23:27 UTC (rev 21594)
+++ trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/select.ecss 2011-02-10 12:34:05 UTC (rev 21595)
@@ -15,7 +15,7 @@
input.rf-sel-inp {
background-color: '#{richSkin.controlBackgroundColor}';
- background-image: url("#{resource['org.richfaces.renderkit.html.images.InputBackgroundImage']}");
+ background-image: url("#{resource['org.richfaces.images:inputBackgroundImage.png']}");
background-position:1px 1px;
background-repeat:no-repeat;
border: 0px;
@@ -34,7 +34,7 @@
}
.rf-sel-btn{
- background-image: "url(#{resource['org.richfaces.renderkit.html.images.AutocompleteButtonGradient']})";
+ background-image: "url(#{resource['org.richfaces.images:autocompleteButtonGradient.png']})";
background-repeat: repeat-x;
background-position: top left;
background-color: '#{richSkin.headerBackgroundColor}';
Modified: trunk/ui/input/ui/src/main/resources/META-INF/richfaces/resource-mappings.properties
===================================================================
--- trunk/ui/input/ui/src/main/resources/META-INF/richfaces/resource-mappings.properties 2011-02-10 12:23:27 UTC (rev 21594)
+++ trunk/ui/input/ui/src/main/resources/META-INF/richfaces/resource-mappings.properties 2011-02-10 12:34:05 UTC (rev 21595)
@@ -15,4 +15,44 @@
{baseColorParam=additionalBackgroundColor, gradientColorParam=trimColor, height=18, width=1}
org.richfaces.images\:fuBtnDisGrad.png=org.richfaces.renderkit.html.BaseGradient\
{baseColorParam=tableSubfooterBackgroundColor, gradientColorParam=tableFooterBackgroundColor, height=18, width=1}
-org.richfaces\:fileUploadProgress=org.richfaces.resource.FileUploadProgressResource
\ No newline at end of file
+org.richfaces\:fileUploadProgress=org.richfaces.resource.FileUploadProgressResource
+
+org.richfaces.images\:comboDownButton.png=org.richfaces.renderkit.html.images.ComboDownButton
+org.richfaces.images\:comboDisabledDownButton.png=org.richfaces.renderkit.html.images.ComboDownButton{disabled=true}
+
+org.richfaces.images\:autocompleteButtonGradient.png=org.richfaces.renderkit.html.images.AutocompleteGradient\
+ {topColorParam=headerGradientColor ,bottomColorParam=headerBackgroundColor}
+org.richfaces.images\:autocompleteFieldGradient.png=org.richfaces.renderkit.html.images.AutocompleteGradient\
+ {topColorParam=additionalBackgroundColor ,bottomColorParam=controlBackgroundColor}
+
+org.richfaces.images\:spinnerArrowTop.png=org.richfaces.renderkit.html.images.SpinnerArrowTop
+org.richfaces.images\:spinnerArrowBottom.png=org.richfaces.renderkit.html.images.SpinnerArrowBottom
+
+org.richfaces.images\:spinnerDisabledArrowTop.png=org.richfaces.renderkit.html.images.SpinnerArrowTop\
+ {colorParam=tabDisabledTextColor}
+org.richfaces.images\:spinnerDisabledArrowBottom.png=org.richfaces.renderkit.html.images.SpinnerArrowBottom\
+ {colorParam=tabDisabledTextColor}
+
+org.richfaces.images\:sliderArrowBottom.png=org.richfaces.renderkit.html.images.SliderArrowBottom
+org.richfaces.images\:sliderArrowLeft.png=org.richfaces.renderkit.html.images.SliderArrowLeft
+org.richfaces.images\:sliderArrowRight.png=org.richfaces.renderkit.html.images.SliderArrowRight
+
+org.richfaces.images\:sliderDisabledArrowBottom.png=org.richfaces.renderkit.html.images.SliderArrowBottom\
+ {colorParam=tabDisabledTextColor}
+org.richfaces.images\:sliderDisabledArrowLeft.png=org.richfaces.renderkit.html.images.SliderArrowLeft\
+ {colorParam=tabDisabledTextColor}
+org.richfaces.images\:sliderDisabledArrowRight.png=org.richfaces.renderkit.html.images.SliderArrowRight\
+ {colorParam=tabDisabledTextColor}
+
+org.richfaces.images\:sliderSelectedArrowBottom.png=org.richfaces.renderkit.html.images.SliderArrowBottom\
+ {colorParam=tipBorderColor}
+org.richfaces.images\:sliderSelectedArrowLeft.png=org.richfaces.renderkit.html.images.SliderArrowLeft\
+ {colorParam=tipBorderColor}
+org.richfaces.images\:sliderSelectedArrowRight.png=org.richfaces.renderkit.html.images.SliderArrowRight\
+ {colorParam=tipBorderColor}
+
+org.richfaces.images\:inputBackgroundImage.png=org.richfaces.renderkit.html.images.InputBackgroundImage
+org.richfaces.images\:buttonBackgroundImage.png=org.richfaces.renderkit.html.images.ButtonBackgroundImage
+
+
+
\ No newline at end of file
Modified: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/accordion.ecss
===================================================================
--- trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/accordion.ecss 2011-02-10 12:23:27 UTC (rev 21594)
+++ trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/accordion.ecss 2011-02-10 12:34:05 UTC (rev 21595)
@@ -10,7 +10,7 @@
border-bottom-width: 1px;
border-bottom-style: solid;
border-bottom-color: '#{richSkin.panelBorderColor}';
- background-image: "url(#{resource['org.richfaces.renderkit.html.GradientA']})";
+ background-image: "url(#{resource['org.richfaces.images:gradientA.png']})";
background-repeat: repeat-x;
background-position: top left;
background-color: '#{richSkin.headerBackgroundColor}';
Modified: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/collapsiblePanel.ecss
===================================================================
--- trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/collapsiblePanel.ecss 2011-02-10 12:23:27 UTC (rev 21594)
+++ trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/collapsiblePanel.ecss 2011-02-10 12:34:05 UTC (rev 21595)
@@ -19,7 +19,7 @@
border-style:solid;
background-position:top left;
background-repeat:repeat-x;
- background-image:"url(#{resource['org.richfaces.renderkit.html.GradientA']})";
+ background-image:"url(#{resource['org.richfaces.images:gradientA.png']})";
}
.rf-cp-hdr-exp {}
Modified: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/dropdownmenu.ecss
===================================================================
--- trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/dropdownmenu.ecss 2011-02-10 12:23:27 UTC (rev 21594)
+++ trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/dropdownmenu.ecss 2011-02-10 12:34:05 UTC (rev 21595)
@@ -94,7 +94,7 @@
margin : 2px 0px 2px 24px;
}
.rf-ddm-nd {
- background-image: "url(#{resource['org.richfaces.renderkit.html.images.MenuNodeImage']})";
+ background-image: "url(#{resource['org.richfaces.images:menuNodeImage.gif']})";
background-repeat: no-repeat;
background-position: top;
font-size: 1px;
Modified: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panel.ecss
===================================================================
--- trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panel.ecss 2011-02-10 12:23:27 UTC (rev 21594)
+++ trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panel.ecss 2011-02-10 12:34:05 UTC (rev 21595)
@@ -18,7 +18,7 @@
border-style:solid;
background-position:top left;
background-repeat:repeat-x;
- background-image:"url(#{resource['org.richfaces.renderkit.html.GradientA']})";
+ background-image:"url(#{resource['org.richfaces.images:gradientA.png']})";
}
.rf-p-b{
Modified: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/popupPanel.ecss
===================================================================
--- trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/popupPanel.ecss 2011-02-10 12:23:27 UTC (rev 21594)
+++ trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/popupPanel.ecss 2011-02-10 12:34:05 UTC (rev 21595)
@@ -34,7 +34,7 @@
z-index:100;
}
.rf-pp-hdr {
- background : "url(#{resource['org.richfaces.renderkit.html.GradientA']})";
+ background : "url(#{resource['org.richfaces.images:gradientA.png']})";
repeat-x : 'top left #{richSkin.headerBackgroundColor}';
position : relative;
padding-left : 10px;
Modified: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/toolbar.ecss
===================================================================
--- trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/toolbar.ecss 2011-02-10 12:23:27 UTC (rev 21594)
+++ trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/toolbar.ecss 2011-02-10 12:34:05 UTC (rev 21595)
@@ -10,7 +10,7 @@
background-position:left top;
background-repeat:repeat-x;
/*check gradient from headerGradientColor to headerBackgroundColor*/
- background-image:url("#{resource['org.richfaces.renderkit.html.GradientA']}");
+ background-image:url("#{resource['org.richfaces.images:gradientA.png']}");
}
.rf-tb-itm {
@@ -35,25 +35,25 @@
}
.rf-tb-sep-grid {
- background-image:url("#{resource['org.richfaces.renderkit.html.images.GridSeparatorImage']}");
+ background-image:url("#{resource['org.richfaces.images:gridSeparatorImage.gif']}");
width: 9px;
background-repeat: repeat-y;
}
.rf-tb-sep-line {
width: 2px;
- background-image:url("#{resource['org.richfaces.renderkit.html.images.LineSeparatorImage']}");
+ background-image:url("#{resource['org.richfaces.images:lineSeparatorImage.gif']}");
background-repeat: repeat-y;
}
.rf-tb-sep-disc {
width: 9px;
- background-image:url("#{resource['org.richfaces.renderkit.html.images.DotSeparatorImage']}");
+ background-image:url("#{resource['org.richfaces.images:dotSeparatorImage.gif']}");
background-repeat: no-repeat;
}
.rf-tb-sep-square {
width: 9px;
- background-image:url("#{resource['org.richfaces.renderkit.html.images.SquareSeparatorImage']}");
+ background-image:url("#{resource['org.richfaces.images:squareSeparatorImage.gif']}");
background-repeat: no-repeat;
}
\ No newline at end of file
Modified: trunk/ui/output/ui/src/main/resources/META-INF/richfaces/resource-mappings.properties
===================================================================
--- trunk/ui/output/ui/src/main/resources/META-INF/richfaces/resource-mappings.properties 2011-02-10 12:23:27 UTC (rev 21594)
+++ trunk/ui/output/ui/src/main/resources/META-INF/richfaces/resource-mappings.properties 2011-02-10 12:34:05 UTC (rev 21595)
@@ -19,11 +19,16 @@
org.richfaces.images\:actRightTabBg.png=org.richfaces.renderkit.html.BaseGradient\
{width=26, height=5, baseColorParam=generalBackgroundColor, gradientColorParam=tabBackgroundColor, horizontal=true}
-org.richfaces.images\:pbAniBg.gif=org.richfaces.renderkit.html.images.ProgressBarAnimatedBackgroundImage
-
org.richfaces.images\:menu_list_bg.gif=org.richfaces.renderkit.html.BaseGradient\
{width=22, height=3, baseColorParam=additionalBackgroundColor, gradientColorParam=tabBackgroundColor, horizontal=true}
org.richfaces.images\:menu_item_bg.gif=org.richfaces.renderkit.html.BaseGradient\
{width=3, height=16, baseColorParam=additionalBackgroundColor, gradientColorParam=tabBackgroundColor}
org.richfaces.images\:tabLineBg.png=org.richfaces.renderkit.html.BaseGradient\
- {width=5, height=26, baseColorParam=additionalBackgroundColor, gradientColorParam=generalBackgroundColor}
\ No newline at end of file
+ {width=5, height=26, baseColorParam=additionalBackgroundColor, gradientColorParam=generalBackgroundColor}
+
+org.richfaces.images\:menuNodeImage.gif=org.richfaces.renderkit.html.images.MenuNodeImage
+org.richfaces.images\:pbAniBg.gif=org.richfaces.renderkit.html.images.ProgressBarAnimatedBackgroundImage
+org.richfaces.images\:dotSeparatorImage.gif=org.richfaces.renderkit.html.images.DotSeparatorImage
+org.richfaces.images\:gridSeparatorImage.gif=org.richfaces.renderkit.html.images.GridSeparatorImage
+org.richfaces.images\:squareSeparatorImage.gif=org.richfaces.renderkit.html.images.SquareSeparatorImage
+org.richfaces.images\:lineSeparatorImage.gif=org.richfaces.renderkit.html.images.LineSeparatorImage
15 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r21594 - in trunk/examples/richfaces-showcase/src/main/webapp/richfaces/attachQueue: samples and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2011-02-10 07:23:27 -0500 (Thu, 10 Feb 2011)
New Revision: 21594
Modified:
trunk/examples/richfaces-showcase/src/main/webapp/richfaces/attachQueue/attachQueue.xhtml
trunk/examples/richfaces-showcase/src/main/webapp/richfaces/attachQueue/samples/attachQueue-sample.xhtml
Log:
http://jira.jboss.org/browse/RF-10204
Modified: trunk/examples/richfaces-showcase/src/main/webapp/richfaces/attachQueue/attachQueue.xhtml
===================================================================
--- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/attachQueue/attachQueue.xhtml 2011-02-10 12:05:52 UTC (rev 21593)
+++ trunk/examples/richfaces-showcase/src/main/webapp/richfaces/attachQueue/attachQueue.xhtml 2011-02-10 12:23:27 UTC (rev 21594)
@@ -5,14 +5,12 @@
xmlns:a4j="http://richfaces.org/a4j">
<p>In RichFaces 4 all request settings related to queue was moved
out of components attributes and now customization available using new
- a4j:attachQueue tag. Next sample shows how requestGroupingId (former
- similarityGroupingId) could be set for different components making the
- requests from them similar. Besides setting requestGroupingId - attach
- queue tag at second button redefines default queue request delay from
- 500ms to 1500ms.</p>
-
- <p>If you will click the buttons fast - requests will be combined
- and only last click will be processed</p>
+ <b>a4j:attachQueue</b> tag. Next sample shows how <b>requestDelay</b>
+ could be changed for single component.</p>
+ <p>Note that when you typing in input - status appears with two
+ seconds delay because <b>default queue contains requestDelay="2000"</b>.
+ And when you clicking save button - it appears immediately because <b>requestDelay
+ changed to 0 for the button</b>.</p>
<ui:include src="#{demoNavigator.sampleIncludeURI}" />
<ui:include src="/templates/includes/source-view.xhtml">
<ui:param name="src" value="#{demoNavigator.sampleIncludeURI}" />
Modified: trunk/examples/richfaces-showcase/src/main/webapp/richfaces/attachQueue/samples/attachQueue-sample.xhtml
===================================================================
--- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/attachQueue/samples/attachQueue-sample.xhtml 2011-02-10 12:05:52 UTC (rev 21593)
+++ trunk/examples/richfaces-showcase/src/main/webapp/richfaces/attachQueue/samples/attachQueue-sample.xhtml 2011-02-10 12:23:27 UTC (rev 21594)
@@ -5,24 +5,21 @@
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:a4j="http://richfaces.org/a4j"
xmlns:rich="http://richfaces.org/rich">
- <a4j:queue requestDelay="500"></a4j:queue>
+ <a4j:queue requestDelay="2000"/>
<h:form>
- <rich:panel>
- <h:panelGrid columns="2">
- <a4j:commandButton value="Set Name to Alex" render="rep">
- <a4j:attachQueue requestGroupingId="group1" />
- <a4j:param name="username" value="Alex" assignTo="#{userBean.name}" />
- </a4j:commandButton>
-
- <a4j:commandButton value="Set Name to John" render="rep">
- <a4j:attachQueue requestGroupingId="group1" requestDelay="1500" />
- <a4j:param name="username" value="John" assignTo="#{userBean.name}" />
- </a4j:commandButton>
- </h:panelGrid>
+ <rich:panel bodyClass="bClass">
+ <h:outputText value="Type there:" />
+ <h:inputText>
+ <a4j:ajax event="keyup" />
+ </h:inputText>
+ <a4j:commandButton value="submit">
+ <a4j:attachQueue requestDelay="0" />
+ </a4j:commandButton>
+ <a4j:status>
+ <f:facet name="start">
+ Please wait...
+ </f:facet>
+ </a4j:status>
</rich:panel>
-
- <rich:panel>
- <h:outputText id="rep" value="Selected Name:#{userBean.name}" />
- </rich:panel>
</h:form>
</ui:composition>
\ No newline at end of file
15 years, 2 months
- 1
- 0