[OFBiz] SVN: r7650 - in trunk/applications/content: webapp/content/WEB-INF webapp/content/content webapp/content/data widget widget/content
hansbak@svn.ofbiz.org
hansbak at svn.ofbiz.org
Sun May 21 08:06:33 CDT 2006
Author: hansbak
Date: 2006-05-21 08:06:02 -0500 (Sun, 21 May 2006)
New Revision: 7650
Modified:
trunk/applications/content/webapp/content/WEB-INF/controller.xml
trunk/applications/content/webapp/content/content/ContentForms.xml
trunk/applications/content/webapp/content/data/DataResourceForms.xml
trunk/applications/content/widget/CommonScreens.xml
trunk/applications/content/widget/ContentMenus.xml
trunk/applications/content/widget/content/ContentScreens.xml
trunk/applications/content/widget/content/DataResourceMenus.xml
trunk/applications/content/widget/content/DataResourceScreens.xml
Log:
tried to get the dataresource screens working, a lot better now but still a lot of things not working....
Modified: trunk/applications/content/webapp/content/WEB-INF/controller.xml
===================================================================
--- trunk/applications/content/webapp/content/WEB-INF/controller.xml 2006-05-21 06:52:27 UTC (rev 7649)
+++ trunk/applications/content/webapp/content/WEB-INF/controller.xml 2006-05-21 13:06:02 UTC (rev 7650)
@@ -427,6 +427,10 @@
</request-map>
<!-- ================ DataResourceType Requests ================= -->
+ <request-map uri="findDataResource">
+ <security auth="true" https="true"/>
+ <response name="success" type="view" value="FindDataResource"/>
+ </request-map>
<request-map uri="EditDataResourceType">
<security auth="true" https="true"/>
<response name="success" type="view" value="EditDataResourceType"/>
@@ -665,7 +669,6 @@
<request-map uri="LookupPartyName"><security https="true" auth="true"/><response name="success" type="view" value="LookupPartyName"/></request-map>
<!-- ================ Redirect Content Requests ================= -->
- <!--request-map uri="ContentMenu"><security auth="true" https="true"/><response name="success" type="view" value="ContentMenu"/></request-map-->
<request-map uri="findContent">
<security auth="true" https="true"/>
<response name="success" type="view" value="FindContent"/>
@@ -727,7 +730,10 @@
<!-- DataResource requests -->
<request-map uri="BrowseDataResource"><security auth="true" https="true"/><response name="success" type="view" value="BrowseDataResource"/></request-map>
- <request-map uri="EditDataResource"><security auth="true" https="true"/><response name="success" type="view" value="EditDataResource"/></request-map>
+ <request-map uri="editDataResource">
+ <security auth="true" https="true"/>
+ <response name="success" type="view" value="EditDataResource"/>
+ </request-map>
<request-map uri="AddDataResource"><security auth="true" https="true"/><response name="success" type="view" value="AddDataResource"/></request-map>
<request-map uri="AddDataResourceText"><security auth="true" https="true"/><response name="success" type="view" value="AddDataResourceText"/></request-map>
<request-map uri="AddDataResourceUrl"><security auth="true" https="true"/><response name="success" type="view" value="EditDataResourceUrl"/></request-map>
@@ -1513,10 +1519,7 @@
<response name="success" type="view" value="ViewSimpleContent"/>
</request-map>
- <!-- ================ Find/Lookup Requests ================= -->
- <request-map uri="FindContent"><security auth="true" https="true"/><response name="success" type="view" value="FindContent"/></request-map>
- <request-map uri="FindDataResource"><security auth="true" https="true"/><response name="success" type="view" value="FindDataResource"/></request-map>
- <request-map uri="FindDataResource.ftl"><security auth="true" https="true"/><response name="success" type="view" value="FindDataResource"/></request-map>
+ <!-- ================ Lookup Requests ================= -->
<request-map uri="LookupContent"><security auth="true" https="true"/><response name="success" type="view" value="LookupContent"/></request-map>
<request-map uri="LookupDataResource"><security auth="true" https="true"/><response name="success" type="view" value="LookupDataResource"/></request-map>
@@ -1566,23 +1569,23 @@
<view-map name="EditContentOperation" page="component://content/widget/contentsetup/ContentSetupScreens.xml#EditContentOperation" type="screen"/>
<view-map name="EditContentPurposeOperation" page="component://content/widget/contentsetup/ContentSetupScreens.xml#EditContentPurposeOperation" type="screen"/>
- <view-map name="FindDataResource" page="component://content/widget/data/DataResourceScreens.xml#FindDataResource" type="screen"/>
- <view-map name="UploadImage" page="component://content/widget/data/DataResourceScreens.xml#UploadImage" type="screen"/>
- <view-map name="EditDataResource" page="component://content/widget/data/DataResourceScreens.xml#EditDataResource" type="screen"/>
- <view-map name="AddDataResource" page="component://content/widget/data/DataResourceScreens.xml#AddDataResource" type="screen"/>
- <view-map name="AddDataResourceText" page="component://content/widget/data/DataResourceScreens.xml#AddDataResourceText" type="screen"/>
- <view-map name="AddDataResourceUrl" page="component://content/widget/data/DataResourceScreens.xml#AddDataResourceUrl" type="screen"/>
- <view-map name="AddDataResourceUpload" page="component://content/widget/data/DataResourceScreens.xml#AddDataResourceUpload" type="screen"/>
- <view-map name="EditDataResourceText" page="component://content/widget/data/DataResourceScreens.xml#EditDataResourceText" type="screen"/>
- <view-map name="EditDataResourceUrl" page="component://content/widget/data/DataResourceScreens.xml#EditDataResourceUrl" type="screen"/>
- <view-map name="EditDataResourceUpload" page="component://content/widget/data/DataResourceScreens.xml#EditDataResourceUpload" type="screen"/>
- <view-map name="EditElectronicText" page="component://content/widget/data/DataResourceScreens.xml#EditElectronicText" type="screen"/>
- <view-map name="EditDataResourceAttribute" page="component://content/widget/data/DataResourceScreens.xml#EditDataResourceAttribute" type="screen"/>
- <view-map name="EditDataResourceRole" page="component://content/widget/data/DataResourceScreens.xml#EditDataResourceRole" type="screen"/>
- <view-map name="EditDataResourceProductFeatures" page="component://content/widget/data/DataResourceScreens.xml#EditDataResourceProductFeatures" type="screen"/>
- <view-map name="EditHtmlText" page="component://content/widget/data/DataResourceScreens.xml#EditHtmlText" type="screen"/>
+ <view-map name="FindDataResource" page="component://content/widget/content/DataResourceScreens.xml#FindDataResource" type="screen"/>
+ <view-map name="UploadImage" page="component://content/widget/content/DataResourceScreens.xml#UploadImage" type="screen"/>
+ <view-map name="EditDataResource" page="component://content/widget/content/DataResourceScreens.xml#EditDataResource" type="screen"/>
+ <view-map name="AddDataResource" page="component://content/widget/content/DataResourceScreens.xml#AddDataResource" type="screen"/>
+ <view-map name="AddDataResourceText" page="component://content/widget/content/DataResourceScreens.xml#AddDataResourceText" type="screen"/>
+ <view-map name="AddDataResourceUrl" page="component://content/widget/content/DataResourceScreens.xml#AddDataResourceUrl" type="screen"/>
+ <view-map name="AddDataResourceUpload" page="component://content/widget/content/DataResourceScreens.xml#AddDataResourceUpload" type="screen"/>
+ <view-map name="EditDataResourceText" page="component://content/widget/content/DataResourceScreens.xml#EditDataResourceText" type="screen"/>
+ <view-map name="EditDataResourceUrl" page="component://content/widget/content/DataResourceScreens.xml#EditDataResourceUrl" type="screen"/>
+ <view-map name="EditDataResourceUpload" page="component://content/widget/content/DataResourceScreens.xml#EditDataResourceUpload" type="screen"/>
+ <view-map name="EditElectronicText" page="component://content/widget/content/DataResourceScreens.xml#EditElectronicText" type="screen"/>
+ <view-map name="EditDataResourceAttribute" page="component://content/widget/content/DataResourceScreens.xml#EditDataResourceAttribute" type="screen"/>
+ <view-map name="EditDataResourceRole" page="component://content/widget/content/DataResourceScreens.xml#EditDataResourceRole" type="screen"/>
+ <view-map name="EditDataResourceProductFeatures" page="component://content/widget/content/DataResourceScreens.xml#EditDataResourceProductFeatures" type="screen"/>
+ <view-map name="EditHtmlText" page="component://content/widget/content/DataResourceScreens.xml#EditHtmlText" type="screen"/>
- <view-map name="BrowseDataResource" page="/data/BrowseDataResource.ftl" type="jpublish"/>
+ <view-map name="BrowseDataResource" page="/content/BrowseDataResource.ftl" type="jpublish"/>
<view-map name="EditDataResourceType" page="/datasetup/EditDataResourceType.ftl" type="jpublish"/>
<view-map name="EditDataResourceTypeAttr" page="/datasetup/EditDataResourceTypeAttr.ftl" type="jpublish"/>
@@ -1675,7 +1678,7 @@
<view-map name="LookupSubContent" page="/layout/LookupSubContent.ftl" type="jpublish"/>
<view-map name="LookupContent" page="component://content/widget/content/ContentScreens.xml#LookupContent" type="screen"/>
- <view-map name="LookupDataResource" page="component://content/widget/data/DataScreens.xml#LookupDataResource" type="screen"/>
+ <view-map name="LookupDataResource" page="component://content/widget/content/DataScreens.xml#LookupDataResource" type="screen"/>
<view-map name="LookupSurvey" page="component://content/widget/SurveyScreens.xml#LookupSurvey" type="screen"/>
<view-map name="LookupSurveyResponse" page="component://content/widget/SurveyScreens.xml#LookupSurveyResponse" type="screen"/>
<!-- end of view mappings -->
Modified: trunk/applications/content/webapp/content/content/ContentForms.xml
===================================================================
--- trunk/applications/content/webapp/content/content/ContentForms.xml 2006-05-21 06:52:27 UTC (rev 7649)
+++ trunk/applications/content/webapp/content/content/ContentForms.xml 2006-05-21 13:06:02 UTC (rev 7650)
@@ -17,12 +17,12 @@
under the License.
-->
-<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-form.xsd">
+<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="../../../../../framework/widget/dtd/widget-form.xsd">
<form name="FindContent" default-title-style="tableheadtext"
default-tooltip-style="tabletext" default-widget-style="inputBox"
- target="FindContent" title="" type="single">
+ target="findContent" title="" type="single">
<!--auto-fields-entity entity-name="Content" default-field-type="find" /-->
<field name="noConditionFind"><hidden value="Y"/></field>
<field name="contentId"><text-find default-option="contains" ignore-case="true"/></field>
@@ -47,11 +47,16 @@
<field name="statusId">
<drop-down allow-empty="true">
<entity-options description="${description}" entity-name="StatusItem">
- <entity-constraint name="statusTypeId" operator="equals" value="CONTENT_STATUS "/>
+ <entity-constraint name="statusTypeId" operator="equals" value="CONTENT_STATUS"/>
</entity-options>
</drop-down>
</field>
<field name="createdByUserLogin" position="2"><lookup target-form-name="LookupPerson"/></field>
+ <field name="localeString">
+ <drop-down allow-empty="true">
+ <entity-options entity-name="CountryCode" description="${countryName}[${countryCode}]" key-field-name="countryCode"/>
+ </drop-down>
+ </field>
<field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
@@ -72,6 +77,7 @@
<field name="contentName"><display/></field>
<field name="description"><display/></field>
<field name="statusId"><display-entity entity-name="StatusItem"></display-entity></field>
+ <field name="localeString"><display-entity entity-name="CountryCode" key-field-name="countryCode" description="${countryName}[${countryCode}]"></display-entity></field>
<field name="contentTypeId"><display-entity entity-name="ContentType"></display-entity></field>
<field name="mimeTypeId"><display-entity entity-name="MimeType"></display-entity></field>
<field name="dataResourceId"><display/></field>
Modified: trunk/applications/content/webapp/content/data/DataResourceForms.xml
===================================================================
--- trunk/applications/content/webapp/content/data/DataResourceForms.xml 2006-05-21 06:52:27 UTC (rev 7649)
+++ trunk/applications/content/webapp/content/data/DataResourceForms.xml 2006-05-21 13:06:02 UTC (rev 7650)
@@ -1,62 +1,84 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
- * Copyright (c) 2003-2006 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$
+
+ Copyright 2001-2006 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ use this file except in compliance with the License. You may obtain a copy of
+ the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ License for the specific language governing permissions and limitations
+ under the License.
-->
-<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-form.xsd">
- <!-- DataResourceType forms -->
- <form name="findDataResource" default-entity-name="DataResource" target="FindDataResource" title="" type="single"
+<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="../../../../../framework/widget/dtd/widget-form.xsd">
+ <!-- DataResource forms -->
+ <form name="FindDataResource" target="findDataResource" title="" type="single"
default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
- <auto-fields-entity entity-name="DataResource" default-field-type="find"/>
+ <!--auto-fields-entity entity-name="DataResource" default-field-type="find"/-->
+ <field name="noConditionFind"><hidden value="Y"/></field>
+ <field name="dataResourceId"><text-find default-option="contains" ignore-case="true"/></field>
+ <field name="dataResourceName"><text-find default-option="contains" ignore-case="true"/></field>
<field name="dataResourceTypeId">
<drop-down allow-empty="true">
<entity-options description="${description}" entity-name="DataResourceType" key-field-name="dataResourceTypeId"/>
</drop-down>
</field>
- <field name="mimeTypeId">
+ <field name="mimeTypeId" position="2">
<drop-down allow-empty="true">
<entity-options description="${description}" entity-name="MimeType" key-field-name="mimeTypeId"/>
</drop-down>
</field>
- <field name="characterSetId">
+ <field name="statusId">
<drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="CharacterSet" key-field-name="characterSetId"/>
+ <entity-options description="${description}" entity-name="StatusItem">
+ <entity-constraint name="statusTypeId" operator="equals" value="CONTENT_STATUS"/>
+ </entity-options>
</drop-down>
</field>
- <field name="submitButton" title="Find" widget-style="smallSubmit"><submit button-type="button"/></field>
+ <field name="localeString" position="2">
+ <drop-down allow-empty="true">
+ <entity-options entity-name="CountryCode" description="${countryName}[${countryCode}]" key-field-name="countryCode"/>
+ </drop-down>
+ </field>
+ <field name="createdByUserLogin" position="1"><lookup target-form-name="LookupPerson"/></field>
+ <field name="dataCategoryId" position="2">
+ <drop-down>
+ <entity-options description="${categoryName}" entity-name="DataCategory"/>
+ </drop-down>
+ </field>
+ <field name="searchButton" title="Find" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="listFindDataResource" list-name="entityList" paginate-target="FindDataResource" title="" type="list"
- default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="display">
+
+ <form name="ListDataResource" paginate-target="findDataResource" title="" type="list" list-name="listIt" default-entity-name="DataResource"
+ default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="tabletext">
<actions>
<service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
<field-map field-name="inputFields" env-name="parameters"/>
- <field-map field-name="entityName" env-name="entityName" value="DataResource"/>
+ <field-map field-name="entityName" value="DataResource"/>
+ <field-map field-name="orderBy" value="dataResourceId"/>
+ <field-map field-name="noConditionFind" value="Y"/>
</service>
</actions>
- <auto-fields-entity entity-name="DataResource" default-field-type="display"/>
<field name="dataResourceId" title="" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${dataResourceId}" target="gotoDataResource?dataResourceId=${dataResourceId}"/>
+ <hyperlink also-hidden="false" description="${dataResourceId}" target="editDataResource?dataResourceId=${dataResourceId}"/>
</field>
+ <field name="dataResourceName"><display/></field>
+ <field name="dataResourceTypeId"><display-entity entity-name="DataResourceType" description="${description}"></display-entity></field>
+ <field name="mimeTypeId"><display-entity entity-name="MimeType" description="${description}"></display-entity></field>
+ <field name="statusId"><display-entity entity-name="StatusItem" description="${description}"></display-entity></field>
+ <field name="localeString"><display-entity entity-name="CountryCode" description="${countryName}[${countryCode}]" key-field-name="countryCode"></display-entity></field>
+ <field name="createdByUserLogin"><display-entity also-hidden="false" entity-name="PartyNameView" key-field-name="partyId" description="${groupName}${firstName} ${lastName}"/></field>
+ <field name="dataCategoryId"><display-entity entity-name="DataCategory" description="${categoryName}[${datacategoryId}]"></display-entity></field>
</form>
+
<form name="lookupDataResource" target="LookupDataResource" title="" type="single"
default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
<auto-fields-entity entity-name="DataResource" default-field-type="find"/>
@@ -284,8 +306,8 @@
<form name="AddDataResourceProductFeature" target="createDataResourceProductFeature" title="" type="single"
default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
<auto-fields-service service-name="createProductFeatureDataResource"/>
- <field name="dataResourceId" title="" widget-style="buttontext" map-name="currentValue"><display/></field>
- <field name="productFeatureId" title="" widget-style="buttontext"><lookup target-form-name="LookupProductFeature"/></field>
+ <field name="dataResourceId" widget-style="buttontext" map-name="currentValue"><display/></field>
+ <field name="productFeatureId" widget-style="buttontext"><lookup target-form-name="LookupProductFeature"/></field>
<field name="submitButton" title="Add" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="ListDataResourceProductFeature" list-name="contentList" target="" title="" type="list"
@@ -341,7 +363,7 @@
<!-- ElectronicText forms -->
<form name="EditElectronicText" target="updateElectronicText" title="" type="single" default-map-name="currentValue"
default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
- <auto-fields-service service-name="updateElectronicText"/>
+ <!--auto-fields-service service-name="updateElectronicText"/-->
<actions>
<entity-one entity-name="ElectronicText" value-name="eText">
<field-map field-name="dataResourceId" env-name="parameters.dataResourceId" ></field-map>
@@ -373,7 +395,7 @@
default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
<auto-fields-entity entity-name="ElectronicText"/>
<field name="dataResourceId" title="" widget-style="buttontext"><display/></field>
- <field name="textData" title="Text_" id-name="textData"><textarea rows="20" cols="120"/></field>
+ <field name="textData" title="Text_" id-name="textData"><textarea rows="20" cols="120" visual-editor-enable="true"/></field>
<field name="submitButton" title="Update" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
</forms>
Modified: trunk/applications/content/widget/CommonScreens.xml
===================================================================
--- trunk/applications/content/widget/CommonScreens.xml 2006-05-21 06:52:27 UTC (rev 7649)
+++ trunk/applications/content/widget/CommonScreens.xml 2006-05-21 13:06:02 UTC (rev 7650)
@@ -17,8 +17,8 @@
under the License.
-->
-<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-screen.xsd">
+<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="../../../framework/widget/dtd/widget-screen.xsd">
<screen name="mainContentDecorator">
<section>
<actions>
@@ -141,7 +141,18 @@
<widgets>
<decorator-screen name="mainContentDecorator">
<decorator-section name="body">
- <include-menu name="dataresource" location="component://content/webapp/content/data/DataResourceMenus.xml"/>
+ <section>
+ <condition>
+ <not><if-empty field-name="currentValue.dataResourceId"/></not>
+ </condition>
+ <widgets>
+ <label style="head1" text="${uiLabelMap.${titleProperty}} ${uiLabelMap.CommonFor}: ${currentValue.dataResourceName} [${currentValue.dataResourceId}] ${uiLabelMap.${extraFunctionName}}"/>
+ </widgets>
+ <fail-widgets>
+ <label style="head1" text="${uiLabelMap.${titleProperty}}"/>
+ </fail-widgets>
+ </section>
+ <include-menu name="dataresource" location="component://content/widget/content/DataResourceMenus.xml"/>
<decorator-section-include name="body"/>
</decorator-section>
</decorator-screen>
Modified: trunk/applications/content/widget/ContentMenus.xml
===================================================================
--- trunk/applications/content/widget/ContentMenus.xml 2006-05-21 06:52:27 UTC (rev 7649)
+++ trunk/applications/content/widget/ContentMenus.xml 2006-05-21 13:06:02 UTC (rev 7650)
@@ -27,7 +27,7 @@
<menu-item name="survey" title="${uiLabelMap.ContentSurvey}"><link target="FindSurvey"/></menu-item>
<menu-item name="Forum" title="${uiLabelMap.ContentForum}"><link target="findForumGroups"/></menu-item>
<menu-item name="Content" title="${uiLabelMap.ContentContent}"><link target="findContent"/></menu-item>
- <menu-item name="DataResource" title="${uiLabelMap.ContentDataResource}"><link target="FindDataResource"/></menu-item>
+ <menu-item name="DataResource" title="${uiLabelMap.ContentDataResource}"><link target="findDataResource"/></menu-item>
<menu-item name="ContentSetupMenu" title="${uiLabelMap.ContentContentSetup}"><link target="ContentSetupMenu"/></menu-item>
<menu-item name="DataResourceSetupMenu" title="${uiLabelMap.ContentDataSetup}"><link target="DataSetupMenu"/></menu-item>
<menu-item name="Layout" title="${uiLabelMap.ContentTemplate}"><link target="LayoutMenu"/></menu-item>
Modified: trunk/applications/content/widget/content/ContentScreens.xml
===================================================================
--- trunk/applications/content/widget/content/ContentScreens.xml 2006-05-21 06:52:27 UTC (rev 7649)
+++ trunk/applications/content/widget/content/ContentScreens.xml 2006-05-21 13:06:02 UTC (rev 7650)
@@ -35,7 +35,7 @@
<decorator-screen name="mainContentDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<container><link target="EditContent" text="${uiLabelMap.CommonCreateNew}" style="buttontext"/></container>
- <label style="head1" text="${uiLabelMap.PageTitleFindContent}"></label>
+ <label style="head1" text="${uiLabelMap.PageTitleFindContent}"/>
<include-form name="FindContent" location="component://content/webapp/content/content/ContentForms.xml"/>
<label style="head1" text="Content List"></label>
<include-form name="ListContent" location="component://content/webapp/content/content/ContentForms.xml"/>
Modified: trunk/applications/content/widget/content/DataResourceMenus.xml
===================================================================
--- trunk/applications/content/widget/content/DataResourceMenus.xml 2006-05-21 06:52:27 UTC (rev 7649)
+++ trunk/applications/content/widget/content/DataResourceMenus.xml 2006-05-21 13:06:02 UTC (rev 7650)
@@ -1,37 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- * Copyright (c) 2003-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: $
+
+ Copyright 2001-2006 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ use this file except in compliance with the License. You may obtain a copy of
+ the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ License for the specific language governing permissions and limitations
+ under the License.
-->
-<menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-menu.xsd">
- <menu name="contentsetup" default-title-style="tabButton"
- default-selected-style="tabButtonSelected"
- default-menu-item-name="content"
- orientation="horizontal"
- menu-width="100%"
- default-tooltip-style="tabletext" default-widget-style="tabButton"
- default-associated-content-id="${userLogin.userLoginId}"
- title="" type="simple">
+<menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="../../../../framework/widget/dtd/widget-menu.xsd">
+ <menu name="contentsetup">
<menu-item name="adddataresource" title="Add" >
<link target="AddDataResource" name="AddDataResource" target-window="_top" style="tabButton" />
</menu-item>
@@ -84,4 +73,49 @@
<link target="EditDataResourceProductFeatures" name="EditDataResourceProductFeatures" target-window="_top" style="tabButton" />
</menu-item>
</menu>
+ <menu name="dataresource">
+
+ <menu-item name="editDataResource" title="Data Resource" >
+ <condition>
+ <not><if-empty field-name="currentValue.dataResourceId"/></not>
+ </condition>
+ <link target="editDataResource?dataResourceId=${parameters.dataResourceId}"/>
+ </menu-item>
+ <menu-item name="editElectronicText" title="Text" >
+ <condition>
+ <not><if-empty field-name="currentValue.dataResourceId"/></not>
+ </condition>
+ <link target="EditElectronicText?dataResourceId=${parameters.dataResourceId}"/>
+ </menu-item>
+ <menu-item name="editHtmlText" title="Html" >
+ <condition>
+ <not><if-empty field-name="currentValue.dataResourceId"/></not>
+ </condition>
+ <link target="EditHtmlText?dataResourceId=${parameters.dataResourceId}"/>
+ </menu-item>
+ <menu-item name="uploadImage" title="Image" >
+ <condition>
+ <not><if-empty field-name="currentValue.dataResourceId"/></not>
+ </condition>
+ <link target="UploadImage?dataResourceId=${parameters.dataResourceId}"/>
+ </menu-item>
+ <menu-item name="editDataResourceAttribute" title="Attribute" >
+ <condition>
+ <not><if-empty field-name="currentValue.dataResourceId"/></not>
+ </condition>
+ <link target="EditDataResourceAttribute?dataResourceId=${parameters.dataResourceId}"/>
+ </menu-item>
+ <menu-item name="editDataResourceRole" title="Role" >
+ <condition>
+ <not><if-empty field-name="currentValue.dataResourceId"/></not>
+ </condition>
+ <link target="EditDataResourceRole?dataResourceId=${parameters.dataResourceId}"/>
+ </menu-item>
+ <menu-item name="editDataResourceProductFeatures" title="Product Features" >
+ <condition>
+ <not><if-empty field-name="currentValue.dataResourceId"/></not>
+ </condition>
+ <link target="EditDataResourceProductFeatures?dataResourceId=${parameters.dataResourceId}"/>
+ </menu-item>
+ </menu>
</menus>
Modified: trunk/applications/content/widget/content/DataResourceScreens.xml
===================================================================
--- trunk/applications/content/widget/content/DataResourceScreens.xml 2006-05-21 06:52:27 UTC (rev 7649)
+++ trunk/applications/content/widget/content/DataResourceScreens.xml 2006-05-21 13:06:02 UTC (rev 7650)
@@ -1,43 +1,23 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
- * Copyright (c) 2005-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: ContentSetupScreens.xml 5661 2005-09-07 20:40:17Z jonesde $
+ $Id: $
+
+ Copyright 2001-2006 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ use this file except in compliance with the License. You may obtain a copy of
+ the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ License for the specific language governing permissions and limitations
+ under the License.
-->
-<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-screen.xsd">
- <screen name="common-decorator">
- <section>
- <actions>
- <set field="currentMenuItemName" from-field="currentMenuItemName" from-scope="user"/>
- </actions>
- <widgets>
- <decorator-screen name="mainContentDecorator" location="component://content/widget/CommonScreens.xml">
- <decorator-section name="body">
- <include-menu name="contentsetup" location="component://content/widget/content/DataResourceMenus.xml"/>
- <decorator-section-include name="body"/>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
+<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="../../../../framework/widget/dtd/widget-screen.xsd">
<screen name="FindDataResource">
<section>
<condition>
@@ -45,13 +25,17 @@
</condition>
<actions>
<set field="headerItem" value="DataResource"/>
- <set field="currentMenuItemName" to-scope="user" value="finddataresource"/>
+ <set field="titleProperty" value="PageTitleFindDataResource"/>
+ <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
+ <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="30"/>
</actions>
<widgets>
- <decorator-screen name="common-decorator">
+ <decorator-screen name="mainContentDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <include-form name="findDataResource" location="component://content/webapp/content/data/DataResourceForms.xml"/>
- <include-form name="listFindDataResource" location="component://content/webapp/content/data/DataResourceForms.xml"/>
+ <container><link target="editDataResource" text="${uiLabelMap.CommonCreateNew}" style="buttontext"/></container>
+ <label style="head1" text="${uiLabelMap.PageTitleFindDataResource}"/>
+ <include-form name="FindDataResource" location="component://content/webapp/content/data/DataResourceForms.xml"/>
+ <include-form name="ListDataResource" location="component://content/webapp/content/data/DataResourceForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -83,10 +67,13 @@
</condition>
<actions>
<set field="headerItem" value="DataResource"/>
- <set field="currentMenuItemName" to-scope="user" value="uploadimage"/>
+ <set field="tabButtonItem" value="uploadImage"/>
+ <entity-one entity-name="DataResource" value-name="currentValue">
+ <field-map field-name="dataResourceId" env-name="parameters.dataResourceId"/>
+ </entity-one>
</actions>
<widgets>
- <decorator-screen name="common-decorator">
+ <decorator-screen name="commonDataResourceDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<include-form name="ImageUpload" location="component://content/webapp/content/data/DataResourceForms.xml"/>
</decorator-section>
@@ -101,16 +88,13 @@
</condition>
<actions>
<set field="headerItem" value="DataResource"/>
- <set field="currentMenuItemName" to-scope="user" value="editdataresource"/>
-
- <set field="dataResourceId" from-field="parameters.dataResourceId" to-scope="screen" default-value="${defaultContentId}"/>
- <set field="dataResourceId" from-field="dataResourceId" to-scope="user"/>
+ <set field="tabButtonItem" value="editDataResource"/>
<entity-one entity-name="DataResource" value-name="currentValue">
- <field-map field-name="dataResourceId" env-name="dataResourceId"/>
+ <field-map field-name="dataResourceId" env-name="parameters.dataResourceId"/>
</entity-one>
</actions>
<widgets>
- <decorator-screen name="common-decorator">
+ <decorator-screen name="commonDataResourceDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<include-form name="EditDataResource" location="component://content/webapp/content/data/DataResourceForms.xml"/>
</decorator-section>
@@ -128,7 +112,7 @@
<set field="currentMenuItemName" to-scope="user" value="adddataresource"/>
</actions>
<widgets>
- <decorator-screen name="common-decorator">
+ <decorator-screen name="commonDataResourceDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<include-form name="AddDataResource" location="component://content/webapp/content/data/DataResourceForms.xml"/>
</decorator-section>
@@ -146,7 +130,7 @@
<set field="currentMenuItemName" to-scope="user" value="adddataresourcetext"/>
</actions>
<widgets>
- <decorator-screen name="common-decorator">
+ <decorator-screen name="commonDataResourceDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<include-form name="AddDataResourceText" location="component://content/webapp/content/data/DataResourceForms.xml"/>
</decorator-section>
@@ -164,7 +148,7 @@
<set field="currentMenuItemName" to-scope="user" value="adddataresourceurl"/>
</actions>
<widgets>
- <decorator-screen name="common-decorator">
+ <decorator-screen name="commonDataResourceDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<include-form name="AddDataResourceUrl" location="component://content/webapp/content/data/DataResourceForms.xml"/>
</decorator-section>
@@ -183,7 +167,7 @@
<set field="currentMenuItemName" to-scope="user" value="adddataresourceupload"/>
</actions>
<widgets>
- <decorator-screen name="common-decorator">
+ <decorator-screen name="commonDataResourceDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<include-form name="AddDataResourceUpload" location="component://content/webapp/content/data/DataResourceForms.xml"/>
</decorator-section>
@@ -201,7 +185,7 @@
<set field="currentMenuItemName" to-scope="user" value="editdataresourcetext"/>
</actions>
<widgets>
- <decorator-screen name="common-decorator">
+ <decorator-screen name="commonDataResourceDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<include-form name="EditDataResourceText" location="component://content/webapp/content/data/DataResourceForms.xml"/>
</decorator-section>
@@ -219,7 +203,7 @@
<set field="currentMenuItemName" to-scope="user" value="editdataresourceurl"/>
</actions>
<widgets>
- <decorator-screen name="common-decorator">
+ <decorator-screen name="commonDataResourceDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<include-form name="EditDataResourceUrl" location="component://content/webapp/content/data/DataResourceForms.xml"/>
</decorator-section>
@@ -237,7 +221,7 @@
<set field="currentMenuItemName" to-scope="user" value="editdataresourceupload"/>
</actions>
<widgets>
- <decorator-screen name="common-decorator">
+ <decorator-screen name="commonDataResourceDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<include-form name="EditDataResourceUpload" location="component://content/webapp/content/data/DataResourceForms.xml"/>
</decorator-section>
@@ -253,9 +237,13 @@
<actions>
<set field="headerItem" value="DataResource"/>
<set field="currentMenuItemName" to-scope="user" value="editelectronictext"/>
+ <set field="tabButtonItem" value="editElectronicText"/>
+ <entity-one entity-name="DataResource" value-name="currentValue">
+ <field-map field-name="dataResourceId" env-name="parameters.dataResourceId"/>
+ </entity-one>
</actions>
<widgets>
- <decorator-screen name="common-decorator">
+ <decorator-screen name="commonDataResourceDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<include-form name="EditElectronicText" location="component://content/webapp/content/data/DataResourceForms.xml"/>
</decorator-section>
@@ -270,13 +258,16 @@
</condition>
<actions>
<set field="headerItem" value="DataResource"/>
- <set field="currentMenuItemName" to-scope="user" value="editdataresourceattribute"/>
+ <set field="tabButtonItem" value="editDataResourceAttribute"/>
+ <entity-one entity-name="DataResource" value-name="currentValue">
+ <field-map field-name="dataResourceId" env-name="parameters.dataResourceId"/>
+ </entity-one>
</actions>
<widgets>
- <decorator-screen name="common-decorator">
+ <decorator-screen name="commonDataResourceDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <include-form name="AddDataResourceAttribute" location="component://content/webapp/content/data/DataResourceForms.xml"/>
<include-form name="ListDataResourceAttribute" location="component://content/webapp/content/data/DataResourceForms.xml"/>
+ <include-form name="AddDataResourceAttribute" location="component://content/webapp/content/data/DataResourceForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -289,14 +280,16 @@
</condition>
<actions>
<set field="headerItem" value="DataResource"/>
- <set field="currentMenuItemName" to-scope="user" value="editdataresourcerole"/>
+ <set field="tabButtonItem" value="editDataResourceRole"/>
+ <entity-one entity-name="DataResource" value-name="currentValue">
+ <field-map field-name="dataResourceId" env-name="parameters.dataResourceId"/>
+ </entity-one>
</actions>
<widgets>
- <decorator-screen name="common-decorator">
+ <decorator-screen name="commonDataResourceDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <include-form name="AddDataResourceRole" location="component://content/webapp/content/data/DataResourceForms.xml"/>
<include-form name="ListDataResourceRole" location="component://content/webapp/content/data/DataResourceForms.xml"/>
-
+ <include-form name="AddDataResourceRole" location="component://content/webapp/content/data/DataResourceForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -309,16 +302,18 @@
</condition>
<actions>
<set field="headerItem" value="DataResource"/>
- <set field="currentMenuItemName" to-scope="user" value="editdataresourceproductfeatures"/>
+ <set field="tabButtonItem" value="editDataResourceProductFeatures"/>
+ <entity-one entity-name="DataResource" value-name="currentValue">
+ <field-map field-name="dataResourceId" env-name="parameters.dataResourceId"/>
+ </entity-one>
</actions>
<widgets>
- <decorator-screen name="common-decorator">
- <decorator-section name="body">
- <include-form name="AddDataResourceProductFeature" location="component://content/webapp/content/data/DataResourceForms.xml"/>
- <include-form name="ListDataResourceProductFeature" location="component://content/webapp/content/data/DataResourceForms.xml"/>
-
- </decorator-section>
- </decorator-screen>
+ <decorator-screen name="commonDataResourceDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <include-form name="ListDataResourceProductFeature" location="component://content/webapp/content/data/DataResourceForms.xml"/>
+ <include-form name="AddDataResourceProductFeature" location="component://content/webapp/content/data/DataResourceForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
</widgets>
</section>
</screen>
@@ -330,9 +325,13 @@
<actions>
<set field="headerItem" value="DataResource"/>
<set field="currentMenuItemName" to-scope="user" value="edithtmltext"/>
+ <set field="tabButtonItem" value="editHtmlText"/>
+ <entity-one entity-name="DataResource" value-name="currentValue">
+ <field-map field-name="dataResourceId" env-name="parameters.dataResourceId"/>
+ </entity-one>
</actions>
<widgets>
- <decorator-screen name="common-decorator">
+ <decorator-screen name="commonDataResourceDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<include-form name="EditHtmlText" location="component://content/webapp/content/data/DataResourceForms.xml"/>
</decorator-section>
@@ -340,18 +339,4 @@
</widgets>
</section>
</screen>
- <screen name="DataMenu">
- <section>
- <condition>
- <if-has-permission permission="CONTENTMGR" action="UPDATE"/>
- </condition>
- <actions>
- <set field="headerItem" value="DataResource"/>
- <set field="currentMenuItemName" to-scope="user" value="datamenu" default-value="FindDataResource"/>
- </actions>
- <widgets>
- <include-screen name="FindDataResource"/>
- </widgets>
- </section>
- </screen>
</screens>
More information about the Svn
mailing list