From: Jani Laakso <jani.laakso@itmill.com>
Date: Tue, 9 Oct 2007 09:05:30 +0000 (+0000)
Subject: Refactored WebContent/ITK-INF to WebContent/ITMILL
X-Git-Tag: 6.7.0.beta1~5885
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=a08688e7bb834b0eb15c0e29726bfc0aa9546a36;p=vaadin-framework.git

Refactored WebContent/ITK-INF to WebContent/ITMILL

svn changeset:2463/svn branch:trunk
---

diff --git a/Hosted Mode Browser Linux.launch b/Hosted Mode Browser Linux.launch
index 0c02b9ebd2..55460ba6e4 100644
--- a/Hosted Mode Browser Linux.launch	
+++ b/Hosted Mode Browser Linux.launch	
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/tk-trunk/build/gwt/gwt/gwt-dev-linux.jar"/>
+<listEntry value="/tk-trunk"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
+<listEntry value="4"/>
 </listAttribute>
 <booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
 <stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
diff --git a/Hosted Mode Browser Mac.launch b/Hosted Mode Browser Mac.launch
index 71946f5405..cd912055c6 100644
--- a/Hosted Mode Browser Mac.launch	
+++ b/Hosted Mode Browser Mac.launch	
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;sourceLookupDirector&gt;&#10;&lt;sourceContainers duplicates=&quot;false&quot;&gt;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot;?&amp;gt;&amp;#10;&amp;lt;javaProject name=&amp;quot;tk-trunk&amp;quot;/&amp;gt;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.javaProject&quot;/&gt;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot;?&amp;gt;&amp;#10;&amp;lt;default/&amp;gt;&amp;#10;&quot; typeId=&quot;org.eclipse.debug.core.containerType.default&quot;/&gt;&#10;&lt;/sourceContainers&gt;&#10;&lt;/sourceLookupDirector&gt;&#10;"/>
-<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.google.gwt.dev.GWTShell"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/tk-trunk"/>
+</listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="4"/>
 </listAttribute>
+<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
+<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
+<stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;sourceLookupDirector&gt;&#10;&lt;sourceContainers duplicates=&quot;false&quot;&gt;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot;?&amp;gt;&amp;#10;&amp;lt;javaProject name=&amp;quot;tk-trunk&amp;quot;/&amp;gt;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.javaProject&quot;/&gt;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot;?&amp;gt;&amp;#10;&amp;lt;default/&amp;gt;&amp;#10;&quot; typeId=&quot;org.eclipse.debug.core.containerType.default&quot;/&gt;&#10;&lt;/sourceContainers&gt;&#10;&lt;/sourceLookupDirector&gt;&#10;"/>
 <listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER&quot; javaProject=&quot;GwtClient&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#10;"/>
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/tk-trunk/build/gwt/gwt/gwt-user.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/tk-trunk/build/gwt/gwt/gwt-dev-mac.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/tk-trunk/src&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
 </listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-noserver -whitelist &quot;127.0.0.1  ^http[:][/][/]127[.]0[.]0[.]1[:]8080&quot; -logLevel ALL -out WebContents/gwt -style PRETTY  http://127.0.0.1:8080/tk/com.itmill.toolkit.terminal.gwt.Client/gwt-test.html"/>
+<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.google.gwt.dev.GWTShell"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-noserver -whitelist &quot;127.0.0.1  ^http[:][/][/]127[.]0[.]0[.]1[:]8080&quot; -logLevel ALL -out WebContents/gwt -style PRETTY  http://127.0.0.1:8080/tk-trunk/TestBench/"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="tk-trunk"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-XstartOnFirstThread"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/tk-trunk"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-XstartOnFirstThread -Xms300M -Xmx512M"/>
 </launchConfiguration>
