[OFBiz] SVN: r4968 - in trunk: applications/accounting/config
applications/accounting/webapp/accounting
applications/accounting/widget applications/content/webapp/content
applications/content/webapp/content/WEB-INF
applications/content/webapp/content/WEB-INF/pagedefs
applications/content/widget applications/content/widget/cms
applications/content/widget/content
applications/content/widget/contentsetup applications/marketing
applications/marketing/webapp/marketing
applications/marketing/webapp/marketing/WEB-INF
applications/marketing/webapp/marketing/WEB-INF/pagedefs
applications/marketing/webapp/marketing/WEB-INF/pagedefs/includes
applications/marketing/webapp/marketing/includes
applications/marketing/webapp/marketing/templates
applications/marketing/widget
applications/party/webapp/partymgr/WEB-INF
applications/party/webapp/partymgr/includes
applications/party/webapp/partymgr/templates
applications/party/widget/partymgr framework/example/webapp/example
framework/example/widget/example
jonesde at svn.ofbiz.org
jonesde at svn.ofbiz.org
Fri May 6 02:38:45 EDT 2005
Author: jonesde
Date: 2005-05-06 01:38:08 -0500 (Fri, 06 May 2005)
New Revision: 4968
Added:
trunk/applications/marketing/webapp/marketing/WEB-INF/pagedefs/includes/appheader.xml
trunk/applications/marketing/webapp/marketing/includes/appheader.ftl
trunk/applications/marketing/widget/
trunk/applications/marketing/widget/CommonScreens.xml
trunk/applications/party/webapp/partymgr/includes/appheader.ftl
Removed:
trunk/applications/accounting/webapp/accounting/main.ftl
trunk/applications/content/webapp/content/WEB-INF/pagedefs/login.xml
trunk/applications/content/webapp/content/WEB-INF/pagedefs/main.xml
trunk/applications/content/webapp/content/login.ftl
trunk/applications/content/webapp/content/main.ftl
trunk/applications/marketing/webapp/marketing/WEB-INF/pagedefs/includes/header.xml
trunk/applications/marketing/webapp/marketing/WEB-INF/pagedefs/login.xml
trunk/applications/marketing/webapp/marketing/includes/appbar.jsp
trunk/applications/marketing/webapp/marketing/includes/errormsg.jsp
trunk/applications/marketing/webapp/marketing/includes/footer.jsp
trunk/applications/marketing/webapp/marketing/includes/header.ftl
trunk/applications/marketing/webapp/marketing/includes/header.jsp
trunk/applications/marketing/webapp/marketing/login.ftl
trunk/applications/marketing/webapp/marketing/main.jsp
trunk/applications/marketing/webapp/marketing/templates/leftbar_template.jsp
trunk/applications/marketing/webapp/marketing/templates/rightbar_template.jsp
trunk/applications/party/webapp/partymgr/includes/header.ftl
trunk/framework/example/webapp/example/main.ftl
Modified:
trunk/applications/accounting/config/AccountingUiLabels.properties
trunk/applications/accounting/widget/CommonScreens.xml
trunk/applications/content/webapp/content/WEB-INF/controller.xml
trunk/applications/content/widget/CommonScreens.xml
trunk/applications/content/widget/cms/CMSScreens.xml
trunk/applications/content/widget/content/ContentScreens.xml
trunk/applications/content/widget/contentsetup/ContentSetupScreens.xml
trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml
trunk/applications/marketing/webapp/marketing/WEB-INF/regions.xml
trunk/applications/marketing/webapp/marketing/templates/main.ftl
trunk/applications/marketing/webapp/marketing/templates/main_template.jsp
trunk/applications/party/webapp/partymgr/WEB-INF/regions.xml
trunk/applications/party/webapp/partymgr/templates/main.ftl
trunk/applications/party/webapp/partymgr/templates/main_template.jsp
trunk/applications/party/widget/partymgr/CommonScreens.xml
trunk/framework/example/widget/example/CommonScreens.xml
Log:
A bunch of cleanups, and a few conversions to screen widget; also changed some messages as mentioned in Jira OFBIZ-227
Modified: trunk/applications/accounting/config/AccountingUiLabels.properties
===================================================================
--- trunk/applications/accounting/config/AccountingUiLabels.properties 2005-05-06 03:27:14 UTC (rev 4967)
+++ trunk/applications/accounting/config/AccountingUiLabels.properties 2005-05-06 06:38:08 UTC (rev 4968)
@@ -111,7 +111,7 @@
AccountingLookupPayment=Lookup Payment
AccountingMainMenu=Main
AccountingMainPage=Accounting Manager Main Page
-AccountingMainPageNote=NOTE: This application is currently in development. This page will change.
+AccountingMainPageNote=Welcome to the Accounting Manager!
AccountingManagerApplication=Accounting Manager Application
AccountingManualTxMenu=Manual Tx
AccountingMethod=Method
Deleted: trunk/applications/accounting/webapp/accounting/main.ftl
===================================================================
--- trunk/applications/accounting/webapp/accounting/main.ftl 2005-05-06 03:27:14 UTC (rev 4967)
+++ trunk/applications/accounting/webapp/accounting/main.ftl 2005-05-06 06:38:08 UTC (rev 4968)
@@ -1,52 +0,0 @@
-<#--
- * Copyright (c) 2003 The Open For Business Project - www.ofbiz.org
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
- * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- *@author Andy Zeneski (jaz at ofbiz.org)
- *@author David E. Jones (jonesde at ofbiz.org)
- *@author Olivier Heintz (olivier.heintz at nereide.biz)
- *@version $Rev$
- *@since 2.1
--->
-
-<table border="0" width="100%" cellspacing="0" cellpadding="0" class="boxoutside">
- <tr>
- <td width="100%">
- <table width="100%" border="0" cellspacing="0" cellpadding="0" class="boxtop">
- <tr>
- <td align="left" width="90%" >
- <div class="boxhead"> ${uiLabelMap.AccountingMainPage}</div>
- </td>
- </tr>
- </table>
- </td>
- </tr>
- <tr>
- <td width="100%">
- <table width="100%" border="0" cellspacing="0" cellpadding="0" class="boxbottom">
- <tr>
- <td>
- <div class="tabletext">${uiLabelMap.AccountingMainPageNote}</div>
- </td>
- </tr>
- </table>
- </td>
- </tr>
-</table>
Modified: trunk/applications/accounting/widget/CommonScreens.xml
===================================================================
--- trunk/applications/accounting/widget/CommonScreens.xml 2005-05-06 03:27:14 UTC (rev 4967)
+++ trunk/applications/accounting/widget/CommonScreens.xml 2005-05-06 06:38:08 UTC (rev 4968)
@@ -75,9 +75,14 @@
<widgets>
<decorator-screen name="main-decorator">
<decorator-section name="body">
- <platform-specific>
- <html><html-template location="component://accounting/webapp/accounting/main.ftl"/></html>
- </platform-specific>
+ <container style="screenlet">
+ <container style="screenlet-header">
+ <label style="boxhead" text="${uiLabelMap.AccountingMainPage}"/>
+ </container>
+ <container style="screenlet-body">
+ <container><label style="tabletext" text="${uiLabelMap.AccountingMainPageNote}"/></container>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -97,4 +102,3 @@
</section>
</screen>
</screens>
-
Modified: trunk/applications/content/webapp/content/WEB-INF/controller.xml
===================================================================
--- trunk/applications/content/webapp/content/WEB-INF/controller.xml 2005-05-06 03:27:14 UTC (rev 4967)
+++ trunk/applications/content/webapp/content/WEB-INF/controller.xml 2005-05-06 06:38:08 UTC (rev 4968)
@@ -1361,8 +1361,8 @@
<!-- View Mappings -->
<view-map name="error" page="/error/error.jsp"/>
- <view-map name="main" page="/main.ftl" type="jpublish"/>
- <view-map name="login" page="/login.ftl" type="jpublish"/>
+ <view-map name="main" type="screen" page="component://content/widget/CommonScreens.xml#main"/>
+ <view-map name="login" type="screen" page="component://content/widget/CommonScreens.xml#login"/>
<view-map name="fonts.fo" page="/fonts.fo.ftl" type="fop"/>
<view-map name="FindWebSite" page="/website/FindWebSite.ftl" type="jpublish"/>
Deleted: trunk/applications/content/webapp/content/WEB-INF/pagedefs/login.xml
===================================================================
--- trunk/applications/content/webapp/content/WEB-INF/pagedefs/login.xml 2005-05-06 03:27:14 UTC (rev 4967)
+++ trunk/applications/content/webapp/content/WEB-INF/pagedefs/login.xml 2005-05-06 06:38:08 UTC (rev 4968)
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<page>
- <template>main</template>
- <property name="title">Login</property>
- <property name="headerItem">login</property>
- <property name="permissionType">none</property>
-</page>
Deleted: trunk/applications/content/webapp/content/WEB-INF/pagedefs/main.xml
===================================================================
--- trunk/applications/content/webapp/content/WEB-INF/pagedefs/main.xml 2005-05-06 03:27:14 UTC (rev 4967)
+++ trunk/applications/content/webapp/content/WEB-INF/pagedefs/main.xml 2005-05-06 06:38:08 UTC (rev 4968)
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<page>
- <template>main</template>
- <property name="title">Main</property>
- <property name="headerItem">main</property>
- <property name="permissionType">none</property>
-</page>
Deleted: trunk/applications/content/webapp/content/login.ftl
===================================================================
--- trunk/applications/content/webapp/content/login.ftl 2005-05-06 03:27:14 UTC (rev 4967)
+++ trunk/applications/content/webapp/content/login.ftl 2005-05-06 06:38:08 UTC (rev 4968)
@@ -1,105 +0,0 @@
-<#--
- * Copyright (c) 2003 The Open For Business Project - www.ofbiz.org
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
- * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- *@author Andy Zeneski (jaz at ofbiz.org)
- *@author Olivier Heintz (olivier.heintz at nereide.biz)
- *@version $Rev:$
- *@since 2.1
--->
-
-<#assign uiLabelMap = requestAttributes.uiLabelMap>
-<#assign previousParams = sessionAttributes._PREVIOUS_PARAMS_?if_exists>
-<#if previousParams?has_content>
- <#assign previousParams = "?" + previousParams>
-</#if>
-
-<#assign username = requestParameters.USERNAME?default((sessionAttributes.autoUserLogin.userLoginId)?default(""))>
-<#if username != "">
- <#assign focusName = false>
-<#else>
- <#assign focusName = true>
-</#if>
-
-<table width='300' border='0' cellpadding='0' cellspacing='0' align='center'>
- <tr>
- <td width='100%' valign='top'>
- <table border='0' width='100%' cellspacing='0' cellpadding='0' class='boxoutside'>
- <tr>
- <td width='100%'>
- <table width='100%' border='0' cellspacing='0' cellpadding='0' class='boxtop'>
- <tr>
- <td valign='middle' align='center'>
- <div class="boxhead">${uiLabelMap.CommonRegistred}</div>
- </td>
- </tr>
- </table>
- </td>
- </tr>
- <tr>
- <td width='100%'>
- <table width='100%' border='0' cellspacing='0' cellpadding='0' class='boxbottom'>
- <tr>
- <td align="center" valign="middle" width='100%'>
- <form method="post" action="<@ofbizUrl>/login${previousParams?if_exists}</@ofbizUrl>" name="loginform" style='margin: 0;'>
- <table width='100%' border='0' cellpadding='0' cellspacing='2'>
- <tr>
- <td align="right">
- <span class="tabletext">${uiLabelMap.CommonUsername} </span>
- </td>
- <td>
- <input type="text" class="inputBox" name="USERNAME" value="${username}" size="20">
- </td>
- </tr>
- <tr>
- <td align="right">
- <span class="tabletext">${uiLabelMap.CommonPassword} </span>
- </td>
- <td align="left">
- <input type="password" class="inputBox" name="PASSWORD" value="" size="20">
- </td>
- </tr>
- <tr>
- <td colspan="2" align="center">
- <!--<a href="javascript:document.loginform.submit()" class="buttontext">[Login]</a>-->
- <input type="submit" value=${uiLabelMap.CommonLogin} class="loginButton">
- </td>
- </tr>
- </table>
- </form>
- </td>
- </tr>
- </table>
- </td>
- </tr>
- </table>
- </td>
- </tr>
-</table>
-
-<script language="JavaScript" type="text/javascript">
-<!--
- <#if focusName>
- document.loginform.USERNAME.focus();
- <#else>
- document.loginform.PASSWORD.focus();
- </#if>
-//-->
-</script>
Deleted: trunk/applications/content/webapp/content/main.ftl
===================================================================
--- trunk/applications/content/webapp/content/main.ftl 2005-05-06 03:27:14 UTC (rev 4967)
+++ trunk/applications/content/webapp/content/main.ftl 2005-05-06 06:38:08 UTC (rev 4968)
@@ -1,50 +0,0 @@
-<#--
- * Copyright (c) 2003 The Open For Business Project - www.ofbiz.org
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
- * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- *@author Andy Zeneski (jaz at ofbiz.org)
- *@version $Rev:$
- *@since 2.2
--->
-
-<TABLE border="0" width='100%' cellspacing='0' cellpadding='0' class='boxoutside'>
- <TR>
- <TD width='100%'>
- <table width='100%' border='0' cellspacing='0' cellpadding='0' class='boxtop'>
- <tr>
- <TD align="left" width='90%' >
- <div class='boxhead'> Content Manager Main Page</div>
- </TD>
- </tr>
- </table>
- </TD>
- </TR>
- <TR>
- <TD width='100%'>
- <table width='100%' border='0' cellspacing='0' cellpadding='0' class='boxbottom'>
- <tr>
- <td>
- <DIV class='tabletext'>NOTE: This application is currently in development. This page will change.</DIV>
- </td>
- </tr>
- </table>
- </TD>
- </TR>
-</TABLE>
Modified: trunk/applications/content/widget/CommonScreens.xml
===================================================================
--- trunk/applications/content/widget/CommonScreens.xml 2005-05-06 03:27:14 UTC (rev 4967)
+++ trunk/applications/content/widget/CommonScreens.xml 2005-05-06 06:38:08 UTC (rev 4968)
@@ -25,7 +25,7 @@
<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-screen.xsd">
- <screen name="main">
+ <screen name="main-decorator">
<section>
<actions>
<!-- base/top/specific map first, then more common map added for shared labels -->
@@ -74,6 +74,36 @@
</widgets>
</section>
</screen>
+
+ <screen name="main">
+ <section>
+ <widgets>
+ <decorator-screen name="main-decorator">
+ <decorator-section name="body">
+ <container style="screenlet">
+ <container style="screenlet-header">
+ <label style="boxhead" text="Content Manager Main Page"/>
+ </container>
+ <container style="screenlet-body">
+ <container><label style="tabletext" text="Welcome to the Content Manager!"/></container>
+ </container>
+ </container>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+ <screen name="login">
+ <section>
+ <widgets>
+ <decorator-screen name="main-decorator">
+ <decorator-section name="body">
+ <platform-specific>
+ <html><html-template location="component://common/webcommon/login.ftl"/></html>
+ </platform-specific>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
</screens>
-
-
Modified: trunk/applications/content/widget/cms/CMSScreens.xml
===================================================================
--- trunk/applications/content/widget/cms/CMSScreens.xml 2005-05-06 03:27:14 UTC (rev 4967)
+++ trunk/applications/content/widget/cms/CMSScreens.xml 2005-05-06 06:38:08 UTC (rev 4968)
@@ -32,7 +32,7 @@
<set field="headerItem" value="CMS"/>
</actions>
<widgets>
- <decorator-screen name="main" location="component://content/widget/CommonScreens.xml" >
+ <decorator-screen name="main-decorator" location="component://content/widget/CommonScreens.xml" >
<decorator-section name="body">
<include-menu name="cms" location="component://content/webapp/content/cms/CMSMenus.xml" />
<decorator-section-include name="body"/>
Modified: trunk/applications/content/widget/content/ContentScreens.xml
===================================================================
--- trunk/applications/content/widget/content/ContentScreens.xml 2005-05-06 03:27:14 UTC (rev 4967)
+++ trunk/applications/content/widget/content/ContentScreens.xml 2005-05-06 06:38:08 UTC (rev 4968)
@@ -31,7 +31,7 @@
<set field="currentContentMenuItemName" from-field="currentContentMenuItemName" from-scope="user"/>
</actions>
<widgets>
- <decorator-screen name="main" location="component://content/widget/CommonScreens.xml">
+ <decorator-screen name="main-decorator" location="component://content/widget/CommonScreens.xml">
<decorator-section name="body">
<include-menu name="content" location="component://content/webapp/content/content/ContentMenus.xml"/>
<decorator-section-include name="body"/>
Modified: trunk/applications/content/widget/contentsetup/ContentSetupScreens.xml
===================================================================
--- trunk/applications/content/widget/contentsetup/ContentSetupScreens.xml 2005-05-06 03:27:14 UTC (rev 4967)
+++ trunk/applications/content/widget/contentsetup/ContentSetupScreens.xml 2005-05-06 06:38:08 UTC (rev 4968)
@@ -28,19 +28,19 @@
<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-screen.xsd">
- <screen name="common">
+ <screen name="common-decorator">
<section>
<actions>
<set field="currentMenuItemName" from-field="currentMenuItemName" from-scope="user"/>
</actions>
- <widgets>
- <decorator-screen name="main" location="component://content/widget/CommonScreens.xml" >
- <decorator-section name="body">
- <include-menu name="contentsetup" location="component://content/webapp/content/contentsetup/ContentSetupMenus.xml" />
- <decorator-section-include name="body"/>
- </decorator-section>
- </decorator-screen>
- </widgets>
+ <widgets>
+ <decorator-screen name="main-decorator" location="component://content/widget/CommonScreens.xml">
+ <decorator-section name="body">
+ <include-menu name="contentsetup" location="component://content/webapp/content/contentsetup/ContentSetupMenus.xml"/>
+ <decorator-section-include name="body"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
</section>
</screen>
@@ -49,16 +49,16 @@
<actions>
<set field="headerItem" value="Content"/>
<set field="currentMenuItemName" from-field="currentMenuItemName" from-scope="user" default-value="FindContent"/>
- <set field="subScreens.ContentPurposeOp" value="ContentPurposeOp" />
- <set field="subScreens.ContentOp" value="ContentOp" />
- <set field="subScreens.assocPrep" value="assocPrep" />
- <set field="subScreens.typeAttr" value="typeAttr" />
- <set field="subScreens.purposeType" value="purposeType" />
- <set field="subScreens.assocType" value="assocType" />
- <set field="subScreens.type" value="type" />
+ <set field="subScreens.ContentPurposeOp" value="ContentPurposeOp"/>
+ <set field="subScreens.ContentOp" value="ContentOp"/>
+ <set field="subScreens.assocPrep" value="assocPrep"/>
+ <set field="subScreens.typeAttr" value="typeAttr"/>
+ <set field="subScreens.purposeType" value="purposeType"/>
+ <set field="subScreens.assocType" value="assocType"/>
+ <set field="subScreens.type" value="type"/>
</actions>
<widgets>
- <include-screen name="${subScreens.${currentMenuItemName}}" />
+ <include-screen name="${subScreens.${currentMenuItemName}}"/>
</widgets>
</section>
</screen>
@@ -73,10 +73,10 @@
<set field="currentMenuItemName" to-scope="user" value="type"/>
</actions>
<widgets>
- <decorator-screen name="common" >
+ <decorator-screen name="common-decorator">
<decorator-section name="body">
- <include-form name="UpdateContentType" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml" />
- <include-form name="AddContentType" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml" />
+ <include-form name="UpdateContentType" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml"/>
+ <include-form name="AddContentType" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -93,10 +93,10 @@
<set field="currentMenuItemName" to-scope="user" value="typeAttr"/>
</actions>
<widgets>
- <decorator-screen name="common" >
+ <decorator-screen name="common-decorator">
<decorator-section name="body">
- <include-form name="UpdateContentTypeAttr" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml" />
- <include-form name="AddContentTypeAttr" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml" />
+ <include-form name="UpdateContentTypeAttr" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml"/>
+ <include-form name="AddContentTypeAttr" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -113,10 +113,10 @@
<set field="currentMenuItemName" to-scope="user" value="assocType"/>
</actions>
<widgets>
- <decorator-screen name="common" >
+ <decorator-screen name="common-decorator">
<decorator-section name="body">
- <include-form name="UpdateContentAssocType" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml" />
- <include-form name="AddContentAssocType" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml" />
+ <include-form name="UpdateContentAssocType" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml"/>
+ <include-form name="AddContentAssocType" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -133,10 +133,10 @@
<set field="currentMenuItemName" to-scope="user" value="purposeType"/>
</actions>
<widgets>
- <decorator-screen name="common" >
+ <decorator-screen name="common-decorator">
<decorator-section name="body">
- <include-form name="UpdateContentPurposeType" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml" />
- <include-form name="AddContentPurposeType" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml" />
+ <include-form name="UpdateContentPurposeType" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml"/>
+ <include-form name="AddContentPurposeType" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -153,10 +153,10 @@
<set field="currentMenuItemName" to-scope="user" value="assocPred"/>
</actions>
<widgets>
- <decorator-screen name="common" >
+ <decorator-screen name="common-decorator">
<decorator-section name="body">
- <include-form name="UpdateContentAssocPredicate" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml" />
- <include-form name="AddContentAssocPredicate" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml" />
+ <include-form name="UpdateContentAssocPredicate" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml"/>
+ <include-form name="AddContentAssocPredicate" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -173,10 +173,10 @@
<set field="currentMenuItemName" to-scope="user" value="contentPurposeOp"/>
</actions>
<widgets>
- <decorator-screen name="common" >
+ <decorator-screen name="common-decorator">
<decorator-section name="body">
- <include-form name="UpdateContentPurposeOperation" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml" />
- <include-form name="AddContentPurposeOperation" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml" />
+ <include-form name="UpdateContentPurposeOperation" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml"/>
+ <include-form name="AddContentPurposeOperation" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -195,7 +195,7 @@
<script location="component://content/widget/contentsetup/userpermprep.bsh"/>
</actions>
<widgets>
- <decorator-screen name="common" >
+ <decorator-screen name="common-decorator">
<decorator-section name="body">
<platform-specific>
<html>
@@ -217,10 +217,10 @@
<set field="currentMenuItemName" to-scope="user" value="contentOp"/>
</actions>
<widgets>
- <decorator-screen name="common" >
+ <decorator-screen name="common-decorator">
<decorator-section name="body">
- <include-form name="UpdateContentOperation" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml" />
- <include-form name="AddContentOperation" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml" />
+ <include-form name="UpdateContentOperation" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml"/>
+ <include-form name="AddContentOperation" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -237,16 +237,13 @@
<set field="currentMenuItemName" to-scope="user" value="contentPurposeOp"/>
</actions>
<widgets>
- <decorator-screen name="common" >
+ <decorator-screen name="common-decorator">
<decorator-section name="body">
- <include-form name="UpdateContentPurpose" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml" />
- <include-form name="AddContentPurpose" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml" />
+ <include-form name="UpdateContentPurpose" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml"/>
+ <include-form name="AddContentPurpose" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
</section>
</screen>
-
-
</screens>
-
Modified: trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml
===================================================================
--- trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml 2005-05-06 03:27:14 UTC (rev 4967)
+++ trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml 2005-05-06 06:38:08 UTC (rev 4968)
@@ -34,6 +34,7 @@
<handler name="jpublish" type="view" class="org.ofbiz.webapp.view.JPublishViewHandler"/>
<handler name="region" type="view" class="org.ofbiz.webapp.view.RegionViewHandler"/>
+ <handler name="screen" type="view" class="org.ofbiz.widget.screen.ScreenWidgetViewHandler"/>
<handler name="ftl" type="view" class="org.ofbiz.webapp.ftl.FreeMarkerViewHandler"/>
<handler name="jsp" type="view" class="org.ofbiz.webapp.view.JspViewHandler"/>
@@ -184,8 +185,8 @@
<!-- View Mappings -->
<view-map name="error" page="/error/error.jsp"/>
- <view-map name="main" type="region"/>
- <view-map name="login" type="jpublish" page="/login.ftl"/>
+ <view-map name="main" type="screen" page="component://marketing/widget/CommonScreens.xml#main"/>
+ <view-map name="login" type="screen" page="component://marketing/widget/CommonScreens.xml#login"/>
<view-map name="EditDataSources" type="region"/>
Copied: trunk/applications/marketing/webapp/marketing/WEB-INF/pagedefs/includes/appheader.xml (from rev 4966, trunk/applications/marketing/webapp/marketing/WEB-INF/pagedefs/includes/header.xml)
Deleted: trunk/applications/marketing/webapp/marketing/WEB-INF/pagedefs/includes/header.xml
===================================================================
--- trunk/applications/marketing/webapp/marketing/WEB-INF/pagedefs/includes/header.xml 2005-05-06 03:27:14 UTC (rev 4967)
+++ trunk/applications/marketing/webapp/marketing/WEB-INF/pagedefs/includes/header.xml 2005-05-06 06:38:08 UTC (rev 4968)
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<page>
- <template>plain</template>
-</page>
\ No newline at end of file
Deleted: trunk/applications/marketing/webapp/marketing/WEB-INF/pagedefs/login.xml
===================================================================
--- trunk/applications/marketing/webapp/marketing/WEB-INF/pagedefs/login.xml 2005-05-06 03:27:14 UTC (rev 4967)
+++ trunk/applications/marketing/webapp/marketing/WEB-INF/pagedefs/login.xml 2005-05-06 06:38:08 UTC (rev 4968)
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<page>
- <template>main</template>
- <property name="title">Login</property>
-</page>
\ No newline at end of file
Modified: trunk/applications/marketing/webapp/marketing/WEB-INF/regions.xml
===================================================================
--- trunk/applications/marketing/webapp/marketing/WEB-INF/regions.xml 2005-05-06 03:27:14 UTC (rev 4967)
+++ trunk/applications/marketing/webapp/marketing/WEB-INF/regions.xml 2005-05-06 06:38:08 UTC (rev 4968)
@@ -4,23 +4,14 @@
xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/regions.xsd">
<define id='MAIN_REGION' template='/templates/main_template.jsp'>
<put section='title'>Application Page</put> <!-- this is a default and is meant to overridden -->
- <put section='header' type="jpublish" content='/includes/header.ftl'/>
<put section='appbar' type="jpublish" content='/includes/appbar.ftl'/>
+ <put section='appheader' type="jpublish" content='/includes/appheader.ftl'/>
<put section='error' type="jpublish" content='/includes/errormsg.ftl'/>
<put section='content' content='/main.jsp'/> <!-- this is a default and is meant to overridden -->
<put section='footer' type="jpublish" content='/includes/footer.ftl'/>
</define>
<!-- ====== Start View Specific Regions ====== -->
- <define id='main' region='MAIN_REGION'>
- <put section='title'>Main Page</put>
- <put section='content' content='/main.jsp'/>
- </define>
- <define id='login' region='MAIN_REGION'>
- <put section='title'>Login Page</put>
- <put section='content' content='/login.jsp'/>
- </define>
-
<define id='EditDataSources' region='MAIN_REGION'>
<put section='title'>Edit Data Sources</put>
<put section='content' content='/datasource/EditDataSources.jsp'/>
Deleted: trunk/applications/marketing/webapp/marketing/includes/appbar.jsp
===================================================================
--- trunk/applications/marketing/webapp/marketing/includes/appbar.jsp 2005-05-06 03:27:14 UTC (rev 4967)
+++ trunk/applications/marketing/webapp/marketing/includes/appbar.jsp 2005-05-06 06:38:08 UTC (rev 4968)
@@ -1,144 +0,0 @@
-<%@ page import="java.util.*, java.net.*" %>
-<%@ page import="org.ofbiz.security.*, org.ofbiz.entity.*" %>
-<%@ page import="org.ofbiz.base.util.*, org.ofbiz.webapp.pseudotag.*, org.ofbiz.webapp.control.*" %>
-<%@ page import="org.ofbiz.securityext.login.*" %>
-
-<%@ taglib uri="ofbizTags" prefix="ofbiz" %>
-
-<jsp:useBean id="security" type="org.ofbiz.security.Security" scope="request" />
-<%String externalLoginKey = LoginWorker.getExternalLoginKey(request);%>
-<%String externalKeyParam = externalLoginKey == null ? "" : "?externalLoginKey=" + externalLoginKey;%>
-
-<ofbiz:if name="userLogin">
-<table align="center" width="100%" border="0" cellspacing="0" cellpadding="0">
- <tr bgcolor="#FFFFFF">
- <td height="15">
- <table width="100%" border="0" cellspacing="0" cellpadding="0">
- <tr>
- <%if(security.hasEntityPermission("PARTYMGR", "_VIEW", session)) {%>
- <td height="15" class="tabdownblock">
- <table width="100%" border="0" cellspacing="0" cellpadding="0">
- <tr>
- <td class="tabdownleft"><a href="<%=response.encodeURL("/partymgr/control/main" + externalKeyParam)%>" title="Party Manager" class="tablink"><img src="<ofbiz:contenturl>/images/spacer.gif</ofbiz:contenturl>" alt="" width="10" height="15" border="0"></a></td>
- <td nowrap="nowrap" class="tabdowncenter"><a href="<%=response.encodeURL("/partymgr/control/main" + externalKeyParam)%>" title="Party Manager" class="tablink">Party</a></td>
- <td class="tabdownright"><a href="<%=response.encodeURL("/partymgr/control/main" + externalKeyParam)%>" title="Party Manager" class="tablink"><img src="<ofbiz:contenturl>/images/spacer.gif</ofbiz:contenturl>" alt="" width="10" height="15" border="0"></a></td>
- </tr>
- <tr><td colspan="3" class="blackarea"><img src="<ofbiz:contenturl>/images/spacer.gif</ofbiz:contenturl>" alt="" height="1"></td></tr>
- <tr><td colspan="3" class="whitearea"><img src="<ofbiz:contenturl>/images/spacer.gif</ofbiz:contenturl>" alt="" height="1"></td></tr>
- </table>
- </td>
- <%}%>
- <%if(security.hasEntityPermission("MARKETING", "_VIEW", session)) {%>
- <td height="15" class="mainblock">
- <table width="100%" border="0" cellspacing="0" cellpadding="0">
- <tr>
- <td class="tabupleft"><a href="<%=response.encodeURL("/marketing/control/main" + externalKeyParam)%>" title="Marketing Manager" class="tablinkselected"><img src="<ofbiz:contenturl>/images/spacer.gif</ofbiz:contenturl>" alt="" width="10" height="15" border="0"></a></td>
- <td nowrap="nowrap" class="tabupcenter"><a href="<%=response.encodeURL("/marketing/control/main" + externalKeyParam)%>" title="Marketing Manager" class="tablinkselected">Marketing</a></td>
- <td class="tabupright"><a href="<%=response.encodeURL("/marketing/control/main" + externalKeyParam)%>" title="Marketing Manager" class="tablinkselected"><img src="<ofbiz:contenturl>/images/spacer.gif</ofbiz:contenturl>" alt="" width="10" height="15" border="0"></a></td>
- </tr>
- </table>
- </td>
- <%}%>
- <%if(security.hasEntityPermission("CATALOG", "_VIEW", session)) {%>
- <td height="15" class="tabdownleft">
- <table width="100%" border="0" cellspacing="0" cellpadding="0">
- <tr>
- <td class="tabdownleft"><a href="<%=response.encodeURL("/catalog/control/main" + externalKeyParam)%>" title="Catalog Manager" class="tablink"><img src="<ofbiz:contenturl>/images/spacer.gif</ofbiz:contenturl>" alt="" width="10" height="15" border="0"></a></td>
- <td nowrap="nowrap" class="tabdowncenter"><a href="<%=response.encodeURL("/catalog/control/main" + externalKeyParam)%>" title="Catalog Manager" class="tablink">Catalog</a></td>
- <td class="tabdownright"><a href="<%=response.encodeURL("/catalog/control/main" + externalKeyParam)%>" title="Catalog Manager" class="tablink"><img src="<ofbiz:contenturl>/images/spacer.gif</ofbiz:contenturl>" alt="" width="10" height="15" border="0"></a></td>
- </tr>
- <tr><td colspan="3" class="blackarea"><img src="<ofbiz:contenturl>/images/spacer.gif</ofbiz:contenturl>" alt="" height="1"></td></tr>
- <tr><td colspan="3" class="whitearea"><img src="<ofbiz:contenturl>/images/spacer.gif</ofbiz:contenturl>" alt="" height="1"></td>
- </tr>
- </table>
- </td>
- <%}%>
- <%if(security.hasEntityPermission("FACILITY", "_VIEW", session)) {%>
- <td height="15" class="tabdownblock">
- <table width="100%" border="0" cellspacing="0" cellpadding="0">
- <tr>
- <td class="tabdownleft"><a href="<%=response.encodeURL("/facility/control/main" + externalKeyParam)%>" title="Facility Manager" class="tablink"><img src="<ofbiz:contenturl>/images/spacer.gif</ofbiz:contenturl>" alt="" width="10" height="15" border="0"></a></td>
- <td nowrap="nowrap" class="tabdowncenter"><a href="<%=response.encodeURL("/facility/control/main" + externalKeyParam)%>" title="Facility Manager" class="tablink">Facility</a></td>
- <td class="tabdownright"><a href="<%=response.encodeURL("/facility/control/main" + externalKeyParam)%>" title="Facility Manager" class="tablink"><img src="<ofbiz:contenturl>/images/spacer.gif</ofbiz:contenturl>" alt="" width="10" height="15" border="0"></a></td>
- </tr>
- <tr><td colspan="3" class="blackarea"><img src="<ofbiz:contenturl>/images/spacer.gif</ofbiz:contenturl>" alt="" height="1"></td></tr>
- <tr><td colspan="3" class="whitearea"><img src="<ofbiz:contenturl>/images/spacer.gif</ofbiz:contenturl>" alt="" height="1"></td></tr>
- </table>
- </td>
- <%}%>
- <%if(security.hasEntityPermission("ORDERMGR", "_VIEW", session)) {%>
- <td height="15" class="tabdownblock">
- <table width="100%" border="0" cellspacing="0" cellpadding="0">
- <tr>
- <td class="tabdownleft"><a href="<%=response.encodeURL("/ordermgr/control/main" + externalKeyParam)%>" title="Order Manager" class="tablink"><img src="<ofbiz:contenturl>/images/spacer.gif</ofbiz:contenturl>" alt="" width="10" height="15" border="0"></a></td>
- <td nowrap="nowrap" class="tabdowncenter"><a href="<%=response.encodeURL("/ordermgr/control/main" + externalKeyParam)%>" title="Order Manager" class="tablink">Order</a></td>
- <td class="tabdownright"><a href="<%=response.encodeURL("/ordermgr/control/main" + externalKeyParam)%>" title="Order Manager" class="tablink"><img src="<ofbiz:contenturl>/images/spacer.gif</ofbiz:contenturl>" alt="" width="10" height="15" border="0"></a></td>
- </tr>
- <tr><td colspan="3" class="blackarea"><img src="<ofbiz:contenturl>/images/spacer.gif</ofbiz:contenturl>" alt="" height="1"></td></tr>
- <tr><td colspan="3" class="whitearea"><img src="<ofbiz:contenturl>/images/spacer.gif</ofbiz:contenturl>" alt="" height="1"></td></tr>
- </table>
- </td>
- <%}%>
- <%if(security.hasEntityPermission("ACCOUNTING", "_VIEW", session)) {%>
- <td height="15" class="tabdownblock">
- <table width="100%" border="0" cellspacing="0" cellpadding="0">
- <tr>
- <td class="tabdownleft"><a href="<%=response.encodeURL("/accounting/control/main" + externalKeyParam)%>" title="Accounting" class="tablink"><img src="<ofbiz:contenturl>/images/spacer.gif</ofbiz:contenturl>" alt="" width="10" height="15" border="0"></a></td>
- <td nowrap="nowrap" class="tabdowncenter"><a href="<%=response.encodeURL("/accounting/control/main" + externalKeyParam)%>" title="Accounting" class="tablink">Accounting</a></td>
- <td class="tabdownright"><a href="<%=response.encodeURL("/accounting/control/main" + externalKeyParam)%>" title="Accounting" class="tablink"><img src="<ofbiz:contenturl>/images/spacer.gif</ofbiz:contenturl>" alt="" width="10" height="15" border="0"></a></td>
- </tr>
- <tr><td colspan="3" class="blackarea"><img src="<ofbiz:contenturl>/images/spacer.gif</ofbiz:contenturl>" alt="" height="1"></td></tr>
- <tr><td colspan="3" class="whitearea"><img src="<ofbiz:contenturl>/images/spacer.gif</ofbiz:contenturl>" alt="" height="1"></td></tr>
- </table>
- </td>
- <%}%>
- <%if(security.hasEntityPermission("WORKEFFORTMGR", "_VIEW", session)) {%>
- <td height="15" class="tabdownblock">
- <table width="100%" border="0" cellspacing="0" cellpadding="0">
- <tr>
- <td class="tabdownleft"><a href="<%=response.encodeURL("/workeffort/control/main" + externalKeyParam)%>" title="WorkEffort" class="tablink"><img src="<ofbiz:contenturl>/images/spacer.gif</ofbiz:contenturl>" alt="" width="10" height="15" border="0"></a></td>
- <td nowrap="nowrap" class="tabdowncenter"><a href="<%=response.encodeURL("/workeffort/control/main" + externalKeyParam)%>" title="WorkEffort" class="tablink">WorkEffort</a></td>
- <td class="tabdownright"><a href="<%=response.encodeURL("/workeffort/control/main" + externalKeyParam)%>" title="WorkEffort" class="tablink"><img src="<ofbiz:contenturl>/images/spacer.gif</ofbiz:contenturl>" alt="" width="10" height="15" border="0"></a></td>
- </tr>
- <tr><td colspan="3" class="blackarea"><img src="<ofbiz:contenturl>/images/spacer.gif</ofbiz:contenturl>" alt="" height="1"></td></tr>
- <tr><td colspan="3" class="whitearea"><img src="<ofbiz:contenturl>/images/spacer.gif</ofbiz:contenturl>" alt="" height="1"></td></tr>
- </table>
- </td>
- <%}%>
- <%if(security.hasEntityPermission("CONTENTMGR", "_VIEW", session)) {%>
- <td height="15" class="tabdownblock">
- <table width="100%" border="0" cellspacing="0" cellpadding="0">
- <tr>
- <td class="tabdownleft"><a href="<%=response.encodeURL("/content/control/main" + externalKeyParam)%>" title="Content Manager" class="tablink"><img src="<ofbiz:contenturl>/images/spacer.gif</ofbiz:contenturl>" alt="" width="10" height="15" border="0"></a></td>
- <td nowrap="nowrap" class="tabdowncenter"><a href="<%=response.encodeURL("/content/control/main" + externalKeyParam)%>" title="Content Manager" class="tablink">Content</a></td>
- <td class="tabdownright"><a href="<%=response.encodeURL("/content/control/main" + externalKeyParam)%>" title="Content Manager" class="tablink"><img src="<ofbiz:contenturl>/images/spacer.gif</ofbiz:contenturl>" alt="" width="10" height="15" border="0"></a></td>
- </tr>
- <tr><td colspan="3" class="blackarea"><img src="<ofbiz:contenturl>/images/spacer.gif</ofbiz:contenturl>" alt="" height="1"></td></tr>
- <tr><td colspan="3" class="whitearea"><img src="<ofbiz:contenturl>/images/spacer.gif</ofbiz:contenturl>" alt="" height="1"></td></tr>
- </table>
- </td>
- <%}%>
- <td height="15" class="tabdownblock">
- <table width="100%" border="0" cellspacing="0" cellpadding="0">
- <tr>
- <td class="tabdownleft"><a href="<%=response.encodeURL("/webtools/control/main" + externalKeyParam)%>" title="WebTools" class="tablink"><img src="<ofbiz:contenturl>/images/spacer.gif</ofbiz:contenturl>" alt="" width="10" height="15" border="0"></a></td>
- <td nowrap="nowrap" class="tabdowncenter"><a href="<%=response.encodeURL("/webtools/control/main" + externalKeyParam)%>" title="WebTools" class="tablink">WebTools</a></td>
- <td class="tabdownright"><a href="<%=response.encodeURL("/webtools/control/main" + externalKeyParam)%>" title="WebTools" class="tablink"><img src="<ofbiz:contenturl>/images/spacer.gif</ofbiz:contenturl>" alt="" width="10" height="15" border="0"></a></td>
- </tr>
- <tr><td colspan="3" class="blackarea"><img src="<ofbiz:contenturl>/images/spacer.gif</ofbiz:contenturl>" alt="" height="1"></td></tr>
- <tr><td colspan="3" class="whitearea"><img src="<ofbiz:contenturl>/images/spacer.gif</ofbiz:contenturl>" alt="" height="1"></td></tr>
- </table>
- </td>
- <td width="100%" style="vertical-align: bottom;">
- <table width="100%" border="0" cellspacing="0" cellpadding="0">
- <tr>
- <td class="whitearea"><img src="<ofbiz:contenturl>/images/spacer.gif</ofbiz:contenturl>" alt="" height="1"></td>
- </tr>
- </table>
- </td>
- </tr>
- </table>
- </td>
- </tr>
-</table>
-</ofbiz:if>
Copied: trunk/applications/marketing/webapp/marketing/includes/appheader.ftl (from rev 4966, trunk/applications/marketing/webapp/marketing/includes/header.ftl)
Deleted: trunk/applications/marketing/webapp/marketing/includes/errormsg.jsp
===================================================================
--- trunk/applications/marketing/webapp/marketing/includes/errormsg.jsp 2005-05-06 03:27:14 UTC (rev 4967)
+++ trunk/applications/marketing/webapp/marketing/includes/errormsg.jsp 2005-05-06 06:38:08 UTC (rev 4968)
@@ -1,9 +0,0 @@
-<%@ page import="org.ofbiz.base.util.*" %><%
-String eventMsgReq = (String)request.getAttribute("_EVENT_MESSAGE_");
-String errorMsgReq = (String)request.getAttribute("_ERROR_MESSAGE_");
-String errorMsgSes = (String)session.getAttribute("_ERROR_MESSAGE_");
-if(errorMsgSes != null) session.removeAttribute("_ERROR_MESSAGE_");
-if(errorMsgReq != null){ %>
-<br/><div class='errorMessage'><%=UtilFormatOut.replaceString(errorMsgReq, "\n", "<br/>")%></div><br/><%} if(errorMsgSes != null) {%>
-<br/><div class='errorMessage'><%=UtilFormatOut.replaceString(errorMsgSes, "\n", "<br/>")%></div><br/><%} if(eventMsgReq != null) {%>
-<br/><div class='eventMessage'><%=UtilFormatOut.replaceString(eventMsgReq, "\n", "<br/>")%></div><br/><%}%>
Deleted: trunk/applications/marketing/webapp/marketing/includes/footer.jsp
===================================================================
--- trunk/applications/marketing/webapp/marketing/includes/footer.jsp 2005-05-06 03:27:14 UTC (rev 4967)
+++ trunk/applications/marketing/webapp/marketing/includes/footer.jsp 2005-05-06 06:38:08 UTC (rev 4968)
@@ -1,6 +0,0 @@
-<br/><br/>
-<div class="tabletext" align="center">
- <div class="tabletext">(c) 2004 The Open For Business Project - <a href="http://www.ofbiz.org" class="tabletext" target="_blank">www.ofbiz.org</a></div>
- <div class="tabletext">Powered By <a href="http://www.ofbiz.org" class="tabletext" target="_blank">OFBiz</a></div>
-</div>
-<br/>
\ No newline at end of file
Deleted: trunk/applications/marketing/webapp/marketing/includes/header.ftl
===================================================================
--- trunk/applications/marketing/webapp/marketing/includes/header.ftl 2005-05-06 03:27:14 UTC (rev 4967)
+++ trunk/applications/marketing/webapp/marketing/includes/header.ftl 2005-05-06 06:38:08 UTC (rev 4968)
@@ -1,40 +0,0 @@
-<#--
- * Copyright (c) 2003 The Open For Business Project - www.ofbiz.org
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
- * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- *@author Andy Zeneski (jaz at ofbiz.org)
- *@version $Rev$
- *@since 2.1
--->
-
-<#assign security = requestAttributes.security>
-<div class="apptitle"> Marketing Manager Application </div>
-<div class="row">
- <div class="col"><a href="<@ofbizUrl>/main</@ofbizUrl>" class="headerButtonLeft">Main</a></div>
- <div class="col"><a href="<@ofbizUrl>/EditDataSources</@ofbizUrl>" class="headerButtonLeft">DataSource</a></div>
- <div class="col"><a href="<@ofbizUrl>/FindMarketingCampaign</@ofbizUrl>" class="headerButtonLeft">Campaign</a></div>
- <div class="col"><a href="<@ofbizUrl>/FindTrackingCode</@ofbizUrl>" class="headerButtonLeft">Tracking</a></div>
- <#if requestAttributes.userLogin?has_content>
- <div class="col-right"><a href="<@ofbizUrl>/logout</@ofbizUrl>" class="headerButtonRight">Logout</a></div>
- <#else>
- <div class="col-right"><a href='<@ofbizUrl>${requestAttributes.checkLoginUrl?if_exists}</@ofbizUrl>' class='headerButtonRight'>Login</a></div>
- </#if>
- <div class="col-fill"> </div>
-</div>
Deleted: trunk/applications/marketing/webapp/marketing/includes/header.jsp
===================================================================
--- trunk/applications/marketing/webapp/marketing/includes/header.jsp 2005-05-06 03:27:14 UTC (rev 4967)
+++ trunk/applications/marketing/webapp/marketing/includes/header.jsp 2005-05-06 06:38:08 UTC (rev 4968)
@@ -1,23 +0,0 @@
-
-<%@ taglib uri="ofbizTags" prefix="ofbiz" %>
-<%@ page import="org.ofbiz.security.*, org.ofbiz.entity.*, org.ofbiz.base.util.*, org.ofbiz.webapp.pseudotag.*, org.ofbiz.webapp.control.*" %>
-<%@ page import="org.ofbiz.common.*" %>
-<%@ page import="java.util.*" %>
-
-<jsp:useBean id="security" type="org.ofbiz.security.Security" scope="request" />
-
-<div class="apptitle"> Marketing Manager Application </div>
-<div class="row">
- <div class="col"><a href="<ofbiz:url>/main</ofbiz:url>" class="headerButtonLeft">Main</a></div>
- <div class="col"><a href="<ofbiz:url>/EditDataSources</ofbiz:url>" class="headerButtonLeft">DataSource</a></div>
- <div class="col"><a href="<ofbiz:url>/FindMarketingCampaign</ofbiz:url>" class="headerButtonLeft">Campaign</a></div>
- <div class="col"><a href="<ofbiz:url>/FindTrackingCode</ofbiz:url>" class="headerButtonLeft">Tracking</a></div>
- <div class="col"><a href="#<%--<ofbiz:url>/FindContactList</ofbiz:url>--%>" class="headerButtonLeft">ContactList</a></div>
- <ofbiz:unless name="userLogin">
- <div class="col-right"><a href='<ofbiz:url><%=LoginWorker.makeLoginUrl(pageContext)%></ofbiz:url>' class='headerButtonRight'>Login</a></div>
- </ofbiz:unless>
- <ofbiz:if name="userLogin">
- <div class="col-right"><a href="<ofbiz:url>/logout</ofbiz:url>" class="headerButtonRight">Logout</a></div>
- </ofbiz:if>
- <div class="col-fill"> </div>
-</div>
Deleted: trunk/applications/marketing/webapp/marketing/login.ftl
===================================================================
--- trunk/applications/marketing/webapp/marketing/login.ftl 2005-05-06 03:27:14 UTC (rev 4967)
+++ trunk/applications/marketing/webapp/marketing/login.ftl 2005-05-06 06:38:08 UTC (rev 4968)
@@ -1,105 +0,0 @@
-<#--
- * Copyright (c) 2003 The Open For Business Project - www.ofbiz.org
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
- * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- *@author Andy Zeneski (jaz at ofbiz.org)
- *@author Olivier Heintz (olivier.heintz at nereide.biz)
- *@version $Rev$
- *@since 2.1
--->
-
-<#assign uiLabelMap = requestAttributes.uiLabelMap>
-<#assign previousParams = sessionAttributes._PREVIOUS_PARAMS_?if_exists>
-<#if previousParams?has_content>
- <#assign previousParams = "?" + previousParams>
-</#if>
-
-<#assign username = requestParameters.USERNAME?default((sessionAttributes.autoUserLogin.userLoginId)?default(""))>
-<#if username != "">
- <#assign focusName = false>
-<#else>
- <#assign focusName = true>
-</#if>
-
-<table width='300' border='0' cellpadding='0' cellspacing='0' align='center'>
- <tr>
- <td width='100%' valign='top'>
- <table border='0' width='100%' cellspacing='0' cellpadding='0' class='boxoutside'>
- <tr>
- <td width='100%'>
- <table width='100%' border='0' cellspacing='0' cellpadding='0' class='boxtop'>
- <tr>
- <td valign='middle' align='center'>
- <div class="boxhead">${uiLabelMap.CommonRegistred}</div>
- </td>
- </tr>
- </table>
- </td>
- </tr>
- <tr>
- <td width='100%'>
- <table width='100%' border='0' cellspacing='0' cellpadding='0' class='boxbottom'>
- <tr>
- <td align="center" valign="middle" width='100%'>
- <form method="post" action="<@ofbizUrl>/login${previousParams?if_exists}</@ofbizUrl>" name="loginform" style='margin: 0;'>
- <table width='100%' border='0' cellpadding='0' cellspacing='2'>
- <tr>
- <td align="right">
- <span class="tabletext">${uiLabelMap.CommonUsername} </span>
- </td>
- <td>
- <input type="text" class="inputBox" name="USERNAME" value="${username}" size="20">
- </td>
- </tr>
- <tr>
- <td align="right">
- <span class="tabletext">${uiLabelMap.CommonPassword} </span>
- </td>
- <td align="left">
- <input type="password" class="inputBox" name="PASSWORD" value="" size="20">
- </td>
- </tr>
- <tr>
- <td colspan="2" align="center">
- <!--<a href="javascript:document.loginform.submit()" class="buttontext">[Login]</a>-->
- <input type="submit" value=${uiLabelMap.CommonLogin} class="loginButton">
- </td>
- </tr>
- </table>
- </form>
- </td>
- </tr>
- </table>
- </td>
- </tr>
- </table>
- </td>
- </tr>
-</table>
-
-<script language="JavaScript" type="text/javascript">
-<!--
- <#if focusName>
- document.loginform.USERNAME.focus();
- <#else>
- document.loginform.PASSWORD.focus();
- </#if>
-//-->
-</script>
Deleted: trunk/applications/marketing/webapp/marketing/main.jsp
===================================================================
--- trunk/applications/marketing/webapp/marketing/main.jsp 2005-05-06 03:27:14 UTC (rev 4967)
+++ trunk/applications/marketing/webapp/marketing/main.jsp 2005-05-06 06:38:08 UTC (rev 4968)
@@ -1,58 +0,0 @@
-<%--
- * Copyright (c) 2001 The Open For Business Project - www.ofbiz.org
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
- * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- *@author David E. Jones
- *@created May 22 2001
- *@version 1.0
---%>
-
-<%@ page import="org.ofbiz.base.util.*" %>
-<%@ page import="org.ofbiz.security.*" %>
-<%@ taglib uri="ofbizTags" prefix="ofbiz" %>
-
-<TABLE border="0" width='100%' cellspacing='0' cellpadding='0' class='boxoutside'>
- <TR>
- <TD width='100%'>
- <table width='100%' border='0' cellspacing='0' cellpadding='0' class='boxtop'>
- <tr>
- <TD align="left" width='90%' >
- <div class='boxhead'> Marketing Manager Main Page</div>
- </TD>
- </tr>
- </table>
- </TD>
- </TR>
- <TR>
- <TD width='100%'>
- <table width='100%' border='0' cellspacing='0' cellpadding='0' class='boxbottom'>
- <tr>
- <td>
- <ofbiz:unless name="userLogin">
- <DIV class='tabletext'>For something interesting make sure you are logged in, try username:admin, password:ofbiz.</DIV>
- <BR>
- </ofbiz:unless>
- <DIV class='tabletext'>NOTE: This application is currently in development. This page will change.</DIV
- </td>
- </tr>
- </table>
- </TD>
- </TR>
-</TABLE>
Deleted: trunk/applications/marketing/webapp/marketing/templates/leftbar_template.jsp
===================================================================
--- trunk/applications/marketing/webapp/marketing/templates/leftbar_template.jsp 2005-05-06 03:27:14 UTC (rev 4967)
+++ trunk/applications/marketing/webapp/marketing/templates/leftbar_template.jsp 2005-05-06 06:38:08 UTC (rev 4968)
@@ -1,14 +0,0 @@
-<%@ taglib uri='regions' prefix='region' %>
-
- <td width='150' valign="top" align="left">
- <region:render section='first'/>
-
- <region:render section='second'/>
-
- <region:render section='third'/>
-
- <region:render section='fourth'/>
-
- <region:render section='fifth'/>
- </td>
- <td width='5'> </td>
Modified: trunk/applications/marketing/webapp/marketing/templates/main.ftl
===================================================================
--- trunk/applications/marketing/webapp/marketing/templates/main.ftl 2005-05-06 03:27:14 UTC (rev 4967)
+++ trunk/applications/marketing/webapp/marketing/templates/main.ftl 2005-05-06 06:38:08 UTC (rev 4968)
@@ -63,10 +63,10 @@
</tr>
</table>
-${pages.get("/includes/appbar.ftl")}
+${common.get("/includes/appbar.ftl")}
<div class="centerarea">
- ${pages.get("/includes/header.ftl")}
+ ${pages.get("/includes/appheader.ftl")}
<div class="contentarea">
<div style="border: 0; margin: 0; padding: 0; width: 100%;">
<table style="border: 0; margin: 0; padding: 0; width: 100%;" cellpadding="0" cellspacing="0">
@@ -84,7 +84,7 @@
</div>
</div>
-${pages.get("/includes/footer.ftl")}
+${common.get("/includes/footer.ftl")}
</body>
</html>
Modified: trunk/applications/marketing/webapp/marketing/templates/main_template.jsp
===================================================================
--- trunk/applications/marketing/webapp/marketing/templates/main_template.jsp 2005-05-06 03:27:14 UTC (rev 4967)
+++ trunk/applications/marketing/webapp/marketing/templates/main_template.jsp 2005-05-06 06:38:08 UTC (rev 4968)
@@ -43,7 +43,7 @@
<region:render section='appbar'/>
<div class="centerarea">
- <region:render section='header'/>
+ <region:render section='appheader'/>
<div class="contentarea">
<div style='border: 0; margin: 0; padding: 0; width: 100%;'>
<table style='border: 0; margin: 0; padding: 0; width: 100%;' cellpadding='0' cellspacing='0'>
Deleted: trunk/applications/marketing/webapp/marketing/templates/rightbar_template.jsp
===================================================================
--- trunk/applications/marketing/webapp/marketing/templates/rightbar_template.jsp 2005-05-06 03:27:14 UTC (rev 4967)
+++ trunk/applications/marketing/webapp/marketing/templates/rightbar_template.jsp 2005-05-06 06:38:08 UTC (rev 4968)
@@ -1,14 +0,0 @@
-<%@ taglib uri='regions' prefix='region' %>
-
- <td width='5'> </td>
- <td width='150' valign="top" align="right">
- <region:render section='first'/>
-
- <region:render section='second'/>
-
- <region:render section='third'/>
-
- <region:render section='fourth'/>
-
- <region:render section='fifth'/>
- </td>
Added: trunk/applications/marketing/widget/CommonScreens.xml
===================================================================
--- trunk/applications/marketing/widget/CommonScreens.xml 2005-05-06 03:27:14 UTC (rev 4967)
+++ trunk/applications/marketing/widget/CommonScreens.xml 2005-05-06 06:38:08 UTC (rev 4968)
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Copyright (c) 2004-2005 The Open For Business Project - www.ofbiz.org
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
+ * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * $Id: CommonScreens.xml 3880 2004-11-07 05:19:34Z jonesde $
+-->
+
+<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-screen.xsd">
+ <screen name="main-decorator">
+ <section>
+ <actions>
+ <!-- base/top/specific map first, then more common map added for shared labels -->
+ <property-map resource="MarketingUiLabels" map-name="uiLabelMap" global="true"/>
+ <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
+
+ <set field="layoutSettings.companyName" from-field="uiLabelMap.ExampleCompanyName" global="true"/>
+ <set field="layoutSettings.companySubtitle" from-field="uiLabelMap.ExampleCompanySubtitle" global="true"/>
+ <set field="layoutSettings.headerImageUrl" value="/images/ofbiz_logo.jpg" global="true"/>
+ <!-- <set field="layoutSettings.headerMiddleBackgroundUrl" value="" global="true"/> -->
+ <!-- <set field="layoutSettings.headerRightBackgroundUrl" value="" global="true"/> -->
+ <set field="activeApp" value="marketing" global="true"/>
+ </actions>
+ <widgets>
+ <!-- render header -->
+ <platform-specific><html><html-template location="component://common/webcommon/includes/header.ftl"/></html></platform-specific>
+ <!-- render appbar -->
+ <platform-specific><html><html-template location="component://common/webcommon/includes/appbar.ftl"/></html></platform-specific>
+
+ <container style="centerarea">
+ <!-- render appheader -->
+ <platform-specific><html><html-template location="component://marketing/webapp/marketing/includes/appheader.ftl"/></html></platform-specific>
+
+ <container style="contentarea">
+ <container style="column-main">
+ <!-- render messages -->
+ <platform-specific><html><html-template location="component://common/webcommon/includes/messages.ftl"/></html></platform-specific>
+ <decorator-section-include name="body"/>
+ </container>
+ </container>
+ </container>
+
+ <!-- render footer -->
+ <platform-specific><html><html-template location="component://common/webcommon/includes/footer.ftl"/></html></platform-specific>
+ </widgets>
+ </section>
+ </screen>
+
+ <screen name="main">
+ <section>
+ <widgets>
+ <decorator-screen name="main-decorator">
+ <decorator-section name="body">
+ <container style="screenlet">
+ <container style="screenlet-header">
+ <label style="boxhead" text="Marketing Manager Main Page"/>
+ </container>
+ <container style="screenlet-body">
+ <container><label style="tabletext" text="Welcome to the Marketing Manager!"/></container>
+ </container>
+ </container>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+ <screen name="login">
+ <section>
+ <widgets>
+ <decorator-screen name="main-decorator">
+ <decorator-section name="body">
+ <platform-specific>
+ <html><html-template location="component://common/webcommon/login.ftl"/></html>
+ </platform-specific>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+</screens>
Property changes on: trunk/applications/marketing/widget/CommonScreens.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:keywords
+ "Id Rev Author"
Name: svn:eol-style
+ native
Modified: trunk/applications/party/webapp/partymgr/WEB-INF/regions.xml
===================================================================
--- trunk/applications/party/webapp/partymgr/WEB-INF/regions.xml 2005-05-06 03:27:14 UTC (rev 4967)
+++ trunk/applications/party/webapp/partymgr/WEB-INF/regions.xml 2005-05-06 06:38:08 UTC (rev 4968)
@@ -4,7 +4,7 @@
xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/regions.xsd">
<define id='MAIN_REGION' template='/templates/main_template.jsp'>
<put section='title'>Application Page</put> <!-- this is a default and is meant to overridden -->
- <put section='header' type="jpublish" content='/includes/header.ftl'/>
+ <put section='appheader' type="jpublish" content='/includes/appheader.ftl'/>
<put section='appbar' type="jpublish" content='/includes/appbar.ftl'/>
<put section='error' type="jpublish" content='/includes/errormsg.ftl'/>
<put section='content' content='/main.jsp'/> <!-- this is a default and is meant to overridden -->
Copied: trunk/applications/party/webapp/partymgr/includes/appheader.ftl (from rev 4966, trunk/applications/party/webapp/partymgr/includes/header.ftl)
Deleted: trunk/applications/party/webapp/partymgr/includes/header.ftl
===================================================================
--- trunk/applications/party/webapp/partymgr/includes/header.ftl 2005-05-06 03:27:14 UTC (rev 4967)
+++ trunk/applications/party/webapp/partymgr/includes/header.ftl 2005-05-06 06:38:08 UTC (rev 4968)
@@ -1,56 +0,0 @@
-<#--
- * Copyright (c) 2003 The Open For Business Project - www.ofbiz.org
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
- * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- *@author Andy Zeneski (jaz at ofbiz.org)
- *@author Olivier Heintz (olivier.heintz at nereide.biz)
- *@version $Rev$
- *@since 2.1
--->
-
-<#if (requestAttributes.uiLabelMap)?exists><#assign uiLabelMap = requestAttributes.uiLabelMap></#if>
-<#if (requestAttributes.security)?exists><#assign security = requestAttributes.security></#if>
-<#if (requestAttributes.userLogin)?exists><#assign userLogin = requestAttributes.userLogin></#if>
-<#if (requestAttributes.checkLoginUrl)?exists><#assign checkLoginUrl = requestAttributes.checkLoginUrl></#if>
-
-<#assign unselectedLeftClassName = "headerButtonLeft">
-<#assign unselectedRightClassName = "headerButtonRight">
-<#assign selectedLeftClassMap = {(page.headerItem)?default("void") : "headerButtonLeftSelected"}>
-<#assign selectedRightClassMap = {(page.headerItem)?default("void") : "headerButtonRightSelected"}>
-
-<div class="apptitle"> ${uiLabelMap.PartyManagerApplication} </div>
-<div class="row">
- <div class="col"><a href="<@ofbizUrl>/main</@ofbizUrl>" class="${selectedLeftClassMap.main?default(unselectedLeftClassName)}">${uiLabelMap.CommonMain}</a></div>
- <div class="col"><a href="<@ofbizUrl>/findparty</@ofbizUrl>" class="${selectedLeftClassMap.find?default(unselectedLeftClassName)}">${uiLabelMap.CommonFind}</a></div>
- <#if security.hasEntityPermission("PARTYMGR", "_CREATE", session)>
- <div class="col"><a href="<@ofbizUrl>/createnew</@ofbizUrl>" class="${selectedLeftClassMap.create?default(unselectedLeftClassName)}">${uiLabelMap.CommonCreate}</a></div>
- </#if>
- <div class="col"><a href="<@ofbizUrl>/pendingcommunications</@ofbizUrl>" class="${selectedLeftClassMap.comm?default(unselectedLeftClassName)}">Comm</a></div>
- <div class="col"><a href="<@ofbizUrl>/showvisits</@ofbizUrl>" class="${selectedLeftClassMap.visits?default(unselectedLeftClassName)}">${uiLabelMap.PartyVisits}</a></div>
- <#if security.hasEntityPermission("SECURITY", "_VIEW", session)>
- <div class="col"><a href="<@ofbizUrl>/FindSecurityGroup</@ofbizUrl>" class="${selectedLeftClassMap.security?default(unselectedLeftClassName)}">${uiLabelMap.CommonSecurity}</a></div>
- </#if>
- <#if userLogin?has_content>
- <div class="col-right"><a href="<@ofbizUrl>/logout</@ofbizUrl>" class="${unselectedRightClassName}">${uiLabelMap.CommonLogout}</a></div>
- <#else>
- <div class="col-right"><a href='<@ofbizUrl>${requestAttributes.checkLoginUrl?if_exists}</@ofbizUrl>' class='${selectedRightClassMap.login?default(unselectedRightClassName)}'>${uiLabelMap.CommonLogin}</a></div>
- </#if>
- <div class="col-fill"> </div>
-</div>
Modified: trunk/applications/party/webapp/partymgr/templates/main.ftl
===================================================================
--- trunk/applications/party/webapp/partymgr/templates/main.ftl 2005-05-06 03:27:14 UTC (rev 4967)
+++ trunk/applications/party/webapp/partymgr/templates/main.ftl 2005-05-06 06:38:08 UTC (rev 4968)
@@ -31,7 +31,7 @@
${common.get("/includes/appbar.ftl")}
<div class="centerarea">
- ${pages.get("/includes/header.ftl")}
+ ${pages.get("/includes/appheader.ftl")}
<div class="contentarea">
<div style='border: 0; margin: 0; padding: 0; width: 100%;'>
<table style='border: 0; margin: 0; padding: 0; width: 100%;' cellpadding='0' cellspacing='0'>
Modified: trunk/applications/party/webapp/partymgr/templates/main_template.jsp
===================================================================
--- trunk/applications/party/webapp/partymgr/templates/main_template.jsp 2005-05-06 03:27:14 UTC (rev 4967)
+++ trunk/applications/party/webapp/partymgr/templates/main_template.jsp 2005-05-06 06:38:08 UTC (rev 4968)
@@ -43,7 +43,7 @@
<region:render section='appbar'/>
<div class="centerarea">
- <region:render section='header'/>
+ <region:render section='appheader'/>
<div class="contentarea">
<div style='border: 0; margin: 0; padding: 0; width: 100%;'>
<table style='border: 0; margin: 0; padding: 0; width: 100%;' cellpadding='0' cellspacing='0'>
Modified: trunk/applications/party/widget/partymgr/CommonScreens.xml
===================================================================
--- trunk/applications/party/widget/partymgr/CommonScreens.xml 2005-05-06 03:27:14 UTC (rev 4967)
+++ trunk/applications/party/widget/partymgr/CommonScreens.xml 2005-05-06 06:38:08 UTC (rev 4968)
@@ -47,7 +47,7 @@
<container style="centerarea">
<!-- render appheader -->
- <platform-specific><html><html-template location="component://party/webapp/partymgr/includes/header.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://party/webapp/partymgr/includes/appheader.ftl"/></html></platform-specific>
<container style="contentarea">
<container style="column-main">
Deleted: trunk/framework/example/webapp/example/main.ftl
===================================================================
--- trunk/framework/example/webapp/example/main.ftl 2005-05-06 03:27:14 UTC (rev 4967)
+++ trunk/framework/example/webapp/example/main.ftl 2005-05-06 06:38:08 UTC (rev 4968)
@@ -1,50 +0,0 @@
-<#--
- * Copyright (c) 2003 The Open For Business Project - www.ofbiz.org
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
- * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- *@author Andy Zeneski (jaz at ofbiz.org)
- *@version $Rev$
- *@since 2.1
--->
-
-<TABLE border="0" width='100%' cellspacing='0' cellpadding='0' class='boxoutside'>
- <TR>
- <TD width='100%'>
- <table width='100%' border='0' cellspacing='0' cellpadding='0' class='boxtop'>
- <tr>
- <TD align="left" width='90%' >
- <div class='boxhead'> Example Main Page</div>
- </TD>
- </tr>
- </table>
- </TD>
- </TR>
- <TR>
- <TD width='100%'>
- <table width='100%' border='0' cellspacing='0' cellpadding='0' class='boxbottom'>
- <tr>
- <td>
- <DIV class='tabletext'>NOTE: This application is currently in development. This page will change.</DIV>
- </td>
- </tr>
- </table>
- </TD>
- </TR>
-</TABLE>
Modified: trunk/framework/example/widget/example/CommonScreens.xml
===================================================================
--- trunk/framework/example/widget/example/CommonScreens.xml 2005-05-06 03:27:14 UTC (rev 4967)
+++ trunk/framework/example/widget/example/CommonScreens.xml 2005-05-06 06:38:08 UTC (rev 4968)
@@ -69,9 +69,20 @@
<widgets>
<decorator-screen name="main-decorator">
<decorator-section name="body">
- <platform-specific>
- <html><html-template location="component://example/webapp/example/main.ftl"/></html>
- </platform-specific>
+ <container style="screenlet">
+ <container style="screenlet-header">
+ <label style="boxhead" text="Example Main Page"/>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <condition><if-empty field-name="userLogin"/></condition>
+ <widgets>
+ <container><label style="tabletext" text="For something interesting make sure you are logged in, try username:admin, password:ofbiz."/></container>
+ </widgets>
+ </section>
+ <container><label style="tabletext" text="Welcome to the Example application!"/></container>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -91,4 +102,3 @@
</section>
</screen>
</screens>
-
More information about the Svn
mailing list