Browse Source

Major theme refactoring:

-Base theme now completed.
-Default theme is now inherited from the Base theme, all redundant (but mandatory) style properties have been moved to the Base theme.

----

Includes major merges from 6.0 branch as well.

svn changeset:7572/svn branch:theme_2009_03
tags/6.7.0.beta1
Jouni Koivuviita 15 years ago
parent
commit
217580bb8a
100 changed files with 4872 additions and 3967 deletions
  1. 2
    2
      WebContent/ITMILL/themes/base/absolutelayout/absolutelayout.css
  2. 4
    6
      WebContent/ITMILL/themes/base/accordion/accordion.css
  3. 79
    38
      WebContent/ITMILL/themes/base/button/button.css
  4. 12
    5
      WebContent/ITMILL/themes/base/caption/caption.css
  5. 94
    120
      WebContent/ITMILL/themes/base/common/common.css
  6. BIN
      WebContent/ITMILL/themes/base/common/img/sprites.png
  7. 0
    3
      WebContent/ITMILL/themes/base/coordinatelayout/coordinatelayout.css
  8. 0
    0
      WebContent/ITMILL/themes/base/customcomponent/customcomponent.css
  9. 0
    0
      WebContent/ITMILL/themes/base/customlayout/customlayout.css
  10. 30
    35
      WebContent/ITMILL/themes/base/datefield/datefield.css
  11. 8
    46
      WebContent/ITMILL/themes/base/formlayout/formlayout.css
  12. 15
    21
      WebContent/ITMILL/themes/base/gridlayout/gridlayout.css
  13. 18
    0
      WebContent/ITMILL/themes/base/link/link.css
  14. 30
    17
      WebContent/ITMILL/themes/base/menubar/menubar.css
  15. 2
    7
      WebContent/ITMILL/themes/base/notification/notification.css
  16. 34
    21
      WebContent/ITMILL/themes/base/orderedlayout/orderedlayout.css
  17. 11
    5
      WebContent/ITMILL/themes/base/panel/panel.css
  18. 3
    2
      WebContent/ITMILL/themes/base/popupview/popupview.css
  19. 14
    13
      WebContent/ITMILL/themes/base/progressindicator/progressindicator.css
  20. 86
    89
      WebContent/ITMILL/themes/base/select/select.css
  21. BIN
      WebContent/ITMILL/themes/base/shadow/img/bottom-left.png
  22. BIN
      WebContent/ITMILL/themes/base/shadow/img/bottom-right.png
  23. BIN
      WebContent/ITMILL/themes/base/shadow/img/bottom.png
  24. BIN
      WebContent/ITMILL/themes/base/shadow/img/center.png
  25. BIN
      WebContent/ITMILL/themes/base/shadow/img/left.png
  26. BIN
      WebContent/ITMILL/themes/base/shadow/img/right.png
  27. BIN
      WebContent/ITMILL/themes/base/shadow/img/top-left.png
  28. BIN
      WebContent/ITMILL/themes/base/shadow/img/top-right.png
  29. BIN
      WebContent/ITMILL/themes/base/shadow/img/top.png
  30. 20
    20
      WebContent/ITMILL/themes/base/shadow/shadow.css
  31. 22
    33
      WebContent/ITMILL/themes/base/slider/slider.css
  32. 0
    10
      WebContent/ITMILL/themes/base/splitpanel/splitpanel.css
  33. 662
    614
      WebContent/ITMILL/themes/base/styles.css
  34. 65
    42
      WebContent/ITMILL/themes/base/table/table.css
  35. 40
    29
      WebContent/ITMILL/themes/base/tabsheet/tabsheet.css
  36. 43
    2
      WebContent/ITMILL/themes/base/textfield/textfield.css
  37. 29
    24
      WebContent/ITMILL/themes/base/tree/tree.css
  38. BIN
      WebContent/ITMILL/themes/base/window/img/shadow/bottom-left.png
  39. BIN
      WebContent/ITMILL/themes/base/window/img/shadow/bottom-right.png
  40. BIN
      WebContent/ITMILL/themes/base/window/img/shadow/bottom.png
  41. BIN
      WebContent/ITMILL/themes/base/window/img/shadow/center.png
  42. BIN
      WebContent/ITMILL/themes/base/window/img/shadow/left.png
  43. BIN
      WebContent/ITMILL/themes/base/window/img/shadow/right.png
  44. BIN
      WebContent/ITMILL/themes/base/window/img/shadow/top-left.png
  45. BIN
      WebContent/ITMILL/themes/base/window/img/shadow/top-right.png
  46. BIN
      WebContent/ITMILL/themes/base/window/img/shadow/top.png
  47. 38
    77
      WebContent/ITMILL/themes/base/window/window.css
  48. 2
    24
      WebContent/ITMILL/themes/default/accordion/accordion.css
  49. 12
    77
      WebContent/ITMILL/themes/default/button/button.css
  50. 5
    32
      WebContent/ITMILL/themes/default/caption/caption.css
  51. 4
    198
      WebContent/ITMILL/themes/default/common/common.css
  52. 3
    92
      WebContent/ITMILL/themes/default/datefield/datefield.css
  53. 2
    27
      WebContent/ITMILL/themes/default/formlayout/formlayout.css
  54. 3
    32
      WebContent/ITMILL/themes/default/gridlayout/gridlayout.css
  55. 1
    25
      WebContent/ITMILL/themes/default/link/link.css
  56. 26
    50
      WebContent/ITMILL/themes/default/menubar/menubar.css
  57. 1
    7
      WebContent/ITMILL/themes/default/notification/notification.css
  58. 16
    25
      WebContent/ITMILL/themes/default/orderedlayout/orderedlayout.css
  59. 12
    77
      WebContent/ITMILL/themes/default/panel/panel.css
  60. 0
    5
      WebContent/ITMILL/themes/default/popupview/popupview.css
  61. 1
    26
      WebContent/ITMILL/themes/default/progressindicator/progressindicator.css
  62. 10
    116
      WebContent/ITMILL/themes/default/select/select.css
  63. 1
    18
      WebContent/ITMILL/themes/default/shadow/shadow.css
  64. 5
    57
      WebContent/ITMILL/themes/default/slider/slider.css
  65. 1615
    1244
      WebContent/ITMILL/themes/default/styles.css
  66. 20
    99
      WebContent/ITMILL/themes/default/table/table.css
  67. 23
    164
      WebContent/ITMILL/themes/default/tabsheet/tabsheet.css
  68. 1
    48
      WebContent/ITMILL/themes/default/textfield/textfield.css
  69. 1
    30
      WebContent/ITMILL/themes/default/tree/tree.css
  70. 5
    95
      WebContent/ITMILL/themes/default/window/window.css
  71. 0
    0
      WebContent/ITMILL/themes/reindeer/button/button.css
  72. 1554
    0
      WebContent/ITMILL/themes/reindeer/styles.css
  73. 7
    1
      WebContent/ITMILL/themes/sampler/table/styles.css
  74. 1
    1
      build/VERSION.properties
  75. 4
    7
      build/bin/mergetool.py
  76. 57
    15
      build/build.xml
  77. 1
    1
      build/package/start.sh
  78. 10
    23
      src/com/itmill/toolkit/Application.java
  79. 15
    0
      src/com/itmill/toolkit/annotations/AutoGenerated.java
  80. 1
    1
      src/com/itmill/toolkit/automatedtests/ComponentsInTable.java
  81. 1
    0
      src/com/itmill/toolkit/automatedtests/SimplestApplication.java
  82. 2
    0
      src/com/itmill/toolkit/automatedtests/featurebrowser/AccordionExample.java
  83. 1
    0
      src/com/itmill/toolkit/automatedtests/featurebrowser/ButtonExample.java
  84. 2
    0
      src/com/itmill/toolkit/automatedtests/featurebrowser/ClientCachingExample.java
  85. 1
    0
      src/com/itmill/toolkit/automatedtests/featurebrowser/ComboBoxExample.java
  86. 1
    0
      src/com/itmill/toolkit/automatedtests/featurebrowser/EmbeddedBrowserExample.java
  87. 8
    4
      src/com/itmill/toolkit/automatedtests/featurebrowser/FeatureBrowser.java
  88. 8
    2
      src/com/itmill/toolkit/automatedtests/featurebrowser/FormExample.java
  89. 9
    4
      src/com/itmill/toolkit/automatedtests/featurebrowser/GeneratedColumnExample.java
  90. 2
    1
      src/com/itmill/toolkit/automatedtests/util/DebugId.java
  91. 2
    1
      src/com/itmill/toolkit/automatedtests/util/Log.java
  92. 2
    1
      src/com/itmill/toolkit/automatedtests/util/RandomComponents.java
  93. 1
    2
      src/com/itmill/toolkit/automatedtests/util/StatusServlet.java
  94. 5
    7
      src/com/itmill/toolkit/data/Buffered.java
  95. 4
    1
      src/com/itmill/toolkit/data/BufferedValidatable.java
  96. 18
    17
      src/com/itmill/toolkit/data/Container.java
  97. 8
    7
      src/com/itmill/toolkit/data/Item.java
  98. 14
    20
      src/com/itmill/toolkit/data/Property.java
  99. 3
    2
      src/com/itmill/toolkit/data/Validatable.java
  100. 0
    0
      src/com/itmill/toolkit/data/Validator.java

WebContent/ITMILL/themes/default/absolutelayout/absolutelayout.css → WebContent/ITMILL/themes/base/absolutelayout/absolutelayout.css View File

@@ -1,4 +1,4 @@
.i-absolutelayout-wrapper {
position: absolute;
overflow:hidden;
}
overflow: hidden;
}

+ 4
- 6
WebContent/ITMILL/themes/base/accordion/accordion.css View File

@@ -4,23 +4,21 @@
overflow: hidden;
text-align: left /* Force default alignment */
}

.i-accordion-item {
position: relative;
position: relative;
}

.i-accordion-item-caption {
overflow: hidden;
white-space: nowrap;
background: #eee;
border-bottom: 1px solid #ddd;
}

.i-accordion-item-caption .i-caption {
cursor: pointer;
}

.i-accordion-item-open .i-accordion-item-caption .i-caption {
cursor: default;
}

.i-accordion-item-content {
position: absolute;
overflow: auto;

+ 79
- 38
WebContent/ITMILL/themes/base/button/button.css View File

@@ -3,55 +3,96 @@
white-space: nowrap;
margin: 0;
}
.i-button img {
display:inline;
}

