#7178 eliminated "example" theme

svn changeset:20370/svn branch:6.7

14 files changed, 7 insertions, 138 deletions

diff --git a/WebContent/VAADIN/themes/example/favicon.ico b/WebContent/VAADIN/themes/example/favicon.ico
deleted file mode 100644
index e58158c02c..0000000000
--- a/WebContent/VAADIN/themes/example/favicon.ico
+++ /dev/null
diff --git a/WebContent/VAADIN/themes/example/icons/ok.png b/WebContent/VAADIN/themes/example/icons/ok.png
deleted file mode 100644
index 89591faef2..0000000000
--- a/WebContent/VAADIN/themes/example/icons/ok.png
+++ /dev/null
diff --git a/WebContent/VAADIN/themes/example/layouts/Contact.html b/WebContent/VAADIN/themes/example/layouts/Contact.html
deleted file mode 100644
index 8197923b81..0000000000
--- a/WebContent/VAADIN/themes/example/layouts/Contact.html
+++ /dev/null
@@ -1,30 +0,0 @@
-
-<h3>Contact Sales</h3>
-<p>
-Do you want us to send you an offer? Or have our sales team contact
-you on another matter? Please fill out the enclosed form and we'll get
-back to you as soon as possible. You can also call us or send us an
-e-mail.
-</p>
-
-<h3>Report a Bug</h3>
-<p>
-If you have found an issue with Vaadin, demo applications or
-documentation, please report it to us. Fill out the following form to
-send us any relevant information about the issue.
-Click here
-</p>
-
-<h3>A job for a real expert</h3>
-<p>
-We are always interested in new and keen talents! Finnish language
-skills are required so please fill out the application form.
-Click here for the form
-</p>
-
-<h3>You feedback is always welcome</h3>
-<p>
-Please give us feedback on our site, products and services. We are
-happy to receive positive as well as negative comments as they help us
-improve ourselves even further! 
-</p>
diff --git a/WebContent/VAADIN/themes/example/layouts/Developers.html b/WebContent/VAADIN/themes/example/layouts/Developers.html
deleted file mode 100644
index bc74566c63..0000000000
--- a/WebContent/VAADIN/themes/example/layouts/Developers.html
+++ /dev/null
@@ -1,17 +0,0 @@
-
-<h3>Developers</h3>
-
-<p>
-This section contains information for developers using Vaadin
-to create Java web applications.
-</p>
-
-<p>
-Start by reading the example application walk-through, get familiar
-with the application structure and install the development environment.
-</p>
-
-<p>
-Simple. You'll be ready to build your own Ajax web applications in
-Java language. 
-</p>
diff --git a/WebContent/VAADIN/themes/example/layouts/Products.html b/WebContent/VAADIN/themes/example/layouts/Products.html
deleted file mode 100644
index 839ebf8e0c..0000000000
--- a/WebContent/VAADIN/themes/example/layouts/Products.html
+++ /dev/null
@@ -1,25 +0,0 @@
-
-<h3>Top 5 reasons to choose Vaadin</h3>
-
-<p>
-1. High compatibility with web browsers and application servers
-</p>
-
-<p>
-2. Real savings in cross-browser application development and testing
-</p>
-
-<p>
-3. Ready-made components that make applications easy to maintain
-and easy to extend
-</p>
-
-<p>
-4. Supports all stages of the application development cycle from
-design to maintenance
-</p>
-
-<p>
-5. Proven in production - since 2001
-</p>
-   
diff --git a/WebContent/VAADIN/themes/example/layouts/Welcome.html b/WebContent/VAADIN/themes/example/layouts/Welcome.html
deleted file mode 100644
index 05abef5f11..0000000000
--- a/WebContent/VAADIN/themes/example/layouts/Welcome.html
+++ /dev/null
@@ -1,20 +0,0 @@
-
-<h3>Welcome</h3>
-
-<p>
-IT Mill is a specialist in enterprise web user interface design and
-technology. We offer a variety of products and services for enterprise
-application user interface design, -analysis and -implementation. Our
-flagship product is Vaadin - a server-side component framework for
-Java EE. Vaadin enables creation of highly usable browser applications
-in real Java.
-</p>
-
-<p>
-Vaadin is a web user interface framework for developing high-quality
-web applications for enterprise and professional use. By using
-standard Java tools and the enterprise environment (Java EE -
-formerly J2EE) we have created the most elegant and complete
-architecture for developing user interfaces for web business
-applications - for your benefit.
-</p>
\ No newline at end of file
diff --git a/WebContent/VAADIN/themes/example/layouts/icon_intro.png b/WebContent/VAADIN/themes/example/layouts/icon_intro.png
deleted file mode 100644
index 032712985c..0000000000
--- a/WebContent/VAADIN/themes/example/layouts/icon_intro.png
+++ /dev/null
diff --git a/WebContent/VAADIN/themes/example/styles.css b/WebContent/VAADIN/themes/example/styles.css
deleted file mode 100644
index 1a179140fe..0000000000
--- a/WebContent/VAADIN/themes/example/styles.css
+++ /dev/null
@@ -1,39 +0,0 @@
-@import url(../runo/styles.css);
-
-.v-generated-body {
-	/* full height layout does not need scrollable body; 
-	avoids excess scrollbars if moving sub-window over the window area */
-	overflow:hidden;
-}
-
-/******************************************************************************
- * For FormExample.java
- ******************************************************************************/
-.v-form legend {
-	color: #464f52;
-}
-
-.v-orderedlayout-formroot td {
-	vertical-align: top;
-}
-
-/******************************************************************************
- * For GeneratedColumnExample.java.
- ******************************************************************************/
-/* Align columns generated with ValueColumnGenerator to right. */ 
-.v-label-column-type-value {
-    text-align: right;
-}
-
-/* The total value column is displayed in bold. */
-.v-label-column-total {
-	font-weight: bold;
-	text-align: right;
-}
-
-/* Display calculated values in blue color. */
-.v-label-column-price, .v-label-column-consumption, .v-label-column-dailycost {
-    color: blue;
-    text-align: right;
-}
-
diff --git a/WebContent/VAADIN/themes/example/layouts/News.html b/WebContent/VAADIN/themes/tests-tickets/layouts/Ticket1519_News.html
index 0ac582cfbe..0ac582cfbe 100644
--- a/WebContent/VAADIN/themes/example/layouts/News.html
+++ b/WebContent/VAADIN/themes/tests-tickets/layouts/Ticket1519_News.html
diff --git a/WebContent/VAADIN/themes/example/layouts/Support.html b/WebContent/VAADIN/themes/tests-tickets/layouts/Ticket1519_Support.html
index aca7e2a66d..aca7e2a66d 100644
--- a/WebContent/VAADIN/themes/example/layouts/Support.html
+++ b/WebContent/VAADIN/themes/tests-tickets/layouts/Ticket1519_Support.html
diff --git a/WebContent/VAADIN/themes/example/layouts/mainLayout.html b/WebContent/VAADIN/themes/tests-tickets/layouts/Ticket1775.html
index 80eec49b7f..80eec49b7f 100644
--- a/WebContent/VAADIN/themes/example/layouts/mainLayout.html
+++ b/WebContent/VAADIN/themes/tests-tickets/layouts/Ticket1775.html
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1519.java b/tests/src/com/vaadin/tests/tickets/Ticket1519.java
index d088b2be23..ff6d340372 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1519.java
+++ b/tests/src/com/vaadin/tests/tickets/Ticket1519.java
@@ -10,14 +10,14 @@ public class Ticket1519 extends Application {
     @Override
     public void init() {
 
-        final Window mainWin = new Window("Test app to #1368");
+        final Window mainWin = new Window("Test app to #1519");
         setMainWindow(mainWin);
 
-        mainWin.setTheme("example");
+        mainWin.setTheme("tests-tickets");
         TabSheet ts = new TabSheet();
 
-        ts.addTab(new CustomLayout("News"), "News", null);
-        ts.addTab(new CustomLayout("Support"), "Support", null);
+        ts.addTab(new CustomLayout("Ticket1519_News"), "News", null);
+        ts.addTab(new CustomLayout("Ticket1519_Support"), "Support", null);
 
         mainWin.addComponent(ts);
 
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1775.java b/tests/src/com/vaadin/tests/tickets/Ticket1775.java
index aabf31b620..f37737e929 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1775.java
+++ b/tests/src/com/vaadin/tests/tickets/Ticket1775.java
@@ -13,8 +13,8 @@ public class Ticket1775 extends com.vaadin.Application {
 

         final Window main = new Window("#1775");

         setMainWindow(main);

-        main.setTheme("example");

-        String layoutName = "mainLayout";

+        main.setTheme("tests-tickets");

+        String layoutName = "Ticket1775";

         final CustomLayout layout = new CustomLayout(layoutName);

 

         main.addComponent(layout);

diff --git a/tests/src/com/vaadin/tests/tickets/Ticket736.java b/tests/src/com/vaadin/tests/tickets/Ticket736.java
index ac7868cb48..c530b7ca99 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket736.java
+++ b/tests/src/com/vaadin/tests/tickets/Ticket736.java
@@ -25,7 +25,7 @@ public class Ticket736 extends Application {
         final Window mainWin = new Window("Test app for #736");
         setMainWindow(mainWin);
 
-        mainWin.setTheme("example");
+        mainWin.setTheme("runo");
 
         // Create form for editing address
         final Form f = new Form();