]> source.dussan.org Git - vaadin-framework.git/commitdiff
New Runo theme demo application and Runo theme style constants.
authorJouni Koivuviita <jouni.koivuviita@itmill.com>
Tue, 4 May 2010 13:21:27 +0000 (13:21 +0000)
committerJouni Koivuviita <jouni.koivuviita@itmill.com>
Tue, 4 May 2010 13:21:27 +0000 (13:21 +0000)
svn changeset:13026/svn branch:6.4

15 files changed:
WebContent/VAADIN/themes/demo/book-covers/comics.png [new file with mode: 0644]
WebContent/VAADIN/themes/demo/book-covers/designing-interactions.png [new file with mode: 0644]
WebContent/VAADIN/themes/demo/book-covers/designing-interfaces.png [new file with mode: 0644]
WebContent/VAADIN/themes/demo/book-covers/gdtnb.png [new file with mode: 0644]
WebContent/VAADIN/themes/demo/book-covers/new-mind.png [new file with mode: 0644]
WebContent/VAADIN/themes/demo/book-covers/new-type.png [new file with mode: 0644]
WebContent/VAADIN/themes/demo/book-covers/rogue-leaders.png [new file with mode: 0644]
WebContent/VAADIN/themes/demo/book-covers/simplicity.png [new file with mode: 0644]
WebContent/VAADIN/themes/demo/book-covers/tcss.png [new file with mode: 0644]
WebContent/VAADIN/themes/demo/book-covers/upod.png [new file with mode: 0644]
WebContent/VAADIN/themes/demo/book-covers/wfd.png [new file with mode: 0644]
WebContent/WEB-INF/web.xml
WebContent/index.html
src/com/vaadin/ui/themes/Reindeer.java
src/com/vaadin/ui/themes/Runo.java

diff --git a/WebContent/VAADIN/themes/demo/book-covers/comics.png b/WebContent/VAADIN/themes/demo/book-covers/comics.png
new file mode 100644 (file)
index 0000000..98bfb36
Binary files /dev/null and b/WebContent/VAADIN/themes/demo/book-covers/comics.png differ
diff --git a/WebContent/VAADIN/themes/demo/book-covers/designing-interactions.png b/WebContent/VAADIN/themes/demo/book-covers/designing-interactions.png
new file mode 100644 (file)
index 0000000..7c8f971
Binary files /dev/null and b/WebContent/VAADIN/themes/demo/book-covers/designing-interactions.png differ
diff --git a/WebContent/VAADIN/themes/demo/book-covers/designing-interfaces.png b/WebContent/VAADIN/themes/demo/book-covers/designing-interfaces.png
new file mode 100644 (file)
index 0000000..471f671
Binary files /dev/null and b/WebContent/VAADIN/themes/demo/book-covers/designing-interfaces.png differ
diff --git a/WebContent/VAADIN/themes/demo/book-covers/gdtnb.png b/WebContent/VAADIN/themes/demo/book-covers/gdtnb.png
new file mode 100644 (file)
index 0000000..48cddc5
Binary files /dev/null and b/WebContent/VAADIN/themes/demo/book-covers/gdtnb.png differ
diff --git a/WebContent/VAADIN/themes/demo/book-covers/new-mind.png b/WebContent/VAADIN/themes/demo/book-covers/new-mind.png
new file mode 100644 (file)
index 0000000..d23fe11
Binary files /dev/null and b/WebContent/VAADIN/themes/demo/book-covers/new-mind.png differ
diff --git a/WebContent/VAADIN/themes/demo/book-covers/new-type.png b/WebContent/VAADIN/themes/demo/book-covers/new-type.png
new file mode 100644 (file)
index 0000000..9ad7ffa
Binary files /dev/null and b/WebContent/VAADIN/themes/demo/book-covers/new-type.png differ
diff --git a/WebContent/VAADIN/themes/demo/book-covers/rogue-leaders.png b/WebContent/VAADIN/themes/demo/book-covers/rogue-leaders.png
new file mode 100644 (file)
index 0000000..9468f7e
Binary files /dev/null and b/WebContent/VAADIN/themes/demo/book-covers/rogue-leaders.png differ
diff --git a/WebContent/VAADIN/themes/demo/book-covers/simplicity.png b/WebContent/VAADIN/themes/demo/book-covers/simplicity.png
new file mode 100644 (file)
index 0000000..cdfb79a
Binary files /dev/null and b/WebContent/VAADIN/themes/demo/book-covers/simplicity.png differ
diff --git a/WebContent/VAADIN/themes/demo/book-covers/tcss.png b/WebContent/VAADIN/themes/demo/book-covers/tcss.png
new file mode 100644 (file)
index 0000000..d40cf1b
Binary files /dev/null and b/WebContent/VAADIN/themes/demo/book-covers/tcss.png differ
diff --git a/WebContent/VAADIN/themes/demo/book-covers/upod.png b/WebContent/VAADIN/themes/demo/book-covers/upod.png
new file mode 100644 (file)
index 0000000..5da43f2
Binary files /dev/null and b/WebContent/VAADIN/themes/demo/book-covers/upod.png differ
diff --git a/WebContent/VAADIN/themes/demo/book-covers/wfd.png b/WebContent/VAADIN/themes/demo/book-covers/wfd.png
new file mode 100644 (file)
index 0000000..3bcc62c
Binary files /dev/null and b/WebContent/VAADIN/themes/demo/book-covers/wfd.png differ
index dfdedf5dce9e1832931ccbb7c654cf7655bdc609..6b6b6815255809aed705f3a59e03e6d53fd4f281 100644 (file)
                <param-name>resourceCacheTime</param-name>\r
                <param-value>3600</param-value> \r
        </context-param>\r
