You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by as...@apache.org on 2009/08/31 14:24:10 UTC
svn commit: r809555 - in /ofbiz/trunk/specialpurpose/googlebase:
entitydef/entitymodel.xml webapp/googlebase/WEB-INF/web.xml
widget/CommonScreens.xml widget/GoogleBaseScreens.xml
Author: ashish
Date: Mon Aug 31 12:24:10 2009
New Revision: 809555
URL: http://svn.apache.org/viewvc?rev=809555&view=rev
Log:
Moving screen definition to appropriate location.
Added:
ofbiz/trunk/specialpurpose/googlebase/widget/CommonScreens.xml (with props)
Modified:
ofbiz/trunk/specialpurpose/googlebase/entitydef/entitymodel.xml
ofbiz/trunk/specialpurpose/googlebase/webapp/googlebase/WEB-INF/web.xml
ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml
Modified: ofbiz/trunk/specialpurpose/googlebase/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlebase/entitydef/entitymodel.xml?rev=809555&r1=809554&r2=809555&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/googlebase/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/specialpurpose/googlebase/entitydef/entitymodel.xml Mon Aug 31 12:24:10 2009
@@ -33,8 +33,7 @@
<!-- ========================================================= -->
<!-- ======================== Data Model ===================== -->
<!-- The modules in this file are as follows: -->
- <!-- - org.ofbiz.googlecheckout.config -->
- <!-- - org.ofbiz.googlebase.shipping -->
+ <!-- - org.ofbiz.googlebase.config -->
<!-- ========================================================= -->
<!-- ========================================================= -->
Modified: ofbiz/trunk/specialpurpose/googlebase/webapp/googlebase/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlebase/webapp/googlebase/WEB-INF/web.xml?rev=809555&r1=809554&r2=809555&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/googlebase/webapp/googlebase/WEB-INF/web.xml (original)
+++ ofbiz/trunk/specialpurpose/googlebase/webapp/googlebase/WEB-INF/web.xml Mon Aug 31 12:24:10 2009
@@ -40,7 +40,7 @@
</context-param>
<context-param>
<param-name>mainDecoratorLocation</param-name>
- <param-value>component://googlebase/widget/GoogleBaseScreens.xml</param-value>
+ <param-value>component://googlebase/widget/CommonScreens.xml</param-value>
<description>The location of the main-decorator screen to use for this webapp; referred to as a context variable in screen def XML files.</description>
</context-param>
Added: ofbiz/trunk/specialpurpose/googlebase/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlebase/widget/CommonScreens.xml?rev=809555&view=auto
==============================================================================
--- ofbiz/trunk/specialpurpose/googlebase/widget/CommonScreens.xml (added)
+++ ofbiz/trunk/specialpurpose/googlebase/widget/CommonScreens.xml Mon Aug 31 12:24:10 2009
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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://ofbiz.apache.org/dtds/widget-screen.xsd">
+
+ <screen name="main-decorator">
+ <section>
+ <actions>
+ <property-map resource="GoogleBaseUiLabels" map-name="uiLabelMap" global="true"/>
+ <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
+ <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
+ <property-map resource="WorkEffortUiLabels" map-name="uiLabelMap" global="true"/>
+ <set field="activeApp" value="googlebase" global="true"/>
+
+ <set field="layoutSettings.companyName" from-field="uiLabelMap.GoogleBaseCompanyName" global="true"/>
+ <set field="layoutSettings.companySubtitle" from-field="uiLabelMap.GoogleBaseApplication" global="true"/>
+ <set field="applicationMenuName" value="GoogleBaseAppBar" global="true"/>
+ <set field="applicationMenuLocation" value="component://googlebase/widget/GoogleBaseMenus.xml" global="true"/>
+ <set field="applicationTitle" value="${uiLabelMap.GoogleBaseApplication}" global="true"/>
+ </actions>
+ <widgets>
+ <include-screen name="ApplicationDecorator" location="component://commonext/widget/CommonScreens.xml"/>
+ </widgets>
+ </section>
+ </screen>
+
+ <screen name="CommonFindDecorator">
+ <section>
+ <actions>
+ <set field="headerItem" value="googlebase"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <section>
+ <condition>
+ <if-has-permission permission="GOOGLEBASE" action="_VIEW"/>
+ </condition>
+ <widgets>
+ <decorator-section-include name="body"/>
+ </widgets>
+ <fail-widgets>
+ <label style="h3">${uiLabelMap.GoogleBaseViewPermissionError}</label>
+ </fail-widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
+ <screen name="CommonProductDecorator">
+ <section>
+ <actions>
+ <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
+
+ <set field="productId" from-field="parameters.productId"/>
+ <entity-one entity-name="Product" value-field="product"/>
+ <set field="productName" from-field="product.productName"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <section>
+ <!-- do check for GOOGLEBASE, _VIEW permission -->
+ <condition>
+ <if-has-permission permission="GOOGLEBASE" action="_VIEW"/>
+ </condition>
+ <widgets>
+ <section>
+ <condition><not><if-empty field="product"/></not></condition>
+ <widgets>
+ <include-menu name="ProductTabBar" location="component://product/widget/catalog/Menus.xml"/>
+ <platform-specific>
+ <html><html-template location="component://product/webapp/catalog/product/ProductTabBar.ftl"/></html>
+ </platform-specific>
+ <container>
+ <label style="h1">${uiLabelMap.${labelTitleProperty}} ${uiLabelMap.CommonFor}: ${product.internalName} [${uiLabelMap.CommonId}:${productId}] ${${extraFunctionName}}</label>
+ <image src="${product.smallImageUrl}" height="40" width="40" url-mode="content"/>
+ </container>
+
+ <!-- add Create Product and View Product (in ecommerce) links -->
+ <container style="button-bar">
+ <link target="EditProduct" text="${uiLabelMap.ProductNewProduct}" style="buttontext"/>
+ <link target="CreateVirtualWithVariantsForm" text="${uiLabelMap.ProductNewVirtualProduct}" style="buttontext"/>
+ <link target="/ecommerce/control/product" url-mode="inter-app" text="${uiLabelMap.ProductProductPage}" style="buttontext">
+ <parameter param-name="product_id" from-field="productId"/>
+ </link>
+ <link target="ProductBarCode.pdf" target-window="_blank" text="${uiLabelMap.ProductBarcode}" style="buttontext">
+ <parameter param-name="productId"/>
+ <parameter param-name="productName"/>
+ </link>
+ </container>
+ </widgets>
+ </section>
+
+ <decorator-section-include name="body"/>
+ </widgets>
+ <fail-widgets>
+ <label style="h3">${uiLabelMap.ProductCatalogViewPermissionError}</label>
+ </fail-widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+</screens>
\ No newline at end of file
Propchange: ofbiz/trunk/specialpurpose/googlebase/widget/CommonScreens.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/specialpurpose/googlebase/widget/CommonScreens.xml
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/specialpurpose/googlebase/widget/CommonScreens.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml?rev=809555&r1=809554&r2=809555&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml Mon Aug 31 12:24:10 2009
@@ -21,109 +21,6 @@
<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd">
- <screen name="main-decorator">
- <section>
- <actions>
- <property-map resource="GoogleBaseUiLabels" map-name="uiLabelMap" global="true"/>
- <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
- <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
- <property-map resource="WorkEffortUiLabels" map-name="uiLabelMap" global="true"/>
- <set field="activeApp" value="googlebase" global="true"/>
-
- <set field="layoutSettings.companyName" from-field="uiLabelMap.GoogleBaseCompanyName" global="true"/>
- <set field="layoutSettings.companySubtitle" from-field="uiLabelMap.GoogleBaseApplication" global="true"/>
- <set field="applicationMenuName" value="GoogleBaseAppBar" global="true"/>
- <set field="applicationMenuLocation" value="component://googlebase/widget/GoogleBaseMenus.xml" global="true"/>
- <set field="applicationTitle" value="${uiLabelMap.GoogleBaseApplication}" global="true"/>
- </actions>
- <widgets>
- <include-screen name="ApplicationDecorator" location="component://commonext/widget/CommonScreens.xml"/>
- </widgets>
- </section>
- </screen>
-
- <screen name="CommonFindDecorator">
- <section>
- <actions>
- <set field="headerItem" value="googlebase"/>
- </actions>
- <widgets>
- <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <section>
- <condition>
- <if-has-permission permission="GOOGLEBASE" action="_VIEW"/>
- </condition>
- <widgets>
- <decorator-section-include name="body"/>
- </widgets>
- <fail-widgets>
- <label style="h3">${uiLabelMap.GoogleBaseViewPermissionError}</label>
- </fail-widgets>
- </section>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
-
- <screen name="CommonProductDecorator">
- <section>
- <actions>
- <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
-
- <set field="productId" from-field="parameters.productId"/>
- <entity-one entity-name="Product" value-field="product"/>
- <set field="productName" from-field="product.productName"/>
- </actions>
- <widgets>
- <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <section>
- <!-- do check for GOOGLEBASE, _VIEW permission -->
- <condition>
- <if-has-permission permission="GOOGLEBASE" action="_VIEW"/>
- </condition>
- <widgets>
- <section>
- <condition><not><if-empty field="product"/></not></condition>
- <widgets>
- <include-menu name="ProductTabBar" location="component://product/widget/catalog/Menus.xml"/>
- <platform-specific>
- <html><html-template location="component://product/webapp/catalog/product/ProductTabBar.ftl"/></html>
- </platform-specific>
- <container>
- <label style="h1">${uiLabelMap.${labelTitleProperty}} ${uiLabelMap.CommonFor}: ${product.internalName} [${uiLabelMap.CommonId}:${productId}] ${${extraFunctionName}}</label>
- <image src="${product.smallImageUrl}" height="40" width="40" url-mode="content"/>
- </container>
-
- <!-- add Create Product and View Product (in ecommerce) links -->
- <container style="button-bar">
- <link target="EditProduct" text="${uiLabelMap.ProductNewProduct}" style="buttontext"/>
- <link target="CreateVirtualWithVariantsForm" text="${uiLabelMap.ProductNewVirtualProduct}" style="buttontext"/>
- <link target="/ecommerce/control/product" url-mode="inter-app" text="${uiLabelMap.ProductProductPage}" style="buttontext">
- <parameter param-name="product_id" from-field="productId"/>
- </link>
- <link target="ProductBarCode.pdf" target-window="_blank" text="${uiLabelMap.ProductBarcode}" style="buttontext">
- <parameter param-name="productId"/>
- <parameter param-name="productName"/>
- </link>
- </container>
- </widgets>
- </section>
-
- <decorator-section-include name="body"/>
- </widgets>
- <fail-widgets>
- <label style="h3">${uiLabelMap.ProductCatalogViewPermissionError}</label>
- </fail-widgets>
- </section>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
-
<screen name="advancedsearch">
<section>
<actions>
@@ -138,7 +35,7 @@
<script location="component://product/webapp/catalog/WEB-INF/actions/find/advancedsearchoptions.groovy"/>
</actions>
<widgets>
- <decorator-screen name="CommonFindDecorator">
+ <decorator-screen name="CommonFindDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
<html><html-template location="component://product/webapp/catalog/find/advancedsearch.ftl"/></html>
@@ -156,7 +53,7 @@
<script location="component://product/webapp/catalog/WEB-INF/actions/find/keywordsearch.groovy"/>
</actions>
<widgets>
- <decorator-screen name="CommonFindDecorator">
+ <decorator-screen name="CommonFindDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
<html><html-template location="component://product/webapp/catalog/find/keywordsearch.ftl"/></html>