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