diff options
43 files changed, 34 insertions, 31 deletions
diff --git a/src/com/itmill/toolkit/demo/features/Feature.java b/src/com/itmill/toolkit/demo/features/Feature.java index 5da2c2d2db..6398e83781 100644 --- a/src/com/itmill/toolkit/demo/features/Feature.java +++ b/src/com/itmill/toolkit/demo/features/Feature.java @@ -28,7 +28,6 @@ package com.itmill.toolkit.demo.features; -import com.itmill.toolkit.Application; import com.itmill.toolkit.terminal.ClassResource; import com.itmill.toolkit.terminal.Resource; import com.itmill.toolkit.ui.*; @@ -98,18 +97,23 @@ public abstract class Feature extends CustomComponent { String desc = getDescriptionXHTML(); String title = getTitle(); if (desc != null) { - GridLayout gl = new GridLayout(2, 1); + OrderedLayout mainLayout = new OrderedLayout(OrderedLayout.ORIENTATION_VERTICAL); + OrderedLayout layout = new OrderedLayout(OrderedLayout.ORIENTATION_HORIZONTAL); + mainLayout.addComponent(layout); if (getImage() != null) - gl.addComponent(new Embedded("", new ClassResource(getImage(), + layout.addComponent(new Embedded("", new ClassResource(getImage(), this.getApplication()))); String label = ""; - if (title != null) - label += "<h2>" + title + "</h2>"; label += desc; if (propsReminder) label += PROP_REMINDER_TEXT; - gl.addComponent(new Label(label, Label.CONTENT_XHTML)); - ts.addTab(gl, "Description", null); + if (title != null) { + layout.addComponent(new Label("<h3>" + title + "</h3>", + Label.CONTENT_XHTML)); + } + mainLayout.addComponent(new Label(label, Label.CONTENT_XHTML)); + + ts.addTab(mainLayout, "Description", null); } // Javadoc tab diff --git a/src/com/itmill/toolkit/demo/features/FeatureButton.java b/src/com/itmill/toolkit/demo/features/FeatureButton.java index 502a4d9272..15e2865d04 100644 --- a/src/com/itmill/toolkit/demo/features/FeatureButton.java +++ b/src/com/itmill/toolkit/demo/features/FeatureButton.java @@ -77,7 +77,7 @@ public class FeatureButton extends Feature { } protected String getImage() { - return "button.jpg"; + return "icon_demo.png"; } protected String getTitle() { diff --git a/src/com/itmill/toolkit/demo/features/FeatureContainers.java b/src/com/itmill/toolkit/demo/features/FeatureContainers.java index 5b3f5fe134..af71a56286 100644 --- a/src/com/itmill/toolkit/demo/features/FeatureContainers.java +++ b/src/com/itmill/toolkit/demo/features/FeatureContainers.java @@ -52,7 +52,7 @@ public class FeatureContainers extends Feature { + "hierarchically. Those ordering models provide basis for " + "Table, Tree and Select UI components. As with other data " + "models, the containers support events for notifying about the " - + "changes." + + "chaembedded.jpgnges." + "<br /><br />Set of utilities for converting between container models by " + "adding external indexing or hierarchy into existing containers. " + "In memory containers implementing indexed and hierarchical " diff --git a/src/com/itmill/toolkit/demo/features/FeatureDateField.java b/src/com/itmill/toolkit/demo/features/FeatureDateField.java index 570b2c370b..5aa2eadf18 100644 --- a/src/com/itmill/toolkit/demo/features/FeatureDateField.java +++ b/src/com/itmill/toolkit/demo/features/FeatureDateField.java @@ -116,7 +116,7 @@ public class FeatureDateField extends Feature { } protected String getImage() { - return "datefield.jpg"; + return "icon_demo.png"; } protected String getTitle() { diff --git a/src/com/itmill/toolkit/demo/features/FeatureEmbedded.java b/src/com/itmill/toolkit/demo/features/FeatureEmbedded.java index e63792f2cd..4983f421e4 100644 --- a/src/com/itmill/toolkit/demo/features/FeatureEmbedded.java +++ b/src/com/itmill/toolkit/demo/features/FeatureEmbedded.java @@ -105,7 +105,7 @@ public class FeatureEmbedded extends Feature { } protected String getImage() { - return "embedded.jpg"; + return "icon_demo.png"; } protected String getTitle() { diff --git a/src/com/itmill/toolkit/demo/features/FeatureForm.java b/src/com/itmill/toolkit/demo/features/FeatureForm.java index 488b9e9fcb..52bdc589da 100644 --- a/src/com/itmill/toolkit/demo/features/FeatureForm.java +++ b/src/com/itmill/toolkit/demo/features/FeatureForm.java @@ -185,7 +185,7 @@ public class FeatureForm extends Feature implements } protected String getImage() { - return "form.jpg"; + return "icon_demo.png"; } } diff --git a/src/com/itmill/toolkit/demo/features/FeatureFrameWindow.java b/src/com/itmill/toolkit/demo/features/FeatureFrameWindow.java index 51e430f084..c68235c36e 100644 --- a/src/com/itmill/toolkit/demo/features/FeatureFrameWindow.java +++ b/src/com/itmill/toolkit/demo/features/FeatureFrameWindow.java @@ -89,7 +89,7 @@ public class FeatureFrameWindow extends Feature implements Button.ClickListener } protected String getImage() { - return "framewindow.jpg"; + return "icon_demo.png"; } protected String getTitle() { diff --git a/src/com/itmill/toolkit/demo/features/FeatureGridLayout.java b/src/com/itmill/toolkit/demo/features/FeatureGridLayout.java index 99926dba4e..3ef95bd711 100644 --- a/src/com/itmill/toolkit/demo/features/FeatureGridLayout.java +++ b/src/com/itmill/toolkit/demo/features/FeatureGridLayout.java @@ -84,7 +84,7 @@ public class FeatureGridLayout extends Feature { } protected String getImage() { - return "gridlayout.jpg"; + return "icon_demo.png"; } protected String getTitle() { diff --git a/src/com/itmill/toolkit/demo/features/FeatureItems.java b/src/com/itmill/toolkit/demo/features/FeatureItems.java index 0ee458debc..c3d604f48d 100644 --- a/src/com/itmill/toolkit/demo/features/FeatureItems.java +++ b/src/com/itmill/toolkit/demo/features/FeatureItems.java @@ -96,7 +96,7 @@ public class FeatureItems extends Feature { } protected String getImage() { - return "items.jpg"; + return "icon_demo.png"; } protected String getTitle() { diff --git a/src/com/itmill/toolkit/demo/features/FeatureLabel.java b/src/com/itmill/toolkit/demo/features/FeatureLabel.java index cac095c6f6..742e90e45c 100644 --- a/src/com/itmill/toolkit/demo/features/FeatureLabel.java +++ b/src/com/itmill/toolkit/demo/features/FeatureLabel.java @@ -85,7 +85,7 @@ public class FeatureLabel extends Feature { } protected String getImage() { - return "label.jpg"; + return "icon_demo.png"; } protected String getTitle() { diff --git a/src/com/itmill/toolkit/demo/features/FeatureLink.java b/src/com/itmill/toolkit/demo/features/FeatureLink.java index 372a7cb230..350ec604a6 100644 --- a/src/com/itmill/toolkit/demo/features/FeatureLink.java +++ b/src/com/itmill/toolkit/demo/features/FeatureLink.java @@ -75,7 +75,7 @@ public class FeatureLink extends Feature { } protected String getImage() { - return "link.jpg"; + return "icon_demo.png"; } protected String getTitle() { diff --git a/src/com/itmill/toolkit/demo/features/FeatureOrderedLayout.java b/src/com/itmill/toolkit/demo/features/FeatureOrderedLayout.java index a432e3a27b..c36e459261 100644 --- a/src/com/itmill/toolkit/demo/features/FeatureOrderedLayout.java +++ b/src/com/itmill/toolkit/demo/features/FeatureOrderedLayout.java @@ -85,7 +85,7 @@ public class FeatureOrderedLayout extends Feature { } protected String getImage() { - return "orderedlayout.jpg"; + return "icon_demo.png"; } protected String getTitle() { diff --git a/src/com/itmill/toolkit/demo/features/FeaturePanel.java b/src/com/itmill/toolkit/demo/features/FeaturePanel.java index f65829dcdb..1213a04e41 100644 --- a/src/com/itmill/toolkit/demo/features/FeaturePanel.java +++ b/src/com/itmill/toolkit/demo/features/FeaturePanel.java @@ -77,7 +77,7 @@ public class FeaturePanel extends Feature { } protected String getImage() { - return "panel.jpg"; + return "icon_demo.png"; } protected String getTitle() { diff --git a/src/com/itmill/toolkit/demo/features/FeatureSelect.java b/src/com/itmill/toolkit/demo/features/FeatureSelect.java index f0f95ff909..963eee11b2 100644 --- a/src/com/itmill/toolkit/demo/features/FeatureSelect.java +++ b/src/com/itmill/toolkit/demo/features/FeatureSelect.java @@ -88,7 +88,7 @@ public class FeatureSelect extends Feature { + "allows for multiple item selection, this is usually represented as either a " + "listbox of selectable items or as a group of checkboxes." + "<br/><br/>" - + "Data source can be associated both with selected item and the list of selections. " + + "Data soutree.jpgrce can be associated both with selected item and the list of selections. " + "This way you can easily present a selection based on items specified elsewhere in application. " + "<br/><br/>" + "On the demo tab you can try out how the different properties affect the" @@ -96,7 +96,7 @@ public class FeatureSelect extends Feature { } protected String getImage() { - return "select.jpg"; + return "icon_demo.png"; } protected String getTitle() { diff --git a/src/com/itmill/toolkit/demo/features/FeatureTabSheet.java b/src/com/itmill/toolkit/demo/features/FeatureTabSheet.java index 524e4be03a..6d30a1a80b 100644 --- a/src/com/itmill/toolkit/demo/features/FeatureTabSheet.java +++ b/src/com/itmill/toolkit/demo/features/FeatureTabSheet.java @@ -75,13 +75,13 @@ public class FeatureTabSheet extends Feature { protected String getDescriptionXHTML() { return "A multicomponent container with tabs for switching between them.<br/>" - + "In the normal case, one would place a layout component on each tab.<br/><br />" + + "In the ntable.jpgormal case, one would place a layout component on each tab.<br/><br />" + "On the demo tab you can try out how the different properties affect " + "the presentation of the component."; } protected String getImage() { - return "tabsheet.jpg"; + return "icon_demo.png"; } protected String getTitle() { diff --git a/src/com/itmill/toolkit/demo/features/FeatureTable.java b/src/com/itmill/toolkit/demo/features/FeatureTable.java index e2cbd2f922..2e58f70d28 100644 --- a/src/com/itmill/toolkit/demo/features/FeatureTable.java +++ b/src/com/itmill/toolkit/demo/features/FeatureTable.java @@ -181,7 +181,7 @@ public class FeatureTable extends Feature implements Action.Handler { } protected String getImage() { - return "table.jpg"; + return "icon_demo.png"; } protected String getTitle() { diff --git a/src/com/itmill/toolkit/demo/features/FeatureTextField.java b/src/com/itmill/toolkit/demo/features/FeatureTextField.java index 342dda1f77..512a4e87d9 100644 --- a/src/com/itmill/toolkit/demo/features/FeatureTextField.java +++ b/src/com/itmill/toolkit/demo/features/FeatureTextField.java @@ -79,7 +79,7 @@ public class FeatureTextField extends Feature { } protected String getImage() { - return "textfield.gif"; + return "icon_demo.png"; } protected String getTitle() { diff --git a/src/com/itmill/toolkit/demo/features/FeatureTree.java b/src/com/itmill/toolkit/demo/features/FeatureTree.java index 8821749444..b92ebfada9 100644 --- a/src/com/itmill/toolkit/demo/features/FeatureTree.java +++ b/src/com/itmill/toolkit/demo/features/FeatureTree.java @@ -158,7 +158,7 @@ public class FeatureTree extends Feature implements Action.Handler { } protected String getImage() { - return "tree.jpg"; + return "icon_demo.png"; } protected String getTitle() { diff --git a/src/com/itmill/toolkit/demo/features/FeatureUpload.java b/src/com/itmill/toolkit/demo/features/FeatureUpload.java index 452df31c77..371509ad55 100644 --- a/src/com/itmill/toolkit/demo/features/FeatureUpload.java +++ b/src/com/itmill/toolkit/demo/features/FeatureUpload.java @@ -88,7 +88,7 @@ public class FeatureUpload extends Feature implements Upload.FinishedListener { } protected String getImage() { - return "filetransfer.jpg"; + return "icon_demo.png"; } protected String getTitle() { diff --git a/src/com/itmill/toolkit/demo/features/FeatureWindow.java b/src/com/itmill/toolkit/demo/features/FeatureWindow.java index db96a7dba4..7e2a3471f7 100644 --- a/src/com/itmill/toolkit/demo/features/FeatureWindow.java +++ b/src/com/itmill/toolkit/demo/features/FeatureWindow.java @@ -95,7 +95,7 @@ public class FeatureWindow extends Feature { } protected String getImage() { - return "window.jpg"; + return "icon_demo.png"; } protected String getTitle() { diff --git a/src/com/itmill/toolkit/demo/features/IntroWelcome.java b/src/com/itmill/toolkit/demo/features/IntroWelcome.java index 3f2fa826d8..d8f2cc56f4 100644 --- a/src/com/itmill/toolkit/demo/features/IntroWelcome.java +++ b/src/com/itmill/toolkit/demo/features/IntroWelcome.java @@ -103,7 +103,6 @@ public class IntroWelcome extends Feature { protected String getExampleSrc() { return "" - + "// Hello World example application\n\n" + "package com.itmill.toolkit.demo;\n" + "import com.itmill.toolkit.ui.*;\n" + "public class HelloWorld extends com.itmill.toolkit.Application {\n" @@ -122,11 +121,11 @@ public class IntroWelcome extends Feature { } protected String getImage() { - return null; + return "icon_intro.png"; } protected String getTitle() { - return null; + return "Welcome"; } } diff --git a/src/com/itmill/toolkit/demo/features/button.jpg b/src/com/itmill/toolkit/demo/features/button.jpg Binary files differdeleted file mode 100644 index c7e4bf8e3c..0000000000 --- a/src/com/itmill/toolkit/demo/features/button.jpg +++ /dev/null diff --git a/src/com/itmill/toolkit/demo/features/datefield.jpg b/src/com/itmill/toolkit/demo/features/datefield.jpg Binary files differdeleted file mode 100644 index c035175541..0000000000 --- a/src/com/itmill/toolkit/demo/features/datefield.jpg +++ /dev/null diff --git a/src/com/itmill/toolkit/demo/features/embedded.jpg b/src/com/itmill/toolkit/demo/features/embedded.jpg Binary files differdeleted file mode 100644 index c428192c44..0000000000 --- a/src/com/itmill/toolkit/demo/features/embedded.jpg +++ /dev/null diff --git a/src/com/itmill/toolkit/demo/features/filetransfer.jpg b/src/com/itmill/toolkit/demo/features/filetransfer.jpg Binary files differdeleted file mode 100644 index 4c2ceb0008..0000000000 --- a/src/com/itmill/toolkit/demo/features/filetransfer.jpg +++ /dev/null diff --git a/src/com/itmill/toolkit/demo/features/form.jpg b/src/com/itmill/toolkit/demo/features/form.jpg Binary files differdeleted file mode 100644 index d9993bdbe6..0000000000 --- a/src/com/itmill/toolkit/demo/features/form.jpg +++ /dev/null diff --git a/src/com/itmill/toolkit/demo/features/framewindow.jpg b/src/com/itmill/toolkit/demo/features/framewindow.jpg Binary files differdeleted file mode 100644 index 725df76ee3..0000000000 --- a/src/com/itmill/toolkit/demo/features/framewindow.jpg +++ /dev/null diff --git a/src/com/itmill/toolkit/demo/features/gridlayout.jpg b/src/com/itmill/toolkit/demo/features/gridlayout.jpg Binary files differdeleted file mode 100644 index 63f06c3281..0000000000 --- a/src/com/itmill/toolkit/demo/features/gridlayout.jpg +++ /dev/null diff --git a/src/com/itmill/toolkit/demo/features/icon_demo.png b/src/com/itmill/toolkit/demo/features/icon_demo.png Binary files differnew file mode 100644 index 0000000000..6a5c295d6a --- /dev/null +++ b/src/com/itmill/toolkit/demo/features/icon_demo.png diff --git a/src/com/itmill/toolkit/demo/features/icon_intro.png b/src/com/itmill/toolkit/demo/features/icon_intro.png Binary files differnew file mode 100644 index 0000000000..032712985c --- /dev/null +++ b/src/com/itmill/toolkit/demo/features/icon_intro.png diff --git a/src/com/itmill/toolkit/demo/features/items.jpg b/src/com/itmill/toolkit/demo/features/items.jpg Binary files differdeleted file mode 100644 index fb5a38d55e..0000000000 --- a/src/com/itmill/toolkit/demo/features/items.jpg +++ /dev/null diff --git a/src/com/itmill/toolkit/demo/features/label.jpg b/src/com/itmill/toolkit/demo/features/label.jpg Binary files differdeleted file mode 100644 index 402dc4d4c5..0000000000 --- a/src/com/itmill/toolkit/demo/features/label.jpg +++ /dev/null diff --git a/src/com/itmill/toolkit/demo/features/link.jpg b/src/com/itmill/toolkit/demo/features/link.jpg Binary files differdeleted file mode 100644 index 6aaa06e5d4..0000000000 --- a/src/com/itmill/toolkit/demo/features/link.jpg +++ /dev/null diff --git a/src/com/itmill/toolkit/demo/features/orderedlayout.jpg b/src/com/itmill/toolkit/demo/features/orderedlayout.jpg Binary files differdeleted file mode 100644 index 1724c7cb62..0000000000 --- a/src/com/itmill/toolkit/demo/features/orderedlayout.jpg +++ /dev/null diff --git a/src/com/itmill/toolkit/demo/features/panel.jpg b/src/com/itmill/toolkit/demo/features/panel.jpg Binary files differdeleted file mode 100644 index dd06508b30..0000000000 --- a/src/com/itmill/toolkit/demo/features/panel.jpg +++ /dev/null diff --git a/src/com/itmill/toolkit/demo/features/parameters.jpg b/src/com/itmill/toolkit/demo/features/parameters.jpg Binary files differdeleted file mode 100644 index f4e5fd577c..0000000000 --- a/src/com/itmill/toolkit/demo/features/parameters.jpg +++ /dev/null diff --git a/src/com/itmill/toolkit/demo/features/select.jpg b/src/com/itmill/toolkit/demo/features/select.jpg Binary files differdeleted file mode 100644 index 1ce629fb68..0000000000 --- a/src/com/itmill/toolkit/demo/features/select.jpg +++ /dev/null diff --git a/src/com/itmill/toolkit/demo/features/serverevents.jpg b/src/com/itmill/toolkit/demo/features/serverevents.jpg Binary files differdeleted file mode 100644 index 36d88a8b35..0000000000 --- a/src/com/itmill/toolkit/demo/features/serverevents.jpg +++ /dev/null diff --git a/src/com/itmill/toolkit/demo/features/table.jpg b/src/com/itmill/toolkit/demo/features/table.jpg Binary files differdeleted file mode 100644 index fe0f30dbf4..0000000000 --- a/src/com/itmill/toolkit/demo/features/table.jpg +++ /dev/null diff --git a/src/com/itmill/toolkit/demo/features/tabsheet.jpg b/src/com/itmill/toolkit/demo/features/tabsheet.jpg Binary files differdeleted file mode 100644 index 402b2a464a..0000000000 --- a/src/com/itmill/toolkit/demo/features/tabsheet.jpg +++ /dev/null diff --git a/src/com/itmill/toolkit/demo/features/textfield.gif b/src/com/itmill/toolkit/demo/features/textfield.gif Binary files differdeleted file mode 100644 index 58b6e57e32..0000000000 --- a/src/com/itmill/toolkit/demo/features/textfield.gif +++ /dev/null diff --git a/src/com/itmill/toolkit/demo/features/tree.jpg b/src/com/itmill/toolkit/demo/features/tree.jpg Binary files differdeleted file mode 100644 index d563b90eb4..0000000000 --- a/src/com/itmill/toolkit/demo/features/tree.jpg +++ /dev/null diff --git a/src/com/itmill/toolkit/demo/features/window.jpg b/src/com/itmill/toolkit/demo/features/window.jpg Binary files differdeleted file mode 100644 index c297341523..0000000000 --- a/src/com/itmill/toolkit/demo/features/window.jpg +++ /dev/null |
