]> source.dussan.org Git - vaadin-framework.git/commitdiff
#7178 eliminated "example" theme
authorHenri Sara <henri.sara@itmill.com>
Sat, 13 Aug 2011 07:15:01 +0000 (07:15 +0000)
committerHenri Sara <henri.sara@itmill.com>
Sat, 13 Aug 2011 07:15:01 +0000 (07:15 +0000)
svn changeset:20370/svn branch:6.7

17 files changed:
WebContent/VAADIN/themes/example/favicon.ico [deleted file]
WebContent/VAADIN/themes/example/icons/ok.png [deleted file]
WebContent/VAADIN/themes/example/layouts/Contact.html [deleted file]
WebContent/VAADIN/themes/example/layouts/Developers.html [deleted file]
WebContent/VAADIN/themes/example/layouts/News.html [deleted file]
WebContent/VAADIN/themes/example/layouts/Products.html [deleted file]
WebContent/VAADIN/themes/example/layouts/Support.html [deleted file]
WebContent/VAADIN/themes/example/layouts/Welcome.html [deleted file]
WebContent/VAADIN/themes/example/layouts/icon_intro.png [deleted file]
WebContent/VAADIN/themes/example/layouts/mainLayout.html [deleted file]
WebContent/VAADIN/themes/example/styles.css [deleted file]
WebContent/VAADIN/themes/tests-tickets/layouts/Ticket1519_News.html [new file with mode: 0644]
WebContent/VAADIN/themes/tests-tickets/layouts/Ticket1519_Support.html [new file with mode: 0644]
WebContent/VAADIN/themes/tests-tickets/layouts/Ticket1775.html [new file with mode: 0644]
tests/src/com/vaadin/tests/tickets/Ticket1519.java
tests/src/com/vaadin/tests/tickets/Ticket1775.java
tests/src/com/vaadin/tests/tickets/Ticket736.java

