summaryrefslogtreecommitdiffstats
path: root/WebContent
diff options
context:
space:
mode:
authorJouni Koivuviita <jouni.koivuviita@itmill.com>2010-05-04 13:21:27 +0000
committerJouni Koivuviita <jouni.koivuviita@itmill.com>2010-05-04 13:21:27 +0000
commitee0fea3874651c2d375120b1cd546797bedc1146 (patch)
tree8d9d70fc73fa511b370a81de5cf03e1ddea28920 /WebContent
parentb9d97b16fa108da637443242c35921aa163aa211 (diff)
downloadvaadin-framework-ee0fea3874651c2d375120b1cd546797bedc1146.tar.gz
vaadin-framework-ee0fea3874651c2d375120b1cd546797bedc1146.zip
New Runo theme demo application and Runo theme style constants.
svn changeset:13026/svn branch:6.4
Diffstat (limited to 'WebContent')
-rw-r--r--WebContent/VAADIN/themes/demo/book-covers/comics.pngbin0 -> 12997 bytes
-rw-r--r--WebContent/VAADIN/themes/demo/book-covers/designing-interactions.pngbin0 -> 8452 bytes
-rw-r--r--WebContent/VAADIN/themes/demo/book-covers/designing-interfaces.pngbin0 -> 9511 bytes
-rw-r--r--WebContent/VAADIN/themes/demo/book-covers/gdtnb.pngbin0 -> 13858 bytes
-rw-r--r--WebContent/VAADIN/themes/demo/book-covers/new-mind.pngbin0 -> 9631 bytes
-rw-r--r--WebContent/VAADIN/themes/demo/book-covers/new-type.pngbin0 -> 13963 bytes
-rw-r--r--WebContent/VAADIN/themes/demo/book-covers/rogue-leaders.pngbin0 -> 8680 bytes
-rw-r--r--WebContent/VAADIN/themes/demo/book-covers/simplicity.pngbin0 -> 4934 bytes
-rw-r--r--WebContent/VAADIN/themes/demo/book-covers/tcss.pngbin0 -> 13612 bytes
-rw-r--r--WebContent/VAADIN/themes/demo/book-covers/upod.pngbin0 -> 5770 bytes
-rw-r--r--WebContent/VAADIN/themes/demo/book-covers/wfd.pngbin0 -> 1831 bytes
-rw-r--r--WebContent/WEB-INF/web.xml184
-rw-r--r--WebContent/index.html3
13 files changed, 100 insertions, 87 deletions
diff --git a/WebContent/VAADIN/themes/demo/book-covers/comics.png b/WebContent/VAADIN/themes/demo/book-covers/comics.png
new file mode 100644
index 0000000000..98bfb368d9
--- /dev/null
+++ b/WebContent/VAADIN/themes/demo/book-covers/comics.png
Binary files 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
index 0000000000..7c8f97183d
--- /dev/null
+++ b/WebContent/VAADIN/themes/demo/book-covers/designing-interactions.png
Binary files 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
index 0000000000..471f6711d9
--- /dev/null
+++ b/WebContent/VAADIN/themes/demo/book-covers/designing-interfaces.png
Binary files 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
index 0000000000..48cddc5789
--- /dev/null
+++ b/WebContent/VAADIN/themes/demo/book-covers/gdtnb.png
Binary files 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
index 0000000000..d23fe11b47
--- /dev/null
+++ b/WebContent/VAADIN/themes/demo/book-covers/new-mind.png
Binary files 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
index 0000000000..9ad7ffa07b
--- /dev/null
+++ b/WebContent/VAADIN/themes/demo/book-covers/new-type.png
Binary files 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
index 0000000000..9468f7e80f
--- /dev/null
+++ b/WebContent/VAADIN/themes/demo/book-covers/rogue-leaders.png
Binary files 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
index 0000000000..cdfb79aa42
--- /dev/null
+++ b/WebContent/VAADIN/themes/demo/book-covers/simplicity.png
Binary files 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
index 0000000000..d40cf1bb00
--- /dev/null
+++ b/WebContent/VAADIN/themes/demo/book-covers/tcss.png
Binary files 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
index 0000000000..5da43f2525
--- /dev/null
+++ b/WebContent/VAADIN/themes/demo/book-covers/upod.png
Binary files 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
index 0000000000..3bcc62cb39
--- /dev/null
+++ b/WebContent/VAADIN/themes/demo/book-covers/wfd.png
Binary files differ
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>