From: Marc Englund Date: Wed, 19 Sep 2007 07:52:24 +0000 (+0000) Subject: layout -> layouts X-Git-Tag: 6.7.0.beta1~5995 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=95d0dc6e2f7ad9a19aaa6c477decacab8a2ab570;p=vaadin-framework.git layout -> layouts svn changeset:2324/svn branch:trunk --- diff --git a/WebContent/ITK-INF/themes/demo/layout/featurebrowser-mainlayout.html b/WebContent/ITK-INF/themes/demo/layout/featurebrowser-mainlayout.html deleted file mode 100644 index ee66b4919e..0000000000 --- a/WebContent/ITK-INF/themes/demo/layout/featurebrowser-mainlayout.html +++ /dev/null @@ -1,241 +0,0 @@ - - - - - - -

- -

tree

- -

- - - - - - -

demo

- -

tabsheet

- -

properties

- -

- - - - - - - -

themes

restart

- -

- - - - - - \ No newline at end of file diff --git a/WebContent/ITK-INF/themes/demo/layout/img/header.png b/WebContent/ITK-INF/themes/demo/layout/img/header.png deleted file mode 100644 index bf64ac4e17..0000000000 Binary files a/WebContent/ITK-INF/themes/demo/layout/img/header.png and /dev/null differ diff --git a/WebContent/ITK-INF/themes/demo/layout/img/hide_properties.png b/WebContent/ITK-INF/themes/demo/layout/img/hide_properties.png deleted file mode 100644 index 0069db75d9..0000000000 Binary files a/WebContent/ITK-INF/themes/demo/layout/img/hide_properties.png and /dev/null differ diff --git a/WebContent/ITK-INF/themes/demo/layout/img/m_bg.png b/WebContent/ITK-INF/themes/demo/layout/img/m_bg.png deleted file mode 100644 index 2d37f7ffae..0000000000 Binary files a/WebContent/ITK-INF/themes/demo/layout/img/m_bg.png and /dev/null differ diff --git a/WebContent/ITK-INF/themes/demo/layout/img/show_properties.png b/WebContent/ITK-INF/themes/demo/layout/img/show_properties.png deleted file mode 100644 index 6427452419..0000000000 Binary files a/WebContent/ITK-INF/themes/demo/layout/img/show_properties.png and /dev/null differ diff --git a/WebContent/ITK-INF/themes/demo/layout/img/tab_handle.png b/WebContent/ITK-INF/themes/demo/layout/img/tab_handle.png deleted file mode 100644 index ed0c34cabb..0000000000 Binary files a/WebContent/ITK-INF/themes/demo/layout/img/tab_handle.png and /dev/null differ diff --git a/WebContent/ITK-INF/themes/demo/layouts/featurebrowser-mainlayout.html b/WebContent/ITK-INF/themes/demo/layouts/featurebrowser-mainlayout.html new file mode 100644 index 0000000000..ee66b4919e --- /dev/null +++ b/WebContent/ITK-INF/themes/demo/layouts/featurebrowser-mainlayout.html @@ -0,0 +1,241 @@ + + + + + + +

+ +

tree

+ +

+ + + + + + +

demo

+ +

tabsheet

+ +

properties

+ +

+ + + + + + + +

themes

restart

+ +

+ + + + + + \ No newline at end of file diff --git a/WebContent/ITK-INF/themes/demo/layouts/img/header.png b/WebContent/ITK-INF/themes/demo/layouts/img/header.png new file mode 100644 index 0000000000..bf64ac4e17 Binary files /dev/null and b/WebContent/ITK-INF/themes/demo/layouts/img/header.png differ diff --git a/WebContent/ITK-INF/themes/demo/layouts/img/hide_properties.png b/WebContent/ITK-INF/themes/demo/layouts/img/hide_properties.png new file mode 100644 index 0000000000..0069db75d9 Binary files /dev/null and b/WebContent/ITK-INF/themes/demo/layouts/img/hide_properties.png differ diff --git a/WebContent/ITK-INF/themes/demo/layouts/img/m_bg.png b/WebContent/ITK-INF/themes/demo/layouts/img/m_bg.png new file mode 100644 index 0000000000..2d37f7ffae Binary files /dev/null and b/WebContent/ITK-INF/themes/demo/layouts/img/m_bg.png differ diff --git a/WebContent/ITK-INF/themes/demo/layouts/img/show_properties.png b/WebContent/ITK-INF/themes/demo/layouts/img/show_properties.png new file mode 100644 index 0000000000..6427452419 Binary files /dev/null and b/WebContent/ITK-INF/themes/demo/layouts/img/show_properties.png differ diff --git a/WebContent/ITK-INF/themes/demo/layouts/img/tab_handle.png b/WebContent/ITK-INF/themes/demo/layouts/img/tab_handle.png new file mode 100644 index 0000000000..ed0c34cabb Binary files /dev/null and b/WebContent/ITK-INF/themes/demo/layouts/img/tab_handle.png differ diff --git a/WebContent/ITK-INF/themes/example/layout/Contact.html b/WebContent/ITK-INF/themes/example/layout/Contact.html deleted file mode 100644 index a37425078c..0000000000 --- a/WebContent/ITK-INF/themes/example/layout/Contact.html +++ /dev/null @@ -1,30 +0,0 @@ - -

