[richfaces-svn-commits] JBoss Rich Faces SVN: r19927 - trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces.

Author: pyaschenko Date: 2010-11-04 07:01:49 -0400 (Thu, 04 Nov 2010) New Revision: 19927 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.js Log: http://jira.jboss.com/jira/browse/RF-9637 http://jira.jboss.com/jira/browse/RF-9633 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 2010-11-04 09:31:43 UTC (rev 19926) +++ trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/calendar.ecss 2010-11-04 11:01:49 UTC (rev 19927) @@ -59,6 +59,18 @@ color : '#{richSkin.headerTextColor}'; } +.rf-ca-tl{ + vertical-align : middle; + text-align : center; + width: 20px; + height : 22px; + background-color : '#{richSkin.headerBackgroundColor}'; + font-size : '#{richSkin.headerSizeFont}'; + font-family : '#{richSkin.headerFamilyFont}'; + font-weight : '#{richSkin.headerWeightFont}'; + color : '#{richSkin.headerTextColor}'; +} + .rf-ca-days{ border-bottom : 1px solid; border-right : 0px solid; @@ -288,7 +300,7 @@ padding: 5px 5px 5px 1px; } -.rich-ca-date-layout-ok { +.rf-ca-date-layout-ok { background: '#{richSkin.additionalBackgroundColor}'; border-top: 1px solid; border-top-color: '#{richSkin.panelBorderColor}'; @@ -318,7 +330,7 @@ border: 1px solid; border-color: '#{richSkin.panelBorderColor}'; border-right-color: '#{richSkin.tableBackgroundColor}'; - border-bottom-color: '#{richSkin.panelBorderColor}'; + border-bottom-color: '#{richSkin.tableBackgroundColor}'; background-color: '#{richSkin.calendarWeekBackgroundColor}'; } Modified: trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/calendar.js =================================================================== --- trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/calendar.js 2010-11-04 09:31:43 UTC (rev 19926) +++ trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/calendar.js 2010-11-04 11:01:49 UTC (rev 19927) @@ -128,24 +128,24 @@ [ new E('tr',{}, [ - new E('td',{'class': 'rf-tl-ftr', 'style':function(context){return (this.isEmpty ? 'display:none;' : '');}}, + new E('td',{'class': 'rf-ca-tl-ftr', 'style':function(context){return (this.isEmpty ? 'display:none;' : '');}}, [ new ET(function (context) { return rf.calendarTemplates.evalMacro("selectedDateControl", context)}) ]), - new E('td',{'class': 'rf-tl-ftr', 'style':function(context){return (this.isEmpty ? 'display:none;' : '');}}, + new E('td',{'class': 'rf-ca-tl-ftr', 'style':function(context){return (this.isEmpty ? 'display:none;' : '');}}, [ new ET(function (context) { return rf.calendarTemplates.evalMacro("cleanControl", context)}) ]), - new E('td',{'class': 'rf-tl-ftr', 'style':function(context){return (this.isEmpty ? 'display:none;' : '');}}, + new E('td',{'class': 'rf-ca-tl-ftr', 'style':function(context){return (this.isEmpty ? 'display:none;' : '');}}, [ new ET(function (context) { return rf.calendarTemplates.evalMacro("timeControl", context)}) ]), - new E('td',{'class': 'rf-tl-ftr', 'style': 'background-image:none;', 'width': '100%'}, []), - new E('td',{'class': 'rf-tl-ftr', 'style':function(context){return (this.isEmpty ? 'display:none;' : '')+(context.calendar.params.disabled || context.calendar.params.readonly || !context.calendar.params.showApplyButton ? 'background-image:none;' : '');}}, + new E('td',{'class': 'rf-ca-tl-ftr', 'style': 'background-image:none;', 'width': '100%'}, []), + new E('td',{'class': 'rf-ca-tl-ftr', 'style':function(context){return (this.isEmpty ? 'display:none;' : '')+(context.calendar.params.disabled || context.calendar.params.readonly || !context.calendar.params.showApplyButton ? 'background-image:none;' : '');}}, [ new ET(function (context) { return rf.calendarTemplates.evalMacro("todayControl", context)}) ]), - new E('td',{'class': 'rf-tl-ftr', 'style':function(context){return (this.isEmpty ? 'display:none;' : '')+'background-image:none;';}}, + new E('td',{'class': 'rf-ca-tl-ftr', 'style':function(context){return (this.isEmpty ? 'display:none;' : '')+'background-image:none;';}}, [ new ET(function (context) { return rf.calendarTemplates.evalMacro("applyControl", context)}) ])