svn commit: r471222 - in /incubator/ofbiz/trunk/applica
Locked
 
|
Author: jacopoc
Date: Sat Nov 4 07:58:29 2006 New Revision: 471222 URL: http://svn.apache.org/viewvc?view=rev&rev=471222 Log: A few screens converted from JPublish to Widget. However the user interface of the content component is a real mess and the conversion/clanups of the whole component is going to be a big, complex and time consuming task. Added: incubator/ofbiz/trunk/applications/content/webapp/content/datasetup/DataResourceSetupMenus.xml (with props) incubator/ofbiz/trunk/applications/content/widget/datasetup/ incubator/ofbiz/trunk/applications/content/widget/datasetup/DataResourceSetupScreens.xml (with props) Removed: incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/pagedefs/datasetup/DataSetupMenu.xml incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/pagedefs/datasetup/EditCharacterSet.xml incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/pagedefs/datasetup/EditDataResourceType.xml incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/pagedefs/datasetup/EditDataResourceTypeAttr.xml incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/pagedefs/datasetup/EditFileExtension.xml incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/pagedefs/datasetup/EditMetaDataPredicate.xml incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/pagedefs/datasetup/EditMimeType.xml incubator/ofbiz/trunk/applications/content/webapp/content/datasetup/EditCharacterSet.ftl incubator/ofbiz/trunk/applications/content/webapp/content/datasetup/EditDataResourceType.ftl incubator/ofbiz/trunk/applications/content/webapp/content/datasetup/EditDataResourceTypeAttr.ftl incubator/ofbiz/trunk/applications/content/webapp/content/datasetup/EditFileExtension.ftl incubator/ofbiz/trunk/applications/content/webapp/content/datasetup/EditMetaDataPredicate.ftl incubator/ofbiz/trunk/applications/content/webapp/content/datasetup/EditMimeType.ftl Modified: incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml incubator/ofbiz/trunk/applications/content/webapp/content/datasetup/DataSetupForms.xml incubator/ofbiz/trunk/applications/content/widget/CommonScreens.xml Modified: incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml?view=diff&rev=471222&r1=471221&r2=471222 ============================================================================== --- incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml (original) +++ incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml Sat Nov 4 07:58:29 2006 @@ -1595,13 +1595,13 @@ <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"/> + <view-map name="EditDataResourceType" page="component://content/widget/datasetup/DataResourceSetupScreens.xml#EditDataResourceType" type="screen"/> + <view-map name="EditDataResourceTypeAttr" page="component://content/widget/datasetup/DataResourceSetupScreens.xml#EditDataResourceTypeAttr" type="screen"/> <view-map name="EditDataCategory" page="/datasetup/EditDataCategory.ftl" type="jpublish"/> - <view-map name="EditMetaDataPredicate" page="/datasetup/EditMetaDataPredicate.ftl" type="jpublish"/> - <view-map name="EditCharacterSet" page="/datasetup/EditCharacterSet.ftl" type="jpublish"/> - <view-map name="EditFileExtension" page="/datasetup/EditFileExtension.ftl" type="jpublish"/> - <view-map name="EditMimeType" page="/datasetup/EditMimeType.ftl" type="jpublish"/> + <view-map name="EditMetaDataPredicate" page="component://content/widget/datasetup/DataResourceSetupScreens.xml#EditMetaDataPredicate" type="screen"/> + <view-map name="EditCharacterSet" page="component://content/widget/datasetup/DataResourceSetupScreens.xml#EditCharacterSet" type="screen"/> + <view-map name="EditFileExtension" page="component://content/widget/datasetup/DataResourceSetupScreens.xml#EditFileExtension" type="screen"/> + <view-map name="EditMimeType" page="component://content/widget/datasetup/DataResourceSetupScreens.xml#EditMimeType" type="screen"/> <view-map name="ListLayout" page="/layout/ListLayout.ftl" type="jpublish"/> <view-map name="FindLayout" page="/layout/FindLayout.ftl" type="jpublish"/> Added: incubator/ofbiz/trunk/applications/content/webapp/content/datasetup/DataResourceSetupMenus.xml URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/webapp/content/datasetup/DataResourceSetupMenus.xml?view=auto&rev=471222 ============================================================================== --- incubator/ofbiz/trunk/applications/content/webapp/content/datasetup/DataResourceSetupMenus.xml (added) +++ incubator/ofbiz/trunk/applications/content/webapp/content/datasetup/DataResourceSetupMenus.xml Sat Nov 4 07:58:29 2006 @@ -0,0 +1,52 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +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="dataresourcesetup" + 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"> + + <menu-item name="EditDataResourceType" title="${uiLabelMap.CommonType}" > + <link target="EditDataResourceType" target-window="_top" style="tabButton" /> + </menu-item> + <menu-item name="EditCharacterSet" title="${uiLabelMap.ContentCharacterSet}" > + <link target="EditCharacterSet" target-window="_top" style="tabButton" /> + </menu-item> + <menu-item name="EditDataCategory" title="${uiLabelMap.ContentCategory}" > + <link target="EditDataCategory" target-window="_top" style="tabButton" /> + </menu-item> + <menu-item name="EditDataResourceTypeAttr" title="${uiLabelMap.ContentTypeAttr}" > + <link target="EditDataResourceTypeAttr" target-window="_top" style="tabButton" /> + </menu-item> + <menu-item name="EditFileExtension" title="${uiLabelMap.ContentFileExt}" > + <link target="EditFileExtension" target-window="_top" style="tabButton" /> + </menu-item> + <menu-item name="EditMetaDataPredicate" title="${uiLabelMap.ContentMetaDataPred}" > + <link target="EditMetaDataPredicate" target-window="_top" style="tabButton" /> + </menu-item> + <menu-item name="EditMimeType" title="${uiLabelMap.ContentMimeType}" > + <link target="EditMimeType" target-window="_top" style="tabButton" /> + </menu-item> + </menu> +</menus> Propchange: incubator/ofbiz/trunk/applications/content/webapp/content/datasetup/DataResourceSetupMenus.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/ofbiz/trunk/applications/content/webapp/content/datasetup/DataResourceSetupMenus.xml ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: incubator/ofbiz/trunk/applications/content/webapp/content/datasetup/DataResourceSetupMenus.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Modified: incubator/ofbiz/trunk/applications/content/webapp/content/datasetup/DataSetupForms.xml URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/webapp/content/datasetup/DataSetupForms.xml?view=diff&rev=471222&r1=471221&r2=471222 ============================================================================== --- incubator/ofbiz/trunk/applications/content/webapp/content/datasetup/DataSetupForms.xml (original) +++ incubator/ofbiz/trunk/applications/content/webapp/content/datasetup/DataSetupForms.xml Sat Nov 4 07:58:29 2006 @@ -34,15 +34,18 @@ default-tooltip-style="tabletext" default-widget-style="inputBox" list-name="contentList" target="updateDataResourceType" title="" type="list"> + <actions> + <entity-condition entity-name="DataResourceType" use-cache="false"/> + </actions> <auto-fields-service service-name="updateDataResourceType"/> - <field name="dataResourceTypeId" widget-style="buttontext"> + <field name="dataResourceTypeId" widget-style="tabletext"> <display/> </field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"> <submit button-type="button"/> </field> <field name="deleteLink" title="" widget-style="buttontext"> - <hyperlink also-hidden="false" description="[${uiLabelMap.CommonDelete}]" target="removeDataResourceType?dataResourceTypeId=${dataResourceTypeId}"/> + <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeDataResourceType?dataResourceTypeId=${dataResourceTypeId}"/> </field> </form> @@ -67,18 +70,21 @@ <form name="UpdateDataResourceTypeAttr" default-title-style="tableheadtext" - default-tooltip-style="tabletext" default-widget-style="inputBox" + default-tooltip-style="tabletext" default-widget-style="tabletext" list-name="contentList" target="updateDataResourceTypeAttr" title="" type="list"> + <actions> + <entity-condition entity-name="DataResourceTypeAttr" use-cache="false"/> + </actions> <auto-fields-service service-name="createDataResourceTypeAttr"/> - <field name="dataResourceTypeId" widget-style="buttontext"> + <field name="dataResourceTypeId"> <display/> </field> - <field name="attrName" title="Attribute Name" widget-style="buttontext"> + <field name="attrName" title="Attribute Name"> <display/> </field> <field name="deleteLink" title="" widget-style="buttontext"> - <hyperlink also-hidden="false" description="[${uiLabelMap.CommonDelete}]" target="removeDataResourceTypeAttr?dataResourceTypeId=${dataResourceTypeId}&attrName=${attrName}"/> + <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeDataResourceTypeAttr?dataResourceTypeId=${dataResourceTypeId}&attrName=${attrName}"/> </field> </form> @@ -99,15 +105,18 @@ default-tooltip-style="tabletext" default-widget-style="inputBox" list-name="contentList" target="updateCharacterSet" title="" type="list"> + <actions> + <entity-condition entity-name="CharacterSet" use-cache="false"/> + </actions> <auto-fields-service service-name="updateCharacterSet"/> - <field name="characterSetId" widget-style="buttontext"> + <field name="characterSetId" widget-style="tabletext"> <display/> </field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"> <submit button-type="button"/> </field> <field name="deleteLink" title="" widget-style="buttontext"> - <hyperlink also-hidden="false" description="[${uiLabelMap.CommonDelete}]" target="removeCharacterSet?characterSetId=${characterSetId}"/> + <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeCharacterSet?characterSetId=${characterSetId}"/> </field> </form> @@ -136,7 +145,7 @@ list-name="contentList" target="updateDataCategory" title="" type="list"> <auto-fields-service service-name="updateDataCategory"/> - <field name="dataCategoryId" widget-style="buttontext"> + <field name="dataCategoryId" widget-style="tabletext"> <display/> </field> <field name="parentCategoryId"> @@ -150,7 +159,7 @@ <submit button-type="button"/> </field> <field name="deleteLink" title="" widget-style="buttontext"> - <hyperlink also-hidden="false" description="[${uiLabelMap.CommonDelete}]" target="removeDataCategory?dataCategoryId=${dataCategoryId}"/> + <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeDataCategory?dataCategoryId=${dataCategoryId}"/> </field> </form> @@ -177,8 +186,11 @@ default-tooltip-style="tabletext" default-widget-style="inputBox" list-name="contentList" target="updateFileExtension" title="" type="list"> + <actions> + <entity-condition entity-name="FileExtension" use-cache="false"/> + </actions> <auto-fields-service service-name="updateFileExtension"/> - <field name="fileExtensionId" widget-style="buttontext"> + <field name="fileExtensionId" widget-style="tabletext"> <display/> </field> <field name="mimeTypeId" title="" > @@ -191,7 +203,7 @@ <submit button-type="button"/> </field> <field name="deleteLink" title="" widget-style="buttontext"> - <hyperlink also-hidden="false" description="[${uiLabelMap.CommonDelete}]" target="removeFileExtension?fileExtensionId=${fileExtensionId}"/> + <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeFileExtension?fileExtensionId=${fileExtensionId}"/> </field> </form> @@ -212,15 +224,18 @@ default-tooltip-style="tabletext" default-widget-style="inputBox" list-name="contentList" target="updateMetaDataPredicate" title="" type="list"> + <actions> + <entity-condition entity-name="MetaDataPredicate" use-cache="false"/> + </actions> <auto-fields-service service-name="updateMetaDataPredicate"/> - <field name="metaDataPredicateId" widget-style="buttontext"> + <field name="metaDataPredicateId" widget-style="tabletext"> <display/> </field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"> <submit button-type="button"/> </field> <field name="deleteLink" title="" widget-style="buttontext"> - <hyperlink also-hidden="false" description="[${uiLabelMap.CommonDelete}]" target="removeMetaDataPredicate?metaDataPredicateId=${metaDataPredicateId}"/> + <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeMetaDataPredicate?metaDataPredicateId=${metaDataPredicateId}"/> </field> </form> @@ -241,15 +256,18 @@ default-tooltip-style="tabletext" default-widget-style="inputBox" list-name="contentList" target="updateMimeType" title="" type="list"> + <actions> + <entity-condition entity-name="MimeType" use-cache="false"/> + </actions> <auto-fields-service service-name="updateMimeType"/> - <field name="mimeTypeId" widget-style="buttontext"> + <field name="mimeTypeId" widget-style="tabletext"> <display/> </field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"> <submit button-type="button"/> </field> <field name="deleteLink" title="" widget-style="buttontext"> - <hyperlink also-hidden="false" description="[${uiLabelMap.CommonDelete}]" target="removeMimeType?mimeTypeId=${mimeTypeId}"/> + <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeMimeType?mimeTypeId=${mimeTypeId}"/> </field> </form> </forms> Modified: incubator/ofbiz/trunk/applications/content/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/widget/CommonScreens.xml?view=diff&rev=471222&r1=471221&r2=471222 ============================================================================== --- incubator/ofbiz/trunk/applications/content/widget/CommonScreens.xml (original) +++ incubator/ofbiz/trunk/applications/content/widget/CommonScreens.xml Sat Nov 4 07:58:29 2006 @@ -190,6 +190,22 @@ </widgets> </section> </screen> + + <screen name="commonDataResourceSetupDecorator"> + <section> + <actions> + <set field="tabButtonItem" from-field="tabButtonItem" from-scope="user"/> + </actions> + <widgets> + <decorator-screen name="mainContentDecorator" location="component://content/widget/CommonScreens.xml"> + <decorator-section name="body"> + <include-menu name="dataresourcesetup" location="component://content/webapp/content/datasetup/DataResourceSetupMenus.xml"/> + <decorator-section-include name="body"/> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> <screen name="main"> <section> Added: incubator/ofbiz/trunk/applications/content/widget/datasetup/DataResourceSetupScreens.xml URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/widget/datasetup/DataResourceSetupScreens.xml?view=auto&rev=471222 ============================================================================== --- incubator/ofbiz/trunk/applications/content/widget/datasetup/DataResourceSetupScreens.xml (added) +++ incubator/ofbiz/trunk/applications/content/widget/datasetup/DataResourceSetupScreens.xml Sat Nov 4 07:58:29 2006 @@ -0,0 +1,140 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +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="EditDataResourceType"> + <section> + <condition> + <if-has-permission permission="CONTENTMGR" action="UPDATE"/> + </condition> + <actions> + <set field="titleProperty" value="PageTitleEditDataResourceType"/> + <set field="headerItem" value="DataResourceSetupMenu"/> + <set field="tabButtonItem" to-scope="user" value="EditDataResourceType"/> + </actions> + <widgets> + <decorator-screen name="commonDataResourceSetupDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <include-form name="UpdateDataResourceType" location="component://content/webapp/content/datasetup/DataSetupForms.xml"/> + <include-form name="AddDataResourceType" location="component://content/webapp/content/datasetup/DataSetupForms.xml"/> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + <screen name="EditCharacterSet"> + <section> + <condition> + <if-has-permission permission="CONTENTMGR" action="UPDATE"/> + </condition> + <actions> + <set field="titleProperty" value="PageTitleEditCharacterSet"/> + <set field="headerItem" value="DataResourceSetupMenu"/> + <set field="tabButtonItem" to-scope="user" value="EditCharacterSet"/> + </actions> + <widgets> + <decorator-screen name="commonDataResourceSetupDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <include-form name="UpdateCharacterSet" location="component://content/webapp/content/datasetup/DataSetupForms.xml"/> + <include-form name="AddCharacterSet" location="component://content/webapp/content/datasetup/DataSetupForms.xml"/> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + <screen name="EditDataResourceTypeAttr"> + <section> + <condition> + <if-has-permission permission="CONTENTMGR" action="UPDATE"/> + </condition> + <actions> + <set field="titleProperty" value="PageTitleEditDataResourceTypeAttr"/> + <set field="headerItem" value="DataResourceSetupMenu"/> + <set field="tabButtonItem" to-scope="user" value="EditDataResourceTypeAttr"/> + </actions> + <widgets> + <decorator-screen name="commonDataResourceSetupDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <include-form name="UpdateDataResourceTypeAttr" location="component://content/webapp/content/datasetup/DataSetupForms.xml"/> + <include-form name="AddDataResourceTypeAttr" location="component://content/webapp/content/datasetup/DataSetupForms.xml"/> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + <screen name="EditFileExtension"> + <section> + <condition> + <if-has-permission permission="CONTENTMGR" action="UPDATE"/> + </condition> + <actions> + <set field="titleProperty" value="PageTitleEditFileExtension"/> + <set field="headerItem" value="DataResourceSetupMenu"/> + <set field="tabButtonItem" to-scope="user" value="EditFileExtension"/> + </actions> + <widgets> + <decorator-screen name="commonDataResourceSetupDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <include-form name="UpdateFileExtension" location="component://content/webapp/content/datasetup/DataSetupForms.xml"/> + <include-form name="AddFileExtension" location="component://content/webapp/content/datasetup/DataSetupForms.xml"/> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + <screen name="EditMetaDataPredicate"> + <section> + <condition> + <if-has-permission permission="CONTENTMGR" action="UPDATE"/> + </condition> + <actions> + <set field="titleProperty" value="PageTitleEditMetaDataPredicate"/> + <set field="headerItem" value="DataResourceSetupMenu"/> + <set field="tabButtonItem" to-scope="user" value="EditMetaDataPredicate"/> + </actions> + <widgets> + <decorator-screen name="commonDataResourceSetupDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <include-form name="UpdateMetaDataPredicate" location="component://content/webapp/content/datasetup/DataSetupForms.xml"/> + <include-form name="AddMetaDataPredicate" location="component://content/webapp/content/datasetup/DataSetupForms.xml"/> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + <screen name="EditMimeType"> + <section> + <condition> + <if-has-permission permission="CONTENTMGR" action="UPDATE"/> + </condition> + <actions> + <set field="titleProperty" value="PageTitleEditMimeType"/> + <set field="headerItem" value="DataResourceSetupMenu"/> + <set field="tabButtonItem" to-scope="user" value="EditMimeType"/> + </actions> + <widgets> + <decorator-screen name="commonDataResourceSetupDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <include-form name="UpdateMimeType" location="component://content/webapp/content/datasetup/DataSetupForms.xml"/> + <include-form name="AddMimeType" location="component://content/webapp/content/datasetup/DataSetupForms.xml"/> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> +</screens> Propchange: incubator/ofbiz/trunk/applications/content/widget/datasetup/DataResourceSetupScreens.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/ofbiz/trunk/applications/content/widget/datasetup/DataResourceSetupScreens.xml ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: incubator/ofbiz/trunk/applications/content/widget/datasetup/DataResourceSetupScreens.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |