diff options
21 files changed, 267 insertions, 374 deletions
diff --git a/WebContent/VAADIN/readme.txt b/WebContent/VAADIN/readme.txt index 4e4d0030aa..ed7ab74ec4 100644 --- a/WebContent/VAADIN/readme.txt +++ b/WebContent/VAADIN/readme.txt @@ -2,7 +2,7 @@ Themes and Widget Sets ====================== -The WebContent/ITMILL directory contains Themes and Widgetsets. +The WebContent/VAADIN directory contains Themes and Widgetsets. ------ Themes diff --git a/WebContent/VAADIN/themes/base/styles.css b/WebContent/VAADIN/themes/base/styles.css index 42680407c3..283c6b6dc1 100644 --- a/WebContent/VAADIN/themes/base/styles.css +++ b/WebContent/VAADIN/themes/base/styles.css @@ -1,12 +1,12 @@ /* Automatically compiled css file from subdirectories. */ -/* ./WebContent/ITMILL/themes/base/absolutelayout/absolutelayout.css */ +/* ./WebContent/VAADIN/themes/base/absolutelayout/absolutelayout.css */ .v-absolutelayout-wrapper { position: absolute; overflow: hidden; } -/* ./WebContent/ITMILL/themes/base/accordion/accordion.css */ +/* ./WebContent/VAADIN/themes/base/accordion/accordion.css */ .v-accordion { position: relative; outline: none; @@ -34,7 +34,7 @@ width: 100%; } -/* ./WebContent/ITMILL/themes/base/button/button.css */ +/* ./WebContent/VAADIN/themes/base/button/button.css */ .v-button { cursor: pointer; white-space: nowrap; @@ -131,7 +131,7 @@ } */ -/* ./WebContent/ITMILL/themes/base/caption/caption.css */ +/* ./WebContent/VAADIN/themes/base/caption/caption.css */ .v-captionwrapper { text-align: left; /* Force default alignment */ } @@ -164,7 +164,7 @@ display: inline; } -/* ./WebContent/ITMILL/themes/base/common/common.css */ +/* ./WebContent/VAADIN/themes/base/common/common.css */ /* References the BODY tag generated by Vaadin application servlet */ .v-generated-body { width: 100%; @@ -352,17 +352,17 @@ padding: 2px; } -/* ./WebContent/ITMILL/themes/base/customcomponent/customcomponent.css */ +/* ./WebContent/VAADIN/themes/base/customcomponent/customcomponent.css */ .v-customcomponent { overflow: hidden; } -/* ./WebContent/ITMILL/themes/base/customlayout/customlayout.css */ +/* ./WebContent/VAADIN/themes/base/customlayout/customlayout.css */ .v-customlayout { overflow: hidden; } -/* ./WebContent/ITMILL/themes/base/datefield/datefield.css */ +/* ./WebContent/VAADIN/themes/base/datefield/datefield.css */ .v-datefield { white-space: nowrap; } @@ -435,7 +435,7 @@ filter: alpha(opacity=30); } -/* ./WebContent/ITMILL/themes/base/formlayout/formlayout.css */ +/* ./WebContent/VAADIN/themes/base/formlayout/formlayout.css */ .v-formlayout-cell .v-errorindicator { display: block; } @@ -476,7 +476,7 @@ float: none; } -/* ./WebContent/ITMILL/themes/base/gridlayout/gridlayout.css */ +/* ./WebContent/VAADIN/themes/base/gridlayout/gridlayout.css */ .v-gridlayout-margin-top { padding-top: 2em; } @@ -508,7 +508,7 @@ overflow: hidden; } -/* ./WebContent/ITMILL/themes/base/link/link.css */ +/* ./WebContent/VAADIN/themes/base/link/link.css */ .v-link { white-space: nowrap; } @@ -528,7 +528,7 @@ border:none; } -/* ./WebContent/ITMILL/themes/base/menubar/menubar.css */ +/* ./WebContent/VAADIN/themes/base/menubar/menubar.css */ .v-menubar table { white-space: nowrap; border-collapse: collapse; @@ -567,7 +567,7 @@ cursor: default; } -/* ./WebContent/ITMILL/themes/base/notification/notification.css */ +/* ./WebContent/VAADIN/themes/base/notification/notification.css */ .v-Notification { background: #999; color: #fff; @@ -610,7 +610,7 @@ white-space: nowrap; } -/* ./WebContent/ITMILL/themes/base/orderedlayout/orderedlayout.css */ +/* ./WebContent/VAADIN/themes/base/orderedlayout/orderedlayout.css */ .v-orderedlayout-margin-top, .v-horizontallayout-margin-top, .v-verticallayout-margin-top { @@ -654,7 +654,7 @@ overflow: hidden; } -/* ./WebContent/ITMILL/themes/base/panel/panel.css */ +/* ./WebContent/VAADIN/themes/base/panel/panel.css */ .v-panel, .v-panel-caption, .v-panel-content, @@ -691,7 +691,7 @@ .v-panel-deco { } -/* ./WebContent/ITMILL/themes/base/popupview/popupview.css */ +/* ./WebContent/VAADIN/themes/base/popupview/popupview.css */ .v-popupview { cursor: pointer; width: 5px; @@ -702,7 +702,7 @@ overflow: auto; } -/* ./WebContent/ITMILL/themes/base/progressindicator/progressindicator.css */ +/* ./WebContent/VAADIN/themes/base/progressindicator/progressindicator.css */ .v-progressindicator { overflow: hidden; /* for IE6 */ width: 150px; @@ -739,7 +739,7 @@ overflow: hidden; /* for IE6 */ } -/* ./WebContent/ITMILL/themes/base/select/select.css */ +/* ./WebContent/VAADIN/themes/base/select/select.css */ .v-select { text-align: left; } @@ -875,7 +875,7 @@ } */ -/* ./WebContent/ITMILL/themes/base/shadow/shadow.css */ +/* ./WebContent/VAADIN/themes/base/shadow/shadow.css */ .v-shadow { position: absolute; } @@ -962,7 +962,7 @@ margin-left: -4px; } -/* ./WebContent/ITMILL/themes/base/slider/slider.css */ +/* ./WebContent/VAADIN/themes/base/slider/slider.css */ .v-slider { margin: 5px 0; } @@ -1028,7 +1028,7 @@ margin: 0 -1px; } -/* ./WebContent/ITMILL/themes/base/splitpanel/splitpanel.css */ +/* ./WebContent/VAADIN/themes/base/splitpanel/splitpanel.css */ .v-splitpanel-horizontal, .v-splitpanel-vertical { overflow: hidden; @@ -1061,7 +1061,7 @@ height: 99%; } -/* ./WebContent/ITMILL/themes/base/table/table.css */ +/* ./WebContent/VAADIN/themes/base/table/table.css */ /* Table theme building instructions * * Toolkit scroll table is very complex widget with dozens of features. These @@ -1208,7 +1208,7 @@ color: #ddd; } -/* ./WebContent/ITMILL/themes/base/tabsheet/tabsheet.css */ +/* ./WebContent/VAADIN/themes/base/tabsheet/tabsheet.css */ .v-tabsheet, .v-tabsheet-content, .v-tabsheet-deco { @@ -1295,7 +1295,7 @@ height: 0; } -/* ./WebContent/ITMILL/themes/base/textfield/textfield.css */ +/* ./WebContent/VAADIN/themes/base/textfield/textfield.css */ .v-textfield { text-align: left /* Force default alignment */ } @@ -1349,7 +1349,7 @@ textarea.v-textarea-prompt { outline-width: medium; } -/* ./WebContent/ITMILL/themes/base/tree/tree.css */ +/* ./WebContent/VAADIN/themes/base/tree/tree.css */ .v-tree { text-align: left /* Force default alignment */ } @@ -1398,7 +1398,7 @@ div.v-tree-node-leaf { clear: left; } -/* ./WebContent/ITMILL/themes/base/window/window.css */ +/* ./WebContent/VAADIN/themes/base/window/window.css */ .v-window { background: #fff; } diff --git a/WebContent/VAADIN/themes/default/styles.css b/WebContent/VAADIN/themes/default/styles.css index 3c0e4f2bdc..ae96ce10a1 100644 --- a/WebContent/VAADIN/themes/default/styles.css +++ b/WebContent/VAADIN/themes/default/styles.css @@ -1,12 +1,12 @@ /* Automatically compiled css file from subdirectories. */ -/* ./WebContent/ITMILL/themes/base/absolutelayout/absolutelayout.css */ +/* ./WebContent/VAADIN/themes/base/absolutelayout/absolutelayout.css */ .v-absolutelayout-wrapper { position: absolute; overflow: hidden; } -/* ./WebContent/ITMILL/themes/base/accordion/accordion.css */ +/* ./WebContent/VAADIN/themes/base/accordion/accordion.css */ .v-accordion { position: relative; outline: none; @@ -34,7 +34,7 @@ width: 100%; } -/* ./WebContent/ITMILL/themes/base/button/button.css */ +/* ./WebContent/VAADIN/themes/base/button/button.css */ .v-button { cursor: pointer; white-space: nowrap; @@ -131,7 +131,7 @@ } */ -/* ./WebContent/ITMILL/themes/base/caption/caption.css */ +/* ./WebContent/VAADIN/themes/base/caption/caption.css */ .v-captionwrapper { text-align: left; /* Force default alignment */ } @@ -164,7 +164,7 @@ display: inline; } -/* ./WebContent/ITMILL/themes/base/common/common.css */ +/* ./WebContent/VAADIN/themes/base/common/common.css */ /* References the BODY tag generated by Vaadin application servlet */ .v-generated-body { width: 100%; @@ -352,17 +352,17 @@ padding: 2px; } -/* ./WebContent/ITMILL/themes/base/customcomponent/customcomponent.css */ +/* ./WebContent/VAADIN/themes/base/customcomponent/customcomponent.css */ .v-customcomponent { overflow: hidden; } -/* ./WebContent/ITMILL/themes/base/customlayout/customlayout.css */ +/* ./WebContent/VAADIN/themes/base/customlayout/customlayout.css */ .v-customlayout { overflow: hidden; } -/* ./WebContent/ITMILL/themes/base/datefield/datefield.css */ +/* ./WebContent/VAADIN/themes/base/datefield/datefield.css */ .v-datefield { white-space: nowrap; } @@ -435,7 +435,7 @@ filter: alpha(opacity=30); } -/* ./WebContent/ITMILL/themes/base/formlayout/formlayout.css */ +/* ./WebContent/VAADIN/themes/base/formlayout/formlayout.css */ .v-formlayout-cell .v-errorindicator { display: block; } @@ -476,7 +476,7 @@ float: none; } -/* ./WebContent/ITMILL/themes/base/gridlayout/gridlayout.css */ +/* ./WebContent/VAADIN/themes/base/gridlayout/gridlayout.css */ .v-gridlayout-margin-top { padding-top: 2em; } @@ -508,7 +508,7 @@ overflow: hidden; } -/* ./WebContent/ITMILL/themes/base/link/link.css */ +/* ./WebContent/VAADIN/themes/base/link/link.css */ .v-link { white-space: nowrap; } @@ -528,7 +528,7 @@ border:none; } -/* ./WebContent/ITMILL/themes/base/menubar/menubar.css */ +/* ./WebContent/VAADIN/themes/base/menubar/menubar.css */ .v-menubar table { white-space: nowrap; border-collapse: collapse; @@ -567,7 +567,7 @@ cursor: default; } -/* ./WebContent/ITMILL/themes/base/notification/notification.css */ +/* ./WebContent/VAADIN/themes/base/notification/notification.css */ .v-Notification { background: #999; color: #fff; @@ -610,7 +610,7 @@ white-space: nowrap; } -/* ./WebContent/ITMILL/themes/base/orderedlayout/orderedlayout.css */ +/* ./WebContent/VAADIN/themes/base/orderedlayout/orderedlayout.css */ .v-orderedlayout-margin-top, .v-horizontallayout-margin-top, .v-verticallayout-margin-top { @@ -654,7 +654,7 @@ overflow: hidden; } -/* ./WebContent/ITMILL/themes/base/panel/panel.css */ +/* ./WebContent/VAADIN/themes/base/panel/panel.css */ .v-panel, .v-panel-caption, .v-panel-content, @@ -691,7 +691,7 @@ .v-panel-deco { } -/* ./WebContent/ITMILL/themes/base/popupview/popupview.css */ +/* ./WebContent/VAADIN/themes/base/popupview/popupview.css */ .v-popupview { cursor: pointer; width: 5px; @@ -702,7 +702,7 @@ overflow: auto; } -/* ./WebContent/ITMILL/themes/base/progressindicator/progressindicator.css */ +/* ./WebContent/VAADIN/themes/base/progressindicator/progressindicator.css */ .v-progressindicator { overflow: hidden; /* for IE6 */ width: 150px; @@ -739,7 +739,7 @@ overflow: hidden; /* for IE6 */ } -/* ./WebContent/ITMILL/themes/base/select/select.css */ +/* ./WebContent/VAADIN/themes/base/select/select.css */ .v-select { text-align: left; } @@ -875,7 +875,7 @@ } */ -/* ./WebContent/ITMILL/themes/base/shadow/shadow.css */ +/* ./WebContent/VAADIN/themes/base/shadow/shadow.css */ .v-shadow { position: absolute; } @@ -962,7 +962,7 @@ margin-left: -4px; } -/* ./WebContent/ITMILL/themes/base/slider/slider.css */ +/* ./WebContent/VAADIN/themes/base/slider/slider.css */ .v-slider { margin: 5px 0; } @@ -1028,7 +1028,7 @@ margin: 0 -1px; } -/* ./WebContent/ITMILL/themes/base/splitpanel/splitpanel.css */ +/* ./WebContent/VAADIN/themes/base/splitpanel/splitpanel.css */ .v-splitpanel-horizontal, .v-splitpanel-vertical { overflow: hidden; @@ -1061,7 +1061,7 @@ height: 99%; } -/* ./WebContent/ITMILL/themes/base/table/table.css */ +/* ./WebContent/VAADIN/themes/base/table/table.css */ /* Table theme building instructions * * Toolkit scroll table is very complex widget with dozens of features. These @@ -1208,7 +1208,7 @@ color: #ddd; } -/* ./WebContent/ITMILL/themes/base/tabsheet/tabsheet.css */ +/* ./WebContent/VAADIN/themes/base/tabsheet/tabsheet.css */ .v-tabsheet, .v-tabsheet-content, .v-tabsheet-deco { @@ -1295,7 +1295,7 @@ height: 0; } -/* ./WebContent/ITMILL/themes/base/textfield/textfield.css */ +/* ./WebContent/VAADIN/themes/base/textfield/textfield.css */ .v-textfield { text-align: left /* Force default alignment */ } @@ -1349,7 +1349,7 @@ textarea.v-textarea-prompt { outline-width: medium; } -/* ./WebContent/ITMILL/themes/base/tree/tree.css */ +/* ./WebContent/VAADIN/themes/base/tree/tree.css */ .v-tree { text-align: left /* Force default alignment */ } @@ -1398,7 +1398,7 @@ div.v-tree-node-leaf { clear: left; } -/* ./WebContent/ITMILL/themes/base/window/window.css */ +/* ./WebContent/VAADIN/themes/base/window/window.css */ .v-window { background: #fff; } @@ -1551,13 +1551,13 @@ div.v-window-header { } /* Automatically compiled css file from subdirectories. */ -/* ./WebContent/ITMILL/themes/default/absolutelayout/absolutelayout.css */ +/* ./WebContent/VAADIN/themes/default/absolutelayout/absolutelayout.css */ .v-absolutelayout-wrapper { position: absolute; overflow:hidden; } -/* ./WebContent/ITMILL/themes/default/accordion/accordion.css */ +/* ./WebContent/VAADIN/themes/default/accordion/accordion.css */ .v-accordion-item { background-color: #fff; } @@ -1580,7 +1580,7 @@ div.v-window-header { border-bottom: 1px solid #c8cccd; } -/* ./WebContent/ITMILL/themes/default/button/button.css */ +/* ./WebContent/VAADIN/themes/default/button/button.css */ .v-button { font-size: 13px; } @@ -1603,7 +1603,7 @@ div.v-window-header { padding-right: 5px; } -/* ./WebContent/ITMILL/themes/default/caption/caption.css */ +/* ./WebContent/VAADIN/themes/default/caption/caption.css */ .v-captionwrapper { margin: 0.3em 0 0 0; } @@ -1620,7 +1620,7 @@ div.v-window-header { margin-left: -3px; } -/* ./WebContent/ITMILL/themes/default/common/common.css */ +/* ./WebContent/VAADIN/themes/default/common/common.css */ .v-generated-body { background: #e9eced; } @@ -1738,7 +1738,7 @@ div.v-window-header { background-image: url(common/img/loading-indicator-wait.gif); } -/* ./WebContent/ITMILL/themes/default/datefield/datefield.css */ +/* ./WebContent/VAADIN/themes/default/datefield/datefield.css */ .v-datefield-button { font-size:13px; width: 22px; @@ -1876,7 +1876,7 @@ div.v-window-header { margin: 0; } -/* ./WebContent/ITMILL/themes/default/formlayout/formlayout.css */ +/* ./WebContent/VAADIN/themes/default/formlayout/formlayout.css */ .v-formlayout-cell .v-errorindicator { width: 10px; height: 16px; @@ -1932,7 +1932,7 @@ div.v-window-header { font-weight: bold; } -/* ./WebContent/ITMILL/themes/default/gridlayout/gridlayout.css */ +/* ./WebContent/VAADIN/themes/default/gridlayout/gridlayout.css */ .v-gridlayout-margin-top { padding-top: 15px; } @@ -1950,12 +1950,12 @@ div.v-window-header { padding-top: 8px; } -/* ./WebContent/ITMILL/themes/default/link/link.css */ +/* ./WebContent/VAADIN/themes/default/link/link.css */ .v-link a { color: #464f52; } -/* ./WebContent/ITMILL/themes/default/menubar/menubar.css */ +/* ./WebContent/VAADIN/themes/default/menubar/menubar.css */ .v-menubar { color: #464f52; border: 1px solid #c6cbcc; @@ -1989,7 +1989,7 @@ div.v-window-header { background: #5daee8; } -/* ./WebContent/ITMILL/themes/default/notification/notification.css */ +/* ./WebContent/VAADIN/themes/default/notification/notification.css */ .v-Notification { font-family: "Trebuchet MS", geneva, helvetica, arial, tahoma, verdana, sans-serif; background-color: #818e92; @@ -2066,7 +2066,7 @@ div.v-window-header { white-space: nowrap; } -/* ./WebContent/ITMILL/themes/default/orderedlayout/orderedlayout.css */ +/* ./WebContent/VAADIN/themes/default/orderedlayout/orderedlayout.css */ .v-orderedlayout-margin-top, .v-horizontallayout-margin-top, .v-verticallayout-margin-top { @@ -2094,7 +2094,7 @@ div.v-window-header { padding-left: 8px; } -/* ./WebContent/ITMILL/themes/default/panel/panel.css */ +/* ./WebContent/VAADIN/themes/default/panel/panel.css */ .v-panel { background: transparent url(panel/img/top-left.png) no-repeat; } @@ -2195,7 +2195,7 @@ div.v-window-header { overflow: hidden; } -/* ./WebContent/ITMILL/themes/default/popupview/popupview.css */ +/* ./WebContent/VAADIN/themes/default/popupview/popupview.css */ .v-popupview-popup { border: 1px solid #babfc0; border-bottom: 1px solid #dee2e3; @@ -2203,7 +2203,7 @@ div.v-window-header { padding: 3px; } -/* ./WebContent/ITMILL/themes/default/progressindicator/progressindicator.css */ +/* ./WebContent/VAADIN/themes/default/progressindicator/progressindicator.css */ .v-progressindicator { background: #dfe2e4 url(progressindicator/img/base.gif) repeat-x 0 1px; } @@ -2224,7 +2224,7 @@ div.v-window-header { background: #dfe2e4 url(common/img/blank.gif); } -/* ./WebContent/ITMILL/themes/default/select/select.css */ +/* ./WebContent/VAADIN/themes/default/select/select.css */ .v-select-select { font-size: 13px; } @@ -2384,7 +2384,7 @@ div.v-window-header { } */ -/* ./WebContent/ITMILL/themes/default/shadow/shadow.css */ +/* ./WebContent/VAADIN/themes/default/shadow/shadow.css */ .v-shadow { position: absolute; } @@ -2454,7 +2454,7 @@ div.v-window-header { background: transparent url(shadow/img/bottom-right.png); } -/* ./WebContent/ITMILL/themes/default/slider/slider.css */ +/* ./WebContent/VAADIN/themes/default/slider/slider.css */ .v-slider { border-top: 1px solid #cccfd0; border-bottom: 1px solid #cccfd0; @@ -2539,7 +2539,7 @@ div.v-window-header { margin: 0 -1px; } -/* ./WebContent/ITMILL/themes/default/splitpanel/splitpanel.css */ +/* ./WebContent/VAADIN/themes/default/splitpanel/splitpanel.css */ .v-splitpanel-horizontal, .v-splitpanel-vertical { overflow: hidden; } @@ -2594,7 +2594,7 @@ div.v-window-header { } -/* ./WebContent/ITMILL/themes/default/table/table.css */ +/* ./WebContent/VAADIN/themes/default/table/table.css */ .v-table-header-wrap { height: 36px; border: 1px solid #b6bbbc; @@ -2731,13 +2731,13 @@ div.v-window-header { 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="../../ITMILL/themes/default/table/img/scroll-position-bg.png", sizingMethod="scale"); - filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../ITMILL/themes/default/table/img/scroll-position-bg.png", sizingMethod="scale"); - filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="ITMILL/themes/default/table/img/scroll-position-bg.png", sizingMethod="scale"); - filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="/ITMILL/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"); + filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="/VAADIN/themes/default/table/img/scroll-position-bg.png", sizingMethod="scale"); } -/* ./WebContent/ITMILL/themes/default/tabsheet/tabsheet.css */ +/* ./WebContent/VAADIN/themes/default/tabsheet/tabsheet.css */ .v-tabsheet-tabs { height: 48px; } @@ -3008,7 +3008,7 @@ div.v-window-header { height: 0; } -/* ./WebContent/ITMILL/themes/default/textfield/textfield.css */ +/* ./WebContent/VAADIN/themes/default/textfield/textfield.css */ .v-textfield { background: #fff url(textfield/img/bg.png) repeat-x; padding: 2px; @@ -3046,7 +3046,7 @@ textarea.v-textarea-prompt { background: #fff url(textfield/img/bg.png) repeat-x; } -/* ./WebContent/ITMILL/themes/default/tree/tree.css */ +/* ./WebContent/VAADIN/themes/default/tree/tree.css */ .v-tree-node { background: transparent url(tree/img/collapsed.png) no-repeat 2px 1px; } @@ -3074,7 +3074,7 @@ textarea.v-textarea-prompt { padding: 1px; } -/* ./WebContent/ITMILL/themes/default/window/window.css */ +/* ./WebContent/VAADIN/themes/default/window/window.css */ .v-window { color: #464f52; font-family: "Trebuchet MS", geneva, helvetica, arial, tahoma, verdana, sans-serif; diff --git a/WebContent/VAADIN/themes/default/table/table.css b/WebContent/VAADIN/themes/default/table/table.css index 61dc500c95..30053523fd 100644 --- a/WebContent/VAADIN/themes/default/table/table.css +++ b/WebContent/VAADIN/themes/default/table/table.css @@ -134,8 +134,8 @@ 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="../../ITMILL/themes/default/table/img/scroll-position-bg.png", sizingMethod="scale"); - filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../ITMILL/themes/default/table/img/scroll-position-bg.png", sizingMethod="scale"); - filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="ITMILL/themes/default/table/img/scroll-position-bg.png", sizingMethod="scale"); - filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="/ITMILL/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"); + filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="/VAADIN/themes/default/table/img/scroll-position-bg.png", sizingMethod="scale"); }
\ No newline at end of file diff --git a/WebContent/VAADIN/themes/reindeer/styles.css b/WebContent/VAADIN/themes/reindeer/styles.css index 92b61d4cb7..cf1f63bb5f 100644 --- a/WebContent/VAADIN/themes/reindeer/styles.css +++ b/WebContent/VAADIN/themes/reindeer/styles.css @@ -1,12 +1,12 @@ /* Automatically compiled css file from subdirectories. */ -/* ./WebContent/ITMILL/themes/base/absolutelayout/absolutelayout.css */ +/* ./WebContent/VAADIN/themes/base/absolutelayout/absolutelayout.css */ .v-absolutelayout-wrapper { position: absolute; overflow: hidden; } -/* ./WebContent/ITMILL/themes/base/accordion/accordion.css */ +/* ./WebContent/VAADIN/themes/base/accordion/accordion.css */ .v-accordion { position: relative; outline: none; @@ -34,7 +34,7 @@ width: 100%; } -/* ./WebContent/ITMILL/themes/base/button/button.css */ +/* ./WebContent/VAADIN/themes/base/button/button.css */ .v-button { cursor: pointer; white-space: nowrap; @@ -131,7 +131,7 @@ } */ -/* ./WebContent/ITMILL/themes/base/caption/caption.css */ +/* ./WebContent/VAADIN/themes/base/caption/caption.css */ .v-captionwrapper { text-align: left; /* Force default alignment */ } @@ -164,7 +164,7 @@ display: inline; } -/* ./WebContent/ITMILL/themes/base/common/common.css */ +/* ./WebContent/VAADIN/themes/base/common/common.css */ /* References the BODY tag generated by Vaadin application servlet */ .v-generated-body { width: 100%; @@ -352,17 +352,17 @@ padding: 2px; } -/* ./WebContent/ITMILL/themes/base/customcomponent/customcomponent.css */ +/* ./WebContent/VAADIN/themes/base/customcomponent/customcomponent.css */ .v-customcomponent { overflow: hidden; } -/* ./WebContent/ITMILL/themes/base/customlayout/customlayout.css */ +/* ./WebContent/VAADIN/themes/base/customlayout/customlayout.css */ .v-customlayout { overflow: hidden; } -/* ./WebContent/ITMILL/themes/base/datefield/datefield.css */ +/* ./WebContent/VAADIN/themes/base/datefield/datefield.css */ .v-datefield { white-space: nowrap; } @@ -435,7 +435,7 @@ filter: alpha(opacity=30); } -/* ./WebContent/ITMILL/themes/base/formlayout/formlayout.css */ +/* ./WebContent/VAADIN/themes/base/formlayout/formlayout.css */ .v-formlayout-cell .v-errorindicator { display: block; } @@ -476,7 +476,7 @@ float: none; } -/* ./WebContent/ITMILL/themes/base/gridlayout/gridlayout.css */ +/* ./WebContent/VAADIN/themes/base/gridlayout/gridlayout.css */ .v-gridlayout-margin-top { padding-top: 2em; } @@ -508,7 +508,7 @@ overflow: hidden; } -/* ./WebContent/ITMILL/themes/base/link/link.css */ +/* ./WebContent/VAADIN/themes/base/link/link.css */ .v-link { white-space: nowrap; } @@ -528,7 +528,7 @@ border:none; } -/* ./WebContent/ITMILL/themes/base/menubar/menubar.css */ +/* ./WebContent/VAADIN/themes/base/menubar/menubar.css */ .v-menubar table { white-space: nowrap; border-collapse: collapse; @@ -567,7 +567,7 @@ cursor: default; } -/* ./WebContent/ITMILL/themes/base/notification/notification.css */ +/* ./WebContent/VAADIN/themes/base/notification/notification.css */ .v-Notification { background: #999; color: #fff; @@ -610,7 +610,7 @@ white-space: nowrap; } -/* ./WebContent/ITMILL/themes/base/orderedlayout/orderedlayout.css */ +/* ./WebContent/VAADIN/themes/base/orderedlayout/orderedlayout.css */ .v-orderedlayout-margin-top, .v-horizontallayout-margin-top, .v-verticallayout-margin-top { @@ -654,7 +654,7 @@ overflow: hidden; } -/* ./WebContent/ITMILL/themes/base/panel/panel.css */ +/* ./WebContent/VAADIN/themes/base/panel/panel.css */ .v-panel, .v-panel-caption, .v-panel-content, @@ -691,7 +691,7 @@ .v-panel-deco { } -/* ./WebContent/ITMILL/themes/base/popupview/popupview.css */ +/* ./WebContent/VAADIN/themes/base/popupview/popupview.css */ .v-popupview { cursor: pointer; width: 5px; @@ -702,7 +702,7 @@ overflow: auto; } -/* ./WebContent/ITMILL/themes/base/progressindicator/progressindicator.css */ +/* ./WebContent/VAADIN/themes/base/progressindicator/progressindicator.css */ .v-progressindicator { overflow: hidden; /* for IE6 */ width: 150px; @@ -739,7 +739,7 @@ overflow: hidden; /* for IE6 */ } -/* ./WebContent/ITMILL/themes/base/select/select.css */ +/* ./WebContent/VAADIN/themes/base/select/select.css */ .v-select { text-align: left; } @@ -875,7 +875,7 @@ } */ -/* ./WebContent/ITMILL/themes/base/shadow/shadow.css */ +/* ./WebContent/VAADIN/themes/base/shadow/shadow.css */ .v-shadow { position: absolute; } @@ -962,7 +962,7 @@ margin-left: -4px; } -/* ./WebContent/ITMILL/themes/base/slider/slider.css */ +/* ./WebContent/VAADIN/themes/base/slider/slider.css */ .v-slider { margin: 5px 0; } @@ -1028,7 +1028,7 @@ margin: 0 -1px; } -/* ./WebContent/ITMILL/themes/base/splitpanel/splitpanel.css */ +/* ./WebContent/VAADIN/themes/base/splitpanel/splitpanel.css */ .v-splitpanel-horizontal, .v-splitpanel-vertical { overflow: hidden; @@ -1061,7 +1061,7 @@ height: 99%; } -/* ./WebContent/ITMILL/themes/base/table/table.css */ +/* ./WebContent/VAADIN/themes/base/table/table.css */ /* Table theme building instructions * * Toolkit scroll table is very complex widget with dozens of features. These @@ -1208,7 +1208,7 @@ color: #ddd; } -/* ./WebContent/ITMILL/themes/base/tabsheet/tabsheet.css */ +/* ./WebContent/VAADIN/themes/base/tabsheet/tabsheet.css */ .v-tabsheet, .v-tabsheet-content, .v-tabsheet-deco { @@ -1295,7 +1295,7 @@ height: 0; } -/* ./WebContent/ITMILL/themes/base/textfield/textfield.css */ +/* ./WebContent/VAADIN/themes/base/textfield/textfield.css */ .v-textfield { text-align: left /* Force default alignment */ } @@ -1349,7 +1349,7 @@ textarea.v-textarea-prompt { outline-width: medium; } -/* ./WebContent/ITMILL/themes/base/tree/tree.css */ +/* ./WebContent/VAADIN/themes/base/tree/tree.css */ .v-tree { text-align: left /* Force default alignment */ } @@ -1398,7 +1398,7 @@ div.v-tree-node-leaf { clear: left; } -/* ./WebContent/ITMILL/themes/base/window/window.css */ +/* ./WebContent/VAADIN/themes/base/window/window.css */ .v-window { background: #fff; } @@ -1551,11 +1551,14 @@ div.v-window-header { } /* Automatically compiled css file from subdirectories. */ -/* ./WebContent/ITMILL/themes/reindeer/a-sprite-definitions/a-sprite-definitions.css */ +/* ./WebContent/VAADIN/themes/reindeer/a-sprite-definitions/a-sprite-definitions.css */ +/** sprite: verticals; sprite-image: url(common/img/vertical-sprites.png); sprite-layout: vertical */ +/** sprite: horizontals; sprite-image: url(common/img/horizontal-sprites.png); sprite-layout: horizontal */ +/** sprite: buttons; sprite-image: url(button/img/button-sprites.png); sprite-layout: vertical */ -/* ./WebContent/ITMILL/themes/reindeer/button/button.css */ +/* ./WebContent/VAADIN/themes/reindeer/button/button.css */ /* We serve simpler buttons for IE6, since it doesn't support the adjacent * sibling selector (+) that is needed to position .v-icon properly. */ @@ -1565,9 +1568,7 @@ div > .v-button, padding: 0 0 0 6px; background-color: transparent; background-repeat: no-repeat; - background-image: url(button/img/button-sprites.png); - -background-image: url(button/img/button-sprites-ie6.png); - background-position: left -0px; + background-image: url(button/img/left.png); /** sprite-ref: buttons */ border: none; cursor: default; } @@ -1579,9 +1580,7 @@ div > .v-button span, background-color: transparent; background-repeat: no-repeat; background-position: right top; - background-image: url(button/img/button-sprites.png); - -background-image: url(button/img/button-sprites-ie6.png); - background-position: right -26px; + background-image: url(button/img/right.png); /** sprite-ref: buttons; sprite-alignment: right */ text-shadow: #fff 0 1px 0; font-weight: bold; font-size: 11px; @@ -1593,29 +1592,21 @@ div > .v-button span, padding-top: 5px; } .v-button:focus { - background-image: url(button/img/button-sprites.png); - -background-image: url(button/img/button-sprites-ie6.png); - background-position: left -52px; + background-image: url(button/img/left-focus.png); /** sprite-ref: buttons */ outline: none; } .v-button:focus span { - background-image: url(button/img/button-sprites.png); - -background-image: url(button/img/button-sprites-ie6.png); - background-position: right -78px; + background-image: url(button/img/right-focus.png); /** sprite-ref: buttons; sprite-alignment: right */ outline: none; } .v-button:active, .v-ie7 .v-button.v-pressed { - background-image: url(button/img/button-sprites.png); - -background-image: url(button/img/button-sprites-ie6.png); - background-position: left -104px; + background-image: url(button/img/left-pressed.png); /** sprite-ref: buttons */ outline: none; } .v-button:active span, .v-ie7 .v-button.v-pressed span { - background-image: url(button/img/button-sprites.png); - -background-image: url(button/img/button-sprites-ie6.png); - background-position: right -130px; + background-image: url(button/img/right-pressed.png); /** sprite-ref: buttons; sprite-alignment: right */ outline: none; } .v-ie7 .v-button.v-pressed span { @@ -1716,53 +1707,37 @@ div > .v-button .v-errorindicator, */ div > .v-button-primary, .v-ie7 .v-button-primary { - background-image: url(button/img/button-sprites.png); - -background-image: url(button/img/button-sprites-ie6.png); - background-position: left -156px; + background-image: url(button/img/primary-left.png); /** sprite-ref: buttons */ } div > .v-button-primary span, .v-ie7 .v-button-primary span { - background-image: url(button/img/button-sprites.png); - -background-image: url(button/img/button-sprites-ie6.png); - background-position: right -182px; + background-image: url(button/img/primary-right.png); /** sprite-ref: buttons; sprite-alignment: right */ } .v-button-primary:focus { - background-image: url(button/img/button-sprites.png); - -background-image: url(button/img/button-sprites-ie6.png); - background-position: left -208px; + background-image: url(button/img/primary-left-focus.png); /** sprite-ref: buttons */ } .v-button-primary:focus span { - background-image: url(button/img/button-sprites.png); - -background-image: url(button/img/button-sprites-ie6.png); - background-position: right -234px; + background-image: url(button/img/primary-right-focus.png); /** sprite-ref: buttons; sprite-alignment: right */ } .v-button-primary:active, .v-ie7 .v-button-primary.v-pressed { - background-image: url(button/img/button-sprites.png); - -background-image: url(button/img/button-sprites-ie6.png); - background-position: left -260px; + background-image: url(button/img/primary-left-pressed.png); /** sprite-ref: buttons */ } .v-button-primary:active span, .v-ie7 .v-button-primary.v-pressed span { - background-image: url(button/img/button-sprites.png); - -background-image: url(button/img/button-sprites-ie6.png); - background-position: right -286px; + background-image: url(button/img/primary-right-pressed.png); /** sprite-ref: buttons; sprite-alignment: right */ } /* * Small-style -------------------------- */ div > .v-button-small, .v-ie7 .v-button-small { - background-image: url(button/img/button-sprites.png); - -background-image: url(button/img/button-sprites-ie6.png); - background-position: left -312px; + background-image: url(button/img/small-left.png); /** sprite-ref: buttons */ height: 20px; } div > .v-button-small span, .v-ie7 .v-button-small span { - background-image: url(button/img/button-sprites.png); - -background-image: url(button/img/button-sprites-ie6.png); - background-position: right -332px; + background-image: url(button/img/small-right.png); /** sprite-ref: buttons; sprite-alignment: right */ height: 19px; padding: 1px 11px 0 5px; font-weight: normal; @@ -1776,26 +1751,18 @@ div > .v-button-small span, padding-top: 2px; } .v-button-small:focus { - background-image: url(button/img/button-sprites.png); - -background-image: url(button/img/button-sprites-ie6.png); - background-position: left -352px; + background-image: url(button/img/small-left-focus.png); /** sprite-ref: buttons */ } .v-button-small:focus span { - background-image: url(button/img/button-sprites.png); - -background-image: url(button/img/button-sprites-ie6.png); - background-position: right -372px; + background-image: url(button/img/small-right-focus.png); /** sprite-ref: buttons; sprite-alignment: right */ } .v-button-small:active, .v-ie7 .v-button-small.v-pressed { - background-image: url(button/img/button-sprites.png); - -background-image: url(button/img/button-sprites-ie6.png); - background-position: left -392px; + background-image: url(button/img/small-left-pressed.png); /** sprite-ref: buttons */ } .v-button-small:active span, .v-ie7 .v-button-small.v-pressed span { - background-image: url(button/img/button-sprites.png); - -background-image: url(button/img/button-sprites-ie6.png); - background-position: right -412px; + background-image: url(button/img/small-right-pressed.png); /** sprite-ref: buttons; sprite-alignment: right */ } /** @@ -1832,7 +1799,7 @@ div > .v-button-small span, border-bottom-color: #888d91; } -/* ./WebContent/ITMILL/themes/reindeer/common/common.css */ +/* ./WebContent/VAADIN/themes/reindeer/common/common.css */ .v-generated-body, .v-app { background: #f5f5f5; @@ -1921,7 +1888,7 @@ div > .v-button-small span, margin: 1px 0 4px 0; } -/* ./WebContent/ITMILL/themes/reindeer/datefield/datefield.css */ +/* ./WebContent/VAADIN/themes/reindeer/datefield/datefield.css */ .v-datefield-calendarpanel { border-collapse: collapse; margin: 0; @@ -1935,9 +1902,7 @@ div > .v-button-small span, td.v-datefield-calendarpanel-month { height: 23px; background-repeat: repeat-x; - background-image: url(common/img/vertical-sprites.png); - -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -0px; + background-image: url(datefield/img/header-bg.png); /** sprite-ref: verticals; sprite-alignment: repeat */ } span.v-datefield-calendarpanel-month { display: block; @@ -1977,9 +1942,7 @@ span.v-datefield-calendarpanel-month { border: none; background: transparent; background-repeat: no-repeat; - background-image: url(common/img/vertical-sprites.png); - -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -23px; + background-image: url(datefield/img/year-prev.png); /** sprite-ref: verticals */ overflow: hidden; padding: 0; text-indent: -9999px; @@ -1994,28 +1957,20 @@ span.v-datefield-calendarpanel-month { } .v-datefield-calendarpanel-nextyear button { background-position: left top; - background-image: url(common/img/vertical-sprites.png); - -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -46px; + background-image: url(datefield/img/year-next.png); /** sprite-ref: verticals */ } .v-datefield-calendarpanel-prevyear button:active, .v-ie6 .v-datefield-calendarpanel-prevyear button.v-pressed { - background-image: url(common/img/vertical-sprites.png); - -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: right -69px; + background-image: url(datefield/img/year-prev-pressed.png); /** sprite-ref: verticals; sprite-alignment: right */ } .v-datefield-calendarpanel-nextyear button:active, .v-ie6 .v-datefield-calendarpanel-nextyear button.v-pressed { - background-image: url(common/img/vertical-sprites.png); - -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -92px; + background-image: url(datefield/img/year-next-pressed.png); /** sprite-ref: verticals */ } .v-datefield-calendarpanel-prevmonth, .v-datefield-calendarpanel-nextmonth { background-repeat: repeat-x; - background-image: url(common/img/vertical-sprites.png); - -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -115px; + background-image: url(datefield/img/header-bg.png); /** sprite-ref: verticals; sprite-alignment: repeat */ } .v-datefield-calendarpanel-prevmonth button, .v-datefield-calendarpanel-nextmonth button { @@ -2025,9 +1980,7 @@ span.v-datefield-calendarpanel-month { border-right: 1px solid #d8d8d8; background: transparent; background-position: center top; - background-image: url(common/img/vertical-sprites.png); - -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: center -138px; + background-image: url(datefield/img/month-prev.png); /** sprite-ref: verticals; sprite-alignment: center */ min-width: 24px; } .v-ie6 .v-datefield-calendarpanel-prevmonth button, @@ -2036,26 +1989,20 @@ span.v-datefield-calendarpanel-month { border: none; } .v-datefield-calendarpanel-nextmonth button { - background-image: url(common/img/vertical-sprites.png); - -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: center -159px; + background-image: url(datefield/img/month-next.png); /** sprite-ref: verticals; sprite-alignment: center */ } .v-datefield-calendarpanel-prevmonth button:active, .v-ie6 .v-datefield-calendarpanel-prevmonth button.v-pressed { background-position: center top; - background-image: url(common/img/vertical-sprites.png); - -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: center -180px; + background-image: url(datefield/img/month-prev-pressed.png); /** sprite-ref: verticals; sprite-alignment: center */ } .v-datefield-calendarpanel-nextmonth button:active, .v-ie6 .v-datefield-calendarpanel-nextmonth button.v-pressed { background-position: center top; - background-image: url(common/img/vertical-sprites.png); - -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: center -201px; + background-image: url(datefield/img/month-next-pressed.png); /** sprite-ref: verticals; sprite-alignment: center */ } -/* ./WebContent/ITMILL/themes/reindeer/label/label.css */ +/* ./WebContent/VAADIN/themes/reindeer/label/label.css */ .v-label { line-height: 18px; } @@ -2083,7 +2030,7 @@ span.v-datefield-calendarpanel-month { color: #707070; } -/* ./WebContent/ITMILL/themes/reindeer/layouts/layouts.css */ +/* ./WebContent/VAADIN/themes/reindeer/layouts/layouts.css */ .v-orderedlayout-margin-top, .v-horizontallayout-margin-top, .v-verticallayout-margin-top { @@ -2117,7 +2064,7 @@ span.v-datefield-calendarpanel-month { background-color: #bcd3de; } -/* ./WebContent/ITMILL/themes/reindeer/panel/panel.css */ +/* ./WebContent/VAADIN/themes/reindeer/panel/panel.css */ .v-panel-caption, .v-panel-nocaption { border-bottom: 1px solid #dcdcdc; @@ -2154,13 +2101,11 @@ span.v-datefield-calendarpanel-month { background: rgba(0,0,0,.08); } -/* ./WebContent/ITMILL/themes/reindeer/select/select.css */ +/* ./WebContent/VAADIN/themes/reindeer/select/select.css */ .v-filterselect { height: 24px; background-repeat: no-repeat; - background-image: url(common/img/vertical-sprites.png); - -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -222px; + background-image: url(select/img/left.png); /** sprite-ref: verticals; sprite-margin-bottom: 1px */ padding-left: 2px; } .v-app .v-filterselect-input, @@ -2168,9 +2113,7 @@ span.v-datefield-calendarpanel-month { .v-popupview-popup .v-filterselect-input { background: transparent; background-repeat: repeat-x; - background-image: url(common/img/vertical-sprites.png); - -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -247px; + background-image: url(select/img/center.png); /** sprite-ref: verticals; sprite-alignment: repeat */ border: none; height: 21px; } @@ -2187,54 +2130,36 @@ span.v-datefield-calendarpanel-month { outline: none; } .v-filterselect-focus { - background-image: url(common/img/vertical-sprites.png); - -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -271px; + background-image: url(select/img/left-focus.png); /** sprite-ref: verticals; sprite-margin-bottom: 1px */ } .v-filterselect-focus .v-filterselect-input { - background-image: url(common/img/vertical-sprites.png); - -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -296px; + background-image: url(select/img/center-focus.png); /** sprite-ref: verticals; sprite-alignment: repeat */ } .v-filterselect-button { overflow: hidden; width: 25px; height: 24px; - background-image: url(common/img/vertical-sprites.png); - -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -320px; + background-image: url(select/img/right.png); /** sprite-ref: verticals */ cursor: default; } .v-filterselect-button:hover { - background-image: url(common/img/vertical-sprites.png); - -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -344px; + background-image: url(select/img/right-hover.png); /** sprite-ref: verticals */ } .v-filterselect-button:active { - background-image: url(common/img/vertical-sprites.png); - -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -368px; + background-image: url(select/img/right-pressed.png); /** sprite-ref: verticals */ } .v-filterselect-focus .v-filterselect-button { - background-image: url(common/img/vertical-sprites.png); - -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -392px; + background-image: url(select/img/right-focus.png); /** sprite-ref: verticals */ } .v-filterselect-focus .v-filterselect-button:hover { - background-image: url(common/img/vertical-sprites.png); - -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -416px; + background-image: url(select/img/right-focus-hover.png); /** sprite-ref: verticals */ } .v-filterselect-focus .v-filterselect-button:active { - background-image: url(common/img/vertical-sprites.png); - -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -440px; + background-image: url(select/img/right-focus-pressed.png); /** sprite-ref: verticals */ } .v-disabled .v-filterselect-button:hover, .v-readonly .v-filterselect-button:hover { - background-image: url(common/img/vertical-sprites.png); - -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -464px; + background-image: url(select/img/right.png); /** sprite-ref: verticals */ } .v-filterselect-suggestpopup { background: #f8f8f9; @@ -2258,9 +2183,7 @@ span.v-datefield-calendarpanel-month { .v-filterselect-suggestmenu .gwt-MenuItem-selected { background: transparent; background-repeat: repeat-x; - background-image: url(common/img/vertical-sprites.png); - -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -488px; + background-image: url(select/img/sel-bg.png); /** sprite-ref: verticals; sprite-alignment: repeat */ color: #fff; text-shadow: #3b5a7a 0 1px 0; } @@ -2274,27 +2197,19 @@ span.v-datefield-calendarpanel-month { } .v-filterselect-nextpage:hover { background-repeat: repeat-x; - background-image: url(common/img/vertical-sprites.png); - -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -506px; + background-image: url(select/img/page-down-hover.png); /** sprite-ref: verticals; sprite-alignment: repeat */ } .v-filterselect-prevpage:hover { background-repeat: repeat-x; - background-image: url(common/img/vertical-sprites.png); - -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -517px; + background-image: url(select/img/page-up-hover.png); /** sprite-ref: verticals; sprite-alignment: repeat */ } .v-filterselect-nextpage:active { background-repeat: repeat-x; - background-image: url(common/img/vertical-sprites.png); - -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -528px; + background-image: url(select/img/page-down-pressed.png); /** sprite-ref: verticals; sprite-alignment: repeat */ } .v-filterselect-prevpage:active { background-repeat: repeat-x; - background-image: url(common/img/vertical-sprites.png); - -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -539px; + background-image: url(select/img/page-up-pressed.png); /** sprite-ref: verticals; sprite-alignment: repeat */ } .v-filterselect-nextpage-off span, .v-filterselect-prevpage-off span { @@ -2309,27 +2224,19 @@ span.v-datefield-calendarpanel-month { text-indent: -99999px; background-position: center 3px; background-repeat: no-repeat; - background-image: url(common/img/vertical-sprites.png); - -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: center -550px; + background-image: url(select/img/arrow-down.png); /** sprite-ref: verticals; sprite-margin-top: 3px; sprite-margin-bottom: 3px; sprite-alignment: center */ user-select: none; -moz-user-select: none; -webkit-user-select: none; } .v-filterselect-prevpage span { - background-image: url(common/img/vertical-sprites.png); - -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: center -561px; + background-image: url(select/img/arrow-up.png); /** sprite-ref: verticals; sprite-margin-top: 3px; sprite-margin-bottom: 3px; sprite-alignment: center */ } .v-filterselect-nextpage:hover span { - background-image: url(common/img/vertical-sprites.png); - -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: center -572px; + background-image: url(select/img/arrow-down-hover.png); /** sprite-ref: verticals; sprite-margin-top: 3px; sprite-margin-bottom: 3px; sprite-alignment: center */ } .v-filterselect-prevpage:hover span { - background-image: url(common/img/vertical-sprites.png); - -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: center -583px; + background-image: url(select/img/arrow-up-hover.png); /** sprite-ref: verticals; sprite-margin-top: 3px; sprite-margin-bottom: 3px; sprite-alignment: center */ } .v-filterselect-status { text-shadow: #e9eaeb 0 1px 0; @@ -2340,9 +2247,7 @@ span.v-datefield-calendarpanel-month { height: 11px; overflow: hidden; background-repeat: repeat-x; - background-image: url(common/img/vertical-sprites.png); - -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -594px; + background-image: url(select/img/status-bg.png); /** sprite-ref: verticals; sprite-alignment: repeat */ -moz-border-radius-bottomleft: 2px; -moz-border-radius-bottomright: 2px; -webkit-border-bottom-left-radius: 2px; @@ -2378,39 +2283,33 @@ span.v-datefield-calendarpanel-month { } /* Filterselect with icon needs a similar fix than in buttons */ -/* ./WebContent/ITMILL/themes/reindeer/splitpanel/splitpanel.css */ +/* ./WebContent/VAADIN/themes/reindeer/splitpanel/splitpanel.css */ .v-splitpanel-horizontal .v-splitpanel-hsplitter { width: 7px; background-repeat: repeat-y; - background-image: url(common/img/horizontal-sprites.png); - background-position: -0px top; + background-image: url(splitpanel/img/hor-bg.png); /** sprite-ref: horizontals; sprite-alignment: repeat */ } .v-splitpanel-horizontal .v-splitpanel-hsplitter div { width: 7px; background: transparent; background-repeat: no-repeat; background-position: 50%; - background-image: url(common/img/horizontal-sprites.png); - background-position: -7px center; + background-image: url(splitpanel/img/hor-handle.png); /** sprite-ref: horizontals; sprite-alignment: center */ } .v-splitpanel-vertical .v-splitpanel-vsplitter { height: 7px; background-repeat: repeat-x; - background-image: url(common/img/vertical-sprites.png); - -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -611px; + background-image: url(splitpanel/img/ver-bg.png); /** sprite-ref: verticals; sprite-alignment: repeat */ } .v-splitpanel-vertical .v-splitpanel-vsplitter div { height: 7px; background: transparent; background-repeat: no-repeat; background-position: 50%; - background-image: url(common/img/vertical-sprites.png); - -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: center -618px; + background-image: url(splitpanel/img/ver-handle.png); /** sprite-ref: verticals; sprite-alignment: center */ } -/* ./WebContent/ITMILL/themes/reindeer/tabsheet/tabsheet.css */ +/* ./WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet.css */ .v-tabsheet-spacertd div { border-color: #bfbfbf; border-left: none; @@ -2475,7 +2374,7 @@ span.v-datefield-calendarpanel-month { border-color: #7c8a91; } -/* ./WebContent/ITMILL/themes/reindeer/textfield/textfield.css */ +/* ./WebContent/VAADIN/themes/reindeer/textfield/textfield.css */ .v-textfield { line-height: normal; height: 19px; @@ -2484,9 +2383,7 @@ span.v-datefield-calendarpanel-month { border-bottom-color: #d2d3d4; background: #fff; background-repeat: repeat-x; - background-image: url(common/img/vertical-sprites.png); - -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -625px; + background-image: url(textfield/img/bg.png); /** sprite-ref: verticals; sprite-alignment: repeat */ -moz-border-radius: 3px; } /* Need more specific selector because of #2384 fixes in base/common/common.css */ diff --git a/WebContent/VAADIN/themes/sampler/prominentprimaryaction/styles.css b/WebContent/VAADIN/themes/sampler/prominentprimaryaction/styles.css index ff096097bb..ee49f10217 100644 --- a/WebContent/VAADIN/themes/sampler/prominentprimaryaction/styles.css +++ b/WebContent/VAADIN/themes/sampler/prominentprimaryaction/styles.css @@ -2,7 +2,7 @@ /* PNG with alpha as background */ background: #66aa00 url(prominentbg.png) bottom right; /* make PNG work in IE */ - filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="/ITMILL/themes/sampler/prominentprimaryaction/prominentbg.png", sizingMethod="scale"); + filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="/VAADIN/themes/sampler/prominentprimaryaction/prominentbg.png", sizingMethod="scale"); border: 2px solid #66aa00; /* make some extra room */ padding: 10px; diff --git a/build/build.properties b/build/build.properties index 7ae42f9f23..4d8ef66429 100644 --- a/build/build.properties +++ b/build/build.properties @@ -1,8 +1,8 @@ result-path=build/result checkout-path=build/checkout -product-file=itmill-toolkit -product-name=IT Mill Toolkit -toolkit-package=com/itmill/toolkit -eclipse-workspace-name=itmill-toolkit-examples +product-file=vaadin +product-name=Vaadin +toolkit-package=com/vaadin +eclipse-workspace-name=vaadin-examples eclipse-launch-vmargs=-Xms256M -Xmx512M gwt-dir=build/gwt diff --git a/build/buildhelpers/com/vaadin/buildhelpers/CompileDefaultTheme.java b/build/buildhelpers/com/vaadin/buildhelpers/CompileDefaultTheme.java index 0ed54a91cd..468cf0f4bf 100644 --- a/build/buildhelpers/com/vaadin/buildhelpers/CompileDefaultTheme.java +++ b/build/buildhelpers/com/vaadin/buildhelpers/CompileDefaultTheme.java @@ -18,7 +18,7 @@ import java.util.Comparator; */ public class CompileDefaultTheme { - private static final String THEME_DIR = "./WebContent/ITMILL/themes/"; + private static final String THEME_DIR = "./WebContent/VAADIN/themes/"; private static final String BASE = "base"; private static final String DEFAULT = "default"; private static final String REINDEER = "reindeer"; diff --git a/build/package/start.sh b/build/package/start.sh index 0dbf824d43..b7faad9be3 100644 --- a/build/package/start.sh +++ b/build/package/start.sh @@ -4,4 +4,4 @@ if [ "$1" != "" ] ; then cd $1 fi -java -cp WebContent/demo/lib/jetty/jetty-6.1.7.jar:WebContent/demo/lib/jetty/jetty-util-6.1.7.jar:WebContent/demo/lib/jetty/servlet-api-2.5-6.1.7.jar:WebContent/WEB-INF/classes:WebContent/WEB-INF/src com.vaadin.launcher.ITMillToolkitDesktopMode $ITMILLTOOLKIT_PARAMETERS +java -cp WebContent/demo/lib/jetty/jetty-6.1.7.jar:WebContent/demo/lib/jetty/jetty-util-6.1.7.jar:WebContent/demo/lib/jetty/servlet-api-2.5-6.1.7.jar:WebContent/WEB-INF/classes:WebContent/WEB-INF/src com.vaadin.launcher.ITMillToolkitDesktopMode $VAADIN_PARAMETERS diff --git a/src/com/vaadin/automatedtests/featurebrowser/JavaScriptAPIExample.java b/src/com/vaadin/automatedtests/featurebrowser/JavaScriptAPIExample.java index d902eb8323..5956db9853 100644 --- a/src/com/vaadin/automatedtests/featurebrowser/JavaScriptAPIExample.java +++ b/src/com/vaadin/automatedtests/featurebrowser/JavaScriptAPIExample.java @@ -22,7 +22,7 @@ import com.vaadin.ui.Button.ClickEvent; */
public class JavaScriptAPIExample extends CustomComponent {
- public static final String txt = "<p>For advanced client side programmers Toolkit offers a simple method which can be used to force sync client with server. This may be needed for example if another part of a mashup changes things on server.</p> (more examples will be added here as the APIs are made public)<br/><br/><A href=\"javascript:itmill.forceSync();\">javascript:itmill.forceSync();</A>";
+ public static final String txt = "<p>For advanced client side programmers Toolkit offers a simple method which can be used to force sync client with server. This may be needed for example if another part of a mashup changes things on server.</p> (more examples will be added here as the APIs are made public)<br/><br/><A href=\"javascript:vaadin.forceSync();\">javascript:itmill.forceSync();</A>";
private final VerticalLayout main;
private final Label l;
@@ -61,7 +61,7 @@ public class JavaScriptAPIExample extends CustomComponent { Label l = new Label(
"This label will update it's server-side value AFTER it's rendered to the client-side. "
+ "The client will be synchronized on reload, when you click a button, "
- + "or when itmill.forceSync() is called.") {
+ + "or when vaadin.forceSync() is called.") {
@Override
public void paintContent(PaintTarget target) throws PaintException {
diff --git a/src/com/vaadin/demo/coverflow/gwt/client/ui/VCoverflow.java b/src/com/vaadin/demo/coverflow/gwt/client/ui/VCoverflow.java index a09c9b1865..ad92de3d83 100644 --- a/src/com/vaadin/demo/coverflow/gwt/client/ui/VCoverflow.java +++ b/src/com/vaadin/demo/coverflow/gwt/client/ui/VCoverflow.java @@ -1,7 +1,7 @@ /* @ITMillApache2LicenseForJavaFiles@ */ - + package com.vaadin.demo.coverflow.gwt.client.ui; import java.util.ArrayList; @@ -201,23 +201,23 @@ public class VCoverflow extends Composite implements Paintable { * id */ public native void initializeMethods(String id) /*-{ - var app = this; - - if($wnd.itmill.coverflow == null) - var coverflow = []; - else - var coverflow = $wnd.itmill.coverflow; - - coverflow['getCovers_' + id] = function() { - app.@com.vaadin.demo.coverflow.gwt.client.ui.VCoverflow::getCovers()(); - }; - - coverflow['setCurrent_' + id] = function(selected) { - app.@com.vaadin.demo.coverflow.gwt.client.ui.VCoverflow::setCover(Ljava/lang/String;)(selected); - }; - - $wnd.itmill.coverflow = coverflow; - }-*/; + var app = this; + + if($wnd.vaadin.coverflow == null) + var coverflow = []; + else + var coverflow = $wnd.vaadin.coverflow; + + coverflow['getCovers_' + id] = function() { + app.@com.vaadin.demo.coverflow.gwt.client.ui.VCoverflow::getCovers()(); + }; + + coverflow['setCurrent_' + id] = function(selected) { + app.@com.vaadin.demo.coverflow.gwt.client.ui.VCoverflow::setCover(Ljava/lang/String;)(selected); + }; + + $wnd.vaadin.coverflow = coverflow; + }-*/; /** * This function sends all covers to the flash. We cannot do this directly @@ -259,14 +259,14 @@ public class VCoverflow extends Composite implements Paintable { * @param icon */ public native void addCover(String id, String caption, String icon) /*-{ - try { - $doc['fxcoverflow' + id].addCover(caption.toString(), icon.toString()); - } - catch(e) { - $wnd.alert(e.message); - } - - }-*/; + try { + $doc['fxcoverflow' + id].addCover(caption.toString(), icon.toString()); + } + catch(e) { + $wnd.alert(e.message); + } + + }-*/; /** * This function tells the flash which cover should be selected. @@ -275,21 +275,21 @@ public class VCoverflow extends Composite implements Paintable { * @param key */ public native void selectCover(String id, String key) /*-{ - $doc["fxcoverflow" + id].selectCover(key.toString()); - }-*/; + $doc["fxcoverflow" + id].selectCover(key.toString()); + }-*/; public native void setBackgroundColor(String id, String startGradient, String endGradient) /*-{ - $doc["fxcoverflow" + id].setBackgroundColor("0x" + startGradient.toString(), "0x" + endGradient.toString()); - }-*/; + $doc["fxcoverflow" + id].setBackgroundColor("0x" + startGradient.toString(), "0x" + endGradient.toString()); + }-*/; public native void toggleScrollbarVisibility(String id, boolean visibility) /*-{ - $doc["fxcoverflow" + id].toggleScrollbarVisibility(visibility); - }-*/; + $doc["fxcoverflow" + id].toggleScrollbarVisibility(visibility); + }-*/; public native void removeCover(String id, String key) /*-{ - $doc["fxcoverflow" + id].removeCover(key); - }-*/; + $doc["fxcoverflow" + id].removeCover(key); + }-*/; /** * Set the HTML coding of the flash movie. This isn't done until the diff --git a/src/com/vaadin/demo/coverflow/gwt/flex/Coverflow.as b/src/com/vaadin/demo/coverflow/gwt/flex/Coverflow.as index 38d924b7dd..130556a894 100644 --- a/src/com/vaadin/demo/coverflow/gwt/flex/Coverflow.as +++ b/src/com/vaadin/demo/coverflow/gwt/flex/Coverflow.as @@ -99,7 +99,7 @@ package { // that the flash is now ready to accept information of the covers. // The name of the function we're about to call is dynamic, meaning // it is unique for every instance of this widget - ExternalInterface.call("itmill.coverflow['getCovers_" + _pid + "']"); + ExternalInterface.call("vaadin.coverflow['getCovers_" + _pid + "']"); } catch (error:SecurityError) { Alert.show("A SecurityError occurred: " + error.message + "\n"); } catch (error:Error) { @@ -418,7 +418,7 @@ package { // the animation has finished), then send the selected cover's // key to GWT which will then forward it to the server. if (ExternalInterface.available && i == _selected) { - ExternalInterface.call("itmill.coverflow['setCurrent_" + _pid + "']",_coverList[_selected].caption); + ExternalInterface.call("vaadin.coverflow['setCurrent_" + _pid + "']",_coverList[_selected].caption); // Send an event which notifies the scrollbar that the selected cover has changed. _eventHandler.dispatchEvent(new Event(EventHandler.CURRENT_CHANGED)); diff --git a/src/com/vaadin/demo/featurebrowser/JavaScriptAPIExample.java b/src/com/vaadin/demo/featurebrowser/JavaScriptAPIExample.java index 4656263163..42f07648d6 100644 --- a/src/com/vaadin/demo/featurebrowser/JavaScriptAPIExample.java +++ b/src/com/vaadin/demo/featurebrowser/JavaScriptAPIExample.java @@ -22,7 +22,7 @@ import com.vaadin.ui.Button.ClickEvent; */
public class JavaScriptAPIExample extends CustomComponent {
- public static final String txt = "<p>For advanced client side programmers Toolkit offers a simple method which can be used to force sync client with server. This may be needed for example if another part of a mashup changes things on server.</p> (more examples will be added here as the APIs are made public)<br/><br/><A href=\"javascript:itmill.forceSync();\">javascript:itmill.forceSync();</A>";
+ public static final String txt = "<p>For advanced client side programmers Toolkit offers a simple method which can be used to force sync client with server. This may be needed for example if another part of a mashup changes things on server.</p> (more examples will be added here as the APIs are made public)<br/><br/><A href=\"javascript:vaadin.forceSync();\">javascript:itmill.forceSync();</A>";
private final VerticalLayout main;
private final Label l;
@@ -61,7 +61,7 @@ public class JavaScriptAPIExample extends CustomComponent { Label l = new Label(
"This label will update it's server-side value AFTER it's rendered to the client-side. "
+ "The client will be synchronized on reload, when you click a button, "
- + "or when itmill.forceSync() is called.") {
+ + "or when vaadin.forceSync() is called.") {
@Override
public void paintContent(PaintTarget target) throws PaintException {
diff --git a/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java b/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java index 564a87445e..e27283258a 100644 --- a/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java +++ b/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java @@ -74,8 +74,8 @@ public class ApplicationConfiguration { /*-{ var id = this.@com.vaadin.terminal.gwt.client.ApplicationConfiguration::id; - if($wnd.itmill.toolkitConfigurations && $wnd.itmill.toolkitConfigurations[id]) { - var jsobj = $wnd.itmill.toolkitConfigurations[id]; + if($wnd.vaadin.toolkitConfigurations && $wnd.vaadin.toolkitConfigurations[id]) { + var jsobj = $wnd.vaadin.toolkitConfigurations[id]; var uri = jsobj.appUri; if(uri[uri.length -1] != "/") { uri = uri + "/"; @@ -173,7 +173,7 @@ public class ApplicationConfiguration { private native static void loadAppIdListFromDOM(ArrayList<String> list) /*-{ var j; - for(j in $wnd.itmill.toolkitConfigurations) { + for(j in $wnd.vaadin.toolkitConfigurations) { list.@java.util.Collection::add(Ljava/lang/Object;)(j); } }-*/; diff --git a/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java b/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java index 51c5c92fe3..1d6fe6d0eb 100755 --- a/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java +++ b/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java @@ -173,11 +173,11 @@ public class ApplicationConnection { return componentLocator.@com.vaadin.terminal.gwt.client.ComponentLocator::getPathForElement(Lcom/google/gwt/user/client/Element;)(element); } - if(!$wnd.itmill.clients) { - $wnd.itmill.clients = {}; + if(!$wnd.vaadin.clients) { + $wnd.vaadin.clients = {}; } - $wnd.itmill.clients[TTAppId] = client; + $wnd.vaadin.clients[TTAppId] = client; }-*/; /** @@ -191,7 +191,7 @@ public class ApplicationConnection { /** * Publishes a JavaScript API for mash-up applications. * <ul> - * <li><code>itmill.forceSync()</code> sends pending variable changes, in + * <li><code>vaadin.forceSync()</code> sends pending variable changes, in * effect synchronizing the server and client state. This is done for all * applications on host page.</li> * </ul> @@ -202,20 +202,20 @@ public class ApplicationConnection { /*-{ var app = this; var oldSync; - if($wnd.itmill.forceSync) { - oldSync = $wnd.itmill.forceSync; + if($wnd.vaadin.forceSync) { + oldSync = $wnd.vaadin.forceSync; } - $wnd.itmill.forceSync = function() { + $wnd.vaadin.forceSync = function() { if(oldSync) { oldSync(); } app.@com.vaadin.terminal.gwt.client.ApplicationConnection::sendPendingVariableChanges()(); } var oldForceLayout; - if($wnd.itmill.forceLayout) { - oldForceLayout = $wnd.itmill.forceLayout; + if($wnd.vaadin.forceLayout) { + oldForceLayout = $wnd.vaadin.forceLayout; } - $wnd.itmill.forceLayout = function() { + $wnd.vaadin.forceLayout = function() { if(oldForceLayout) { oldForceLayout(); } @@ -235,7 +235,7 @@ public class ApplicationConnection { */ public native static boolean isDebugMode() /*-{ - if($wnd.itmill.debug) { + if($wnd.vaadin.debug) { var parameters = $wnd.location.search; var re = /debug[^\/]*$/; return re.test(parameters); diff --git a/src/com/vaadin/terminal/gwt/client/ui/TreeImages.java b/src/com/vaadin/terminal/gwt/client/ui/TreeImages.java index db53653e71..f266f0de8c 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/TreeImages.java +++ b/src/com/vaadin/terminal/gwt/client/ui/TreeImages.java @@ -12,8 +12,7 @@ public interface TreeImages extends com.google.gwt.user.client.ui.TreeImages { * An image indicating an open branch.
*
* @return a prototype of this image
- * @gwt.resource
- * com/itmill/toolkit/terminal/gwt/public/default/tree/img/expanded
+ * @gwt.resource com/vaadin/terminal/gwt/public/default/tree/img/expanded
* .png
*/
AbstractImagePrototype treeOpen();
@@ -22,8 +21,7 @@ public interface TreeImages extends com.google.gwt.user.client.ui.TreeImages { * An image indicating a closed branch.
*
* @return a prototype of this image
- * @gwt.resource
- * com/itmill/toolkit/terminal/gwt/public/default/tree/img/collapsed
+ * @gwt.resource com/vaadin/terminal/gwt/public/default/tree/img/collapsed
* .png
*/
AbstractImagePrototype treeClosed();
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VUnknownComponent.java b/src/com/vaadin/terminal/gwt/client/ui/VUnknownComponent.java index 12faa71992..69af9f43b9 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VUnknownComponent.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VUnknownComponent.java @@ -21,8 +21,8 @@ public class VUnknownComponent extends Composite implements Paintable { panel.add(caption); panel.add(uidlTree); initWidget(panel); - setStyleName("itmill-unknown"); - caption.setStyleName("itmill-unknown-caption"); + setStyleName("vaadin-unknown"); + caption.setStyleName("vaadin-unknown-caption"); } public void updateFromUIDL(UIDL uidl, ApplicationConnection client) { diff --git a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java index 52ac148e76..6180993faa 100644 --- a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java +++ b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java @@ -1205,16 +1205,16 @@ public abstract class AbstractApplicationServlet extends HttpServlet { + "'></script>\n"); page.write("<script type=\"text/javascript\">\n"); page.write("//<![CDATA[\n"); - page.write("if(!itmill || !itmill.toolkitConfigurations) {\n " - + "if(!itmill) { var itmill = {}} \n" - + "itmill.toolkitConfigurations = {};\n" - + "itmill.themesLoaded = {}};\n"); + page.write("if(!vaadin || !vaadin.toolkitConfigurations) {\n " + + "if(!vaadin) { var vaadin = {}} \n" + + "vaadin.toolkitConfigurations = {};\n" + + "vaadin.themesLoaded = {}};\n"); if (!isProductionMode()) { - page.write("itmill.debug = true;\n"); + page.write("vaadin.debug = true;\n"); } - page.write("itmill.toolkitConfigurations[\"" + appId + "\"] = {"); + page.write("vaadin.toolkitConfigurations[\"" + appId + "\"] = {"); page.write("appUri:'" + appUrl + "', "); page.write("pathInfo: '" + pathInfo + "', "); if (window != application.getMainWindow()) { @@ -1254,7 +1254,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet { // set page.write("<script type=\"text/javascript\">\n"); page.write("//<![CDATA[\n"); - page.write("if(!itmill.themesLoaded['" + themeName + "']) {\n"); + page.write("if(!vaadin.themesLoaded['" + themeName + "']) {\n"); page .write("var stylesheet = document.createElement('link');\n"); page.write("stylesheet.setAttribute('rel', 'stylesheet');\n"); @@ -1263,7 +1263,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet { + "/styles.css');\n"); page .write("document.getElementsByTagName('head')[0].appendChild(stylesheet);\n"); - page.write("itmill.themesLoaded['" + themeName + page.write("vaadin.themesLoaded['" + themeName + "'] = true;\n}\n"); page.write("//]]>\n</script>\n"); } @@ -1271,12 +1271,12 @@ public abstract class AbstractApplicationServlet extends HttpServlet { } else { page.write("<script type=\"text/javascript\">\n"); page.write("//<![CDATA[\n"); - page.write("if(!itmill || !itmill.toolkitConfigurations) {\n " - + "if(!itmill) { var itmill = {}} \n" - + "itmill.toolkitConfigurations = {};\n" - + "itmill.themesLoaded = {};\n"); + page.write("if(!vaadin || !vaadin.toolkitConfigurations) {\n " + + "if(!vaadin) { var vaadin = {}} \n" + + "vaadin.toolkitConfigurations = {};\n" + + "vaadin.themesLoaded = {};\n"); if (!isProductionMode()) { - page.write("itmill.debug = true;\n"); + page.write("vaadin.debug = true;\n"); } page .write("document.write('<iframe tabIndex=\"-1\" id=\"__gwt_historyFrame\" " @@ -1287,7 +1287,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet { + widgetset + "/" + widgetset + ".nocache.js?" + new Date().getTime() + "'><\\/script>\");\n}\n"); - page.write("itmill.toolkitConfigurations[\"" + appId + "\"] = {"); + page.write("vaadin.toolkitConfigurations[\"" + appId + "\"] = {"); page.write("appUri:'" + appUrl + "', "); page.write("pathInfo: '" + pathInfo + "', "); if (window != application.getMainWindow()) { @@ -1328,7 +1328,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet { // set page.write("<script type=\"text/javascript\">\n"); page.write("//<![CDATA[\n"); - page.write("if(!itmill.themesLoaded['" + themeName + "']) {\n"); + page.write("if(!vaadin.themesLoaded['" + themeName + "']) {\n"); page .write("var stylesheet = document.createElement('link');\n"); page.write("stylesheet.setAttribute('rel', 'stylesheet');\n"); @@ -1337,7 +1337,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet { + "/styles.css');\n"); page .write("document.getElementsByTagName('head')[0].appendChild(stylesheet);\n"); - page.write("itmill.themesLoaded['" + themeName + page.write("vaadin.themesLoaded['" + themeName + "'] = true;\n}\n"); page.write("//]]>\n</script>\n"); } diff --git a/src/com/vaadin/terminal/gwt/server/ApplicationRunnerServlet.java b/src/com/vaadin/terminal/gwt/server/ApplicationRunnerServlet.java index 774b866a44..fe20093e02 100644 --- a/src/com/vaadin/terminal/gwt/server/ApplicationRunnerServlet.java +++ b/src/com/vaadin/terminal/gwt/server/ApplicationRunnerServlet.java @@ -89,9 +89,9 @@ public class ApplicationRunnerServlet extends AbstractApplicationServlet { * Parses application runner URIs. * * If request URL is e.g. - * http://localhost:8080/itmill/run/com.vaadin.demo.Calc then + * http://localhost:8080/vaadin/run/com.vaadin.demo.Calc then * <ul> - * <li>context=itmill</li> + * <li>context=vaadin</li> * <li>Runner servlet=run</li> * <li>Toolkit application=com.vaadin.demo.Calc</li> * </ul> diff --git a/src/com/vaadin/ui/AbstractOrderedLayout.java b/src/com/vaadin/ui/AbstractOrderedLayout.java index e83a71eeaf..573f92c53b 100644 --- a/src/com/vaadin/ui/AbstractOrderedLayout.java +++ b/src/com/vaadin/ui/AbstractOrderedLayout.java @@ -234,9 +234,8 @@ public abstract class AbstractOrderedLayout extends AbstractLayout implements /* * (non-Javadoc) * - * @see - * com.vaadin.ui.Layout.AlignmentHandler#setComponentAlignment(com - * .itmill.toolkit.ui.Component, int, int) + * @see com.vaadin.ui.Layout.AlignmentHandler#setComponentAlignment(com + * .vaadin.ui.Component, int, int) */ public void setComponentAlignment(Component childComponent, int horizontalAlignment, int verticalAlignment) { @@ -266,9 +265,8 @@ public abstract class AbstractOrderedLayout extends AbstractLayout implements /* * (non-Javadoc) * - * @see - * com.vaadin.ui.Layout.AlignmentHandler#getComponentAlignment(com - * .itmill.toolkit.ui.Component) + * @see com.vaadin.ui.Layout.AlignmentHandler#getComponentAlignment(com + * .vaadin.ui.Component) */ public Alignment getComponentAlignment(Component childComponent) { Alignment alignment = componentToAlignment.get(childComponent); diff --git a/src/com/vaadin/ui/LoginForm.java b/src/com/vaadin/ui/LoginForm.java index a9f94bbf54..3a8103e1a6 100644 --- a/src/com/vaadin/ui/LoginForm.java +++ b/src/com/vaadin/ui/LoginForm.java @@ -88,7 +88,7 @@ public class LoginForm extends CustomComponent { private URIHandler uriHandler = new URIHandler() { private final String responce = "<html><body>Login form handeled." - + "<script type='text/javascript'>top.itmill.forceSync();" + + "<script type='text/javascript'>top.vaadin.forceSync();" + "</script></body></html>"; public DownloadStream handleURI(URL context, String relativeUri) { |