Contact Sales

-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. -

- -

Report a Bug

-If you have found an issue with IT Mill Toolkit, 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 -

- -

A job for a real expert

-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 -

- -

You feedback is always welcome

-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! -

diff --git a/WebContent/ITK-INF/themes/example/layout/Developers.html b/WebContent/ITK-INF/themes/example/layout/Developers.html deleted file mode 100644 index 50e054a4f4..0000000000 --- a/WebContent/ITK-INF/themes/example/layout/Developers.html +++ /dev/null @@ -1,17 +0,0 @@ - -

Developers

- -

-This section contains information for developers using IT Mill Toolkit -to create Java web applications. -

- -

-Start by reading the example application walk-through, get familiar -with the application structure and install the development environment. -

- -

-Simple. You'll be ready to build your own Ajax web applications in -Java language. -

diff --git a/WebContent/ITK-INF/themes/example/layout/News.html b/WebContent/ITK-INF/themes/example/layout/News.html deleted file mode 100644 index f6ab7c7f7f..0000000000 --- a/WebContent/ITK-INF/themes/example/layout/News.html +++ /dev/null @@ -1,40 +0,0 @@ - -

News

- -

-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. -

- -

-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. -

- -

-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. -

- -

-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. -

- -

-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. -

- -

-In late 2006 IT Mill ensured funding of the new generation of -Millstone. IT Mill Toolkit was released in early 2007. -

- diff --git a/WebContent/ITK-INF/themes/example/layout/Products.html b/WebContent/ITK-INF/themes/example/layout/Products.html deleted file mode 100644 index 1b9b74c128..0000000000 --- a/WebContent/ITK-INF/themes/example/layout/Products.html +++ /dev/null @@ -1,25 +0,0 @@ - -

Top 5 reasons to choose IT Mill Toolkit

- -

-1. High compatibility with web browsers and application servers -

- -

-2. Real savings in cross-browser application development and testing -

- -

-3. Ready-made components that make applications easy to maintain -and easy to extend -

- -

-4. Supports all stages of the application development cycle from -design to maintenance -

- -

-5. Proven in production - since 2001 -

- diff --git a/WebContent/ITK-INF/themes/example/layout/Support.html b/WebContent/ITK-INF/themes/example/layout/Support.html deleted file mode 100644 index aca7e2a66d..0000000000 --- a/WebContent/ITK-INF/themes/example/layout/Support.html +++ /dev/null @@ -1,16 +0,0 @@ - -

Support

- -

-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. -

- -

-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. -

diff --git a/WebContent/ITK-INF/themes/example/layout/Welcome.html b/WebContent/ITK-INF/themes/example/layout/Welcome.html deleted file mode 100644 index 964753da5b..0000000000 --- a/WebContent/ITK-INF/themes/example/layout/Welcome.html +++ /dev/null @@ -1,20 +0,0 @@ - -

Welcome

- -

-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 IT Mill Toolkit - a server-side component -framework for Java EE. IT Mill Toolkit enables creation of highly -usable browser applications in real Java. -

- -

-IT Mill Toolkit 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. -

\ No newline at end of file diff --git a/WebContent/ITK-INF/themes/example/layout/icon_intro.png b/WebContent/ITK-INF/themes/example/layout/icon_intro.png deleted file mode 100644 index 032712985c..0000000000 Binary files a/WebContent/ITK-INF/themes/example/layout/icon_intro.png and /dev/null differ diff --git a/WebContent/ITK-INF/themes/example/layout/mainLayout.html b/WebContent/ITK-INF/themes/example/layout/mainLayout.html deleted file mode 100644 index 5679ecbc62..0000000000 --- a/WebContent/ITK-INF/themes/example/layout/mainLayout.html +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - -

This is an example application that uses custom layouts

- - - - - - - -

- - - - - - - - -

diff --git a/WebContent/ITK-INF/themes/example/layouts/Contact.html b/WebContent/ITK-INF/themes/example/layouts/Contact.html new file mode 100644 index 0000000000..a37425078c --- /dev/null +++ b/WebContent/ITK-INF/themes/example/layouts/Contact.html @@ -0,0 +1,30 @@ + +

Contact Sales

+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. +

+ +

Report a Bug

+If you have found an issue with IT Mill Toolkit, 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 +

+ +

A job for a real expert

+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 +

+ +

You feedback is always welcome

+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! +

diff --git a/WebContent/ITK-INF/themes/example/layouts/Developers.html b/WebContent/ITK-INF/themes/example/layouts/Developers.html new file mode 100644 index 0000000000..50e054a4f4 --- /dev/null +++ b/WebContent/ITK-INF/themes/example/layouts/Developers.html @@ -0,0 +1,17 @@ + +

Developers

+ +

+This section contains information for developers using IT Mill Toolkit +to create Java web applications. +

+ +

+Start by reading the example application walk-through, get familiar +with the application structure and install the development environment. +

