diff options
Diffstat (limited to 'WebContent')
99 files changed, 826 insertions, 1431 deletions
diff --git a/WebContent/VAADIN/themes/base/absolutelayout/absolutelayout.css b/WebContent/VAADIN/themes/base/absolutelayout/absolutelayout.css index b2c2ed2858..fba94a8edc 100644 --- a/WebContent/VAADIN/themes/base/absolutelayout/absolutelayout.css +++ b/WebContent/VAADIN/themes/base/absolutelayout/absolutelayout.css @@ -1,4 +1,14 @@ .v-absolutelayout-wrapper { position: absolute; overflow: hidden; -}
\ No newline at end of file +} +.v-absolutelayout-margin, .v-absolutelayout-canvas { + box-sizing: border-box; + -moz-box-sizing: border-box; +} +.v-absolutelayout.v-has-height > div, .v-absolutelayout.v-has-height > div > div { + height: 100%; +} +.v-absolutelayout.v-has-width > div, .v-absolutelayout.v-has-width > div > div { + width: 100%; +} diff --git a/WebContent/VAADIN/themes/base/button/button.css b/WebContent/VAADIN/themes/base/button/button.css index 48d30d4576..2e14d59a90 100644 --- a/WebContent/VAADIN/themes/base/button/button.css +++ b/WebContent/VAADIN/themes/base/button/button.css @@ -29,14 +29,6 @@ cursor: default; } -.v-ie6 .v-button { - display: inline; -} - -.v-ie7 .v-button { - display: inline; -} - .v-button-wrap, .v-button-caption { vertical-align: middle; @@ -117,10 +109,7 @@ zoom: 1; float: none; } -/* Fixes streched buttons in IE6 and IE7*/ -.v-ie6 .v-nativebutton { - width: 1px; -} +/* Fixes stretched buttons in IE7*/ .v-ie .v-nativebutton { overflow: visible; padding-left: 1em; @@ -147,12 +136,6 @@ white-space: nowrap; } -/* Fix for IE6/IE7 issue where checkbox moves 1 pixel down after selection (#4636) */ -.v-ie6 .v-checkbox, -.v-ie7 .v-checkbox { - vertical-align: baseline; -} - .v-checkbox .v-icon { margin: 0 2px; } diff --git a/WebContent/VAADIN/themes/base/caption/caption.css b/WebContent/VAADIN/themes/base/caption/caption.css index bdeaae3de2..364b68a226 100644 --- a/WebContent/VAADIN/themes/base/caption/caption.css +++ b/WebContent/VAADIN/themes/base/caption/caption.css @@ -6,40 +6,18 @@ white-space: nowrap; } .v-errorindicator { - float: left; + display: inline-block; } .v-caption .v-icon { - float: left; + display: inline-block; padding-right: 2px; vertical-align: middle; } .v-caption .v-captiontext { - float: left; + display: inline-block; overflow: hidden; vertical-align: middle; } .v-caption .v-required-field-indicator { - float: left; + display: inline-block; } - -.v-caption-clearelem { - clear: both; - width: 0; - height: 0; - overflow: hidden; -} - -/* Fix IE6 "double-float-margin-bug" */ -.v-ie6 .v-errorindicator, -.v-ie6 .v-icon, -.v-ie6 .v-captiontext, -.v-ie6 .v-required-field-indicator { - display: inline; -} - -.v-ie9 .v-gridlayout-margin>div>div>.v-caption, -.v-ie9 .v-verticallayout>div>div>.v-caption, -.v-ie9 .v-horizontallayout>div>div>.v-caption { - /* Fix possible sub pixel rounding errors that cause error indicators to drop */ - margin-right:-0.5px; -}
\ No newline at end of file diff --git a/WebContent/VAADIN/themes/base/common/common.css b/WebContent/VAADIN/themes/base/common/common.css index 27bc57dd00..6de2b26267 100644 --- a/WebContent/VAADIN/themes/base/common/common.css +++ b/WebContent/VAADIN/themes/base/common/common.css @@ -32,9 +32,12 @@ div.v-app-loading { overflow: auto; /* avoid scrollbars with margins in root layout */ outline: none; + position: relative; +} +/* Prevent margin collapse */ +.v-view.v-view-embedded { margin-top: -1px; border-top: 1px solid transparent; - position: relative; } /** * Try to handle printing somehow. Reasonable printing support @@ -90,7 +93,14 @@ div.v-app-loading { border: none; padding: 0; margin: 0; + height: 100%; +} +.v-form-content { + height: 100%; + box-sizing: border-box; + -moz-box-sizing: border-box; } + /* Field modified */ /* Disabled by default .v-modified, .v-richtextarea.v-modified iframe.gwt-RichTextArea, @@ -229,4 +239,8 @@ div.v-app-loading { opacity: 0.5; filter: alpha(opacity=50); cursor: default; +} + +.v-clip { + overflow: hidden; }
\ No newline at end of file diff --git a/WebContent/VAADIN/themes/base/csslayout/csslayout.css b/WebContent/VAADIN/themes/base/csslayout/csslayout.css index 1f85d6f460..1a4cb10a77 100644 --- a/WebContent/VAADIN/themes/base/csslayout/csslayout.css +++ b/WebContent/VAADIN/themes/base/csslayout/csslayout.css @@ -1,6 +1,18 @@ .v-csslayout { overflow: hidden; } +.v-csslayout-margin, .v-csslayout-container { + box-sizing: border-box; + -moz-box-sizing: border-box; +} +.v-has-width > .v-csslayout-margin, +.v-has-width > .v-csslayout-margin > .v-csslayout-container { + width: 100%; +} +.v-has-height > .v-csslayout-margin, +.v-has-height > .v-csslayout-margin > .v-csslayout-container { + height: 100%; +} .v-csslayout-margin-top { padding-top: 12px; } diff --git a/WebContent/VAADIN/themes/base/datefield/datefield.css b/WebContent/VAADIN/themes/base/datefield/datefield.css index 8e2e9aeb2b..7af440c735 100644 --- a/WebContent/VAADIN/themes/base/datefield/datefield.css +++ b/WebContent/VAADIN/themes/base/datefield/datefield.css @@ -64,16 +64,6 @@ color: #666; } -.v-ie6 .v-datefield-calendarpanel-day, -.v-ie7 .v-datefield-calendarpanel-day { - margin: 1px; -} -.v-ie6 .v-datefield-calendarpanel-day-focused, -.v-ie7 .v-datefield-calendarpanel-day-focused { - border: 1px dotted black; - margin: 0px; -} - .v-datefield-time { white-space: nowrap; } @@ -97,10 +87,3 @@ background-color: #ffe0e0; } */ -/* IE somehow loses generic v-disabled alpha. See #1960 */ -.v-ie6 .v-disabled .v-datefield-button, -.v-ie6 .v-disabled .v-datefield-textfield, -.v-ie7 .v-disabled .v-datefield-button, -.v-ie7 .v-disabled .v-datefield-textfield { - filter: alpha(opacity=30); -}
\ No newline at end of file diff --git a/WebContent/VAADIN/themes/base/formlayout/formlayout.css b/WebContent/VAADIN/themes/base/formlayout/formlayout.css index 9566ff1663..755a59bc89 100644 --- a/WebContent/VAADIN/themes/base/formlayout/formlayout.css +++ b/WebContent/VAADIN/themes/base/formlayout/formlayout.css @@ -1,3 +1,9 @@ +.v-formlayout.v-has-width > table { + width: 100%; +} +.v-formlayout.v-has-height > table { + height: 100%; +} .v-formlayout-cell .v-errorindicator { display: block; } @@ -9,6 +15,9 @@ text-align:right; white-space: nowrap; } +.v-formlayout-errorcell, .v-formlayout-captioncell { + width: 1px; /* Don't use any extra space */ +} .v-formlayout-captioncell .v-caption { overflow: visible; } diff --git a/WebContent/VAADIN/themes/base/gridlayout/gridlayout.css b/WebContent/VAADIN/themes/base/gridlayout/gridlayout.css index 87cdcfd361..9edaf152a0 100644 --- a/WebContent/VAADIN/themes/base/gridlayout/gridlayout.css +++ b/WebContent/VAADIN/themes/base/gridlayout/gridlayout.css @@ -1,3 +1,9 @@ +.v-gridlayout { + position: relative; +} +.v-gridlayout-slot { + position: absolute; +} .v-gridlayout-margin-top { padding-top: 12px; } @@ -23,8 +29,3 @@ .v-gridlayout-spacing-off { overflow: hidden; } -/* Ensure that resizing gridlayout works in IE */ -.v-ie6 .v-gridlayout, -.v-ie7 .v-gridlayout { - overflow: hidden; -}
\ No newline at end of file diff --git a/WebContent/VAADIN/themes/base/orderedlayout/orderedlayout.css b/WebContent/VAADIN/themes/base/orderedlayout/orderedlayout.css index 9f91669385..727ca92f72 100644 --- a/WebContent/VAADIN/themes/base/orderedlayout/orderedlayout.css +++ b/WebContent/VAADIN/themes/base/orderedlayout/orderedlayout.css @@ -1,3 +1,9 @@ +.v-orderedlayout, +.v-horizontallayout, +.v-verticallayout { + position: relative; +} + .v-orderedlayout-margin-top, .v-horizontallayout-margin-top, .v-verticallayout-margin-top { @@ -31,12 +37,7 @@ padding-top: 0; padding-left: 0; } -/* To make sure IE don't expand elements larger than they should */ -.v-ie6 .v-orderedlayout, -.v-ie6 .v-horizontallayout, -.v-ie6 .v-verticallayout, -.v-ie7 .v-orderedlayout, -.v-ie7 .v-horizontallayout, -.v-ie7 .v-verticallayout { - overflow: hidden; + +.v-horizontallayout-slot, .v-verticallayout-slot { + position: absolute; } diff --git a/WebContent/VAADIN/themes/base/paintable/paintable.css b/WebContent/VAADIN/themes/base/paintable/paintable.css new file mode 100644 index 0000000000..1de0b70c38 --- /dev/null +++ b/WebContent/VAADIN/themes/base/paintable/paintable.css @@ -0,0 +1,4 @@ +.v-paintable { + box-sizing: border-box; + -moz-box-sizing: border-box; +}
\ No newline at end of file diff --git a/WebContent/VAADIN/themes/base/panel/panel.css b/WebContent/VAADIN/themes/base/panel/panel.css index 126d3da91c..5ef0d91e49 100644 --- a/WebContent/VAADIN/themes/base/panel/panel.css +++ b/WebContent/VAADIN/themes/base/panel/panel.css @@ -30,6 +30,8 @@ } .v-panel-content { overflow: auto; + box-sizing: border-box; + -moz-box-sizing: border-box; } .v-panel-deco { }
\ No newline at end of file diff --git a/WebContent/VAADIN/themes/base/progressindicator/progressindicator.css b/WebContent/VAADIN/themes/base/progressindicator/progressindicator.css index a9a90c4b06..4037802cf2 100644 --- a/WebContent/VAADIN/themes/base/progressindicator/progressindicator.css +++ b/WebContent/VAADIN/themes/base/progressindicator/progressindicator.css @@ -1,21 +1,17 @@ .v-progressindicator { - overflow: hidden; /* for IE6 */ width: 150px; } .v-progressindicator-wrapper { - overflow: hidden; /* for IE6 */ height: 7px; border: 1px solid #ddd; } .v-progressindicator-indicator { height: 7px; - overflow: hidden; /* for IE6 */ background: #ddd; } div.v-progressindicator-indeterminate { height: 20px; width: 20px; - overflow: hidden; /* for IE6 */ background: #fff url(../common/img/ajax-loader-medium.gif) no-repeat 50%; border-radius: 4px; -webkit-border-radius: 4px; @@ -31,6 +27,5 @@ div.v-progressindicator-indeterminate { div.v-progressindicator-indeterminate-disabled { height: 20px; width: 20px; - overflow: hidden; /* for IE6 */ background: transparent; }
\ No newline at end of file diff --git a/WebContent/VAADIN/themes/base/select/select.css b/WebContent/VAADIN/themes/base/select/select.css index 4487bc6a4e..fe50b98ce6 100644 --- a/WebContent/VAADIN/themes/base/select/select.css +++ b/WebContent/VAADIN/themes/base/select/select.css @@ -56,6 +56,7 @@ .v-filterselect { white-space: nowrap; text-align: left; + display: inline-block; } .v-filterselect .v-icon { float: left; @@ -63,15 +64,18 @@ .v-app .v-filterselect-input, .v-window .v-filterselect-input, .v-popupview-popup .v-filterselect-input { + margin: 0; float: left; -webkit-border-radius: 0px; + box-sizing: border-box; + -moz-box-sizing: border-box; } .v-filterselect-prompt .v-filterselect-input { color: #999; font-style: italic; } .v-filterselect-button { - float: right; + display: inline-block; cursor: pointer; width: 1em; height: 1em; diff --git a/WebContent/VAADIN/themes/base/shadow/shadow.css b/WebContent/VAADIN/themes/base/shadow/shadow.css index 209dd0e235..c576a026bd 100644 --- a/WebContent/VAADIN/themes/base/shadow/shadow.css +++ b/WebContent/VAADIN/themes/base/shadow/shadow.css @@ -66,20 +66,3 @@ width: 10px; height: 10px; background: transparent url(img/bottom-right.png); } - - - - - -/* For IE6 (no transparent png's, we use a blur filter) */ - -.v-ie6 .v-shadow * { - display: none; -} - -.v-ie6 .v-shadow { - background: #000; - filter: progid:DXImageTransform.Microsoft.Blur(pixelRadius=2) alpha(opacity=20); - margin-top: -2px; - margin-left: -2px; -}
\ No newline at end of file diff --git a/WebContent/VAADIN/themes/base/slider/slider.css b/WebContent/VAADIN/themes/base/slider/slider.css index 5ee6cbf31c..1be474f04e 100644 --- a/WebContent/VAADIN/themes/base/slider/slider.css +++ b/WebContent/VAADIN/themes/base/slider/slider.css @@ -63,15 +63,3 @@ background: #FFE0E0; } */ - -/* IE specific styles */ -.v-ie6 .v-slider, -.v-ie6 .v-slider-vertical { - margin: 0; -} -.v-ie6 .v-slider .v-slider-handle { - margin: -1px 0; -} -.v-ie6 .v-slider-vertical .v-slider-handle { - margin: 0 -1px; -}
\ No newline at end of file diff --git a/WebContent/VAADIN/themes/base/splitpanel/splitpanel.css b/WebContent/VAADIN/themes/base/splitpanel/splitpanel.css index 80a2133b23..7831a8d9ce 100644 --- a/WebContent/VAADIN/themes/base/splitpanel/splitpanel.css +++ b/WebContent/VAADIN/themes/base/splitpanel/splitpanel.css @@ -4,11 +4,9 @@ } .v-splitpanel-hsplitter { width: 6px; - font-size: 1px; /* for IE6 */ } .v-splitpanel-hsplitter div { width: 6px; - font-size: 1px; /* for IE6 */ position: absolute; top: 0; bottom: 0; @@ -21,11 +19,9 @@ } .v-splitpanel-vsplitter { height: 6px; - font-size: 1px; /* for IE6 */ } .v-splitpanel-vsplitter div { height: 6px; - font-size: 1px; /* for IE6 */ background: #ddd; cursor: s-resize; cursor: row-resize; @@ -33,13 +29,3 @@ .v-disabled .v-splitpanel-vsplitter div { cursor: default; } -/* IE specific styles */ -.v-ie6 .v-splitpanel-hsplitter div { - height: 99%; -} -.v-ie6 .v-splitpanel-first-container, -.v-ie6 .v-splitpanel-second-container, -.v-ie7 .v-splitpanel-first-container, -.v-ie7 .v-splitpanel-second-container { - position: relative; -}
\ No newline at end of file diff --git a/WebContent/VAADIN/themes/base/table/table.css b/WebContent/VAADIN/themes/base/table/table.css index 2c1e3d9593..653063ccb5 100644 --- a/WebContent/VAADIN/themes/base/table/table.css +++ b/WebContent/VAADIN/themes/base/table/table.css @@ -26,9 +26,6 @@ overflow: hidden; text-align: left; /* Force default alignment */ } -.v-ie7 .v-table { - overflow: visible; -} .v-table-header-wrap { overflow: hidden; border: 1px solid #aaa; @@ -102,10 +99,6 @@ white-space: nowrap; margin-left: 6px; } -.v-ie7 .v-table-caption-container-align-right { - margin-left: 0px; - padding-left: 6px; -} .v-table-caption-container-align-right { float: right; } @@ -193,10 +186,6 @@ .v-table.v-disabled .v-table-column-selector { cursor: default; } -.v-ie6 .v-table-column-selector, -.v-ie7 .v-table-column-selector { - position: static; -} .v-table-focus-slot-left { border-left: 2px solid #999; float: none; diff --git a/WebContent/VAADIN/themes/base/tabsheet/tabsheet.css b/WebContent/VAADIN/themes/base/tabsheet/tabsheet.css index 7288d32d89..d369cd99f0 100644 --- a/WebContent/VAADIN/themes/base/tabsheet/tabsheet.css +++ b/WebContent/VAADIN/themes/base/tabsheet/tabsheet.css @@ -39,9 +39,6 @@ text-align: right; margin-top: -1em; } -.v-ff2 .v-tabsheet-scroller { - position: relative; -} .v-disabled .v-tabsheet-scroller { display: none; } @@ -84,13 +81,9 @@ cursor: default; visibility: hidden; } -.v-tabsheet-tabitem:hover .v-tabsheet-caption-close, -.v-ie6 .v-tabsheet-caption-close { +.v-tabsheet-tabitem:hover .v-tabsheet-caption-close { visibility: visible; } -.v-ie6 .v-tabsheet-caption-close { - float: right; -} .v-tabsheet-tabitem { border: 1px solid #aaa; border-right: none; @@ -118,10 +111,6 @@ border-bottom: none; position: relative; } -.v-ie6 .v-tabsheet-content, -.v-ie7 .v-tabsheet-content { - zoom: 1; -} .v-tabsheet-deco { height: 1px; background: #aaa; diff --git a/WebContent/VAADIN/themes/base/tree/img/connector-collapse-ie6.png b/WebContent/VAADIN/themes/base/tree/img/connector-collapse-ie6.png Binary files differdeleted file mode 100644 index f0e5953235..0000000000 --- a/WebContent/VAADIN/themes/base/tree/img/connector-collapse-ie6.png +++ /dev/null diff --git a/WebContent/VAADIN/themes/base/tree/img/connector-collapse-last-ie6.png b/WebContent/VAADIN/themes/base/tree/img/connector-collapse-last-ie6.png Binary files differdeleted file mode 100644 index 0d2fd54885..0000000000 --- a/WebContent/VAADIN/themes/base/tree/img/connector-collapse-last-ie6.png +++ /dev/null diff --git a/WebContent/VAADIN/themes/base/tree/img/connector-expand-ie6.png b/WebContent/VAADIN/themes/base/tree/img/connector-expand-ie6.png Binary files differdeleted file mode 100644 index 1a7758fce5..0000000000 --- a/WebContent/VAADIN/themes/base/tree/img/connector-expand-ie6.png +++ /dev/null diff --git a/WebContent/VAADIN/themes/base/tree/img/connector-expand-last-ie6.png b/WebContent/VAADIN/themes/base/tree/img/connector-expand-last-ie6.png Binary files differdeleted file mode 100644 index db94fc0d8e..0000000000 --- a/WebContent/VAADIN/themes/base/tree/img/connector-expand-last-ie6.png +++ /dev/null diff --git a/WebContent/VAADIN/themes/base/tree/tree-connectors.css b/WebContent/VAADIN/themes/base/tree/tree-connectors.css index 6e7ce45391..c60e41c48b 100644 --- a/WebContent/VAADIN/themes/base/tree/tree-connectors.css +++ b/WebContent/VAADIN/themes/base/tree/tree-connectors.css @@ -33,17 +33,3 @@ .v-tree-connectors .v-tree-node-drag-top.v-tree-node-leaf { background-position: 2px 50%; } - -/* IE6 */ -.v-ie6 .v-tree-connectors .v-tree-node { - background: transparent url(img/connector-expand-ie6.png) no-repeat 2px -52px; -} -.v-ie6 .v-tree-connectors .v-tree-node-expanded { - background: transparent url(img/connector-collapse-ie6.png) no-repeat 2px -52px; -} -.v-ie6 .v-tree-connectors .v-tree-node-last { - background: transparent url(img/connector-expand-last-ie6.png) no-repeat 2px -52px; -} -.v-ie6 .v-tree-connectors .v-tree-node-last.v-tree-node-expanded { - background: transparent url(img/connector-collapse-last-ie6.png) no-repeat 2px -52px; -}
\ No newline at end of file diff --git a/WebContent/VAADIN/themes/base/tree/tree-default.css b/WebContent/VAADIN/themes/base/tree/tree-default.css index c486233ea8..23721c77ae 100644 --- a/WebContent/VAADIN/themes/base/tree/tree-default.css +++ b/WebContent/VAADIN/themes/base/tree/tree-default.css @@ -37,27 +37,6 @@ div.v-tree-node-leaf { .v-tree-node-children { padding-left: 1em; } -/* ie6compatnode is hidden from non ie6 browsers, for ie6 - * uses weird hack to sink all events properly - */ -.v-tree-node-ie6compatnode { - display: none; -} -/* IMPORTANT keep the offsetWidth of this element the same as the margin-left of v-tree-node-caption */ -.v-ie6 .v-tree-node-ie6compatnode { - display: inline; - float: left; - background: orange; - margin: 0; - width: 0.8em; - height: 0.8em; - padding: 0.1em; - filter: alpha(opacity=0); -} -.v-ie6 .v-tree-node, -.v-ie6 .v-tree-node-children { - clear: left; -} /*************************************** * Drag'n'drop styles ***************************************/ @@ -106,9 +85,6 @@ div.v-tree-node-leaf { margin: -2px 2px -2px -2px; background-color: #bcdcff; } -.v-ie6 .v-tree .v-tree-node-caption-drag-center div { - margin: -2px ; -} .v-tree .v-tree-node-caption-drag-center div { background-color: rgba(169,209,255,.6); } diff --git a/WebContent/VAADIN/themes/base/treetable/treetable.css b/WebContent/VAADIN/themes/base/treetable/treetable.css index 1bc21b890c..de505ba774 100644 --- a/WebContent/VAADIN/themes/base/treetable/treetable.css +++ b/WebContent/VAADIN/themes/base/treetable/treetable.css @@ -5,26 +5,15 @@ /* defines the amount of indent per level */ width: 18px; } -.v-ie7 .v-treetable-treespacer{ - height: 100%; /* #7388 */ -} .v-treetable-node-closed { background: url(../treetable/img/arrow-right.png) right center no-repeat; } -.v-ie6 .v-treetable-node-closed { - background-image: url(../treetable/img/arrow-right.gif); -} - .v-treetable-node-open { background: url(../treetable/img/arrow-down.png) right center no-repeat; } -.v-ie6 .v-treetable-node-open { - background-image: url(../treetable/img/arrow-down.gif); -} - .v-treetable .v-checkbox { display: inline-block; padding-bottom: 4px; diff --git a/WebContent/VAADIN/themes/base/upload/upload.css b/WebContent/VAADIN/themes/base/upload/upload.css index e6b58fb14e..adc5751d7c 100644 --- a/WebContent/VAADIN/themes/base/upload/upload.css +++ b/WebContent/VAADIN/themes/base/upload/upload.css @@ -2,10 +2,6 @@ white-space: nowrap; } -.v-ie6 .v-upload, -.v-ie7 .v-upload { - margin:0; -} .v-upload-immediate { position: relative; diff --git a/WebContent/VAADIN/themes/base/window/window.css b/WebContent/VAADIN/themes/base/window/window.css index 398238426e..f553f95fdf 100644 --- a/WebContent/VAADIN/themes/base/window/window.css +++ b/WebContent/VAADIN/themes/base/window/window.css @@ -1,16 +1,37 @@ .v-window { background: #fff; } +.v-window-contents { + box-sizing: border-box; + -moz-box-sizing: border-box; +} + +.v-window.v-has-width > div.popupContent, +.v-window.v-has-width .v-window-wrap, +.v-window.v-has-width .v-window-contents, +.v-window.v-has-width .v-window-contents > div { + width: 100%; +} + +.v-window.v-has-height > div.popupContent, +.v-window.v-has-height .v-window-wrap, +.v-window.v-has-height .v-window-contents, +.v-window.v-has-height .v-window-contents > div { + height: 100%; +} + .v-window-outerheader { padding: 0.3em 1em; - height: 1em; + height: 1.6em; + position: relative; + box-sizing: border-box; + -moz-box-sizing: border-box; } .v-window-outerheader, .v-window-draggingCurtain { cursor: move; } - .v-window-header { font-weight: bold; } @@ -22,21 +43,9 @@ div.v-window-header { overflow: hidden; padding: 0; } -.v-ie6 .v-window-header { - width: 100%; -} .v-window-header .v-icon { vertical-align: middle; /* This has to be 'middle', not 'bottom', to allow larger icons than 16px */ } -/* Partial fix for bug #1106 */ -/* Target Firefox 2 (somehow this will force almost all window borders on top of a Flash object) */ -.v-window-contents, x:-moz-any-link { - overflow: hidden; -} -/* Target Firefox 3 (it doesn't need any trickery, so revert the previous) */ -.v-window-contents, x:-moz-any-link, x:default { - overflow: visible; -} .v-window-contents > div { outline: none; } @@ -88,15 +97,6 @@ div.v-window-header { height: 100%; filter: alpha(opacity=50); } -/* IE6 workaround for position:fixed; */ -.v-ie6 .v-window-modalitycurtain { - position: absolute; - top: expression(document.documentElement.scrollTop + "px"); -} -/* min-width for IE6 */ -.v-ie6 .v-window { - width: 0; /* */ -} /* Shadow for window */ .v-shadow-window { position: absolute; @@ -158,13 +158,3 @@ div.v-window-header { width: 28px; height: 28px; background: transparent url(img/shadow/bottom-right.png); } -/* For IE6 (no transparent png's, we use a blur filter) */ -.v-ie6 .v-shadow-window * { - display: none; -} -.v-ie6 .v-shadow-window { - background: #000; - filter: progid:DXImageTransform.Microsoft.Blur(pixelRadius=5) alpha(opacity=20); - margin-top: 2px; - margin-left: 2px; -}
\ No newline at end of file diff --git a/WebContent/VAADIN/themes/chameleon/common/common.css b/WebContent/VAADIN/themes/chameleon/common/common.css index e1a5bdce7a..9d5a64b2ad 100644 --- a/WebContent/VAADIN/themes/chameleon/common/common.css +++ b/WebContent/VAADIN/themes/chameleon/common/common.css @@ -28,8 +28,7 @@ -moz-border-radius: 4px; } -.v-sa .v-tooltip, -.v-ff3 .v-tooltip { +.v-sa .v-tooltip { outline: 1px solid rgba(0,0,0,.2); -webkit-border-radius: 0; -moz-border-radius: 0; @@ -98,16 +97,6 @@ overflow: hidden; } -.v-ie6 .v-window, -.v-ie6 .v-popupview-popup, -.v-ie6 .v-filterselect-suggestpopup, -.v-ie6 .v-datefield-popup, -.v-ie6 .v-contextmenu, -.v-ie6 .v-Notification, -.v-ie6 .v-menubar-submenu { - background-image: none; - } - .v-filterselect-suggestpopup, .v-contextmenu, .v-menubar-submenu { diff --git a/WebContent/VAADIN/themes/chameleon/components/accordion/accordion.css b/WebContent/VAADIN/themes/chameleon/components/accordion/accordion.css index 6b0f69aaaa..8fb7254008 100644 --- a/WebContent/VAADIN/themes/chameleon/components/accordion/accordion.css +++ b/WebContent/VAADIN/themes/chameleon/components/accordion/accordion.css @@ -14,10 +14,6 @@ border-style: solid none; } -.v-ie6 .v-accordion-item-caption { - background-image: none; - } - div.v-accordion-item-caption, div.v-accordion-item-open .v-accordion-item-caption:active { background-color: transparent; diff --git a/WebContent/VAADIN/themes/chameleon/components/button/button.css b/WebContent/VAADIN/themes/chameleon/components/button/button.css index 0a9544b5ae..1dffddb4c2 100644 --- a/WebContent/VAADIN/themes/chameleon/components/button/button.css +++ b/WebContent/VAADIN/themes/chameleon/components/button/button.css @@ -1,5 +1,4 @@ .v-button:active, -.v-ie7 .v-pressed.v-button, .v-ie8 .v-pressed.v-button, div.v-button-down { background-image: url(../../img/grad-dark-bottom2.png); @@ -7,7 +6,6 @@ div.v-button-down { } .v-button:active .v-button-wrap, -.v-ie7 .v-pressed.v-button .v-button-wrap, .v-ie8 .v-pressed.v-button .v-button-wrap, .v-button-down .v-button-wrap { background-image: url(../../img/grad-dark-top2.png); @@ -22,10 +20,6 @@ div.v-button-down .v-button-wrap { background-image: url(../../img/grad-dark-top2.png); } -.v-ie6 div.v-button-down .v-button-wrap { - background-image: none; - } - .v-button { overflow: hidden; } @@ -66,16 +60,6 @@ div.v-button-down .v-button-wrap { overflow: hidden; } -body.v-ie6 .v-button { - background-image: none; - } - -body.v-ie6 .v-button .v-button-wrap { - background-image: none; - display: inline; - zoom: 1; - } - .v-button:focus { outline: none; } @@ -110,7 +94,6 @@ body.v-ie6 .v-button .v-button-wrap { } .v-button-small:active .v-button-wrap, -.v-ie7 .v-button-small.v-pressed .v-button-wrap, .v-ie8 .v-button-small.v-pressed .v-button-wrap, .v-button-down.small .v-button-wrap { padding: 2px 10px; @@ -131,7 +114,6 @@ body.v-ie6 .v-button .v-button-wrap { } .v-button-wide:active .v-button-wrap, -.v-ie7 .v-button-wide.v-pressed .v-button-wrap, .v-ie8 .v-button-wide.v-pressed .v-button-wrap { padding-left: 25px; padding-right: 25px; @@ -147,7 +129,6 @@ body.v-ie6 .v-button .v-button-wrap { } .v-button-tall:active .v-button-wrap, -.v-ie7 .v-button-tall.v-pressed .v-button-wrap, .v-ie8 .v-button-tall.v-pressed .v-button-wrap { padding-top: 12px; padding-bottom: 12px; @@ -263,22 +244,6 @@ body.v-ie .v-pressed.v-button-borderless .v-button-wrap { margin-right: -0.5em; } -.v-ie6 .v-button-icon-on-right, -.v-ie7 .v-button-icon-on-right { - position: relative; - } - -.v-ie6 .v-button-icon-on-right .v-button-caption, -.v-ie7 .v-button-icon-on-right .v-button-caption { - padding-right: 14px; - } - -.v-ie6 .v-button-icon-on-right .v-icon, -.v-ie7 .v-button-icon-on-right .v-icon { - position: absolute; - right: 0; - margin: 0; - } /******************************************************************************* * Icon-only @@ -289,4 +254,4 @@ body.v-ie .v-pressed.v-button-borderless .v-button-wrap { .v-button-icon-only .v-icon { margin-right: -.5em; - }
\ No newline at end of file + } diff --git a/WebContent/VAADIN/themes/chameleon/components/datefield/datefield.css b/WebContent/VAADIN/themes/chameleon/components/datefield/datefield.css index 71771ad6e1..3804ab52e0 100644 --- a/WebContent/VAADIN/themes/chameleon/components/datefield/datefield.css +++ b/WebContent/VAADIN/themes/chameleon/components/datefield/datefield.css @@ -23,25 +23,6 @@ height: 1.2em; } -.v-ie6 .v-datefield-button, -.v-ie7 .v-datefield-button { - height: 1.55em; - margin-top: 1px; - padding: 0; - } - -.v-ie7 .v-datefield-button { - height: 1.85em; - } - -.v-ie7 .v-datefield-small .v-datefield-button { - height: 1.75em; - } - -.v-ie7 .v-datefield-big .v-datefield-button { - height: 2em; - } - .v-ie8 .v-datefield-button { height: 1.6em; padding: 0; @@ -116,10 +97,6 @@ td.v-datefield-calendarpanel-month { text-shadow: 0 1px 0 rgba(255,255,255,.7); } -.v-ie6 td.v-datefield-calendarpanel-month { - background-image: none; - } - span.v-datefield-calendarpanel-month { display: block; text-align: center; @@ -172,10 +149,6 @@ td.v-datefield-calendarpanel-nextyear { background-position: 0 0; } -.v-ie6 .v-datefield-calendarpanel-header button { - background-image: none; - } - .v-datefield-calendarpanel-header button:active { background-image: url(../../img/grad-dark-top2.png); } @@ -239,10 +212,6 @@ td.v-datefield-calendarpanel-nextyear { margin-bottom: 2px; } -.v-ie6 .v-datefield-calendarpanel-weekdays strong { - background-image: none; - } - .v-datefield-calendarpanel .v-first strong { -webkit-border-bottom-left-radius: 3px; -moz-border-radius-bottomleft: 3px; @@ -293,10 +262,6 @@ td.v-datefield-calendarpanel-nextyear { border: 1px solid #c9c9c9; } -.v-ie6 .v-datefield-calendarpanel-day-today { - background-image: none; - } - .v-datefield-calendarpanel-day-selected, .v-datefield-calendarpanel-day-selected:hover { margin: 0 0 0 .3em; diff --git a/WebContent/VAADIN/themes/chameleon/components/menubar/menubar.css b/WebContent/VAADIN/themes/chameleon/components/menubar/menubar.css index 00b062f8d6..4f6be1b923 100644 --- a/WebContent/VAADIN/themes/chameleon/components/menubar/menubar.css +++ b/WebContent/VAADIN/themes/chameleon/components/menubar/menubar.css @@ -5,10 +5,6 @@ border-width: 1px 0; } -.v-ie6 .v-menubar { - background-image: none; - } - .v-menubar .v-menubar-menuitem { padding: .2em .5em; line-height: normal; @@ -26,7 +22,3 @@ background-image: url(../../img/grad-light-top2.png); background-position: 0 -1px; } - -.v-ie6 .v-menubar-submenu .v-menubar-menuitem-selected { - background-image: none; - }
\ No newline at end of file diff --git a/WebContent/VAADIN/themes/chameleon/components/notification/notification.css b/WebContent/VAADIN/themes/chameleon/components/notification/notification.css index 1e4268cf92..ee686912c5 100644 --- a/WebContent/VAADIN/themes/chameleon/components/notification/notification.css +++ b/WebContent/VAADIN/themes/chameleon/components/notification/notification.css @@ -47,10 +47,6 @@ div.v-Notification-tray { text-shadow: 0 1px 1px rgba(0,0,0,.5); } -.v-ie6 .v-Notification-tray { - background-image: none; - } - .v-Notification-tray h1 { font-size: 14px; line-height: 18px; diff --git a/WebContent/VAADIN/themes/chameleon/components/panel/panel.css b/WebContent/VAADIN/themes/chameleon/components/panel/panel.css index e83e245ce6..0e5dcb8a38 100644 --- a/WebContent/VAADIN/themes/chameleon/components/panel/panel.css +++ b/WebContent/VAADIN/themes/chameleon/components/panel/panel.css @@ -87,10 +87,6 @@ div.v-panel-content-light { padding: .3em .6em; } -.v-ie6 .v-panel-bubble .v-panel-caption-bubble { - background-image: none; - } - .v-panel-nocaption-bubble { padding: 0; margin: 0; diff --git a/WebContent/VAADIN/themes/chameleon/components/progressindicator/progressindicator.css b/WebContent/VAADIN/themes/chameleon/components/progressindicator/progressindicator.css index b13b627ed6..c080c0fc43 100644 --- a/WebContent/VAADIN/themes/chameleon/components/progressindicator/progressindicator.css +++ b/WebContent/VAADIN/themes/chameleon/components/progressindicator/progressindicator.css @@ -18,11 +18,6 @@ border: 1px solid #b3b3b3; } -.v-ie6 .v-progressindicator-wrapper, -.v-ie6 .v-progressindicator-indicator { - background-image: none; - } - /******************************************************************************* * Small diff --git a/WebContent/VAADIN/themes/chameleon/components/selects/selects.css b/WebContent/VAADIN/themes/chameleon/components/selects/selects.css index 170a4bb991..3c8496f0fe 100644 --- a/WebContent/VAADIN/themes/chameleon/components/selects/selects.css +++ b/WebContent/VAADIN/themes/chameleon/components/selects/selects.css @@ -84,13 +84,6 @@ body .v-filterselect-suggestpopup-big td { -ms-user-select: none; } -.v-ie6 .v-filterselect-prevpage-off, -.v-ie6 .v-filterselect-nextpage-off, -.v-ie6 .v-filterselect-prevpage, -.v-ie6 .v-filterselect-nextpage { - background-image: none; - } - .v-filterselect-prevpage:active, .v-filterselect-nextpage:active { background-image: (../../img/grad-dark-bottom2.png); @@ -126,10 +119,6 @@ body .v-filterselect-suggestpopup-big td { background-position: 0 -1px; } -.v-ie6 .v-filterselect-suggestmenu .gwt-menuItem-selected { - background-image: none; - } - .v-filterselect-suggestpopup-small .v-filterselect-status { font-size: .8em; } @@ -156,10 +145,6 @@ body .v-filterselect-suggestpopup-big td { padding: .3em .5em; } -.v-ie6 .v-filterselect-select-button { - background-image: none; - } - .v-filterselect-select-button .v-filterselect-input { display: block; width: 100% !important; @@ -176,10 +161,3 @@ body .v-filterselect-suggestpopup-big td { height: 100%; background-position: 100% -8px; } - -.v-ie6 .v-filterselect-select-button .v-filterselect-button { - float: none; - position: relative; - margin: -1.8em -.5em -.3em -.5em; - padding: .3em .5em; - }
\ No newline at end of file diff --git a/WebContent/VAADIN/themes/chameleon/components/slider/slider.css b/WebContent/VAADIN/themes/chameleon/components/slider/slider.css index c0fc271d3f..6a430723e2 100644 --- a/WebContent/VAADIN/themes/chameleon/components/slider/slider.css +++ b/WebContent/VAADIN/themes/chameleon/components/slider/slider.css @@ -42,10 +42,6 @@ border-width: 0 1px; } -.v-ie6 .v-slider-vertical { - width: 6px; - } - .v-slider-vertical .v-slider-base { background-image: none; width: 4px; @@ -58,8 +54,3 @@ margin: 0; margin-left: -5px; } - -.v-ie6 .v-slider-base, -.v-ie6 .v-slider-handle { - background-image: none; - }
\ No newline at end of file diff --git a/WebContent/VAADIN/themes/chameleon/components/splitpanel/splitpanel.css b/WebContent/VAADIN/themes/chameleon/components/splitpanel/splitpanel.css index bd407592cb..1cb04bc29b 100644 --- a/WebContent/VAADIN/themes/chameleon/components/splitpanel/splitpanel.css +++ b/WebContent/VAADIN/themes/chameleon/components/splitpanel/splitpanel.css @@ -5,11 +5,6 @@ width: 9px; } -.v-ie6 .v-splitpanel-hsplitter div, -.v-ie6 .v-splitpanel-vsplitter div { - background-image: url(../../img/split-handle-ie6.png); - } - .v-splitpanel-vsplitter div { background-position: 50% 2px; margin: -1px 0; @@ -35,13 +30,6 @@ background: #b3b3b3 url(../../img/grad-light-top.png) repeat-x; } -.v-ie6 .v-splitpanel-hsplitter, -.v-ie6 .v-splitpanel-hsplitter-locked, -.v-ie6 .v-splitpanel-vsplitter, -.v-ie6 .v-splitpanel-vsplitter-locked { - background-image: none; - } - /******************************************************************************* * Small ******************************************************************************/ @@ -61,11 +49,6 @@ body .v-splitpanel-vsplitter-small-locked { line-height: 1px; } -body.v-ie6 .v-splitpanel-vsplitter-small, -body.v-ie6 .v-splitpanel-vsplitter-small-locked { - overflow: hidden; - } - .v-splitpanel-hsplitter-small div { width: 7px; margin-left: -2px; @@ -78,8 +61,3 @@ body.v-ie6 .v-splitpanel-vsplitter-small-locked { background: transparent; overflow: hidden; } - -.v-ie6 .v-splitpanel-hsplitter-small div, -.v-ie6 .v-splitpanel-vsplitter-small div { - background-image: none; - }
\ No newline at end of file diff --git a/WebContent/VAADIN/themes/chameleon/components/table/table.css b/WebContent/VAADIN/themes/chameleon/components/table/table.css index 66ab6d6101..2bc52bc844 100644 --- a/WebContent/VAADIN/themes/chameleon/components/table/table.css +++ b/WebContent/VAADIN/themes/chameleon/components/table/table.css @@ -5,11 +5,6 @@ line-height: normal; } -.v-ie6 .v-table-header-wrap, -.v-ie6 .v-table-header-drag { - background-image: none; - } - .v-table-caption-container, .v-table-header-drag { padding-top: .2em; @@ -52,10 +47,6 @@ div.v-table-focus-slot-left { background-position: 0 -1px; } -.v-ie6 .v-table tr.v-selected { - background-image: none; - } - div.v-table-focus-slot-right { background: transparent; border-right: 2px solid #b3b3b3; diff --git a/WebContent/VAADIN/themes/chameleon/components/tabsheet/tabsheet.css b/WebContent/VAADIN/themes/chameleon/components/tabsheet/tabsheet.css index 4ca7359094..d1697c584a 100644 --- a/WebContent/VAADIN/themes/chameleon/components/tabsheet/tabsheet.css +++ b/WebContent/VAADIN/themes/chameleon/components/tabsheet/tabsheet.css @@ -36,10 +36,6 @@ -moz-border-radius-topright: 2px; } -.v-ie6 .v-tabsheet-tabitem-selected .v-caption { - background-image: none; - } - .v-tabsheet-content { background: #fff; border-color: #b3b3b3; @@ -62,10 +58,6 @@ margin: .2em 0 0 0; } -.v-ie6 .v-tabsheet-caption-close { - background-image: url(../../img/close-btn-ie6.png); - } - .v-tabsheet-caption-close:hover { background-position: .5em -25px; } @@ -89,10 +81,6 @@ -moz-border-radius: 6px; } -.v-ie6 .v-tabsheet-scroller { - background-image: none; - } - .v-tabsheet-scrollerPrev, .v-tabsheet-scrollerNext, .v-tabsheet-scrollerPrev-disabled, @@ -109,13 +97,6 @@ filter: alpha(opacity=50); } -.v-ie6 .v-tabsheet-scrollerPrev, -.v-ie6 .v-tabsheet-scrollerNext, -.v-ie6 .v-tabsheet-scrollerPrev-disabled, -.v-ie6 .v-tabsheet-scrollerNext-disabled{ - background-image: url(../../img/tab-arrows-ie6.png); - } - .v-tabsheet-scroller button::-moz-focus-inner { border: none; padding: 0; diff --git a/WebContent/VAADIN/themes/chameleon/components/textfield/textfield.css b/WebContent/VAADIN/themes/chameleon/components/textfield/textfield.css index 9c448eee00..a7601bb649 100644 --- a/WebContent/VAADIN/themes/chameleon/components/textfield/textfield.css +++ b/WebContent/VAADIN/themes/chameleon/components/textfield/textfield.css @@ -21,11 +21,15 @@ textarea.v-textarea, padding: .2em; } -input.v-textfield[type="text"], -.v-filterselect { +input.v-textfield[type="text"] { height: 1.2em; } +input.v-paintable.v-textfield[type="text"], +.v-filterselect { + height: 1.6em; + } + body input.v-textfield, body textarea.v-textarea, body input.v-filterselect-input { @@ -123,8 +127,3 @@ input.v-textfield-search[type=text], .v-filterselect-search { padding-left: 17px; } - -.v-ie6 input.v-textfield-search { - /* Compensate for big style as well, since IE6 doesn't handle the selector */ - padding-left: 21px; - }
\ No newline at end of file diff --git a/WebContent/VAADIN/themes/chameleon/components/window/window.css b/WebContent/VAADIN/themes/chameleon/components/window/window.css index 3034a58fbf..6ca8622a76 100644 --- a/WebContent/VAADIN/themes/chameleon/components/window/window.css +++ b/WebContent/VAADIN/themes/chameleon/components/window/window.css @@ -11,10 +11,6 @@ z-index: 2; } -.v-ie6 .v-window-closebox { - background-image: url(../../img/close-btn-ie6.png); - } - .v-window-closebox:hover { background-position: 0 -25px; } @@ -34,11 +30,6 @@ background-image: url(../../img/grad-light-top.png); background-repeat: repeat-x; } - -.v-ie6 .v-window-wrap { - background: transparent !important; - } - .v-window-outerheader { padding: .2em 1.7em .5em 1.2em; height: auto; diff --git a/WebContent/VAADIN/themes/chameleon/compound/sidebar-menu/sidebar-menu.css b/WebContent/VAADIN/themes/chameleon/compound/sidebar-menu/sidebar-menu.css index 83b736584f..e2ab7f2080 100644 --- a/WebContent/VAADIN/themes/chameleon/compound/sidebar-menu/sidebar-menu.css +++ b/WebContent/VAADIN/themes/chameleon/compound/sidebar-menu/sidebar-menu.css @@ -33,11 +33,6 @@ color: #fff; } -.v-ie6 .sidebar-menu .tab-selected, -.v-ie6 .sidebar-menu .selected { - background-image: none; - } - .sidebar-menu .tab-selected:focus, .sidebar-menu .selected:focus { outline: none; diff --git a/WebContent/VAADIN/themes/chameleon/compound/toolbar/toolbar.css b/WebContent/VAADIN/themes/chameleon/compound/toolbar/toolbar.css index 594fc245a6..468172037e 100644 --- a/WebContent/VAADIN/themes/chameleon/compound/toolbar/toolbar.css +++ b/WebContent/VAADIN/themes/chameleon/compound/toolbar/toolbar.css @@ -4,10 +4,6 @@ border-width: 1px 0; } -.v-ie6 .v-csslayout-toolbar { - background-image: none; - } - .v-csslayout-toolbar .v-csslayout-margin { margin: 3px .3em 2px; padding-bottom: 1px; diff --git a/WebContent/VAADIN/themes/chameleon/img/close-btn-ie6.png b/WebContent/VAADIN/themes/chameleon/img/close-btn-ie6.png Binary files differdeleted file mode 100644 index 334b03769a..0000000000 --- a/WebContent/VAADIN/themes/chameleon/img/close-btn-ie6.png +++ /dev/null diff --git a/WebContent/VAADIN/themes/chameleon/img/date-btn-ie6.png b/WebContent/VAADIN/themes/chameleon/img/date-btn-ie6.png Binary files differdeleted file mode 100644 index d22411b260..0000000000 --- a/WebContent/VAADIN/themes/chameleon/img/date-btn-ie6.png +++ /dev/null diff --git a/WebContent/VAADIN/themes/chameleon/img/split-handle-ie6.png b/WebContent/VAADIN/themes/chameleon/img/split-handle-ie6.png Binary files differdeleted file mode 100644 index 2e23c10d90..0000000000 --- a/WebContent/VAADIN/themes/chameleon/img/split-handle-ie6.png +++ /dev/null diff --git a/WebContent/VAADIN/themes/chameleon/img/tab-arrows-ie6.png b/WebContent/VAADIN/themes/chameleon/img/tab-arrows-ie6.png Binary files differdeleted file mode 100644 index 963cf2e1a0..0000000000 --- a/WebContent/VAADIN/themes/chameleon/img/tab-arrows-ie6.png +++ /dev/null diff --git a/WebContent/VAADIN/themes/liferay/button/button.css b/WebContent/VAADIN/themes/liferay/button/button.css index 8181a041a0..bd0f307947 100644 --- a/WebContent/VAADIN/themes/liferay/button/button.css +++ b/WebContent/VAADIN/themes/liferay/button/button.css @@ -50,11 +50,6 @@ line-height: 16px; } -.v-ie6 .v-button .v-button-wrap { - display: inline; - zoom: 1; -} - /* Link style button */ .v-button-link, .v-disabled.v-button-link, diff --git a/WebContent/VAADIN/themes/liferay/common/common.css b/WebContent/VAADIN/themes/liferay/common/common.css index 26a0354ff3..521c4f3ac1 100644 --- a/WebContent/VAADIN/themes/liferay/common/common.css +++ b/WebContent/VAADIN/themes/liferay/common/common.css @@ -33,7 +33,3 @@ div.v-app { font-weight: bold; margin: 1px 0 4px 0; } - -.v-ie6 .v-view { - border-top: none; -}
\ No newline at end of file diff --git a/WebContent/VAADIN/themes/liferay/datefield/datefield.css b/WebContent/VAADIN/themes/liferay/datefield/datefield.css index 4307658449..6040052798 100644 --- a/WebContent/VAADIN/themes/liferay/datefield/datefield.css +++ b/WebContent/VAADIN/themes/liferay/datefield/datefield.css @@ -116,13 +116,6 @@ span.v-datefield-calendarpanel-month { min-width: 22px; } -.v-ie6 .v-datefield-calendarpanel-prevyear button, -.v-ie6 .v-datefield-calendarpanel-nextyear button, -.v-ie7 .v-datefield-calendarpanel-prevyear button, -.v-ie7 .v-datefield-calendarpanel-nextyear button { - width: 22px; -} - .v-datefield-calendarpanel-day { display: block; width: 22px; diff --git a/WebContent/VAADIN/themes/liferay/select/select.css b/WebContent/VAADIN/themes/liferay/select/select.css index 48e35f9baa..66672cc573 100644 --- a/WebContent/VAADIN/themes/liferay/select/select.css +++ b/WebContent/VAADIN/themes/liferay/select/select.css @@ -7,10 +7,6 @@ select { background-color: #fff; } -.v-ie6 select { - font-size: 1em; -} - .v-filterselect-button { width: 24px; height: 24px; diff --git a/WebContent/VAADIN/themes/liferay/tabsheet/close-ie6.png b/WebContent/VAADIN/themes/liferay/tabsheet/close-ie6.png Binary files differdeleted file mode 100644 index fcbbedb6d4..0000000000 --- a/WebContent/VAADIN/themes/liferay/tabsheet/close-ie6.png +++ /dev/null diff --git a/WebContent/VAADIN/themes/liferay/tabsheet/tabsheet.css b/WebContent/VAADIN/themes/liferay/tabsheet/tabsheet.css index 4d5c21d7af..7f23edb809 100644 --- a/WebContent/VAADIN/themes/liferay/tabsheet/tabsheet.css +++ b/WebContent/VAADIN/themes/liferay/tabsheet/tabsheet.css @@ -132,7 +132,6 @@ .v-tabsheet-caption-close { background: transparent url(close.png) no-repeat right top; - -background-image: url(close-ie6.png); cursor: default; float: right; margin: 3px -1px 0; diff --git a/WebContent/VAADIN/themes/liferay/tree/arrows_sprites-ie6.png b/WebContent/VAADIN/themes/liferay/tree/arrows_sprites-ie6.png Binary files differdeleted file mode 100644 index c9a0bbd388..0000000000 --- a/WebContent/VAADIN/themes/liferay/tree/arrows_sprites-ie6.png +++ /dev/null diff --git a/WebContent/VAADIN/themes/liferay/tree/tree.css b/WebContent/VAADIN/themes/liferay/tree/tree.css index 23fe10f52e..33da398736 100644 --- a/WebContent/VAADIN/themes/liferay/tree/tree.css +++ b/WebContent/VAADIN/themes/liferay/tree/tree.css @@ -1,6 +1,5 @@ .v-tree-node { background: transparent url(arrows_sprites.png) no-repeat -42px 1px; - -background: transparent url(arrows_sprites-ie6.png) no-repeat -42px 1px; } .v-tree-node span { diff --git a/WebContent/VAADIN/themes/liferay/window/window.css b/WebContent/VAADIN/themes/liferay/window/window.css index 6b61d880f1..5ac7c02175 100644 --- a/WebContent/VAADIN/themes/liferay/window/window.css +++ b/WebContent/VAADIN/themes/liferay/window/window.css @@ -10,21 +10,6 @@ background: #fff url(top-left.png) no-repeat; } -.v-ie6 .v-window-wrap, -.v-ie7 .v-window-wrap { - background-position: 1px 1px; -} - -.v-ie6 .v-window-wrap { - border-bottom: none; -} - -.v-ie6 .v-window-footer { - border-bottom: 1px solid #c8c9ca; - margin-top: -1px; - padding-top: 1px; -} - .v-window-outerheader { height: 16px; margin-left: 9px; diff --git a/WebContent/VAADIN/themes/reindeer-tests/styles.css b/WebContent/VAADIN/themes/reindeer-tests/styles.css index 243d1b87d4..7da9e50a46 100644 --- a/WebContent/VAADIN/themes/reindeer-tests/styles.css +++ b/WebContent/VAADIN/themes/reindeer-tests/styles.css @@ -20,6 +20,11 @@ display: none; } +.v-disabled.v-datefield-enabled-readonly-styled, +.v-readonly.v-datefield-enabled-readonly-styled { + padding-right: 0; +} + .popup-style .v-datefield-calendarpanel-header, .v-datefield-popup-popup-style .v-datefield-calendarpanel-time { background: red; diff --git a/WebContent/VAADIN/themes/reindeer/button/button-firefox.css b/WebContent/VAADIN/themes/reindeer/button/button-firefox.css deleted file mode 100644 index 4e8a1f58c9..0000000000 --- a/WebContent/VAADIN/themes/reindeer/button/button-firefox.css +++ /dev/null @@ -1,5 +0,0 @@ -.v-ff2 .v-button .v-button-caption { - display: -moz-inline-box; - padding-top: 6px; - height: 20px; - }
\ No newline at end of file diff --git a/WebContent/VAADIN/themes/reindeer/button/button-ie.css b/WebContent/VAADIN/themes/reindeer/button/button-ie.css index aaac6bf0b6..47d9496e81 100644 --- a/WebContent/VAADIN/themes/reindeer/button/button-ie.css +++ b/WebContent/VAADIN/themes/reindeer/button/button-ie.css @@ -1,75 +1,4 @@ -.v-ie6 .v-nativebutton-link, -.v-ie7 .v-nativebutton-link, .v-ie8 .v-nativebutton-link { padding: 0; text-align: left; } - -/** - * IE6 buttons -------------------------- - */ -.v-ie6 .v-button { - border: 1px solid #b3b3b3; - border-bottom-color: #9a9a9a; - background: #d8d8d8 url(img/right.png) no-repeat 0 -1px; - padding: 0 15px; - height: 23px; -} -.v-ie6 .v-button .v-button-wrap { - background: transparent; - height: 20px; - padding: 3px 0 0; - display: inline; - zoom: 1; -} -.v-ie6 .v-button-primary { - background-image: url(img/primary-right.png); -} -.v-ie6 .v-button-small { - background-image: url(img/small-right.png); - height: 17px; -} -.v-ie6 .v-button-small .v-button-wrap { - height: 17px; - padding: 0; -} -.v-ie6 .v-button.v-pressed { - background: transparent url(img/right-pressed.png) no-repeat 0 -1px; -} -/* Buttons on blue background */ -.v-ie6 .blue .v-button { - border-color: #84949c; - border-top-color: #83939b; - border-bottom-color: #888d91; -} -/* Buttons on black background */ -.v-ie6 .black .v-button { - border: 1px solid #0d0e0f; - background: #202224 url(img/black/right.png) no-repeat 0 -1px; - color: #c9ccce; -} -.v-ie6 .black .v-button-primary { - background-image: url(img/black/primary-right.png); -} -.v-ie6 .black .v-button-small { - background-image: url(img/black/small-right.png); -} -.v-ie6 .black .v-button.v-pressed { - background-image: url(img/black/right-pressed.png); -} - - -/* Link style button */ -.v-ie6 .v-button-link, -.v-ie6 .black .v-button-link { - background: transparent; - border: none; - height: auto; - line-height: normal; - padding: 0; -} -.v-ie6 .v-button-link .v-button-wrap, -.v-ie6 .black .v-button-link .v-button-wrap { - padding: 0; - height: auto; -}
\ No newline at end of file diff --git a/WebContent/VAADIN/themes/reindeer/button/button.css b/WebContent/VAADIN/themes/reindeer/button/button.css index 14da4facc5..1948e5aafb 100644 --- a/WebContent/VAADIN/themes/reindeer/button/button.css +++ b/WebContent/VAADIN/themes/reindeer/button/button.css @@ -7,5 +7,4 @@ @import "button-link-style.css"; /* Browser-specific corrections to the standard implementation */ -@import "button-firefox.css"; @import "button-ie.css";
\ No newline at end of file diff --git a/WebContent/VAADIN/themes/reindeer/common/common.css b/WebContent/VAADIN/themes/reindeer/common/common.css index 50dcdd84ab..ff8ae47036 100644 --- a/WebContent/VAADIN/themes/reindeer/common/common.css +++ b/WebContent/VAADIN/themes/reindeer/common/common.css @@ -44,9 +44,6 @@ height: 16px; background: transparent url(../common/icons/error.png) no-repeat 50%; } -.v-ie6 .v-errorindicator { - background-image: url(../common/icons/error-ie6.png); -} .v-tooltip { background-color: #fffcdd; border: 1px solid #b8b295; diff --git a/WebContent/VAADIN/themes/reindeer/common/icons/bullet-ie6.png b/WebContent/VAADIN/themes/reindeer/common/icons/bullet-ie6.png Binary files differdeleted file mode 100644 index 7ba2e118a6..0000000000 --- a/WebContent/VAADIN/themes/reindeer/common/icons/bullet-ie6.png +++ /dev/null diff --git a/WebContent/VAADIN/themes/reindeer/common/icons/bullet-white-ie6.png b/WebContent/VAADIN/themes/reindeer/common/icons/bullet-white-ie6.png Binary files differdeleted file mode 100644 index 9661802744..0000000000 --- a/WebContent/VAADIN/themes/reindeer/common/icons/bullet-white-ie6.png +++ /dev/null diff --git a/WebContent/VAADIN/themes/reindeer/common/icons/error-ie6.png b/WebContent/VAADIN/themes/reindeer/common/icons/error-ie6.png Binary files differdeleted file mode 100644 index dce7941157..0000000000 --- a/WebContent/VAADIN/themes/reindeer/common/icons/error-ie6.png +++ /dev/null diff --git a/WebContent/VAADIN/themes/reindeer/datefield/datefield.css b/WebContent/VAADIN/themes/reindeer/datefield/datefield.css index 7217d70576..bc8f617845 100644 --- a/WebContent/VAADIN/themes/reindeer/datefield/datefield.css +++ b/WebContent/VAADIN/themes/reindeer/datefield/datefield.css @@ -1,3 +1,6 @@ +.v-datefield { + overflow: hidden; +} input.v-textfield-readonly:focus{ background-color: transparent; } @@ -43,14 +46,9 @@ span.v-datefield-calendarpanel-month { .v-datefield-full { min-width: 240px; } -.v-ff2 .v-datefield-month, -.v-ff2 .v-datefield-day, -.v-ff2 .v-datefield-full { - min-width: 254px; -} -.v-datefield-popupcalendar, -.v-ff2 .v-datefield-popupcalendar { +.v-datefield-popupcalendar { min-width: 0; + padding-right: 24px; } .v-datefield-year .v-datefield-calendarpanel { width: 100px; @@ -120,10 +118,6 @@ td.v-datefield-calendarpanel-nextyear { .v-ie .v-datefield-calendarpanel-nextmonth button { border: none; } -.v-ie6 .v-datefield-calendarpanel-prevmonth button, -.v-ie6 .v-datefield-calendarpanel-nextmonth button { - width: 24px; -} .v-datefield-calendarpanel-nextmonth button { background-image: url(img/month-next.png); /** sprite-ref: verticals; sprite-alignment: center */ } @@ -231,21 +225,23 @@ td.v-datefield-calendarpanel-nextyear { -moz-border-radius: 3px; } .v-sa .v-datefield-popup, -.v-ff3 .v-datefield-popup, .v-op .v-datefield-popup { background: rgba(255,255,255,.95); } -.v-datefield-year .v-datefield-textfield { - width: 4em; +.v-has-width > input.v-datefield-textfield { + width: 100%; } -.v-datefield-month .v-datefield-textfield { - width: 5em; +.v-datefield-year > .v-datefield-textfield { + width: 4.5em; } -.v-datefield-day .v-datefield-textfield { +.v-datefield-month > .v-datefield-textfield { width: 5.5em; } -.v-datefield-full .v-datefield-textfield { - width: 12em; +.v-datefield-day > .v-datefield-textfield { + width: 6em; +} +.v-datefield-full >.v-datefield-textfield { + width: 12.5em; } .v-datefield-popupcalendar input.v-datefield-textfield { border-right-width: 0; @@ -253,7 +249,9 @@ td.v-datefield-calendarpanel-nextyear { -moz-border-radius-bottomright: 0; -webkit-border-top-right-radius: 0; -webkit-border-bottom-right-radius: 0; - height: 14px; + height: 23px; + box-sizing: border-box; + -moz-box-sizing: border-box; } .v-datefield.v-readonly input.v-datefield-textfield { border-right-width: 1px; @@ -267,6 +265,7 @@ td.v-datefield-calendarpanel-nextyear { } .v-datefield-popupcalendar .v-datefield-button { width: 24px; + margin-right: -24px; height: 23px; background: transparent; border: none; @@ -289,11 +288,6 @@ td.v-datefield-calendarpanel-nextyear { background-image: url(img/popup-btn-black-pressed.png); /** sprite-ref: black-verticals */ } -/* Small adjustment for IE6 */ -.v-ie6 .v-datefield-popupcalendar .v-datefield-button { - margin-top: 1px; -} - /*------------ * on black background diff --git a/WebContent/VAADIN/themes/reindeer/formlayout/formlayout.css b/WebContent/VAADIN/themes/reindeer/formlayout/formlayout.css index a5d465a91f..b28040a0e9 100644 --- a/WebContent/VAADIN/themes/reindeer/formlayout/formlayout.css +++ b/WebContent/VAADIN/themes/reindeer/formlayout/formlayout.css @@ -6,9 +6,6 @@ height: 16px; background: transparent url(../common/icons/error.png) no-repeat 50%; } -.v-ie6 .v-formlayout-cell .v-errorindicator { - background-image: url(../common/icons/error-ie6.png); -} .v-formlayout-captioncell { text-align: right; white-space: nowrap; @@ -42,10 +39,6 @@ margin-top: 5px; min-height: 20px; } -.v-ie6 .v-form-errormessage { - height: 20px; - background-image: url(../common/icons/error-ie6.png); -} .v-form fieldset { border: none; border-top: 1px solid #babfc0; diff --git a/WebContent/VAADIN/themes/reindeer/panel/panel.css b/WebContent/VAADIN/themes/reindeer/panel/panel.css index 8ce943a7be..23575799ab 100644 --- a/WebContent/VAADIN/themes/reindeer/panel/panel.css +++ b/WebContent/VAADIN/themes/reindeer/panel/panel.css @@ -23,6 +23,7 @@ } .v-panel-content, .white .v-panel-content { + background: #fff; border: 1px solid #dcdcdc; border-bottom: none; border-top: none; @@ -32,13 +33,6 @@ .v-ie9 .v-panel-content { border-top-color: rgba(0,0,0,.07); } -.v-panel-content > div { - background: #fff; - min-height: 100%; -} -.v-ie6 .v-panel-content { - background: #fff; -} .blue .v-panel-deco { border-color: #92a3ac; background: #adc2cd; @@ -64,9 +58,6 @@ display: inline-block; vertical-align: middle; } -.v-ie6 .v-panel-caption .v-errorindicator { - background-image: url(../common/icons/error-ie6.png); -} /* Light style */ .v-panel-light .v-panel-caption-light, @@ -75,11 +66,6 @@ } .v-panel-light .v-panel-content-light { border: none; -} -.v-panel-content-light > div { - background: transparent; -} -.v-ie6 .v-panel-content-light { background: transparent; } .v-panel-light .v-panel-deco-light { diff --git a/WebContent/VAADIN/themes/reindeer/select/img/black/left-black-focus-ie6.png b/WebContent/VAADIN/themes/reindeer/select/img/black/left-black-focus-ie6.png Binary files differdeleted file mode 100644 index 5cf13fac6a..0000000000 --- a/WebContent/VAADIN/themes/reindeer/select/img/black/left-black-focus-ie6.png +++ /dev/null diff --git a/WebContent/VAADIN/themes/reindeer/select/img/black/left-black-ie6.png b/WebContent/VAADIN/themes/reindeer/select/img/black/left-black-ie6.png Binary files differdeleted file mode 100644 index d06d599e0e..0000000000 --- a/WebContent/VAADIN/themes/reindeer/select/img/black/left-black-ie6.png +++ /dev/null diff --git a/WebContent/VAADIN/themes/reindeer/select/img/left-focus-ie6.png b/WebContent/VAADIN/themes/reindeer/select/img/left-focus-ie6.png Binary files differdeleted file mode 100644 index 643aac1bc9..0000000000 --- a/WebContent/VAADIN/themes/reindeer/select/img/left-focus-ie6.png +++ /dev/null diff --git a/WebContent/VAADIN/themes/reindeer/select/img/left-ie6.png b/WebContent/VAADIN/themes/reindeer/select/img/left-ie6.png Binary files differdeleted file mode 100644 index 226aea1ad1..0000000000 --- a/WebContent/VAADIN/themes/reindeer/select/img/left-ie6.png +++ /dev/null diff --git a/WebContent/VAADIN/themes/reindeer/select/select.css b/WebContent/VAADIN/themes/reindeer/select/select.css index b23e7571e2..903066e4ab 100644 --- a/WebContent/VAADIN/themes/reindeer/select/select.css +++ b/WebContent/VAADIN/themes/reindeer/select/select.css @@ -3,9 +3,7 @@ background-repeat: no-repeat; background-image: url(img/left.png); /** sprite-ref: verticals; sprite-margin-bottom: 1px */ padding-left: 2px; -} -.v-ie6 .v-filterselect { - background-image: url(img/left-ie6.png); /** sprite-ref: verticals; sprite-margin-bottom: 1px */ + padding-right: 25px; /* Space for the button */ } .v-app .v-filterselect-input, .v-window .v-filterselect-input, @@ -13,13 +11,15 @@ background: transparent repeat-x; background-image: url(img/center.png); /** sprite-ref: verticals; sprite-alignment: repeat; sprite-margin-bottom: 1px */ border: none; - height: 16px; + height: 24px; } /* More specific selector to override padding */ .v-app input.v-filterselect-input, .v-window input.v-filterselect-input, .v-popupview-popup input.v-filterselect-input { padding: 4px 0 4px 2px; + box-sizing: border-box; + -moz-box-sizing: border-box; } .v-filterselect-prompt .v-filterselect-input { font-style: normal; @@ -30,9 +30,6 @@ .v-filterselect-focus { background-image: url(img/left-focus.png); /** sprite-ref: verticals; sprite-margin-bottom: 1px */ } -.v-ie6 .v-filterselect-focus { - background-image: url(img/left-focus-ie6.png); /** sprite-ref: verticals; sprite-margin-bottom: 1px */ -} .v-filterselect-focus .v-filterselect-input { background-image: url(img/center-focus.png); /** sprite-ref: verticals; sprite-alignment: repeat */ } @@ -42,6 +39,7 @@ height: 24px; background-image: url(img/right.png); /** sprite-ref: verticals ; sprite-margin-bottom: 1px */ cursor: default; + margin-right: -25px; } .v-filterselect-button:hover { background-image: url(img/right-hover.png); /** sprite-ref: verticals */ @@ -209,9 +207,6 @@ .black .v-filterselect { background-image: url(img/black/left-black.png); /** sprite-ref: black-verticals; sprite-margin-bottom: 1px */ } -.v-ie6 .black .v-filterselect { - background-image: url(img/black/left-black-ie6.png); /** sprite-ref: black-verticals; sprite-margin-bottom: 1px */ -} .v-app .black .v-filterselect-input, .v-window .black .v-filterselect-input, .v-window-black .v-filterselect-input, @@ -222,9 +217,6 @@ .black .v-filterselect-focus { background-image: url(img/black/left-black-focus.png); /** sprite-ref: black-verticals; sprite-margin-bottom: 1px */ } -.v-ie6 .black .v-filterselect-focus { - background-image: url(img/black/left-black-focus-ie6.png); /** sprite-ref: black-verticals; sprite-margin-bottom: 1px */ -} .black .v-filterselect-focus .v-filterselect-input { background-image: url(img/black/center-black-focus.png); /** sprite-ref: black-verticals; sprite-alignment: repeat; sprite-margin-bottom: 1px */ } @@ -265,15 +257,3 @@ background: #151717; color: #c9ccce; } - -/* Twincolselect needs a little tweak in IE6 */ -.v-ie6 .v-select-twincol-buttons .v-button { - padding-left: 12px; - padding-right: 12px; -} - -/* IE6 needs some help identifying when the input is readonly */ -.v-ie6 .v-filterselect.v-readonly, -.v-ie6 .v-filterselect .v-filterselect-input-readonly { - background: transparent; -}
\ No newline at end of file diff --git a/WebContent/VAADIN/themes/reindeer/table/table.css b/WebContent/VAADIN/themes/reindeer/table/table.css index 2e6c597160..9b78d86e34 100644 --- a/WebContent/VAADIN/themes/reindeer/table/table.css +++ b/WebContent/VAADIN/themes/reindeer/table/table.css @@ -25,24 +25,6 @@ line-height: normal; } -.v-ie6 .v-table, -.v-ie6 .v-table-header-wrap, -.v-ie6 .v-table-footer-wrap, -.v-ie6 .v-table-column-selector { - /* The header will overflow the Table due to a bug in IE6 after changes in #3003. To fix this (#7314) - * we need to apply position:relative to the wrappers and selector to make them appear on top of the - * header. We also need to apply it to the table root div to get rid of a really weird IE6 rendering bug - * caused by all this relativeness (see attachment in #7314). - */ - position: relative; -} - -.v-ie6 .v-table.v-disabled, -.v-ie7 .v-table.v-disabled { - /* Fixes ie issue #7324 where disabled shim does not cover table body */ - position: relative; -} - .v-table-footer-wrap, .white .v-table-footer-wrap { text-transform: none; diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-minimal-style.css b/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-minimal-style.css index d0041e586a..dfa83d7088 100644 --- a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-minimal-style.css +++ b/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-minimal-style.css @@ -105,8 +105,7 @@ .v-tabsheet-tabs-minimal .v-tabsheet-caption-close { margin-top: 1px; } -.v-ff .v-tabsheet-tabs-minimal .v-tabsheet-caption-close, -.v-ie7 .v-tabsheet-tabs-minimal .v-tabsheet-caption-close { +.v-ff .v-tabsheet-tabs-minimal .v-tabsheet-caption-close { margin-top: -15px; } .v-tabsheet-tabs-minimal .v-tabsheet-caption-close:hover, diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-normal-style.css b/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-normal-style.css index 1c22a68a99..3d23fa110a 100644 --- a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-normal-style.css +++ b/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-normal-style.css @@ -52,13 +52,6 @@ font-size: 14px; font-weight: normal; } -.v-ff .v-tabsheet-caption-close, -.v-ie7 .v-tabsheet-caption-close { - margin-top: -17px; -} -.v-ie6 .v-tabsheet-caption-close { - float: none; -} .v-tabsheet-caption-close:hover { background-image: url(img/close-btn-hover.png); /** sprite-ref: verticals */ } @@ -108,8 +101,7 @@ .v-tabsheet-tabsheetpanel { background: #fff; } -.v-sa .v-tabsheet-content, -.v-ff3 .v-tabsheet-content { +.v-sa .v-tabsheet-content { border-color: rgba(0,0,0,.1); } .blue .v-tabsheet-deco { @@ -123,8 +115,7 @@ background: #e2e2e2; overflow: hidden; } -.v-sa .v-tabsheet-deco, -.v-ff3 .v-tabsheet-deco { +.v-sa .v-tabsheet-deco { border-top-color: rgba(0,0,0,.1); background: rgba(0,0,0,.08); } @@ -151,13 +142,6 @@ height: 16px; background: transparent url(../common/icons/error.png) no-repeat 50%; } -.v-ff2 .v-tabsheet-tabs .v-icon, -.v-ff2 .v-tabsheet-tabs .v-errorindicator { - display: -moz-inline-stack; -} -.v-ie6 .v-tabsheet-tabs .v-errorindicator { - background-image: url(../common/icons/error-ie6.png); -} .v-ie .v-tabsheet-tabs .v-errorindicator { zoom: 1; display: inline; diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-small-style.css b/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-small-style.css index e440f7fdd1..c7c79d35ee 100644 --- a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-small-style.css +++ b/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-small-style.css @@ -50,8 +50,7 @@ .v-tabsheet-tabs-bar .v-tabsheet-caption-close { margin-top: 1px; } -.v-ff .v-tabsheet-tabs-bar .v-tabsheet-caption-close, -.v-ie7 .v-tabsheet-tabs-bar .v-tabsheet-caption-close { +.v-ff .v-tabsheet-tabs-bar .v-tabsheet-caption-close { margin-top: -14px; } .v-tabsheet-tabs-bar .v-tabsheet-caption-close:hover { diff --git a/WebContent/VAADIN/themes/reindeer/textfield/textfield.css b/WebContent/VAADIN/themes/reindeer/textfield/textfield.css index 4c8ed4251e..dce5dffba0 100644 --- a/WebContent/VAADIN/themes/reindeer/textfield/textfield.css +++ b/WebContent/VAADIN/themes/reindeer/textfield/textfield.css @@ -20,7 +20,7 @@ -webkit-border-radius: 3px; border-radius: 3px; margin: 0; - height: 15px; + height: 23px; line-height: normal; } .v-textarea, @@ -35,6 +35,10 @@ .v-window textarea.v-textarea { padding: 3px 3px 4px; } +.v-app input.v-textfield.v-paintable, +.v-window input.v-textfield.v-paintable { + height: 24px; +} .v-app .v-textfield-focus, .v-window .v-textfield-focus, .v-popupview-popup .v-textfield-focus, @@ -62,7 +66,8 @@ textarea.v-textarea-prompt { .v-app textarea.v-textarea-small { font-size: 11px; } -.v-table input.v-textfield { +.v-app .v-table input.v-textfield.v-paintable, +.v-window .v-table input.v-textfield.v-paintable { padding: 1px 2px; height: auto; line-height: normal; @@ -71,14 +76,6 @@ textarea.v-textarea-prompt { margin-top: -2px; margin-bottom: -2px; } -.v-ie6 .v-table-cell-wrapper input.v-textfield { - margin-top: -2px; - margin-bottom: -2px; -} -.v-ie6 .v-table-cell-wrapper div input.v-textfield { - margin-top: 0; - margin-bottom: 0; -} /* Textfield on black background */ .black .v-textfield, .black .v-textarea { diff --git a/WebContent/VAADIN/themes/reindeer/tree/img/arrows-ie6.png b/WebContent/VAADIN/themes/reindeer/tree/img/arrows-ie6.png Binary files differdeleted file mode 100644 index e016e313a7..0000000000 --- a/WebContent/VAADIN/themes/reindeer/tree/img/arrows-ie6.png +++ /dev/null diff --git a/WebContent/VAADIN/themes/reindeer/tree/tree.css b/WebContent/VAADIN/themes/reindeer/tree/tree.css index 63ac914fdf..f72f61c545 100644 --- a/WebContent/VAADIN/themes/reindeer/tree/tree.css +++ b/WebContent/VAADIN/themes/reindeer/tree/tree.css @@ -1,13 +1,6 @@ .v-tree-node { background: transparent url(img/arrows.png) no-repeat 6px -10px; } -.v-ie6 .v-tree-node { - background-image: url(img/arrows-ie6.png); - background-repeat: no-repeat; -} -.v-ie6 div.v-tree-node-leaf { - background: transparent; -} .v-tree-node-expanded { background-position: -7px 5px; } @@ -32,12 +25,6 @@ .v-tree-node-children { padding-left: 16px; } -/* IMPORTANT keep the offsetWidth (width + padding) of this element the same as the margin-left of v-tree-node-caption */ -.v-ie6 .v-tree-node-ie6compatnode { - width: 14px; - height: 10px; - padding: 1px; -} .v-tree-node-caption.v-tree-node-focused span{ padding-left: 1px; padding-top: 0px; @@ -46,9 +33,6 @@ .v-tree-node-focused span{ border: 1px dotted black; } -.v-ie6 .v-tree-node-ie6compatnode.v-tree-node-focused{ - padding-left: 0px; -} /*************************************** * Drag'n'drop styles ***************************************/ diff --git a/WebContent/VAADIN/themes/reindeer/window/img/black/content-bg-ie6.png b/WebContent/VAADIN/themes/reindeer/window/img/black/content-bg-ie6.png Binary files differdeleted file mode 100644 index 8ff06a11ed..0000000000 --- a/WebContent/VAADIN/themes/reindeer/window/img/black/content-bg-ie6.png +++ /dev/null diff --git a/WebContent/VAADIN/themes/reindeer/window/img/black/header-bg-ie6.png b/WebContent/VAADIN/themes/reindeer/window/img/black/header-bg-ie6.png Binary files differdeleted file mode 100644 index ddfc27f6e6..0000000000 --- a/WebContent/VAADIN/themes/reindeer/window/img/black/header-bg-ie6.png +++ /dev/null diff --git a/WebContent/VAADIN/themes/reindeer/window/img/black/resize-ie6.png b/WebContent/VAADIN/themes/reindeer/window/img/black/resize-ie6.png Binary files differdeleted file mode 100644 index 011b64a918..0000000000 --- a/WebContent/VAADIN/themes/reindeer/window/img/black/resize-ie6.png +++ /dev/null diff --git a/WebContent/VAADIN/themes/reindeer/window/window.css b/WebContent/VAADIN/themes/reindeer/window/window.css index 5b3997f444..3015f70eb5 100644 --- a/WebContent/VAADIN/themes/reindeer/window/window.css +++ b/WebContent/VAADIN/themes/reindeer/window/window.css @@ -3,35 +3,16 @@ } .v-window-wrap { border: 1px solid #808386; + box-sizing: border-box; + -moz-box-sizing: border-box; } .v-sa .v-window-wrap, -.v-ff3 .v-window-wrap, .v-op .v-window-wrap { border-color: rgba(0,0,0,.2); } -.v-ff2 .v-window-wrap, -.v-ie6 .v-window-wrap { - border: none; -} -.v-ff2 .v-window-outerheader, -.v-ie6 .v-window-outerheader { - border: 1px solid #808386; - border-bottom: none; -} -.v-ff2 .v-window-contents, -.v-ie6 .v-window-contents { - border: 1px solid #808386; - border-top: none; - border-bottom: none; -} -.v-ff2 .v-window-footer, -.v-ie6 .v-window-footer { - border: 1px solid #808386; - border-top: none; -} .v-window-outerheader { padding: 12px 32px 0 14px; - height: 25px; + height: 37px; background: black repeat-x; background-image: url(img/header-bg.png); /** sprite-ref: verticals; sprite-alignment: repeat */ } @@ -50,9 +31,6 @@ padding-left: 13px; background: transparent url(../common/icons/error.png) no-repeat 0 50%; } -.v-ie6 .v-window-error .v-window-header { - background-image: url(../common/icons/error-ie6.png); -} .v-window-resizebox { width: 15px; height: 15px; @@ -136,12 +114,6 @@ background: #f7f7f8 repeat-x; background-image: url(img/content-bg-light.png); /** sprite-ref: verticals; sprite-alignment: repeat */ } -.v-ie6 .v-window-light .v-window-wrap2 { - background-image: none; -} - - - /** @@ -156,7 +128,6 @@ overflow: hidden; } .v-sa .v-window-black .v-window-wrap, -.v-ff3 .v-window-black .v-window-wrap, .v-op .v-window-black .v-window-wrap { border-color: rgba(0,0,0,.8); } @@ -166,7 +137,6 @@ -webkit-border-radius: 7px; } .v-sa .v-window-black .v-window-wrap2, -.v-ff3 .v-window-black .v-window-wrap2, .v-op .v-window-black .v-window-wrap2 { background-color: rgba(29,32,33,.9); } @@ -203,12 +173,6 @@ width: 14px; height: 14px; } -.v-ie6 .v-window-black .v-window-resizebox { - background-image: url(img/black/resize-ie6.png); /** sprite-ref: black-verticals; sprite-margin-bottom: 4px */ -} -.v-ie6 .v-window-black .v-window-contents { - background: transparent url(img/black/content-bg-ie6.png) repeat-x; -} /* Must be last to make this image last in the sprites */ .v-window-black .v-window-contents { border: none; diff --git a/WebContent/VAADIN/themes/runo/button/button.css b/WebContent/VAADIN/themes/runo/button/button.css index 75557d8a39..5515db5aec 100644 --- a/WebContent/VAADIN/themes/runo/button/button.css +++ b/WebContent/VAADIN/themes/runo/button/button.css @@ -56,12 +56,6 @@ text-overflow: ellipsis; } -.v-ie7 .v-button .v-button-wrap { - overflow: visible; -} - - - /* Small style */ .v-button-small .v-button-wrap, .v-disabled.v-button-small .v-button-wrap { @@ -160,13 +154,3 @@ .v-checkbox .v-errorindicator { padding-left: 10px; } -.v-ie6 .v-checkbox .v-errorindicator { - padding-right: 4px; - } -.v-ie7 .v-checkbox .v-errorindicator { - padding-right: 7px; - } -.v-ie6 .v-button .v-errorindicator, -.v-ie7 .v-button .v-errorindicator { - padding-right: 5px; - }
\ No newline at end of file diff --git a/WebContent/VAADIN/themes/runo/caption/caption.css b/WebContent/VAADIN/themes/runo/caption/caption.css index d5be467822..93d7874665 100644 --- a/WebContent/VAADIN/themes/runo/caption/caption.css +++ b/WebContent/VAADIN/themes/runo/caption/caption.css @@ -6,10 +6,3 @@ height: 16px; background: transparent url(../icons/16/error.png) no-repeat top right; } -.v-ie6 .v-errorindicator { - /* gif for transparency */ - background-image: url(../icons/16/error.gif); -} -.v-ie7 .v-errorindicator { - margin-left: -3px; -}
\ No newline at end of file diff --git a/WebContent/VAADIN/themes/runo/datefield/datefield.css b/WebContent/VAADIN/themes/runo/datefield/datefield.css index b9a4efc50e..0bfa060a09 100644 --- a/WebContent/VAADIN/themes/runo/datefield/datefield.css +++ b/WebContent/VAADIN/themes/runo/datefield/datefield.css @@ -143,9 +143,3 @@ td.v-datefield-calendarpanel-month { color: #999; font-style: normal; } -/* IE specific styles */ -.v-ie7 .v-datefield-button { - background-position: right 1px; - height: 25px; - margin: 0; -}
\ No newline at end of file diff --git a/WebContent/VAADIN/themes/runo/formlayout/formlayout.css b/WebContent/VAADIN/themes/runo/formlayout/formlayout.css index fa4a7bde63..466baafd8c 100644 --- a/WebContent/VAADIN/themes/runo/formlayout/formlayout.css +++ b/WebContent/VAADIN/themes/runo/formlayout/formlayout.css @@ -36,9 +36,6 @@ margin-top: 5px; min-height: 20px; } -.v-ie6 .v-form-errormessage { - height: 20px -} .v-form fieldset { border: none; border-top: 1px solid #babfc0; diff --git a/WebContent/VAADIN/themes/runo/panel/panel.css b/WebContent/VAADIN/themes/runo/panel/panel.css index 8fcfcaf100..138fb07f9c 100644 --- a/WebContent/VAADIN/themes/runo/panel/panel.css +++ b/WebContent/VAADIN/themes/runo/panel/panel.css @@ -67,38 +67,12 @@ overflow: hidden; } /* IE specific rules */ -.v-ie6 .v-panel { - background: transparent; -} -.v-ie6 .v-panel-caption { - border: 1px solid #babfc0; - border-bottom: none; - background: #fff; - margin: 0; - padding-left: 18px -} -.v-ie6 .v-panel-nocaption { - border: none; - background: transparent; - margin: 0; - height: 0; -} -.v-ie6 .v-panel-caption-light { - border: none; - background: transparent; -} -.v-ie6 .v-panel-content, -.v-ie7 .v-panel-content, .v-ie8 .v-panel-content { border-bottom: 1px solid #babfc0; } -.v-ie6 .v-panel-content-light, -.v-ie7 .v-panel-content-light, .v-ie8 .v-panel-content-light { border-bottom: none; } -.v-ie6 .v-panel-deco, -.v-ie7 .v-panel-deco, .v-ie8 .v-panel-deco { height: 0; overflow: hidden; diff --git a/WebContent/VAADIN/themes/runo/select/select.css b/WebContent/VAADIN/themes/runo/select/select.css index ad1744288a..5c66cf81db 100644 --- a/WebContent/VAADIN/themes/runo/select/select.css +++ b/WebContent/VAADIN/themes/runo/select/select.css @@ -22,7 +22,7 @@ .v-popupview-popup .v-filterselect .v-filterselect-input { background: transparent url(img/bg-center-filter.png) no-repeat 1px 0; border: none; - height: 20px; + height: 23px; margin: 0; padding: 2px 0 1px 2px; font-size: 13px; @@ -127,12 +127,6 @@ border-top: 1px solid #b6bbbc; } -/* IE6 needs some help identifying when the input is readonly */ -.v-ie6 .v-filterselect.v-readonly, -.v-ie6 .v-filterselect .v-filterselect-input-readonly { - background: transparent; -} - /* Error styles (disabled by default) ---------------------------------- diff --git a/WebContent/VAADIN/themes/runo/slider/slider.css b/WebContent/VAADIN/themes/runo/slider/slider.css index 07b10dfa17..698d15de90 100644 --- a/WebContent/VAADIN/themes/runo/slider/slider.css +++ b/WebContent/VAADIN/themes/runo/slider/slider.css @@ -68,16 +68,3 @@ background-color: #FFE0E0; } */ - -/* IE specific styles */ - -.v-ie6 .v-slider, -.v-ie6 .v-slider-vertical { - margin: 0; -} -.v-ie6 .v-slider .v-slider-handle { - margin: -1px 0; -} -.v-ie6 .v-slider-vertical .v-slider-handle { - margin: 0 -1px; -}
\ No newline at end of file diff --git a/WebContent/VAADIN/themes/runo/splitpanel/splitpanel.css b/WebContent/VAADIN/themes/runo/splitpanel/splitpanel.css index c74ab257ba..d7851c27e6 100644 --- a/WebContent/VAADIN/themes/runo/splitpanel/splitpanel.css +++ b/WebContent/VAADIN/themes/runo/splitpanel/splitpanel.css @@ -6,13 +6,11 @@ .v-splitpanel-hsplitter, .v-splitpanel-hsplitter-locked { width: 6px; - font-size: 1px; /* for IE6 */ } .v-splitpanel-hsplitter div, .v-splitpanel-hsplitter-locked div { width: 6px; - font-size: 1px; /* for IE6 */ position: absolute; top: 0; bottom: 0; @@ -24,35 +22,16 @@ .v-splitpanel-vsplitter, .v-splitpanel-vsplitter-locked { height: 6px; - font-size: 1px; /* for IE6 */ } .v-splitpanel-vsplitter div, .v-splitpanel-vsplitter-locked div { height: 6px; - font-size: 1px; /* for IE6 */ background: #ccd2d0 url(img/bg_ver.png); border: 1px solid #b6bbbc; margin: -1px 0; } -/* IE6 specific styles */ - -.v-ie6 .v-splitpanel-hsplitter div, -.v-ie6 .v-splitpanel-hsplitter-locked div { - height: 99%; -} - -.v-ie6 .v-splitpanel-vsplitter, -.v-ie6 .v-splitpanel-vsplitter-locked { - height: 8px; -} - -.v-ie6 .v-splitpanel-vsplitter div, -.v-ie6 .v-splitpanel-vsplitter-locked div { - margin: 0; -} - /* Rounded style */ .v-splitpanel-hsplitter-rounded div, @@ -72,10 +51,6 @@ .v-splitpanel-vsplitter-rounded-locked div { margin: -1px 4px; } -.v-ie6 .v-splitpanel-hsplitter-rounded div, -.v-ie6 .v-splitpanel-hsplitter-rounded-locked div { - height: 97%; -} /* Small style */ diff --git a/WebContent/VAADIN/themes/runo/table/table.css b/WebContent/VAADIN/themes/runo/table/table.css index 8c82a6f3e8..42f93752be 100644 --- a/WebContent/VAADIN/themes/runo/table/table.css +++ b/WebContent/VAADIN/themes/runo/table/table.css @@ -28,10 +28,6 @@ text-shadow: #ffffff 0 1px 0; margin-left: 4px; } -.v-ie7 .v-table-caption-container-align-right { - margin-left: 0px; - padding-left: 0px; -} .v-table-sort-indicator { width: 0; height: 36px; @@ -158,20 +154,6 @@ tr.v-table-row-odd:hover { .v-table .v-link { display: inline; } -/* IE6 hack */ -.v-ie6 .v-table-scrollposition { - background: transparent; - /* - AlphaImageLoader uses src attribute relative to host page, not CSS - We need multiple different filters because we cannot be sure how host page is served compared to theme resources - TODO: This actually does not work as expected, since only the last filter is applied. Can we chain filters together (i.e. contain all versions on one line)? - */ - filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../../VAADIN/themes/default/table/img/scroll-position-bg.png", sizingMethod="scale"); - filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../VAADIN/themes/default/table/img/scroll-position-bg.png", sizingMethod="scale"); - filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="VAADIN/themes/default/table/img/scroll-position-bg.png", sizingMethod="scale"); - filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="/VAADIN/themes/default/table/img/scroll-position-bg.png", sizingMethod="scale"); -} - /* Borderless style */ .v-table-borderless .v-table-header-wrap, diff --git a/WebContent/VAADIN/themes/runo/tabsheet/tabsheet.css b/WebContent/VAADIN/themes/runo/tabsheet/tabsheet.css index 64cd85b61d..7028b3ed16 100644 --- a/WebContent/VAADIN/themes/runo/tabsheet/tabsheet.css +++ b/WebContent/VAADIN/themes/runo/tabsheet/tabsheet.css @@ -132,24 +132,6 @@ padding-top: 12px; }*/ /* IE specific styles */ -.v-ie6 .v-tabsheet-tabs { - height: 46px; -} -.v-ie6 .v-tabsheet-tabitem-selected { - border: 1px solid #babfc0; - border-bottom: none; - background: #fff; - margin-top: 0; - height: 23px; - padding: 18px 14px 6px 15px; - cursor: default; - color: #ee5311; -} -.v-ie6 .v-tabsheet-tabitem-selected .v-caption { - background: transparent; - padding: 0; - margin: 0; -} .v-ie .v-tabsheet-content { border-bottom: none; } @@ -159,7 +141,6 @@ overflow: hidden; margin: 0; } -.v-ie7 .v-tabsheet-deco, .v-ie8 .v-tabsheet-deco, .v-ie9 .v-tabsheet-deco { width: 100%; @@ -267,23 +248,6 @@ margin-left: -3px; padding-left: 3px; }*/ -/* IE specific styles */ -.v-ie6 .v-tabsheet-tabs-light, -.v-ie7 .v-tabsheet-tabs-light { - height: 32px; -} -.v-ie6 .v-tabsheet-tabs-light .v-tabsheet-tabitem-selected, -.v-ie7 .v-tabsheet-tabs-light .v-tabsheet-tabitem-selected { - border: none; - background: #fff url(img/inline-tab-right.png) no-repeat right top; - padding: 0; - height: 32px; -} -.v-ie6 .v-tabsheet-tabs-light .v-tabsheet-tabitem-selected .v-caption, -.v-ie7 .v-tabsheet-tabs-light .v-tabsheet-tabitem-selected .v-caption { - background: transparent url(img/inline-tab-left.png) no-repeat -7px 0; - padding: 9px 11px 0 11px; -} .v-ie .v-tabsheet-deco-light { height: 0; }
\ No newline at end of file diff --git a/WebContent/VAADIN/themes/runo/textfield/textfield.css b/WebContent/VAADIN/themes/runo/textfield/textfield.css index f4ac207ea1..af4443c80f 100644 --- a/WebContent/VAADIN/themes/runo/textfield/textfield.css +++ b/WebContent/VAADIN/themes/runo/textfield/textfield.css @@ -12,7 +12,7 @@ input.v-textfield, input[type=text].v-textfield, textarea.v-textarea { font-size: 12px; - height: 16px; + height: 22px; padding: 2px; } textarea.v-textarea { @@ -39,7 +39,7 @@ input.v-textfield-small, input[type=text].v-textfield-small, textarea.v-textarea-small { font-size: 11px; - height: 14px; + height: 18px; line-height: 12px; padding: 1px 2px; }
\ No newline at end of file diff --git a/WebContent/VAADIN/themes/runo/tree/tree.css b/WebContent/VAADIN/themes/runo/tree/tree.css index 03c8a0d829..14061b8afb 100644 --- a/WebContent/VAADIN/themes/runo/tree/tree.css +++ b/WebContent/VAADIN/themes/runo/tree/tree.css @@ -30,12 +30,6 @@ .v-tree-node-children { padding-left: 16px; } -/* IMPORTANT keep the offsetWidth (width + padding) of this element the same as the margin-left of v-tree-node-caption */ -.v-ie6 .v-tree-node-ie6compatnode { - width: 14px; - height: 10px; - padding: 1px; -} .v-tree{ outline:none; } @@ -47,9 +41,6 @@ .v-tree-node-focused span{ border: 1px dotted black; } -.v-ie6 .v-tree-node-ie6compatnode.v-tree-node-focused{ - padding-left: 0px; -} /*************************************** * Drag'n'drop styles ***************************************/ diff --git a/WebContent/VAADIN/themes/runo/window/window.css b/WebContent/VAADIN/themes/runo/window/window.css index 81509146aa..d412f66605 100644 --- a/WebContent/VAADIN/themes/runo/window/window.css +++ b/WebContent/VAADIN/themes/runo/window/window.css @@ -9,7 +9,7 @@ background: transparent url(img/top-left.png) no-repeat; } .v-window-outerheader { - height: 23px; + height: 49px; margin-left: 9px; padding: 15px 40px 11px 12px; background: transparent url(img/top-right.png) no-repeat right top; @@ -21,13 +21,14 @@ letter-spacing: -0.03em; color: #f14c1a; text-shadow: 0 1px 0 #fff; - /* This element is 100% wide in IE6 */ } -.v-window-contents { +.v-window-contents > div { background: #fff; border: 2px solid #babfc0; border-top: none; border-bottom: none; + box-sizing: border-box; + -moz-box-sizing: border-box; } .v-window div.v-window-footer { height: 8px; @@ -35,12 +36,7 @@ background: transparent url(img/bottom-right.png) no-repeat right bottom; overflow: visible; } -.v-ie7 .v-window-footer { - position: relative; - overflow: visible; -} -.v-window-resizebox, -.v-ie7 .v-window-resizebox { +.v-window-resizebox { position: absolute; /* Needed to position the element over ScrollPanel, which is relatively positioned */ right: 5px; width: 10px; diff --git a/WebContent/VAADIN/vaadinBootstrap.js b/WebContent/VAADIN/vaadinBootstrap.js new file mode 100644 index 0000000000..1f5f3fa973 --- /dev/null +++ b/WebContent/VAADIN/vaadinBootstrap.js @@ -0,0 +1,281 @@ +(function() { + var defaults; + var apps = {}; + var themesLoaded = {}; + var widgetsets = {}; + + + var log; + if (typeof console === "undefined" || !window.location.search.match(/[&?]debug(&|$)/)) { + //If no console.log present, just use a no-op + log = function() {}; + } else if (typeof console.log === "function") { + //If it's a function, use it with apply + log = function() { + console.log.apply(console, arguments); + }; + } else { + //In IE, its a native function for which apply is not defined, but it works without a proper 'this' reference + log = console.log; + } + + var loadTheme = function(url) { + if(!themesLoaded[url]) { + log("loadTheme", url); + var stylesheet = document.createElement('link'); + stylesheet.setAttribute('rel', 'stylesheet'); + stylesheet.setAttribute('type', 'text/css'); + stylesheet.setAttribute('href', url + "/styles.css"); + document.getElementsByTagName('head')[0].appendChild(stylesheet); + themesLoaded[url] = true; + } + } + + var isWidgetsetLoaded = function(widgetset) { + var className = widgetset.replace(/\./g, "_"); + return (typeof window[className]) != "undefined"; + } + + var loadWidgetset = function(basePath, widgetset) { + if (widgetsets[widgetset]) { + return; + } + log("load widgetset", basePath, widgetset) + setTimeout(function() { + if (!isWidgetsetLoaded(widgetset)) { + alert("Failed to load the widgetset: " + url); + } + }, 15000); + + var url = basePath + widgetset + "/" + widgetset + ".nocache.js?" + new Date().getTime(); + + var scriptTag = document.createElement('script'); + scriptTag.setAttribute('type', 'text/javascript'); + scriptTag.setAttribute('src', url); + document.getElementsByTagName('head')[0].appendChild(scriptTag); + + widgetsets[widgetset] = { + pendingApps: [] + }; + } + + window.vaadin = window.vaadin || { + setDefaults: function(d) { + if (defaults) { + log("Ignoring new defaults as defaults have already been loaded"); + return; + } + log("Got defaults", d) + defaults = d; + }, + initApplication: function(appId, config) { + if (apps[appId]) { + throw "Application " + appId + " already initialized"; + } + log("init application", appId, config); + + var testbenchId = appId.replace(/-\d+$/, ''); + window.vaadin.clients[testbenchId] = { + isActive: function() { + return true; + } + } + + var getConfig = function(name) { + var value = config[name]; + if (value === undefined) { + value = defaults[name]; + } + return value; + } + + var fetchRootConfig = function() { + log('Fetching root config'); + var url = getConfig('browserDetailsUrl'); + if (!url) { + // No special url defined, use the default URL + url = getConfig('appUri'); + // Add a slash to the end, because ApplicationConiguration.loadFromDOM does so... + if (url.length == 0 || url.substr(url.length-1) !== "/") { + url += '/'; + } + } + url += ((/\?/).test(url) ? "&" : "?") + "browserDetails"; + var rootId = getConfig("rootId"); + if (rootId !== undefined) { + url += "&rootId=" + rootId; + } + + url += '&initialPath=' + encodeURIComponent(getConfig("initialPath")); + url += '&initialParams=' + encodeURIComponent(JSON.stringify(getConfig("initialParams"))); + + url += '&' + vaadin.getBrowserDetailsParameters(appId); + + // Timestamp to avoid caching + url += '&' + (new Date()).getTime(); + + var r = new XMLHttpRequest(); + r.open('POST', url, true); + r.onreadystatechange = function (aEvt) { + if (r.readyState == 4) { + if (r.status == 200){ + log("Got root config response", r.responseText); + var updatedConfig = JSON.parse(r.responseText); + + // Copy new properties to the config object + for (var property in updatedConfig) { + if (updatedConfig.hasOwnProperty(property)) { + config[property] = updatedConfig[property]; + } + } + + // Try bootstrapping again, this time without fetching missing info + bootstrapApp(false); + } else { + log('Error', r.statusText); + } + } + }; + r.send(null); + + log('sending request to ', url); + }; + + //Export public data + var app = { + 'getConfig': getConfig + }; + apps[appId] = app; + + if (!window.name) { + window.name = appId + '-' + Math.random(); + } + + var bootstrapApp = function(mayDefer) { + var themeUri = getConfig('themeUri'); + if (themeUri) { + loadTheme(themeUri); + } + + var widgetsetBase = getConfig('widgetsetBase'); + var widgetset = getConfig('widgetset'); + if (widgetset && widgetsetBase) { + loadWidgetset(widgetsetBase, widgetset); + } + + if (getConfig('uidl') === undefined) { + if (mayDefer) { + fetchRootConfig(); + } else { + throw "May not defer bootstrap any more"; + } + } else { + if (widgetsets[widgetset].callback) { + log("Starting from bootstrap", appId); + widgetsets[widgetset].callback(appId); + } else { + log("Setting pending startup", appId); + widgetsets[widgetset].pendingApps.push(appId); + } + } + } + bootstrapApp(true); + + if (getConfig("debug")) { + // TODO debug state is now global for the entire page, but should somehow only be set for the current application + window.vaadin.debug = true; + } + + return app; + }, + clients: {}, + getApp: function(appId) { + var app = apps[appId]; + return app; + }, + loadTheme: loadTheme, + registerWidgetset: function(widgetset, callback) { + log("Widgetset registered", widgetset) + widgetsets[widgetset].callback = callback; + for(var i = 0; i < widgetsets[widgetset].pendingApps.length; i++) { + var appId = widgetsets[widgetset].pendingApps[i]; + log("Starting from register widgetset", appId); + callback(appId); + } + widgetsets[widgetset].pendingApps = null; + }, + getBrowserDetailsParameters: function(parentElementId) { + // Screen height and width + var url = 'sh=' + window.screen.height; + url += '&sw=' + window.screen.width; + + // Window height and width + var cw = 0; + var ch = 0; + if(typeof(window.innerWidth) == 'number') { + // Modern browsers + cw = window.innerWidth; + ch = window.innerHeight; + } else { + // IE 8 + cw = document.documentElement.clientWidth; + ch = document.documentElement.clientHeight; + } + url += '&cw=' + cw + '&ch=' + ch; + + + var d = new Date(); + + url += '&curdate=' + d.getTime(); + + var tzo1 = d.getTimezoneOffset(); // current offset + var dstDiff = 0; + var rtzo = tzo1; + + for (var m=12;m>0;m--) { + d.setUTCMonth(m); + var tzo2 = d.getTimezoneOffset(); + if (tzo1 != tzo2) { + dstDiff = (tzo1 > tzo2 ? tzo1-tzo2 : tzo2-tzo1); // offset w/o DST + rtzo = (tzo1 > tzo2 ? tzo1 : tzo2); // offset w/o DST + break; + } + } + + // Time zone offset + url += '&tzo=' + tzo1; + + // DST difference + url += '&dstd=' + dstDiff; + + // Raw time zone offset + url += '&rtzo=' + rtzo; + + // DST in effect? + url += '&dston=' + (tzo1 != rtzo); + + var pe = document.getElementById(parentElementId); + if (pe) { + url += '&vw=' + pe.offsetWidth; + url += '&vh=' + pe.offsetHeight; + } + + // Uri fragment + if (location.hash) { + //Remove initial # + url += '&fr=' + encodeURIComponent(location.hash.replace(/^#/, "")); + } + // Window name + if (window.name) { + url += '&wn=' + encodeURIComponent(window.name); + } + + // Detect touch device support + try { document.createEvent("TouchEvent"); url += "&td=1";} catch(e){}; + + return url; + } + }; + + log('Vaadin bootstrap loaded'); +})();
\ No newline at end of file diff --git a/WebContent/release-notes.html b/WebContent/release-notes.html index f511774584..1ca217bc56 100644 --- a/WebContent/release-notes.html +++ b/WebContent/release-notes.html @@ -1,14 +1,14 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> -<title>Vaadin Framework @version@</title> -<link rel="stylesheet" type="text/css" href="css/styles.css" /> - -<!--[if lte IE 6]> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <title>Vaadin Framework @version@</title> + <link rel="stylesheet" type="text/css" href="css/styles.css" /> + + <!--[if lte IE 6]> <link rel="stylesheet" type="text/css" href="css/ie.css" /> <![endif]--> -<style type="text/css"> + <style type="text/css"> .nested-list ol { counter-reset: item } @@ -22,515 +22,386 @@ counter-increment: item } </style> -</head> -<!-- /head --> -<body> - - <div id="header"> - <h1>Vaadin – thinking of U and I</h1> - <div id="version"> - <strong>Version @version@</strong> - </div> - </div> - <!-- /header --> - - <div id="content"> - - <p>Version @version@ built on @builddate@.</p> - - <h2 id="tableofcontents">Release Notes for Vaadin Framework - @version@</h2> - <ul> - <li><a href="#overview">Package contents</a> - </li> - <li><a href="#security-fixes">Security fixes in Vaadin @version-minor@</a> - </li> - <li><a href="#enhancements">Enhancements in Vaadin @version-minor@</a> - </li> - <li><a href="#fixes">Fixes in Vaadin @version@</a> - </li> - <li><a href="#backwardsincompatibilities">Backwards - incompatible changes in Vaadin @version-minor@</a> - </li> - <li><a href="#dependencies">Vaadin @version@ dependencies</a> - </li> - <li><a href="#upgrading">Upgrading to Vaadin @version-minor@</a> - </li> - <li><a href="#knownissues">Known problems and limitations in - Vaadin @version@</a> - </li> - <li><a href="#supportedversions">Supported technologies</a> - </li> - </li> - <li><a href="#vaadinontheweb">Vaadin on the Web</a> - </li> - </ul> - <h2 id="overview">Package Contents</h2> - <p> - <b>Vaadin</b> is a Java framework for building modern web - applications that look great, perform well and make you and your - users happy. <b>Vaadin</b> is available under the Apache 2 license - (see license.html). - </p> - <p> - <b>Vaadin</b> is distributed as a single JAR file. Inside the JAR you - will find: - <ul> - <li>Vaadin server and client side classes (/com)</li> - <li>Vaadin server and client side sources (/com)</li> - <li>The default widget set (/VAADIN/widgetsets)</li> - <li>Themes: Runo, Reindeer and Chameleon (/VAADIN/themes)</li> - <li>Release notes (/release-notes.html)</li> - <li>Licensing information (/license.html)</li> - </ul> - </p> - - <h2 id="security-fixes">Security fixes in Vaadin @version-minor@</h2> - <p>Vaadin 6.7.0 and later incorporates fixes for the following security issues:</p> - <ul> - <li><a href="http://dev.vaadin.com/ticket/7669">#7669</a> CSRF/XSS vulnerability through separator injection</li> - <li><a href="http://dev.vaadin.com/ticket/7670">#7670</a> Directory traversal vulnerability</li> - <li><a href="http://dev.vaadin.com/ticket/7671">#7671</a> Contributory XSS: Possibility to inject HTML/JavaScript in system error messages</li> - <li><a href="http://dev.vaadin.com/ticket/7672">#7672</a> Contributory XSS: possibility for injection in certain components</li> - </ul> - - <p> - These issues were discovered by Wouter Coekaerts (<a href="http://wouter.coekaerts.be/">http://wouter.coekaerts.be/</a>) and an internal review. - Immediate upgrade to a version containing the fixes (6.6.7 or later or 6.7.0 or later) is strongly recommended for all users. - </p> - - <p> - The most serious of these issues is the directory traversal attack that can allow read access to the class files of an application as well as some configuration information. - </p> - - <p> - If unable to immediately upgrade Vaadin to a version containing the fixes, the directory traversal vulnerability can be mitigated by not mapping the context path - "/VAADIN" to a Vaadin servlet in web.xml but instead deploying such static resources (themes and widgetsets) directly on the server and serving them as files. - </p> - - <p> - The other vulnerabilities typically require user actions (pasting text crafted by the attacker into the application or following a link crafted by the attacker) - for a successful attack, but may be exploitable more directly in certain applications. They can allow the attacker to control the user session for the application - in the browser. - </p> - - <h2 id="enhancements">Enhancements in Vaadin @version-minor@</h2> - <p> - <b>SQLContainer</b> - </p> - <p>SQLContainer connects your application to an SQL database using - JDBC. SQLContainer allows you to easily bind data stored in a SQL - database to Table and Select components, as well as edit the data - using Forms. Compared to many object-relational tools this provides - you with fast, low-level database access.</p> - <p>SQLContainer was previously distributed as an add-on and has - now been integrated into the framework.</p> - <p> - <b>TreeTable</b> - </p> - <p>TreeTable is an extended Table component that can show - hierarchical structures in its first column. Users can show or hide - children from a small icon before the actual column value in the - first column.</p> - <p>TreeTable is, similarly to Table, designed to scale well with - large number of rows by only sending the needed rows to the browser. - With the Collapsible Container extension, a developer can build the - data provider so that it does not consume too much memory on the - server side either.</p> - <p> - <b>Chameleon Theme</b> - </p> - <p>Chameleon Theme provides a completely new look and feel for - your application.</p> - <p> - The theme is built on top of the Vaadin Base theme and tries to keep - out of the way where appropriate, so small modifications are easy to - do with CSS. - <p> - The theme contains several different useful styles for many of the - basic components like <i>big</i> and <i>warning</i> for a Label. You - can even combine many styles together, like <i>big warning</i> - </p> - If the default color scheme does not suit your taste, feel free to - use the online color scheme editor at <a - href="http://demo.vaadin.com/">http://demo.vaadin.com</a> to build a - customized theme.You can also change the base font size for the whole - theme with the same editor. - <p> - <i>Note that the theme is intentionally simplified for some - browsers, most notably old Internet Explorer versions.</i> - </p> - </p> - <p> - <b>Notification</b> now supports a plain text mode for its contents - </p> - <p> - <b>OptionGroup</b> now supports a HTML mode for the item captions - </p> - <p> - <b>OptionGroup</b> now supports item icons - </p> - <p> - <b>MenuBar</b> now supports a HTML mode for the item captions - </p> - <p> - <b>ComboBox</b> now supports scrolling using the mouse wheel - </p> - <p> - <b>Table ColumnGenerator</b> can now generate plain text in addition - to Components - </p> - <p> - <b>TabSheet</b> tabs can be styled individually - </p> - <p> - <b>Button</b> can be automatically disabled when clicked - </p> - <p> - <b>Tree, Table</b> and <b>TreeTable</b> support tooltips for - individual items or cells - </p> - <p> - <b>Table</b> and <b>TreeTable</b> now support GeneratedRows that can - be used for grouping or summary rows - </p> - <p> - <b>TreeTable</b> supports animation for expand and collapse - operations - </p> - <p> - <b>TreeTable</b> supports expand and collapse listeners - </p> - <p> - <b>PopupDateField</b> and <b>InlineDateField</b> now support time - zones - </p> - <p> - <b>ComboBox</b> can now be used as a replacement for NativeSelect - </p> - <p> - <b>Audio</b> and <b>Video</b> components implement support for HTML5 <audio> and <video> elements. - </p> - <p> - <b>CDI</b> can now also be used with @SessionScoped beans. - </p> - <p> - <b>Sampler</b> is no longer distributed as part of Vaadin @version@. - It will be available as a separate download - </p> - <p> - <b>Book of Vaadin</b> is no longer distributed with Vaadin @version@. - It is available as a separate download from <a - href="http://vaadin.com/book">http://vaadin.com/book</a> - </p> - <p> - The <a - href="http://dev.vaadin.com/query?status=closed&type=enhancement&milestone=Vaadin+6.7.0.rc1&or&status=closed&type=enhancement&milestone=Vaadin+6.7.0.beta1&or&status=closed&type=enhancement&milestone=Vaadin+6.7.0&group=status&col=id&col=summary&col=type&col=owner&col=priority&col=component&col=version&order=priority">full - details of the enhancements</a> can be found at dev.vaadin.com.</a> - </p> - <h2 id="fixes">Fixes in Vaadin @version@</h2> + </head> + + <body> + <div id="header"> + <h1>Vaadin – thinking of U and I</h1> + <div id="version"> + <strong>Version @version@</strong> + </div> + </div> <!-- /header --> + + <div id="content"> + <p>Version @version@ built on @builddate@.</p> + + <h2 id="tableofcontents">Release Notes for Vaadin Framework @version@</h2> + <ul> + <li><a href="#overview">Package contents</a></li> + <li><a href="#enhancements">Enhancements in Vaadin @version-minor@</a></li> + <li><a href="#changelog">Complete change log for Vaadin @version@</a></li> + <li><a href="#migrating">Migrating from Vaadin 6 to Vaadin 7</a></li> + <li><a href="#dependencies">Vaadin @version@ dependencies</a></li> + <li><a href="#upgrading">Upgrading to Vaadin @version-minor@</a></li> + <li><a href="#supportedversions">Supported technologies</a></li> + <li><a href="#vaadinontheweb">Vaadin on the Web</a></li> + </ul> + + <h2 id="overview">Package Contents</h2> + + <p> + <b>Vaadin</b> is a Java framework for building modern web applications that look + great, perform well and make you and your users happy. <b>Vaadin</b> is available + under the Apache 2 license (see license.html). + </p> + + <p> + <b>Vaadin</b> is distributed as a single JAR file. Inside the JAR you will find: + </p> + + <ul> + <li>Vaadin server and client side classes (<tt>/com</tt>)</li> + <li>Vaadin server and client side sources (<tt>/com</tt>)</li> + <li>The default widget set (<tt>/VAADIN/widgetsets</tt>)</li> + <li>Themes: Runo, Reindeer and Chameleon (<tt>/VAADIN/themes</tt>)</li> + <li>Release notes (<tt>/release-notes.html</tt>)</li> + <li>Licensing information (<tt>/license.html</tt>)</li> + </ul> + + <h2 id="enhancements">Enhancements in Vaadin @version-minor@</h2> + + <p> + @version-minor@ is the first development release of the upcoming Version 7 of the + Vaadin Framework. It introduces the first set of new features in Vaadin 7, for the + purpose of receiving feedback regarding the changes. + </p> + + <p>The major changes in this first phase are: + + <ul> + <li>Redesign of the window and application APIs</li> + <li>Redesign of forms and data binding</li> + </ul> + + <p> + The enchancements are described in more detail in the <a + href="https://vaadin.com/wiki/-/wiki/Main/Vaadin+7">mini-tutorials</a> in the + Vaadin Wiki. + </p> + + <h3 id="changelog">ChangeLog</h3> + + <p> + For a complete list of changes in this release, please see the <a + href="http://dev.vaadin.com/query?status=closed&group=resolution&milestone=Vaadin+7.0.0.alpha1">list + of closed tickets</a>. + </p> + + <h2 id="migrating">Migrating from Vaadin 6</h2> + + <p> + All Vaadin 6 applications need some changes when migrating to Vaadin 7. The most + obvious changes are in the application/window API and require extending either + <b>Root</b> or <b>Root.LegacyApplication</b> instead of <b>Application</b>. + </p> + + <p> + A detailed list of migration changes are given in the <a + href="http://dev.vaadin.com/wiki/Vaadin7/MigrationGuide">Vaadin 7 Migration + Guide</a>. + </p> + + <h2 id="dependencies">Vaadin @version@ Dependencies</h2> + + <h3>Google Web Toolkit (GWT)</h3> + + <p> + Vaadin uses GWT @gwt-version@ for widget set compilation. GWT can be downloaded + from <a + href="http://code.google.com/webtoolkit/">http://code.google.com/webtoolkit/</a>. + GWT can also be automatically downloaded by the Vaadin Plug-in for Eclipse. Please + note that GWT @gwt-version@ requires the <i>validation-api-1.0.0.GA.jar</i> and + <i>validation-api-1.0.0.GA-sources.jar</i> files in addition to <i>gwt-dev.jar</i> + and <i>gwt-user.jar</i> for widget set compilation. + </p> + + <h3>Bean Validation</h3> + + <p> + If you want to use the bean validation feature in Vaadin 7, you need a Bean + Validation API implementation. You need to install the JAR in the + <tt>WEB-INF/lib</tt> directory. + </p> + + <h2 id="upgrading">Upgrading to Vaadin @version-minor@</h2> + + <h3>Upgrading the Eclipse Plugin</h3> + + <p> + This release requires that you use the <i>experimental</i> Vaadin Plugin for + Eclipse. Its update site is + <tt>http://vaadin.com/eclipse/experimental</tt>. Please see the <a + href="http://vaadin.com/eclipse">installation instructions</a> for more details. + </p> + + <h3>General Upgrading Instructions</h3> + + <p> + When upgrading from an earlier Vaadin version, you must: + </p> - <p> - #7788 Field.setProperyDatasource() does not reflect value for 6.7.0<br/> - #7479 Vaadin apps cannot current be deployed on IBM WebSphere v8<br/> - #7724 TextField with PropertyFormatter did not repaint in 6.7.0 (event with requestRepaint() call)<br/> - #7731 Javascript error when adding an item to an empty Table when setColumnWidth is used<br/> - #7776 AbstractField don't respect value change events from property during commit<br/> - #7778 Table rendering problem<br/> - #6588 Repainting in TextChangeListener will send wrong value to client.<br/> - #7720 TreeTable doesn't get refreshed if all entries are removed<br/> - #7738 Slashes or backslahes in ApplicationResources URLs should not be encoded<br/> - #7753 TreeTable gets into a state that causes internal error when getChildren throws an exception.<br/> - #3710 Width is miscalculated for the footer layouts in forms of undefined size<br/> - #7548 TestBench pressSpecialKey (arrows) doesn't work on Tree in IE6<br/> - #7708 DragAndDropWrapper.setDescription("foo") does not work<br/> - #7736 Logging level of SqlContainer is too high<br/> - #7755 Debug window "highlight component" does not work with sub windows<br/> - </p> - <p> - The <a href="http://dev.vaadin.com/query?status=closed&type=defect&milestone=Vaadin%20@version@">full - details of the defects</a> can be found at dev.vaadin.com. - </p> - - <h2 id="backwardsincompatibilities">Backwards incompatible - changes in Vaadin @version-minor@</h2> - <p>Table.ColumnGenerator.generateCell has been changed to return - Object instead of Component to enable generation of plain text.</p> - <p>Package names for SQLContainer, TreeTable and Chameleon Theme - java files have been changed from com.vaadin.addons.* to com.vaadin.*</p> - </p> - <p>If you have been using SQLContainer, TreeTable or Chameleon - Theme as add-ons, remove the add-on jars from the project.</p> - <p>The DOM structure of Forms without descriptions has changed, which means - that any TestBench scripts testing this kind of Form need to be updated. - If your tests start failing, subtract one from the index in the test script, - e.g. change - <pre class="codeblock">VForm[0]/domChild[0]/domChild[3]</pre> - into - <pre class="codeblock">VForm[0]/domChild[0]/domChild[2]</pre> - and your tests will pass again.</p> - - <h2 id="dependencies">Vaadin @version@ dependencies</h2> - Vaadin uses GWT @gwt-version@ for widget set compilation. GWT can be - downloaded from <a href="http://code.google.com/webtoolkit/">http://code.google.com/webtoolkit/</a>. - GWT can also be automatically downloaded by the Vaadin Plug-in for - Eclipse. Please note that GWT @gwt-version@ requires the <i>validation-api-1.0.0.GA.jar</i> - and <i>validation-api-1.0.0.GA-sources.jar</i> files in addition to <i>gwt-dev.jar</i> - and <i>gwt-user.jar</i> for widget set compilation. - - <h2 id="upgrading">Upgrading to Vaadin @version-minor@</h2> - <p> - When upgrading from an earlier Vaadin version, you must - <ul> - <li>Recompile your classes using the new Vaadin JAR. Binary - compatibility is only guaranteed for maintenance releases of - Vaadin.</li> - <li>Recompile any add-ons you have created using the new Vaadin - JAR.</li> - <li>Recompile your widget set using the new Vaadin JAR and the - newly compiled add-ons.</li> - <li>If you have extracted a theme from the Vaadin JAR, you need - to update it with the theme provided in the new Vaadin JAR.</li> - </ul> - </p> - <p>Remember also to refresh the project in your IDE to ensure that - the new version of everything is in use.</p> - <p>Using the "?debug" URL parameter you can verify that the - version of the servlet (JAR), the theme and the widgetset all match.</p> - <p> - <b>Eclipse</b> users should always check if there is a new version of - the Eclipse Plug-in available. The Eclipse Plug-in can be used to - update the Vaadin version in the project (Project properties » - Vaadin). - </p> - - <p> - <b>Maven</b> users should update the Vaadin dependency version in the - <tt>pom.xml</tt> - unless it is defined as - <tt>LATEST</tt> - . You must also ensure that the GWT dependency uses the correct - version and recompile your project and your widget set. - - </p> - - <b>Liferay and other portal</b> users must install the new - vaadin-@version@.jar as - <t>ROOT/WEB-INF/lib/vaadin.jar</b> in the portal. Additionally the - contents of the <tt>VAADIN</tt> folder from the JAR must be extracted - to the <tt>ROOT/html/VAADIN</tt> directory in the Liferay - installation. If your portal uses custom widgets, install the latest - version of <a - href="http://vaadin.com/directory#addon/vaadin-control-panel-for-liferay">Vaadin - Control Panel for Liferay</a> for easy widget set compilation. - - <h3>Upgrading from Vaadin 6.5 or earlier</h3> - If you are upgrading from 6.5.x or earlier, notice that Vaadin - @version@ uses GWT @gwt-version@. Upgrade your dependencies as - necessary. See <a href="#dependencies">the dependencies</a> section - for more information. - </p> - - <h3 id="widgetupgrade">Upgrading from Vaadin 6.1 or earlier</h3> - - <p> - The way widget sets are created was completely changed in Vaadin 6.2. - Existing projects, where custom widgets (a custom widget set) are - used, must be migrated when upgrading to Vaadin 6.2 or later. - Projects where the default widget set is used do not need migration. - See <a - href="http://vaadin.com/download/release/6.2/6.2.0/release-notes.html">Vaadin - 6.2.0 release notes</a> for more details. - </p> - - <h4 id="gae">Notes and Limitations for Google App Engine</h4> - - <p>The following instructions and limitations apply when you run a - Vaadin application under the Google App Engine.</p> - - <ul> - <li><p> - Applications must use <b>GAEApplicationServlet</b> instead of <b>ApplicationServlet</b> - in - <tt>web.xml</tt> - . - </p> - </li> - - <li><p> - Session support must be enabled in - <tt>appengine-web.xml</tt> - : - </p> <pre> <sessions-enabled>true</sessions-enabled></pre> - </li> - - <li><p>Avoid using the session for storage, usual App Engine - limitations apply (no synchronization, i.e, unreliable).</p> - </li> - - <li><p> - Vaadin uses memcache for mutex, the key is of the form - <tt>_vmutex<sessionid></tt> - . - </p> - </li> - - <li><p> - The Vaadin <b>WebApplicationContext</b> class is serialized - separately into memcache and datastore; the memcache key is - <tt>_vac<sessionid></tt> - and the datastore entity kind is - <tt>_vac</tt> - with identifiers of the type - <tt>_vac<sessionid></tt> - . - </p> - </li> - - <li><p> - DO NOT update application state when serving an <b>ApplicationResource</b> - (e.g <b>ClassResource</b>.<i>getStream()</i>). - </p> - </li> - - <li><p> - AVOID (or be very careful when) updating application state in a <b>TransactionListener</b> - or a <b>HttpServletRequestListener</b> - they are called even when - the application is not locked and won't be serialized (e.g <b>ApplicationResource</b>), - and changes can thus go missing (it should be safe to update things - that can be safely discarded later - i.e valid only for the current - request) - </p> - </li> - - <li><p>The application remains locked during uploads - a - progress bar is not possible</p> - </li> - </ul> - - - <p> - For other known problems, see open tickets at developer site <a - href="http://dev.vaadin.com/">dev.vaadin.com</a>. - </p> - - <h2 id="supportedversions">Supported technologies</h2> - - <p> - Vaadin is based on <b>Java 5</b> and it is also compatible with most - other operating system supporting Java 5 or newer. Vaadin is - supported on the following <b>operating systems</b>: - </p> - - <ul> - <li>Windows (see the <a href="#knownissues">Zip installation - notice above</a>)</li> - <li>Linux</li> - <li>Mac OS X</li> - </ul> - - <p> - Vaadin requires <b>Java Servlet API 2.3</b> but also supports later - versions and should work with any Java application server that - conforms to the standard. The following <b>application servers</b> - are supported: - </p> - - <ul> - <li>Apache Tomcat, version 4.1-7.0</li> - <li>Oracle WebLogic® Server, version 9.2-10.3.5(11gR1)</li> - <li>IBM WebSphere® Application Server, version 6.1-8.0</li> - <li>JBoss Application Server, 3.2.8-7.0</li> - <li>Jetty, version 5.0-7.0</li> - <li>Glassfish, version 2.0-3.1</li> - </ul> - <p> - Vaadin supports JSR-168 and JSR-286 Portlet specifications. All - portals that implement either of the portlet specifications should - work. The following <b>portals</b> are supported: - </p> - <ul> - <li>Liferay Portal 5.2-6.0</li> - <li>GateIn Portal 3.1</li> - <li>eXo Platform 3</li> - <li>Oracle WebLogic® Portal 10gR3</li> - <li>WebSphere Portal 6.1-7.0</li> - </ul> - <p> - Vaadin also supports <b>Google App Engine</b>. - </p> - <p> - Vaadin supports the following <b>browsers</b>: - </p> - - <ul> - <li>Mozilla Firefox 3-10</li> - <li>Internet Explorer 6-9</li> - <li>Safari 4-5</li> - <li>Opera 10-11</li> - <li>Google Chrome 13-16</li> - </ul> - - <p> - Vaadin supports the built-in browsers in the following <b>mobile operating - systems</b>: - </p> - - <ul> - <li>iOS 4-5</li> - <li>Android 2-3</li> - </ul> - - <h2 id="vaadinontheweb">Vaadin on the Web</h2> - <p> - <ul> - <li><a href="http://vaadin.com">vaadin.com - The developer - portal containing everything you need to know about Vaadin</a> - </li> - <li><a href="http://demo.vaadin.com">demo.vaadin.com - A - collection of demos for Vaadin</a></li> - <li><a href="http://vaadin.com/learn">vaadin.com/learn - - Getting started with Vaadin</a></li> - <li><a href="http://vaadin.com/forum">vaadin.com/forum - - Forums for Vaadin related discussions - </li> - <li><a href="http://vaadin.com/book">vaadin.com/book - Book - of Vaadin - everything you need to know about Vaadin - </li> - <li><a href="http://vaadin.com/api">vaadin.com/api - Online - javadocs - </li> - <li><a href="http://vaadin.com/directory">vaadin.com/directory - - Add-ons for Vaadin - </li> - <li><a href="http://dev.vaadin.com">dev.vaadin.com - Bug - tracker - </li> - <li><a - href="http://dev.vaadin.com/svn/versions/@version-minor@">dev.vaadin.com/svn/versions/@version-minor@ - - Source code - </li> - <li><a href="http://vaadin.com/pro-account">vaadin.com/pro-account - - Commercial support and tools for Vaadin development - </li> - <li><a href="http://vaadin.com/services">vaadin.com/services - - Expert services for Vaadin - </li> - <li><a href="http://vaadin.com/company">vaadin.com/company - - Information about the company behind Vaadin - </li> - </ul> - </p> - </div> - <!-- /content--> + <ul> + <li>Recompile your classes using the new Vaadin JAR. Binary + compatibility is only guaranteed for maintenance releases of + Vaadin.</li> + + <li>Recompile any add-ons you have created using the new Vaadin + JAR.</li> + + <li>Recompile your widget set using the new Vaadin JAR and the newly compiled + add-ons.</li> + + <li>If you have extracted a theme from the Vaadin JAR, you need to update it with + the theme provided in the new Vaadin JAR.</li> + </ul> + + <p> + Remember also to refresh the project in your IDE to ensure that the new version of + everything is in use. + </p> + + <p> + Using the "?debug" URL parameter you can verify that the version of the servlet + (JAR), the theme and the widgetset all match. + </p> + + <p> + <b>Eclipse</b> users should always check if there is a new version of + the Eclipse Plug-in available. The Eclipse Plug-in can be used to + update the Vaadin version in the project (Project properties » + Vaadin). + </p> + + <p> + <b>Maven</b> users should update the Vaadin dependency version in the + <tt>pom.xml</tt> unless it is defined as <tt>LATEST</tt> . You must also ensure + that the GWT dependency uses the correct version and recompile your project and + your widget set. + </p> + + <p> + <b>Liferay and other portal</b> users must install the new vaadin-@version@.jar as + <t>ROOT/WEB-INF/lib/vaadin.jar</b> in the portal. Additionally the contents of the + <tt>VAADIN</tt> folder from the JAR must be extracted to the + <tt>ROOT/html/VAADIN</tt> directory in the Liferay installation. If your portal + uses custom widgets, install the latest version of <a + href="http://vaadin.com/directory#addon/vaadin-control-panel-for-liferay">Vaadin + Control Panel for Liferay</a> for easy widget set compilation. + </p> + + <h2 id="gae">Notes and Limitations for Google App Engine</h4> + + <p>The following instructions and limitations apply when you run a Vaadin + application under the Google App Engine.</p> + + <ul> + <li> + <p> + Applications must use <b>GAEApplicationServlet</b> instead of + <b>ApplicationServlet</b> in <tt>web.xml</tt>. + </p> + </li> + + <li> + <p> + Session support must be enabled in + <tt>appengine-web.xml</tt>: + </p> + + <pre> <sessions-enabled>true</sessions-enabled></pre> + </li> + + <li> + <p> + Avoid using the session for storage, usual App Engine limitations apply (no + synchronization, i.e, unreliable). + </p> + </li> + + <li> + <p> + Vaadin uses memcache for mutex, the key is of the form + <tt>_vmutex<sessionid></tt>. + </p> + </li> + + <li> + <p> + The Vaadin <b>WebApplicationContext</b> class is serialized separately into + memcache and datastore; the memcache key is <tt>_vac<sessionid></tt> and + the datastore entity kind is <tt>_vac</tt> with identifiers of the type + <tt>_vac<sessionid></tt>. + </p> + </li> + + <li> + <p> + DO NOT update application state when serving an <b>ApplicationResource</b> + (e.g <b>ClassResource</b>.<i>getStream()</i>). + </p> + </li> + + <li> + <p> + AVOID (or be very careful when) updating application state in a + <b>TransactionListener</b> or a <b>HttpServletRequestListener</b> - they are + called even when the application is not locked and won't be serialized (e.g + <b>ApplicationResource</b>), and changes can thus go missing (it should be + safe to update things that can be safely discarded later - i.e valid only for + the current request) + </p> + </li> + + <li> + <p> + The application remains locked during uploads - a progress bar is not + possible + </p> + </li> + </ul> + + <p> + For other known problems, see open tickets at developer site <a + href="http://dev.vaadin.com/">dev.vaadin.com</a>. + </p> + + <h2 id="supportedversions">Supported Technologies</h2> + + <p> + Vaadin 7 is compatible with <b>Java 5</b> and it is also compatible with most other + operating system supporting Java 5 or newer. However, using Java 6 is recommended, + as it is required by widget set compilation. + </p> + + <p> + Vaadin 7 is supported on the following <b>operating systems</b>: + </p> + + <ul> + <li>Windows (see the <a href="#knownissues">Zip installation + notice above</a>)</li> + <li>Linux</li> + <li>Mac OS X</li> + </ul> + + <p> + Vaadin 7 requires <b>Java Servlet API 2.4</b> but also supports later versions and + should work with any Java application server that conforms to the standard. The + following <b>application servers</b> are supported: + </p> + + <ul> + <li>Apache Tomcat, version 5.0-7.0</li> + <li>Oracle WebLogic® Server, version 9.2-10.3.5(11gR1)</li> + <li>IBM WebSphere® Application Server, version 6.1-8.0</li> + <li>JBoss Application Server, 4.0.0-7.0</li> + <li>Jetty, version 5.0-7.0</li> + <li>Glassfish, version 2.0-3.1</li> + </ul> + + <p> + Vaadin 7 supports the JSR-286 Portlet specification. All portals that + implement either of the portlet specifications should work. The following + <b>portals</b> are supported: + </p> + + <ul> + <li>Liferay Portal 5.2-6.0</li> + <li>GateIn Portal 3.1</li> + <li>eXo Platform 3</li> + </ul> + + <p> + Vaadin also supports <b>Google App Engine</b>. + </p> + + <p> + Vaadin supports the following <b>browsers</b>: + </p> + + <ul> + <li>Mozilla Firefox 10</li> + <li>Internet Explorer 8-9</li> + <li>Safari 5</li> + <li>Opera 11</li> + <li>Google Chrome 16</li> + </ul> + + <h2 id="vaadinontheweb">Vaadin on the Web</h2> + + <ul> + <li><a href="http://vaadin.com">vaadin.com - The developer + portal containing everything you need to know about Vaadin</a> + </li> + <li><a href="http://demo.vaadin.com">demo.vaadin.com - A + collection of demos for Vaadin</a></li> + <li><a href="http://vaadin.com/learn">vaadin.com/learn - + Getting started with Vaadin</a></li> + <li><a href="http://vaadin.com/forum">vaadin.com/forum - + Forums for Vaadin related discussions</a> + </li> + <li><a href="http://vaadin.com/book">vaadin.com/book - Book + of Vaadin - everything you need to know about Vaadin</a> + </li> + <li><a href="http://vaadin.com/api">vaadin.com/api - Online + javadocs</a> + </li> + <li><a href="http://vaadin.com/directory">vaadin.com/directory + - Add-ons for Vaadin</a> + </li> + + <li><a href="http://vaadin.com/pro-account">vaadin.com/pro-account + - Commercial support and tools for Vaadin development </a> + </li> + <li><a href="http://vaadin.com/services">vaadin.com/services + - Expert services for Vaadin</a> + </li> + <li><a href="http://vaadin.com/company">vaadin.com/company + - Information about the company behind Vaadin</a> + </li> + + <li><a href="http://dev.vaadin.com">dev.vaadin.com - Bug tracker</a></li> + + <li><a + href="http://dev.vaadin.com/wiki/Vaadin/Development/StartingVaadin7Development">How + to get the source code of Vaadin</a> + </li> + </ul> + </div> <!-- /content--> <div id="footer"> <span class="slogan"><strong>vaadin <em>}></em> </strong> thinking of U and I<span> <a href="#top">↑ Back to top</a> - </div> - <!-- /footer --> - -</body> -</html>
\ No newline at end of file + </div> <!-- /footer --> + </body> +</html> + +<!-- Keep this comment at the end of the file +Local variables: +mode: xml +sgml-omittag:nil +sgml-shorttag:nil +sgml-namecase-general:nil +sgml-general-insert-case:lower +sgml-minimize-attributes:nil +sgml-always-quote-attributes:t +sgml-indent-step:2 +sgml-indent-data:t +sgml-parent-document:nil +sgml-exposed-tags:nil +sgml-local-catalogs:("/etc/sgml/catalog" "/usr/share/xemacs21/xemacs-packages/etc/psgml-dtds/CATALOG") +sgml-local-ecat-files:("ECAT" "~/sgml/ECAT" "/usr/share/sgml/ECAT" "/usr/local/share/sgml/ECAT" "/usr/local/lib/sgml/ECAT") +End: +--> |