-
+\r
        <servlet>\r
                <servlet-name>VaadinApplicationRunner</servlet-name>\r
                <servlet-class>com.vaadin.terminal.gwt.server.ApplicationRunnerServlet</servlet-class>\r
                <init-param><param-name>defaultPackages</param-name>\r
                <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>\r
        </servlet>\r
-
-
-       <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>
+\r
+\r
+       <servlet>\r
+               <servlet-name>RobustnessSimple</servlet-name>\r
+               <servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>\r
+               <init-param>\r
+                       <param-name>application</param-name>\r
+                       <param-value>com.vaadin.tests.robustness.RobustnessSimple</param-value>\r
+               </init-param>\r
+       </servlet>\r
+\r
+\r
+       <servlet>\r
+               <servlet-name>DemoTestBench</servlet-name>\r
+               <servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>\r
+               <init-param>\r
+                       <param-name>application</param-name>\r
+                       <param-value>com.vaadin.demo.testbench.TestBench</param-value>\r
+               </init-param>\r
        </servlet>\r
        <servlet>\r
                <servlet-name>TestForNativeWindowing</servlet-name>\r
                </init-param>\r
        </servlet>\r
 \r
+       <servlet>\r
+               <servlet-name>RunoTheme</servlet-name>\r
+               <servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>\r
+               <init-param>\r
+                       <param-name>application</param-name>\r
+                       <param-value>com.vaadin.demo.themes.RunoTheme</param-value>\r
+               </init-param>\r
+       </servlet>\r
+\r
        <servlet>\r
                <servlet-name>FeaturesApplication</servlet-name>\r
                <servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>\r
                </init-param>\r
        </servlet>\r
 \r
-       <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>\r
+               <servlet-name>ColorPickerApplication</servlet-name>\r
+               <servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>\r
+               <init-param>\r
+                       <param-name>application</param-name>\r
+                       <param-value>com.vaadin.demo.colorpicker.ColorPickerApplication</param-value>\r
+               </init-param>\r
                <init-param>\r
                        <param-name>widgetset</param-name>\r
                        <param-value>com.vaadin.demo.colorpicker.gwt.ColorPickerWidgetSet</param-value>\r
                </init-param>\r
        </servlet>\r
 \r
-       <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>\r
+               <servlet-name>BookTestServlet</servlet-name>\r
+               <servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>\r
+               <init-param>\r
+                       <param-name>application</param-name>\r
+                       <param-value>com.vaadin.tests.book.BookTestApplication</param-value>\r
+               </init-param>\r
+       </servlet>\r
+\r
+       <servlet>\r
+               <servlet-name>WindowTestServlet</servlet-name>\r
+               <servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>\r
+               <init-param>\r
+                       <param-name>application</param-name>\r
+                       <param-value>com.vaadin.tests.book.WindowTestApplication</param-value>\r
+               </init-param>\r
+       </servlet>\r
+\r
+       <servlet>\r
+               <servlet-name>ChatServlet</servlet-name>\r
+               <servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>\r
+               <init-param>\r
+                       <param-name>application</param-name>\r
+                       <param-value>com.vaadin.tests.book.ChatApplication</param-value>\r
+               </init-param>\r
        </servlet>\r
        \r
        <servlet>\r
                        <param-name>application</param-name>\r
                        <param-value>com.vaadin.tests.appengine.GAESyncTest</param-value>\r
                </init-param>\r