diff --git a/WebContent/ITK-INF/themes/demo/layouts/featurebrowser-mainlayout.html b/WebContent/ITK-INF/themes/demo/layouts/featurebrowser-mainlayout.html
deleted file mode 100644
index ee66b4919e..0000000000
--- a/WebContent/ITK-INF/themes/demo/layouts/featurebrowser-mainlayout.html
+++ /dev/null
@@ -1,241 +0,0 @@
-<html>
-<head>
-<link REL="stylesheet" TYPE="text/css">
-</head>
-
-<body>
-<div id="_UID_main" style="position: absolute; top: 0; left: 0; width: 100%; height: 100%;"><img src="img/header.png" />
-	
-	<div id="_UID_features" style="top: 62px; width: 200px; position: absolute; overflow: auto; left: 0;" location="tree">
-		<div style="width: 100%; height: 100%; border: 1px solid red;">tree</div>
-	</div>
-	
-	<div id="_UID_demo" style="overflow: auto; position: absolute; top: 62px; left: 215px; ">
-	<table width="100%" height="100%" cellspacing="0" cellpadding="0"
-		border="0">
-		<tbody>
-			<tr>
-				<td valign="middle" align="center">
-				<table>
-					<tbody>
-						<tr>
-							<td style="text-align: left;"  location="demo">
-								<div style="width: 100%; height: 100%; border: 1px solid red;">demo</div>
-							</td>
-						</tr>
-					</tbody>
-				</table>
-				</td>
-			</tr>
-		</tbody>
-	</table>
-	</div>
-	
-	<div id="_UID_tabs" style="overflow: hidden; position: absolute; left: 215px;" location="tabsheet">	
-		<div style="width: 100%; height: 100%; border: 1px solid red;">tabsheet</div>
-	</div>
-		
-	<img id="_UID_prop-toggle" src="img/show_properties.png" style=" top: 23px; position: absolute;"/>
-		
-	<div id="_UID_props" style="overflow: hidden; position: absolute; top: 23px; width: 0px;" location="properties">
-		<div style="width: 100%; height: 100%; border: 1px solid red;">properties</div>
-	</div>	
-		
-	<div id="_UID_cntr"
-		style="overflow: hidden; position: absolute; bottom: 10px; left: 0pt; width: 200px; height: 50px;">
-	<table width="100%" height="100%" border="0">
-		<tbody>
-			<tr>
-				<td width="50%" valign="middle" align="center" id="_UID_cntr-left" location="themes">themes</td>
-				<td width="50%" valign="middle" align="center" id="_UID_cntr-right" location="restart">restart</td>
-			</tr>
-		</tbody>
-	</table>
-	</div>
-	
-	<img id="_UID_divider" src="img/tab_handle.png" style="position: absolute;" />
-
-</div>
-
-
-<script type="text/javascript">
-
-/** Recalculate feature browser main layout dimensions for all components */
-_UID_layout = function() {
-
-	// Then animations are needed, this will be reset to true
-	var animationNeeded = false;
-
-	// References to all elements
-	var mainDiv = document.getElementById("_UID_main"); 
-	if (mainDiv == null) { alert("maindiv is null"); return;}
-	var featuresDiv = document.getElementById("_UID_features");
-	var demoDiv = document.getElementById("_UID_demo");
-	var tabsDiv = document.getElementById("_UID_tabs");
-	var propertiesDiv = document.getElementById("_UID_props");
-	var controlDiv = document.getElementById("_UID_cntr");
-	var dividerDiv = document.getElementById("_UID_divider");
-
-	// Logobar height
-	var logoBarHeight = 62;
-
-	// Get whole window contents size
-	document.body.style.padding = 0;
-	document.body.style.margin = 0;	
-	document.body.style.position = "absolute";
-	document.body.style.height = "100%";
-	document.body.style.width = "100%";
-	var width = document.body.offsetWidth;
-	var height = document.body.offsetHeight;
-	mainDiv.style.height = height + "px";
-	mainDiv.style.width = width + "px";
-
-	// Recalc features div dimensions
-	var featuresWidth = 200;
-	var controlHeight = 50;
-	featuresDiv.style.top="" + logoBarHeight + "px";
-	featuresDiv.style.width="" + featuresWidth + "px";
-	featuresDiv.style.height="" + (height-controlHeight-logoBarHeight) + "px";
-
-	// Recalc properties div dimensions
-	if (typeof propertiesDiv.targetWidth == 'undefined') propertiesDiv.targetWidth = 0;
-	var propWidth = Math.floor((propertiesDiv.offsetWidth + propertiesDiv.targetWidth)/2);
-	if (Math.abs(propWidth - propertiesDiv.targetWidth) <= 1) propWidth = propertiesDiv.targetWidth;
-	if (propWidth >width-featuresWidth) propWidth = width-featuresWidth; 
-	if (propWidth < 0) propWidth = 0; 
-	if ((propWidth+1) != (propertiesDiv.targetWidth+1)) animationNeeded=true;
-	var centerWidth = width - propWidth - featuresWidth - 40;
-	propertiesDiv.style.position="absolute";
-	propertiesDiv.style.overflow="hidden";
-	propertiesDiv.style.top="" + 23 + "px";
-	propertiesDiv.style.left="" + (centerWidth + featuresWidth + 40) + "px";
-	propertiesDiv.style.width=propWidth + "px";
-	propertiesDiv.style.height="" + (height - 23) + "px";	
-	var buttonDiv = document.getElementById("_UID_prop-toggle");
-	buttonDiv.style.left = "" + (centerWidth + featuresWidth - 20 + 40) + "px"
-	if (propWidth == 0) { //buttonDiv.src = buttonDiv.showPng; 
-	buttonDiv.style.height = "92px"; }
-	if (propWidth == propertiesDiv.maxWidth) { //buttonDiv.src = buttonDiv.hidePng;
-	 buttonDiv.style.height = "23px"; }
-	buttonDiv.onclick  = function() {
-		var propertiesDiv = document.getElementById("_UID_props");
-		propertiesDiv.targetWidth = propertiesDiv.targetWidth == 0 ? 265 : 0;
-		_UID_layout();
-	};
-
-	// Recalc divider div dimensions
-	if (typeof dividerDiv.demoHeight == 'undefined') dividerDiv.demoHeight = Math.floor(height/2);
-	if (dividerDiv.isActive) {
-		dividerDiv.demoHeight = dividerDiv.mouseY-10 - logoBarHeight;
-		if (dividerDiv.demoHeight < 0) dividerDiv.demoHeight = 0;
-	} else {
-		if (dividerDiv.demoHeight + logoBarHeight > height - 20) dividerDiv.demoHeight = height - 20 - logoBarHeight;
-		if (dividerDiv.demoHeight < 0) dividerDiv.demoHeight = 0;
-	}
-	var dividerHeight = 17;
-	dividerDiv.style.position="absolute";
-	dividerDiv.style.overflow="hidden";
-	dividerDiv.style.top="" + (dividerDiv.demoHeight + logoBarHeight)+ "px";
-	dividerDiv.style.left="" + (15+featuresWidth+Math.round((centerWidth-137)/2)) +"px";
-	dividerDiv.style.width="" + 137 + "px";
-	dividerDiv.style.height="" + dividerHeight + "px";		
-	
-	// Recalc tabs div dimensions
-	tabsDiv.style.position="absolute";
-	tabsDiv.style.overflow="hidden";
-	tabsDiv.style.top="" + (dividerDiv.demoHeight + dividerHeight + logoBarHeight) + "px";
-	tabsDiv.style.left="" + (featuresWidth + 15) + "px";
-	tabsDiv.style.width="" + centerWidth + "px";
-	tabsDiv.style.height="" + (height - dividerDiv.demoHeight - dividerHeight - logoBarHeight) + "px";	
-	_UID_updateTabs();	
-
-	// Recalc demo div dimensions
-	demoDiv.style.position="absolute";
-	demoDiv.style.overflow="auto";
-	demoDiv.style.top="" + logoBarHeight + "px";
-	demoDiv.style.left="" + (featuresWidth + 15) + "px";
-	demoDiv.style.width="" + centerWidth + "px";
-	demoDiv.style.height="" + dividerDiv.demoHeight + "px";	
-	
-	// Recalc control div dimensions
-	// TODO, make floating
-	controlDiv.style.position="absolute";
-	controlDiv.style.overflow="hidden";
-	controlDiv.style.top="" + (height - controlHeight) + "px";
-	controlDiv.style.left="0";
-	controlDiv.style.width="" + featuresWidth + "px";
-	controlDiv.style.height="" + controlHeight + "px";	
-
-	if (animationNeeded) {
-		setTimeout("_UID_layout()",30);
-	}
-};
-
-/** Recalculate tabs content width */
-_UID_updateTabs = function() {
-	try {
-		var tabsDiv = document.getElementById("_UID_tabs");
-		var tabsComponent = itmill.themes.Demo.prototype._UID_elemByIndex(tabsDiv.childNodes,0);
-		if (tabsComponent == null) return;
-		var tabs = itmill.themes.Demo.prototype._UID_elemByIndex(tabsComponent.childNodes,0);
-		if (tabs == null) return;
-		var content = itmill.themes.Demo.prototype._UID_elemByIndex(tabsComponent.childNodes,1);
-		if (content == null) return;
-		content.style.height="" + (tabsDiv.offsetHeight - tabs.offsetHeight-13) + "px";
-		content.style.borderBottom="0";
-		content.style.overflow='auto';
-		var iframe = content.getElementsByTagName("iframe").item(0);
-		if (iframe != null) { 
-			content.style.overflow='hidden';
-			content.style.padding='0';	
-			content.style.height="" + (tabsDiv.offsetHeight - tabs.offsetHeight) + "px";
-			iframe.height=content.style.height;
-			iframe.style.border='0';
-		}
-	} catch (e) {}
-};
-
-/** Helper method. Get element from node array by index */
-_UID_elemByIndex = function(nodeArray, index) {
-	if (typeof nodeArray == 'undefined' || nodeArray == null) return null;
-	var i=0;
-	while (index>=0 && i < nodeArray.length) {
-		while(i < nodeArray.length && nodeArray[i].nodeType != Node.ELEMENT_NODE) i++;
-		if (index == 0) return nodeArray[i];
-		index--; i++;
-	}
-	return null;
-}
-
-_UID_dividerUpdate = function() {
-	var dividerDiv = document.getElementById("_UID_divider");
-	var div = document.getElementById("_UID_main");
-	dividerDiv.isActive = true;
-	div.onmouseup = function() {
-		dividerDiv.isActive = false;
-		div.onmouseup = null;
-		div.onmousemove = null;
-	}
-	div.onmousemove = function(e) {
-		dividerDiv.mouseY = typeof e != 'undefined' ? e.clientY : window.event.clientY;
-		_UID_layout();
-	}
-	return false;
-};
-
-_UID_initFeatureBrowserLayout = function() {
-	var dividerDiv = document.getElementById("_UID_divider");
-	if (dividerDiv == null) alert("no divider div");
-	dividerDiv.isActive = false;
-	dividerDiv.onmousedown = _UID_dividerUpdate;
-	
-	window.onresize=_UID_layout; 
-	_UID_layout();
-};
-
-_UID_initFeatureBrowserLayout();
-
-</script>
-
-</body>
-</html>
\ 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
deleted file mode 100644
index bf64ac4e17..0000000000
Binary files a/WebContent/ITK-INF/themes/demo/layouts/img/header.png and /dev/null 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
deleted file mode 100644
index 0069db75d9..0000000000
Binary files a/WebContent/ITK-INF/themes/demo/layouts/img/hide_properties.png and /dev/null 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
deleted file mode 100644
index 2d37f7ffae..0000000000
Binary files a/WebContent/ITK-INF/themes/demo/layouts/img/m_bg.png and /dev/null 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
deleted file mode 100644
index 6427452419..0000000000
Binary files a/WebContent/ITK-INF/themes/demo/layouts/img/show_properties.png and /dev/null 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
deleted file mode 100644
index ed0c34cabb..0000000000
Binary files a/WebContent/ITK-INF/themes/demo/layouts/img/tab_handle.png and /dev/null differ
diff --git a/WebContent/ITK-INF/themes/demo/styles.css b/WebContent/ITK-INF/themes/demo/styles.css
deleted file mode 100644
index 735fa83e3c..0000000000
--- a/WebContent/ITK-INF/themes/demo/styles.css
+++ /dev/null
@@ -1,6 +0,0 @@
-body, html {
-	background: #e9eced;
-	margin: 0;
-	padding: 0;
-	height: 100%;
-}
\ No newline at end of file
diff --git a/WebContent/ITK-INF/themes/example/layouts/Contact.html b/WebContent/ITK-INF/themes/example/layouts/Contact.html
deleted file mode 100644
index a37425078c..0000000000
--- a/WebContent/ITK-INF/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 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
-</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/ITK-INF/themes/example/layouts/Developers.html b/WebContent/ITK-INF/themes/example/layouts/Developers.html
deleted file mode 100644
index 50e054a4f4..0000000000
--- a/WebContent/ITK-INF/themes/example/layouts/Developers.html
+++ /dev/null
@@ -1,17 +0,0 @@
-
-<h3>Developers</h3>
-
-<p>
-This section contains information for developers using IT Mill Toolkit
-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/ITK-INF/themes/example/layouts/News.html b/WebContent/ITK-INF/themes/example/layouts/News.html
deleted file mode 100644
index f6ab7c7f7f..0000000000
--- a/WebContent/ITK-INF/themes/example/layouts/News.html
+++ /dev/null
@@ -1,40 +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. 
-</p>
-
diff --git a/WebContent/ITK-INF/themes/example/layouts/Products.html b/WebContent/ITK-INF/themes/example/layouts/Products.html
deleted file mode 100644
index 1b9b74c128..0000000000
--- a/WebContent/ITK-INF/themes/example/layouts/Products.html
+++ /dev/null
@@ -1,25 +0,0 @@
-
-<h3>Top 5 reasons to choose IT Mill Toolkit</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/ITK-INF/themes/example/layouts/Support.html b/WebContent/ITK-INF/themes/example/layouts/Support.html
deleted file mode 100644
index aca7e2a66d..0000000000
--- a/WebContent/ITK-INF/themes/example/layouts/Support.html
+++ /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/ITK-INF/themes/example/layouts/Welcome.html b/WebContent/ITK-INF/themes/example/layouts/Welcome.html
deleted file mode 100644
index 964753da5b..0000000000
--- a/WebContent/ITK-INF/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 IT Mill Toolkit - a server-side component
-framework for Java EE. IT Mill Toolkit enables creation of highly
-usable browser applications in real Java.
-</p>
-
-<p>
-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.
-</p>
\ 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
deleted file mode 100644
index 032712985c..0000000000
Binary files a/WebContent/ITK-INF/themes/example/layouts/icon_intro.png and /dev/null differ
diff --git a/WebContent/ITK-INF/themes/example/layouts/mainLayout.html b/WebContent/ITK-INF/themes/example/layouts/mainLayout.html
deleted file mode 100644
index 5679ecbc62..0000000000
--- a/WebContent/ITK-INF/themes/example/layouts/mainLayout.html
+++ /dev/null
@@ -1,33 +0,0 @@
-
-<!-- Toolkit 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/ITK-INF/themes/example/styles.css b/WebContent/ITK-INF/themes/example/styles.css
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/WebContent/ITK-INF/themes/reservr/styles.css b/WebContent/ITK-INF/themes/reservr/styles.css
deleted file mode 100644
index 569fcaf8c6..0000000000
--- a/WebContent/ITK-INF/themes/reservr/styles.css
+++ /dev/null
@@ -1,15 +0,0 @@
-button.important-link {
-	border: 0px;
-	text-align: left;
-	text-decoration: underline;
-	background: none;
-	font-weight: bold;
-}
-button.selected-link {
-	border: 0px;
-	text-align: left;
-	text-decoration: underline;
-	background: #183C6B;
-	font-weight: bold;
-	color: white;
-}
diff --git a/WebContent/ITMILL/themes/demo/layouts/featurebrowser-mainlayout.html b/WebContent/ITMILL/themes/demo/layouts/featurebrowser-mainlayout.html
new file mode 100644
index 0000000000..ee66b4919e
--- /dev/null
+++ b/WebContent/ITMILL/themes/demo/layouts/featurebrowser-mainlayout.html
@@ -0,0 +1,241 @@
+<html>
+<head>
+<link REL="stylesheet" TYPE="text/css">
+</head>
+
+<body>
+<div id="_UID_main" style="position: absolute; top: 0; left: 0; width: 100%; height: 100%;"><img src="img/header.png" />
+	
+	<div id="_UID_features" style="top: 62px; width: 200px; position: absolute; overflow: auto; left: 0;" location="tree">
+		<div style="width: 100%; height: 100%; border: 1px solid red;">tree</div>
+	</div>
+	
+	<div id="_UID_demo" style="overflow: auto; position: absolute; top: 62px; left: 215px; ">
+	<table width="100%" height="100%" cellspacing="0" cellpadding="0"
+		border="0">
+		<tbody>
+			<tr>
+				<td valign="middle" align="center">
+				<table>
+					<tbody>
+						<tr>
+							<td style="text-align: left;"  location="demo">
+								<div style="width: 100%; height: 100%; border: 1px solid red;">demo</div>
+							</td>
+						</tr>
+					</tbody>
+				</table>
+				</td>
+			</tr>
+		</tbody>
+	</table>
+	</div>
+	
+	<div id="_UID_tabs" style="overflow: hidden; position: absolute; left: 215px;" location="tabsheet">	
+		<div style="width: 100%; height: 100%; border: 1px solid red;">tabsheet</div>
+	</div>
+		
+	<img id="_UID_prop-toggle" src="img/show_properties.png" style=" top: 23px; position: absolute;"/>
+		
+	<div id="_UID_props" style="overflow: hidden; position: absolute; top: 23px; width: 0px;" location="properties">
+		<div style="width: 100%; height: 100%; border: 1px solid red;">properties</div>
+	</div>	
+		
+	<div id="_UID_cntr"
+		style="overflow: hidden; position: absolute; bottom: 10px; left: 0pt; width: 200px; height: 50px;">
+	<table width="100%" height="100%" border="0">
+		<tbody>
+			<tr>
+				<td width="50%" valign="middle" align="center" id="_UID_cntr-left" location="themes">themes</td>
+				<td width="50%" valign="middle" align="center" id="_UID_cntr-right" location="restart">restart</td>
+			</tr>
+		</tbody>
+	</table>
+	</div>
+	
+	<img id="_UID_divider" src="img/tab_handle.png" style="position: absolute;" />
+
+</div>
+
+
+<script type="text/javascript">
+
+/** Recalculate feature browser main layout dimensions for all components */
+_UID_layout = function() {
+
+	// Then animations are needed, this will be reset to true
+	var animationNeeded = false;
+
+	// References to all elements
+	var mainDiv = document.getElementById("_UID_main"); 
+	if (mainDiv == null) { alert("maindiv is null"); return;}
+	var featuresDiv = document.getElementById("_UID_features");
+	var demoDiv = document.getElementById("_UID_demo");
+	var tabsDiv = document.getElementById("_UID_tabs");
+	var propertiesDiv = document.getElementById("_UID_props");
+	var controlDiv = document.getElementById("_UID_cntr");
+	var dividerDiv = document.getElementById("_UID_divider");
+
+	// Logobar height
+	var logoBarHeight = 62;
+
+	// Get whole window contents size
+	document.body.style.padding = 0;
+	document.body.style.margin = 0;	
+	document.body.style.position = "absolute";
+	document.body.style.height = "100%";
+	document.body.style.width = "100%";
+	var width = document.body.offsetWidth;
+	var height = document.body.offsetHeight;
+	mainDiv.style.height = height + "px";
+	mainDiv.style.width = width + "px";
+
+	// Recalc features div dimensions
+	var featuresWidth = 200;
+	var controlHeight = 50;
+	featuresDiv.style.top="" + logoBarHeight + "px";
+	featuresDiv.style.width="" + featuresWidth + "px";
+	featuresDiv.style.height="" + (height-controlHeight-logoBarHeight) + "px";
+
+	// Recalc properties div dimensions
+	if (typeof propertiesDiv.targetWidth == 'undefined') propertiesDiv.targetWidth = 0;
+	var propWidth = Math.floor((propertiesDiv.offsetWidth + propertiesDiv.targetWidth)/2);
+	if (Math.abs(propWidth - propertiesDiv.targetWidth) <= 1) propWidth = propertiesDiv.targetWidth;
+	if (propWidth >width-featuresWidth) propWidth = width-featuresWidth; 
+	if (propWidth < 0) propWidth = 0; 
+	if ((propWidth+1) != (propertiesDiv.targetWidth+1)) animationNeeded=true;
+	var centerWidth = width - propWidth - featuresWidth - 40;
+	propertiesDiv.style.position="absolute";
+	propertiesDiv.style.overflow="hidden";
+	propertiesDiv.style.top="" + 23 + "px";
+	propertiesDiv.style.left="" + (centerWidth + featuresWidth + 40) + "px";
+	propertiesDiv.style.width=propWidth + "px";
+	propertiesDiv.style.height="" + (height - 23) + "px";	
+	var buttonDiv = document.getElementById("_UID_prop-toggle");
+	buttonDiv.style.left = "" + (centerWidth + featuresWidth - 20 + 40) + "px"
+	if (propWidth == 0) { //buttonDiv.src = buttonDiv.showPng; 
+	buttonDiv.style.height = "92px"; }
+	if (propWidth == propertiesDiv.maxWidth) { //buttonDiv.src = buttonDiv.hidePng;
+	 buttonDiv.style.height = "23px"; }
+	buttonDiv.onclick  = function() {
+		var propertiesDiv = document.getElementById("_UID_props");
+		propertiesDiv.targetWidth = propertiesDiv.targetWidth == 0 ? 265 : 0;
+		_UID_layout();
+	};
+
+	// Recalc divider div dimensions
+	if (typeof dividerDiv.demoHeight == 'undefined') dividerDiv.demoHeight = Math.floor(height/2);
+	if (dividerDiv.isActive) {
+		dividerDiv.demoHeight = dividerDiv.mouseY-10 - logoBarHeight;
+		if (dividerDiv.demoHeight < 0) dividerDiv.demoHeight = 0;
+	} else {
+		if (dividerDiv.demoHeight + logoBarHeight > height - 20) dividerDiv.demoHeight = height - 20 - logoBarHeight;
+		if (dividerDiv.demoHeight < 0) dividerDiv.demoHeight = 0;
+	}
+	var dividerHeight = 17;
+	dividerDiv.style.position="absolute";
+	dividerDiv.style.overflow="hidden";
+	dividerDiv.style.top="" + (dividerDiv.demoHeight + logoBarHeight)+ "px";
+	dividerDiv.style.left="" + (15+featuresWidth+Math.round((centerWidth-137)/2)) +"px";
+	dividerDiv.style.width="" + 137 + "px";
+	dividerDiv.style.height="" + dividerHeight + "px";		
+	
+	// Recalc tabs div dimensions
+	tabsDiv.style.position="absolute";
+	tabsDiv.style.overflow="hidden";
+	tabsDiv.style.top="" + (dividerDiv.demoHeight + dividerHeight + logoBarHeight) + "px";
+	tabsDiv.style.left="" + (featuresWidth + 15) + "px";
+	tabsDiv.style.width="" + centerWidth + "px";
+	tabsDiv.style.height="" + (height - dividerDiv.demoHeight - dividerHeight - logoBarHeight) + "px";	
+	_UID_updateTabs();	
+
+	// Recalc demo div dimensions
+	demoDiv.style.position="absolute";
+	demoDiv.style.overflow="auto";
+	demoDiv.style.top="" + logoBarHeight + "px";
+	demoDiv.style.left="" + (featuresWidth + 15) + "px";
+	demoDiv.style.width="" + centerWidth + "px";
+	demoDiv.style.height="" + dividerDiv.demoHeight + "px";	
+	
+	// Recalc control div dimensions
+	// TODO, make floating
+	controlDiv.style.position="absolute";
+	controlDiv.style.overflow="hidden";
+	controlDiv.style.top="" + (height - controlHeight) + "px";
+	controlDiv.style.left="0";
+	controlDiv.style.width="" + featuresWidth + "px";
+	controlDiv.style.height="" + controlHeight + "px";	
+
+	if (animationNeeded) {
+		setTimeout("_UID_layout()",30);
+	}
+};
+
+/** Recalculate tabs content width */
+_UID_updateTabs = function() {
+	try {
+		var tabsDiv = document.getElementById("_UID_tabs");
+		var tabsComponent = itmill.themes.Demo.prototype._UID_elemByIndex(tabsDiv.childNodes,0);
+		if (tabsComponent == null) return;
+		var tabs = itmill.themes.Demo.prototype._UID_elemByIndex(tabsComponent.childNodes,0);
+		if (tabs == null) return;
+		var content = itmill.themes.Demo.prototype._UID_elemByIndex(tabsComponent.childNodes,1);
+		if (content == null) return;
+		content.style.height="" + (tabsDiv.offsetHeight - tabs.offsetHeight-13) + "px";
+		content.style.borderBottom="0";
+		content.style.overflow='auto';
+		var iframe = content.getElementsByTagName("iframe").item(0);
+		if (iframe != null) { 
+			content.style.overflow='hidden';
+			content.style.padding='0';	
+			content.style.height="" + (tabsDiv.offsetHeight - tabs.offsetHeight) + "px";
+			iframe.height=content.style.height;
+			iframe.style.border='0';
+		}
+	} catch (e) {}
+};
+
+/** Helper method. Get element from node array by index */
+_UID_elemByIndex = function(nodeArray, index) {
+	if (typeof nodeArray == 'undefined' || nodeArray == null) return null;
+	var i=0;
+	while (index>=0 && i < nodeArray.length) {
+		while(i < nodeArray.length && nodeArray[i].nodeType != Node.ELEMENT_NODE) i++;
+		if (index == 0) return nodeArray[i];
+		index--; i++;
+	}
+	return null;
+}
+
+_UID_dividerUpdate = function() {
+	var dividerDiv = document.getElementById("_UID_divider");
+	var div = document.getElementById("_UID_main");
+	dividerDiv.isActive = true;
+	div.onmouseup = function() {
+		dividerDiv.isActive = false;
+		div.onmouseup = null;
+		div.onmousemove = null;
+	}
+	div.onmousemove = function(e) {
+		dividerDiv.mouseY = typeof e != 'undefined' ? e.clientY : window.event.clientY;
+		_UID_layout();
+	}
+	return false;
+};
+
+_UID_initFeatureBrowserLayout = function() {
+	var dividerDiv = document.getElementById("_UID_divider");
+	if (dividerDiv == null) alert("no divider div");
+	dividerDiv.isActive = false;
+	dividerDiv.onmousedown = _UID_dividerUpdate;
+	
+	window.onresize=_UID_layout; 
+	_UID_layout();
+};
+
+_UID_initFeatureBrowserLayout();
+
+</script>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/WebContent/ITMILL/themes/demo/layouts/img/header.png b/WebContent/ITMILL/themes/demo/layouts/img/header.png
new file mode 100644
index 0000000000..bf64ac4e17
Binary files /dev/null and b/WebContent/ITMILL/themes/demo/layouts/img/header.png differ
diff --git a/WebContent/ITMILL/themes/demo/layouts/img/hide_properties.png b/WebContent/ITMILL/themes/demo/layouts/img/hide_properties.png
new file mode 100644
index 0000000000..0069db75d9
Binary files /dev/null and b/WebContent/ITMILL/themes/demo/layouts/img/hide_properties.png differ
diff --git a/WebContent/ITMILL/themes/demo/layouts/img/m_bg.png b/WebContent/ITMILL/themes/demo/layouts/img/m_bg.png
new file mode 100644
index 0000000000..2d37f7ffae
Binary files /dev/null and b/WebContent/ITMILL/themes/demo/layouts/img/m_bg.png differ
diff --git a/WebContent/ITMILL/themes/demo/layouts/img/show_properties.png b/WebContent/ITMILL/themes/demo/layouts/img/show_properties.png
new file mode 100644
index 0000000000..6427452419
Binary files /dev/null and b/WebContent/ITMILL/themes/demo/layouts/img/show_properties.png differ
diff --git a/WebContent/ITMILL/themes/demo/layouts/img/tab_handle.png b/WebContent/ITMILL/themes/demo/layouts/img/tab_handle.png
new file mode 100644
index 0000000000..ed0c34cabb
Binary files /dev/null and b/WebContent/ITMILL/themes/demo/layouts/img/tab_handle.png differ
diff --git a/WebContent/ITMILL/themes/demo/styles.css b/WebContent/ITMILL/themes/demo/styles.css
new file mode 100644
index 0000000000..735fa83e3c
--- /dev/null
+++ b/WebContent/ITMILL/themes/demo/styles.css
@@ -0,0 +1,6 @@
+body, html {
+	background: #e9eced;
+	margin: 0;
+	padding: 0;
+	height: 100%;
+}
\ No newline at end of file
diff --git a/WebContent/ITMILL/themes/example/layouts/Contact.html b/WebContent/ITMILL/themes/example/layouts/Contact.html
new file mode 100644
index 0000000000..a37425078c
--- /dev/null
+++ b/WebContent/ITMILL/themes/example/layouts/Contact.html
@@ -0,0 +1,30 @@
+
+<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 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
+</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/ITMILL/themes/example/layouts/Developers.html b/WebContent/ITMILL/themes/example/layouts/Developers.html
new file mode 100644
index 0000000000..50e054a4f4
--- /dev/null
+++ b/WebContent/ITMILL/themes/example/layouts/Developers.html
@@ -0,0 +1,17 @@
+
+<h3>Developers</h3>
+
+<p>
+This section contains information for developers using IT Mill Toolkit
+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/ITMILL/themes/example/layouts/News.html b/WebContent/ITMILL/themes/example/layouts/News.html
new file mode 100644
index 0000000000..f6ab7c7f7f
--- /dev/null
+++ b/WebContent/ITMILL/themes/example/layouts/News.html
@@ -0,0 +1,40 @@
+
+<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. 
+</p>
+
diff --git a/WebContent/ITMILL/themes/example/layouts/Products.html b/WebContent/ITMILL/themes/example/layouts/Products.html
new file mode 100644
index 0000000000..1b9b74c128
--- /dev/null
+++ b/WebContent/ITMILL/themes/example/layouts/Products.html
@@ -0,0 +1,25 @@
+
+<h3>Top 5 reasons to choose IT Mill Toolkit</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/ITMILL/themes/example/layouts/Support.html b/WebContent/ITMILL/themes/example/layouts/Support.html
new file mode 100644
index 0000000000..aca7e2a66d
--- /dev/null
+++ b/WebContent/ITMILL/themes/example/layouts/Support.html
@@ -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/ITMILL/themes/example/layouts/Welcome.html b/WebContent/ITMILL/themes/example/layouts/Welcome.html
new file mode 100644
index 0000000000..964753da5b
--- /dev/null
+++ b/WebContent/ITMILL/themes/example/layouts/Welcome.html
@@ -0,0 +1,20 @@
+
+<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 IT Mill Toolkit - a server-side component
+framework for Java EE. IT Mill Toolkit enables creation of highly
+usable browser applications in real Java.
+</p>
+
+<p>
+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.
+</p>
\ No newline at end of file
diff --git a/WebContent/ITMILL/themes/example/layouts/icon_intro.png b/WebContent/ITMILL/themes/example/layouts/icon_intro.png
new file mode 100644
index 0000000000..032712985c
Binary files /dev/null and b/WebContent/ITMILL/themes/example/layouts/icon_intro.png differ
diff --git a/WebContent/ITMILL/themes/example/layouts/mainLayout.html b/WebContent/ITMILL/themes/example/layouts/mainLayout.html
new file mode 100644
index 0000000000..5679ecbc62
--- /dev/null
+++ b/WebContent/ITMILL/themes/example/layouts/mainLayout.html
@@ -0,0 +1,33 @@
+
+<!-- Toolkit 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/ITMILL/themes/example/styles.css b/WebContent/ITMILL/themes/example/styles.css
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/WebContent/ITMILL/themes/reservr/styles.css b/WebContent/ITMILL/themes/reservr/styles.css
new file mode 100644
index 0000000000..569fcaf8c6
--- /dev/null
+++ b/WebContent/ITMILL/themes/reservr/styles.css
@@ -0,0 +1,15 @@
+button.important-link {
+	border: 0px;
+	text-align: left;
+	text-decoration: underline;
+	background: none;
+	font-weight: bold;
+}
+button.selected-link {
+	border: 0px;
+	text-align: left;
+	text-decoration: underline;
+	background: #183C6B;
+	font-weight: bold;
+	color: white;
+}
diff --git a/WebContent/reservr.html b/WebContent/reservr.html
index 20db089d83..ac1270fdf5 100644
--- a/WebContent/reservr.html
+++ b/WebContent/reservr.html
@@ -8,8 +8,8 @@
 		};
 	</script>
 	<script src="http://maps.google.com/maps?file=api&amp;v=2" type="text/javascript"></script>
