You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ad...@apache.org on 2008/07/08 00:44:34 UTC
svn commit: r674660 - in /ofbiz/trunk/applications/party:
webapp/partymgr/WEB-INF/actions/party/GetContactMechs.groovy
webapp/partymgr/communication/CommForms.xml
webapp/partymgr/party/editcontactmech.ftl
widget/partymgr/CommunicationScreens.xml
Author: adrianc
Date: Mon Jul 7 15:44:34 2008
New Revision: 674660
URL: http://svn.apache.org/viewvc?rev=674660&view=rev
Log:
Some UI fixups in the Party Component.
Modified:
ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/GetContactMechs.groovy
ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml
ofbiz/trunk/applications/party/webapp/partymgr/party/editcontactmech.ftl
ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml
Modified: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/GetContactMechs.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/GetContactMechs.groovy?rev=674660&r1=674659&r2=674660&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/GetContactMechs.groovy (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/GetContactMechs.groovy Mon Jul 7 15:44:34 2008
@@ -20,5 +20,5 @@
import org.ofbiz.party.contact.ContactMechWorker;
partyId = partyId ?: parameters.partyId;
-context.showOld = "true".equals(parameters.SHOW_OLD);
+showOld = "true".equals(parameters.SHOW_OLD);
context.contactMeches = ContactMechWorker.getPartyContactMechValueMaps(delegator, partyId, showOld);
\ No newline at end of file
Modified: ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml?rev=674660&r1=674659&r2=674660&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml Mon Jul 7 15:44:34 2008
@@ -368,7 +368,8 @@
<field name="datetimeStarted" title="${uiLabelMap.CommonSend}"><display description="${bsh:datetimeStarted==null?"":datetimeStarted.toString().substring(0,16);}"/></field>
</form>
- <form name="ListPartyCommEvents" type="list" extends="ListCommEvents" odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ <form name="ListPartyCommEvents" type="list" extends="ListCommEvents"
+ header-row-style="header-row-2" odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="CommunicationEvent">
<condition-list combine="or">
@@ -378,7 +379,7 @@
<order-by field-name="-lastUpdatedStamp"/>
</entity-condition>
</actions>
- <field name="removeLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="smallSubmit">
+ <field name="removeLink" title="${uiLabelMap.CommonDelete}" widget-style="smallSubmit">
<hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deletePartyCommunicationEvent?partyId=${partyId}&communicationEventId=${communicationEventId}"/>
</field>
</form>
@@ -408,7 +409,7 @@
</actions>
</form>
- <form name="ListLookupCommEvents" type="list" list-name="listIt" extends="ListCommEvents">
+ <form name="ListLookupCommEvents" type="list" list-name="listIt" extends="ListCommEvents" header-row-style="header-row-2">
<actions>
<service result-map-list-name="listIt" result-map-name="result" service-name="performFind">
<field-map env-name="parameters" field-name="inputFields"/>
@@ -416,7 +417,7 @@
<field-map value="datetimeStarted DESC" field-name="orderBy"/>
</service>
</actions>
- <field name="removeLink" widget-style="smallSubmit">
+ <field name="removeLink" title="${uiLabelMap.CommonDelete}" widget-style="smallSubmit">
<hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteCommunicationEvent?communicationEventId=${communicationEventId}"/>
</field>
</form>
@@ -512,8 +513,8 @@
<field name="submitButton" title="${uiLabelMap.PartyAddRole}"><submit button-type="button"/></field>
</form>
- <form name="listCommContent" type="list" list-name="contentDataResourceList"
- paginate-target="/ListCommContent" view-size="20" odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ <form name="listCommContent" type="list" list-name="contentDataResourceList" paginate-target="/ListCommContent"
+ view-size="20" header-row-style="header-row-2" odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
<entity-and entity-name="CommEventContentDataResource" list-name="contentDataResourceList">
<field-map field-name="communicationEventId"/>
Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/editcontactmech.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/editcontactmech.ftl?rev=674660&r1=674659&r2=674660&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/editcontactmech.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/editcontactmech.ftl Mon Jul 7 15:44:34 2008
@@ -16,8 +16,6 @@
specific language governing permissions and limitations
under the License.
-->
-
-<!-- begin editcontactmech.ftl -->
<#if !mechMap.contactMech?exists>
<#-- When creating a new contact mech, first select the type, then actually create -->
<#if !preContactMechTypeId?has_content>
@@ -49,15 +47,8 @@
</#if>
<#if mechMap.contactMechTypeId?has_content>
<#if !mechMap.contactMech?has_content>
-<div class="screenlet">
- <div class="screenlet-title-bar">
- <h3>${uiLabelMap.PartyCreateNewContact}</h3>
- </div>
- <div class="screenlet-body">
- <div class="button-bar">
- <a href="<@o...@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonGoBack}</a>
- <a href="javascript:document.editcontactmechform.submit()" class="smallSubmit">${uiLabelMap.CommonSave}</a>
- </div>
+ <h1>${uiLabelMap.PartyCreateNewContact}</h1>
+ <div id="mech-purpose-types">
<#if contactMechPurposeType?exists>
<p>(${uiLabelMap.PartyMsgContactHavePurpose} <b>"${contactMechPurposeType.get("description",locale)?if_exists}"</b>)</p>
</#if>
@@ -71,15 +62,7 @@
<#if contactMechPurposeTypeId?exists><input type="hidden" name="contactMechPurposeTypeId" value="${contactMechPurposeTypeId?if_exists}"></#if>
<#if paymentMethodId?has_content><input type='hidden' name='paymentMethodId' value='${paymentMethodId}'></#if>
<#else>
-<div class="screenlet">
- <div class="screenlet-title-bar">
- <h3>${uiLabelMap.PartyEditContactInformation}</h3>
- </div>
- <div class="screenlet-body">
- <div class="button-bar">
- <a href="<@o...@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonGoBack}</a>
- <a href="javascript:document.editcontactmechform.submit()" class="smallSubmit">${uiLabelMap.CommonSave}</a>
- </div>
+ <h1>${uiLabelMap.PartyEditContactInformation}</h1>
<div id="mech-purpose-types">
<table class="basic-table" cellspacing="0">
<#if mechMap.purposeTypes?has_content>
@@ -246,13 +229,11 @@
</tr>
</form>
</table>
+ </div>
<div class="button-bar">
<a href="<@o...@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonGoBack}</a>
<a href="javascript:document.editcontactmechform.submit()" class="smallSubmit">${uiLabelMap.CommonSave}</a>
- </div>
</div>
-</div>
<#else>
<a href="<@o...@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonGoBack}</a>
</#if>
-<!-- end editcontactmech.ftl -->
\ No newline at end of file
Modified: ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml?rev=674660&r1=674659&r2=674660&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml Mon Jul 7 15:44:34 2008
@@ -83,21 +83,9 @@
<if-service-permission service-name="partyCommunicationEventPermissionCheck" main-action="VIEW"/>
</condition>
<widgets>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PartyFoundCommunicationEvents}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <container><link style="smallSubmit" target="EditCommunicationEvent?partyId=${partyId}" text="${uiLabelMap.PartyNewCommunication}"/></container>
- <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="ListPartyCommEvents"/>
- </widgets>
- </section>
- </container>
- </container>
+ <container style="h1"><label text="${uiLabelMap.PageTitleListCommunications}"/></container>
+ <container style="button-bar"><link style="smallSubmit" target="EditCommunicationEvent?partyId=${partyId}" text="${uiLabelMap.PartyNewCommunication}"/></container>
+ <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="ListPartyCommEvents"/>
</widgets>
<fail-widgets>
<label style="h3">${uiLabelMap.PartyMgrViewPermissionError}</label>
@@ -112,7 +100,6 @@
<section>
<actions>
<set field="titleProperty" value="PageTitleFindCommunicationEvents"/>
- <set field="title" type="String" value="${uiLabelMap.PageTitleFindCommunicationEvents}"/>
<set field="headerItem" value="comm"/>
<set field="tabButtonItem" value="find"/>
<set field="entityName" value="CommunicationEvent"/>
@@ -125,21 +112,25 @@
<if-service-permission service-name="partyCommunicationEventPermissionCheck" main-action="VIEW"/>
</condition>
<widgets>
- <section>
- <condition>
- <not><if-empty field-name="partyId"/></not>
- </condition>
- <widgets>
- <include-menu location="component://party/widget/partymgr/PartyMenus.xml" name="ProfileTabBar"/>
- </widgets>
- </section>
- <include-menu name="CommSubTabBar" location="component://party/webapp/partymgr/communication/CommMenus.xml"/>
- <screenlet title="${uiLabelMap.PartyFindCommunicationEvents}" collapsible="true" name="FindCommunicationEvents">
- <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="findCommEvents"/>
- </screenlet>
- <screenlet title="${uiLabelMap.PartyFoundCommunicationEvents}" navigation-form-name="ListLookupCommEvents">
- <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="ListLookupCommEvents"/>
- </screenlet>
+ <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml">
+ <decorator-section name="menu-bar">
+ <section>
+ <condition>
+ <not><if-empty field-name="partyId"/></not>
+ </condition>
+ <widgets>
+ <include-menu location="component://party/widget/partymgr/PartyMenus.xml" name="ProfileTabBar"/>
+ </widgets>
+ </section>
+ <include-menu name="CommSubTabBar" location="component://party/webapp/partymgr/communication/CommMenus.xml"/>
+ </decorator-section>
+ <decorator-section name="search-options">
+ <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="findCommEvents"/>
+ </decorator-section>
+ <decorator-section name="search-results">
+ <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="ListLookupCommEvents"/>
+ </decorator-section>
+ </decorator-screen>
</widgets>
<fail-widgets>
<label style="h3">${uiLabelMap.PartyMgrViewPermissionError}</label>
@@ -578,7 +569,7 @@
<screen name="ListCommContent">
<section>
<actions>
- <set field="titleProperty" value="PageTitleCommEvents"/>
+ <set field="titleProperty" value="PartyCommContent"/>
<set field="headerItem" value="comm"/>
<set field="tabButtonItem" value="PartyCommEvents"/>
<set field="subTabButtonItem" value="CommContent"/>
@@ -586,8 +577,6 @@
<set default-value="${userLogin.partyId}" field="partyIdFrom" value="${parameters.partyIdFrom}"/>
<set default-value="${userLogin.partyId}" field="partyIdTo" value="${parameters.partyIdTo}"/>
<set field="communicationEventId" value="${parameters.communicationEventId}"/>
- <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
- <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="20"/>
</actions>
<widgets>
<decorator-screen name="CommonCommunicationEventDecorator" location="${parameters.mainDecoratorLocation}">
@@ -597,6 +586,7 @@
<if-service-permission service-name="partyCommunicationEventPermissionCheck" main-action="VIEW"/>
</condition>
<widgets>
+ <container style="h1"><label text="${uiLabelMap.PartyCommContent}"/></container>
<section>
<condition>
<if-compare field-name="okayToUpdate" operator="equals" type="Boolean" value="true"/>
@@ -605,20 +595,7 @@
<container style="button-bar"><link style="smallSubmit" target="AddCommContent?communicationEventId=${communicationEventId}&partyId=${partyId}" text="${uiLabelMap.PartyAddCommContent}"/></container>
</widgets>
</section>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PartyCommContent}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="listCommContent"/>
- </widgets>
- </section>
- </container>
- </container>
+ <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="listCommContent"/>
</widgets>
<fail-widgets>
<label style="h3">${uiLabelMap.PartyMgrViewPermissionError}</label>
@@ -633,7 +610,7 @@
<screen name="AddCommContent">
<section>
<actions>
- <set field="titleProperty" value="PageTitleCommEvents"/>
+ <set field="titleProperty" value="PartyNewCommContent"/>
<set field="headerItem" value="comm"/>
<set field="tabButtonItem" value="PartyCommEvents"/>
<set field="subTabButtonItem" value="CommContent"/>
@@ -650,20 +627,8 @@
<if-service-permission service-name="partyCommunicationEventPermissionCheck" main-action="CREATE"/>
</condition>
<widgets>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PartyNewCommContent}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="addCommContent"/>
- </widgets>
- </section>
- </container>
- </container>
+ <container style="h1"><label text="${uiLabelMap.PartyNewCommContent}"/></container>
+ <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="addCommContent"/>
</widgets>
<fail-widgets>
<label style="h3">${uiLabelMap.PartyMgrViewPermissionError}</label>
@@ -708,20 +673,8 @@
<include-menu location="component://party/widget/partymgr/PartyMenus.xml" name="ProfileTabBar"/>
</widgets>
</section>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleEditCommContent}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="editCommContent"/>
- </widgets>
- </section>
- </container>
- </container>
+ <container style="h1"><label text="${uiLabelMap.PageTitleEditCommContent}"/></container>
+ <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="editCommContent"/>
<section>
<condition>
<if-regexp expr="text.*" field-name="commEventContentDataResource.drMimeTypeId" />