+ +

+Simple. You'll be ready to build your own Ajax web applications in +Java language. +

diff --git a/WebContent/ITK-INF/themes/example/layouts/News.html b/WebContent/ITK-INF/themes/example/layouts/News.html new file mode 100644 index 0000000000..f6ab7c7f7f --- /dev/null +++ b/WebContent/ITK-INF/themes/example/layouts/News.html @@ -0,0 +1,40 @@ + +

News

+ +

+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. +

+ +

+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. +

+ +

+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. +

+ +

+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. +

+ +

+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. +

+ +

+In late 2006 IT Mill ensured funding of the new generation of +Millstone. IT Mill Toolkit was released in early 2007. +

+ diff --git a/WebContent/ITK-INF/themes/example/layouts/Products.html b/WebContent/ITK-INF/themes/example/layouts/Products.html new file mode 100644 index 0000000000..1b9b74c128 --- /dev/null +++ b/WebContent/ITK-INF/themes/example/layouts/Products.html @@ -0,0 +1,25 @@ + +

Top 5 reasons to choose IT Mill Toolkit

+ +

+1. High compatibility with web browsers and application servers +

+ +

+2. Real savings in cross-browser application development and testing +

+ +

+3. Ready-made components that make applications easy to maintain +and easy to extend +

+ +

+4. Supports all stages of the application development cycle from +design to maintenance +

+ +

+5. Proven in production - since 2001 +

+ diff --git a/WebContent/ITK-INF/themes/example/layouts/Support.html b/WebContent/ITK-INF/themes/example/layouts/Support.html new file mode 100644 index 0000000000..aca7e2a66d --- /dev/null +++ b/WebContent/ITK-INF/themes/example/layouts/Support.html @@ -0,0 +1,16 @@ + +

Support

+ +

+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. +

+ +

+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. +

diff --git a/WebContent/ITK-INF/themes/example/layouts/Welcome.html b/WebContent/ITK-INF/themes/example/layouts/Welcome.html new file mode 100644 index 0000000000..964753da5b --- /dev/null +++ b/WebContent/ITK-INF/themes/example/layouts/Welcome.html @@ -0,0 +1,20 @@ + +

Welcome

+ +

+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 IT Mill Toolkit - a server-side component +framework for Java EE. IT Mill Toolkit enables creation of highly +usable browser applications in real Java. +

+ +

+IT Mill Toolkit 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. +

\ No newline at end of file diff --git a/WebContent/ITK-INF/themes/example/layouts/icon_intro.png b/WebContent/ITK-INF/themes/example/layouts/icon_intro.png new file mode 100644 index 0000000000..032712985c Binary files /dev/null and b/WebContent/ITK-INF/themes/example/layouts/icon_intro.png differ diff --git a/WebContent/ITK-INF/themes/example/layouts/mainLayout.html b/WebContent/ITK-INF/themes/example/layouts/mainLayout.html new file mode 100644 index 0000000000..5679ecbc62 --- /dev/null +++ b/WebContent/ITK-INF/themes/example/layouts/mainLayout.html @@ -0,0 +1,33 @@ + + + + + + + + + +

This is an example application that uses custom layouts

+ + + + + + + +

+ + + + + + + + +

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ICustomLayout.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/ICustomLayout.java index fd7dea2b4b..7b2bb25a2a 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ICustomLayout.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/ICustomLayout.java @@ -120,9 +120,9 @@ public class ICustomLayout extends ComplexPanel implements Paintable, Layout { return; // Get the HTML-template from client - String template = client.getResource("layout/" + newTemplate + ".html"); + String template = client.getResource("layouts/" + newTemplate + ".html"); if (template == null) { - template = "Layout file layout/" + newTemplate + ".html is missing."; + template = "Layout file layouts/" + newTemplate + ".html is missing."; } else { currentTemplate = newTemplate; } @@ -142,7 +142,7 @@ public class ICustomLayout extends ComplexPanel implements Paintable, Layout { if (parent != null && ((IView) parent).getTheme() != null) ; prefixImgSrcs(getElement(), "../ITK-INF/themes/" + ((IView) parent).getTheme() - + "/layout/"); + + "/layouts/"); } /** Collect locations from template */ diff --git a/src/com/itmill/toolkit/terminal/gwt/server/JsonPaintTarget.java b/src/com/itmill/toolkit/terminal/gwt/server/JsonPaintTarget.java index a4e0fa5db9..7102adde6c 100644 --- a/src/com/itmill/toolkit/terminal/gwt/server/JsonPaintTarget.java +++ b/src/com/itmill/toolkit/terminal/gwt/server/JsonPaintTarget.java @@ -486,7 +486,7 @@ public class JsonPaintTarget implements PaintTarget { tag.addAttribute("\"" + name + "\": \"" + escapeJSON(value) + "\""); if (customLayoutArgumentsOpen && "template".equals(name)) - getPreCachedResources().add("layout/" + value + ".html"); + getPreCachedResources().add("layouts/" + value + ".html"); if(name.equals("locale")) manager.requireLocale(value);