-	<script language='javascript' src='ITK-INF/widgetsets/com.itmill.toolkit.demo.reservation.gwt.WidgetSet/com.itmill.toolkit.demo.reservation.gwt.WidgetSet.nocache.js'></script>
-	<link REL="stylesheet" TYPE="text/css" HREF="ITK-INF/themes/reservr/styles.css">
+	<script language='javascript' src='ITMILL/widgetsets/com.itmill.toolkit.demo.reservation.gwt.WidgetSet/com.itmill.toolkit.demo.reservation.gwt.WidgetSet.nocache.js'></script>
+	<link REL="stylesheet" TYPE="text/css" HREF="ITMILL/themes/reservr/styles.css">
 </head>
 <body>
 	<iframe id="__gwt_historyFrame" style="width:0;height:0;border:0"></iframe>
diff --git a/build/bin/compile-gwt-components b/build/bin/compile-gwt-components
index d6130d5e88..887aa0265c 100755
--- a/build/bin/compile-gwt-components
+++ b/build/bin/compile-gwt-components
@@ -13,7 +13,7 @@ else
 	PLATFORM="linux"
 fi
 
-rm -r ../../WebContent/ITK-INF/widgetsets/com.itmill.toolkit.terminal.gwt.DefaultWidgetSet/*
-java $JVMVARS -cp "../../src:../gwt/gwt/gwt-user.jar:../gwt/gwt/gwt-dev-$PLATFORM.jar" com.google.gwt.dev.GWTCompiler -out "../../WebContent/ITK-INF/widgetsets" "$@" com.itmill.toolkit.terminal.gwt.DefaultWidgetSet -style DETAILED;
-java $JVMVARS -cp "../../src:../gwt/gwt/gwt-user.jar:../gwt/gwt/gwt-dev-$PLATFORM.jar" com.google.gwt.dev.GWTCompiler -out "../../WebContent/ITK-INF/widgetsets" "$@" com.itmill.toolkit.demo.colorpicker.gwt.WidgetSet -style DETAILED;
-java $JVMVARS -cp "../../src:../gwt/gwt/gwt-user.jar:../../lib/reservr/googlemaps_gwt.jar:../gwt/gwt/gwt-dev-$PLATFORM.jar" com.google.gwt.dev.GWTCompiler -out "../../WebContent/ITK-INF/widgetsets" "$@" com.itmill.toolkit.demo.reservation.gwt.WidgetSet -style DETAILED;
+rm -r ../../WebContent/ITMILL/widgetsets/*
+java $JVMVARS -cp "../../src:../gwt/gwt/gwt-user.jar:../gwt/gwt/gwt-dev-$PLATFORM.jar" com.google.gwt.dev.GWTCompiler -out "../../WebContent/ITMILL/widgetsets" "$@" com.itmill.toolkit.terminal.gwt.DefaultWidgetSet -style DETAILED;
+java $JVMVARS -cp "../../src:../gwt/gwt/gwt-user.jar:../gwt/gwt/gwt-dev-$PLATFORM.jar" com.google.gwt.dev.GWTCompiler -out "../../WebContent/ITMILL/widgetsets" "$@" com.itmill.toolkit.demo.colorpicker.gwt.WidgetSet -style DETAILED;
+java $JVMVARS -cp "../../src:../gwt/gwt/gwt-user.jar:../../lib/reservr/googlemaps_gwt.jar:../gwt/gwt/gwt-dev-$PLATFORM.jar" com.google.gwt.dev.GWTCompiler -out "../../WebContent/ITMILL/widgetsets" "$@" com.itmill.toolkit.demo.reservation.gwt.WidgetSet -style DETAILED;
diff --git a/build/bin/compile-gwt-components.bat b/build/bin/compile-gwt-components.bat
index fb5a2c077e..9d034fd6d8 100644
--- a/build/bin/compile-gwt-components.bat
+++ b/build/bin/compile-gwt-components.bat
@@ -1,2 +1,2 @@
-@java -cp "%~dp0\../../src;%~dp0\bin;%~dp0\../gwt/gwt/gwt-user.jar;%~dp0\../gwt/gwt/gwt-dev-windows.jar" com.google.gwt.dev.GWTCompiler -out "%~dp0\../../WebContent/ITK-INF/widgetsets" %* com.itmill.toolkit.terminal.gwt.DefaultWidgetSet
-@java -cp "%~dp0\../../src;%~dp0\bin;%~dp0\../gwt/gwt/gwt-user.jar;%~dp0\../../lib/reservr/googlemaps_gwt.jar;%~dp0\../gwt/gwt/gwt-dev-windows.jar" com.google.gwt.dev.GWTCompiler -out "%~dp0\../../WebContent/ITK-INF/widgetsets" %* com.itmill.toolkit.demo.reservation.gwt.WidgetSet
\ No newline at end of file
+@java -cp "%~dp0\../../src;%~dp0\bin;%~dp0\../gwt/gwt/gwt-user.jar;%~dp0\../gwt/gwt/gwt-dev-windows.jar" com.google.gwt.dev.GWTCompiler -out "%~dp0\../../WebContent/ITMILL/widgetsets" %* com.itmill.toolkit.terminal.gwt.DefaultWidgetSet
+@java -cp "%~dp0\../../src;%~dp0\bin;%~dp0\../gwt/gwt/gwt-user.jar;%~dp0\../../lib/reservr/googlemaps_gwt.jar;%~dp0\../gwt/gwt/gwt-dev-windows.jar" com.google.gwt.dev.GWTCompiler -out "%~dp0\../../WebContent/ITMILL/widgetsets" %* com.itmill.toolkit.demo.reservation.gwt.WidgetSet
\ No newline at end of file
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 ba143440cf..135a20cce7 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ICustomLayout.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/ICustomLayout.java
@@ -153,7 +153,7 @@ public class ICustomLayout extends ComplexPanel implements Paintable, Container
 		while (parent != null && !(parent instanceof IView))
 			parent = parent.getParent();
 		if (parent != null && ((IView) parent).getTheme() != null) {
-			prefixImgSrcs(getElement(), "../ITK-INF/themes/"
+			prefixImgSrcs(getElement(), "../ITMILL/themes/"
 					+ ((IView) parent).getTheme() + "/layouts/");
 		} else {
 			throw (new IllegalStateException(
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/table/table.css b/src/com/itmill/toolkit/terminal/gwt/public/default/table/table.css
index 914c469958..bd06ccb010 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/table/table.css
+++ b/src/com/itmill/toolkit/terminal/gwt/public/default/table/table.css
@@ -167,5 +167,5 @@
 /* IE specific styles */
 * html .i-table-scrollposition {
 	background: transparent;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../ITK-INF/widgetsets/com.itmill.toolkit.terminal.gwt.DefaultWidgetSet/default/table/img/scroll-position-bg.png", sizingMethod="scale");
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../ITMILL/widgetsets/com.itmill.toolkit.terminal.gwt.DefaultWidgetSet/default/table/img/scroll-position-bg.png", sizingMethod="scale");
 }
\ No newline at end of file
diff --git a/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java b/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java
index a11cb67de0..9f574c8878 100644
--- a/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java
+++ b/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java
@@ -133,14 +133,14 @@ public class ApplicationServlet extends HttpServlet {
 
 	private static final String AJAX_UIDL_URI = "/UIDL/";
 
-	static final String THEME_DIRECTORY_PATH = "ITK-INF/themes/";
+	static final String THEME_DIRECTORY_PATH = "ITMILL/themes/";
 
 	// Maximum delay between request for an user to be considered active (in ms)
 	private static final long ACTIVE_USER_REQUEST_INTERVAL = 1000 * 45;
 
 	private static final int DEFAULT_THEME_CACHETIME = 1000 * 60 * 60 * 24;
 
-	static final String WIDGETSET_DIRECTORY_PATH = "ITK-INF/widgetsets/";
+	static final String WIDGETSET_DIRECTORY_PATH = "ITMILL/widgetsets/";
 	// Name of the default widget set, used if not specified in web.xml
 	private static final String DEFAULT_WIDGETSET = "com.itmill.toolkit.terminal.gwt.DefaultWidgetSet";
 	// Widget set narameter name