From 95d0dc6e2f7ad9a19aaa6c477decacab8a2ab570 Mon Sep 17 00:00:00 2001 From: Marc Englund Date: Wed, 19 Sep 2007 07:52:24 +0000 Subject: [PATCH] layout -> layouts svn changeset:2324/svn branch:trunk --- .../featurebrowser-mainlayout.html | 0 .../themes/demo/{layout => layouts}/img/header.png | Bin .../{layout => layouts}/img/hide_properties.png | Bin .../themes/demo/{layout => layouts}/img/m_bg.png | Bin .../{layout => layouts}/img/show_properties.png | Bin .../demo/{layout => layouts}/img/tab_handle.png | Bin .../themes/example/{layout => layouts}/Contact.html | 0 .../example/{layout => layouts}/Developers.html | 0 .../themes/example/{layout => layouts}/News.html | 0 .../example/{layout => layouts}/Products.html | 0 .../themes/example/{layout => layouts}/Support.html | 0 .../themes/example/{layout => layouts}/Welcome.html | 0 .../example/{layout => layouts}/icon_intro.png | Bin .../example/{layout => layouts}/mainLayout.html | 0 .../terminal/gwt/client/ui/ICustomLayout.java | 6 +++--- .../terminal/gwt/server/JsonPaintTarget.java | 2 +- 16 files changed, 4 insertions(+), 4 deletions(-) rename WebContent/ITK-INF/themes/demo/{layout => layouts}/featurebrowser-mainlayout.html (100%) rename WebContent/ITK-INF/themes/demo/{layout => layouts}/img/header.png (100%) rename WebContent/ITK-INF/themes/demo/{layout => layouts}/img/hide_properties.png (100%) rename WebContent/ITK-INF/themes/demo/{layout => layouts}/img/m_bg.png (100%) rename WebContent/ITK-INF/themes/demo/{layout => layouts}/img/show_properties.png (100%) rename WebContent/ITK-INF/themes/demo/{layout => layouts}/img/tab_handle.png (100%) rename WebContent/ITK-INF/themes/example/{layout => layouts}/Contact.html (100%) rename WebContent/ITK-INF/themes/example/{layout => layouts}/Developers.html (100%) rename WebContent/ITK-INF/themes/example/{layout => layouts}/News.html (100%) rename WebContent/ITK-INF/themes/example/{layout => layouts}/Products.html (100%) rename WebContent/ITK-INF/themes/example/{layout => layouts}/Support.html (100%) rename WebContent/ITK-INF/themes/example/{layout => layouts}/Welcome.html (100%) rename WebContent/ITK-INF/themes/example/{layout => layouts}/icon_intro.png (100%) rename WebContent/ITK-INF/themes/example/{layout => layouts}/mainLayout.html (100%) diff --git a/WebContent/ITK-INF/themes/demo/layout/featurebrowser-mainlayout.html b/WebContent/ITK-INF/themes/demo/layouts/featurebrowser-mainlayout.html similarity index 100% rename from WebContent/ITK-INF/themes/demo/layout/featurebrowser-mainlayout.html rename to WebContent/ITK-INF/themes/demo/layouts/featurebrowser-mainlayout.html diff --git a/WebContent/ITK-INF/themes/demo/layout/img/header.png b/WebContent/ITK-INF/themes/demo/layouts/img/header.png similarity index 100% rename from WebContent/ITK-INF/themes/demo/layout/img/header.png rename to WebContent/ITK-INF/themes/demo/layouts/img/header.png diff --git a/WebContent/ITK-INF/themes/demo/layout/img/hide_properties.png b/WebContent/ITK-INF/themes/demo/layouts/img/hide_properties.png similarity index 100% rename from WebContent/ITK-INF/themes/demo/layout/img/hide_properties.png rename to WebContent/ITK-INF/themes/demo/layouts/img/hide_properties.png diff --git a/WebContent/ITK-INF/themes/demo/layout/img/m_bg.png b/WebContent/ITK-INF/themes/demo/layouts/img/m_bg.png similarity index 100% rename from WebContent/ITK-INF/themes/demo/layout/img/m_bg.png rename to WebContent/ITK-INF/themes/demo/layouts/img/m_bg.png diff --git a/WebContent/ITK-INF/themes/demo/layout/img/show_properties.png b/WebContent/ITK-INF/themes/demo/layouts/img/show_properties.png similarity index 100% rename from WebContent/ITK-INF/themes/demo/layout/img/show_properties.png rename to WebContent/ITK-INF/themes/demo/layouts/img/show_properties.png diff --git a/WebContent/ITK-INF/themes/demo/layout/img/tab_handle.png b/WebContent/ITK-INF/themes/demo/layouts/img/tab_handle.png similarity index 100% rename from WebContent/ITK-INF/themes/demo/layout/img/tab_handle.png rename to WebContent/ITK-INF/themes/demo/layouts/img/tab_handle.png diff --git a/WebContent/ITK-INF/themes/example/layout/Contact.html b/WebContent/ITK-INF/themes/example/layouts/Contact.html similarity index 100% rename from WebContent/ITK-INF/themes/example/layout/Contact.html rename to WebContent/ITK-INF/themes/example/layouts/Contact.html diff --git a/WebContent/ITK-INF/themes/example/layout/Developers.html b/WebContent/ITK-INF/themes/example/layouts/Developers.html similarity index 100% rename from WebContent/ITK-INF/themes/example/layout/Developers.html rename to WebContent/ITK-INF/themes/example/layouts/Developers.html diff --git a/WebContent/ITK-INF/themes/example/layout/News.html b/WebContent/ITK-INF/themes/example/layouts/News.html similarity index 100% rename from WebContent/ITK-INF/themes/example/layout/News.html rename to WebContent/ITK-INF/themes/example/layouts/News.html diff --git a/WebContent/ITK-INF/themes/example/layout/Products.html b/WebContent/ITK-INF/themes/example/layouts/Products.html similarity index 100% rename from WebContent/ITK-INF/themes/example/layout/Products.html rename to WebContent/ITK-INF/themes/example/layouts/Products.html diff --git a/WebContent/ITK-INF/themes/example/layout/Support.html b/WebContent/ITK-INF/themes/example/layouts/Support.html similarity index 100% rename from WebContent/ITK-INF/themes/example/layout/Support.html rename to WebContent/ITK-INF/themes/example/layouts/Support.html diff --git a/WebContent/ITK-INF/themes/example/layout/Welcome.html b/WebContent/ITK-INF/themes/example/layouts/Welcome.html similarity index 100% rename from WebContent/ITK-INF/themes/example/layout/Welcome.html rename to WebContent/ITK-INF/themes/example/layouts/Welcome.html diff --git a/WebContent/ITK-INF/themes/example/layout/icon_intro.png b/WebContent/ITK-INF/themes/example/layouts/icon_intro.png similarity index 100% rename from WebContent/ITK-INF/themes/example/layout/icon_intro.png rename to WebContent/ITK-INF/themes/example/layouts/icon_intro.png diff --git a/WebContent/ITK-INF/themes/example/layout/mainLayout.html b/WebContent/ITK-INF/themes/example/layouts/mainLayout.html similarity index 100% rename from WebContent/ITK-INF/themes/example/layout/mainLayout.html rename to WebContent/ITK-INF/themes/example/layouts/mainLayout.html 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); -- 2.39.5