-       </servlet>
-
-       <servlet-mapping>
-               <servlet-name>VaadinApplicationRunner</servlet-name>
-               <url-pattern>/run/*</url-pattern>
+       </servlet>\r
+\r
+       <servlet-mapping>\r
+               <servlet-name>VaadinApplicationRunner</servlet-name>\r
+               <url-pattern>/run/*</url-pattern>\r
        </servlet-mapping>\r
 \r
-       <servlet-mapping>
-               <servlet-name>DemoTestBench</servlet-name>
-               <url-pattern>/DemoTestBench/*</url-pattern>
+       <servlet-mapping>\r
+               <servlet-name>DemoTestBench</servlet-name>\r
+               <url-pattern>/DemoTestBench/*</url-pattern>\r
        </servlet-mapping>\r
        <servlet-mapping>\r
                <servlet-name>TestForNativeWindowing</servlet-name>\r
        </servlet-mapping>\r
 \r
 \r
-       <servlet-mapping>
-               <servlet-name>RobustnessSimple</servlet-name>
-               <url-pattern>/RobustnessSimple/*</url-pattern>
-       </servlet-mapping>
-
+       <servlet-mapping>\r
+               <servlet-name>RobustnessSimple</servlet-name>\r
+               <url-pattern>/RobustnessSimple/*</url-pattern>\r
+       </servlet-mapping>\r
+\r
        <servlet-mapping>\r
                <servlet-name>TestSplitPanel</servlet-name>\r
                <url-pattern>/TestSplitPanel/*</url-pattern>\r
        <servlet-mapping>\r
                <servlet-name>TestBench</servlet-name>\r
                <url-pattern>/TestBench/*</url-pattern>\r
-       </servlet-mapping>
+       </servlet-mapping>\r
        <servlet-mapping>\r
                <servlet-name>TestBench</servlet-name>\r
                <url-pattern>/t/*</url-pattern>\r
-       </servlet-mapping>
-
+       </servlet-mapping>\r
+\r
        <servlet-mapping>\r
                <servlet-name>CustomLayoutDemo</servlet-name>\r
                <url-pattern>/CustomLayoutDemo/*</url-pattern>\r
                <!-- portlet -->\r
        </servlet-mapping>\r
 \r
-       <servlet-mapping>
-               <servlet-name>ColorPickerApplication</servlet-name>
-               <url-pattern>/colorpicker/*</url-pattern>
+       <servlet-mapping>\r
+               <servlet-name>ColorPickerApplication</servlet-name>\r
+               <url-pattern>/colorpicker/*</url-pattern>\r
        </servlet-mapping>\r
-       <servlet-mapping>
-               <servlet-name>BookTestServlet</servlet-name>
-               <url-pattern>/book/*</url-pattern>
+       <servlet-mapping>\r
+               <servlet-name>BookTestServlet</servlet-name>\r
+               <url-pattern>/book/*</url-pattern>\r
        </servlet-mapping>\r
-       <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>\r
+               <servlet-name>WindowTestServlet</servlet-name>\r
+               <url-pattern>/windowtest/*</url-pattern>\r
+       </servlet-mapping>\r
+\r
+       <servlet-mapping>\r
+               <servlet-name>ChatServlet</servlet-name>\r
+               <url-pattern>/chat/*</url-pattern>\r
+               <!-- portlet -->\r
        </servlet-mapping>\r
        \r
        <servlet-mapping>\r
        <servlet-mapping>\r
                <servlet-name>GAESyncTest</servlet-name>\r
                <url-pattern>/gaesynctest/*</url-pattern>\r
-       </servlet-mapping>
-
+       </servlet-mapping>\r
+\r
        <servlet-mapping>\r
                <servlet-name>AddressBook</servlet-name>\r
                <url-pattern>/AddressBook/*</url-pattern>\r
                <servlet-name>ReindeerThemeStyles</servlet-name>\r
                <url-pattern>/ReindeerTheme/*</url-pattern>\r
        </servlet-mapping>\r
+       \r
+       <servlet-mapping>\r
+               <servlet-name>RunoTheme</servlet-name>\r
+               <url-pattern>/RunoTheme/*</url-pattern>\r
+       </servlet-mapping>\r
 \r
        <welcome-file-list>\r
                <welcome-file>index.jsp</welcome-file>\r
index f1fd714e75ce2cb278646e80c0acc15575ea6964..68589abe17bfc1bcf87ada37c9df9beaacf05cb8 100644 (file)
                                                        </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>
                                        
index 33a91069a3292a7eaad24f83640bfcae9885113c..2febbb9305fa107361241c07b87a70a4293ed3ef 100644 (file)
@@ -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";
 
index 29cc7089a652010d0fc73057cce51df46911ba61..88011addc4cf9b86d585f83a197b8a82020fbc6d 100644 (file)
@@ -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";
 }