.i-button-link {
border: none;
text-align: left;
text-decoration: underline;
.i-checkbox input {
vertical-align: middle;
}
.i-button img,
.i-checkbox img {
display: inline;
vertical-align: middle;
margin-right: 3px;
}
.i-button span, .i-checkbox label {
vertical-align: middle;
}
.i-button-link {
border: none;
text-align: left;
background: none;
padding: 0;
padding: 0;
}
/* Inset Safari focus outline a bit */
.i-sa .i-button-link:focus {
outline-offset: -3px;
}
.i-button-link span {
text-decoration: underline;
}

/* fixes streched buttons in IE6 */
.i-ie6 .i-button {
width: 1px;
overflow: visible;
padding-left: 10px;
padding-right: 10px;
}
/* fixes streched buttons in IE7 */
.i-ie7 .i-button {
overflow: visible;
padding-left: 10px;
padding-right: 10px;
width: expression(this.offsetWidth + "px");
}
/* Error indicator on checkbox fix for IE */
.i-ie .i-checkbox * {
display: block;
float: left;
}
.i-button-link span {
text-decoration: underline;
}
.i-checkbox {
white-space: nowrap;
}
.i-checkbox .i-errorindicator {
float: none;
display: inline;
padding-left: 1em;
background-position: left;
}
/* Fixes streched buttons in IE6 */
.i-ie6 .i-button {
width: 1px;
overflow: visible;
padding-left: 1em;
padding-right: 1em;
}
.i-ie .i-checkbox .i-errorindicator {
padding-right: 4px;
/* Fixes streched buttons in IE7 */
.i-ie7 .i-button {
overflow: visible;
padding-left: 1em;
padding-right: 1em;
}
/* Error indicator on checkbox fix for IE6 */
.i-ie6 .i-checkbox * {
float: left;
display: inline; /* In effect, does nothing, since float:left forces block-rendering, but will fix "double-float-margin-bug" */
}
.i-ie6 .i-checkbox .i-errorindicator {
background-position: right;
display: inline;
float: left;
padding-left: 0;
padding-right: 0.4em;
}
/* Error indicator on checkbox fix for IE7 */
.i-ie7 .i-checkbox * {
float: left;
}
.i-ie7 .i-checkbox .i-errorindicator {
padding-right: 7px;
background-position: right;
float: left;
padding-left: 0;
padding-right: 0.7em;
}
/* Error indicator on button fix for IE */
.i-ie button .i-errorindicator {
.i-ie6 button .i-errorindicator,
.i-ie7 button .i-errorindicator {
display: inline;
padding-right:5 px;
padding-right: 0.5em;
}
/* Disabled by default
.i-checkbox-error {
background: #ffe0e0;
}
*/
/* Disabled by default
.i-checkbox-required {
background: #ffe0e0;
}
*/

+ 12
- 5
WebContent/ITMILL/themes/base/caption/caption.css View File

@@ -1,24 +1,31 @@
.i-captionwrapper {
text-align: left /* Force default alignment */
text-align: left; /* Force default alignment */
}

.i-caption {
overflow: hidden;
white-space: nowrap;
}

.i-errorindicator {
float: left;
}

.i-caption .i-icon {
float: left;
padding-right: 2px;
vertical-align: middle;
}
.i-caption .i-captiontext {
float: left;
overflow: hidden;
vertical-align: middle;
}

.i-caption .i-required-field-indicator {
float: left;
}

/* Fix IE6 "double-float-margin-bug" */
.i-ie6 .i-errorindicator,
.i-ie6 .i-icon,
.i-ie6 .i-captiontext,
.i-ie6 .i-required-field-indicator {
display: inline;
}

+ 94
- 120
WebContent/ITMILL/themes/base/common/common.css View File

@@ -1,213 +1,187 @@
/* References the BODY tag generated by Vaadin application servlet */
.i-generated-body {
width:100%;
height:100%;
border:0;
margin:0;
overflow:hidden;
width: 100%;
height: 100%;
border: 0;
margin: 0;
overflow: hidden;
}

.i-app {
height: 100%;
}

.i-app-loading {
/* Specify initial loading-throbber styles with this selector (e.g. a banner that is shown before app starts) */
/* You can use this to provide indication for the user that the application is loading. */
/* It is applied to the same element as .i-app */
}

.i-view {
height: 100%;
width: 100%;
overflow: auto;
overflow: auto;
/* avoid scrollbars with margins in root layout */
outline: none;
margin-top:-1px;
border-top:1px solid transparent;
position:relative;
margin-top: -1px;
border-top: 1px solid transparent;
position: relative;
}


/**
* Try to cope printing somehow. Reasonable printing support
* Try to handle printing somehow. Reasonable printing support
* needs application specific planning and CSS tuning.
*/
@media print {
.i-generated-body {
height: auto;
min-height: 20cm;
overflow: visible;
}

.i-app {
height:auto;
height: auto;
min-height: 20cm;
}
.i-view {
overflow: visible;
}
.i-gridlayout {
overflow: visible !important;
}
}
.i-view:active, .i-view:focus {
.i-view:active,
.i-view:focus {
outline: none;
}

.i-app input,
.i-window input,
.i-app select,
.i-window select,
.i-app textarea,
.i-window textarea,
.i-app button,
.i-window button,
.i-contextmenu,
.i-datefield-popup {
/* Specify application global font style and color with this selector */
}

.i-app select,
.i-window select {
padding: 0;
margin: 0;
}

.i-disabled {
opacity: 0.3;
filter: Alpha(opacity=30);
.i-disabled
/*,
.i-app .i-disabled,
.i-window .i-disabled,
.i-popupview-popup .i-disabled*/ {
opacity: .3;
filter: alpha(opacity=30);
cursor: default;
}
.i-ie .i-disabled {
.i-disabled * {
cursor: default;
}
* html .i-disabled {
zoom: 1;
}
*+html .i-disabled {
zoom: 1;
}
.i-disabled .i-disabled {
opacity: 1.0;
filter: Alpha(opacity=100);
opacity: 1;
}
.i-required-field-indicator {
padding-left:2px;
padding-left: 2px;
color: red;
}

/**
* Custom tooltip
*/
/* Field modified */ /* Disabled by default
.i-modified,
.i-richtextarea.i-modified iframe.gwt-RichTextArea,
.i-checkbox.i-modified,
.i-modified .i-select-option,
.i-modified .i-textfield,
.i-modified .i-datefield-calendarpanel,
.i-modified .i-select-select,
.i-modified .i-select-twincol-selections,
.i-modified .i-select-twincol-options,
.i-modified .i-slider-base {
background: #ffffe0;
}
*/
.i-tooltip {
/* The outer element */
cursor: default;
background: #fff;
}

.i-tooltip-text {
/* The main tooltip text (i.e. help text) */
overflow: auto;
}

.i-tooltip .i-errormessage {
/* Additional error message that is shown in case of a component error */
overflow: auto;
}

.i-tooltip .i-errormessage h2 {
/* Error messages often include HTML tags in them */
}

.i-tooltip .i-errormessage h3 {
}

/**
* Context menu styles
*/

.i-contextmenu {
background: #efefef;
border: 1px solid #ddd;
}

.i-contextmenu .gwt-MenuBar {
/* DIV element inside the context menu, which contains all actions */
background: #fff;
}

.i-contextmenu table {
}

.i-contextmenu .gwt-MenuItem {
cursor: pointer;
/* Action item (TD element) */
vertical-align: middle;
padding: 0;
border: 0;
margin: 0;
}

.i-contextmenu .gwt-MenuItem div {
cursor: pointer;
vertical-align: middle;
white-space: nowrap;
}

.i-contextmenu .gwt-MenuItem-selected div {
background: #aaa;
color: #fff;
}

.i-contextmenu .gwt-MenuItem img {
/* Action icon */
.i-contextmenu table {
border-collapse: collapse;
margin: 0;
padding: 0;
}


/**
* Link component styles
*/
.i-link a {
.i-contextmenu .gwt-MenuItem img {
margin-right: 1em;
vertical-align: middle;
}

/**
* Label has tiny paddings to include contents margins.
*/
/* Label has tiny paddings to include possible content margins */
.i-label {
padding-top: 1px;
padding-bottom: 1px;
}

/* Loading indicator states (top-right-corner throbber).
/* A label with undefined width is always considered to be on one line */
.i-label-undef-w {
white-space: nowrap;
}
/* Loading indicator states
* Note: client side expects that loading indicator has a height. It depends on
* this css property to ensure browsers have applied all required styles.
*/
.i-loading-indicator,
.i-loading-indicator-delay,
.i-loading-indicator-wait {
/* remember to specify height */
height: 1px;
height: 16px;
position: absolute;
top: 0;
right: 0;
z-index: 30000;
}
.i-loading-indicator-delay {
/* shown after ~3 seconds of loading */
}
.i-loading-indicator-wait {
/* shown after ~10 seconds of loading */
}

/* debug dialog */

/* Debug dialog */
.i-debug-console {
background:white;
opacity: 0.85;
border: 1px solid black;
font-family:sans-serif;
background: #fff;
opacity: .9;
border: 1px solid #000;
font-family: sans-serif;
}
.i-debug-console-caption {
background:black;
background: #000;
border-bottom: 1px solid grey;
color: white;
font-weight: bold;
}
.i-debug-console-content {
font-size:x-small;
font-size: x-small;
overflow: auto;
}
.i-debug-console-content input {
font-size:xx-small;
font-size: xx-small;
}

/* Debug style */
.i-app .invalidlayout,
.i-app .invalidlayout * {
background: #f99 !important;
}
/* Fix for Liferay, issue #2384 */
.i-app input[type="text"],
.i-app input[type="password"],
.i-app input[type="reset"],
.i-app select,
.i-app textarea {
padding: 2px;
}

BIN
WebContent/ITMILL/themes/base/common/img/sprites.png View File


+ 0
- 3
WebContent/ITMILL/themes/base/coordinatelayout/coordinatelayout.css View File

@@ -1,3 +0,0 @@
.i-coordinatelayout-margin-values {
margin: 0;
}

WebContent/ITMILL/themes/default/customcomponent/customcomponent.css → WebContent/ITMILL/themes/base/customcomponent/customcomponent.css View File


WebContent/ITMILL/themes/default/customlayout/customlayout.css → WebContent/ITMILL/themes/base/customlayout/customlayout.css View File


+ 30
- 35
WebContent/ITMILL/themes/base/datefield/datefield.css View File

@@ -1,76 +1,71 @@
.i-datefield {
white-space: nowrap;
}

.i-datefield-calendarpanel {
width: 19em;
font-size: 12px;
.i-datefield-textfield {
vertical-align: top;
}

.i-datefield-popup .i-datefield-calendarpanel {
width: 16em;
.i-datefield-button {
cursor: pointer;
}

.i-datefield-calendarpanel table {
width: 100%;
}

.i-datefield-calendarpanel td {
text-align: right;
width: 14.2%;
padding: 0;
margin: 0;
}

.i-datefield-calendarpanel td span {
display: block;
.i-datefield-calendarpanel-header td {
text-align: center;
}

.i-datefield-calendarpanel-month {
text-align: center;
white-space: nowrap;
}

.i-datefield-calendarpanel-day,
.i-datefield-calendarpanel-day-today {
cursor: pointer;
}

.i-datefield-calendarpanel-day-today {
border: 1px solid #ddd;
}
.i-disabled .i-datefield-calendarpanel-day,
.i-disabled .i-datefield-calendarpanel-day-today {
cursor: default;
}

.i-datefield-calendarpanel-day-entry {
color: #999;
}

.i-datefield-calendarpanel-day-disabled {
color: #ddd;
}

.i-datefield-calendarpanel-day-entry.i-datefield-calendarpanel-day-disabled {
color: #bbb;
cursor: default;
opacity: .5;
}

.i-datefield-calendarpanel-day-selected {
font-weight: bold;
cursor: default;
background: #333;
color: #fff;
}

.i-datefield-time {
white-space: nowrap;
}

.i-datefield-time .i-label {
display: inline;
}

.i-datefield-rendererror .i-textfield {
background: #ff9999;
/* Disabled by default
.i-datefield-error .i-textfield,
.i-datefield-error .i-datefield-calendarpanel {
background: #ffe0e0;
}
*/

/* Disabled by default
.i-datefield-required .i-textfield,
.i-datefield-required .i-datefield-calendarpanel {
background:transparent;
background-color: #ffe0e0;
}
*/
/* IE somehow loses generic i-disabled alpha. See #1960 */
.i-ie .i-disabled .i-datefield-button,
.i-ie .i-disabled .i-datefield-textfield {
.i-ie6 .i-disabled .i-datefield-button,
.i-ie6 .i-disabled .i-datefield-textfield,
.i-ie7 .i-disabled .i-datefield-button,
.i-ie7 .i-disabled .i-datefield-textfield {
filter: alpha(opacity=30);
}

+ 8
- 46
WebContent/ITMILL/themes/base/formlayout/formlayout.css View File

@@ -1,77 +1,39 @@
.i-formlayout-errorcell .i-errorindicator {
width: 10px;
height: 16px;
.i-formlayout-cell .i-errorindicator {
display: block;
background: transparent url(../icons/16/error.png) no-repeat top right;
}

.i-formlayout-captioncell {
text-align: right;
text-align:right;
white-space: nowrap;
}

.i-formlayout-captioncell .i-caption {
overflow: visible;
}

.i-formlayout-contentcell {
width:100%;
}

.i-formlayout-error-indicator {
/* fix width so layout is not jumpy when error disappears */
width: 12px;
}

.i-formlayout-spacing .i-formlayout-row .i-formlayout-captioncell,
.i-formlayout-spacing .i-formlayout-row .i-formlayout-contentcell,
.i-formlayout-spacing .i-formlayout-row .i-formlayout-errorcell {
padding-top: 8px;
padding-top: 1em;
}

.i-formlayout-spacing .i-formlayout-firstrow .i-formlayout-captioncell,
.i-formlayout-spacing .i-formlayout-firstrow .i-formlayout-contentcell,
.i-formlayout-spacing .i-formlayout-firstrow .i-formlayout-errorcell {
padding-top: 0;
}

.i-formlayout-margin-top .i-formlayout-firstrow .i-formlayout-captioncell,
.i-formlayout-margin-top .i-formlayout-firstrow .i-formlayout-contentcell,
.i-formlayout-margin-top .i-formlayout-firstrow .i-formlayout-errorcell {
padding-top: 15px;
padding-top: 2em;
}
.i-formlayout-margin-bottom .i-formlayout-lastrow .i-formlayout-captioncell,
.i-formlayout-margin-bottom .i-formlayout-lastrow .i-formlayout-contentcell,
.i-formlayout-margin-bottom .i-formlayout-lastrow .i-formlayout-errorcell {
padding-bottom: 15px;
padding-bottom: 2em;
}
.i-formlayout-margin-left .i-formlayout-captioncell {
padding-left: 18px;
padding-left: 2em;
}
.i-formlayout-margin-right .i-formlayout-contentcell {
padding-right: 18px;
}

/* Form */

.i-form-errormessage {
background: transparent url(../icons/16/error.png) no-repeat top left;
padding-left: 20px;
margin-bottom: 5px;
margin-top: 5px;
min-height: 20px;
}

* html .i-form-errormessage {
height: 20px
}

.i-form {
border: none;
margin: 0;
padding: 0;
padding-right: 2em;
}

.i-form .i-caption .i-required-field-indicator {
.i-formlayout-captioncell .i-caption .i-required-field-indicator {
float: none;
}

+ 15
- 21
WebContent/ITMILL/themes/base/gridlayout/gridlayout.css View File

@@ -1,36 +1,30 @@
/* Margin values if defined from server side */
.i-gridlayout-margin-top {
padding-top: 15px;
padding-top: 2em;
}
.i-gridlayout-margin-bottom {
padding-bottom: 15px;
padding-bottom: 2em;
}
.i-gridlayout-margin-left {
padding-left: 18px;
padding-left: 2em;
}
.i-gridlayout-margin-right {
padding-right: 18px;
padding-right: 2em;
}

/*
* Spacing values used by IGridLayout. (element does not exist in DOM)
* Use padding-left for horizontal spacing and padding-top for vertical.
*/
.i-gridlayout-spacing-on {
padding-left:8px;
padding-top:8px;
padding-left: 1em;
padding-top: 1em;
overflow: hidden;
}
.i-gridlayout-spacing,
.i-gridlayout-spacing-off {
padding-left:0px;
padding-top:0px;
padding-left: 0;
padding-top: 0;
}

.i-gridlayout-spacing,
.i-gridlayout-spacing-off {
padding-left:0px;
padding-top:0px;
overflow: hidden;
}

.i-gridlayout {
overflow:hidden;
/* Ensure that resizing gridlayout works in IE */
.i-ie6 .i-gridlayout,
.i-ie7 .i-gridlayout {
overflow: hidden;
}

+ 18
- 0
WebContent/ITMILL/themes/base/link/link.css View File

@@ -0,0 +1,18 @@
.i-link {
white-space: nowrap;
}
.i-link a {
vertical-align: middle;
text-decoration: none;
}
.i-link span {
text-decoration: underline;
vertical-align: middle;
}
.i-disabled a {
cursor: default;
}
.i-link img {
vertical-align: middle;
border:none;
}

+ 30
- 17
WebContent/ITMILL/themes/base/menubar/menubar.css View File

@@ -1,24 +1,37 @@
/*Top menu */
.i-menubar table {
white-space: nowrap;
white-space: nowrap;
border-collapse: collapse;
padding: 0;
margin: 0;
}
.i-menubar table {
white-space: nowrap;
border-collapse: collapse;
padding: 0;
margin: 0;
}
.i-menubar .menuitem {
cursor : default;
}

.i-menubar .menuitem{
cursor : default;
}

.i-menubar .menuitem-selected {
background: #eee;
}

.i-menubar-submenu {
white-space: nowrap;
background: #fff;
}

.i-menubar-submenu .menuitem {
cursor: default;
.i-menubar-submenu table {
white-space: nowrap;
border-collapse: collapse;
padding: 0;
margin: 0;
}
.i-menubar-submenu table td {
white-space: nowrap;
padding: 0;
margin: 0;
}

.i-menubar .menuitem-selected,
.i-menubar-submenu .menuitem-selected {
background: #eee;
background: #333;
color: #fff;
}
.i-menubar-submenu .menuitem {
cursor: default;
}

+ 2
- 7
WebContent/ITMILL/themes/base/notification/notification.css View File

@@ -15,26 +15,21 @@
white-space: nowrap;
margin: 0 0.5em 0 0;
}

.i-Notification.warning {
background: orange;
}

.i-Notification.error {
background: red;
}


.i-Notification.tray h1 {
display: block;
}
.i-Notification.tray p {
display: block;
}
.i-Notification.system {
background-color: red;
opacity: 0.7;
opacity: .7;
filter: alpha(opacity=70);
}
.i-Notification.system h1 {
@@ -43,4 +38,4 @@
}
.i-Notification.system p {
white-space: nowrap;
}
}

+ 34
- 21
WebContent/ITMILL/themes/base/orderedlayout/orderedlayout.css View File

@@ -1,29 +1,42 @@
.i-orderedlayout {
overflow: hidden;
}

.i-orderedlayout-margin-top {
padding-top: 15px;
.i-orderedlayout-margin-top,
.i-horizontallayout-margin-top,
.i-verticallayout-margin-top {
padding-top: 2em;
}

.i-orderedlayout-margin-right {
padding-right: 18px;
.i-orderedlayout-margin-right,
.i-horizontallayout-margin-right,
.i-verticallayout-margin-right {
padding-right: 2em;
}

.i-orderedlayout-margin-bottom {
padding-bottom: 15px;
.i-orderedlayout-margin-bottom,
.i-horizontallayout-margin-bottom,
.i-verticallayout-margin-bottom {
padding-bottom: 2em;
}

.i-orderedlayout-margin-left {
padding-left: 18px;
.i-orderedlayout-margin-left,
.i-horizontallayout-margin-left,
.i-verticallayout-margin-left {
padding-left: 2em;
}

.i-orderedlayout-spacing-on {
padding-top: 8px;
padding-left: 8px;
.i-orderedlayout-spacing-on,
.i-horizontallayout-spacing-on,
.i-verticallayout-spacing-on {
padding-top: 1em;
padding-left: 1em;
}
/** This can be used to define spacing if spacing is off server side */
.i-orderedlayout-spacing-off {
/* This can be used to define spacing if spacing is off server side */
.i-orderedlayout-spacing-off,
.i-horizontallayout-spacing-off,
.i-verticallayout-spacing-off {
padding-top: 0;
padding-left: 0;
}
/* To make sure IE don't expand elements larger than they should */
.i-ie6 .i-orderedlayout,
.i-ie6 .i-horizontallayout,
.i-ie6 .i-verticallayout,
.i-ie7 .i-orderedlayout,
.i-ie7 .i-horizontallayout,
.i-ie7 .i-verticallayout {
overflow: hidden;
}

+ 11
- 5
WebContent/ITMILL/themes/base/panel/panel.css View File

@@ -9,21 +9,27 @@
outline: none; /* Prevent selection outline which might break layouts or cause scrollbars */
text-align: left /* Force default alignment */
}

.i-panel-caption .i-errorindicator {
float: none;
padding-right:1 8px;
display: inline;
}

.i-panel-caption .i-icon {
display: inline;
vertical-align: middle;
}
.i-panel-caption span {
vertical-align: middle;
}

.i-panel-caption {
white-space: nowrap;
overflow:hidden;
font-weight: bold;
}

.i-panel-nocaption {
overflow: hidden;
}
.i-panel-content {
overflow: auto;
}
.i-panel-deco {
}

+ 3
- 2
WebContent/ITMILL/themes/base/popupview/popupview.css View File

@@ -1,8 +1,9 @@
.i-popupview {
cursor: pointer;
width: 5px;
height: 5px;
background: #aaa;
}

.i-popupview-popup {
background: white;
overflow: auto;
}

+ 14
- 13
WebContent/ITMILL/themes/base/progressindicator/progressindicator.css View File

@@ -1,33 +1,34 @@
.i-progressindicator-wrapper {
overflow: hidden; /* for IE6 */
height: 9px;
}

.i-progressindicator {
background: #eee;
overflow: hidden; /* for IE6 */
width: 150px;
}
.i-progressindicator-wrapper {
overflow: hidden; /* for IE6 */
height: 9px;
border: 1px solid #ddd;
}
.i-progressindicator-disabled {
background: #efefef;
height: 9px;
overflow: hidden; /* for IE6 */
}

.i-progressindicator-indicator {
background: #ddd;
height: 9px;
overflow: hidden; /* for IE6 */
background: #ddd;
}

.i-progressindicator-indeterminate {
background: #eee;
height: 16px;
width: 16px;
overflow: hidden; /* for IE6 */
}
.i-progressindicator-disabled-indeterminate {
background: #efefef;
/* Hide obsolete elements in indeterminate mode */
.i-progressindicator-indeterminate .i-progressindicator-wrapper,
.i-progressindicator-indeterminate .i-progressindicator-indicator,
.i-progressindicator-indeterminate-disabled .i-progressindicator-wrapper,
.i-progressindicator-indeterminate-disabled .i-progressindicator-indicator {
display: none;
}
.i-progressindicator-indeterminate-disabled {
height: 16px;
width: 16px;
overflow: hidden; /* for IE6 */

+ 86
- 89
WebContent/ITMILL/themes/base/select/select.css View File

@@ -1,137 +1,134 @@
.i-select {
text-align: left /* Force default alignment */
}
.i-select-optiongroup .i-select-option {
display: block;
text-align: left;
}
.i-select-optiongroup .i-select-option {
display: block;
white-space: nowrap;
}

.i-ie .i-select-optiongroup .i-select-option {
zoom: 1;
}
.i-select-select {
display: block;
}
/* Twincol style */
.i-select-twincol {
white-space: nowrap;
}
.i-select-twincol-options {
float: left;
}
.i-select-twincol-selections {
font-weight: bold;
}
.i-select-twincol-buttons {
float: left;
padding: 2px; /* does not work in first render in FF ? */
text-align: center;
}
.i-select-twincol-buttons .i-select-twincol-deco {
clear:both;
}
.i-select-twincol .i-textfield {
display: block;
float: left;
clear: left;
}
.i-select-twincol .i-button {
display: block;
float: left;
}
.i-select-twincol-buttons .i-button {
display: inline;
float: none;
.i-select-select {
display: block;
}
.i-select-twincol {
white-space: nowrap;
}
.i-select-twincol-options {
float: left;
}
.i-select-twincol-selections {
font-weight: bold;
}
.i-select-twincol-buttons {
float: left;
text-align: center;
}
.i-select-twincol-buttons .i-select-twincol-deco {
clear: both;
}
.i-select-twincol .i-textfield {
display: block;
float: left;
clear: left;
}
.i-select-twincol .i-button {
display: block;
float: left;
}
.i-select-twincol-buttons .i-button {
display: inline;
float: none;
}

/** Filterselect aka ComboBox styles */

.i-filterselect {
white-space: nowrap;
text-align: left /* Force default alignment */
text-align: left;
}

.i-filterselect-input {
.i-filterselect .i-icon {
float: left;
margin: 0;
}

.i-app .i-filterselect-input,
.i-window .i-filterselect-input,
.i-popupview-popup .i-filterselect-input {
float: left;
}
.i-filterselect-prompt .i-filterselect-input {
color: #999;
font-style: italic;
}
.i-filterselect-button {
float: right;
width: 1em;
height: 1em;
cursor: pointer;
background: #ddd;
}

.i-filterselect.i-readonly .i-filterselect-button {
display: none;
}
.i-filterselect-suggestpopup {
background: #eee;
border: 1px solid #ddd;
background: #fff;
border: 1px solid #eee;
}

.i-filterselect-suggestmenu table {
border-collapse: collapse;
border: none;
padding: 0;
margin: 0;
}

.i-filterselect-suggestmenu .gwt-MenuItem {
cursor: pointer;
height: 1em;
white-space: nowrap;
}

.i-filterselect-suggestmenu .gwt-MenuItem .i-icon {
margin-right: 3px;
vertical-align: middle;
}
.i-filterselect-suggestmenu .gwt-MenuItem span {
vertical-align: middle;
}
.i-filterselect-suggestmenu .gwt-MenuItem-selected {
background: #999;
background: #333;
color: #fff;
}

.i-filterselect-nextpage,
.i-filterselect-nextpage-off,
.i-filterselect-prevpage-off,
.i-filterselect-prevpage {
width: 100%;
background: #aaa;
text-align: center;
overflow: hidden;
}

.i-filterselect-nextpage span,
.i-filterselect-nextpage-off span,
.i-filterselect-prevpage-off span,
.i-filterselect-prevpage span {
display: block;
background: #ddd;
cursor: pointer;
overflow: hidden;
text-align: center;
}

.i-filterselect-nextpage-off,
.i-filterselect-prevpage-off {
opacity: 0.5;
filter: Alpha(opacity=50);
color: #666;
opacity: .5;
filter: alpha(opacity=50);
cursor: default;
}
.i-filterselect-nextpage-off span,
.i-filterselect-prevpage-off span {
cursor: default;
}

.i-filterselect-status {
white-space: nowrap;
text-align: center;
}

.i-filterselect-error {
background: #ff2222;
}
/* Error styles (disabled by default)

.i-filterselect-error .i-filterselect-input,
.i-select-error .i-select-option,
.i-select-error .i-select-select,
.i-select-error .i-select-twincol-selections,
.i-select-error .i-select-twincol-options {
background: #ffaaaa;
}
*/

.i-filterselect-error .i-filterselect-button {
background: red;
}
/* Required field styles (disabled by default)
.i-filterselect-error .i-filterselect-input,
.i-select-required .i-select-option,
.i-select-required .i-select-select,
.i-select-required .i-select-twincol-selections,
.i-select-required .i-select-twincol-options {
background: #ffaaaa;
}
*/

BIN
WebContent/ITMILL/themes/base/shadow/img/bottom-left.png View File


BIN
WebContent/ITMILL/themes/base/shadow/img/bottom-right.png View File


BIN
WebContent/ITMILL/themes/base/shadow/img/bottom.png View File


BIN
WebContent/ITMILL/themes/base/shadow/img/center.png View File


BIN
WebContent/ITMILL/themes/base/shadow/img/left.png View File


BIN
WebContent/ITMILL/themes/base/shadow/img/right.png View File


BIN
WebContent/ITMILL/themes/base/shadow/img/top-left.png View File


BIN
WebContent/ITMILL/themes/base/shadow/img/top-right.png View File


BIN
WebContent/ITMILL/themes/base/shadow/img/top.png View File


+ 20
- 20
WebContent/ITMILL/themes/base/shadow/shadow.css View File

@@ -4,66 +4,66 @@

.i-shadow .top-left {
position: absolute; overflow: hidden;
top: -3px; left: -4px;
width: 8px; height: 8px;
top: -3px; left: -5px;
width: 10px; height: 10px;
background: transparent url(img/top-left.png);
}

.i-shadow .top {
position: absolute; overflow: hidden;
top: -3px; left: 4px;
height: 8px; right: 4px;
top: -3px; left: 5px;
height: 10px; right: 5px;
background: transparent url(img/top.png);
}

.i-shadow .top-right {
position: absolute; overflow: hidden;
top: -3px; right: -4px;
width: 8px; height: 8px;
top: -3px; right: -5px;
width: 10px; height: 10px;
background: transparent url(img/top-right.png);
}

.i-shadow .left {
position: absolute; overflow: hidden;
top: 5px; left: -4px;
width: 8px;
top: 7px; left: -5px;
width: 10px;
bottom: 3px;
background: transparent url(img/left.png);
}

.i-shadow .center {
position: absolute; overflow: hidden;
top: 5px; left: 4px;
bottom: 3px; right: 4px;
top: 7px; left: 5px;
bottom: 3px; right: 5px;
background: transparent url(img/center.png);
}

.i-shadow .right {
position: absolute; overflow: hidden;
top: 5px; right: -4px;
width: 8px;
top: 7px; right: -5px;
width: 10px;
bottom: 3px;
background: transparent url(img/right.png);
}

.i-shadow .bottom-left {
position: absolute; overflow: hidden;
bottom: -5px; left: -4px;
width: 8px; height: 8px;
bottom: -7px; left: -5px;
width: 10px; height: 10px;
background: transparent url(img/bottom-left.png);
}

.i-shadow .bottom {
position: absolute; overflow: hidden;
bottom: -5px; left: 4px;
right: 4px; height: 8px;
bottom: -7px; left: 5px;
right: 5px; height: 10px;
background: transparent url(img/bottom.png);
}

.i-shadow .bottom-right {
position: absolute; overflow: hidden;
bottom: -5px; right: -4px;
width: 8px; height: 8px;
bottom: -7px; right: -5px;
width: 10px; height: 10px;
background: transparent url(img/bottom-right.png);
}

@@ -73,11 +73,11 @@

/* For IE6 (no transparent png's, we use a blur filter) */

* html .i-shadow * {
.i-ie6 .i-shadow * {
display: none;
}

* html .i-shadow {
.i-ie6 .i-shadow {
background: #000;
filter: progid:DXImageTransform.Microsoft.Blur(pixelRadius=2) alpha(opacity=20);
margin-top: -3px;

+ 22
- 33
WebContent/ITMILL/themes/base/slider/slider.css View File

@@ -1,24 +1,17 @@
/*--------------------------
Default (horizontal) styles
--------------------------*/

.i-slider {
height: 12px;
width: 200px;
margin: 5px 0;
margin: 5px 0;
}

.i-slider-base {
/* changing the borders will require adjustments to ISlider.java (offsetHeight should be 3px, 1px borders on the sides) */
height: 3px;
background: #efefef;
border-left: 1px solid #eee;
/* changing the borders will require adjustments to ISlider.java */
height: 2px;
border-top: 1px solid #ddd;
background: #eee;
border-left: 1px solid #ddd;
border-right: 1px solid #eee;
}

.i-slider-handle {
background: #ddd;
background: #aaa;
width: 12px;
height: 12px;
margin-top: -5px;
@@ -26,31 +19,20 @@
cursor: pointer;
}


/*-----------------
Vertical styles
-----------------*/

.i-slider-vertical {
width: 3px;
width: 2px;
height: auto;
margin: 0 5px;
border: none;
border-left: 1px solid #eee;
border-right: 1px solid #eee;
border-left: 1px solid #cccfd0;
border-right: 1px solid #cccfd0;
}

.i-slider-vertical .i-slider-base {
width: 3px;
border-left: none;
width: 2px;
border-bottom: 1px solid #eee;
border-right: none;
background: #efefef;
border-top: 1px solid #eee;
border-bottom: 1px solid #eee;
}

.i-slider-vertical .i-slider-handle {
background: #ddd;
width: 12px;
height: 12px;
font-size: 0;
@@ -58,18 +40,25 @@
margin-left: -5px;
}

/* Disabled by default
.i-slider-error .i-slider-base {
background: #FFE0E0;
}
*/
/* Disabled by default
.i-slider-required .i-slider-base {
background: #FFE0E0;
}
*/

/* IE specific styles */

.i-ie6 .i-slider,
.i-ie6 .i-slider-vertical {
margin: 0;
}

.i-ie6 .i-slider .i-slider-handle {
margin: -1px 0;
}

.i-ie6 .i-slider-vertical .i-slider-handle {
margin: 0 -1px;
}

+ 0
- 10
WebContent/ITMILL/themes/base/splitpanel/splitpanel.css View File

@@ -2,12 +2,10 @@
.i-splitpanel-vertical {
overflow: hidden;
}

.i-splitpanel-horizontal .i-splitpanel-hsplitter {
width: 6px;
font-size: 1px; /* for IE6 */
}

.i-splitpanel-horizontal .i-splitpanel-hsplitter div {
width: 6px;
font-size: 1px; /* for IE6 */
@@ -17,25 +15,17 @@
background: #ddd;
cursor: e-resize;
}

.i-splitpanel-vertical .i-splitpanel-vsplitter {
height: 6px;
font-size: 1px; /* for IE6 */
}

.i-splitpanel-vertical .i-splitpanel-vsplitter div {
height: 6px;
font-size: 1px; /* for IE6 */
background: #ddd;
cursor: n-resize;
}





/* IE specific styles */

.i-ie6 .i-splitpanel-horizontal .i-splitpanel-hsplitter div {
height: 99%;
}

+ 662
- 614
WebContent/ITMILL/themes/base/styles.css
File diff suppressed because it is too large
View File


+ 65
- 42
WebContent/ITMILL/themes/base/table/table.css View File

@@ -1,88 +1,115 @@
/* Table theme building instructions
*
* Toolkit scroll table is very complex widget with dozens of features. These
* features set some limitations for theme builder. To keep things working, it
* is safest to try to just override values used in default theme and comfort to
* these instructions.
*
* Borders in table header and in table body need to be same width
* - specify vertical borders on .i-table-header-wrap and .i-table-body
*
* Table cells in body:
* - padding/border for cells is to be defined for td elements (class name: .i-table-cell-content)
* - in default theme there are no borders, but they should work. Just set border-right or border-bottom
* - no padding or border is allowed for div inside cells (class name: .i-table-cell-wrapper) element
* - background is allowed for both elements
*
* Table headers:
* - table cells in header contain .i-table-resizer and
* .i-table-caption-container div elements, which are both floated to right
* - to align header caption to body content resizer width + .i-table-caption-container
* padding right should be equal to content cells padding-right and border-right.
* - Possible cell border in header must be themed into column resizer.
*
*/
.i-table {
overflow: hidden;
text-align: left /* Force default alignment */
text-align: left; /* Force default alignment */
}

.i-table-header-wrap {
background: #efefef;
border: 1px solid #ddd;
overflow: hidden;
border: 1px solid #aaa;
border-bottom: none;
background: #efefef;
}

.i-table-header table,
.i-table-table {
border-collapse: collapse;
border-spacing: 0;
margin: 0;
padding: 0;
border: 0;
}

.i-table-header td,
.i-table-table td {
margin: 0;
.i-table-header td {
padding: 0;
border: 0;
}

.i-table-header td {
.i-table-header-cell,
.i-table-header-cell-asc,
.i-table-header-cell-desc {
cursor: pointer;
}

.i-table-resizer {
display: block;
height: 1em;
height: 1.2em;
float: right;
background: #ddd;
background: #aaa;
cursor: col-resize;
width: 1px;
overflow: hidden;
}

.i-table-caption-container {
float: right;
overflow: hidden;
white-space: nowrap;
padding-right: 6px;
}
.i-table-header-cell-asc .i-table-caption-container {
background: transparent url(../common/img/sprites.png) no-repeat right 6px;
}
.i-table-header-cell-desc .i-table-caption-container {
background: transparent url(../common/img/sprites.png) no-repeat right -10px;
}
.i-table-body {
border: 1px solid #aaa;
}

.i-table-row-spacer {
height: 10px;
overflow: hidden; /* IE hack to allow < one line height divs */
}

.i-table-row,
.i-table-row-odd {
border: 0;
margin: 0;
padding: 0;
cursor: default;
}

.i-table .i-selected {
background: #999;
color: #fff;
}

.i-table-row td,
.i-table-row-odd td {
padding: 0;
}
.i-table-cell-content {
white-space: nowrap;
overflow: hidden;
padding: 3px 0 3px 3px;
margin-right: 5px;
padding: 0 6px;
border-right: 1px solid #aaa;
}
.i-table-cell-wrapper {
/* Do not specify any margins, paddings or borders here */
white-space: nowrap;
overflow: hidden;
}

.i-table-column-selector {
float: right;
background: #ddd;
margin: -1em 0 0 0;
height: 1em;
width: 0.5em;
background: transparent url(../common/img/sprites.png) no-repeat 4px -37px;
margin: -1.2em 0 0 0;
height: 1.2em;
width: 14px;
position: relative; /* hide this from IE, it works without it */
cursor: pointer;
}
.i-ie .i-table-column-selector {
.i-ie6 .i-table-column-selector,
.i-ie7 .i-table-column-selector {
position: static;
}

.i-table-focus-slot-left {
border-left: 2px solid #999;
margin-right: -2px;
@@ -91,28 +118,24 @@
border-right: 2px solid #999;
margin-left: -2px;
}

.i-table-header-drag {
position: absolute;
background: #efefef;
border: 1px solid #eee;
opacity: 0.5;
filter: alpha(opacity=50);
opacity: 0.9;
filter: alpha(opacity=90);
margin-top: 20px;
z-index: 30000;
}

.i-table-scrollposition {
width: 160px;
background: #eee;
border: 1px solid #aaa;
}

.i-table-scrollposition span {
display: block;
text-align: center;
}


/* row in column selector */
.i-on div {

+ 40
- 29
WebContent/ITMILL/themes/base/tabsheet/tabsheet.css View File

@@ -4,7 +4,6 @@
outline: none; /* Prevent selection outline which might break layouts or cause scrollbars */
text-align: left /* Force default alignment */
}

.i-tabsheet-tabs {
empty-cells: hide;
border-collapse: collapse;
@@ -12,63 +11,75 @@
padding: 0;
border: 0;
width: 100%;
overflow: hidden;
border-bottom: 1px solid #ddd;
overflow:hidden;
}
.i-tabsheet-tabs td {
margin:0;
padding:0;
.i-tabsheet-tabitemcell,
.i-tabsheet-spacertd {
margin: 0;
padding: 0;
vertical-align: bottom;
}

.i-tabsheet-spacertd {
width: 100%;
}

.i-tabsheet-spacertd div {
border-left: 1px solid #aaa;
border-bottom: 1px solid #aaa;
height: 1em;
padding: 0.2em 0;
}
.i-tabsheet-hidetabs .i-tabsheet-tabcontainer {
display: none;
}

.i-tabsheet-scroller {
white-space: nowrap;
text-align: right;
margin-top: -1em;
}

.i-tabsheet-scrollerPrev,
.i-tabsheet-scrollerNext {
border: none;
width: 0.5em;
.i-tabsheet-scrollerNext,
.i-tabsheet-scrollerPrev-disabled,
.i-tabsheet-scrollerNext-disabled {
border: 1px solid #aaa;
background: #fff;
width: 12px;
height: 1em;
background: #ddd;
cursor: pointer;
}
.i-tabsheet-scrollerPrev-disabled,
.i-tabsheet-scrollerNext-disabled {
border: none;
width: 0.5em;
height: 1em;
background: #efefef;
}

.i-tabsheet-tabs .i-caption {
white-space: nowrap;
opacity: 0.5;
cursor: default;
}

/* for IE (does not inherit) */
.i-tabsheet-tabs .i-caption,
.i-tabsheet-tabs .i-caption span {
white-space: nowrap;
}

.i-tabsheet-tabitem {
border: 1px solid #aaa;
border-right: none;
cursor: pointer;
padding: 0.2em 0.5em;
}

.i-tabsheet-tabitem-selected {
background: #ddd;
cursor: default;
border-bottom-color: #fff;
}

.i-tabsheet-content {
border: 1px solid #aaa;
/* Vertical borders are not supported, use i-tabsheet-tabcontainer and i-tabsheet-deco to present these borders */
border-top: none;
border-bottom: none;
position: relative;
}
.i-tabsheet-deco {
height: 1px;
background: #aaa;
overflow: hidden;
}
.i-tabsheet-hidetabs .i-tabsheet-content {
border: none;
}
.i-tabsheet-hidetabs .i-tabsheet-deco {
height: 0;
}

+ 43
- 2
WebContent/ITMILL/themes/base/textfield/textfield.css View File

@@ -1,11 +1,52 @@
.i-textfield {
text-align: left /* Force default alignment */
}

.i-textarea {
}
.i-textfield-focus,
.i-textarea-focus {
}
input.i-textfield-prompt,
textarea.i-textarea-prompt {
color: #999;
font-style: italic;
}
.i-textfield.i-readonly,
.i-textarea.i-readonly {
background: transparent;
color: #222;
border: none;
}
.i-richtextarea {
border: 1px solid #aaa;
overflow: hidden;
}

.i-richtextarea .gwt-RichTextToolbar .gwt-ToggleButton,
.i-richtextarea .gwt-RichTextToolbar .gwt-PushButton {
float: left;
}
.i-richtextarea .gwt-RichTextToolbar {
white-space: nowrap;
}
.i-richtextarea iframe {
border: 0;
}
/* Disabled by default
.i-textarea-error,
.i-textfield-error,
.i-richtextarea-error iframe.gwt-RichTextArea {
background: #FFE0E0;
}
*/
/* Disabled by default
.i-textarea-required,
.i-textfield-required,
.i-richtextarea-required iframe.gwt-RichTextArea {
background: #FFE0E0;
}
*/
/* Safari focus glow fix */
.i-sa input:focus,
.i-sa textarea:focus {
outline-width: medium;
}

+ 29
- 24
WebContent/ITMILL/themes/base/tree/tree.css View File

@@ -1,33 +1,18 @@
.i-tree {
text-align: left /* Force default alignment */
}

/* ie6compatnode is hidden from non ie6 browsers, because ie6
* uses weird hack to sink all events properly
*/
.i-tree-node-ie6compatnode {
display: none;
.i-tree-node {
background: transparent url(../common/img/sprites.png) no-repeat 5px -37px;
}

.i-ie6 .i-tree-node-ie6compatnode {
display: inline;
float: left;
background: #000;
margin: 0;
width: 14px;
height: 10px;
padding: 1px;
filter: Alpha(opacity=0);
.i-tree-node-expanded {
background-position: -5px -10px;
}

.i-ie6 .i-tree-node {
clear: both;
div.i-tree-node-leaf {
background: none;
}

.i-tree-node-caption {
margin-left: 16px;
margin-left: 1em;
}

.i-tree-node span {
cursor: pointer;
white-space: nowrap;
@@ -35,8 +20,28 @@
.i-tree-node-selected span {
background: #999;
color: #fff;
cursor: pointer;
}
.i-tree-node-children {
padding-left: 16px;
padding-left: 1em;
}
/* ie6compatnode is hidden from non ie6 browsers, for ie6
* uses weird hack to sink all events properly
*/
.i-tree-node-ie6compatnode {
display: none;
}
/* IMPORTANT keep the offsetWidth of this element the same as the margin-left of i-tree-node-caption */
.i-ie6 .i-tree-node-ie6compatnode {
display: inline;
float: left;
background: orange;
margin: 0;
width: 0.8em;
height: 0.8em;
padding: 0.1em;
filter: alpha(opacity=0);
}
.i-ie6 .i-tree-node,
.i-ie6 .i-tree-node-children {
clear: left;
}

BIN
WebContent/ITMILL/themes/base/window/img/shadow/bottom-left.png View File


BIN
WebContent/ITMILL/themes/base/window/img/shadow/bottom-right.png View File


BIN
WebContent/ITMILL/themes/base/window/img/shadow/bottom.png View File


BIN
WebContent/ITMILL/themes/base/window/img/shadow/center.png View File


BIN
WebContent/ITMILL/themes/base/window/img/shadow/left.png View File


BIN
WebContent/ITMILL/themes/base/window/img/shadow/right.png View File


BIN
WebContent/ITMILL/themes/base/window/img/shadow/top-left.png View File


BIN
WebContent/ITMILL/themes/base/window/img/shadow/top-right.png View File


BIN
WebContent/ITMILL/themes/base/window/img/shadow/top.png View File


+ 38
- 77
WebContent/ITMILL/themes/base/window/window.css View File

@@ -1,25 +1,24 @@
.i-window {
background: #fff;
}

.i-window-outerheader {
cursor: move;
padding: 0.3em 1em;
height: 1em;
}

.i-window-header {
div.i-window-header {
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
font-weight: bold;
padding: 0;
}

.i-ie6 .i-window-header {
width: 100%;
}

.i-window-header .i-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) */
.i-window-contents, x:-moz-any-link {
@@ -29,13 +28,10 @@
.i-window-contents, x:-moz-any-link, x:default {
overflow: visible;
}

.i-window-footer {
height: 10px;
overflow: hidden;
}

.i-window-resizebox {
position: relative; /* Needed to position the element over ScrollPanel, which is also relatively positioned */
display: inline; /* fix IE6 double float margin bug */
float: right;
width: 10px;
@@ -44,140 +40,105 @@
background: #ddd;
overflow: hidden;
}

.i-window-resizebox-disabled {
cursor: default;
background: transparent;
display: none;
}

.i-window-closebox {
position: absolute;
top: 0;
right: 0;
width: 12px;
height: 12px;
width: 1em;
height: 1em;
background: red;
cursor: pointer;
overflow: hidden;
}

.i-window-modalitycurtain {
top: 0;
left: 0;
background: white;
background: #999;
opacity: 0.5;
position: fixed;
width: 100%;
height: 100%;
filter: alpha(opacity=50);
}

/* IE6 workaround for position:fixed; */
* html .i-window-modalitycurtain {
.i-ie6 .i-window-modalitycurtain {
position: absolute;
top: expression(document.documentElement.scrollTop + "px");
}

/* IE specific styles */

* html .i-window {
width: 0; /* min-size for IE6 */
}















/* min-width for IE6 */
.i-ie6 .i-window {
width: 0; /* */
}
/* Shadow for window */

.i-shadow-window {
position: absolute;
}

.i-shadow-window .top-left {
position: absolute; overflow: hidden;
top: -13px; left: -20px;
width: 39px; height: 39px;
top: -10px; left: -15px;
width: 28px; height: 28px;
background: transparent url(img/shadow/top-left.png);
}

.i-shadow-window .top {
position: absolute; overflow: hidden;
top: -13px; left: 19px;
height: 39px;
right: 19px;
top: -10px; left: 13px;
height: 28px;
right: 13px;
background: transparent url(img/shadow/top.png);
}

.i-shadow-window .top-right {
position: absolute; overflow: hidden;
top: -13px; right: -20px;
width: 39px; height: 39px;
top: -10px; right: -15px;
width: 28px; height: 28px;
background: transparent url(img/shadow/top-right.png);
}

.i-shadow-window .left {
position: absolute; overflow: hidden;
top: 26px; left: -20px;
width: 39px;
bottom: 12px;
top: 18px; left: -15px;
width: 28px;
bottom: 10px;
background: transparent url(img/shadow/left.png);
}

.i-shadow-window .center {
position: absolute; overflow: hidden;
top: 26px; left: 19px;
bottom: 12px; right: 19px;
top: 18px; left: 13px;
bottom: 10px; right: 13px;
background: transparent url(img/shadow/center.png);
}

.i-shadow-window .right {
position: absolute; overflow: hidden;
top: 26px; right: -20px;
width: 39px;
bottom: 12px;
top: 18px; right: -15px;
width: 28px;
bottom: 10px;
background: transparent url(img/shadow/right.png);
}

.i-shadow-window .bottom-left {
position: absolute; overflow: hidden;
bottom: -27px; left: -20px;
width: 39px; height: 39px;
bottom: -18px; left: -15px;
width: 28px; height: 28px;
background: transparent url(img/shadow/bottom-left.png);
}

.i-shadow-window .bottom {
position: absolute; overflow: hidden;
bottom: -27px; left: 19px;
right: 19px; height: 39px;
bottom: -18px; left: 13px;
right: 13px; height: 28px;
background: transparent url(img/shadow/bottom.png);
}

.i-shadow-window .bottom-right {
position: absolute; overflow: hidden;
bottom: -27px; right: -20px;
width: 39px; height: 39px;
bottom: -18px; right: -15px;
width: 28px; height: 28px;
background: transparent url(img/shadow/bottom-right.png);
}


/* For IE6 (no transparent png's, we use a blur filter) */

* html .i-shadow-window * {
.i-ie6 .i-shadow-window * {
display: none;
}

* html .i-shadow-window {
.i-ie6 .i-shadow-window {
background: #000;
filter: progid:DXImageTransform.Microsoft.Blur(pixelRadius=5) alpha(opacity=20);
margin-top: 2px;

+ 2
- 24
WebContent/ITMILL/themes/default/accordion/accordion.css View File

@@ -1,43 +1,21 @@
.i-accordion {
position: relative;
outline: none;
overflow: hidden;
text-align: left /* Force default alignment */
}

.i-accordion-item {
position: relative;
background-color: #fff;
}

.i-accordion-item-caption {
height: 31px;
overflow: hidden;
white-space: nowrap;
background: #edf0f0 url(../tabsheet/img/tab-bg.png);
font-size: 15px;
color: #656d73;
border-top: 1px solid #c8cccd;
}

.i-accordion-item-caption .i-caption {
padding: 7px 0 6px 18px;
cursor: pointer;
}

.i-accordion-item-open .i-accordion-item-caption {
color: #3b4b57;
background: #d5dee2 url(img/selected-bg.png);
border-top-color: #cbd7de;
border-bottom-color: #bfc9d4;
text-shadow: #fafafa 1px 1px 0;
text-shadow: #fafafa 0 1px 0;
border-bottom: 1px solid #c8cccd;
cursor: default;
}


.i-accordion-item-content {
position: absolute;
overflow: auto;
width: 100%;
}
}

+ 12
- 77
WebContent/ITMILL/themes/default/button/button.css View File

@@ -1,86 +1,21 @@
.i-button {
cursor: pointer;
font-size: 13px;
white-space: nowrap;
margin: 0px;
}
.i-checkbox input {
vertical-align: middle;
}
.i-button img, .i-checkbox img {
display:inline;
vertical-align: middle;
margin-right: 3px;
}
.i-button span, .i-checkbox label {
vertical-align: middle;
}

.i-button-link {
border: none;
text-align: left;
background: none;
padding: 0;
}
.i-sa .i-button-link:focus {
outline-offset: -3px;
}
.i-button-link span {
text-decoration: underline;
}
.i-checkbox {
white-space: nowrap;
}
.i-checkbox .i-errorindicator {
float: none;
display:inline;
padding-left: 10px;
background-position:left;
}


/* fixes streched buttons in IE6 */
* html .i-button {
width: 1px;
overflow: visible;
padding-left: 10px;
padding-right: 10px;
}

/* fixes streched buttons in IE7 */
*+html .i-button {
overflow: visible;
}
.i-ie6 .i-button,
.i-ie7 .i-button {
padding-left: 10px;
padding-right: 10px;
}
/* Error indicator on checkbox fix for IE6 */
* html .i-checkbox * { display: block; float: left;}
* html .i-checkbox .i-errorindicator {background-position:right;display: block; float: left; padding-left: 0px; padding-right:4px;}

/* Error indicator on checkbox fix for IE7 */
*+ html .i-checkbox * { display: block; float: left;}
*+ html .i-checkbox .i-errorindicator {background-position:right;display: block; float: left; padding-left: 0px;;padding-right:7px;}

/* Error indicator on button fix for IE7 */
*+ html button .i-errorindicator { display:inline; padding-right:5px; }

/* Error indicator on button fix for IE6 */
* html button .i-errorindicator { display:inline; padding-right:5px;}


/* Disabled by default
.i-checkbox-error {
background:transparent;
background-color: #FFE0E0;
}
*/

/* Disabled by default
.i-checkbox-required {
background:transparent;
background-color: #FFE0E0;
.i-ie6 .i-checkbox .i-errorindicator {
padding-right: 4px;
}
.i-ie7 .i-checkbox .i-errorindicator {
padding-right: 7px;
}
*/
.i-ie6 .i-button .i-errorindicator,
.i-ie7 .i-button .i-errorindicator {
padding-right: 5px;
}

+ 5
- 32
WebContent/ITMILL/themes/default/caption/caption.css View File

@@ -1,42 +1,15 @@
/* Provide some extra whitespace for wrapped elements
(these elements usually need the extra space, since
they aren't even handling their own caption) */
.i-captionwrapper {
margin: 0.3em 0 0 0;
text-align: left /* Force default alignment */
}

.i-caption {
overflow: hidden;
white-space: nowrap;
}

.i-errorindicator {
width: 12px;
height: 16px;
float: left;
background: transparent url(../icons/16/error.png) no-repeat top right;
}

* html .i-errorindicator {
background: transparent none;
.i-ie6 .i-errorindicator {
/* gif for transparency */
background: transparent url(../icons/16/error.gif) no-repeat top right;
}
*+html .i-errorindicator {
margin-left:-3px;
}
.i-caption .i-icon {
padding-right: 2px;
vertical-align: middle;
float: left;
}
.i-caption .i-captiontext {
float: left;
overflow: hidden;
vertical-align: middle;
}

.i-caption .i-required-field-indicator {
float: left;
background-image: url(../icons/16/error.gif);
}
.i-ie7 .i-errorindicator {
margin-left: -3px;
}

+ 4
- 198
WebContent/ITMILL/themes/default/common/common.css View File

@@ -1,66 +1,18 @@
/* body tag created by servlet */
.i-generated-body {
background: #e9eced;
width: 100%;
height: 100%;
border: 0;
margin: 0;
overflow: hidden;
}

.i-app {
background: #e9eced;
font-family: "Trebuchet MS", geneva, helvetica, arial, tahoma, verdana, sans-serif;
color: #464f52;
font-size: 13px;
line-height: 18px;
height: 100%;
}

.i-app-loading {
background-image: url(img/loading-indicator.gif);
background-repeat: no-repeat;
background-position: 50%;
}

.i-view {
height: 100%;
width: 100%;
overflow: auto;
/* avoid scrollbars with margins in root layout */
outline: none;
margin-top: -1px;
border-top: 1px solid transparent;
position: relative;
}

/**
* Try to cope printing somehow. Reasonable printing support
* needs application specific planning and CSS tuning.
*/
@media print {
.i-generated-body {
height: auto;
min-height: 20cm;
overflow: visible;
}
.i-app {
height: auto;
min-height: 20cm;
}
.i-view {
overflow: visible;
}
.i-gridlayout {
overflow: visible !important;
}
}

.i-view:active,
.i-view:focus {
outline: none;
}

/* Global font styles */
.i-app input,
.i-app select,
@@ -78,63 +30,11 @@
color: #464f52;
font-size: 13px;
}

.i-app select,
.i-window select {
padding: 0;
margin: 0;
}

.i-disabled,
.i-app .i-disabled,
.i-window .i-disabled {
opacity: 0.3;
filter: Alpha(opacity = 30);
cursor: default;
}

.i-disabled *,
.i-app .i-disabled *,
.i-window .i-disabled * {
cursor: default;
}

* html .i-disabled {
zoom: 1;
}

*+html .i-disabled {
zoom: 1;
}

.i-disabled .i-disabled {
opacity: 1.0;
}

.i-required-field-indicator {
padding-left: 2px;
color: red;
}

/* Field modified */ /* Disabled by default
input.i-modified,
.i-richtextarea.i-modified iframe.gwt-RichTextArea,
.i-checkbox.i-modified,
.i-modified .i-select-option,
.i-modified .i-textfield,
.i-modified .i-datefield-calendarpanel,
.i-modified .i-select-select,
.i-modified .i-select-twincol-selections,
.i-modified .i-select-twincol-options,
.i-modified .i-slider-base {
background:transparent;
background-color: #FFFFE0;
}
*/

/**
* Custom tooltip
*/
/* Custom tooltip */
.i-tooltip {
background-color: #fffcdd;
border: 1px solid #b8b295;
@@ -144,17 +44,13 @@ input.i-modified,
line-height: 13px;
font-family: arial, helvetica, tahoma, verdana, sans-serif;
color: #5d5444;
cursor: default;
}

.i-tooltip-text {
padding: 2px 4px;
border: none;
border-top: 1px solid #fffef5;
border-bottom: 1px solid #fbf8d9;
overflow: auto;
}

.i-tooltip .i-errormessage {
padding: 3px 4px 3px 4px;
background: #ffecc6;
@@ -162,25 +58,18 @@ input.i-modified,
border: none;
border-top: 1px solid #fff3dc;
border-bottom: 1px solid #ead7b1;
overflow: auto;
}

.i-tooltip .i-errormessage h2 {
font-size: 16px;
font-weight: normal;
color: #ab3101;
margin: 2px 0 8px 0;
}

.i-tooltip .i-errormessage h3 {
font-size: 13px;
font-weight: bold;
margin: 1px 0 4px 0;
}

/**
* Context menu styles
*/
.i-contextmenu {
background: #e9eced url(../tabsheet/img/tab-bg.png);
font-family: "Trebuchet MS", geneva, helvetica, arial, tahoma, verdana, sans-serif;
@@ -189,59 +78,25 @@ input.i-modified,
font-size: 12px;
line-height: 14px;
}

.i-contextmenu .gwt-MenuBar {
border-right: 1px solid #c6cbcc;
border-bottom: 1px solid #c6cbcc;
border-top: 1px solid #d0d4d5;
border-left: 1px solid #d0d4d5;
}

.i-contextmenu .gwt-MenuItem {
padding: 2px 0;
cursor: pointer;
vertical-align: middle;
}

.i-contextmenu .gwt-MenuItem div { /*border: 1px solid #f6f7f7;*/
.i-contextmenu .gwt-MenuItem div {
padding: 1px 20px 1px 8px;
cursor: pointer;
vertical-align: middle;
white-space: nowrap;
}

.i-contextmenu .gwt-MenuItem-selected div {
color: #fff;
background: #5daee8;
}

.i-contextmenu table {
border-collapse: collapse;
margin: 0;
padding: 0;
}

.i-contextmenu .gwt-MenuItem img {
margin-right: 10px;
vertical-align: middle;
}

/**
* Label has tiny paddings to include contents margins.
*/
.i-label {
padding-top: 1px;
padding-bottom: 1px;
}

.i-label-undef-w {
white-space: nowrap;
}

/* Loading indicator states
* Note: client side expects that loading indicator has a height. It depends on
* this css property to ensure browsers have applied all required styles.
*/
.i-loading-indicator,
.i-loading-indicator-delay,
.i-loading-indicator-wait {
@@ -249,58 +104,9 @@ input.i-modified,
height: 31px;
background: transparent url(img/loading-indicator.gif);
}

.i-loading-indicator-delay {
background: transparent url(img/loading-indicator-delay.gif);
background-image: url(img/loading-indicator-delay.gif);
}

.i-loading-indicator-wait {
background: transparent url(img/loading-indicator-wait.gif);
}
.i-loading-indicator,
.i-loading-indicator-delay,
.i-loading-indicator-wait {
position: absolute;
top:6px;
right: 5px;
z-index:30000;
}

/* debug dialog */
.i-debug-console {
background: white;
opacity: 0.85;
border: 1px solid black;
font-family: sans-serif;
}

.i-debug-console-caption {
background: black;
border-bottom: 1px solid grey;
color: white;
font-weight: bold;
}

.i-debug-console-content {
font-size: x-small;
overflow: auto;
}

.i-debug-console-content input {
font-size: xx-small;
}

/* Debug style */
.i-app .invalidlayout,
.i-app .invalidlayout * {
background: #f99 !important;
}

/* Fix for liferay. #2384 */
.i-app input[type="text"],
.i-app input[type="password"],
.i-app input[type="reset"],
.i-app select,
.i-app textarea {
padding: 2px;
background-image: url(img/loading-indicator-wait.gif);
}

+ 3
- 92
WebContent/ITMILL/themes/default/datefield/datefield.css View File

@@ -1,11 +1,3 @@
.i-datefield {
white-space: nowrap;
}

.i-datefield-textfield {
vertical-align: top;
}

.i-datefield-button {
font-size:13px;
width: 22px;
@@ -14,10 +6,8 @@
overflow: hidden;
border: none;
background: transparent url(img/open-button.png) no-repeat right 0;
vertical-align: top;
cursor: pointer;
vertical-align: top;
}
.i-datefield-popup {
font-family: "Trebuchet MS", geneva, helvetica, arial, tahoma, verdana, sans-serif;
color: #464f52;
@@ -26,56 +16,34 @@
border: 1px solid #b6bbbc;
padding: 6px;
}
.i-datefield-calendarpanel {
width: 19em;
font-size: 12px;
}
.i-datefield-popup .i-datefield-calendarpanel {
width: 16em;
}
.i-datefield-calendarpanel table {
width: 100%;
}
.i-datefield-calendarpanel td {
text-align: right;
width: 14.2%;
padding: 0;
margin: 0;
}
.i-datefield-calendarpanel td span {
display: block;
}
.i-datefield-calendarpanel-header {
height: 30px;
}
.i-datefield-calendarpanel-header,
.i-datefield-calendarpanel strong {
font-size: 13px;
}
.i-datefield-popup .i-datefield-calendarpanel-header,
.i-datefield-popup .i-datefield-calendarpanel strong {
font-size: 12px;
}
.i-datefield-calendarpanel-header td {
text-align: center;
}
.i-datefield-calendarpanel-month {
font-weight: bold;
text-align: center;
text-shadow: #ffffff 2px 2px 0;
white-space: nowrap;
}
/* Year buttons */
.i-datefield-calendarpanel .i-button-prevyear,
.i-datefield-calendarpanel .i-button-nextyear {
@@ -95,7 +63,6 @@
.i-datefield-calendarpanel .i-button-nextyear:hover {
background-position: left bottom;
}
/* Month buttons */
.i-datefield-calendarpanel .i-button-prevmonth,
.i-datefield-calendarpanel .i-button-nextmonth {
@@ -115,47 +82,32 @@
.i-datefield-calendarpanel .i-button-nextmonth:hover {
background-position: left bottom;
}
.i-datefield-calendarpanel strong {
color: #ee5311;
display: block;
width: 20px;
}
.i-datefield-calendarpanel-day,
.i-datefield-calendarpanel-day-today {
cursor: pointer;
padding: 1px 3px;
width: 14px;
height: 16px;
}
.i-datefield-calendarpanel-day-today {
border: 1px solid #429ce9;
width: 12px;
height: 14px
}
.i-disabled .i-datefield-calendarpanel-day,
.i-disabled .i-datefield-calendarpanel-day-today {
cursor: default;
}
.i-datefield-calendarpanel-day-entry {
color: #6a98b5;
}
.i-datefield-calendarpanel-day-disabled {
font-weight: normal;
color: #dddddd;
cursor: default;
opacity: 0.5;
}
.i-datefield-calendarpanel-day-entry.i-datefield-calendarpanel-day-disabled {
color: #afd6f8;
}
.i-datefield-calendarpanel-day-selected {
font-weight: bold;
width: 14px;
@@ -163,63 +115,22 @@
color: #fff;
padding: 1px 3px;
background: transparent url(img/selected-bg.png) no-repeat 50% 50%;
cursor: default;
border: none;
}
.i-datefield-time {
white-space: nowrap;
font-size: 11px;
}
.i-datefield-time .i-label {
display: inline;
}
.i-datefield-time .i-select {
font-size: 10px;
padding: 0;
margin: 0;
}

/* Disabled by default
.i-datefield-error .i-textfield,
.i-datefield-error .i-datefield-calendarpanel {
background:transparent;
background-color: #FFE0E0;
}
*/

/* Disabled by default
.i-datefield-required .i-textfield,
.i-datefield-required .i-datefield-calendarpanel {
background:transparent;
background-color: #FFE0E0;
}
*/

.i-datefield-rendererror .i-textfield {
background: #ff9999;
}




/* IE specific styles */

*+html .i-datefield-button {
.i-ie7 .i-datefield-button {
background-position: right 1px;
height: 25px;
margin: 0;
}

/* IE somehow loses generic i-disabled alpha. See #1960 */
* html .i-disabled .i-datefield-button,
* html .i-disabled .i-datefield-textfield {
filter: alpha(opacity=30);
}
*+ html .i-disabled .i-datefield-button,
*+ html .i-disabled .i-datefield-textfield {
filter: alpha(opacity=30);
}

}

+ 2
- 27
WebContent/ITMILL/themes/default/formlayout/formlayout.css View File

@@ -1,37 +1,21 @@
.i-formlayout-cell .i-errorindicator {
width: 10px;
height: 16px;
display: block;
background: transparent url(../icons/16/error.png) no-repeat top right;
}
.i-formlayout-captioncell {
text-align:right;
white-space: nowrap;
}
.i-formlayout-captioncell .i-caption {
overflow: visible;
}

.i-formlayout-contentcell {
}

.i-formlayout-error-indicator {
/* fix width so layout is not jumpy when error disapear */
width: 12px;
}

.i-formlayout-spacing .i-formlayout-row .i-formlayout-captioncell,
.i-formlayout-spacing .i-formlayout-row .i-formlayout-contentcell,
.i-formlayout-spacing .i-formlayout-row .i-formlayout-errorcell {
padding-top: 8px;
}

.i-formlayout-spacing .i-formlayout-firstrow .i-formlayout-captioncell,
.i-formlayout-spacing .i-formlayout-firstrow .i-formlayout-contentcell,
.i-formlayout-spacing .i-formlayout-firstrow .i-formlayout-errorcell {
padding-top: 0;
}

.i-formlayout-margin-top .i-formlayout-firstrow .i-formlayout-captioncell,
.i-formlayout-margin-top .i-formlayout-firstrow .i-formlayout-contentcell,
.i-formlayout-margin-top .i-formlayout-firstrow .i-formlayout-errorcell {
@@ -48,9 +32,7 @@
.i-formlayout-margin-right .i-formlayout-contentcell {
padding-right: 18px;
}

/* form */

.i-form-errormessage {
background: transparent url(../icons/16/error.png) no-repeat top left;
padding-left: 20px;
@@ -58,22 +40,15 @@
margin-top: 5px;
min-height: 20px;
}

* html .i-form-errormessage {
.i-ie6 .i-form-errormessage {
height: 20px
}

.i-form fieldset {
border: none;
border-top: 1px solid #babfc0;
}

.i-form legend {
margin: 0;
padding: 0 4px 0.3em 4px;
font-weight: bold;
}

.i-formlayout-captioncell .i-caption .i-required-field-indicator {
float: none;
}
}

+ 3
- 32
WebContent/ITMILL/themes/default/gridlayout/gridlayout.css View File

@@ -1,4 +1,3 @@
/* Margin values if defined from server side */
.i-gridlayout-margin-top {
padding-top: 15px;
}
@@ -11,35 +10,7 @@
.i-gridlayout-margin-right {
padding-right: 18px;
}

/*
* Spacing values used by IGridLayout. (element does not exist in DOM)
* Use padding-left for horizontal spacing and padding-top for vertical.
*/
.i-gridlayout-spacing-on {
padding-left:8px;
padding-top:8px;
overflow:hidden;
}
.i-gridlayout-spacing-off {
padding-left:0px;
padding-top:0px;
overflow:hidden;
}

.i-gridlayout-spacing,
.i-gridlayout-spacing-off {
padding-left:0px;
padding-top:0px;
}

/* Ensure that resizing gridlayout works in IE */
* html .i-gridlayout {
overflow:hidden;
}

*+html .i-gridlayout {
overflow:hidden;
}


padding-left: 8px;
padding-top: 8px;
}

+ 1
- 25
WebContent/ITMILL/themes/default/link/link.css View File

@@ -1,27 +1,3 @@
/**
* Link component styles
* (useless to move into a separate file)
*/
.i-link {
white-space: nowrap;
}

.i-link a {
color: #464f52;
vertical-align: middle;
text-decoration: none;
}

.i-link span {
text-decoration: underline;
vertical-align: middle;
}

.i-disabled a {
cursor: default;
}

.i-link img {
vertical-align: middle;
border:none;
}
}

+ 26
- 50
WebContent/ITMILL/themes/default/menubar/menubar.css View File

@@ -1,56 +1,32 @@
/*
*MenuBar styles
*/
/*Top menu */
.i-menubar table {
font-family: "Trebuchet MS", geneva, helvetica, arial, tahoma, verdana, sans-serif;

border-style:ridge;
border-width:thin;
border-color: #D3D3D3;

background-color : white;
white-space: nowrap;
.i-menubar {
color: #464f52;
border: 1px solid #c6cbcc;
border-right: none;
}
.i-menubar .menuitem {
padding: 0 10px;
margin: 0 10px;
border-right: 1px solid #c6cbcc;
}

.i-menubar .menuitem{
cursor : default;
padding : 0px 10px;
margin : 0px 10px;
background-color : white;
}

.i-menubar .menuitem-selected {
background-color : #EEEEFF;
}

/*Submenu*/
color: #fff;
background: #5daee8;
}
.i-menubar-submenu {
font-size: 13px;
padding : 3px;
font-family: "Trebuchet MS", geneva, helvetica, arial, tahoma, verdana, sans-serif;
background-color : white;
white-space: nowrap;
border-style:ridge;
border-width:thin;
border-color: #D3D3D3;

background: #e9eced url(../tabsheet/img/tab-bg.png);
font-family: "Trebuchet MS", geneva, helvetica, arial, tahoma, verdana, sans-serif;
color: #464f52;
font-size: 12px;
line-height: 14px;
border-right: 1px solid #c6cbcc;
border-bottom: 1px solid #c6cbcc;
border-top: 1px solid #d0d4d5;
border-left: 1px solid #d0d4d5;
}

.i-menubar-submenu .menuitem {
cursor : default;

background-color : white;
padding : 2px 10px;
.i-menubar-submenu .menuitem {
padding: 2px 10px;
}

.i-menubar-submenu .menuitem-selected {
background-color : #EEEEFF;
}
color: #fff;
background: #5daee8;
}

+ 1
- 7
WebContent/ITMILL/themes/default/notification/notification.css View File

@@ -1,4 +1,3 @@

.i-Notification {
font-family: "Trebuchet MS", geneva, helvetica, arial, tahoma, verdana, sans-serif;
background-color: #818e92;
@@ -21,7 +20,6 @@
white-space: nowrap;
margin: 0 10px 0 0;
}

.i-Notification.warning {
background: #fff1e4;
color: #dd3400;
@@ -31,7 +29,6 @@
border-radius: 5px;
opacity: 1;
}

.i-Notification.error {
background: #f23d00 url(img/close-error.png) no-repeat right 5px;
padding-right: 30px;
@@ -40,8 +37,6 @@
-webkit-border-radius: 6px;
border-radius: 6px;
}


.i-Notification.tray {
background: #575e60;
padding: 0.5em;
@@ -66,7 +61,6 @@
margin: 8px 10px 5px 10px;
color: #e4e7ea;
}
.i-Notification.system {
background-color: #ff0a0a;
opacity: 0.7;
@@ -78,4 +72,4 @@
}
.i-Notification.system p {
white-space: nowrap;
}
}

+ 16
- 25
WebContent/ITMILL/themes/default/orderedlayout/orderedlayout.css View File

@@ -1,35 +1,26 @@
.i-orderedlayout-margin-top, .i-horizontallayout-margin-top, .i-verticallayout-margin-top {
.i-orderedlayout-margin-top,
.i-horizontallayout-margin-top,
.i-verticallayout-margin-top {
padding-top: 15px;
}

.i-orderedlayout-margin-right, .i-horizontallayout-margin-right, .i-verticallayout-margin-right {
.i-orderedlayout-margin-right,
.i-horizontallayout-margin-right,
.i-verticallayout-margin-right {
padding-right: 18px;
}

.i-orderedlayout-margin-bottom, .i-horizontallayout-margin-bottom, .i-verticallayout-margin-bottom {
.i-orderedlayout-margin-bottom,
.i-horizontallayout-margin-bottom,
.i-verticallayout-margin-bottom {
padding-bottom: 15px;
}

.i-orderedlayout-margin-left, .i-horizontallayout-margin-left, .i-verticallayout-margin-left {
.i-orderedlayout-margin-left,
.i-horizontallayout-margin-left,
.i-verticallayout-margin-left {
padding-left: 18px;
}

.i-orderedlayout-spacing-on, .i-horizontallayout-spacing-on, .i-verticallayout-spacing-on {
.i-orderedlayout-spacing-on,
.i-horizontallayout-spacing-on,
.i-verticallayout-spacing-on {
padding-top: 8px;
padding-left: 8px;
}
/** This can be used to define spacing if spacing is off server side */
.i-orderedlayout-spacing-off, .i-horizontallayout-spacing-off, .i-verticallayout-spacing-off {
padding-top: 0px;
padding-left: 0px;
}

/*
* To make sure IE don't expand elmenents larger than they should
*/
* html .i-orderedlayout, * html .i-horizontallayout, * html .i-verticallayout {
overflow: hidden;
}
*+html .i-orderedlayout, *+html .i-horizontallayout, *+html .i-verticallayout {
overflow: hidden;
}
}

+ 12
- 77
WebContent/ITMILL/themes/default/panel/panel.css View File

@@ -1,35 +1,11 @@
.i-panel,
.i-panel-caption,
.i-panel-content,
.i-panel-deco,
.i-panel-light,
.i-panel-caption-light,
.i-panel-content-light,
.i-panel-deco-light {
outline: none; /* Prevent selection outline which might break layouts or cause scrollbars */
text-align: left /* Force default alignment */
}

.i-panel {
background: transparent url(img/top-left.png) no-repeat;
}

.i-panel-caption .i-errorindicator {
float: none;
padding-right:20px;
display:inline;
padding-right: 20px;
background: transparent url(../icons/16/error.png) no-repeat bottom center;
}

.i-panel-caption .i-icon {
display:inline;
vertical-align: middle;
}
.i-panel-caption span {
vertical-align: middle;
}

.i-panel-caption,
.i-panel-caption-light {
font-size: 18px;
@@ -37,34 +13,26 @@
font-weight: normal;
letter-spacing: -0.03em;
color: #f14c1a;
white-space: nowrap;
height: 18px;
padding: 15px 18px 14px 8px;
margin-left: 10px;
background: transparent url(img/top-right.png) no-repeat right top;
overflow:hidden;
}

.i-panel-nocaption {
height: 9px;
margin-left: 10px;
background: transparent url(img/top-right.png) no-repeat right top;
overflow: hidden;
}

.i-panel-content {
border: 1px solid #babfc0;
border-bottom: 1px solid #dee2e3;
background-color: #fff;
overflow: auto;
}

.i-panel-deco {
height: 9px;
background: transparent url(img/bottom-right.png) repeat-x right top;
margin-left: 9px;
}

.i-panel-deco:before {
display: block;
content: "";
@@ -73,89 +41,56 @@
margin-left: -9px;
background: transparent url(img/bottom-left.png) no-repeat;
}






/* Light panel style */

.i-panel-light,
.i-panel-caption-light {
background: transparent;
}

.i-panel-nocaption-light {
background: transparent;
height: 0;
margin: 0;
}

.i-panel-content-light {
border: none;
border-top: 1px solid #babfc0;
background: transparent;
}

.i-panel-deco-light {
height: 0;
overflow: hidden;
}








/* IE specific rules (different selectors for IE6 and IE7.
* These selectors must be separate because IE6 won't
* apply them if they are grouped together
* (it doesn't recognize the '+' selector).
*/
* html .i-panel {
/* IE specific rules */
.i-ie6 .i-panel {
background: transparent;
}
* html .i-panel-caption {
.i-ie6 .i-panel-caption {
border: 1px solid #babfc0;
border-bottom: none;
background: #fff;
margin: 0;
padding-left: 18px
}
* html .i-panel-nocaption {
.i-ie6 .i-panel-nocaption {
border: none;
background: transparent;
margin: 0;
height: 0;
}

* html .i-panel-caption-light {
.i-ie6 .i-panel-caption-light {
border: none;
background: transparent;
}
* html .i-panel-content {
.i-ie6 .i-panel-content,
.i-ie7 .i-panel-content {
border-bottom: 1px solid #babfc0;
}
*+html .i-panel-content {
border-bottom: 1px solid #babfc0;
}

* html .i-panel-content-light {
border-bottom: none;
}
*+html .i-panel-content-light {
.i-ie6 .i-panel-content-light,
.i-ie7 .i-panel-content-light {
border-bottom: none;
}

* html .i-panel-deco {
height: 0;
overflow: hidden;
}
*+html .i-panel-deco {
.i-ie6 .i-panel-deco,
.i-ie7 .i-panel-deco {
height: 0;
overflow: hidden;
}

+ 0
- 5
WebContent/ITMILL/themes/default/popupview/popupview.css View File

@@ -2,10 +2,5 @@
border: 1px solid #babfc0;
border-bottom: 1px solid #dee2e3;
background: #fff;
overflow: auto;
padding: 3px;
}

.i-popupview {
cursor: pointer;
}

+ 1
- 26
WebContent/ITMILL/themes/default/progressindicator/progressindicator.css View File

@@ -1,44 +1,19 @@
.i-progressindicator {
background: #dfe2e4 url(img/base.gif);
overflow: hidden; /* for IE6 */
width: 150px;
background: #dfe2e4 url(img/base.gif) repeat-x 0 1px;
}
.i-progressindicator-wrapper {
border: 1px solid #b6bbbc;
overflow: hidden; /* for IE6 */
height: 9px;
}
.i-progressindicator-disabled {
background: #dfe2e4 url(img/disabled.gif);
height: 9px;
border: 1px solid #b6bbbc;
overflow: hidden; /* for IE6 */
}

.i-progressindicator-indicator {
background: #f7f9f9 url(img/progress.png);
height: 9px;
overflow: hidden; /* for IE6 */
}

.i-progressindicator-indeterminate {
background: #dfe2e4 url(../common/img/ajax-loader-medium.gif);
height: 16px;
width: 16px;
overflow: hidden; /* for IE6 */
}

/* Hide obsolete elements in indeterminate mode */
.i-progressindicator-indeterminate .i-progressindicator-wrapper,
.i-progressindicator-indeterminate .i-progressindicator-indicator,
.i-progressindicator-indeterminate-disabled .i-progressindicator-wrapper,
.i-progressindicator-indeterminate-disabled .i-progressindicator-indicator {
display: none;
}

.i-progressindicator-indeterminate-disabled {
background: #dfe2e4 url(../common/img/blank.gif);
height: 16px;
width: 16px;
overflow: hidden; /* for IE6 */
}

+ 10
- 116
WebContent/ITMILL/themes/default/select/select.css View File

@@ -1,97 +1,38 @@
.i-select {
text-align: left /* Force default alignment */
}
.i-select-option {
}
.i-select-optiongroup {
}
.i-select-optiongroup .i-select-option {
display: block;
white-space: nowrap;
/* really mean block for IE */
zoom: 1;
}
.i-select-select {
/*
border: 1px solid #b6b6b6;
border-bottom-color: #9d9d9d;
border-top-color: #d6d6d6;
border-left-color: #d6d6d6;
*/
display: block;
font-size: 13px;
}
/* Twincol style */
.i-select-twincol {
white-space: nowrap;
}
.i-select-twincol-options {
float: left;
font-size: 13px;
}
.i-select-twincol-options,
.i-select-twincol-selections {
font-size: 13px;
font-weight: bold;
}
.i-select-twincol-buttons {
float: left;
padding: 2px; /* does not work in first render in FF ? */
text-align: center;
}
.i-select-twincol-buttons .i-select-twincol-deco {
clear:both;
}
.i-select-twincol .i-textfield {
display: block;
float: left;
clear: left;
}
.i-select-twincol .i-button {
display: block;
float: left;
}
.i-select-twincol-buttons .i-button {
display: inline;
float: none;
}

/** Filterselect aka ComboBox styles */

.i-filterselect {
height: 23px;
white-space: nowrap;
text-align: left; /* Force default alignment */
background: transparent url(img/bg-left-filter.png) no-repeat;
padding-left: 4px;
}
.i-filterselect .i-icon {
float: left;
}
.i-app .i-filterselect .i-filterselect-input,
.i-window .i-filterselect .i-filterselect-input,
.i-popupview-popup .i-filterselect .i-filterselect-input {
background: transparent url(img/bg-center-filter.png) no-repeat 1px 0;
float: left;
border: none;
height: 20px;
margin: 0px;
margin: 0;
padding: 3px 0 0 2px;
font-size: 13px;
}
.i-filterselect-prompt .i-filterselect-input {
font-style: normal;
}
.i-filterselect-input:focus {
/* remove safari/mac outline from this element */
outline: 0px;
outline: none;
}
.i-filterselect-focus {
outline: 1px solid #5daee8;
@@ -102,16 +43,9 @@
outline: 5px auto -webkit-focus-ring-color;
outline-offset: -4px;
}
.i-filterselect-prompt .i-filterselect-input {
/* input prompt active, i.e empty select */
color: #999;
font-style: italic;
}
.i-filterselect-button {
float: right;
width: 25px;
height: 23px;
cursor: pointer;
background: transparent url(img/bg-right-filter.png);
}
.i-filterselect-button:hover {
@@ -121,16 +55,10 @@
.i-readonly .i-filterselect-button:hover {
background-position: top left;
}

.i-filterselect.i-readonly .i-filterselect-button {
display: none;
}

.i-filterselect.i-readonly .i-filterselect-input {
background: transparent;
color: black;
}

.i-filterselect-suggestpopup {
background: #f6f7f7;
border: 1px solid #b6bbbc;
@@ -140,31 +68,18 @@
line-height: 18px;
margin-top: -1px;
}
.i-filterselect-suggestmenu table {
border-collapse: collapse;
border: none;
}
.i-filterselect-suggestmenu .gwt-MenuItem {
padding: 1px 6px;
cursor: pointer;
height: 18px;
white-space: nowrap;
}

.i-filterselect-suggestmenu .gwt-MenuItem .i-icon {
margin-right: 3px;
vertical-align: middle;
}

.i-filterselect-suggestmenu .gwt-MenuItem span {
vertical-align: middle;
}

.i-filterselect-suggestmenu .gwt-MenuItem-selected {
background: #5daee8;
color: #fff;
}

.i-filterselect-nextpage,
.i-filterselect-nextpage-off,
.i-filterselect-prevpage-off,
@@ -172,9 +87,7 @@
height: 11px;
width:100%;
background: transparent url(img/button-bg.png) no-repeat 50% 0;
text-align: center;
margin: 2px 0 0 0;
overflow:hidden;
}
.i-filterselect-prevpage,
.i-filterselect-prevpage-off {
@@ -203,51 +116,33 @@
.i-filterselect-nextpage-off span {
background: transparent url(img/arrow-down.png) no-repeat 50% 60%;
}

.i-filterselect-nextpage-off,
.i-filterselect-prevpage-off {
color: #666;
opacity: 0.5;
filter: Alpha(opacity=50);
}
.i-filterselect-nextpage-off span,
.i-filterselect-prevpage-off span {
cursor: default;
}

.i-filterselect-status {
font-size: 11px;
line-height: 11px;
width:100%;
width: 100%;
padding: 4px 0px;
height: 11px;
white-space: nowrap;
text-align: center;
border-top: 1px solid #b6bbbc;
}


/* Error styles (disabled by default)
----------------------------------
.i-filterselect-error {
background-image: url(img/bg-left-filter-error.png);
}

.i-filterselect-error .i-filterselect-input {
background-image: url(img/bg-center-filter-error.png);
}

.i-filterselect-error .i-filterselect-button {
background-image: url(img/bg-right-filter-error.png);
}

.i-select-error .i-select-option,
.i-select-error .i-select-select,
.i-select-error .i-select-twincol-selections,
.i-select-error .i-select-twincol-options {
background:transparent;
background-color: #FFE0E0;
background: #FFE0E0;
}
*/

@@ -258,7 +153,6 @@
.i-select-required .i-select-select,
.i-select-required .i-select-twincol-selections,
.i-select-required .i-select-twincol-options {
background:transparent;
background-color: #FFE0E0;
background: #FFE0E0;
}
*/

+ 1
- 18
WebContent/ITMILL/themes/default/shadow/shadow.css View File

@@ -65,21 +65,4 @@
bottom: -5px; right: -4px;
width: 8px; height: 8px;
background: transparent url(img/bottom-right.png);
}





/* For IE6 (no transparent png's, we use a blur filter) */

* html .i-shadow * {
display: none;
}

* html .i-shadow {
background: #000;
filter: progid:DXImageTransform.Microsoft.Blur(pixelRadius=2) alpha(opacity=20);
margin-top: -3px;
margin-left: -4px;
}
}

+ 5
- 57
WebContent/ITMILL/themes/default/slider/slider.css View File

@@ -1,35 +1,26 @@
/*--------------------------
Default (horizontal) styles
--------------------------*/

.i-slider {
border-top: 1px solid #cccfd0;
border-bottom: 1px solid #cccfd0;
margin: 5px 0;
width:200px;
}

.i-slider-base {
/* changing the borders will require adjustments to ISlider.java */
height: 2px;
border-top: 1px solid #cbcdce;
background: #f3f3f4;
border-top: 1px solid #cbcdce;
border-left: 1px solid #cccfd0;
border-right: 1px solid #cccfd0;
}
.i-slider-handle {
background: transparent url(img/handle-horizontal.png);
width: 12px;
height: 12px;
margin-top: -5px;
font-size: 0;
cursor: pointer;
}
.i-slider-handle:hover {
background-position: left bottom;
}

.i-slider-scrollbar .i-slider-handle,
.i-slider-scrollbar.i-slider-vertical .i-slider-handle {
background: #ffffff;
@@ -37,45 +28,10 @@
border-radius: 6px;
-moz-border-radius: 6px;
-webkit-border-radius: 6px;
}

/* TODO
.i-slider-bigger {
background: #dde4ef url(img/arrow-right.png);
float: right;
width: 14px;
height: 14px;
overflow: hidden;
margin: 0 0 0 1px;
}

.i-slider-bigger:hover {
background-image: url(img/arrow-right-over.png);
}

.i-slider-smaller {
background: #dde4ef url(img/arrow-left.png);
float: left;
width: 14px;
height: 14px;
overflow: hidden;
margin: 0 1px 0 0;
}

.i-slider-smaller:hover {
background-image: url(img/arrow-left-over.png);
}
*/


/*-----------------
Vertical styles
-----------------*/

.i-slider-vertical {
width: 3px;
height: auto;
margin: 0 5px;
border: none;
border-left: 1px solid #cccfd0;
@@ -93,19 +49,11 @@
background: transparent url(img/handle-vertical.png);
width: 12px;
height: 12px;
font-size: 0;
cursor: pointer;
margin-left: -5px;
}
.i-slider-vertical .i-slider-handle:hover {
background-position: left bottom;
}
.i-slider-vertical .i-slider-bigger {

}
.i-slider-vertical .i-slider-smaller {

}

/* Disabled by default
.i-slider-error .i-slider-base {
@@ -123,13 +71,13 @@

/* IE specific styles */

* html .i-slider,
* html .i-slider-vertical {
.i-ie6 .i-slider,
.i-ie6 .i-slider-vertical {
margin: 0;
}
* html .i-slider .i-slider-handle {
.i-ie6 .i-slider .i-slider-handle {
margin: -1px 0;
}
* html .i-slider-vertical .i-slider-handle {
.i-ie6 .i-slider-vertical .i-slider-handle {
margin: 0 -1px;
}

+ 1615
- 1244
WebContent/ITMILL/themes/default/styles.css
File diff suppressed because it is too large
View File


+ 20
- 99
WebContent/ITMILL/themes/default/table/table.css View File

@@ -1,63 +1,24 @@
.i-table {
overflow: hidden;
text-align: left /* Force default alignment */
}

.i-table.table-inline .i-table-header-wrap {
border-left: none;
border-right: none;
/*margin: -16px -18px 0 -18px;*/
}

.i-table-header-wrap {
height: 36px;
background: #e7edf3 url(img/header-bg.png) repeat-x;
border: 1px solid #b6bbbc;
border-bottom: none;
overflow: hidden;
background: #e7edf3 url(img/header-bg.png) repeat-x;
}

.i-table-header {
height: 36px;
}

.i-table-header table,
.i-table-table {
border-collapse: collapse;
margin: 0;
padding: 0;
border: 0;
}

.i-table-header td,
.i-table-table td {
margin: 0;
padding: 0;
border: 0;
}

.i-table-header td {
cursor: pointer;
}

.i-table-resizer {
display: block;
height: 36px;
float: right;
width: 4px;
background: transparent url(img/resizer-bg.png) repeat-y 50% 50%;
cursor: col-resize;
}

.i-table-caption-container {
float: right;
overflow: hidden;
white-space: nowrap;
color: #393a3c;
font-size: 15px;
padding-top: 9px;
text-shadow: #ffffff 2px 2px 0;
text-shadow: #ffffff 0 1px 0;
padding-right: 2px; /* See themes/base/table.css for explanation */
}

.i-table-header-cell-asc .i-table-caption-container {
background: transparent url(img/sort-asc.png) no-repeat right 80%;
}
@@ -69,25 +30,13 @@
.i-table-header-cell-desc:hover {
background: transparent url(img/header-bg-over.png) repeat-x;
}


.i-table-body {
background: #fff;
border: 1px solid #b6bbbc;
}

.i-table-row-spacer {
height: 10px;
overflow: hidden; /* IE hack to allow < one line height divs */
}

.i-table-row,
.i-table-row-odd {
border: 0;
margin: 0;
padding: 0;
background-color: #fff;
cursor: default;
}
.i-table-row-odd {
background-color: #f6f7f7;
@@ -100,28 +49,26 @@
background: #57a7ed;
color: #fff;
}
.i-table-row td,
.i-table-row-odd td {
padding: 0;
}
.i-table-cell-content {
padding: 0 6px 0 4px;
border-right: none;
}
.i-table-cell-wrapper {
white-space: nowrap;
overflow: hidden;
padding: 3px 0 3px 3px;
margin-right: 5px;
line-height: 23px;
/* Do not specify horizontal padding here */
padding: 3px 0 0 0;
}

/* Fix textfield size to correspond label size inside table */
.i-table-cell-content .i-textfield,
.i-table-cell-content .i-button {
margin: -2px 0 -2px -3px;
margin: -3px 0 0 0;
}
.i-table-cell-content .i-textfield,
.i-table-cell-content .i-datefield {
width: 97%; /* approximate */
}

/* ...but not for datefield textarea */
.i-table-cell-content .i-datefield .i-textfield {
width: auto;
@@ -130,57 +77,35 @@
/* datefield button is too high for table cell */
.i-table-cell-content .i-datefield-button {
height: 25px;
margin: -2px 0;
margin: -3px 0 0 0;
}



.i-table-column-selector {
float: right;
background: transparent url(img/colsel.png) no-repeat;
margin: -36px 0 0 0;
margin: -36px 1px 0 0;
height: 36px;
width: 15px;
position: relative; /* hide this from IE, it works without it */
}

* html .i-table-column-selector {
position: static;
width: 14px;
}

*+html .i-table-column-selector {
position: static;
}

.i-table-focus-slot-left {
border-left: 2px solid #b6bbbc;
margin-right: -2px;
border-color: #b6bbbc;
}
.i-table-focus-slot-right {
border-right: 2px solid #b6bbbc;
margin-left: -2px;
border-color: #b6bbbc;
}

.i-table-header-drag {
position: absolute;
background: #e7edf3 url(img/header-bg.png) repeat-x;
border: 1px solid #b6bbbc;
padding: 4px;
font-family: "Trebuchet MS", geneva, helvetica, arial, tahoma, verdana, sans-serif;
color: #464f52;
font-size: 15px;
opacity: 0.5;
filter: alpha(opacity=50);
margin-top: 20px;
z-index: 20000;
}

.i-table-scrollposition {
width: 160px;
height: 39px;
background: transparent url(img/scroll-position-bg.png);
border: none;
}

.i-table-scrollposition span {
display: block;
margin-top: 8px;
@@ -190,8 +115,6 @@
font-size: 15px;
text-shadow: #ffffff 2px 2px 0;
}


/* row in column selector */
.i-on div {
background: transparent url(img/check.gif) no-repeat 2px 50%;
@@ -200,21 +123,19 @@
.i-off div {
text-indent: 6px;
}

.i-table .i-link {
display: inline;
}

/* IE6 hack */
* html .i-table-scrollposition {
.i-ie6 .i-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.
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");
}
}

+ 23
- 164
WebContent/ITMILL/themes/default/tabsheet/tabsheet.css View File

@@ -1,46 +1,16 @@
.i-tabsheet,
.i-tabsheet-content,
.i-tabsheet-deco {
outline: none; /* Prevent selection outline which might break layouts or cause scrollbars */
text-align: left /* Force default alignment */
}

.i-tabsheet-tabs {
empty-cells: hide;
border-collapse: collapse;
margin:0;
padding:0;
border:0;
height: 48px;
width: 100%;
overflow:hidden;
}

.i-tabsheet-tabs td {
margin:0;
padding:0;
vertical-align: bottom;
}

.i-tabsheet-spacertd {
width: 100%;
}
.i-tabsheet-spacertd div {
height: 37px;
border: 1px solid #b6bbbc;
background: transparent url(img/tab-bg.png);
padding: 0;
}

.i-tabsheet-hidetabs .i-tabsheet-tabcontainer {
display: none;
}

.i-tabsheet-scroller {
white-space: nowrap;
text-align: right;
margin-top: -37px;
}

.i-tabsheet-scrollerPrev,
.i-tabsheet-scrollerNext {
border: none;
@@ -57,7 +27,6 @@
margin-top: -1px;
opacity: 0.9999;
}

.i-tabsheet-scrollerNext,
.i-tabsheet-scrollerNext-disabled {
background: transparent url(img/next.png) no-repeat;
@@ -78,18 +47,6 @@
.i-tabsheet-scrollerNext-disabled:hover {
background-position: -12px 0px;
}

.i-tabsheet-tabs .i-caption {
white-space: nowrap;
}

/* for IE (does not inherit) */
.i-tabsheet-tabs .i-caption span {
white-space: nowrap;
}



.i-tabsheet-tabitem {
border: 1px solid #b6bbbc;
border-right: none;
@@ -100,32 +57,25 @@
font-size: 15px;
line-height: 18px;
background: #f8f9f9 url(img/tab-bg.png);
cursor: pointer;
}

.i-tabsheet-tabitem .i-caption {
height: 20px;
padding: 9px 15px 8px 15px;
}

.i-tabsheet-tabitem-selected {
border: none;
background: transparent url(../panel/img/top-left.png) no-repeat;
margin: 0;
padding: 0;
height: 48px;
cursor: default;
color: #ee5311;
}

.i-tabsheet-tabitem:hover {
color: #4b5257;
}

.i-tabsheet-tabitem-selected:hover {
color: #ee5311;
}

.i-tabsheet-tabitem-selected .i-caption {
background: transparent url(../panel/img/top-right.png) repeat-x right top;
margin: 0 -1px 0 9px;
@@ -133,25 +83,21 @@
padding: 16px 16px 14px 7px;
overflow: visible;
}

.i-tabsheet-content {
border: 1px solid #babfc0;
background-color: #fff;
border-bottom: 1px solid #dee2e3;
border-top: none;
position: relative;
}
.i-tabsheet-hidetabs .i-tabsheet-content {
border-top: 1px solid #b5babb;
}
.i-tabsheet-deco {
height: 10px;
background: transparent url(../panel/img/bottom-right.png) repeat-x right top;
margin-left: 9px;
overflow: visible;
}

.i-tabsheet-deco:before {
display: block;
content: "";
@@ -160,11 +106,7 @@
margin-left: -9px;
background: transparent url(../panel/img/bottom-left.png) no-repeat;
}



/* Progress indication */

.i-tabsheet-loading .i-tabsheet-tabitem-selected .i-captiontext {
background: transparent url(../common/img/ajax-loader.gif) no-repeat top right;
margin-left: -10px;
@@ -174,28 +116,13 @@
margin-top: -12px;
padding-top: 12px;
}


/* IE specific styles */

* html .i-tabsheet-tabs {
height: 46px;
}
*+html .i-tabsheet-tabs {
.i-ie6 .i-tabsheet-tabs,
.i-ie7 .i-tabsheet-tabs {
height: 46px;
}

* html .i-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;
}
*+html .i-tabsheet-tabitem-selected {
.i-ie6 .i-tabsheet-tabitem-selected,
.i-ie7 .i-tabsheet-tabitem-selected {
border: 1px solid #babfc0;
border-bottom: none;
background: #fff;
@@ -205,72 +132,42 @@
cursor: default;
color: #ee5311;
}
* html .i-tabsheet-tabitem-selected .i-caption {
.i-ie6 .i-tabsheet-tabitem-selected .i-caption,
.i-ie7 .i-tabsheet-tabitem-selected .i-caption {
background: transparent;
padding: 0;
margin: 0;
}
*+html .i-tabsheet-tabitem-selected .i-caption {
background: transparent;
padding: 0;
margin: 0;
}

* html .i-tabsheet-content {
.i-ie6 .i-tabsheet-content,
.i-ie7 .i-tabsheet-content {
border-bottom: none;
}
*+html .i-tabsheet-content {
border-bottom: none;
}

* html .i-tabsheet-deco {
.i-ie6 .i-tabsheet-deco,
.i-ie7 .i-tabsheet-deco {
height: 1px;
background: #babfc0;
overflow: hidden;
margin: 0;
}
*+html .i-tabsheet-deco {
height: 1px;
background: #babfc0;
overflow: hidden;
margin: 0;
.i-ie7 .i-tabsheet-deco {
width: 100%;
}














/* Inline style */

/* Light-style */
.i-tabsheet-light .i-tabsheet-tabcontainer {
height: 32px;
}

.i-tabsheet-tabs-light {
height: 32px;
width: 100%;
overflow:hidden;
background: transparent url(img/inline-tab-bg.png) repeat-x;
}

.i-tabsheet-light .i-tabsheet-spacertd div {
height: 31px;
border: none;
border-bottom: 1px solid #b6bbbc;
background: transparent;
}

.i-tabsheet-light .i-tabsheet-tabitem {
border: none;
border-bottom: 1px solid #b6bbbc;
@@ -284,16 +181,13 @@
cursor: pointer;
text-shadow: #fff 0 1px 0;
}

.i-tabsheet-light .i-tabsheet-tabitemcell-first .i-caption {
margin-left: 6px;
}

.i-tabsheet-light .i-tabsheet-tabitem .i-caption {
height: 24px;
padding: 8px 9px 0 9px;
}

.i-tabsheet-light .i-tabsheet-tabitem-selected {
border: none;
background: #fff url(img/inline-tab-right.png) no-repeat right top;
@@ -304,15 +198,12 @@
color: #ee5311;
text-shadow: none;
}

.i-tabsheet-light .i-tabsheet-tabitem:hover {
color: #4b5257;
}

.i-tabsheet-light .i-tabsheet-tabitem-selected:hover {
color: #ee5311;
}

.i-tabsheet-light .i-tabsheet-tabitem-selected .i-caption {
background: transparent url(img/inline-tab-left.png) no-repeat -7px 0;
margin: 0;
@@ -320,33 +211,25 @@
padding: 9px 11px 0 11px;
overflow: visible;
}

.i-tabsheet-light .i-tabsheet-tabitemcell-first .i-tabsheet-tabitem-selected .i-caption {
background: transparent url(img/inline-tab-left.png) no-repeat -3px 0;
padding-left: 15px;
}

.i-tabsheet-light .i-tabsheet-content {
border: none;
background: transparent;
}

.i-tabsheet-light .i-tabsheet-hidetabs .i-tabsheet-content {
border: none;
}

.i-tabsheet-deco-light {
height: 0;
overflow: hidden;
}

.i-tabsheet-deco-light:before {
display: none;
}


/* Scroller */

.i-tabsheet-light .i-tabsheet-scrollerPrev,
.i-tabsheet-light .i-tabsheet-scrollerNext {
margin-top: 2px;
@@ -357,53 +240,29 @@
margin-top: 2px;
height: 34px;
}




/* Progress indication */

.i-tabsheet-loading .i-tabsheet-tabs-light .i-tabsheet-tabitem-selected .i-captiontext {
margin-left: -3px;
padding-left: 3px;
}



/* IE specific styles */

* html .i-tabsheet-tabs-light {
height: 32px;
}
*+html .i-tabsheet-tabs-light {
height: 32px;
}

* html .i-tabsheet-light .i-tabsheet-tabitem-selected {
border: none;
background: #fff url(img/inline-tab-right.png) no-repeat right top;
padding: 0;
.i-ie6 .i-tabsheet-tabs-light,
.i-ie7 .i-tabsheet-tabs-light {
height: 32px;
}
*+html .i-tabsheet-light .i-tabsheet-tabitem-selected {
.i-ie6 .i-tabsheet-light .i-tabsheet-tabitem-selected,
.i-ie7 .i-tabsheet-light .i-tabsheet-tabitem-selected {
border: none;
background: #fff url(img/inline-tab-right.png) no-repeat right top;
padding: 0;
height: 32px;
}
* html .i-tabsheet-light .i-tabsheet-tabitem-selected .i-caption {
.i-ie6 .i-tabsheet-light .i-tabsheet-tabitem-selected .i-caption,
.i-ie7 .i-tabsheet-light .i-tabsheet-tabitem-selected .i-caption {
background: transparent url(img/inline-tab-left.png) no-repeat -7px 0;
padding: 9px 11px 0 11px;
}
*+html .i-tabsheet-light .i-tabsheet-tabitem-selected .i-caption {
background: transparent url(img/inline-tab-left.png) no-repeat -7px 0;
padding: 9px 11px 0 11px;
}

* html .i-tabsheet-deco-light {
.i-ie6 .i-tabsheet-deco-light,
.i-ie6 .i-tabsheet-deco-light {
height: 0;
}
*+html .i-tabsheet-deco-light {
height: 0;
}
}

+ 1
- 48
WebContent/ITMILL/themes/default/textfield/textfield.css View File

@@ -8,9 +8,7 @@
margin: 0;
font-size: 13px;
height: 18px;
text-align: left /* Force default alignment */
}

.i-textarea {
background: #fff url(img/bg.png) repeat-x;
padding: 2px;
@@ -21,63 +19,18 @@
margin: 0;
font-size: 13px;
}

.i-textfield-focus,
.i-textarea-focus {
border-color: #5daee8;
}

input.i-textfield-prompt,
textarea.i-textarea-prompt {
color: #999;
font-style: italic;
font-style: normal;
}

.i-textfield.i-readonly,
.i-textarea.i-readonly {
background: transparent;
color: #222;
border: none;
}

.i-richtextarea {
border: 1px solid #b6b6b6;
overflow: hidden;
}
.i-richtextarea .gwt-RichTextToolbar .gwt-ToggleButton,
.i-richtextarea .gwt-RichTextToolbar .gwt-PushButton {
float:left;
}
.i-richtextarea .gwt-RichTextToolbar {
white-space: nowrap;
}
.i-richtextarea .gwt-RichTextArea {
background: #fff url(img/bg.png) repeat-x;
}
.i-richtextarea iframe {
border: 0;
}

/* Disabled by default
.i-textarea-error,
.i-textfield-error,
.i-richtextarea-error iframe.gwt-RichTextArea {
background:transparent;
background-color: #FFE0E0;
}
*/

/* Disabled by default
.i-textarea-required,
.i-textfield-required,
.i-richtextarea-required iframe.gwt-RichTextArea {
background:transparent;
background-color: #FFE0E0;
}
*/

/* Safari focus glow fix */
.i-sa input:focus,
.i-sa textarea:focus{
outline-width: medium;
}

+ 1
- 30
WebContent/ITMILL/themes/default/tree/tree.css View File

@@ -1,55 +1,26 @@
.i-tree {
text-align: left /* Force default alignment */
}

.i-tree-node {
background: transparent url(img/collapsed.png) no-repeat 2px 1px;
}
.i-tree-node-expanded {
background: transparent url(img/expanded.png) no-repeat 2px 1px;
}
.i-tree-node-leaf {
background-image: none;
}
.i-tree-node-caption {
margin-left: 16px;
}

.i-tree-node span {
padding: 0 2px;
cursor: pointer;
white-space: nowrap;
}
.i-tree-node-selected span {
background: #5daee8;
color: #fff;
padding: 0 2px;
cursor: pointer;
}
.i-tree-node-children {
padding-left: 16px;
}


/* ie6compatnode is hidden from non ie6 browsers, for ie6
* uses weird hack to sink all events properly
*/
.i-tree-node-ie6compatnode {
display: none;
}

/* IMPORTANT keep the offsetWidth of this element the same as the margin-left of i-tree-node-caption */
/* IMPORTANT keep the offsetWidth (width + padding) of this element the same as the margin-left of i-tree-node-caption */
.i-ie6 .i-tree-node-ie6compatnode {
display: inline;
float: left;
background: orange;
margin: 0;
width: 14px;
height: 10px;
padding: 1px;
filter: Alpha(opacity=0);
}
.i-ie6 .i-tree-node,
.i-ie6 .i-tree-node-children {
clear: left;
}

+ 5
- 95
WebContent/ITMILL/themes/default/window/window.css View File

@@ -5,81 +5,50 @@
line-height: 18px;
background: transparent url(img/bottom-left.png) no-repeat left bottom;
}

.i-window-wrap {
background: transparent url(img/top-left.png) no-repeat;
}

.i-window-outerheader {
height: 23px;
margin-left: 9px;
padding: 15px 40px 11px 12px;
background: transparent url(img/top-right.png) no-repeat right top;
cursor: move;
}

.i-window-header {
font-size: 18px;
line-height: 1.2;
font-weight: normal;
letter-spacing: -0.03em;
color: #f14c1a;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
text-shadow: 0 1px 0 #fff;
/* This element is 100% wide in IE6 */
}

* html .i-window-header {
width: 100%;
}

.i-window-header .i-icon {
vertical-align: middle; /* This has to be 'middle', not 'bottom', to allow larger icons than 16px */
}

.i-window-contents {
background: #fff;
border: 2px solid #acb2b3;
border-top: none;
border-bottom: none;
}

/* Partial fix for bug #1106 */
/* Target Firefox 2 (somehow this will force almost all window borders on top of a Flash object) */
.i-window-contents, x:-moz-any-link {
overflow: hidden;
}
/* Target Firefox 3 (it doesn't need any trickery, so revert the previous) */
.i-window-contents, x:-moz-any-link, x:default {
overflow: visible;
}

.i-window-footer {
height: 8px;
margin-left: 9px;
background: transparent url(img/bottom-right.png) no-repeat right top;
}
.i-ie7 .i-window-footer {
position:relative;
position: relative;
}

.i-window-resizebox {
position: absolute; /* Needed to position the element over ScrollPanel, which is also relatively positioned */
position: absolute; /* Needed to position the element over ScrollPanel, which is relatively positioned */
right: 5px;
width: 10px;
height: 10px;
margin-top: -7px;
cursor: se-resize;
background: transparent url(img/resize.png);
overflow: hidden;
}

.i-window-resizebox-disabled {
cursor: default;
background: transparent;
display: block;
}

.i-window-closebox {
position: absolute;
top: 21px;
@@ -87,118 +56,59 @@
width: 12px;
height: 12px;
background: transparent url(img/close.png);
cursor: pointer;
overflow: hidden;
}
.i-window-closebox:hover {
background-position: 0 -12px;
}

.i-window-modalitycurtain {
top: 0;
left: 0;
background: white;
opacity: 0.5;
position: fixed;
width: 100%;
height: 100%;
filter: alpha(opacity=50);
}

/* IE6 workaround for position:fixed; */
* html .i-window-modalitycurtain {
position: absolute;
top: expression(document.documentElement.scrollTop + "px");
}

/* IE specific styles */

* html .i-window {
width: 0; /* min-size for IE6 */
background: #fff;
}

/* Shadow for window */

.i-shadow-window {
position: absolute;
}

.i-shadow-window .top-left {
position: absolute; overflow: hidden;
top: -13px; left: -20px;
width: 39px; height: 39px;
background: transparent url(img/shadow/top-left.png);
}

.i-shadow-window .top {
position: absolute; overflow: hidden;
top: -13px; left: 19px;
height: 39px;
right: 19px;
background: transparent url(img/shadow/top.png);
}

.i-shadow-window .top-right {
position: absolute; overflow: hidden;
top: -13px; right: -20px;
width: 39px; height: 39px;
background: transparent url(img/shadow/top-right.png);
}

.i-shadow-window .left {
position: absolute; overflow: hidden;
top: 26px; left: -20px;
width: 39px;
bottom: 12px;
background: transparent url(img/shadow/left.png);
}

.i-shadow-window .center {
position: absolute; overflow: hidden;
top: 26px; left: 19px;
bottom: 12px; right: 19px;
background: transparent url(img/shadow/center.png);
}

.i-shadow-window .right {
position: absolute; overflow: hidden;
top: 26px; right: -20px;
width: 39px;
bottom: 12px;
background: transparent url(img/shadow/right.png);
}

.i-shadow-window .bottom-left {
position: absolute; overflow: hidden;
bottom: -27px; left: -20px;
width: 39px; height: 39px;
background: transparent url(img/shadow/bottom-left.png);
}

.i-shadow-window .bottom {
position: absolute; overflow: hidden;
bottom: -27px; left: 19px;
right: 19px; height: 39px;
background: transparent url(img/shadow/bottom.png);
}

.i-shadow-window .bottom-right {
position: absolute; overflow: hidden;
bottom: -27px; right: -20px;
width: 39px; height: 39px;
background: transparent url(img/shadow/bottom-right.png);
}


/* For IE6 (no transparent png's, we use a blur filter) */

* html .i-shadow-window * {
display: none;
}

* html .i-shadow-window {
background: #000;
filter: progid:DXImageTransform.Microsoft.Blur(pixelRadius=5) alpha(opacity=20);
margin-top: 2px;
margin-left: 2px;
}

+ 0
- 0
WebContent/ITMILL/themes/reindeer/button/button.css View File


+ 1554
- 0
WebContent/ITMILL/themes/reindeer/styles.css
File diff suppressed because it is too large
View File


+ 7
- 1
WebContent/ITMILL/themes/sampler/table/styles.css View File

@@ -21,4 +21,10 @@
background-color: #ffd;
font-family: monospace;
margin: 0px;
}
}

.i-table .i-icon {
/* explicitly set icon width for fast browsers
* to properly detect row header width */
width: 16px;
}

+ 1
- 1
build/VERSION.properties View File

@@ -1 +1 @@
version=5.3.0
version=6.0.development

+ 4
- 7
build/bin/mergetool.py View File

@@ -79,12 +79,10 @@ def listChangedFiles():
changed = []
for line in lines:
# Remove trailing newline
line = line.rstrip()
print line
line = line[:-1]

# Extract the file state and name
filestate = line[0:2].strip()
filename = line[7:].strip()
(filestate, filename) = re.split(r'[ \+]+', line)

# Ignore files in build directory
if (filename.startswith("build/merge/") \
@@ -543,8 +541,7 @@ def commandRevert():
line = line[:-1]

# Extract the file state and name
filestate = line[0:2].strip()
filename = line[7:].strip()
(filestate, filename) = re.split(r'[ \+]+', line)

# Ignore files in build directory
if (filename.startswith("build/merge/") \

+ 57
- 15
build/build.xml View File

@@ -186,9 +186,6 @@

<echo>Toolkit package is: ${toolkit-package}</echo>

<!-- Can run XEP only if license is available. -->
<available file="build/lib/XEP/license.xml" property="xep.license.available" />

<!-- Create result dir unless already exists -->
<mkdir dir="${result-path}" />

@@ -734,6 +731,11 @@
<echo>TEST TARGET CALLED</echo>
</target>

<target name="remove-widgetset-gwt-tmp">
<echo>Removing widgetset temp files</echo>
<delete dir="${output-dir}/WebContent/ITMILL/widgetsets/.gwt-tmp" includeemptydirs="true"/>
</target>

<target name="compile-widgetset-default">
<echo>Compiling src (client-side)</echo>
<echo>com.itmill.toolkit.terminal.gwt.DefaultWidgetSet</echo>
@@ -751,6 +753,7 @@
<pathelement location="${result-path}/src" />
</classpath>
</java>
<antcall target="remove-widgetset-gwt-tmp"/>
<echo>Compiled DefaultWidgetSet</echo>
</target>

@@ -780,6 +783,7 @@
<pathelement path="${output-dir}/WebContent/WEB-INF/src" />
</classpath>
</java>
<antcall target="remove-widgetset-gwt-tmp"/>
<echo>Compiled ReservationWidgetSet</echo>
</target>

@@ -802,6 +806,7 @@
<pathelement path="${output-dir}/WebContent/WEB-INF/src" />
</classpath>
</java>
<antcall target="remove-widgetset-gwt-tmp"/>
<echo>Compiled SamplerWidgetSet</echo>
</target>
@@ -823,7 +828,8 @@
<pathelement path="${output-dir}/WebContent/WEB-INF/src" />
</classpath>
</java>
<echo>Compiled SamplerWidgetSet</echo>
<antcall target="remove-widgetset-gwt-tmp"/>
<echo>Compiled CoverflowWidgetSet</echo>
</target>
<target name="compile-widgetset-colorpicker">
@@ -844,6 +850,7 @@
<pathelement path="${output-dir}/WebContent/WEB-INF/src" />
</classpath>
</java>
<antcall target="remove-widgetset-gwt-tmp"/>
<echo>Compiled ColorPickerWidgetSet</echo>
</target>

@@ -965,6 +972,18 @@
<!-- Manual: Build from external repository. -->
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->

<target name="manual-init">
<!-- Can run XEP only if license is available. -->
<available file="build/lib/XEP/license.xml" property="xep.license.available" />

<!-- Path to installed XEP license. -->
<property name="xep.license.path.installed" value="/opt/RenderX/XEP/license.xml"/>
<echo>XEP license expected to be installed as ${xep.license.path.installed}</echo>

<!-- Can copy XEP license only if it is available. -->
<available file="${xep.license.path.installed}" property="xep.license.installed"/>
</target>

<!-- Checkout doc repository. -->
<target name="manual-checkout" unless="docdir">
<mkdir dir="${checkout-path}"/>
@@ -976,13 +995,15 @@
</exec>

<property name="docdir" value="${checkout-path}/doc"/>
</target>

<!-- If we have a XEP license, copy it to proper place. -->
<copy file="/opt/RenderX/XEP/license.xml" todir="${docdir}/build/lib/XEP"/>
<!-- If the XEP is installed, copy it to proper place. -->
<target name="xep-license-copy" if="xep.license.installed">
<copy file="${xep.license.path.installed}" todir="${docdir}/build/lib/XEP"/>
</target>

<!-- Build manual. -->
<target name="manual-build">
<target name="manual-build" depends="xep-license-copy">
<ant dir="${docdir}" antfile="build/build.xml" inheritAll="false">
<property name="version" value="${version}"/>
</ant>
@@ -999,7 +1020,7 @@
</copy>
</target>

<target name="manual" depends="init, manual-checkout, manual-build, manual-copy">
<target name="manual" depends="init, manual-init, manual-checkout, manual-build, manual-copy">
</target>

<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
@@ -1110,7 +1131,7 @@
<echo>Installing ${output-dir}/WebContent/${lib-jar-name} to ${nightly.publish}</echo>
<echo>Hopefully you have permissions for the copy operation with SSH.</echo>

<!-- The test task will need this. -->
<!-- Only Linux tests allowed. TODO: Generalize this. -->
<property name="package.linux.filename" value="${result-path}/${product-file}-${package-platform}-${version}.tar.gz"/>

<!-- Copy the linux installation package and the JAR. -->
@@ -1127,16 +1148,37 @@
<target name="nightly-install" depends="nightly-teamcity-publish, nightly-download-publish">
</target>

<target name="testingtools-test">
<!-- Run the separate test script. -->
<ant antfile="build/testing/test.xml" inheritall="true">
</ant>
</target>

<!-- ================================================================== -->
<!-- Automated tests. -->
<!-- ================================================================== -->

<target name="tests" depends="ant-tests, testingtools-tests">
</target>

<target name="testingtools-tests" depends="init">
<fail unless="product-file" message="The 'product-file' property must be defined."/>
<fail unless="package-platform" message="The 'package-platform' property must be defined."/>
<fail unless="version" message="The 'version' property must be defined."/>

<!-- Parameters for the test.xml script. -->
<fail unless="testingtools.tester.host" message="The 'testingtools.tester.host' property must be defined."/>
<fail unless="testingtools.deployment.url" message="The 'testingtools.deployment.url' property must be defined."/>

<property name="package.platform.name" value="${product-file}-${package-platform}-${version}"/>

<!-- Only Linux tests allowed. TODO: Generalize this. -->
<property name="package.linux.filename" value="${result-path}/${package.platform.name}.tar.gz"/>

<!-- Run the separate test script. -->
<ant antfile="tests/test.xml" target="test-package" inheritall="false" inheritrefs="true">
<property name="package.filename" value="${package.linux.filename}"/>
<property name="testing.testarea" value="/tmp/testarea"/>
<property name="package.name" value="${package.platform.name}"/>
<property name="testingtools.tester.host" value="${testingtools.tester.host}"/>
<property name="testingtools.deployment.url" value="${testingtools.deployment.url}"/>
</ant>
</target>

<target name="ant-tests">
<echo>##teamcity[testSuiteStarted name='com.itmill.toolkit.tests.test-framework']</echo>


+ 1
- 1
build/package/start.sh View File

@@ -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.itmill.toolkit.launcher.ITMillToolkitDesktopMode
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.itmill.toolkit.launcher.ITMillToolkitDesktopMode $ITMILLTOOLKIT_PARAMETERS

+ 10
- 23
src/com/itmill/toolkit/Application.java View File

@@ -4,6 +4,7 @@

package com.itmill.toolkit;

import java.io.Serializable;
import java.net.SocketException;
import java.net.URL;
import java.util.Collection;
@@ -84,7 +85,9 @@ import com.itmill.toolkit.ui.Window;
* @VERSION@
* @since 3.0
*/
public abstract class Application implements URIHandler, Terminal.ErrorListener {
@SuppressWarnings("serial")
public abstract class Application implements URIHandler,
Terminal.ErrorListener, Serializable {

/**
* Random window name generator.
@@ -757,11 +760,6 @@ public abstract class Application implements URIHandler, Terminal.ErrorListener
*/
public class UserChangeEvent extends java.util.EventObject {

/**
* Serial generated by eclipse.
*/
private static final long serialVersionUID = 3544951069307188281L;

/**
* New user of the application.
*/
@@ -826,7 +824,7 @@ public abstract class Application implements URIHandler, Terminal.ErrorListener
* @VERSION@
* @since 3.0
*/
public interface UserChangeListener extends EventListener {
public interface UserChangeListener extends EventListener, Serializable {

/**
* The <code>applicationUserChanged</code> method Invoked when the
@@ -872,11 +870,6 @@ public abstract class Application implements URIHandler, Terminal.ErrorListener
*/
public class WindowDetachEvent extends EventObject {

/**
* Serial generated by eclipse.
*/
private static final long serialVersionUID = 3544669568644691769L;

private final Window window;

/**
@@ -914,11 +907,6 @@ public abstract class Application implements URIHandler, Terminal.ErrorListener
*/
public class WindowAttachEvent extends EventObject {

/**
* Serial generated by eclipse.
*/
private static final long serialVersionUID = 3977578104367822392L;

private final Window window;

/**
@@ -954,7 +942,7 @@ public abstract class Application implements URIHandler, Terminal.ErrorListener
/**
* Window attach listener interface.
*/
public interface WindowAttachListener {
public interface WindowAttachListener extends Serializable {

/**
* Window attached
@@ -968,7 +956,7 @@ public abstract class Application implements URIHandler, Terminal.ErrorListener
/**
* Window detach listener interface.
*/
public interface WindowDetachListener {
public interface WindowDetachListener extends Serializable {

/**
* Window detached.
@@ -1186,7 +1174,7 @@ public abstract class Application implements URIHandler, Terminal.ErrorListener
* </p>
*
*/
public static class SystemMessages {
public static class SystemMessages implements Serializable {
protected String sessionExpiredURL = null;
protected boolean sessionExpiredNotificationEnabled = true;
protected String sessionExpiredCaption = "Session Expired";
@@ -1369,7 +1357,8 @@ public abstract class Application implements URIHandler, Terminal.ErrorListener
* </p>
*/

public static class CustomizedSystemMessages extends SystemMessages {
public static class CustomizedSystemMessages extends SystemMessages
implements Serializable {

/**
* Sets the URL to go to when the session has expired.
@@ -1557,7 +1546,6 @@ public abstract class Application implements URIHandler, Terminal.ErrorListener
}

public class ApplicationError implements Terminal.ErrorEvent {

private final Throwable throwable;

public ApplicationError(Throwable throwable) {
@@ -1569,5 +1557,4 @@ public abstract class Application implements URIHandler, Terminal.ErrorListener
}

}

}

+ 15
- 0
src/com/itmill/toolkit/annotations/AutoGenerated.java View File

@@ -0,0 +1,15 @@
package com.itmill.toolkit.annotations;
/**
* Marker annotation for automatically generated code elements.
*
* These elements may be modified or removed by code generation.
*
* @author IT Mill Ltd.
* @version
* @VERSION@
* @since 6.0
*/
public @interface AutoGenerated {
}

+ 1
- 1
src/com/itmill/toolkit/automatedtests/ComponentsInTable.java View File

@@ -14,6 +14,7 @@ import com.itmill.toolkit.ui.OrderedLayout;
import com.itmill.toolkit.ui.Table;
import com.itmill.toolkit.ui.Button.ClickEvent;
@SuppressWarnings("serial")
public class ComponentsInTable extends CustomComponent {
public ComponentsInTable(int cols, int rows) {
@@ -40,7 +41,6 @@ public class ComponentsInTable extends CustomComponent {
content.add(new Button("b" + i, new Button.ClickListener() {
public void buttonClick(ClickEvent event) {
Button b = event.getButton();
System.out.println(event.getButton().getCaption()
+ " click: " + (new Date()).toGMTString());
System.out.println(event.getButton().getApplication());

+ 1
- 0
src/com/itmill/toolkit/automatedtests/SimplestApplication.java View File

@@ -7,6 +7,7 @@ package com.itmill.toolkit.automatedtests;
import com.itmill.toolkit.ui.Label;
import com.itmill.toolkit.ui.Window;

@SuppressWarnings("serial")
public class SimplestApplication extends com.itmill.toolkit.Application {

@Override

+ 2
- 0
src/com/itmill/toolkit/automatedtests/featurebrowser/AccordionExample.java View File

@@ -10,7 +10,9 @@ import com.itmill.toolkit.ui.VerticalLayout;
* Accordion is a derivative of TabSheet, a vertical tabbed layout that places
* the tab contents between the vertical tabs.
*/
@SuppressWarnings("serial")
public class AccordionExample extends CustomComponent {

public AccordionExample() {
// Create a new accordion
final Accordion accordion = new Accordion();

+ 1
- 0
src/com/itmill/toolkit/automatedtests/featurebrowser/ButtonExample.java View File

@@ -21,6 +21,7 @@ import com.itmill.toolkit.ui.Button.ClickEvent;
*
* @author IT Mill Ltd.
*/
@SuppressWarnings("serial")
public class ButtonExample extends CustomComponent implements
Button.ClickListener {

+ 2
- 0
src/com/itmill/toolkit/automatedtests/featurebrowser/ClientCachingExample.java View File

@@ -21,6 +21,7 @@ import com.itmill.toolkit.ui.VerticalLayout;
*
* @author IT Mill Ltd.
*/
@SuppressWarnings("serial")
public class ClientCachingExample extends CustomComponent {
private static final String msg = "This example is a (simple) demonstration of client-side caching."
@@ -52,6 +53,7 @@ public class ClientCachingExample extends CustomComponent {
layout = new VerticalLayout();
layout.setMargin(true);
l = new Label("Slow label - until cached client side.") {
@Override
public void paintContent(PaintTarget target) throws PaintException {
try {

+ 1
- 0
src/com/itmill/toolkit/automatedtests/featurebrowser/ComboBoxExample.java View File

@@ -14,6 +14,7 @@ import com.itmill.toolkit.ui.AbstractSelect.Filtering;
/**
*
*/
@SuppressWarnings("serial")
public class ComboBoxExample extends CustomComponent {

private static final String[] firstnames = new String[] { "John", "Mary",

+ 1
- 0
src/com/itmill/toolkit/automatedtests/featurebrowser/EmbeddedBrowserExample.java View File

@@ -21,6 +21,7 @@ import com.itmill.toolkit.ui.Window.Notification;
* @author IT Mill Ltd.
* @see com.itmill.toolkit.ui.Window
*/
@SuppressWarnings("serial")
public class EmbeddedBrowserExample extends VerticalLayout implements
Select.ValueChangeListener {


+ 8
- 4
src/com/itmill/toolkit/automatedtests/featurebrowser/FeatureBrowser.java View File

@@ -36,10 +36,12 @@ import com.itmill.toolkit.ui.Button.ClickEvent;
* @author IT Mill Ltd.
* @see com.itmill.toolkit.ui.Window
*/
@SuppressWarnings("serial")
public class FeatureBrowser extends com.itmill.toolkit.Application implements
Select.ValueChangeListener {

// Property IDs

private static final Object PROPERTY_ID_CATEGORY = "Category";
private static final Object PROPERTY_ID_NAME = "Name";
private static final Object PROPERTY_ID_DESC = "Description";
@@ -167,7 +169,7 @@ public class FeatureBrowser extends com.itmill.toolkit.Application implements
tree.addListener(this);
tree.setImmediate(true);
tree.expandItemsRecursively(rootId);
for (Iterator i = container.getItemIds().iterator(); i.hasNext();) {
for (Iterator<?> i = container.getItemIds().iterator(); i.hasNext();) {
Object id = i.next();
if (container.getChildren(id) == null) {
tree.setChildrenAllowed(id, false);
@@ -207,6 +209,7 @@ public class FeatureBrowser extends com.itmill.toolkit.Application implements

final HorizontalLayout wbLayout = new HorizontalLayout();
Button b = new Button("Open in sub-window", new Button.ClickListener() {

public void buttonClick(ClickEvent event) {
Component component = (Component) ts.getComponentIterator()
.next();
@@ -231,6 +234,7 @@ public class FeatureBrowser extends com.itmill.toolkit.Application implements
b.setStyleName(Button.STYLE_LINK);
wbLayout.addComponent(b);
b = new Button("Open in native window", new Button.ClickListener() {

public void buttonClick(ClickEvent event) {
Component component = (Component) ts.getComponentIterator()
.next();
@@ -348,8 +352,8 @@ public class FeatureBrowser extends com.itmill.toolkit.Application implements
tree.setValue(table.getValue());
table.addListener(this);
final Item item = table.getItem(table.getValue());
final Class c = (Class) item.getItemProperty(PROPERTY_ID_CLASS)
.getValue();
final Class<?> c = (Class<?>) item.getItemProperty(
PROPERTY_ID_CLASS).getValue();
final Component component = getComponent(c);
if (component != null) {
final String caption = (String) item.getItemProperty(
@@ -369,7 +373,7 @@ public class FeatureBrowser extends com.itmill.toolkit.Application implements

}

private Component getComponent(Class componentClass) {
private Component getComponent(Class<?> componentClass) {
if (!exampleInstances.containsKey(componentClass)) {
try {
final Component c = (Component) componentClass.newInstance();

+ 8
- 2
src/com/itmill/toolkit/automatedtests/featurebrowser/FormExample.java View File

@@ -1,5 +1,7 @@
package com.itmill.toolkit.automatedtests.featurebrowser;

import java.io.Serializable;

import com.itmill.toolkit.data.Item;
import com.itmill.toolkit.data.Validator;
import com.itmill.toolkit.data.util.BeanItem;
@@ -23,6 +25,7 @@ import com.itmill.toolkit.ui.Button.ClickEvent;
* more complex than real use, as it tries to demonstrate more features than
* needed in general case.
*/
@SuppressWarnings("serial")
public class FormExample extends CustomComponent {

static final String cities[] = { "Amsterdam", "Berlin", "Helsinki",
@@ -61,6 +64,7 @@ public class FormExample extends CustomComponent {
}

public static class AddressForm extends Form {

public AddressForm(String caption) {

setCaption(caption);
@@ -114,7 +118,8 @@ public class FormExample extends CustomComponent {
* This is example on how to customize field creation. Any kind of field
* components could be created on the fly.
*/
static class MyFieldFactory extends BaseFieldFactory {
static class MyFieldFactory extends BaseFieldFactory implements
Serializable {

@Override
public Field createField(Item item, Object propertyId,
@@ -159,7 +164,8 @@ public class FormExample extends CustomComponent {
* it would be a good idea to implement Item -interface for the datamodel to
* make it directly bindable to form (without BeanItem wrapper)
*/
public static class Address {
public static class Address implements Serializable {

String name = "";
String streetAddress = "";
String postalCode = "";

+ 9
- 4
src/com/itmill/toolkit/automatedtests/featurebrowser/GeneratedColumnExample.java View File

@@ -36,7 +36,9 @@ import com.itmill.toolkit.ui.Button.ClickListener;
*
* @author magi
*/
@SuppressWarnings("serial")
public class GeneratedColumnExample extends CustomComponent {

/**
* The business model: fill-up at a gas station.
*/
@@ -116,12 +118,13 @@ public class GeneratedColumnExample extends CustomComponent {
* implementations, as they are not needed in this example.
*/
public class MySimpleIndexedContainer implements Container, Indexed {
Vector items;

Vector<BeanItem> items;
Object itemtemplate;

public MySimpleIndexedContainer(Object itemtemplate) {
this.itemtemplate = itemtemplate;
items = new Vector(); // Yeah this is just a test
items = new Vector<BeanItem>(); // Yeah this is just a test
}

public boolean addContainerProperty(Object propertyId, Class type,
@@ -164,7 +167,7 @@ public class GeneratedColumnExample extends CustomComponent {
if (itemId instanceof Integer) {
int pos = ((Integer) itemId).intValue();
if (pos >= 0 && pos < items.size()) {
Item item = (Item) items.get(pos);
Item item = items.get(pos);

// The BeanItem provides the property objects for the items.
return item.getItemProperty(propertyId);
@@ -185,7 +188,7 @@ public class GeneratedColumnExample extends CustomComponent {
if (itemId instanceof Integer) {
int pos = ((Integer) itemId).intValue();
if (pos >= 0 && pos < items.size()) {
return (Item) items.get(pos);
return items.get(pos);
}
}
return null;
@@ -365,6 +368,7 @@ public class GeneratedColumnExample extends CustomComponent {

/** Table column generator for calculating consumption column. */
class ConsumptionColumnGenerator implements Table.ColumnGenerator {

/**
* Generates a cell containing value calculated from the item.
*/
@@ -408,6 +412,7 @@ public class GeneratedColumnExample extends CustomComponent {

/** Table column generator for calculating daily cost column. */
class DailyCostColumnGenerator extends ConsumptionColumnGenerator {

@Override
public Component generateCell(FillUp fillup, FillUp prev) {
double dailycost = fillup.dailyCost(prev);

+ 2
- 1
src/com/itmill/toolkit/automatedtests/util/DebugId.java View File

@@ -4,11 +4,12 @@

package com.itmill.toolkit.automatedtests.util;

import java.io.Serializable;
import java.util.HashMap;

import com.itmill.toolkit.ui.Component;

public class DebugId {
public class DebugId implements Serializable {

private static HashMap debugIds = new HashMap();


+ 2
- 1
src/com/itmill/toolkit/automatedtests/util/Log.java View File

@@ -4,6 +4,7 @@

package com.itmill.toolkit.automatedtests.util;

import java.io.Serializable;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -17,7 +18,7 @@ import java.util.Iterator;
* figure out what went wrong.
*
*/
public class Log {
public class Log implements Serializable {

// 3 (errors only)
// 2 (+ warnings)

+ 2
- 1
src/com/itmill/toolkit/automatedtests/util/RandomComponents.java View File

@@ -4,6 +4,7 @@

package com.itmill.toolkit.automatedtests.util;

import java.io.Serializable;
import java.util.ArrayList;
import java.util.Date;
import java.util.Random;
@@ -41,7 +42,7 @@ import com.itmill.toolkit.ui.Select;
import com.itmill.toolkit.ui.TabSheet;
import com.itmill.toolkit.ui.TextField;

public class RandomComponents {
public class RandomComponents implements Serializable {

private Random rand = null;


+ 1
- 2
src/com/itmill/toolkit/automatedtests/util/StatusServlet.java View File

@@ -15,10 +15,9 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

@SuppressWarnings("serial")
public class StatusServlet extends HttpServlet {

private static final long serialVersionUID = -6764317622536660947L;

public static DateFormat dfHuman = new SimpleDateFormat(
"yyyy-MM-dd HH:mm:ss");


+ 5
- 7
src/com/itmill/toolkit/data/Buffered.java View File

@@ -4,6 +4,8 @@

package com.itmill.toolkit.data;

import java.io.Serializable;

import com.itmill.toolkit.data.Validator.InvalidValueException;
import com.itmill.toolkit.terminal.ErrorMessage;
import com.itmill.toolkit.terminal.PaintException;
@@ -42,7 +44,7 @@ import com.itmill.toolkit.terminal.SystemError;
* @VERSION@
* @since 3.0
*/
public interface Buffered {
public interface Buffered extends Serializable {

/**
* Updates all changes since the previous commit to the data source. The
@@ -147,13 +149,9 @@ public interface Buffered {
* @VERSION@
* @since 3.0
*/
@SuppressWarnings("serial")
public class SourceException extends RuntimeException implements
ErrorMessage {

/**
* Serial generated by eclipse.
*/
private static final long serialVersionUID = 3256720671781630518L;
ErrorMessage, Serializable {

/** Source class implementing the buffered interface */
private final Buffered source;

+ 4
- 1
src/com/itmill/toolkit/data/BufferedValidatable.java View File

@@ -4,6 +4,8 @@

package com.itmill.toolkit.data;

import java.io.Serializable;

/**
* <p>
* This interface defines the combination of <code>Validatable</code> and
@@ -16,7 +18,8 @@ package com.itmill.toolkit.data;
* @VERSION@
* @since 3.0
*/
public interface BufferedValidatable extends Buffered, Validatable {
public interface BufferedValidatable extends Buffered, Validatable,
Serializable {

/**
* Tests if the invalid data is committed to datasource. The default is

+ 18
- 17
src/com/itmill/toolkit/data/Container.java View File

@@ -4,6 +4,7 @@

package com.itmill.toolkit.data;

import java.io.Serializable;
import java.util.Collection;

/**
@@ -51,7 +52,7 @@ import java.util.Collection;
* @VERSION@
* @since 3.0
*/
public interface Container {
public interface Container extends Serializable {

/**
* Gets the Item with the given Item ID from the Container. If the Container
@@ -70,7 +71,7 @@ public interface Container {
*
* @return unmodifiable collection of Property IDs
*/
public Collection getContainerPropertyIds();
public Collection<?> getContainerPropertyIds();

/**
* Gets the ID's of all Items stored in the Container. The ID's are returned
@@ -78,7 +79,7 @@ public interface Container {
*
* @return unmodifiable collection of Item IDs
*/
public Collection getItemIds();
public Collection<?> getItemIds();

/**
* Gets the Property identified by the given itemId and propertyId from the
@@ -100,7 +101,7 @@ public interface Container {
* ID identifying the Properties
* @return data type of the Properties
*/
public Class getType(Object propertyId);
public Class<?> getType(Object propertyId);

/**
* Gets the number of Items in the Container.
@@ -181,7 +182,7 @@ public interface Container {
* @return <code>true</code> if the operation succeeded, <code>false</code>
* if not
*/
public boolean addContainerProperty(Object propertyId, Class type,
public boolean addContainerProperty(Object propertyId, Class<?> type,
Object defaultValue) throws UnsupportedOperationException;

/**
@@ -334,7 +335,7 @@ public interface Container {
*
* @return The sortable field ids.
*/
Collection getSortableContainerPropertyIds();
Collection<?> getSortableContainerPropertyIds();

}

@@ -418,7 +419,7 @@ public interface Container {
* containing the IDs of all other Items that are children in
* the container hierarchy
*/
public Collection getChildren(Object itemId);
public Collection<?> getChildren(Object itemId);

/**
* Gets the ID of the parent Item of the specified Item.
@@ -438,7 +439,7 @@ public interface Container {
* @return An unmodifiable {@link java.util.Collection collection}
* containing IDs of all root elements of the container
*/
public Collection rootItemIds();
public Collection<?> rootItemIds();

/**
* <p>
@@ -568,7 +569,7 @@ public interface Container {
*
* @since 5.0
*/
public interface Filterable extends Container {
public interface Filterable extends Container, Serializable {

/**
* Add a filter for given property.
@@ -600,7 +601,7 @@ public interface Container {
* Interface implemented by viewer classes capable of using a Container as a
* data source.
*/
public interface Viewer {
public interface Viewer extends Serializable {

/**
* Sets the Container that serves as the data source of the viewer.
@@ -631,7 +632,7 @@ public interface Container {
* internally.
* </p>
*/
public interface Editor extends Container.Viewer {
public interface Editor extends Container.Viewer, Serializable {

}

@@ -641,7 +642,7 @@ public interface Container {
* An <code>Event</code> object specifying the Container whose Item set has
* changed.
*/
public interface ItemSetChangeEvent {
public interface ItemSetChangeEvent extends Serializable {

/**
* Gets the Property where the event occurred.
@@ -652,7 +653,7 @@ public interface Container {
}

/** Container Item set change listener interface. */
public interface ItemSetChangeListener {
public interface ItemSetChangeListener extends Serializable {

/**
* Lets the listener know a Containers Item set has changed.
@@ -677,7 +678,7 @@ public interface Container {
* be able to implement an interface.
* </p>
*/
public interface ItemSetChangeNotifier {
public interface ItemSetChangeNotifier extends Serializable {

/**
* Adds an Item set change listener for the object.
@@ -702,7 +703,7 @@ public interface Container {
* An <code>Event</code> object specifying the Container whose Property set
* has changed.
*/
public interface PropertySetChangeEvent {
public interface PropertySetChangeEvent extends Serializable {

/**
* Retrieves the Container whose contents have been modified.
@@ -716,7 +717,7 @@ public interface Container {
* The listener interface for receiving <code>PropertySetChangeEvent</code>
* objects.
*/
public interface PropertySetChangeListener {
public interface PropertySetChangeListener extends Serializable {

/**
* Notifies this listener that the Containers contents has changed.
@@ -744,7 +745,7 @@ public interface Container {
* be able to implement an interface.
* </p>
*/
public interface PropertySetChangeNotifier {
public interface PropertySetChangeNotifier extends Serializable {

/**
* Registers a new Property set change listener for this Container.

+ 8
- 7
src/com/itmill/toolkit/data/Item.java View File

@@ -4,6 +4,7 @@

package com.itmill.toolkit.data;

import java.io.Serializable;
import java.util.Collection;

/**
@@ -18,7 +19,7 @@ import java.util.Collection;
* @VERSION@
* @since 3.0
*/
public interface Item {
public interface Item extends Serializable {

/**
* Gets the Property corresponding to the given Property ID stored in the
@@ -37,7 +38,7 @@ public interface Item {
* @return unmodifiable collection containing IDs of the Properties stored
* the Item
*/
public Collection getItemPropertyIds();
public Collection<?> getItemPropertyIds();

/**
* Tries to add a new Property into the Item.
@@ -78,7 +79,7 @@ public interface Item {
* Interface implemented by viewer classes capable of using an Item as a
* data source.
*/
public interface Viewer {
public interface Viewer extends Serializable {

/**
* Sets the Item that serves as the data source of the viewer.
@@ -105,7 +106,7 @@ public interface Item {
* restrict the class from editing the contents of an internally.
* </p>
*/
public interface Editor extends Item.Viewer {
public interface Editor extends Item.Viewer, Serializable {

}

@@ -119,7 +120,7 @@ public interface Item {
* this event.
* </p>
*/
public interface PropertySetChangeEvent {
public interface PropertySetChangeEvent extends Serializable {

/**
* Retrieves the Item whose contents has been modified.
@@ -133,7 +134,7 @@ public interface Item {
* The listener interface for receiving <code>PropertySetChangeEvent</code>
* objects.
*/
public interface PropertySetChangeListener {
public interface PropertySetChangeListener extends Serializable {

/**
* Notifies this listener that the Item's property set has changed.
@@ -158,7 +159,7 @@ public interface Item {
* be able to implement an interface.
* </p>
*/
public interface PropertySetChangeNotifier {
public interface PropertySetChangeNotifier extends Serializable {

/**
* Registers a new property set change listener for this Item.

+ 14
- 20
src/com/itmill/toolkit/data/Property.java View File

@@ -4,6 +4,8 @@

package com.itmill.toolkit.data;

import java.io.Serializable;

/**
* <p>
* The <code>Property</code> is a simple data object that contains one typed
@@ -33,7 +35,7 @@ package com.itmill.toolkit.data;
* @VERSION@
* @since 3.0
*/
public interface Property {
public interface Property extends Serializable {

/**
* Gets the value stored in the Property. The returned object is compatible
@@ -91,7 +93,7 @@ public interface Property {
*
* @return type of the Property
*/
public Class getType();
public Class<?> getType();

/**
* Tests if the Property is in read-only mode. In read-only mode calls to
@@ -124,13 +126,9 @@ public interface Property {
* @VERSION@
* @since 3.0
*/
@SuppressWarnings("serial")
public class ReadOnlyException extends RuntimeException {

/**
* Serial generated by eclipse.
*/
private static final long serialVersionUID = 3257571702287119410L;

/**
* Constructs a new <code>ReadOnlyException</code> without a detail
* message.
@@ -160,13 +158,9 @@ public interface Property {
* @VERSION@
* @since 3.0
*/
@SuppressWarnings("serial")
public class ConversionException extends RuntimeException {

/**
* Serial generated by eclipse.
*/
private static final long serialVersionUID = 3257571706666366008L;

/**
* Constructs a new <code>ConversionException</code> without a detail
* message.
@@ -206,7 +200,7 @@ public interface Property {
* @VERSION@
* @since 3.0
*/
public interface Viewer {
public interface Viewer extends Serializable {

/**
* Sets the Property that serves as the data source of the viewer.
@@ -240,7 +234,7 @@ public interface Property {
* @VERSION@
* @since 3.0
*/
public interface Editor extends Property.Viewer {
public interface Editor extends Property.Viewer, Serializable {

}

@@ -255,7 +249,7 @@ public interface Property {
* @VERSION@
* @since 3.0
*/
public interface ValueChangeEvent {
public interface ValueChangeEvent extends Serializable {

/**
* Retrieves the Property that has been modified.
@@ -274,7 +268,7 @@ public interface Property {
* @VERSION@
* @since 3.0
*/
public interface ValueChangeListener {
public interface ValueChangeListener extends Serializable {

/**
* Notifies this listener that the Property's value has changed.
@@ -304,7 +298,7 @@ public interface Property {
* @VERSION@
* @since 3.0
*/
public interface ValueChangeNotifier {
public interface ValueChangeNotifier extends Serializable {

/**
* Registers a new value change listener for this Property.
@@ -334,7 +328,7 @@ public interface Property {
* @VERSION@
* @since 3.0
*/
public interface ReadOnlyStatusChangeEvent {
public interface ReadOnlyStatusChangeEvent extends Serializable {

/**
* Property whose read-only state has changed.
@@ -353,7 +347,7 @@ public interface Property {
* @VERSION@
* @since 3.0
*/
public interface ReadOnlyStatusChangeListener {
public interface ReadOnlyStatusChangeListener extends Serializable {

/**
* Notifies this listener that a Property's read-only status has
@@ -385,7 +379,7 @@ public interface Property {
* @VERSION@
* @since 3.0
*/
public interface ReadOnlyStatusChangeNotifier {
public interface ReadOnlyStatusChangeNotifier extends Serializable {

/**
* Registers a new read-only status change listener for this Property.

+ 3
- 2
src/com/itmill/toolkit/data/Validatable.java View File

@@ -4,6 +4,7 @@

package com.itmill.toolkit.data;

import java.io.Serializable;
import java.util.Collection;

/**
@@ -19,7 +20,7 @@ import java.util.Collection;
* @since 3.0
* @see com.itmill.toolkit.data.Validator
*/
public interface Validatable {
public interface Validatable extends Serializable {

/**
* <p>
@@ -54,7 +55,7 @@ public interface Validatable {
*
* @return collection of validators or <code>null</code>
*/
public Collection getValidators();
public Collection<?> getValidators();

/**
* <p>

+ 0
- 0
src/com/itmill/toolkit/data/Validator.java View File


Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save