Author: hansbak
Date: Thu Sep 18 13:20:12 2008
New Revision: 696789
URL: http://svn.apache.org/viewvc?rev=696789&view=rev
Log:
screenlet conversion, extend demo data,text corrections
Modified:
ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/MyPageServices.xml
ofbiz/trunk/specialpurpose/mypage/templates/email/CreateCustRequestNotification.ftl
ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml
Modified:
ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/MyPageServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/MyPageServices.xml?rev=696789&r1=696788&r2=696789&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/MyPageServices.xml
(original)
+++
ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/MyPageServices.xml
Thu Sep 18 13:20:12 2008
@@ -22,9 +22,7 @@
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd";>
<simple-method method-name="sendEmailToCustomer" short-description="Send
Mail When Customer Request is created or commpleted.">
- <entity-one entity-name="CustRequest" value-name="custReq">
- <field-map field-name="custRequestId"
env-name="parameters.custRequestId"/>
- </entity-one>
+ <entity-one entity-name="CustRequest" value-name="custReq"/>
<if>
<condition>
<if-compare field="custReq.statusId" value="CRQ_COMPLETED"
operator="equals"></if-compare>
@@ -99,7 +97,7 @@
<result-to-field result-name="emailAddress"
field-name="emailParams.sendTo"/>
</call-service>
<set field="bodyParameters.person" from-field="person"/>
- <set field="bodyParameters.custRequestId"
from-field="parameters.custRequestId"/>
+ <set field="bodyParameters.custRequest"
from-field="custReq"/>
<set field="bodyParameters.partyId"
from-field="custReq.fromPartyId"/>
<set field="emailParams.bodyParameters"
from-field="bodyParameters"/>
<set field="emailParams.subject"
from-field="storeEmail.subject"/>
Modified:
ofbiz/trunk/specialpurpose/mypage/templates/email/CreateCustRequestNotification.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/templates/email/CreateCustRequestNotification.ftl?rev=696789&r1=696788&r2=696789&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/mypage/templates/email/CreateCustRequestNotification.ftl
(original)
+++
ofbiz/trunk/specialpurpose/mypage/templates/email/CreateCustRequestNotification.ftl
Thu Sep 18 13:20:12 2008
@@ -26,6 +26,16 @@
<body>
<h1>${title}</h1>
<p>Hello ${person.firstName?if_exists}
${person.lastName?if_exists},</p>
- <p>Your Customer Request[${custRequestId}] has been created
successfully.</p>
+ <p>Your Customer Request ${custRequestName}
[${custRequest.custRequestId}] has been created successfully.
+ <br/><br/>
+ We will solve/implement the request as soon as possible
+ <br/><br/>
+ The status and used hours can always be checked at the url: <br/>
+
https://${baseUrl?if_exists}/mypage/control/ViewRequest?custRequestId=${custRequest.custRequestId}
+ <br/><br/>
+ Regards.
+ <br/><br/>
+ PS. we will notify you when the customer request is completed.
+ </p>
</body>
</html>
Modified: ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml?rev=696789&r1=696788&r2=696789&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml Thu Sep 18
13:20:12 2008
@@ -87,10 +87,6 @@
</condition>
<link target="listInvoices"/>
</menu-item>
- <menu-item name="help" title="${uiLabelMap.CommonHelp}"
align-style="opposed">
- <condition><not><if-empty
field-name="userLogin"/></not></condition>
- <link
target="http://docs.ofbiz.org/display/OFBENDUSER/My+Page?decorator=printable";
url-mode="plain" target-window="new"/>
- </menu-item>
<menu-item name="Logout" title="${uiLabelMap.CommonLogout}"
align-style="opposed">
<condition><not><if-empty
field-name="userLogin"/></not></condition>
<link target="logout"/>
@@ -99,6 +95,10 @@
<condition><if-empty field-name="userLogin"/></condition>
<link target="${checkLoginUrl}"/>
</menu-item>
+ <menu-item name="help" title="${uiLabelMap.CommonHelp}"
align-style="opposed">
+ <condition><not><if-empty
field-name="userLogin"/></not></condition>
+ <link
target="http://docs.ofbiz.org/display/OFBENDUSER/My+Page?decorator=printable";
url-mode="plain" target-window="new"/>
+ </menu-item>
<menu-item name="preferences" title="${uiLabelMap.CommonPreferences}"
align-style="opposed">
<condition>
<if-has-permission permission="MYPAGE_EMPLOYEE"/>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml?rev=696789&r1=696788&r2=696789&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml Thu Sep 18
13:20:12 2008
@@ -478,33 +478,18 @@
<widgets>
<decorator-screen name="CommonProjectDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <section>
- <widgets>
- <container style="lefthalf">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label
text="${uiLabelMap.PageTitleProjectInformation}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form
name="ProjectInfo"
location="component://projectmgr/widget/forms/ProjectForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
- <include-screen name="PhasesInfo"/>
- <include-screen name="TasksInfo"/>
- </container>
- <container style="righthalf">
- <include-screen name="SubProjectsInfo"/>
- <include-screen name="PartiesInfo"/>
- <include-screen name="NoteInfo"/>
- </container>
- </widgets>
- </section>
+ <container style="lefthalf">
+ <screenlet
title="${uiLabelMap.PageTitleProjectInformation}">
+ <include-form name="ProjectInfo"
location="component://projectmgr/widget/forms/ProjectForms.xml"/>
+ </screenlet>
+ <include-screen name="PhasesInfo"/>
+ <include-screen name="TasksInfo"/>
+ </container>
+ <container style="righthalf">
+ <include-screen name="SubProjectsInfo"/>
+ <include-screen name="PartiesInfo"/>
+ <include-screen name="NoteInfo"/>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -601,21 +586,10 @@
</service>
<set field="tasks" from-field="result.taskList"/>
</actions>
- <widgets>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.ProjectMgrTasks}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="ListTaskInfo"
location="component://projectmgr/widget/forms/ProjectForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <widgets>
+ <screenlet title="${uiLabelMap.ProjectMgrTasks}"
navigation-form-name="ListTaskInfo">
+ <include-form name="ListTaskInfo"
location="component://projectmgr/widget/forms/ProjectForms.xml"/>
+ </screenlet>
</widgets>
</section>
</screen>
