Author: amarkhel Date: 2010-09-21 15:47:48 -0400 (Tue, 21 Sep 2010) New Revision: 19299 Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TabPanelRenderer.java trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/tabPanel.ecss Log: RF-9363 Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TabPanelRenderer.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TabPanelRenderer.java 2010-09-21 19:47:10 UTC (rev 19298) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TabPanelRenderer.java 2010-09-21 19:47:48 UTC (rev 19299) @@ -86,15 +86,15 @@ } private void writeTabsLineSeparator(ResponseWriter writer) throws IOException { - writer.write("<div class='rf-tb-hdr_border'></div>"); + writer.write("<div class='rf-tb-hdr_brd'></div>"); } private void writeTabsLine(ResponseWriter w, FacesContext context, UIComponent comp) throws IOException { w.startElement(DIV, comp); - w.writeAttribute(CLASS, "rf-tb-hdr_tabline_vis", null); + w.writeAttribute(CLASS, "rf-tb-hdr-tabline-vis", null); w.startElement("table", comp); - w.writeAttribute("class", "rf-tb-hdr_tabs", null); + w.writeAttribute("class", "rf-tb-hdr-tabs", null); w.writeAttribute("cellspacing", "0", null); w.startElement("tbody", comp); w.startElement("tr", comp); @@ -113,9 +113,9 @@ w.endElement("tbody"); w.endElement("table"); - writeTopTabsControl(w, comp, "rf-tb-hdr_scroll_left rftp_hidden", "\u00AB"); - writeTopTabsControl(w, comp, "rf-tb-hdr_tabslist rftp_hidden", "\u2193"); - writeTopTabsControl(w, comp, "rf-tb-hdr_scroll_right rftp_hidden", "\u00BB"); + writeTopTabsControl(w, comp, "rf-tb-hdr-scrl_l rf-tb-hdn", "\u00AB"); + writeTopTabsControl(w, comp, "rf-tb-hdr-tablst rf-tb-hdn", "\u2193"); + writeTopTabsControl(w, comp, "rf-tb-hdr-scrl_r rf-tb-hdn", "\u00BB"); w.endElement("div"); } @@ -153,7 +153,7 @@ writer.writeAttribute("style", concatStyles(isDisplay ? "" : "display : none", attributeAsString(tab, HtmlTab.PropertyKeys.headerStyle.toString())), null); writer.startElement("span", tab); - writer.writeAttribute("class", "rftp_label", null); + writer.writeAttribute("class", "rf-tb-lbl", null); UIComponent headerFacet = tab.getHeaderFacet(state); if (headerFacet != null && headerFacet.isRendered()) { @@ -180,15 +180,15 @@ } private void writeTopTabFirstSpacer(ResponseWriter w, UIComponent comp) throws IOException { - writeTopTabSpacer(w, comp, "padding-left: 5px;", "rf-tb-hdr_spacer"); + writeTopTabSpacer(w, comp, "padding-left: 5px;", "rf-tb-hdr-spcr"); } private void writeTopTabSpacer(ResponseWriter w, UIComponent comp) throws IOException { - writeTopTabSpacer(w, comp, "", "rf-tb-hdr_spacer rftp_horizonttab_tabspacer_width"); + writeTopTabSpacer(w, comp, "", "rf-tb-hdr-spcr rf-tb-hortab-tabspcr_wdh"); } private void writeTopTabLastSpacer(ResponseWriter w, UIComponent comp) throws IOException { - writeTopTabSpacer(w, comp, "padding-right: 5px; width: 100%;", "rf-tb-hdr_spacer"); + writeTopTabSpacer(w, comp, "padding-right: 5px; width: 100%;", "rf-tb-hdr-spcr"); } private void writeTopTabSpacer(ResponseWriter w, UIComponent comp, String style, String classStyle) throws IOException { Modified: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/tabPanel.ecss =================================================================== --- trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/tabPanel.ecss 2010-09-21 19:47:10 UTC (rev 19298) +++ trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/tabPanel.ecss 2010-09-21 19:47:48 UTC (rev 19299) @@ -1,101 +1,4 @@ -.rftp_bottomtab { - border: "1px solid #{richSkin.panelBorderColor}"; - vertical-align: top; -/*gradient - from generalBackgroundColor to tabBackgroundColor*/ - background: "url(#{resource['org.richfaces.images:tabBg.png']}) top repeat-x #{richSkin.tabBackgroundColor}"; -} -.rftp_active_bottom { - border-top: 0px; - font-weight: bold; - vertical-align: top; -/*gradient - from tabBackgroundColor to generalBackgroundColor*/ - background: "url(#{resource['org.richfaces.images:actTabBottomBg.png']}) top repeat-x #{richSkin.additionalBackgroundColor}"; -} - -.rftp_bottomtab_tabline_vis { - padding-bottom: 2px; - overflow: hidden; - height: 25px; - white-space: nowrap; - position: relative; -} - -.rftp_bottomtab_tabs { - border: 0px; - width: 100%; - height: 100%; -} - -.rftp_bottomtab_spacer { - border-top: "1px solid #{richSkin.panelBorderColor}"; -} - -.rftp_bottomtab_border { - border: "1px solid #{richSkin.panelBorderColor}"; - border-bottom: 0px; - height: 2px; - background: '#{richSkin.additionalBackgroundColor}' -/*tabBackgroundColor*/; -} - -.rftp_bottomtab_content { - border: "1px solid #{richSkin.panelBorderColor}"; - border-bottom: 0px; - font-family: '#{richSkin.generalFamilyFont}'; - font-size: '#{richSkin.generalSizeFont}'; - padding: 10px; - background: '#{richSkin.generalBackgroundColor}'; -} - -.rftp_bottomtab_scroll_left { -/*gradient - from tabBackgroundColor to generalBackgroundColor*/ - background: "url(#{resource['org.richfaces.images:actTabBg.png']}) bottom repeat-x #{richSkin.additionalBackgroundColor}"; - position: absolute; - bottom: 1px; - left: 1px; - width: 15px; - height: 25px; - border: "1px solid #{richSkin.panelBorderColor}"; - font-weight: bold; - text-align: center; - font-family: '#{richSkin.generalFamilyFont}'; - font-size: '#{richSkin.generalSizeFont}'; - padding-top: 6px; -} - -.rftp_bottomtab_scroll_right { -/*gradient - from tabBackgroundColor to generalBackgroundColor*/ - background: "url(#{resource['org.richfaces.images:actTabBg.png']}) bottom repeat-x #{richSkin.additionalBackgroundColor}"; - position: absolute; - bottom: 1px; - right: 17px; - width: 15px; - height: 25px; - border: "1px solid #{richSkin.panelBorderColor}"; - font-weight: bold; - text-align: center; - font-family: '#{richSkin.generalFamilyFont}'; - font-size: '#{richSkin.generalSizeFont}'; - padding-top: 6px; -} - -.rftp_bottomtab_tabslist { -/*gradient - from tabBackgroundColor to generalBackgroundColor*/ - background: "url(#{resource['org.richfaces.images:actTabBg.png']}) bottom repeat-x #{richSkin.additionalBackgroundColor}"; - position: absolute; - bottom: 1px; - right: 1px; - width: 15px; - height: 25px; - border: "1px solid #{richSkin.panelBorderColor}"; - font-weight: bold; - text-align: center; - font-family: '#{richSkin.generalFamilyFont}'; - font-size: 14px; - padding-top: 2px; -} - .rf-tb-hdr { white-space: nowrap; border: "1px solid #{richSkin.panelBorderColor}"; @@ -129,7 +32,7 @@ cursor: default; } -.rf-tb-hdr_tabline_vis { +.rf-tb-hdr-tabline-vis { padding-top: 2px; overflow: hidden; height: 25px; @@ -143,26 +46,25 @@ height: 100%; } -.rf-tb-hdr_spacer { +.rf-tb-hdr-spcr { border-bottom: "1px solid #{richSkin.panelBorderColor}"; } -.rftp_horizonttab_tabspacer_width { +.rf-tb-hortab-tabspcr_wdh { padding-left: 1px; } -.rftp_label { +.rf-tb-lbl { white-space: nowrap; font-family: '#{richSkin.generalFamilyFont}'; font-size: '#{richSkin.generalSizeFont}'; } -.rftp_label_container { - position: relative; - padding: 5px 37px 0px 22px; +.rf-tb-hdn { + display: none } -.rf-tb-hdr_scroll_left { +.rf-tb-hdr-scrl_l { background: "url(#{resource['org.richfaces.images:actTabBg.png']}) top repeat-x #{richSkin.additionalBackgroundColor}"; position: absolute; top: 1px; @@ -177,7 +79,7 @@ padding-top: 6px; } -.rf-tb-hdr_scroll_right { +.rf-tb-hdr-scrl_r { background: "url(#{resource['org.richfaces.images:actTabBg.png']}) top repeat-x #{richSkin.additionalBackgroundColor}"; position: absolute; top: 1px; @@ -192,7 +94,7 @@ padding-top: 6px; } -.rf-tb-hdr_tabslist { +.rf-tb-hdr-tablst { background: "url(#{resource['org.richfaces.images:actTabBg.png']}) top repeat-x #{richSkin.additionalBackgroundColor}"; position: absolute; top: 1px; @@ -207,7 +109,7 @@ padding-top: 2px; } -.rf-tb-hdr_border { +.rf-tb-hdr_brd { border: "1px solid #{richSkin.panelBorderColor}"; border-top: 0px; height: 2px; @@ -223,170 +125,4 @@ background: '#{richSkin.generalBackgroundColor}'; } -.rftp_hidden { - display: none -} -.rftp_topmultitab_tabline_vis { - border-bottom: 0px; - padding-top: 2px; - white-space: nowrap; - position: relative; -} - -.rftp_topmultitab_tabs_first { - border: 0px; - width: 100%; - height: 100%; - height: 25px -} - -.rftp_topmultitab_tabs { - border: 0px; - width: 100%; - height: 100%; - height: 25px; - margin-bottom: -1px; -} - -.rftp_topmultitab_spacer { - border-bottom: 0px; -} - -.rftp_topmultitab_border { - border: "1px solid #{richSkin.panelBorderColor}"; - border-top: 0px; - height: 3px; - background: '#{richSkin.additionalBackgroundColor}'; -} - -.rftp_multitab_line_1 { - width: 17% -} - -.rftp_multitab_line_2 { - width: 50% -} - -.rftp_bottommultitab_tabs_first { - border: 0px; - width: 100%; - height: 100%; - height: 25px -} - -.rftp_bottommultitab_tabs { - border: 0px; - width: 100%; - height: 100%; - height: 25px; - margin-top: -1px; -} - -.rftp_bottommultitab_spacer { - border-top: 0px; -} - -.rftp_bottommultitab_border { - border: "1px solid #{richSkin.panelBorderColor}"; - border-bottom: 0px; - height: 3px; - background: '#{richSkin.additionalBackgroundColor}'; -} - -.rftp_label_vert { - white-space: nowrap; - font-family: '#{richSkin.generalFamilyFont}'; - font-size: '#{richSkin.generalSizeFont}'; - padding: 5px 0px 5px 0px; -} - -.rftp_label_container_vert { - position: relative; - padding: 0px 37px 0px 22px; -} - -.rftp_lefttab { - border: "1px solid #{richSkin.panelBorderColor}"; - padding: 2px 0px 2px 0px; - vertical-align: middle; - background: "url(#{resource['org.richfaces.images:tabBg.png']}) top right repeat-x #DAE7F5"; - margin-right: -1px -} - -.rftp_lefttab_active { - border-right: 0px; - font-weight: bold; - vertical-align: middle; - background: "url(#{resource['org.richfaces.images:actLeftTabBg.png']}) top left repeat-y #{richSkin.additionalBackgroundColor}"; - width: 100%; -} - -.rftp_verttab_spacer { - padding-top: 1px; -} - -.rftp_lefttab_border { - border: "1px solid #{richSkin.panelBorderColor}"; - padding-left: 2px; - background: '#{richSkin.additionalBackgroundColor}'; -} - -.rftp_lefttab_content { - width: 100%; - border: "1px solid #{richSkin.panelBorderColor}"; - border-left: 0px; - font-family: '#{richSkin.generalFamilyFont}'; - font-size: '#{richSkin.generalSizeFont}'; - padding: 10px; - background: '#{richSkin.generalBackgroundColor}'; - vertical-align: top; -} - -.rftp_righttab { - border: "1px solid #{richSkin.panelBorderColor}"; - padding: 2px 0px 2px 0px; - vertical-align: middle; - background: "url(#{resource['org.richfaces.images:tabBg.png']}) top right repeat-x #DAE7F5"; - margin-left: -1px -} - -.rftp_righttab_active { - border-left: 0px; - font-weight: bold; - vertical-align: middle; - background: "url(#{resource['org.richfaces.images:actRightTabBg.png']}) top right repeat-y #{richSkin.additionalBackgroundColor}"; - width: 100%; -} - -.rftp_righttab_spacer { - padding-top: 1px; -} - -.rftp_righttab_border { - border: "1px solid #{richSkin.panelBorderColor}"; - padding-right: 2px; - background: '#{richSkin.additionalBackgroundColor}'; -} - -.rftp_righttab_content { - width: 100%; - border: "1px solid #{richSkin.panelBorderColor}"; - border-right: 0px; - font-family: '#{richSkin.generalFamilyFont}'; - font-size: '#{richSkin.generalSizeFont}'; - padding: 10px; - background: '#{richSkin.generalBackgroundColor}'; - vertical-align: top; -} - -.rftp_toptab_tabs {border-collapse : collapse; border : 0px; height : 100%;} -.rftp_toptab_spacer {border-bottom : 1px solid #A6A6A6;} -.rftp_horizonttab_tabspacer_width {padding-left : 1px;} - -.rftp_icon {margin : 4px 0px 0px 5px; vertical-align : top;} -.rftp_close {margin : 4px 5px 0px 10px; vertical-align : top;} -.rftp_label {display : inline-block; font-family : verdana; font-size : 11px; padding : 5px 0px 2px 0px;} - -.rftp_toptab_content {border : 1px solid #A6A6A6; border-top : 0px; font-family : verdana; font-size : 11px; padding : 10px; background : #ffffff;} -.rftp_hidden {display : none}