Author: jacopoc
Date: Thu Oct 5 05:42:44 2006
New Revision: 453207
URL:
http://svn.apache.org/viewvc?view=rev&rev=453207Log:
Now the Webtools application uses the common login template.
Removed:
incubator/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/pagedefs/login.xml
incubator/ofbiz/trunk/framework/webtools/webapp/webtools/login.ftl
Modified:
incubator/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml
incubator/ofbiz/trunk/framework/webtools/widget/CommonScreens.xml
Modified: incubator/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml?view=diff&rev=453207&r1=453206&r2=453207==============================================================================
--- incubator/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml (original)
+++ incubator/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml Thu Oct 5 05:42:44 2006
@@ -492,7 +492,7 @@
<!-- View Mappings -->
<view-map name="error" page="/error/error.jsp"/>
<view-map name="main" type="screen" page="component://webtools/widget/CommonScreens.xml#main"/>
- <view-map name="login" type="jpublish" page="/login.ftl"/>
+ <view-map name="login" type="screen" page="component://webtools/widget/CommonScreens.xml#login"/>
<view-map name="ping" type="ftl" page="/ping.ftl"/>
<view-map name="install" type="region"/>
Modified: incubator/ofbiz/trunk/framework/webtools/widget/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/webtools/widget/CommonScreens.xml?view=diff&rev=453207&r1=453206&r2=453207==============================================================================
--- incubator/ofbiz/trunk/framework/webtools/widget/CommonScreens.xml (original)
+++ incubator/ofbiz/trunk/framework/webtools/widget/CommonScreens.xml Thu Oct 5 05:42:44 2006
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-$Id: CommonScreens.xml 7773 2006-06-12 08:41:23Z jonesde $
Copyright 2004-2006 The Apache Software Foundation
@@ -25,7 +24,7 @@
<!-- base/top/specific map first, then more common map added for shared labels -->
<property-map resource="WebtoolsUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
- <set field="layoutSettings.companyName" from-field="uiLabelMap.WebtoolsCompanyName" global="true"/>
+ <set field="layoutSettings.companyName" from-field="uiLabelMap.WebtoolsCompanyName" global="true"/>
<set field="layoutSettings.companyName" from-field="uiLabelMap.WebtoolsCompanyName" global="true"/>
<set field="layoutSettings.companySubtitle" from-field="uiLabelMap.WebtoolsCompanySubtitle" global="true"/>
<set field="layoutSettings.headerImageUrl" value="/images/ofbiz_logo.jpg" global="true"/>
@@ -55,6 +54,19 @@
<decorator-screen name="CommonWebtoolsDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific><html><html-template location="component://webtools/webapp/webtools/main.ftl"/></html></platform-specific>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+ <screen name="login">
+ <section>
+ <widgets>
+ <decorator-screen name="CommonWebtoolsDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <platform-specific>
+ <html><html-template location="component://common/webcommon/login.ftl"/></html>
+ </platform-specific>
</decorator-section>
</decorator-screen>
</widgets>
Locked
