You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2008/09/27 17:09:39 UTC
svn commit: r699662 - in /myfaces/tobago/branches/tobago-1.0.x:
core/src/main/java/org/apache/myfaces/tobago/
core/src/main/java/org/apache/myfaces/tobago/component/
core/src/main/java/org/apache/myfaces/tobago/taglib/component/
theme/charlotteville/sr...
Author: bommel
Date: Sat Sep 27 08:09:38 2008
New Revision: 699662
URL: http://svn.apache.org/viewvc?rev=699662&view=rev
Log:
(TOBAGO-176) Starting with a tabNavigationBar
Modified:
myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/TobagoConstants.java
myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/component/UITabGroup.java
myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TabGroupTag.java
myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TabGroupTagDeclaration.java
myfaces/tobago/branches/tobago-1.0.x/theme/charlotteville/src/main/resources/org/apache/myfaces/tobago/renderkit/html/charlotteville/standard/style/style.css
myfaces/tobago/branches/tobago-1.0.x/theme/richmond/src/main/resources/org/apache/myfaces/tobago/renderkit/html/richmond/msie/style/style.css
myfaces/tobago/branches/tobago-1.0.x/theme/richmond/src/main/resources/org/apache/myfaces/tobago/renderkit/html/richmond/standard/style/style.css
myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabGroupRenderer.java
myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabNavigationBarRenderer.java
myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/mozilla/style/style.css
myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/msie/style/style.css
myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/style.css
myfaces/tobago/branches/tobago-1.0.x/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/msie/style/style.css
myfaces/tobago/branches/tobago-1.0.x/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/style/style.css
Modified: myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/TobagoConstants.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/TobagoConstants.java?rev=699662&r1=699661&r2=699662&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/TobagoConstants.java (original)
+++ myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/TobagoConstants.java Sat Sep 27 08:09:38 2008
@@ -146,6 +146,7 @@
public static final String ATTR_SHOW_HEADER = "showHeader";
public static final String ATTR_SHOW_ICONS = "showIcons";
public static final String ATTR_SHOW_JUNCTIONS = "showJunctions";
+ public static final String ATTR_SHOW_NAVIGATION_BAR = "showNavigationBar";
public static final String ATTR_SHOW_PAGE_RANGE = "showPageRange";
public static final String ATTR_SHOW_ROOT = "showRoot";
public static final String ATTR_SHOW_ROOT_JUNCTION = "showRootJunction";
Modified: myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/component/UITabGroup.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/component/UITabGroup.java?rev=699662&r1=699661&r2=699662&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/component/UITabGroup.java (original)
+++ myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/component/UITabGroup.java Sat Sep 27 08:09:38 2008
@@ -22,6 +22,7 @@
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_IMMEDIATE;
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_LAYOUT_HEIGHT;
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_LAYOUT_WIDTH;
+import static org.apache.myfaces.tobago.TobagoConstants.ATTR_SHOW_NAVIGATION_BAR;
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_SELECTED_INDEX;
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_SWITCH_TYPE;
import org.apache.myfaces.tobago.ajax.api.AjaxComponent;
@@ -53,6 +54,7 @@
private int renderedIndex;
private String switchType;
private Boolean immediate;
+ private Boolean showNavigationBar;
private MethodBinding tabChangeListener = null;
public static final String SWITCH_TYPE_CLIENT = "client";
@@ -85,6 +87,24 @@
}
}
+ public boolean isShowNavigationBar() {
+ if (showNavigationBar != null) {
+ return showNavigationBar;
+ }
+ ValueBinding vb = getValueBinding(ATTR_SHOW_NAVIGATION_BAR);
+ if (vb != null) {
+ return (!Boolean.FALSE.equals(vb.getValue(getFacesContext())));
+ } else {
+ return true;
+ }
+ }
+
+ public void setShowNavigationBar(boolean showNavigationBar) {
+ this.showNavigationBar = showNavigationBar;
+ }
+
+
+
public void queueEvent(FacesEvent event) {
if (this == event.getSource()) {
if (isImmediate()) {
@@ -256,13 +276,14 @@
}
public Object saveState(FacesContext context) {
- Object[] state = new Object[6];
+ Object[] state = new Object[7];
state[0] = super.saveState(context);
state[1] = renderedIndex;
state[2] = selectedIndex;
state[3] = saveAttachedState(context, tabChangeListener);
state[4] = switchType;
state[5] = immediate;
+ state[6] = showNavigationBar;
return state;
}
@@ -274,6 +295,7 @@
tabChangeListener = (MethodBinding) restoreAttachedState(context, values[3]);
switchType = (String) values[4];
immediate = (Boolean) values[5];
+ showNavigationBar = (Boolean) values[6];
}
public void encodeAjax(FacesContext facesContext) throws IOException {
Modified: myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TabGroupTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TabGroupTag.java?rev=699662&r1=699661&r2=699662&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TabGroupTag.java (original)
+++ myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TabGroupTag.java Sat Sep 27 08:09:38 2008
@@ -20,6 +20,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_IMMEDIATE;
+import static org.apache.myfaces.tobago.TobagoConstants.ATTR_SHOW_NAVIGATION_BAR;
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_SELECTED_INDEX;
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_SWITCH_TYPE;
import org.apache.myfaces.tobago.component.ComponentUtil;
@@ -38,6 +39,7 @@
private String switchType;
private String immediate;
private String state;
+ private String showNavigationBar;
@Override
public String getComponentType() {
@@ -51,6 +53,7 @@
ComponentUtil.setIntegerProperty(component, ATTR_SELECTED_INDEX, state);
ComponentUtil.setStringProperty(component, ATTR_SWITCH_TYPE, switchType);
ComponentUtil.setBooleanProperty(component, ATTR_IMMEDIATE, immediate);
+ ComponentUtil.setBooleanProperty(component, ATTR_SHOW_NAVIGATION_BAR, showNavigationBar);
}
@Override
@@ -60,6 +63,7 @@
switchType = null;
immediate = null;
selectedIndex = null;
+ showNavigationBar = null;
}
public void setServerside(String serverside) {
@@ -83,5 +87,13 @@
public void setImmediate(String immediate) {
this.immediate = immediate;
}
+
+ public String getShowNavigationBar() {
+ return showNavigationBar;
+ }
+
+ public void setShowNavigationBar(String showNavigationBar) {
+ this.showNavigationBar = showNavigationBar;
+ }
}
Modified: myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TabGroupTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TabGroupTagDeclaration.java?rev=699662&r1=699661&r2=699662&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TabGroupTagDeclaration.java (original)
+++ myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TabGroupTagDeclaration.java Sat Sep 27 08:09:38 2008
@@ -55,6 +55,17 @@
void setServerside(String serverside);
/**
+
+ * Flag indicating that the Tab Navigationbar is rendered.
+ *
+ */
+ @TagAttribute
+ @UIComponentTagAttribute(type = "java.lang.Boolean", defaultValue = "true")
+ @Deprecated
+ void setShowNavigationBar(String serverside);
+
+
+ /**
* Flag indicating how tab switching should be done.
* <p/>
* Possible values are:
Modified: myfaces/tobago/branches/tobago-1.0.x/theme/charlotteville/src/main/resources/org/apache/myfaces/tobago/renderkit/html/charlotteville/standard/style/style.css
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/theme/charlotteville/src/main/resources/org/apache/myfaces/tobago/renderkit/html/charlotteville/standard/style/style.css?rev=699662&r1=699661&r2=699662&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/theme/charlotteville/src/main/resources/org/apache/myfaces/tobago/renderkit/html/charlotteville/standard/style/style.css (original)
+++ myfaces/tobago/branches/tobago-1.0.x/theme/charlotteville/src/main/resources/org/apache/myfaces/tobago/renderkit/html/charlotteville/standard/style/style.css Sat Sep 27 08:09:38 2008
@@ -108,6 +108,10 @@
border-color: #FECB66;
}
+div.tobago-tabNavigationBar {
+ border-bottom-color: #FECB66;
+}
+
a:link.tab, a:visited.tab, a:active.tab {
color: #FECB66;
}
Modified: myfaces/tobago/branches/tobago-1.0.x/theme/richmond/src/main/resources/org/apache/myfaces/tobago/renderkit/html/richmond/msie/style/style.css
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/theme/richmond/src/main/resources/org/apache/myfaces/tobago/renderkit/html/richmond/msie/style/style.css?rev=699662&r1=699661&r2=699662&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/theme/richmond/src/main/resources/org/apache/myfaces/tobago/renderkit/html/richmond/msie/style/style.css (original)
+++ myfaces/tobago/branches/tobago-1.0.x/theme/richmond/src/main/resources/org/apache/myfaces/tobago/renderkit/html/richmond/msie/style/style.css Sat Sep 27 08:09:38 2008
@@ -15,6 +15,10 @@
* limitations under the License.
*/
+div.tobago-tabNavigationBar {
+ height: 20px;
+}
+
a:link.tobago-toolBar-button-link, a:visited.tobago-toolBar-button-link, a:active.tobago-toolBar-button-link {
color: #3366CC;
}
\ No newline at end of file
Modified: myfaces/tobago/branches/tobago-1.0.x/theme/richmond/src/main/resources/org/apache/myfaces/tobago/renderkit/html/richmond/standard/style/style.css
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/theme/richmond/src/main/resources/org/apache/myfaces/tobago/renderkit/html/richmond/standard/style/style.css?rev=699662&r1=699661&r2=699662&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/theme/richmond/src/main/resources/org/apache/myfaces/tobago/renderkit/html/richmond/standard/style/style.css (original)
+++ myfaces/tobago/branches/tobago-1.0.x/theme/richmond/src/main/resources/org/apache/myfaces/tobago/renderkit/html/richmond/standard/style/style.css Sat Sep 27 08:09:38 2008
@@ -256,6 +256,10 @@
box-sizing: border-box;
}
+div.tobago-tabNavigationBar {
+ border-bottom-color: #3366CC;
+}
+
a:link.tab, a:visited.tab, a:active.tab {
font-family: bold 12px arial, helvetica, sans-serif;
color: #3366CC;
Modified: myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabGroupRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabGroupRenderer.java?rev=699662&r1=699661&r2=699662&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabGroupRenderer.java (original)
+++ myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabGroupRenderer.java Sat Sep 27 08:09:38 2008
@@ -98,7 +98,7 @@
} catch (NumberFormatException e) {
LOG.error("Can't parse activeIndex: '" + newValue + "'");
}
- HtmlRendererUtil.createHeaderAndBodyStyles(facesContext, component);
+ //HtmlRendererUtil.createHeaderAndBodyStyles(facesContext, component);
}
public void encodeEnd(FacesContext facesContext, UIComponent uiComponent) throws IOException {
@@ -141,7 +141,10 @@
// selected with stylesheet.
int virtualTab = 0;
int currentWidth = 0;
- int navigationBarWidth = getConfiguredValue(facesContext, component, "navigationBarWidth");
+ int navigationBarWidth = 0;
+ if (ComponentUtil.getBooleanAttribute(component, TobagoConstants.ATTR_SHOW_NAVIGATION_BAR)) {
+ navigationBarWidth = getConfiguredValue(facesContext, component, "navigationBarWidth");
+ }
for (UIComponent tab : (List<UIComponent>) component.getChildren()) {
if (tab instanceof UIPanelBase) {
if (tab.isRendered()) {
@@ -315,54 +318,10 @@
writer.startElement(HtmlConstants.TR, null);
writer.writeAttribute(HtmlAttributes.VALIGN, "bottom", false);
- Application application = facesContext.getApplication();
-
- // tool bar
-
- UICommand scrollLeft = (UICommand) application.createComponent(UICommand.COMPONENT_TYPE);
- scrollLeft.setId(component.getId() + "__" + virtualTab + "__" + "previous");
- //scrollLeft.setId(facesContext.getViewRoot().createUniqueId());
- scrollLeft.setRendererType(null);
- scrollLeft.getAttributes().put(ATTR_IMAGE, "image/tabPrev.gif");
- if (tabList.isFirst(virtualTab)) {
- scrollLeft.setDisabled(true);
- }
- if (!(TobagoConfig.getInstance(facesContext).isAjaxEnabled() && SWITCH_TYPE_RELOAD_TAB.equals(switchType))) {
- scrollLeft.getAttributes().put(ATTR_ONCLICK, "tobago_previousTab('" + switchType + "','" + clientId + "',"
- + component.getChildCount() + ')');
- } else {
- scrollLeft.getAttributes().put(ATTR_ONCLICK, "javascript:false");
- }
- UICommand scrollRight = (UICommand) application.createComponent(UICommand.COMPONENT_TYPE);
- scrollRight.setId(component.getId() + "__" + virtualTab + "__" + "next");
- scrollRight.setRendererType(null);
- scrollRight.getAttributes().put(ATTR_IMAGE, "image/tabNext.gif");
- if (tabList.isLast(virtualTab)) {
- scrollRight.setDisabled(true);
- }
- if (!(TobagoConfig.getInstance(facesContext).isAjaxEnabled() && SWITCH_TYPE_RELOAD_TAB.equals(switchType))) {
- scrollRight.getAttributes().put(ATTR_ONCLICK, "tobago_nextTab('" + switchType + "','" + clientId + "',"
- + component.getChildCount() + ')');
- } else {
- scrollRight.getAttributes().put(ATTR_ONCLICK, "javascript:false");
+ UIToolBar toolBar = null;
+ if (toolbarWidth > 0) {
+ toolBar = createToolBar(facesContext, component, virtualTab, switchType, tabList, clientId);
}
- /*UICommand commandList = (UICommand) application.createComponent(UICommand.COMPONENT_TYPE);
- commandList.setId(facesContext.getViewRoot().createUniqueId());
- commandList.setRendererType(null);
- UIMenu menu = (UIMenu) application.createComponent(UIMenu.COMPONENT_TYPE);
- menu.setId(facesContext.getViewRoot().createUniqueId());
- menu.setRendererType(null);
- commandList.getFacets().put(FACET_MENUPOPUP, menu);*/
- UIToolBar toolBar = (UIToolBar) application.createComponent(UIToolBar.COMPONENT_TYPE);
- toolBar.setId(facesContext.getViewRoot().createUniqueId());
- //toolBar.setLabelPosition(UIToolBar.LABEL_OFF);
- toolBar.setRendererType("TabNavigationBar");
- toolBar.setTransient(true);
- //toolBar.setIconSize(AbstractUIToolBar.ICON_OFF);
- toolBar.getChildren().add(scrollLeft);
- toolBar.getChildren().add(scrollRight);
- //toolBar.getChildren().add(commandList);
- component.getFacets().put(TobagoConstants.FACET_TOOL_BAR, toolBar);
UITab activeTab = null;
@@ -497,6 +456,58 @@
writer.endElement(HtmlConstants.TABLE);
}
+ private UIToolBar createToolBar(FacesContext facesContext, UITabGroup component, int virtualTab, String switchType, TabGroupRenderer.TabList tabList, String clientId) {
+ Application application = facesContext.getApplication();
+
+ // tool bar
+
+ UICommand scrollLeft = (UICommand) application.createComponent(UICommand.COMPONENT_TYPE);
+ scrollLeft.setId(component.getId() + "__" + virtualTab + "__" + "previous");
+ //scrollLeft.setId(facesContext.getViewRoot().createUniqueId());
+ scrollLeft.setRendererType(null);
+ scrollLeft.getAttributes().put(ATTR_IMAGE, "image/tabPrev.gif");
+ if (tabList.isFirst(virtualTab)) {
+ scrollLeft.setDisabled(true);
+ }
+ if (!(TobagoConfig.getInstance(facesContext).isAjaxEnabled() && SWITCH_TYPE_RELOAD_TAB.equals(switchType))) {
+ scrollLeft.getAttributes().put(ATTR_ONCLICK, "tobago_previousTab('" + switchType + "','" + clientId + "',"
+ + component.getChildCount() + ')');
+ } else {
+ scrollLeft.getAttributes().put(ATTR_ONCLICK, "javascript:false");
+ }
+ UICommand scrollRight = (UICommand) application.createComponent(UICommand.COMPONENT_TYPE);
+ scrollRight.setId(component.getId() + "__" + virtualTab + "__" + "next");
+ scrollRight.setRendererType(null);
+ scrollRight.getAttributes().put(ATTR_IMAGE, "image/tabNext.gif");
+ if (tabList.isLast(virtualTab)) {
+ scrollRight.setDisabled(true);
+ }
+ if (!(TobagoConfig.getInstance(facesContext).isAjaxEnabled() && SWITCH_TYPE_RELOAD_TAB.equals(switchType))) {
+ scrollRight.getAttributes().put(ATTR_ONCLICK, "tobago_nextTab('" + switchType + "','" + clientId + "',"
+ + component.getChildCount() + ')');
+ } else {
+ scrollRight.getAttributes().put(ATTR_ONCLICK, "javascript:false");
+ }
+ /*UICommand commandList = (UICommand) application.createComponent(UICommand.COMPONENT_TYPE);
+ commandList.setId(facesContext.getViewRoot().createUniqueId());
+ commandList.setRendererType(null);
+ UIMenu menu = (UIMenu) application.createComponent(UIMenu.COMPONENT_TYPE);
+ menu.setId(facesContext.getViewRoot().createUniqueId());
+ menu.setRendererType(null);
+ commandList.getFacets().put(FACET_MENUPOPUP, menu);*/
+ UIToolBar toolBar = (UIToolBar) application.createComponent(UIToolBar.COMPONENT_TYPE);
+ toolBar.setId(facesContext.getViewRoot().createUniqueId());
+ //toolBar.setLabelPosition(UIToolBar.LABEL_OFF);
+ toolBar.setRendererType("TabNavigationBar");
+ toolBar.setTransient(true);
+ //toolBar.setIconSize(AbstractUIToolBar.ICON_OFF);
+ toolBar.getChildren().add(scrollLeft);
+ toolBar.getChildren().add(scrollRight);
+ //toolBar.getChildren().add(commandList);
+ component.getFacets().put(TobagoConstants.FACET_TOOL_BAR, toolBar);
+ return toolBar;
+ }
+
private void renderToolbar(FacesContext facesContext, TobagoResponseWriter writer, UIPanel toolbar, int width,
int navigationBarWidth) throws IOException {
writer.startElement(HtmlConstants.DIV, null);
Modified: myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabNavigationBarRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabNavigationBarRenderer.java?rev=699662&r1=699661&r2=699662&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabNavigationBarRenderer.java (original)
+++ myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabNavigationBarRenderer.java Sat Sep 27 08:09:38 2008
@@ -1,5 +1,9 @@
package org.apache.myfaces.tobago.renderkit.html.scarborough.standard.tag;
+import org.apache.myfaces.tobago.component.UIToolBar;
+
+import javax.faces.component.UIComponent;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -20,6 +24,11 @@
public class TabNavigationBarRenderer extends BoxToolBarRenderer {
@Override
+ protected String getLabelPosition(UIComponent component) {
+ return UIToolBar.LABEL_OFF;
+ }
+
+ @Override
protected String getDivClasses(boolean selected, boolean disabled) {
return "tobago-tabNavigationBar-button tobago-tabNavigationBar-button-"
+ (selected ? "selected-" : "") + (disabled ? "disabled" : "enabled");
Modified: myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/mozilla/style/style.css
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/mozilla/style/style.css?rev=699662&r1=699661&r2=699662&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/mozilla/style/style.css (original)
+++ myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/mozilla/style/style.css Sat Sep 27 08:09:38 2008
@@ -46,7 +46,3 @@
width: 20px;
height: 17px;
}
-
-div.tobago-tabNavigationBar {
- top: -2px;
-}
\ No newline at end of file
Modified: myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/msie/style/style.css
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/msie/style/style.css?rev=699662&r1=699661&r2=699662&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/msie/style/style.css (original)
+++ myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/msie/style/style.css Sat Sep 27 08:09:38 2008
@@ -92,7 +92,6 @@
div.tobago-tabNavigationBar {
margin-right: 6px;
- top: -1px;
}
.tobago-toolBar-button-popup-span {
Modified: myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/style.css
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/style.css?rev=699662&r1=699661&r2=699662&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/style.css (original)
+++ myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/style.css Sat Sep 27 08:09:38 2008
@@ -79,10 +79,11 @@
border-bottom-color: #DDEEFF;
border-bottom-style: solid;
border-bottom-width: 1px;
- height: 25px;
- top: 0px;
- margin-right: 0px;
+ overflow: hidden;
+ height: 100%;
position: absolute;
+ -moz-box-sizing: border-box;
+ box-sizing: border-box;
}
a:link.tab, a:visited.tab, a:active.tab {
@@ -807,7 +808,7 @@
/* end --------------------------------------------------------------------- */
.tobago-input-picker {
- vertical-align: bottom;
+ vertical-align: baseline;
}
/* object ------------------------------------------------------------------ */
Modified: myfaces/tobago/branches/tobago-1.0.x/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/msie/style/style.css
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/msie/style/style.css?rev=699662&r1=699661&r2=699662&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/msie/style/style.css (original)
+++ myfaces/tobago/branches/tobago-1.0.x/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/msie/style/style.css Sat Sep 27 08:09:38 2008
@@ -46,7 +46,6 @@
}*/
-
a:link.tobago-toolBar-button-link, a:visited.tobago-toolBar-button-link, a:active.tobago-toolBar-button-link {
color: #660000;
}
\ No newline at end of file
Modified: myfaces/tobago/branches/tobago-1.0.x/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/style/style.css
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/style/style.css?rev=699662&r1=699661&r2=699662&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/style/style.css (original)
+++ myfaces/tobago/branches/tobago-1.0.x/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/style/style.css Sat Sep 27 08:09:38 2008
@@ -155,10 +155,7 @@
border-bottom-color: #000000;
border-bottom-style: solid;
border-bottom-width: 1px;
- height: 22px;
- top: -4px;
margin-right: 6px;
- position: absolute;
}
a:link.tab, a:visited.tab, a:active.tab {