From: Jouni Koivuviita Date: Tue, 25 Sep 2007 06:45:47 +0000 (+0000) Subject: -New ITabsheet implementation using GWT TabBar and own custom DeckPanel (ITabsheetPanel). X-Git-Tag: 6.7.0.beta1~5959 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=72cf6aaf06df13e87eb5e154f8082a7e4e28b038;p=vaadin-framework.git -New ITabsheet implementation using GWT TabBar and own custom DeckPanel (ITabsheetPanel). -New theme (candidate 0.3) implementation started. -CSS classname conventions forced on several client side components. svn changeset:2371/svn branch:trunk --- diff --git a/src/com/itmill/toolkit/terminal/gwt/client/Caption.java b/src/com/itmill/toolkit/terminal/gwt/client/Caption.java index f40228f921..885d7a8016 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/Caption.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/Caption.java @@ -8,6 +8,8 @@ import com.google.gwt.user.client.ui.PopupPanel; public class Caption extends HTML { + public static final String CLASSNAME = "i-caption"; + private Paintable owner; private Element errorIndicatorElement; @@ -24,7 +26,7 @@ public class Caption extends HTML { public Caption(Paintable component) { super(); owner = component; - setStyleName("i-caption"); + setStyleName(CLASSNAME); } public void updateCaption(UIDL uidl) { diff --git a/src/com/itmill/toolkit/terminal/gwt/client/CaptionWrapper.java b/src/com/itmill/toolkit/terminal/gwt/client/CaptionWrapper.java index b0640fb90f..1957de0ce8 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/CaptionWrapper.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/CaptionWrapper.java @@ -1,11 +1,11 @@ package com.itmill.toolkit.terminal.gwt.client; import com.google.gwt.user.client.ui.FlowPanel; -import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.Widget; public class CaptionWrapper extends FlowPanel { + public static final String CLASSNAME = "i-captionwrapper"; Caption caption; Paintable widget; @@ -14,6 +14,7 @@ public class CaptionWrapper extends FlowPanel { add(caption); widget = toBeWrapped; add((Widget) widget); + setStyleName(CLASSNAME); } public void updateCaption(UIDL uidl) { diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/HorizontalSplitPanelImages.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/HorizontalSplitPanelImages.java new file mode 100644 index 0000000000..07bd6367a6 --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/HorizontalSplitPanelImages.java @@ -0,0 +1,15 @@ +package com.itmill.toolkit.terminal.gwt.client.ui; + +import com.google.gwt.user.client.ui.AbstractImagePrototype; + +public interface HorizontalSplitPanelImages extends + com.google.gwt.user.client.ui.HorizontalSplitPanelImages { + + /** + * An image representing the drag thumb. + * + * @gwt.resource com/itmill/toolkit/terminal/gwt/public/default/common/img/blank.png + */ + AbstractImagePrototype horizontalSplitPanelThumb(); + +} diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ICheckBox.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/ICheckBox.java index 016c8affc0..6282c9d5f8 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ICheckBox.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/ICheckBox.java @@ -8,6 +8,8 @@ import com.itmill.toolkit.terminal.gwt.client.UIDL; public class ICheckBox extends com.google.gwt.user.client.ui.CheckBox implements Paintable { + + public static final String CLASSNAME = "i-checkbox"; String id; @@ -16,6 +18,7 @@ public class ICheckBox extends com.google.gwt.user.client.ui.CheckBox ApplicationConnection client; public ICheckBox() { + setStyleName(CLASSNAME); addClickListener(new ClickListener() { public void onClick(Widget sender) { diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IFilterSelect.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IFilterSelect.java index 85131a46be..027fe3808e 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IFilterSelect.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IFilterSelect.java @@ -294,7 +294,8 @@ public class IFilterSelect extends Composite implements Paintable, initWidget(panel); setStyleName(CLASSNAME); tb.addKeyboardListener(this); - popupOpener.setStyleName(CLASSNAME + "-popupopener"); + tb.setStyleName(CLASSNAME + "-input"); + popupOpener.setStyleName(CLASSNAME + "-button"); popupOpener.addClickListener(this); } diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ILabel.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/ILabel.java index 0ea08a2529..bb204679ef 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ILabel.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/ILabel.java @@ -11,6 +11,7 @@ public class ILabel extends HTML implements Paintable { public ILabel() { super(); + setStyleName(CLASSNAME); } public ILabel(String text) { diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IOptionGroup.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IOptionGroup.java index fed7295edf..d8d759f814 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IOptionGroup.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IOptionGroup.java @@ -37,8 +37,9 @@ public class IOptionGroup extends IOptionGroupBase { op.setText(opUidl.getStringAttribute("caption")); } else { op = new RadioButton(id, opUidl.getStringAttribute("caption")); + op.setStyleName("i-radiobutton"); } - op.setStyleName(CLASSNAME_OPTION); + op.addStyleName(CLASSNAME_OPTION); op.setChecked(opUidl.getBooleanAttribute("selected")); op.setEnabled(!opUidl.getBooleanAttribute("disabled") && !readonly && !disabled); op.addClickListener(this); diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IPanel.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IPanel.java index 5e657130d4..ab36b3bce5 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IPanel.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IPanel.java @@ -91,8 +91,13 @@ public class IPanel extends FlowPanel implements Paintable { content.setHeight("0"); int height = getOffsetHeight(); content.setHeight(neededHeight-height + "px"); - } else + } else { content.setHeight(""); + // We don't need overflow:auto when panel height is not set + // (overflow:auto causes rendering errors at least in Firefox when a + // a panel is inside a tabsheet with overflow:auto set) + DOM.setStyleAttribute(content.getElement(), "overflow", "hidden"); + } } diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ISlider.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/ISlider.java index 78754e68c6..65a9f57f13 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ISlider.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/ISlider.java @@ -156,7 +156,7 @@ public class ISlider extends Widget implements Paintable { DOM.setStyleAttribute(getElement(), "width", "auto"); } }; - adjust.schedule(100); + adjust.schedule(0); // Defer execution } } } diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ISplitPanel.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/ISplitPanel.java index 36a7171419..97a73a2f19 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ISplitPanel.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/ISplitPanel.java @@ -1,14 +1,20 @@ package com.itmill.toolkit.terminal.gwt.client.ui; +import com.google.gwt.core.client.GWT; +import com.google.gwt.user.client.DOM; +import com.google.gwt.user.client.Element; import com.google.gwt.user.client.ui.HorizontalSplitPanel; +import com.google.gwt.user.client.ui.HorizontalSplitPanelImages; import com.google.gwt.user.client.ui.SimplePanel; import com.google.gwt.user.client.ui.VerticalSplitPanel; +import com.google.gwt.user.client.ui.VerticalSplitPanelImages; import com.google.gwt.user.client.ui.Widget; import com.itmill.toolkit.terminal.gwt.client.ApplicationConnection; import com.itmill.toolkit.terminal.gwt.client.Paintable; import com.itmill.toolkit.terminal.gwt.client.UIDL; public class ISplitPanel extends SimplePanel implements Paintable { + public static final String CLASSNAME = "i-splitpanel"; public static final int ORIENTATION_HORIZONTAL = 0; public static final int ORIENTATION_VERTICAL = 1; @@ -24,20 +30,28 @@ public class ISplitPanel extends SimplePanel implements Paintable { public ISplitPanel(int orientation) { super(); - setOrientetion(orientation); + setOrientation(orientation); } - private void setOrientetion(int orientation) { + private void setOrientation(int orientation) { this.orientation = orientation; if(orientation == ORIENTATION_HORIZONTAL) { - this.sph = new HorizontalSplitPanel(); + this.sph = new HorizontalSplitPanel((HorizontalSplitPanelImages) GWT.create(com.itmill.toolkit.terminal.gwt.client.ui.HorizontalSplitPanelImages.class)); + this.sph.setStyleName(CLASSNAME+"-horizontal"); + // Ugly work-around to allow more advanced styling (GWT's heavy use of TABLE-elements is restricting) + Element handle = DOM.getChild(DOM.getChild(this.sph.getElement(), 0), 1); + DOM.setElementAttribute(handle, "className", CLASSNAME+"-handle"); this.setWidget(sph); if(spv != null) { // TODO cleanup contained widgets this.spv = null; } } else { - this.spv = new VerticalSplitPanel(); + this.spv = new VerticalSplitPanel((VerticalSplitPanelImages) GWT.create(com.itmill.toolkit.terminal.gwt.client.ui.VerticalSplitPanelImages.class)); + this.spv.setStyleName(CLASSNAME+"-vertical"); + // Ugly work-around to allow more advanced styling (GWT's heavy use of TABLE-elements is restricting) + Element handle = DOM.getChild(DOM.getChild(this.spv.getElement(), 0), 1); + DOM.setElementAttribute(handle, "className", CLASSNAME+"-handle"); this.setWidget(spv); if(sph != null) { // TODO cleanup contained widgets diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITabsheet.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/ITabsheet.java index 35698f03ff..df7401388e 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITabsheet.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/ITabsheet.java @@ -5,18 +5,16 @@ import java.util.Iterator; import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.Element; -import com.google.gwt.user.client.ui.DeckPanel; -import com.google.gwt.user.client.ui.Label; +import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.SourcesTabEvents; import com.google.gwt.user.client.ui.TabBar; import com.google.gwt.user.client.ui.TabListener; -import com.google.gwt.user.client.ui.TabPanel; import com.google.gwt.user.client.ui.Widget; import com.itmill.toolkit.terminal.gwt.client.ApplicationConnection; import com.itmill.toolkit.terminal.gwt.client.Paintable; import com.itmill.toolkit.terminal.gwt.client.UIDL; -public class ITabsheet extends TabPanel implements Paintable { +public class ITabsheet extends FlowPanel implements Paintable { public static final String CLASSNAME = "i-tabsheet"; @@ -30,16 +28,20 @@ public class ITabsheet extends TabPanel implements Paintable { int activeTabIndex = 0; + private TabBar tb; + private ITabsheetPanel tp; private Element deco; - - TabListener tl = new TabListener() { + + private TabListener tl = new TabListener() { public void onTabSelected(SourcesTabEvents sender, int tabIndex) { - ITabsheet.this.client.updateVariable(id, "selected", tabIndex, - true); + if (client != null && activeTabIndex != tabIndex) + ITabsheet.this.client.updateVariable(id, "selected", "" + + tabKeys.get(tabIndex), true); } public boolean onBeforeTabSelected(SourcesTabEvents sender, int tabIndex) { + // TODO give user indication of progress return true; } @@ -48,49 +50,26 @@ public class ITabsheet extends TabPanel implements Paintable { public ITabsheet() { setStyleName(CLASSNAME); - addTabListener(new TabListener() { - - public void onTabSelected(SourcesTabEvents sender, int tabIndex) { - if (client != null && activeTabIndex != tabIndex) - ITabsheet.this.client.updateVariable(id, "selected", "" - + tabKeys.get(tabIndex), true); - } - - public boolean onBeforeTabSelected(SourcesTabEvents sender, - int tabIndex) { - return true; - } - - }); + tb = new TabBar(); + tp = new ITabsheetPanel(); + deco = DOM.createDiv(); + tp.setStyleName(CLASSNAME+"-content"); + tb.setStyleName(CLASSNAME+"-tabs"); + DOM.setElementProperty(deco, "className", CLASSNAME+"-deco"); + + add(tb); + add(tp); + DOM.appendChild(getElement(), deco); + + tb.addTabListener(tl); + + clearTabs(); } public void updateFromUIDL(UIDL uidl, ApplicationConnection client) { this.client = client; id = uidl.getId(); - - DeckPanel dp = getDeckPanel(); - dp.setStyleName(CLASSNAME+"-content"); - - TabBar tb = getTabBar(); - tb.setStyleName(CLASSNAME+"-tabs"); - - // Add a decoration element for shadow - // TODO refactor tabsheet with plain DIV-implementation - /*if(!DOM.compare(deco, null)) { - DOM.removeChild(DOM.getParent(getElement()), deco); - deco = null; - } - deco = DOM.createDiv(); - DOM.setElementProperty(deco, "className", CLASSNAME+"-deco"); - DOM.appendChild(DOM.getParent(getElement()), deco); - */ - // Adjust width and height - String h = uidl.hasAttribute("height")? uidl.getStringAttribute("height") : ""; - String w = uidl.hasAttribute("width")? uidl.getStringAttribute("width") : ""; - setWidth(w!=""?w:"auto"); - //DOM.setStyleAttribute(deco, "width", w!=""?w:"auto"); - dp.setHeight(h!=""?h:"auto"); UIDL tabs = uidl.getChildUIDL(0); boolean keepCurrentTabs = tabKeys.size() == tabs.getNumberOfChildren(); @@ -105,42 +84,77 @@ public class ITabsheet extends TabPanel implements Paintable { UIDL tab = (UIDL) it.next(); if (tab.getBooleanAttribute("selected")) { activeTabIndex = index; - Widget content = client.getWidget(tab - .getChildUIDL(0)); - tb.selectTab(index); - remove(index); - insert(content, (String) captions.get(index), index); - this.selectTab(index); - ((Paintable)content).updateFromUIDL(tab - .getChildUIDL(0), client); + Widget content = client.getWidget(tab.getChildUIDL(0)); + ((Paintable)content).updateFromUIDL(tab.getChildUIDL(0), client); + tp.remove(index); + tp.insert(content, index); } index++; } } else { tabKeys.clear(); captions.clear(); - clear(); + clearTabs(); + int index = 0; for (Iterator it = tabs.getChildIterator(); it.hasNext();) { UIDL tab = (UIDL) it.next(); String key = tab.getStringAttribute("key"); String caption = tab.getStringAttribute("caption"); + captions.add(caption); tabKeys.add(key); - if (tab.getBooleanAttribute("selected")) { + + tb.addTab(caption); + + if(tab.getBooleanAttribute("selected")) { + Widget content = client.getWidget(tab.getChildUIDL(0)); + tp.add(content); activeTabIndex = index; - Widget content = client.getWidget(tab - .getChildUIDL(0)); - this.add(content, caption); - this.selectTab(this.getWidgetIndex(content)); - ((Paintable)content).updateFromUIDL(tab - .getChildUIDL(0), client); - } else { - this.add(new Label(), caption); - } + ((Paintable)content).updateFromUIDL(tab.getChildUIDL(0), client); + } else + tp.add(new ILabel("")); + index++; } } + + // Open selected tab + tb.selectTab(activeTabIndex); + tp.showWidget(activeTabIndex); + + // Adjust width and height + String h = uidl.hasAttribute("height")? uidl.getStringAttribute("height") : null; + String w = uidl.hasAttribute("width")? uidl.getStringAttribute("width") : null; + setWidth(w!=null?w:"auto"); + + // Try to approximate the height as close as possible + if(h!=null) { + // First, calculate needed pixel height + setHeight(h); + int neededHeight = getOffsetHeight(); + setHeight("auto"); + // Then calculate the size the content area needs to be + tp.setHeight("0"); + int height = getOffsetHeight(); + tp.setHeight(neededHeight-height + "px"); + } else { + tp.setHeight("auto"); + // We don't need overflow:auto when tabsheet height is not set + DOM.setStyleAttribute(tp.getElement(), "overflow", "hidden"); + } } + + private void clearTabs() { + int i = tb.getTabCount(); + while(i>0) + tb.removeTab(--i); + tp.clear(); + + // Get rid of unnecessary 100% cell heights in TabBar (really ugly hack) + Element tr = DOM.getChild(DOM.getChild(tb.getElement(), 0), 0); + Element rest = DOM.getChild(DOM.getChild(tr, DOM.getChildCount(tr)-1), 0); + DOM.removeElementAttribute(rest, "style"); + } } diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITabsheetPanel.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/ITabsheetPanel.java new file mode 100644 index 0000000000..7ab01ed121 --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/ITabsheetPanel.java @@ -0,0 +1,102 @@ +package com.itmill.toolkit.terminal.gwt.client.ui; + +import com.google.gwt.user.client.DOM; +import com.google.gwt.user.client.ui.ComplexPanel; +import com.google.gwt.user.client.ui.Widget; + +/** + * A panel that displays all of its child widgets in a 'deck', where only one + * can be visible at a time. It is used by + * {@link com.itmill.toolkit.terminal.gwt.client.ui.ITabsheetPanel}. + * + * This class has the same basic functionality as the GWT DeckPanel + * {@link com.google.gwt.user.client.ui.DeckPanel}, with the exception + * that it doesn't manipulate the child widgets' width and height attributes. + */ +public class ITabsheetPanel extends ComplexPanel { + + private Widget visibleWidget; + + /** + * Creates an empty tabsheet panel. + */ + public ITabsheetPanel() { + setElement(DOM.createDiv()); + } + + /** + * Adds the specified widget to the deck. + * + * @param w the widget to be added + */ + public void add(Widget w) { + super.add(w, getElement()); + initChildWidget(w); + } + + /** + * Gets the index of the currently-visible widget. + * + * @return the visible widget's index + */ + public int getVisibleWidget() { + return getWidgetIndex(visibleWidget); + } + + /** + * Inserts a widget before the specified index. + * + * @param w the widget to be inserted + * @param beforeIndex the index before which it will be inserted + * @throws IndexOutOfBoundsException if beforeIndex is out of + * range + */ + public void insert(Widget w, int beforeIndex) { + super.insert(w, getElement(), beforeIndex, true); + initChildWidget(w); + } + + public boolean remove(Widget w) { + boolean removed = super.remove(w); + if (removed) { + resetChildWidget(w); + + if (visibleWidget == w) { + visibleWidget = null; + } + } + return removed; + } + + /** + * Shows the widget at the specified index. This causes the currently- visible + * widget to be hidden. + * + * @param index the index of the widget to be shown + */ + public void showWidget(int index) { + checkIndexBoundsForAccess(index); + + if (visibleWidget != null) { + visibleWidget.setVisible(false); + } + visibleWidget = getWidget(index); + visibleWidget.setVisible(true); + } + + /** + * Make the widget invisible, and set its width and height to full. + */ + private void initChildWidget(Widget w) { + w.setVisible(false); + } + + /** + * Make the widget visible, and clear the widget's width and height + * attributes. This is done so that any changes to the visibility, height, or + * width of the widget that were done by the panel are undone. + */ + private void resetChildWidget(Widget w) { + w.setVisible(true); + } +} diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/VerticalSplitPanelImages.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/VerticalSplitPanelImages.java new file mode 100644 index 0000000000..65bb9776b7 --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/VerticalSplitPanelImages.java @@ -0,0 +1,15 @@ +package com.itmill.toolkit.terminal.gwt.client.ui; + +import com.google.gwt.user.client.ui.AbstractImagePrototype; + +public interface VerticalSplitPanelImages extends + com.google.gwt.user.client.ui.VerticalSplitPanelImages { + + /** + * An image representing the drag thumb. + * + * @gwt.resource com/itmill/toolkit/terminal/gwt/public/default/common/img/blank.png + */ + AbstractImagePrototype verticalSplitPanelThumb(); + +} diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/button/button.css b/src/com/itmill/toolkit/terminal/gwt/public/default/button/button.css new file mode 100644 index 0000000000..9bc7b86584 --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/button/button.css @@ -0,0 +1,9 @@ +button { + cursor: pointer; +} +button.link { + border: 0px; + text-align: left; + text-decoration: underline; + background: none; +} diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/button/css/button.css b/src/com/itmill/toolkit/terminal/gwt/public/default/button/css/button.css deleted file mode 100644 index 9bc7b86584..0000000000 --- a/src/com/itmill/toolkit/terminal/gwt/public/default/button/css/button.css +++ /dev/null @@ -1,9 +0,0 @@ -button { - cursor: pointer; -} -button.link { - border: 0px; - text-align: left; - text-decoration: underline; - background: none; -} diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/caption/caption.css b/src/com/itmill/toolkit/terminal/gwt/public/default/caption/caption.css new file mode 100644 index 0000000000..af4a30ef07 --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/caption/caption.css @@ -0,0 +1,13 @@ +.i-errorindicator { + width: 10px; + height: 10px; + display: block; + float:left; + background: #f00; +} + +.i-error { + padding-left: 15px; + background: #fff; + border: 1px solid red; +} \ No newline at end of file diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/caption/css/caption.css b/src/com/itmill/toolkit/terminal/gwt/public/default/caption/css/caption.css deleted file mode 100644 index af4a30ef07..0000000000 --- a/src/com/itmill/toolkit/terminal/gwt/public/default/caption/css/caption.css +++ /dev/null @@ -1,13 +0,0 @@ -.i-errorindicator { - width: 10px; - height: 10px; - display: block; - float:left; - background: #f00; -} - -.i-error { - padding-left: 15px; - background: #fff; - border: 1px solid red; -} \ No newline at end of file diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/common/common.css b/src/com/itmill/toolkit/terminal/gwt/public/default/common/common.css new file mode 100644 index 0000000000..64dc530a00 --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/common/common.css @@ -0,0 +1,34 @@ +#itmtk-ajax-window { + background: #e9eced; + font-family: "Trebuchet MS", geneva, helvetica, arial, tahoma, verdana, sans-serif; + color: #464f52; + font-size: 12px; + line-height: 18px; +} + +input, select, textarea, button { + font-family: "Trebuchet MS", geneva, helvetica, arial, tahoma, verdana, sans-serif; + color: #464f52; +} + +select { + padding: 0; + margin: 0; +} + +.i-disabled { + opacity: 0.3; + filter: Alpha(opacity=30); +} + +.i-contextmenu { + background: #fff; + border: #000; +} + +/* Provide some extra whitespace for wrapped elements + (these elements usuallly need the extra space, since + they aren't even handling their own caption) */ +.i-captionwrapper { + margin: 0.3em 0 0 0; +} \ No newline at end of file diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/common/css/common.css b/src/com/itmill/toolkit/terminal/gwt/public/default/common/css/common.css deleted file mode 100644 index 64c9177eb0..0000000000 --- a/src/com/itmill/toolkit/terminal/gwt/public/default/common/css/common.css +++ /dev/null @@ -1,33 +0,0 @@ -body { - background: #f5f6f7 url(../img/window-bottom-bg.gif) no-repeat right bottom fixed; - font-family: helvetica, arial, tahoma, verdana, sans-serif; - color: #454a51; - font-size: 13px; - line-height: 19px; - padding: 8px; - margin: 0; -} - -#itmtk-ajax-window { - -} - -input, select, textarea, button { - font-family: helvetica, arial, tahoma, verdana, sans-serif; - font-size: 1em; -} - -select { - padding: 0; - margin: 0; -} - -.i-disabled { - opacity: 0.3; - filter: Alpha(opacity=30); -} - -.i-contextmenu { - background: #fff; - border: #000; -} \ No newline at end of file diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/common/img/blank.png b/src/com/itmill/toolkit/terminal/gwt/public/default/common/img/blank.png new file mode 100644 index 0000000000..2ba29d20c1 Binary files /dev/null and b/src/com/itmill/toolkit/terminal/gwt/public/default/common/img/blank.png differ diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/common/img/shadow-em.png b/src/com/itmill/toolkit/terminal/gwt/public/default/common/img/shadow-em.png deleted file mode 100644 index a35c6b6b84..0000000000 Binary files a/src/com/itmill/toolkit/terminal/gwt/public/default/common/img/shadow-em.png and /dev/null differ diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/common/img/shadow.png b/src/com/itmill/toolkit/terminal/gwt/public/default/common/img/shadow.png deleted file mode 100644 index fa3d1d058b..0000000000 Binary files a/src/com/itmill/toolkit/terminal/gwt/public/default/common/img/shadow.png and /dev/null differ diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/common/img/window-bg.png b/src/com/itmill/toolkit/terminal/gwt/public/default/common/img/window-bg.png deleted file mode 100644 index 2bcda2dc63..0000000000 Binary files a/src/com/itmill/toolkit/terminal/gwt/public/default/common/img/window-bg.png and /dev/null differ diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/common/img/window-bottom-bg.gif b/src/com/itmill/toolkit/terminal/gwt/public/default/common/img/window-bottom-bg.gif deleted file mode 100644 index e8068d9a8b..0000000000 Binary files a/src/com/itmill/toolkit/terminal/gwt/public/default/common/img/window-bottom-bg.gif and /dev/null differ diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/datefield/css/datefield.css b/src/com/itmill/toolkit/terminal/gwt/public/default/datefield/css/datefield.css deleted file mode 100644 index bbad2bacb9..0000000000 --- a/src/com/itmill/toolkit/terminal/gwt/public/default/datefield/css/datefield.css +++ /dev/null @@ -1,118 +0,0 @@ -.i-datefield-calendarpanel { - width: 22em; -} -.i-datefield-calendarpanel table { - width: 100%; -} -.i-datefield-calendarpanel td { - width: 14.2%; - text-align: center; - padding: 0; -} -.i-datefield-calendarpanel .i-button { - width: 22px; - height: 22px; - font-size: 1.1em; - padding: 0; - line-height: 1em; -} -.i-datefield-calendarpanel-month { - font-size: 1.1em; -} -.i-datefield-calendarpanel-day { - cursor: pointer; - padding: 0 3px; -} -.i-datefield-calendarpanel-day-today { - font-weight: bold; - border: 1px solid #aaa; - padding: 0 3px; - cursor: pointer; -} -.i-disabled .i-datefield-calendarpanel-day, -.i-disabled .i-datefield-calendarpanel-day-today { - cursor: default; -} -.i-datefield-calendarpanel-day-selected { - font-weight: bold; - color: #fff; - padding: 0 3px; - background-color: #1C3E6E; - cursor: default; -} -.i-datefield-calendarpanel-day-entry { - color: #0074D9; -} -.i-datefield-calendarpanel-day-disabled { - font-weight: normal; - color: #dddddd; - cursor: default; - opacity: 0.5; -} -.i-datefield-calendarpanel-day-entry.i-datefield-calendarpanel-day-disabled { - color: #ABC8E2; -} - -.i-datefield-time { - white-space: nowrap; -} -.i-datefield-time .i-label { - display: inline; -} - -.i-datefield-calendar { - border: 1px solid #29528a; - padding: 5px; - background: #fff; -} -.i-datefield-calendar:before { - display: block; - height: 2px; - overflow: hidden; - background: transparent url(../../panel/img/top-right-small.png) no-repeat right top; - content: url(../../panel/img/top-left-small.png); - margin: -6px -6px 3px -6px; -} -.i-datefield-calendar:after { - display: block; - height: 2px; - overflow: hidden; - background: transparent url(../../panel/img/bottom-right.png) no-repeat right top; - content: url(../../panel/img/bottom-left.png); - margin: 5px -6px -6px -6px; -} - -.i-datefield-entrycalendar-hours { - height: 150px; - overflow: auto; -} -.i-datefield-entrycalendar-hours table { - width: 92%; -} - -.i-datefield-entrycalendar-row-even { - cursor: pointer; - background-color: #fefefe; -} -.i-datefield-entrycalendar-row-odd { - cursor: pointer; - background-color: #eeeeee; -} -.i-datefield-entrycalendar-row-selected { - color: #fff; - background-color: #1C3E6E; -} -td.i-datefield-entrycalendar-time { - padding-right: 2px; - text-align: right; - white-space: nowrap; -} -td.i-datefield-entrycalendar-title { - padding-left: 2px; - text-align: left; - width: 80%; - color: #0074D9; -} -.i-datefield-entrycalendar-row-selected td span { - color: #fff; -} diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/datefield/datefield.css b/src/com/itmill/toolkit/terminal/gwt/public/default/datefield/datefield.css new file mode 100644 index 0000000000..bbad2bacb9 --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/datefield/datefield.css @@ -0,0 +1,118 @@ +.i-datefield-calendarpanel { + width: 22em; +} +.i-datefield-calendarpanel table { + width: 100%; +} +.i-datefield-calendarpanel td { + width: 14.2%; + text-align: center; + padding: 0; +} +.i-datefield-calendarpanel .i-button { + width: 22px; + height: 22px; + font-size: 1.1em; + padding: 0; + line-height: 1em; +} +.i-datefield-calendarpanel-month { + font-size: 1.1em; +} +.i-datefield-calendarpanel-day { + cursor: pointer; + padding: 0 3px; +} +.i-datefield-calendarpanel-day-today { + font-weight: bold; + border: 1px solid #aaa; + padding: 0 3px; + cursor: pointer; +} +.i-disabled .i-datefield-calendarpanel-day, +.i-disabled .i-datefield-calendarpanel-day-today { + cursor: default; +} +.i-datefield-calendarpanel-day-selected { + font-weight: bold; + color: #fff; + padding: 0 3px; + background-color: #1C3E6E; + cursor: default; +} +.i-datefield-calendarpanel-day-entry { + color: #0074D9; +} +.i-datefield-calendarpanel-day-disabled { + font-weight: normal; + color: #dddddd; + cursor: default; + opacity: 0.5; +} +.i-datefield-calendarpanel-day-entry.i-datefield-calendarpanel-day-disabled { + color: #ABC8E2; +} + +.i-datefield-time { + white-space: nowrap; +} +.i-datefield-time .i-label { + display: inline; +} + +.i-datefield-calendar { + border: 1px solid #29528a; + padding: 5px; + background: #fff; +} +.i-datefield-calendar:before { + display: block; + height: 2px; + overflow: hidden; + background: transparent url(../../panel/img/top-right-small.png) no-repeat right top; + content: url(../../panel/img/top-left-small.png); + margin: -6px -6px 3px -6px; +} +.i-datefield-calendar:after { + display: block; + height: 2px; + overflow: hidden; + background: transparent url(../../panel/img/bottom-right.png) no-repeat right top; + content: url(../../panel/img/bottom-left.png); + margin: 5px -6px -6px -6px; +} + +.i-datefield-entrycalendar-hours { + height: 150px; + overflow: auto; +} +.i-datefield-entrycalendar-hours table { + width: 92%; +} + +.i-datefield-entrycalendar-row-even { + cursor: pointer; + background-color: #fefefe; +} +.i-datefield-entrycalendar-row-odd { + cursor: pointer; + background-color: #eeeeee; +} +.i-datefield-entrycalendar-row-selected { + color: #fff; + background-color: #1C3E6E; +} +td.i-datefield-entrycalendar-time { + padding-right: 2px; + text-align: right; + white-space: nowrap; +} +td.i-datefield-entrycalendar-title { + padding-left: 2px; + text-align: left; + width: 80%; + color: #0074D9; +} +.i-datefield-entrycalendar-row-selected td span { + color: #fff; +} diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/filterselect/css/filterselect.css b/src/com/itmill/toolkit/terminal/gwt/public/default/filterselect/css/filterselect.css deleted file mode 100644 index 8049989a4c..0000000000 --- a/src/com/itmill/toolkit/terminal/gwt/public/default/filterselect/css/filterselect.css +++ /dev/null @@ -1,36 +0,0 @@ -.i-filterselect-suggestpopup { - background: #fff; - font-size:small; -} - -.i-filterselect-suggestmenu .gwt-MenuItem { - border: 1px solid black; - border-width: 0 1px 1px 1px; -} - -.i-filterselect-suggestmenu .gwt-MenuItem-selected { - background: yellow; -} - -.i-filterselect { - white-space: nowrap; -} - -.i-filterselect-popupopener { - display:inline; - background:red; -} - -.i-filterselect-nextpage-on, -.i-filterselect-nextpage-off, -.i-filterselect-prevpage-off, -.i-filterselect-prevpage-on, -.i-filterselect-status { - text-align: center; -} - -.i-filterselect-nextpage-off, -.i-filterselect-prevpage-off { - color: #666; -} - diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/panel/css/panel.css b/src/com/itmill/toolkit/terminal/gwt/public/default/panel/css/panel.css deleted file mode 100644 index 1815c43ff0..0000000000 --- a/src/com/itmill/toolkit/terminal/gwt/public/default/panel/css/panel.css +++ /dev/null @@ -1,306 +0,0 @@ -.i-panel { - margin: 8px 0 1px 0; -} - -.i-panel-caption { - font-size: 12px; - line-height: 12px; - font-weight: normal; - color: #2c3c49; - white-space: nowrap; - height: 27px; - padding: 0 5px 0 5px; - border: 1px solid #c1c6cc; - border-bottom: none; - background: #fff url(../img/top-bg.png) repeat-x top left; -} - -.i-panel-caption:before { - display: block; - height: 28px; - overflow: hidden; - background: transparent url(../img/top-right.png) no-repeat right top; - content: url(../img/top-left.png); - margin: -1px -6px -20px -6px; -} - -.i-panel-content { - border: 1px solid #c1c6cc; - border-top: none; - background-color: #fff; - overflow: auto; - padding: 8px; -} - -.i-panel-deco { - height: 9px; - background: transparent url(../../common/img/shadow.png) repeat-x left bottom; - margin-top: -2px; - position: relative; -} - -.i-panel-deco:before { - display: block; - height: 2px; - overflow: hidden; - background: transparent url(../img/bottom-right.png) no-repeat right top; - content: url(../img/bottom-left.png); -} - -.i-panel-nocaption { - border-top: 1px solid #c1c6cc; - background-color: #fff; -} - -.i-panel-nocaption:before { - display: block; - height: 2px; - overflow: hidden; - background: transparent url(../img/top-right-small.png) no-repeat right top; - content: url(../img/top-left-small.png); - margin-top: -1px; -} - - - -/* Strong style */ - -.i-panel-strong .i-panel-caption { - background-image: url(../img/top-bg-strong.png); - border-color: #6c9ad8; - color: #fff; - font-weight: bold; -} - -.i-panel-strong .i-panel-caption:before { - background-image: url(../img/top-right-strong.png); - content: url(../img/top-left-strong.png); -} - - - -/* Light style */ - -.i-panel-light .i-panel-caption { - background: transparent; - font-weight: bold; - border: none; - padding: 3px 0 0 2px; - height: 16px; - margin-bottom: 1px; - border-bottom: 1px solid #e7e7e8; -} - -.i-panel-light .i-panel-caption:before { - display: none; -} - -.i-panel-light .i-panel-caption:after { - display: block; - height: 2px; - overflow: hidden; - background: transparent url(../img/top-right-light.png) no-repeat top right; - content: url(../img/top-left-light.png); - margin: 4px 0 0 -2px; -} - -.i-panel-light .i-panel-content { - border: 1px solid #e7e7e8; - border-top: none; - background: #fff url(../img/bg-light.png) repeat-x 0 1px; -} - -.i-panel-light .i-panel-deco { - background: transparent; - height: 2px; -} - -.i-panel-light .i-panel-deco:before { - background: transparent url(../img/bottom-right-light.png) no-repeat top right; - content: url(../img/bottom-left-light.png); -} - -/* Light style without caption */ -.i-panel-light .i-panel-nocaption { - border-color: #e7e7e8; -} - -.i-panel-light .i-panel-nocaption:before { - background-image: url(../img/top-right-light.png); - content: url(../img/top-left-light.png); -} - - - -/* Highlight style */ - -.i-panel-highlight .i-panel-caption { - background-image: url(../img/top-bg-highlight.png); - background-color: #fffdec; - border-color: #c0baae; - color: #4e4640; -} - -.i-panel-highlight .i-panel-caption:before { - background-image: url(../img/top-right-highlight.png); - content: url(../img/top-left-highlight.png); -} - -.i-panel-highlight .i-panel-content { - background-color: #fffdec; - border-color: #c0baae; - color: #605b52; -} - -/* Highlight style without caption */ -.i-panel-highlight .i-panel-nocaption { - border-color: #c0baae; - background-color: #fffdec; -} - - - -/* Emphasized style */ - -.i-panel-emphasize .i-panel-caption { - background: #6899d9 url(../img/top-bg-em.gif) repeat-x; - border-color: #78a2db; - color: #fff; - font-weight: bold; - height: 22px; -} - -.i-panel-emphasize .i-panel-caption:before { - background-image: url(../img/top-right-em.gif); - content: url(../img/top-left-em.gif); -} - -.i-panel-emphasize .i-panel-content { - background: #3a6bab url(../img/bg-em.gif) repeat-x; - color: #dee6f2; - border-color: #78a2db; -} - -.i-panel-emphasize .i-panel-deco { - margin-top: -4px; - height: 11px; - background-image: url(../../common/img/shadow-em.png); -} - -.i-panel-emphasize .i-panel-deco:before { - background-image: url(../img/bottom-right-em.gif); - content: url(../img/bottom-left-em.gif); - height: 4px; -} - -/* Emphasized style without caption */ -.i-panel-emphasize .i-panel-nocaption { - background: #6899d9 url(../img/top-bg-em.gif) repeat-x; - border: 1px solid #78a2db; - border-bottom: none; - height: 3px; -} - -.i-panel-emphasize .i-panel-nocaption:before { - background-image: url(../img/top-right-em.gif); - content: url(../img/top-left-em.gif); - margin: -1px; -} - - - - - - - -/* IE specific rules (different selectors for IE6 and IE7. - * These selectors must be separate because IE6 won't - * apply them if they are grouped together. -*/ -* html .i-panel-caption { - padding-top: 7px; - height: 19px; -} -*+html .i-panel-caption { - padding-top: 7px; - height: 19px; -} - -* html .i-panel-deco { - position: static; - background: transparent; - margin: 0; - font-size: 1; - height: 7px; - overflow: hidden; - /* TODO change url when packaging is complete */ - filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../com.itmill.toolkit.terminal.gwt.Client/component-themes/common/img/shadow.png", sizingMethod="scale"); -} - -/* Without caption */ -* html .i-panel-nocaption { - height: 1px; - overflow: hidden; - background: #c1c6cc; - border: none; -} - - -/* Light style */ - -* html .i-panel-light .i-panel-caption { - background: transparent; - font-weight: bold; - border: none; - padding: 3px 0 0 2px; - height: 16px; -} -*+html .i-panel-light .i-panel-caption { - background: transparent; - font-weight: bold; - border: none; - padding: 3px 0 0 2px; - height: 16px; -} - -* html .i-panel-light .i-panel-content { - border: 1px solid #e7e7e8; - background-position: 0 2px; -} -*+html .i-panel-light .i-panel-content { - border: 1px solid #e7e7e8; - background-position: 0 2px; -} - -* html .i-panel-light .i-panel-deco { - display: none; -} - -/* Without caption */ -* html .i-panel-light .i-panel-nocaption { - display: none; -} -*+html .i-panel-light .i-panel-nocaption { - display: none; -} - - -/* Emphasized style */ -* html .i-panel-emphasize .i-panel-caption { - height: 15px; -} -*+html .i-panel-emphasize .i-panel-caption { - height: 15px; -} - -* html .i-panel-emphasize .i-panel-content { - background-attachment: fixed; -} - -* html .i-panel-emphasize .i-panel-deco { - height: 7px; - margin-top: 0; - background: transparent; - /* TODO change url when packaging is complete */ - filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../com.itmill.toolkit.terminal.gwt.Client/component-themes/common/img/shadow-em.png", sizingMethod="scale"); -} \ No newline at end of file diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/bg-em.gif b/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/bg-em.gif deleted file mode 100644 index 1c817bfa54..0000000000 Binary files a/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/bg-em.gif and /dev/null differ diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/bg-light.png b/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/bg-light.png deleted file mode 100644 index 1ad2068121..0000000000 Binary files a/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/bg-light.png and /dev/null differ diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/bottom-left-em.gif b/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/bottom-left-em.gif deleted file mode 100644 index 909ddc97ee..0000000000 Binary files a/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/bottom-left-em.gif and /dev/null differ diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/bottom-left-light.png b/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/bottom-left-light.png deleted file mode 100644 index 91e395dd4a..0000000000 Binary files a/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/bottom-left-light.png and /dev/null differ diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/bottom-left.png b/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/bottom-left.png index 9ce9c8efe9..d5c950bc45 100644 Binary files a/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/bottom-left.png and b/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/bottom-left.png differ diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/bottom-right-em.gif b/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/bottom-right-em.gif deleted file mode 100644 index 1ffd8658cb..0000000000 Binary files a/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/bottom-right-em.gif and /dev/null differ diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/bottom-right-light.png b/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/bottom-right-light.png deleted file mode 100644 index 31e6252f90..0000000000 Binary files a/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/bottom-right-light.png and /dev/null differ diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/bottom-right.png b/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/bottom-right.png index 001f63cad5..3ad916f694 100644 Binary files a/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/bottom-right.png and b/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/bottom-right.png differ diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/top-bg-em.gif b/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/top-bg-em.gif deleted file mode 100644 index 57a3d6a4cf..0000000000 Binary files a/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/top-bg-em.gif and /dev/null differ diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/top-bg-highlight.png b/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/top-bg-highlight.png deleted file mode 100644 index 9e68c95174..0000000000 Binary files a/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/top-bg-highlight.png and /dev/null differ diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/top-bg-light.png b/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/top-bg-light.png deleted file mode 100644 index 0f46520214..0000000000 Binary files a/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/top-bg-light.png and /dev/null differ diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/top-bg-strong.png b/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/top-bg-strong.png deleted file mode 100644 index 8385dced7d..0000000000 Binary files a/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/top-bg-strong.png and /dev/null differ diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/top-bg.png b/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/top-bg.png deleted file mode 100644 index 8a29146257..0000000000 Binary files a/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/top-bg.png and /dev/null differ diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/top-left-em.gif b/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/top-left-em.gif deleted file mode 100644 index 94d4e9aae2..0000000000 Binary files a/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/top-left-em.gif and /dev/null differ diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/top-left-highlight.png b/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/top-left-highlight.png deleted file mode 100644 index 26f6a7fd00..0000000000 Binary files a/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/top-left-highlight.png and /dev/null differ diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/top-left-light.png b/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/top-left-light.png deleted file mode 100644 index c732482b0d..0000000000 Binary files a/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/top-left-light.png and /dev/null differ diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/top-left-small.png b/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/top-left-small.png deleted file mode 100644 index 047d62d054..0000000000 Binary files a/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/top-left-small.png and /dev/null differ diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/top-left-strong.png b/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/top-left-strong.png deleted file mode 100644 index 0ecac10257..0000000000 Binary files a/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/top-left-strong.png and /dev/null differ diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/top-left.png b/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/top-left.png index 9c4505986b..8108eab8e4 100644 Binary files a/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/top-left.png and b/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/top-left.png differ diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/top-right-em.gif b/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/top-right-em.gif deleted file mode 100644 index 35069a1af9..0000000000 Binary files a/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/top-right-em.gif and /dev/null differ diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/top-right-highlight.png b/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/top-right-highlight.png deleted file mode 100644 index 58f0127cc9..0000000000 Binary files a/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/top-right-highlight.png and /dev/null differ diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/top-right-light.png b/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/top-right-light.png deleted file mode 100644 index feabbb1ca4..0000000000 Binary files a/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/top-right-light.png and /dev/null differ diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/top-right-small.png b/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/top-right-small.png deleted file mode 100644 index a19338806f..0000000000 Binary files a/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/top-right-small.png and /dev/null differ diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/top-right-strong.png b/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/top-right-strong.png deleted file mode 100644 index 75ea5f536b..0000000000 Binary files a/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/top-right-strong.png and /dev/null differ diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/top-right.png b/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/top-right.png index a9261fea22..9fc0f86635 100644 Binary files a/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/top-right.png and b/src/com/itmill/toolkit/terminal/gwt/public/default/panel/img/top-right.png differ diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/panel/panel.css b/src/com/itmill/toolkit/terminal/gwt/public/default/panel/panel.css new file mode 100644 index 0000000000..0e73204340 --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/panel/panel.css @@ -0,0 +1,166 @@ +.i-panel, +.i-panel-caption, +.i-panel-content, +.i-panel-deco { + outline: none; /* Prevent selection outline which might break layouts or cause scrollbars */ +} + +.i-panel:before { + display: block; + content: ""; + background: transparent url(img/top-right.png) repeat-x right top; + height: 9px; + margin-left: 9px; +} + +.i-panel-caption { + font-size: 18px; + line-height: 18px; + font-weight: normal; + letter-spacing: -0.03em; + color: #f14c1a; + white-space: nowrap; + height: 18px; + padding: 6px 18px 14px 18px; + border: 1px solid #babfc0; + border-top: none; + background: #fff; +} + +.i-panel-nocaption { + height: 9px; +} + +.i-panel-caption:before, +.i-panel-nocaption:before { + display: block; + content: ""; + position: relative; + width: 9px; + height: 9px; + background: transparent url(img/top-left.png) no-repeat; + margin: -15px 0 5px -19px; +} + +.i-panel-nocaption:before { + margin: -9px 0 0 0; +} + +.i-panel-content { + border: 1px solid #babfc0; + border-top: none; + border-bottom: none; + background-color: #fff; + overflow: auto; + padding: 15px 18px 6px 18px; +} + +.i-panel-deco { + height: 9px; + background: transparent url(img/bottom-right.png) repeat-x right top; + margin-left: 9px; +} + +.i-panel-deco:before { + display: block; + content: ""; + width: 9px; + height: 9px; + margin-left: -9px; + background: transparent url(img/bottom-left.png) no-repeat; +} + + + + + + +/* Light panel style */ + +.i-panel-light:before { + display: none; +} + +.i-panel-light .i-panel-caption { + border-left: none; + border-right: none; + background: transparent; +} + +.i-panel-light .i-panel-caption:before, +.i-panel-light .i-panel-nocaption:before { + display: none; +} + +.i-panel-light .i-panel-content { + border: none; + background: transparent; +} + +.i-panel-light .i-panel-deco { + display: none; +} + +.i-panel-light .i-panel-deco:before { + display: none; +} + + + + +/* Light panel contained within another panel or a tabsheet */ +/* Use more precise selector to override IE specific rules automatically */ + +.i-panel .i-panel-light .i-panel-caption, +.i-tabsheet .i-panel-light .i-panel-caption { + border-left: none; + border-right: none; + margin: -16px -18px 0 -18px; + padding-top: 14px; + border-top: 1px solid #babfc0; +} +.i-panel .i-panel-light .i-panel-content, +.i-tabsheet .i-panel-light .i-panel-content { + margin: 0 -18px 16px -18px; +} + + + + + +/* IE specific rules (different selectors for IE6 and IE7. + * These selectors must be separate because IE6 won't + * apply them if they are grouped together. +*/ +* html .i-panel-caption { + border: 1px solid #babfc0; + padding-top: 14px; +} +*+html .i-panel-caption { + border: 1px solid #babfc0; + padding-top: 14px; +} + +* html .i-panel-content { + border-bottom: 1px solid #babfc0; + padding: 15px 18px; +} +*+html .i-panel-content { + border-bottom: 1px solid #babfc0; + padding: 15px 18px; +} + +* html .i-panel-deco { + display: none; +} +*+html .i-panel-deco { + display: none; +} + +/* Without caption */ +* html .i-panel-nocaption { + height: 1px; + overflow: hidden; + background: #c1c6cc; + border: none; +} \ No newline at end of file diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/select/css/select.css b/src/com/itmill/toolkit/terminal/gwt/public/default/select/css/select.css deleted file mode 100644 index 6d8dac8f34..0000000000 --- a/src/com/itmill/toolkit/terminal/gwt/public/default/select/css/select.css +++ /dev/null @@ -1,56 +0,0 @@ -.i-select { - -} - -.i-select-option { - -} - -.i-select-optiongroup { - -} - -.i-select-optiongroup .i-select-option { - display: block; -} - -.i-select-select { - /* - border: 1px solid #b6b6b6; - border-bottom-color: #9d9d9d; - border-top-color: #d6d6d6; - border-left-color: #d6d6d6; - */ - display: block; -} - -/* Twincol style */ -.i-select-twincol-options { - float: left; -} - -.i-select-twincol-buttons { - float: left; - width: 40px; - text-align: center; -} - -.i-select-twincol-buttons .i-select-twincol-deco { - display: inline; /* Needed to push the two buttons in stack */ -} - -.i-select-twincol .i-textfield { - display: block; - float: left; - clear: left; -} - -.i-select-twincol .i-button { - display: block; - float: left; -} - -.i-select-twincol-buttons .i-button { - display: inline; - float: none; -} \ No newline at end of file diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/select/filterselect.css b/src/com/itmill/toolkit/terminal/gwt/public/default/select/filterselect.css new file mode 100644 index 0000000000..3e8ab642cb --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/select/filterselect.css @@ -0,0 +1,36 @@ +.i-filterselect-suggestpopup { + background: #fff; + font-size:small; +} + +.i-filterselect-suggestmenu .gwt-MenuItem { + border: 1px solid black; + border-width: 0 1px 1px 1px; +} + +.i-filterselect-suggestmenu .gwt-MenuItem-selected { + background: yellow; +} + +.i-filterselect { + white-space: nowrap; +} + +.i-filterselect-button { + display:inline; + background:red; +} + +.i-filterselect-nextpage-on, +.i-filterselect-nextpage-off, +.i-filterselect-prevpage-off, +.i-filterselect-prevpage-on, +.i-filterselect-status { + text-align: center; +} + +.i-filterselect-nextpage-off, +.i-filterselect-prevpage-off { + color: #666; +} + diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/select/select.css b/src/com/itmill/toolkit/terminal/gwt/public/default/select/select.css new file mode 100644 index 0000000000..6d8dac8f34 --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/select/select.css @@ -0,0 +1,56 @@ +.i-select { + +} + +.i-select-option { + +} + +.i-select-optiongroup { + +} + +.i-select-optiongroup .i-select-option { + display: block; +} + +.i-select-select { + /* + border: 1px solid #b6b6b6; + border-bottom-color: #9d9d9d; + border-top-color: #d6d6d6; + border-left-color: #d6d6d6; + */ + display: block; +} + +/* Twincol style */ +.i-select-twincol-options { + float: left; +} + +.i-select-twincol-buttons { + float: left; + width: 40px; + text-align: center; +} + +.i-select-twincol-buttons .i-select-twincol-deco { + display: inline; /* Needed to push the two buttons in stack */ +} + +.i-select-twincol .i-textfield { + display: block; + float: left; + clear: left; +} + +.i-select-twincol .i-button { + display: block; + float: left; +} + +.i-select-twincol-buttons .i-button { + display: inline; + float: none; +} \ No newline at end of file diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/slider/css/slider.css b/src/com/itmill/toolkit/terminal/gwt/public/default/slider/css/slider.css deleted file mode 100644 index c7c4f665bd..0000000000 --- a/src/com/itmill/toolkit/terminal/gwt/public/default/slider/css/slider.css +++ /dev/null @@ -1,99 +0,0 @@ -.i-slider { - background: #c3d0dd url(../img/bg.png) repeat-x; - border: 1px solid #29528a; - border-left: none; - border-right: none; - height: 14px; -} -.i-slider:before { - display: block; - width: 1px; - height: 14px; - background-color: #29528a; - border-top: 1px solid #b9c8dc; - border-bottom: 1px solid #b9c8dc; - margin: -1px 0 -15px -1px; - content: ""; -} -.i-slider:after { - display: block; - width: 1px; - height: 14px; - background-color: #29528a; - border-top: 1px solid #b9c8dc; - border-bottom: 1px solid #b9c8dc; - margin: -15px 0 0 100%; - content: ""; -} -.i-slider-base { - background: #c3d0dd url(../img/bg.png) repeat-x; - height: 14px; - overflow: hidden; -} -.i-slider-handle { - background: #fff url(../img/handle-bg.png) repeat-x; - border: 1px solid #29528a; - height: 10px; - font-size: 1px; -} -.i-slider-handle:before { - display: block; - height: 12px; - background: transparent url(../img/handle-right.png) no-repeat right top; - margin: -1px -1px 0 -1px; - content: url(../img/handle-left.png); -} -.i-slider-bigger { - background: #dde4ef url(../img/arrow-right.png); - float: right; - width: 14px; - height: 14px; - overflow: hidden; - margin: 0 0 0 1px; -} -.i-slider-bigger:hover { - background-image: url(../img/arrow-right-over.png); -} -.i-slider-smaller { - background: #dde4ef url(../img/arrow-left.png); - float: left; - width: 14px; - height: 14px; - overflow: hidden; - margin: 0 1px 0 0; -} -.i-slider-smaller:hover { - background-image: url(../img/arrow-left-over.png); -} - - - -/*----------------- - Vertical styles - -----------------*/ - -.i-slider-vertical { - -} -.i-slider-vertical .i-slider-base { - -} -.i-slider-vertical .i-slider-handle { - -} -.i-slider-vertical .i-slider-bigger { - -} - - - -/*-------------------- - IE specific styles - -------------------*/ - -* html .i-slider { - border: 1px solid #29528a; -} -*+html .i-slider { - border: 1px solid #29528a; -} \ No newline at end of file diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/slider/slider.css b/src/com/itmill/toolkit/terminal/gwt/public/default/slider/slider.css new file mode 100644 index 0000000000..c7c4f665bd --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/slider/slider.css @@ -0,0 +1,99 @@ +.i-slider { + background: #c3d0dd url(../img/bg.png) repeat-x; + border: 1px solid #29528a; + border-left: none; + border-right: none; + height: 14px; +} +.i-slider:before { + display: block; + width: 1px; + height: 14px; + background-color: #29528a; + border-top: 1px solid #b9c8dc; + border-bottom: 1px solid #b9c8dc; + margin: -1px 0 -15px -1px; + content: ""; +} +.i-slider:after { + display: block; + width: 1px; + height: 14px; + background-color: #29528a; + border-top: 1px solid #b9c8dc; + border-bottom: 1px solid #b9c8dc; + margin: -15px 0 0 100%; + content: ""; +} +.i-slider-base { + background: #c3d0dd url(../img/bg.png) repeat-x; + height: 14px; + overflow: hidden; +} +.i-slider-handle { + background: #fff url(../img/handle-bg.png) repeat-x; + border: 1px solid #29528a; + height: 10px; + font-size: 1px; +} +.i-slider-handle:before { + display: block; + height: 12px; + background: transparent url(../img/handle-right.png) no-repeat right top; + margin: -1px -1px 0 -1px; + content: url(../img/handle-left.png); +} +.i-slider-bigger { + background: #dde4ef url(../img/arrow-right.png); + float: right; + width: 14px; + height: 14px; + overflow: hidden; + margin: 0 0 0 1px; +} +.i-slider-bigger:hover { + background-image: url(../img/arrow-right-over.png); +} +.i-slider-smaller { + background: #dde4ef url(../img/arrow-left.png); + float: left; + width: 14px; + height: 14px; + overflow: hidden; + margin: 0 1px 0 0; +} +.i-slider-smaller:hover { + background-image: url(../img/arrow-left-over.png); +} + + + +/*----------------- + Vertical styles + -----------------*/ + +.i-slider-vertical { + +} +.i-slider-vertical .i-slider-base { + +} +.i-slider-vertical .i-slider-handle { + +} +.i-slider-vertical .i-slider-bigger { + +} + + + +/*-------------------- + IE specific styles + -------------------*/ + +* html .i-slider { + border: 1px solid #29528a; +} +*+html .i-slider { + border: 1px solid #29528a; +} \ No newline at end of file diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/splitpanel/css/splitpanel.css b/src/com/itmill/toolkit/terminal/gwt/public/default/splitpanel/css/splitpanel.css deleted file mode 100644 index 75a77dc58f..0000000000 --- a/src/com/itmill/toolkit/terminal/gwt/public/default/splitpanel/css/splitpanel.css +++ /dev/null @@ -1,4 +0,0 @@ -.gwt-HorizontalSplitPanel .hsplitter, -.gwt-VerticalSplitPanel .vsplitter { - -} diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/splitpanel/img/bg_hor.png b/src/com/itmill/toolkit/terminal/gwt/public/default/splitpanel/img/bg_hor.png new file mode 100644 index 0000000000..268cfaf18a Binary files /dev/null and b/src/com/itmill/toolkit/terminal/gwt/public/default/splitpanel/img/bg_hor.png differ diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/splitpanel/img/bg_ver.png b/src/com/itmill/toolkit/terminal/gwt/public/default/splitpanel/img/bg_ver.png new file mode 100644 index 0000000000..9dfe06dafb Binary files /dev/null and b/src/com/itmill/toolkit/terminal/gwt/public/default/splitpanel/img/bg_ver.png differ diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/splitpanel/splitpanel.css b/src/com/itmill/toolkit/terminal/gwt/public/default/splitpanel/splitpanel.css new file mode 100644 index 0000000000..8d8d498d2f --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/splitpanel/splitpanel.css @@ -0,0 +1,13 @@ +.i-splitpanel-horizontal .hsplitter { + width: 8px; + background: #ccd2d0 url(img/bg_hor.png); + border: 1px solid #b6bbbc; + cursor: e-resize; +} + +.i-splitpanel-vertical .vsplitter { + height: 8px; + background: #ccd2d0 url(img/bg_ver.png); + border: 1px solid #b6bbbc; + cursor: n-resize; +} \ No newline at end of file diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/styles.css b/src/com/itmill/toolkit/terminal/gwt/public/default/styles.css index 28e8abb3e2..0a2300e2c1 100644 --- a/src/com/itmill/toolkit/terminal/gwt/public/default/styles.css +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/styles.css @@ -1,15 +1,15 @@ -@import "common/css/common.css"; -@import "button/css/button.css"; -@import "textfield/css/textfield.css"; -@import "select/css/select.css"; -@import "panel/css/panel.css"; -@import "tabsheet/css/tabsheet.css"; -@import "datefield/css/datefield.css"; -@import "table/css/table.css"; -@import "slider/css/slider.css"; -@import "window/css/window.css"; -@import "caption/css/caption.css"; -@import "tree/css/tree.css"; -@import "splitpanel/css/splitpanel.css"; -@import "filterselect/css/filterselect.css"; - +@import "common/common.css"; +@import "button/button.css"; +@import "textfield/textfield.css"; +@import "select/select.css"; +@import "panel/panel.css"; +@import "tabsheet/tabsheet.css"; +@import "datefield/datefield.css"; +@import "table/table.css"; +@import "slider/slider.css"; +@import "window/window.css"; +@import "caption/caption.css"; +@import "tree/tree.css"; +@import "splitpanel/splitpanel.css"; +@import "select/filterselect.css"; + diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/table/css/table.css b/src/com/itmill/toolkit/terminal/gwt/public/default/table/css/table.css deleted file mode 100644 index 2e35bec193..0000000000 --- a/src/com/itmill/toolkit/terminal/gwt/public/default/table/css/table.css +++ /dev/null @@ -1,164 +0,0 @@ -.i-table { - border: 1px solid #29528a; - background: #fff; -} -.i-table:before { - display: block; - height: 2px; - overflow: hidden; - background: transparent url(../../panel/img/top-right-small.png) no-repeat right top; - content: url(../../panel/img/top-left-small.png); - margin: -1px -1px 0 -1px; -} -.i-table:after { - display: block; - height: 2px; - overflow: hidden; - background: transparent url(../../panel/img/bottom-right.png) no-repeat right top; - content: url(../../panel/img/bottom-left.png); - margin: 0 -1px -1px -1px; -} - -.i-table-header-wrap { - height: 26px; - background: #e7edf3 url(../img/header-bg.png) repeat-x; - border-bottom: 1px solid #6082b0; - margin-top: -1px; -} - -.i-table-header { -} - -.i-table-header table, -.i-table-table { - border-collapse: collapse; - margin: 0; - padding: 0; - border: 0; -} - -.i-table-header td, -.i-table-table td { - margin:0; - padding:0; - border:0; -} - -.i-table-header td { - cursor: pointer; -} - -.i-table-resizer { - display: block; - height: 26px; - float: right; - background: #aabdda url(../img/resizer-bg.png); - cursor: e-resize; -} - -.i-table-caption-container { - float: right; - overflow: hidden; - white-space: nowrap; - font-weight: bold; - color: #1c3e6e; - padding-top: 5px; -} - -/* disabled row in column selector */ -.i-off { - font-style: italic; -} - - - -.i-table-header-cell { -} -.i-table-header-cell-asc { - background: blue; -} -.i-table-header-cell-desc { - background: cyan; -} - -.i-table-body { - /*margin: 0 1px;*/ -} - -.i-table-row { - border: 0; - margin: 0; - padding: 3px 0 3px 0; - cursor: pointer; -} -.i-table-row:hover, -.i-table .i-odd:hover { - background-color: #d3dfee; -} -.i-table .i-odd { - background-color: #f1f5f9; -} -.i-table .i-selected { - background: #375f98 url(../img/selected-bg.png) repeat-x; - color: #fff; -} - -.i-table-row-spacer { - height: 10px; - overflow: hidden; /* IE hack to allow < one line height divs */ -} - -.i-table-cell-content { - white-space: nowrap; - overflow: hidden; - /*border-right: 1px solid #e4e8ef; - padding-left: 2px; - width: 98%;*/ -} - - - -.i-table-column-selector { - float: right; - background: transparent url(../img/colsel.png) no-repeat; - margin: 4px 0 0 0; - height:15px; - width:15px; -} - -.i-table-focus-slot-left { - border-left: 2px solid #375f98; - margin-right: -2px; -} -.i-table-focus-slot-right { - border-right: 2px solid #375f98; - margin-left: -2px; -} - -.i-table-header-drag { - position: absolute; - background: #e7edf3 url(../img/header-bg.png) repeat-x; - border: 1px solid #375f98; - padding: 4px; - color: #1c3e6e; - font-weight: bold; - opacity: 0.5; - filter: alpha(opacity=50); -} - -.i-table-scrollposition { - display: none; - position: absolute; - width: 150px; - padding: 4px; - border: 1px solid black; - background: yellow; -} - -/* IE specific styles */ -* html .i-table-header-wrap { - margin-top: 0; -} -*+html .i-table-header-wrap { - margin-top: 1px; -} \ No newline at end of file diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/table/table.css b/src/com/itmill/toolkit/terminal/gwt/public/default/table/table.css new file mode 100644 index 0000000000..2e35bec193 --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/table/table.css @@ -0,0 +1,164 @@ +.i-table { + border: 1px solid #29528a; + background: #fff; +} +.i-table:before { + display: block; + height: 2px; + overflow: hidden; + background: transparent url(../../panel/img/top-right-small.png) no-repeat right top; + content: url(../../panel/img/top-left-small.png); + margin: -1px -1px 0 -1px; +} +.i-table:after { + display: block; + height: 2px; + overflow: hidden; + background: transparent url(../../panel/img/bottom-right.png) no-repeat right top; + content: url(../../panel/img/bottom-left.png); + margin: 0 -1px -1px -1px; +} + +.i-table-header-wrap { + height: 26px; + background: #e7edf3 url(../img/header-bg.png) repeat-x; + border-bottom: 1px solid #6082b0; + margin-top: -1px; +} + +.i-table-header { +} + +.i-table-header table, +.i-table-table { + border-collapse: collapse; + margin: 0; + padding: 0; + border: 0; +} + +.i-table-header td, +.i-table-table td { + margin:0; + padding:0; + border:0; +} + +.i-table-header td { + cursor: pointer; +} + +.i-table-resizer { + display: block; + height: 26px; + float: right; + background: #aabdda url(../img/resizer-bg.png); + cursor: e-resize; +} + +.i-table-caption-container { + float: right; + overflow: hidden; + white-space: nowrap; + font-weight: bold; + color: #1c3e6e; + padding-top: 5px; +} + +/* disabled row in column selector */ +.i-off { + font-style: italic; +} + + + +.i-table-header-cell { +} +.i-table-header-cell-asc { + background: blue; +} +.i-table-header-cell-desc { + background: cyan; +} + +.i-table-body { + /*margin: 0 1px;*/ +} + +.i-table-row { + border: 0; + margin: 0; + padding: 3px 0 3px 0; + cursor: pointer; +} +.i-table-row:hover, +.i-table .i-odd:hover { + background-color: #d3dfee; +} +.i-table .i-odd { + background-color: #f1f5f9; +} +.i-table .i-selected { + background: #375f98 url(../img/selected-bg.png) repeat-x; + color: #fff; +} + +.i-table-row-spacer { + height: 10px; + overflow: hidden; /* IE hack to allow < one line height divs */ +} + +.i-table-cell-content { + white-space: nowrap; + overflow: hidden; + /*border-right: 1px solid #e4e8ef; + padding-left: 2px; + width: 98%;*/ +} + + + +.i-table-column-selector { + float: right; + background: transparent url(../img/colsel.png) no-repeat; + margin: 4px 0 0 0; + height:15px; + width:15px; +} + +.i-table-focus-slot-left { + border-left: 2px solid #375f98; + margin-right: -2px; +} +.i-table-focus-slot-right { + border-right: 2px solid #375f98; + margin-left: -2px; +} + +.i-table-header-drag { + position: absolute; + background: #e7edf3 url(../img/header-bg.png) repeat-x; + border: 1px solid #375f98; + padding: 4px; + color: #1c3e6e; + font-weight: bold; + opacity: 0.5; + filter: alpha(opacity=50); +} + +.i-table-scrollposition { + display: none; + position: absolute; + width: 150px; + padding: 4px; + border: 1px solid black; + background: yellow; +} + +/* IE specific styles */ +* html .i-table-header-wrap { + margin-top: 0; +} +*+html .i-table-header-wrap { + margin-top: 1px; +} \ No newline at end of file diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/tabsheet/css/tabsheet.css b/src/com/itmill/toolkit/terminal/gwt/public/default/tabsheet/css/tabsheet.css deleted file mode 100644 index 682817d4f6..0000000000 --- a/src/com/itmill/toolkit/terminal/gwt/public/default/tabsheet/css/tabsheet.css +++ /dev/null @@ -1,110 +0,0 @@ -.i-tabsheet { - -} - -.i-tabsheet-tabs { - empty-cells: hide; - border-collapse: collapse; -} - -.i-tabsheet-tabs .gwt-TabBarFirst { - display: none; -} - -.i-tabsheet-tabs .gwt-TabBarRest { - border-bottom: solid 1px #c1c6cc; -} - -.i-tabsheet-tabs .gwt-TabBarItem { - border: solid 1px #9cacb9; - border-bottom-color: #c1c6cc; - height: 18px; - padding: 4px 25px; - color: #2c3c49; - font-size: 12px; - background: #ecf0f4 url(../img/tab-bg.png) repeat-x; - margin-right: 1px; - cursor: pointer; -} - -.i-tabsheet-tabs .gwt-TabBarItem-selected { - border-color: #c1c6cc; - border-bottom-color: #fff; - background: #fff url(../img/tab-selected-bg.png) repeat-x; - padding-top: 7px; - padding-bottom: 5px; - margin-bottom: -1px; - cursor: default; -} - -.i-tabsheet-tabs .gwt-TabBarItem:hover { - color: #62788a; -} - -.i-tabsheet-tabs .gwt-TabBarItem-selected:hover { - color: #2c3c49; -} - -.i-tabsheet-tabs .gwt-TabBarItem:before { - display: block; - height: 2px; - overflow: hidden; - background: transparent url(../img/tab-right.png) no-repeat right top; - content: url(../img/tab-left.png); - margin: -5px -26px 3px -26px; -} - -.i-tabsheet-tabs .gwt-TabBarItem-selected:before { - height: 27px; - background-image: url(../img/tab-selected-right.png); - content: url(../img/tab-selected-left.png); - margin: -8px -26px -20px -26px; -} - -.i-tabsheet-content { - background-color: #fff; - border: solid 1px #c1c6cc; - border-top: none; - padding: 8px; -} - -.i-tabsheet-deco { - height: 9px; - background: transparent url(../../common/img/shadow.png) repeat-x left bottom; - margin: -2px 0 0 1px; - position: relative; -} - -.i-tabsheet-deco:before { - display: block; - height: 2px; - overflow: hidden; - background: transparent url(../../panel/img/bottom-right.png) no-repeat right top; - content: url(../../panel/img/bottom-left.png); -} - -/* Fix Safari bug (one pixel table offset) */ -.i-tabsheet-content { - margin-left: 1px; -} -.i-tabsheet-tabs .gwt-TabBarFirst { - display: block; - width: 1px; - height: 1px; - overflow: hidden; -} - - - - -/* IE specific styles */ -* html .i-tabsheet-deco { - position: static; - background: transparent; - margin-top: 0; - font-size: 1; - height: 7px; - overflow: hidden; - /* TODO change url when packaging is complete */ - filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../com.itmill.toolkit.terminal.gwt.Client/component-themes/common/img/shadow.png", sizingMethod="scale"); -} \ No newline at end of file diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/tabsheet/img/tab-bg.png b/src/com/itmill/toolkit/terminal/gwt/public/default/tabsheet/img/tab-bg.png index aef042a41e..a4235e9a83 100644 Binary files a/src/com/itmill/toolkit/terminal/gwt/public/default/tabsheet/img/tab-bg.png and b/src/com/itmill/toolkit/terminal/gwt/public/default/tabsheet/img/tab-bg.png differ diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/tabsheet/tabsheet.css b/src/com/itmill/toolkit/terminal/gwt/public/default/tabsheet/tabsheet.css new file mode 100644 index 0000000000..21ae68b2a1 --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/tabsheet/tabsheet.css @@ -0,0 +1,157 @@ +.i-tabsheet, +.i-tabsheet-content, +.i-tabsheet-deco { + outline: none; /* Prevent selection outline which might break layouts or cause scrollbars */ +} + + +.i-tabsheet-tabs { + empty-cells: hide; + border-collapse: collapse; + height: 48px; + background: transparent url(img/tabs-bg.png) repeat-x bottom left; +} + +.i-tabsheet-tabs .gwt-TabBarFirst { + display: none; +} + +.i-tabsheet-tabs .gwt-TabBarRest { + border: 1px solid #b6bbbc; + background: #f8f9f9 url(img/tab-bg.png); + height: 37px; +} + +.i-tabsheet-tabs .gwt-TabBarItem { + border: 1px solid #b6bbbc; + border-right: none; + height: 20px; + padding: 9px 15px 8px 15px; + margin-top: 9px; + color: #777f85; + font-size: 15px; + line-height: 15px; + background: #f8f9f9 url(img/tab-bg.png); + cursor: pointer; +} + +.i-tabsheet-tabs .gwt-TabBarItem-selected { + border: none; + background: transparent url(../panel/img/top-left.png) no-repeat; + margin-top: -9px; + padding-left: 16px; + height: 30px; + cursor: default; + color: #ee5311; +} + +.i-tabsheet-tabs .gwt-TabBarItem:hover { + color: #4b5257; +} + +.i-tabsheet-tabs .gwt-TabBarItem-selected:hover { + color: #ee5311; +} + +.i-tabsheet-tabs .gwt-TabBarItem-selected:before { + display: block; + height: 9px; + background: transparent url(../panel/img/top-right.png) repeat-x right top; + content: ""; + margin: -9px -16px 9px -6px; +} + +.i-tabsheet-content { + border: 1px solid #babfc0; + border-top: none; + border-bottom: none; + background-color: #fff; + overflow: auto; + padding: 15px 18px 6px 18px; +} + +.i-tabsheet-deco { + height: 9px; + background: transparent url(../panel/img/bottom-right.png) repeat-x right top; + margin-left: 9px; +} + +.i-tabsheet-deco:before { + display: block; + content: ""; + width: 9px; + height: 9px; + margin-left: -9px; + background: transparent url(../panel/img/bottom-left.png) no-repeat; +} + + + + +/* Fix Safari bug (one pixel table offset) by + adding one extra pixel in every browser */ +/* Actually, let Safari be a little different, it's a bug */ +/* +.i-tabsheet-content { + margin-left: 1px; +} +.i-tabsheet-tabs .gwt-TabBarFirst { + display: block; + width: 1px; + height: 1px; + overflow: hidden; +} +.i-tabsheet { + margin-left: -1px; +} +*/ + + + + + + + + +/* IE specific styles */ +* html .i-tabsheet-content { + border-bottom: 1px solid #babfc0; +} +*+html .i-tabsheet-content { + border-bottom: 1px solid #babfc0; +} + +* html .i-tabsheet-tabs { + height: 46px; +} +*+html .i-tabsheet-tabs { + height: 46px; +} + +* html .i-tabsheet-tabs .gwt-TabBarItem-selected { + border: 1px solid #babfc0; + border-bottom: none; + background: #fff; + margin-top: 0; + height: 23px; + padding: 18px 14px 6px 15px; + cursor: default; + color: #ee5311; +} +*+html .i-tabsheet-tabs .gwt-TabBarItem-selected { + border: 1px solid #babfc0; + border-bottom: none; + background: #fff; + margin-top: 0; + height: 23px; + padding: 18px 14px 6px 15px; + cursor: default; + color: #ee5311; +} + +* html .i-tabsheet-deco { + display: none; +} +*+html .i-tabsheet-deco { + display: none; +} \ No newline at end of file diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/textfield/css/textfield.css b/src/com/itmill/toolkit/terminal/gwt/public/default/textfield/css/textfield.css deleted file mode 100644 index da7bbf32d7..0000000000 --- a/src/com/itmill/toolkit/terminal/gwt/public/default/textfield/css/textfield.css +++ /dev/null @@ -1,28 +0,0 @@ -.i-textfield { - font-size: 1.1em; - color: #444; - background: #fff url(../img/bg.png) repeat-x; - padding: 2px; - border: 1px solid #b6b6b6; - border-top-color: #9d9d9d; - border-bottom-color: #d6d6d6; - border-right-color: #d6d6d6; - margin: 0; -} - -.i-textfield-focus { - color: #111; - border-color: #4376c3; - border-bottom-color: #6696dd; - border-right-color: #6696dd; -} - -.i-textfield-error { - background: #ff9999; -} - -.i-textfield.i-readonly { - background: transparent; - color: #222; - border: none; -} \ No newline at end of file diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/textfield/textfield.css b/src/com/itmill/toolkit/terminal/gwt/public/default/textfield/textfield.css new file mode 100644 index 0000000000..da7bbf32d7 --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/textfield/textfield.css @@ -0,0 +1,28 @@ +.i-textfield { + font-size: 1.1em; + color: #444; + background: #fff url(../img/bg.png) repeat-x; + padding: 2px; + border: 1px solid #b6b6b6; + border-top-color: #9d9d9d; + border-bottom-color: #d6d6d6; + border-right-color: #d6d6d6; + margin: 0; +} + +.i-textfield-focus { + color: #111; + border-color: #4376c3; + border-bottom-color: #6696dd; + border-right-color: #6696dd; +} + +.i-textfield-error { + background: #ff9999; +} + +.i-textfield.i-readonly { + background: transparent; + color: #222; + border: none; +} \ No newline at end of file diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/tree/css/tree.css b/src/com/itmill/toolkit/terminal/gwt/public/default/tree/css/tree.css deleted file mode 100644 index 60a220c67d..0000000000 --- a/src/com/itmill/toolkit/terminal/gwt/public/default/tree/css/tree.css +++ /dev/null @@ -1,6 +0,0 @@ -.i-tree-node-selected > table > tbody > tr > td > span.gwt-TreeItem { - background: #ff0; -} -span.gwt-TreeItem { - cursor: pointer; -} \ No newline at end of file diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/tree/tree.css b/src/com/itmill/toolkit/terminal/gwt/public/default/tree/tree.css new file mode 100644 index 0000000000..60a220c67d --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/tree/tree.css @@ -0,0 +1,6 @@ +.i-tree-node-selected > table > tbody > tr > td > span.gwt-TreeItem { + background: #ff0; +} +span.gwt-TreeItem { + cursor: pointer; +} \ No newline at end of file diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/window/css/window.css b/src/com/itmill/toolkit/terminal/gwt/public/default/window/css/window.css deleted file mode 100644 index a5cc9486b3..0000000000 --- a/src/com/itmill/toolkit/terminal/gwt/public/default/window/css/window.css +++ /dev/null @@ -1,42 +0,0 @@ -.i-window { - border: 1px solid #999; - /* mac FF fix for scrollbar see thru */ - position: absolute; -} -.i-window-header { - background: yellow; - height:20px; - overflow: hidden; -} - -.i-window-footer { - background: #0f0; - height:2px; -} - -.i-window-contents { - overflow:auto; - background: #fff; -} - -.i-window-resizebox { - position:absolute; - bottom:0; - right:0; - background: black; - width: 5px; - height: 5px; - float:right; - /* IE 6 hack */ - overflow: auto; -} - -.i-window-closebox { - position:absolute; - top:0; - right:0; - background: red; - width: 15px; - height: 15px; - float:right; -} diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/window/window.css b/src/com/itmill/toolkit/terminal/gwt/public/default/window/window.css new file mode 100644 index 0000000000..a5cc9486b3 --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/window/window.css @@ -0,0 +1,42 @@ +.i-window { + border: 1px solid #999; + /* mac FF fix for scrollbar see thru */ + position: absolute; +} +.i-window-header { + background: yellow; + height:20px; + overflow: hidden; +} + +.i-window-footer { + background: #0f0; + height:2px; +} + +.i-window-contents { + overflow:auto; + background: #fff; +} + +.i-window-resizebox { + position:absolute; + bottom:0; + right:0; + background: black; + width: 5px; + height: 5px; + float:right; + /* IE 6 hack */ + overflow: auto; +} + +.i-window-closebox { + position:absolute; + top:0; + right:0; + background: red; + width: 15px; + height: 15px; + float:right; +} diff --git a/src/com/itmill/toolkit/ui/TabSheet.java b/src/com/itmill/toolkit/ui/TabSheet.java index fac5ea5d4b..41409c1f83 100644 --- a/src/com/itmill/toolkit/ui/TabSheet.java +++ b/src/com/itmill/toolkit/ui/TabSheet.java @@ -73,11 +73,11 @@ public class TabSheet extends AbstractComponentContainer implements Sizeable { */ private boolean tabsHidden; - private int height; + private int height = -1; private int heightUnit; - private int width; + private int width = -1; private int widthUnit; @@ -204,13 +204,11 @@ public class TabSheet extends AbstractComponentContainer implements Sizeable { if (areTabsHidden()) target.addAttribute("hidetabs", true); - if(width > 0) { - target.addAttribute("width", width + UNIT_SYMBOLS[widthUnit]); - } else { - target.addAttribute("width", "100%"); + if(width > -1) { + target.addAttribute("width", getWidth() + UNIT_SYMBOLS[widthUnit]); } - if(height > 0) { - target.addAttribute("height", height + UNIT_SYMBOLS[widthUnit]); + if(height > -1) { + target.addAttribute("height", getHeight() + UNIT_SYMBOLS[heightUnit]); } target.startTag("tabs"); @@ -520,17 +518,21 @@ public class TabSheet extends AbstractComponentContainer implements Sizeable { public void setHeight(int height) { this.height = height; + requestRepaint(); } public void setHeightUnits(int units) { this.heightUnit = units; + requestRepaint(); } public void setWidth(int width) { this.width = width; + requestRepaint(); } public void setWidthUnits(int units) { this.widthUnit = units; + requestRepaint(); } }