diff options
15 files changed, 243 insertions, 90 deletions
diff --git a/WebContent/VAADIN/themes/demo/book-covers/comics.png b/WebContent/VAADIN/themes/demo/book-covers/comics.png Binary files differnew file mode 100644 index 0000000000..98bfb368d9 --- /dev/null +++ b/WebContent/VAADIN/themes/demo/book-covers/comics.png diff --git a/WebContent/VAADIN/themes/demo/book-covers/designing-interactions.png b/WebContent/VAADIN/themes/demo/book-covers/designing-interactions.png Binary files differnew file mode 100644 index 0000000000..7c8f97183d --- /dev/null +++ b/WebContent/VAADIN/themes/demo/book-covers/designing-interactions.png diff --git a/WebContent/VAADIN/themes/demo/book-covers/designing-interfaces.png b/WebContent/VAADIN/themes/demo/book-covers/designing-interfaces.png Binary files differnew file mode 100644 index 0000000000..471f6711d9 --- /dev/null +++ b/WebContent/VAADIN/themes/demo/book-covers/designing-interfaces.png diff --git a/WebContent/VAADIN/themes/demo/book-covers/gdtnb.png b/WebContent/VAADIN/themes/demo/book-covers/gdtnb.png Binary files differnew file mode 100644 index 0000000000..48cddc5789 --- /dev/null +++ b/WebContent/VAADIN/themes/demo/book-covers/gdtnb.png diff --git a/WebContent/VAADIN/themes/demo/book-covers/new-mind.png b/WebContent/VAADIN/themes/demo/book-covers/new-mind.png Binary files differnew file mode 100644 index 0000000000..d23fe11b47 --- /dev/null +++ b/WebContent/VAADIN/themes/demo/book-covers/new-mind.png diff --git a/WebContent/VAADIN/themes/demo/book-covers/new-type.png b/WebContent/VAADIN/themes/demo/book-covers/new-type.png Binary files differnew file mode 100644 index 0000000000..9ad7ffa07b --- /dev/null +++ b/WebContent/VAADIN/themes/demo/book-covers/new-type.png diff --git a/WebContent/VAADIN/themes/demo/book-covers/rogue-leaders.png b/WebContent/VAADIN/themes/demo/book-covers/rogue-leaders.png Binary files differnew file mode 100644 index 0000000000..9468f7e80f --- /dev/null +++ b/WebContent/VAADIN/themes/demo/book-covers/rogue-leaders.png diff --git a/WebContent/VAADIN/themes/demo/book-covers/simplicity.png b/WebContent/VAADIN/themes/demo/book-covers/simplicity.png Binary files differnew file mode 100644 index 0000000000..cdfb79aa42 --- /dev/null +++ b/WebContent/VAADIN/themes/demo/book-covers/simplicity.png diff --git a/WebContent/VAADIN/themes/demo/book-covers/tcss.png b/WebContent/VAADIN/themes/demo/book-covers/tcss.png Binary files differnew file mode 100644 index 0000000000..d40cf1bb00 --- /dev/null +++ b/WebContent/VAADIN/themes/demo/book-covers/tcss.png diff --git a/WebContent/VAADIN/themes/demo/book-covers/upod.png b/WebContent/VAADIN/themes/demo/book-covers/upod.png Binary files differnew file mode 100644 index 0000000000..5da43f2525 --- /dev/null +++ b/WebContent/VAADIN/themes/demo/book-covers/upod.png diff --git a/WebContent/VAADIN/themes/demo/book-covers/wfd.png b/WebContent/VAADIN/themes/demo/book-covers/wfd.png Binary files differnew file mode 100644 index 0000000000..3bcc62cb39 --- /dev/null +++ b/WebContent/VAADIN/themes/demo/book-covers/wfd.png diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml index dfdedf5dce..6b6b681525 100644 --- a/WebContent/WEB-INF/web.xml +++ b/WebContent/WEB-INF/web.xml @@ -24,32 +24,32 @@ <param-name>resourceCacheTime</param-name>
<param-value>3600</param-value>
</context-param>
- +
<servlet>
<servlet-name>VaadinApplicationRunner</servlet-name>
<servlet-class>com.vaadin.terminal.gwt.server.ApplicationRunnerServlet</servlet-class>
<init-param><param-name>defaultPackages</param-name>
<param-value>com.vaadin.tests,com.vaadin.demo,com.vaadin.tests.tickets,com.vaadin.tests.components,com.vaadin.tests.components.layouts,com.vaadin.tests.components.panel,com.vaadin.tests.components.combobox,com.vaadin.tests.components.popupview,com.vaadin.tests.components.datefield,com.vaadin.tests.components.richtextarea,com.vaadin.tests.components.absolutelayout,com.vaadin.tests.components.embedded,com.vaadin.tests.components.splitpanel,com.vaadin.tests.components.abstractfield,com.vaadin.tests.components.form,com.vaadin.tests.components.table,com.vaadin.tests.components.accordion,com.vaadin.tests.components.label,com.vaadin.tests.components.tabsheet,com.vaadin.tests.components.beanitemcontainer,com.vaadin.tests.components.link,com.vaadin.tests.components.textfield,com.vaadin.tests.components.button,com.vaadin.tests.components.optiongroup,com.vaadin.tests.components.tree,com.vaadin.tests.components.caption,com.vaadin.tests.components.orderedlayout,com.vaadin.tests.components.window,com.vaadin.tests.dd</param-value></init-param>
</servlet>
- - - <servlet> - <servlet-name>RobustnessSimple</servlet-name> - <servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class> - <init-param> - <param-name>application</param-name> - <param-value>com.vaadin.tests.robustness.RobustnessSimple</param-value> - </init-param> - </servlet> - - - <servlet> - <servlet-name>DemoTestBench</servlet-name> - <servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class> - <init-param> - <param-name>application</param-name> - <param-value>com.vaadin.demo.testbench.TestBench</param-value> - </init-param> +
+
+ <servlet>
+ <servlet-name>RobustnessSimple</servlet-name>
+ <servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
+ <init-param>
+ <param-name>application</param-name>
+ <param-value>com.vaadin.tests.robustness.RobustnessSimple</param-value>
+ </init-param>
+ </servlet>
+
+
+ <servlet>
+ <servlet-name>DemoTestBench</servlet-name>
+ <servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
+ <init-param>
+ <param-name>application</param-name>
+ <param-value>com.vaadin.demo.testbench.TestBench</param-value>
+ </init-param>
</servlet>
<servlet>
<servlet-name>TestForNativeWindowing</servlet-name>
@@ -166,6 +166,15 @@ </servlet>
<servlet>
+ <servlet-name>RunoTheme</servlet-name>
+ <servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
+ <init-param>
+ <param-name>application</param-name>
+ <param-value>com.vaadin.demo.themes.RunoTheme</param-value>
+ </init-param>
+ </servlet>
+
+ <servlet>
<servlet-name>FeaturesApplication</servlet-name>
<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
<init-param>
@@ -255,44 +264,44 @@ </init-param>
</servlet>
- <servlet> - <servlet-name>ColorPickerApplication</servlet-name> - <servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class> - <init-param> - <param-name>application</param-name> - <param-value>com.vaadin.demo.colorpicker.ColorPickerApplication</param-value> - </init-param> + <servlet>
+ <servlet-name>ColorPickerApplication</servlet-name>
+ <servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
+ <init-param>
+ <param-name>application</param-name>
+ <param-value>com.vaadin.demo.colorpicker.ColorPickerApplication</param-value>
+ </init-param>
<init-param>
<param-name>widgetset</param-name>
<param-value>com.vaadin.demo.colorpicker.gwt.ColorPickerWidgetSet</param-value>
</init-param>
</servlet>
- <servlet> - <servlet-name>BookTestServlet</servlet-name> - <servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class> - <init-param> - <param-name>application</param-name> - <param-value>com.vaadin.tests.book.BookTestApplication</param-value> - </init-param> - </servlet> - - <servlet> - <servlet-name>WindowTestServlet</servlet-name> - <servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class> - <init-param> - <param-name>application</param-name> - <param-value>com.vaadin.tests.book.WindowTestApplication</param-value> - </init-param> - </servlet> - - <servlet> - <servlet-name>ChatServlet</servlet-name> - <servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class> - <init-param> - <param-name>application</param-name> - <param-value>com.vaadin.tests.book.ChatApplication</param-value> - </init-param> + <servlet>
+ <servlet-name>BookTestServlet</servlet-name>
+ <servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
+ <init-param>
+ <param-name>application</param-name>
+ <param-value>com.vaadin.tests.book.BookTestApplication</param-value>
+ </init-param>
+ </servlet>
+
+ <servlet>
+ <servlet-name>WindowTestServlet</servlet-name>
+ <servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
+ <init-param>
+ <param-name>application</param-name>
+ <param-value>com.vaadin.tests.book.WindowTestApplication</param-value>
+ </init-param>
+ </servlet>
+
+ <servlet>
+ <servlet-name>ChatServlet</servlet-name>
+ <servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
+ <init-param>
+ <param-name>application</param-name>
+ <param-value>com.vaadin.tests.book.ChatApplication</param-value>
+ </init-param>
</servlet>
<servlet>
@@ -302,16 +311,16 @@ <param-name>application</param-name>
<param-value>com.vaadin.tests.appengine.GAESyncTest</param-value>
</init-param>
- </servlet> - - <servlet-mapping> - <servlet-name>VaadinApplicationRunner</servlet-name> - <url-pattern>/run/*</url-pattern> + </servlet>
+
+ <servlet-mapping>
+ <servlet-name>VaadinApplicationRunner</servlet-name>
+ <url-pattern>/run/*</url-pattern>
</servlet-mapping>
- <servlet-mapping> - <servlet-name>DemoTestBench</servlet-name> - <url-pattern>/DemoTestBench/*</url-pattern> + <servlet-mapping>
+ <servlet-name>DemoTestBench</servlet-name>
+ <url-pattern>/DemoTestBench/*</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>TestForNativeWindowing</servlet-name>
@@ -319,11 +328,11 @@ </servlet-mapping>
- <servlet-mapping> - <servlet-name>RobustnessSimple</servlet-name> - <url-pattern>/RobustnessSimple/*</url-pattern> - </servlet-mapping> - + <servlet-mapping>
+ <servlet-name>RobustnessSimple</servlet-name>
+ <url-pattern>/RobustnessSimple/*</url-pattern>
+ </servlet-mapping>
+
<servlet-mapping>
<servlet-name>TestSplitPanel</servlet-name>
<url-pattern>/TestSplitPanel/*</url-pattern>
@@ -337,12 +346,12 @@ <servlet-mapping>
<servlet-name>TestBench</servlet-name>
<url-pattern>/TestBench/*</url-pattern>
- </servlet-mapping> + </servlet-mapping>
<servlet-mapping>
<servlet-name>TestBench</servlet-name>
<url-pattern>/t/*</url-pattern>
- </servlet-mapping> - + </servlet-mapping>
+
<servlet-mapping>
<servlet-name>CustomLayoutDemo</servlet-name>
<url-pattern>/CustomLayoutDemo/*</url-pattern>
@@ -412,23 +421,23 @@ <!-- portlet -->
</servlet-mapping>
- <servlet-mapping> - <servlet-name>ColorPickerApplication</servlet-name> - <url-pattern>/colorpicker/*</url-pattern> + <servlet-mapping>
+ <servlet-name>ColorPickerApplication</servlet-name>
+ <url-pattern>/colorpicker/*</url-pattern>
</servlet-mapping>
- <servlet-mapping> - <servlet-name>BookTestServlet</servlet-name> - <url-pattern>/book/*</url-pattern> + <servlet-mapping>
+ <servlet-name>BookTestServlet</servlet-name>
+ <url-pattern>/book/*</url-pattern>
</servlet-mapping>
- <servlet-mapping> - <servlet-name>WindowTestServlet</servlet-name> - <url-pattern>/windowtest/*</url-pattern> - </servlet-mapping> - - <servlet-mapping> - <servlet-name>ChatServlet</servlet-name> - <url-pattern>/chat/*</url-pattern> - <!-- portlet --> + <servlet-mapping>
+ <servlet-name>WindowTestServlet</servlet-name>
+ <url-pattern>/windowtest/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>ChatServlet</servlet-name>
+ <url-pattern>/chat/*</url-pattern>
+ <!-- portlet -->
</servlet-mapping>
<servlet-mapping>
@@ -439,8 +448,8 @@ <servlet-mapping>
<servlet-name>GAESyncTest</servlet-name>
<url-pattern>/gaesynctest/*</url-pattern>
- </servlet-mapping> - + </servlet-mapping>
+
<servlet-mapping>
<servlet-name>AddressBook</servlet-name>
<url-pattern>/AddressBook/*</url-pattern>
@@ -450,6 +459,11 @@ <servlet-name>ReindeerThemeStyles</servlet-name>
<url-pattern>/ReindeerTheme/*</url-pattern>
</servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>RunoTheme</servlet-name>
+ <url-pattern>/RunoTheme/*</url-pattern>
+ </servlet-mapping>
<welcome-file-list>
<welcome-file>index.jsp</welcome-file>
diff --git a/WebContent/index.html b/WebContent/index.html index f1fd714e75..68589abe17 100644 --- a/WebContent/index.html +++ b/WebContent/index.html @@ -150,11 +150,10 @@ </a> </div> <div class="col2"> - <a class="thumb" href="demo/img/runo.png" rel="zoombox" title="Runo theme mockup (actual implementation differs in some parts)"> + <a class="thumb" href="RunoTheme"> <img src="demo/img/icons/runo.png" /> <span><strong>Runo</strong>Clean and easy to extend</span> </a> - <span class="thumb-rel">(mockup only, demo coming soon)</span> </div> </div> diff --git a/src/com/vaadin/ui/themes/Reindeer.java b/src/com/vaadin/ui/themes/Reindeer.java index 33a91069a3..2febbb9305 100644 --- a/src/com/vaadin/ui/themes/Reindeer.java +++ b/src/com/vaadin/ui/themes/Reindeer.java @@ -48,9 +48,9 @@ public class Reindeer extends BaseTheme { **************************************************************************/ /** - * Default action style for buttons (the button that gets activated when - * user presses 'enter' in a form). Use sparingly, only one default button - * per screen should be visible. + * Default action style for buttons (the button that should get activated + * when the user presses 'enter' in a form). Use sparingly, only one default + * button per view should be visible. */ public static final String BUTTON_DEFAULT = "primary"; diff --git a/src/com/vaadin/ui/themes/Runo.java b/src/com/vaadin/ui/themes/Runo.java index 29cc7089a6..88011addc4 100644 --- a/src/com/vaadin/ui/themes/Runo.java +++ b/src/com/vaadin/ui/themes/Runo.java @@ -7,6 +7,10 @@ public class Runo extends BaseTheme { public static final String THEME_NAME = "Runo"; + public static String themeName() { + return THEME_NAME.toLowerCase(); + } + /*************************************************************************** * * Button styles @@ -18,6 +22,18 @@ public class Runo extends BaseTheme { */ public static final String BUTTON_SMALL = "small"; + /** + * Big sized button, use to gather much attention for some particular action + */ + public static final String BUTTON_BIG = "big"; + + /** + * Default action style for buttons (the button that should get activated + * when the user presses 'enter' in a form). Use sparingly, only one default + * button per view should be visible. + */ + public static final String BUTTON_DEFAULT = "default"; + /*************************************************************************** * * Panel styles @@ -40,4 +56,128 @@ public class Runo extends BaseTheme { */ public static final String TABSHEET_SMALL = "light"; + /*************************************************************************** + * + * SplitPanel styles + * + **************************************************************************/ + + /** + * Reduces the width/height of the split handle. Useful when you don't want + * the split handle to touch the sides of the containing layout. + */ + public static final String SPLITPANEL_REDUCED = "rounded"; + + /** + * Reduces the visual size of the split handle to one pixel (the active drag + * size is still larger). + */ + public static final String SPLITPANEL_SMALL = "small"; + + /*************************************************************************** + * + * Label styles + * + **************************************************************************/ + + /** + * Largest title/header size. Use for main sections in your application. + */ + public static final String LABEL_H1 = "h1"; + + /** + * Similar style as in panel captions. Useful for sub-sections within a + * view. + */ + public static final String LABEL_H2 = "h2"; + + /** + * Small font size. Useful for contextual help texts and similar less + * frequently needed information. Use with modesty, since this style will be + * more harder to read due to its smaller size and contrast. + */ + public static final String LABEL_SMALL = "small"; + + /*************************************************************************** + * + * Layout styles + * + **************************************************************************/ + + /** + * An alternative background color for layouts. Use on top of white + * background (e.g. inside Panels, TabSheets and sub-windows). + */ + public static final String LAYOUT_DARKER = "darker"; + + /** + * Add a drop shadow around the layout and its contained components. + * Produces a rectangular shadow, even if the contained component would have + * a different shape. + * <p> + * Note: does not work in Internet Explorer 6 + */ + public static final String CSSLAYOUT_SHADOW = "box-shadow"; + + /** + * Adds necessary styles to the layout to make it look selectable (i.e. + * clickable). Add a click listener for the layout, and toggle the + * {@link #CSSLAYOUT_SELECTABLE_SELECTED} style for the same layout to make + * it look selected or not. + */ + public static final String CSSLAYOUT_SELECTABLE = "selectable"; + public static final String CSSLAYOUT_SELECTABLE_SELECTED = "selectable-selected"; + + /*************************************************************************** + * + * TextField styles + * + **************************************************************************/ + + /** + * Small sized text field with small font + */ + public static final String TEXTFIELD_SMALL = "small"; + + /*************************************************************************** + * + * Table styles + * + **************************************************************************/ + + /** + * Smaller header and item fonts. + */ + public static final String TABLE_SMALL = "small"; + + /** + * Removes the border and background color from the table. Removes + * alternating row background colors as well. + */ + public static final String TABLE_BORDERLESS = "borderless"; + + /*************************************************************************** + * + * Accordion styles + * + **************************************************************************/ + + /** + * A detached looking accordion, providing space around its captions and + * content. Doesn't necessarily need a Panel or other container to wrap it + * in order to make it look right. + */ + public static final String ACCORDION_LIGHT = "light"; + + /*************************************************************************** + * + * Window styles + * + **************************************************************************/ + + /** + * Smaller header and a darker background color for the window. Useful for + * smaller dialog-like windows. + */ + public static final String WINDOW_DIALOG = "dialog"; } |
