Reverted [13019], postponed to 6.4 due to major modifications in Runo theme.

svn changeset:13021/svn branch:6.3

diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml
index 3345fc7b133da7d3e09a0d7f2b3d2f4a5df816f9..dfdedf5dce9e1832931ccbb7c654cf7655bdc609 100644 (file)
--- a/WebContent/WEB-INF/web.xml
+++ b/WebContent/WEB-INF/web.xml
@@ -165,15 +165,6 @@
                </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
@@ -459,11 +450,6 @@
                <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

diff --git a/WebContent/index.html b/WebContent/index.html
index 9956bbc77dd6c19c5710e436c8d5482be155a6fb..f1fd714e75ce2cb278646e80c0acc15575ea6964 100644 (file)
--- a/WebContent/index.html
+++ b/WebContent/index.html
@@ -150,10 +150,11 @@
                                                        </a>
                                                </div>
                                                <div class="col2">
-                                                       <a class="thumb demoapp" href="RunoTheme">
+                                                       <a class="thumb" href="demo/img/runo.png" rel="zoombox" title="Runo theme mockup (actual implementation differs in some parts)">
                                                                <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>