diff --git a/WebContent/VAADIN/themes/example/favicon.ico b/WebContent/VAADIN/themes/example/favicon.ico
deleted file mode 100644 (file)
index e58158c..0000000
Binary files a/WebContent/VAADIN/themes/example/favicon.ico and /dev/null differ
diff --git a/WebContent/VAADIN/themes/example/icons/ok.png b/WebContent/VAADIN/themes/example/icons/ok.png
deleted file mode 100644 (file)
index 89591fa..0000000
Binary files a/WebContent/VAADIN/themes/example/icons/ok.png and /dev/null differ
diff --git a/WebContent/VAADIN/themes/example/layouts/Contact.html b/WebContent/VAADIN/themes/example/layouts/Contact.html
deleted file mode 100644 (file)
index 8197923..0000000
+++ /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 (file)
index bc74566..0000000
+++ /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/News.html b/WebContent/VAADIN/themes/example/layouts/News.html
deleted file mode 100644 (file)
index 0ac582c..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-
-<h3>News</h3>
-
-<p>
-IT Mill was founded in 2000 to develop this new programming paradigm
-that would support the creation of real user interfaces for real
-application using real programming languages.
-</p>
-
-<p>
-IT Mill has been offering high-quality expert services to support its
-customers' software development from the start. This model has made it
-possible for the company to grow and develop realistically and solely
-on net income.
-</p>
-
-<p>
-The development of company's proprietary MillstoneTM technology
-started at the end of 2000 in cooperation with Tekes, the National
-Technology Agency of Finland. The first new Millstone customer
-applications were launched already in 2001.
-</p>
-
-<p>
-Version 3.0 of the Millstone user interface library was published
-using an open LGPL license in December 2002, making it possible to use
-the library free of charge all around the world.
-</p>
-
-<p>
-Until 2005 more than 50 % of IT Mill's turnover was derived from sales
-of Millstone specialist services, with the rest coming from sales of
-other software development services and outsourcing services.
-</p>
-
-<p>
-In late 2006 IT Mill ensured funding of the new generation of
-Millstone. IT Mill Toolkit was released in early 2007 and renamed
-Vaadin in 2009.
-</p>
-
diff --git a/WebContent/VAADIN/themes/example/layouts/Products.html b/WebContent/VAADIN/themes/example/layouts/Products.html
deleted file mode 100644 (file)
index 839ebf8..0000000
+++ /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/Support.html b/WebContent/VAADIN/themes/example/layouts/Support.html
deleted file mode 100644 (file)
index aca7e2a..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-
-<h3>Support</h3>
-
-<p>
-IT Mill offers a service, one that is expert, flexible and reliable.
-We cover the gamut of software development - we are technology
-consultants, a turnkey systems providers, a support center for the
-customer's internal product development.
-</p>
-
-<p>
-We offer maintenance as well as additional development services for
-all the software we build. However, it is one of our principles that
-the customer should always be free to solicit competing bids for
-further development and software maintenance.
-</p>
diff --git a/WebContent/VAADIN/themes/example/layouts/Welcome.html b/WebContent/VAADIN/themes/example/layouts/Welcome.html
deleted file mode 100644 (file)
index 05abef5..0000000
+++ /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 (file)
index 0327129..0000000
Binary files a/WebContent/VAADIN/themes/example/layouts/icon_intro.png and /dev/null differ
diff --git a/WebContent/VAADIN/themes/example/layouts/mainLayout.html b/WebContent/VAADIN/themes/example/layouts/mainLayout.html
deleted file mode 100644 (file)
index 80eec49..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-
-<!-- Vaadin components are placed with divs that have matching
-location tag -->
-
-<table>
-  <tr>
-    <td><img src="icon_intro.png" /></td>
-    <td width="80%"><b>This is an example application that uses custom layouts</b></td>
-    <td align="right">
-      <!-- login components -->
-      <table align="right">
-        <tr>
-         <td><div location="loginUser"></div></td>
-          <td><div location="loginPassword"></div></td>
-          <td><div style="width:100px;margin-top:1em" location="loginButton"></div></td>
-        </tr>
-      </table>
-    </td>  
-  </tr>
-</table>
-
-<table>
-  <tr>
-    <!-- menu component -->
-    <td valign="top" width="150">
-      <div location="menu"></div>
-    </td>
-    <!-- body component, updated by menu clicked event -->
-    <td valign="top">
-      <div location="body"></div>
-    </td>
-  </tr>
-</table>
diff --git a/WebContent/VAADIN/themes/example/styles.css b/WebContent/VAADIN/themes/example/styles.css
deleted file mode 100644 (file)
index 1a17914..0000000
+++ /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/tests-tickets/layouts/Ticket1519_News.html b/WebContent/VAADIN/themes/tests-tickets/layouts/Ticket1519_News.html
new file mode 100644 (file)
index 0000000..0ac582c
--- /dev/null
@@ -0,0 +1,41 @@
+
+<h3>News</h3>
+
+<p>
+IT Mill was founded in 2000 to develop this new programming paradigm
+that would support the creation of real user interfaces for real
+application using real programming languages.
+</p>
+
+<p>
+IT Mill has been offering high-quality expert services to support its
+customers' software development from the start. This model has made it
+possible for the company to grow and develop realistically and solely
+on net income.
+</p>
+
+<p>
+The development of company's proprietary MillstoneTM technology
+started at the end of 2000 in cooperation with Tekes, the National
+Technology Agency of Finland. The first new Millstone customer
+applications were launched already in 2001.
+</p>
+
+<p>
+Version 3.0 of the Millstone user interface library was published
+using an open LGPL license in December 2002, making it possible to use
+the library free of charge all around the world.
+</p>
+
+<p>
+Until 2005 more than 50 % of IT Mill's turnover was derived from sales
+of Millstone specialist services, with the rest coming from sales of
+other software development services and outsourcing services.
+</p>
+
+<p>
+In late 2006 IT Mill ensured funding of the new generation of
+Millstone. IT Mill Toolkit was released in early 2007 and renamed
+Vaadin in 2009.
+</p>
+
diff --git a/WebContent/VAADIN/themes/tests-tickets/layouts/Ticket1519_Support.html b/WebContent/VAADIN/themes/tests-tickets/layouts/Ticket1519_Support.html
new file mode 100644 (file)
index 0000000..aca7e2a
--- /dev/null
@@ -0,0 +1,16 @@
+
+<h3>Support</h3>
+
+<p>
+IT Mill offers a service, one that is expert, flexible and reliable.
+We cover the gamut of software development - we are technology
+consultants, a turnkey systems providers, a support center for the
+customer's internal product development.
+</p>
+
+<p>
+We offer maintenance as well as additional development services for
+all the software we build. However, it is one of our principles that
+the customer should always be free to solicit competing bids for
+further development and software maintenance.
+</p>
diff --git a/WebContent/VAADIN/themes/tests-tickets/layouts/Ticket1775.html b/WebContent/VAADIN/themes/tests-tickets/layouts/Ticket1775.html
new file mode 100644 (file)
index 0000000..80eec49
--- /dev/null
@@ -0,0 +1,33 @@
+
+<!-- Vaadin components are placed with divs that have matching
+location tag -->
+
+<table>
+  <tr>
+    <td><img src="icon_intro.png" /></td>
+    <td width="80%"><b>This is an example application that uses custom layouts</b></td>
+    <td align="right">
+      <!-- login components -->
+      <table align="right">
+        <tr>
+         <td><div location="loginUser"></div></td>
+          <td><div location="loginPassword"></div></td>
+          <td><div style="width:100px;margin-top:1em" location="loginButton"></div></td>
+        </tr>
+      </table>
+    </td>  
+  </tr>
+</table>
+
+<table>
+  <tr>
+    <!-- menu component -->
+    <td valign="top" width="150">
+      <div location="menu"></div>
+    </td>
+    <!-- body component, updated by menu clicked event -->
+    <td valign="top">
+      <div location="body"></div>
+    </td>
+  </tr>
+</table>
index d088b2be2314ed2e99c292db7eeb15bca644cd09..ff6d34037236b2d3277b4321c802ff4d5cbef21e 100644 (file)
@@ -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);
 
index aabf31b62082e28f53ee2fcc57571f0121884cda..f37737e929ea4ddb63b2adc9272318edbc3cd356 100644 (file)
@@ -13,8 +13,8 @@ public class Ticket1775 extends com.vaadin.Application {
 \r
         final Window main = new Window("#1775");\r
         setMainWindow(main);\r
-        main.setTheme("example");\r
-        String layoutName = "mainLayout";\r
+        main.setTheme("tests-tickets");\r
+        String layoutName = "Ticket1775";\r
         final CustomLayout layout = new CustomLayout(layoutName);\r
 \r
         main.addComponent(layout);\r
index ac7868cb48c3b7216bac58ef74e9c0e89258cf30..c530b7ca99fe207e48b87846c9a151ea5ee084f8 100644 (file)
@@ -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();