Author: hansbak
Date: Mon Feb 22 09:59:55 2010
New Revision: 912523
URL: http://svn.apache.org/viewvc?rev=912523&view=rev
Log:
ebaystore: Grouped forms and re-format EbayAccountScreen in ebaystore component
Modified:
ofbiz/trunk/specialpurpose/ebaystore/widget/EbayAccountForms.xml
ofbiz/trunk/specialpurpose/ebaystore/widget/EbayAccountScreens.xml
ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreForms.xml
ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreMenus.xml
Modified: ofbiz/trunk/specialpurpose/ebaystore/widget/EbayAccountForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/widget/EbayAccountForms.xml?rev=912523&r1=912522&r2=912523&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/widget/EbayAccountForms.xml (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/widget/EbayAccountForms.xml Mon Feb 22
09:59:55 2010
@@ -20,6 +20,48 @@
<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd";>
+ <form name="NewEbayAccount" type="single" target="createEbayAccount">
+ <auto-fields-service service-name="createEbayAccount"/>
+ <field name="statusId"><hidden value="PARTY_ENABLED"/></field>
+ <field name="gender">
+ <drop-down allow-empty="true">
+ <option key="M" description="${uiLabelMap.CommonMale}"/>
+ <option key="F" description="${uiLabelMap.CommonFemale}"/>
+ </drop-down>
+ </field>
+ <field name="currentPassword"><password/></field>
+ <field name="currentPasswordVerify"><password/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonCreate}"><submit
button-type="button"/></field>
+ </form>
+ <!-- feedback -->
+ <form name="ItemsAwaitingFeedback" type="list"
list-name="itemsAwaitingFeedbackList"
+ odd-row-style="alternate-row" header-row-style="header-row-2"
default-table-style="basic-table hover-bar">
+ <row-actions>
+ <set field="leave" value="${commentType}"/>
+ </row-actions>
+ <field name="itemID"><display description="${itemID} -
${title}"/></field>
+ <field name="userID"><display description="${userID}"/></field>
+ <field name="actions" use-when=""${commentType}" ==
""">
+ <hyperlink target="LeaveFeedback" description="Leave Feedback">
+ <parameter param-name="itemId" value="${itemID}"/>
+ <parameter param-name="transactionId"
value="${transactionID}"/>
+ <parameter param-name="productStoreId"
value="${parameters.productStoreId}"/>
+ <parameter param-name="targetUser" value="${userID}"/>
+ <parameter param-name="commentingUser"
value="${commentingUser}"/>
+ <parameter param-name="role" value="${role}"/>
+ </hyperlink>
+ </field>
+ </form>
+ <form name="RecentFeedback" type="list" list-name="recentFeedbackList"
+ odd-row-style="alternate-row" header-row-style="header-row-2"
default-table-style="basic-table hover-bar">
+ <field name="contentId" title="Feedback Id"><display/></field>
+ <field name="dataResourceId" title="Comment Text">
+ <display-entity entity-name="ElectronicText"
key-field-name="dataResourceId" description="${textData}"/>
+ </field>
+ <field name="commentator" title="Commentator"><display/></field>
+ <field name="createdDate"><display type="date"/></field>
+ </form>
+ <!-- Personal Information -->
<form name="EbayPersonalInformationForm" type="single"
default-map-name="results.registrationAddress"
default-table-style="basic-table">
<field name="firstName"><display/></field>
<field name="lastName"><display/></field>
Modified: ofbiz/trunk/specialpurpose/ebaystore/widget/EbayAccountScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/widget/EbayAccountScreens.xml?rev=912523&r1=912522&r2=912523&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/widget/EbayAccountScreens.xml
(original)
+++ ofbiz/trunk/specialpurpose/ebaystore/widget/EbayAccountScreens.xml Mon Feb
22 09:59:55 2010
@@ -19,25 +19,114 @@
<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd";>
+ <!-- Personal Information -->
<screen name="EbayPersonalInformation">
- <section>
- <actions>
- <set field="accountItem"
value="personalInformation"/>
- <service service-name="getEbayUser"
result-map="results">
- <field-map field-name="productStoreId"
from-field="parameters.productStoreId"/>
- </service>
- </actions>
- <widgets>
+ <section>
+ <actions>
+ <set field="accountItem"
value="personalInformation"/>
+ <service service-name="getEbayUser"
result-map="results">
+ <field-map field-name="productStoreId"
from-field="parameters.productStoreId"/>
+ </service>
+ </actions>
+ <widgets>
<decorator-screen name="AccountDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <screenlet name=""
title="${uiLabelMap.EbayPersonalInformation}">
- <include-form
location="component://ebaystore/widget/EbayAccountForms.xml"
name="EbayPersonalInformationForm"/>
- </screenlet>
+ <screenlet name=""
title="${uiLabelMap.EbayPersonalInformation}">
+ <include-form
location="component://ebaystore/widget/EbayAccountForms.xml"
name="EbayPersonalInformationForm"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
- </widgets>
- </section>
- </screen>
+ </widgets>
+ </section>
+ </screen>
+ <!-- feedback -->
+ <screen name="EbayFeedback">
+ <section>
+ <actions>
+ <set field="titleProperty" value="eBay Feedback"/>
+ <set field="headerItem" value="ebayStore"/>
+ <set field="accountItem" value="feedback"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="AccountDecorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <section>
+ <condition>
+ <if-has-permission permission="EBAY"
action="_VIEW"/>
+ </condition>
+ <widgets>
+ <screenlet title="${uiLabelMap.EbayFeedback}">
+ <include-menu
location="component://ebaystore/widget/EbayStoreMenus.xml"
name="EbayFeedbackTabBar"/>
+ <decorator-section-include name="body"/>
+ </screenlet>
+ </widgets>
+ <fail-widgets>
+ <label
style="h3">${uiLabelMap.EbayViewPermissionError}</label>
+ </fail-widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+ <screen name="Feedback">
+ <section>
+ <actions>
+ <set field="titleProperty" value="eBay Feedback"/>
+ <set field="headerItem" value="ebayStore"/>
+ <set field="feedbackItem" value="Feedback"/>
+ <service service-name="loadFeedback">
+ <field-map field-name="productStoreId"
from-field="parameters.productStoreId"/>
+ </service>
+ <service service-name="getItemsAwaitingFeedback"
result-map="results">
+ <field-map field-name="productStoreId"
from-field="parameters.productStoreId"/>
+ </service>
+ <set field="itemsAwaitingFeedbackList"
from-field="results.itemsAwaitingFeedback"/>
+ <script
location="component://ebaystore/webapp/ebaystore/WEB-INF/actions/feedback/FeedbackList.groovy"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="EbayFeedback" >
+ <decorator-section name="body">
+ <screenlet>
+ <screenlet
navigation-form-name="ItemsAwaitingFeedback" title="Items Awaiting Feedback">
+ <include-form name="ItemsAwaitingFeedback"
location="component://ebaystore/widget/EbayAccountForms.xml"/>
+ </screenlet>
+ </screenlet>
+ <screenlet>
+ <screenlet navigation-form-name="RecentFeedback"
title="Recent Feedback">
+ <include-form name="RecentFeedback"
location="component://ebaystore/widget/EbayAccountForms.xml"/>
+ </screenlet>
+ </screenlet>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+ <screen name="LeaveFeedback">
+ <section>
+ <actions>
+ <set field="titleProperty" value="eBay Feedback"/>
+ <set field="headerItem" value="ebayStore"/>
+ <set field="feedbackItem" value="LeaveFeedback"/>
+ <set field="role" from-field="parameters.role"
default-value="all"/>
+ <service service-name="getItemsAwaitingFeedback"
result-map="results"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="EbayFeedback" >
+ <decorator-section name="body">
+ <screenlet>
+ <screenlet title="${uiLabelMap.EbayLeaveFeedback}">
+ <include-menu
location="component://ebaystore/widget/EbayStoreMenus.xml"
name="EbayFeedbackSubTabBar"/>
+ <platform-specific>
+ <html><html-template
location="component://ebaystore/webapp/ebaystore/feedback/LeaveFeedback.ftl"/></html>
+ </platform-specific>
+ </screenlet>
+ </screenlet>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
<!-- ebay feedback -->
<screen name="EbayFeedback">
<section>
@@ -88,12 +177,12 @@
<decorator-section name="body">
<screenlet>
<screenlet
navigation-form-name="ItemsAwaitingFeedback" title="Items Awaiting Feedback">
- <include-form name="ItemsAwaitingFeedback"
location="component://ebaystore/widget/EbayStoreForms.xml"/>
+ <include-form name="ItemsAwaitingFeedback"
location="component://ebaystore/widget/EbayAccountForms.xml"/>
</screenlet>
</screenlet>
<screenlet>
<screenlet navigation-form-name="RecentFeedback"
title="Recent Feedback">
- <include-form name="RecentFeedback"
location="component://ebaystore/widget/EbayStoreForms.xml"/>
+ <include-form name="RecentFeedback"
location="component://ebaystore/widget/EbayAccountForms.xml"/>
</screenlet>
</screenlet>
</decorator-section>
Modified: ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreForms.xml?rev=912523&r1=912522&r2=912523&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreForms.xml (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreForms.xml Mon Feb 22
09:59:55 2010
@@ -109,126 +109,10 @@
<field name="currentPasswordVerify"><password/></field>
<field name="submitButton" title="${uiLabelMap.CommonCreate}"><submit
button-type="button"/></field>
</form>
- <!-- feedback -->
- <form name="ItemsAwaitingFeedback" type="list"
list-name="itemsAwaitingFeedbackList"
- odd-row-style="alternate-row" header-row-style="header-row-2"
default-table-style="basic-table hover-bar">
- <row-actions>
- <set field="leave" value="${commentType}"/>
- </row-actions>
- <field name="itemID"><display description="${itemID} -
${title}"/></field>
- <field name="userID"><display description="${userID}"/></field>
- <field name="actions" use-when=""${commentType}" ==
""">
- <hyperlink target="LeaveFeedback" description="Leave Feedback">
- <parameter param-name="itemId" value="${itemID}"/>
- <parameter param-name="transactionId"
value="${transactionID}"/>
- <parameter param-name="productStoreId"
value="${parameters.productStoreId}"/>
- <parameter param-name="targetUser" value="${userID}"/>
- <parameter param-name="commentingUser"
value="${commentingUser}"/>
- <parameter param-name="role" value="${role}"/>
- </hyperlink>
- </field>
- </form>
- <form name="RecentFeedback" type="list" list-name="recentFeedbackList"
- odd-row-style="alternate-row" header-row-style="header-row-2"
default-table-style="basic-table hover-bar">
- <field name="contentId" title="Feedback Id"><display/></field>
- <field name="dataResourceId" title="Comment Text">
- <display-entity entity-name="ElectronicText"
key-field-name="dataResourceId" description="${textData}"/>
- </field>
- <field name="commentator" title="Commentator"><display/></field>
- <field name="createdDate"><display type="date"/></field>
- </form>
- <form name="EditAutomationRelistSoldItems"
target="createEbayAutomaticRelistItems" type="single">
- <alt-target use-when="job!=null"
target="updateEbayAutomaticRelistItems"/>
- <field name="jobId" use-when="job!=null"><hidden
value="${job.jobId}"/></field>
- <field name="jobId" use-when="job==null"><hidden
value="${jobId}"/></field>
- <field name="authUserLoginId"><hidden value="${userLoginId}"/></field>
- <field name="productStoreId"><hidden
value="${parameters.productStoreId}"/></field>
- <field name="startDateTime"><date-time
default-value="${job.startDateTime}"/></field>
- <field name="finishDateTime"><date-time
default-value="${job.finishDateTime}"/></field>
- <field name="submit" use-when="job!=null"
title="${uiLabelMap.CommonApply}"><submit/></field>
- <field name="submit" use-when="job==null"
title="${uiLabelMap.CommonCreate}"><submit/></field>
- </form>
<!-- block out of stock items -->
<form name="blockItemsOutOfStock" type="single"
target="runBlockItemOutOfStock">
<field name="productStoreId"><hidden
value="${parameters.productStoreId}"/></field>
<field name="productStore" entry-name="parameters.productStoreId"
><display-entity entity-name="ProductStore" description="${storeName}
[${productStoreId}]" key-field-name="productStoreId" ></display-entity></field>
<field name="submitButton"
title="${uiLabelMap.BlockItemsOutOfStock}"><submit
button-type="button"/></field>
</form>
- <!-- Sold Items List -->
- <form name="SoldItemList" type="list" target="doAction"
list-name="soldItemList"
- odd-row-style="alternate-row" header-row-style="header-row-2"
default-table-style="basic-table hover-bar" use-row-submit="true"
separate-columns="true">
- <row-actions>
- <script
location="component://ebaystore/webapp/ebaystore/WEB-INF/actions/store/SoldAction.groovy"/>
- </row-actions>
- <field name="productStoreId"><hidden
value="${parameters.productStoreId}"/></field>
- <field name="itemId"><display description="${itemId} -
${title}"/></field>
- <field name="buyer"><display description="${buyer}"/></field>
- <field name="listingType"><display
description="${listingType}"/></field>
- <field name="quantity"><display description="${quantity}"/></field>
- <field name="transactionId"><display
description="${transactionId}"/></field>
- <field name="salePrice"><display description="${salePrice}"/></field>
- <field name="totalAmount"><display
description="${totalAmount}"/></field>
- <field name="creationTime"><display description="${creationTime}"
type="date"/></field>
- <field name="paidTime"><display description="${paidTime}"
type="date"/></field>
- <field name="checkoutStatus"><display
description="${checkoutStatus}"/></field>
- <field name="unpaidItemStatus"><display
description="${unpaidItemStatus}"/></field>
- <field name="action"
use-when=""${hasAction}"=="true"">
- <drop-down>
- <list-options key-name="action" list-name="actionList"
description="${actionName}"/>
- </drop-down>
- </field>
- <field name="submitButton"
use-when=""${hasAction}"=="true""
title="${uiLabelMap.CommonSubmit}"><submit/></field>
- </form>
- <form name="OpenUnpaid" type="single" target="addDispute">
- <field name="productStoreId"><hidden
value="${parameters.productStoreId}"/></field>
- <field name="itemId"><hidden value="${parameters.itemId}"/></field>
- <field name="item"><text disabled="true"
default-value="${parameters.itemId} - ${parameters.title}"/></field>
- <field name="listingType"><text disabled="true"
default-value="${parameters.listingType}"/></field>
- <field name="quantity"><text disabled="true"
default-value="${parameters.quantity}"/></field>
- <field name="salePrice"><text disabled="true"
default-value="${parameters.salePrice}"/></field>
- <field name="transactionId"><hidden
value="${parameters.transactionId}"/></field>
- <field name="transaction"><text disabled="true"
default-value="${parameters.transactionId}"/></field>
- <field name="disputeReasonCodeType">
- <radio no-current-selected-key="TransactionMutuallyCanceled">
- <option key="BUYER_HAS_NOT_PAID" description="The buyer
has not paid for the item"/>
- <option key="TRANSACTION_MUTUALLY_CANCELED"
description="We have both agreed not to complete the transaction"/>
- </radio>
- </field>
- <field name="disputeExplanationCodeType">
- <drop-down>
- <option key="" description="- - Select One - -"/>
- <option key="BUYER_PURCHASING_MISTAKE"
description="Buyer purchased item by mistake or changed mind"/>
- <option key="BUYER_RETURNED_ITEM_FOR_REFUND"
description="Buyer is returning item for a refund"/>
- <option key="UNABLE_TO_RESOLVE_TERMS"
description="Buyer and I disagreed over terms"/>
- <option key="BUYER_HAS_NOT_RESPONDED"
description="Buyer is unresponsive"/>
- <option key="PAYMENT_METHOD_NOT_SUPPORTED"
description="Buyer's payment hasn't been received or hasn't cleared"/>
- <option key="SHIPPING_ADDRESS_NOT_CONFIRMED"
description="Buyer requested shipment to an unconfirmed address"/>
- <option key="SHIP_COUNTRY_NOT_SUPPORTED"
description="Seller doesn't ship to the country requested by buyer"/>
- <option key="OTHER_EXPLANATION"
description="Other reason"/>
- </drop-down>
- </field>
- <field name="submitButton" title="${uiLabelMap.CommonSubmit}"
position="1"><submit/></field>
- <field name="cancelButton" title="${uiLabelMap.CommonEmptyHeader}"
widget-style="smallSubmit" position="2">
- <hyperlink target="soldListing"
description="${uiLabelMap.CommonCancel}">
- <parameter param-name="productStoreId"
from-field="parameters.productStoreId"/>
- </hyperlink>
- </field>
- </form>
- <form name="MakeSecondChanceOffer" type="single"
target="addEbaySecondChanceOffer">
- <auto-fields-service service-name="addEbaySecondChanceOffer"/>
- <field name="duration">
- <drop-down>
- <option key="DAYS_1" description="a day"/>
- <option key="DAYS_3" description="3 days"/>
- <option key="DAYS_5" description="5 days"/>
- <option key="DAYS_7" description="7 days"/>
- </drop-down>
- </field>
- <field name="recipientBidderUserId">
- <drop-down>
- <list-options key-name="userId" list-name="bidders"
description="${userId}"/>
- </drop-down>
- </field>
- <field name="submitButton"
title="${uiLabelMap.CommonAdd}"><submit/></field>
- </form>
</forms>
\ No newline at end of file
Modified: ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreMenus.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreMenus.xml?rev=912523&r1=912522&r2=912523&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreMenus.xml (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreMenus.xml Mon Feb 22
09:59:55 2010
@@ -123,7 +123,7 @@
<parameter param-name="role" value="seller"/>
</link>
</menu-item>
- <menu-item name="buyer" title="${uiLabelMap.EbaySoldLeaveFeedback}">
+ <menu-item name="buyer" title="${uiLabelMap.EbaySold}">
<link target="LeaveFeedback">
<parameter param-name="productStoreId"
value="${parameters.productStoreId}"/>
<parameter param-name="role" value="buyer"/>
