You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ha...@apache.org on 2009/04/02 11:52:21 UTC

svn commit: r761221 - in /ofbiz/trunk/applications/party/widget/partymgr: CommunicationScreens.xml PartyMenus.xml

Author: hansbak
Date: Thu Apr  2 09:52:20 2009
New Revision: 761221

URL: http://svn.apache.org/viewvc?rev=761221&view=rev
Log:
fix all/open button and reformat

Modified:
    ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml
    ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml

Modified: ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml?rev=761221&r1=761220&r2=761221&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml Thu Apr  2 09:52:20 2009
@@ -847,37 +847,26 @@
             </actions>
             <widgets>
                 <screenlet title="${uiLabelMap.PartyCommunicationsOfParty}: ${partyName.firstName} ${partyName.middleName} ${partyName.lastName} ${partyName.groupName} [${partyId}] "
-                    navigation-menu-name="communicationsMenu" navigation-form-name="ListPartyCommEvents"
-                    name="myComms">
-                    <include-menu name="communicationsMenu"
-                        location="component://party/widget/partymgr/PartyMenus.xml" />
+                    navigation-menu-name="communicationsMenu" navigation-form-name="ListPartyCommEvents" name="myComms">
+                    <include-menu name="communicationsMenu" location="component://party/widget/partymgr/PartyMenus.xml" />
                     <section>
                         <condition>
-                            <not>
-                                <if-empty field="commEventsUnknown" />
-                            </not>
+                            <not><if-empty field="commEventsUnknown" /></not>
                         </condition>
                         <widgets>
                             <label style="h2" text="${uiLabelMap.PartyEmailsFromUnknownOrigin}"></label>
-                            <include-form
-                                location="component://party/webapp/partymgr/communication/CommForms.xml"
-                                name="ListMyUnknownPartyEmails" />
+                            <include-form name="ListMyUnknownPartyEmails" location="component://party/webapp/partymgr/communication/CommForms.xml"/>
                         </widgets>
                     </section>
                     <label style="h2" text="${uiLabelMap.PartyEmailsFromKnownOrigin}"></label>
-                    <include-form name="ListPartyCommEvents"
-                        location="component://party/webapp/partymgr/communication/CommForms.xml"/>
+                    <include-form name="ListPartyCommEvents" location="component://party/webapp/partymgr/communication/CommForms.xml"/>
                     <section>
                         <condition>
-                            <not>
-                                <if-empty field="commEventDraft" />
-                            </not>
+                            <not><if-empty field="commEventDraft" /></not>
                         </condition>
                         <widgets>
                             <label style="h2" text="${uiLabelMap.PartyDraftEmails}"></label>
-                            <include-form
-                                location="component://party/webapp/partymgr/communication/CommForms.xml"
-                                name="ListDraftEmails" />
+                            <include-form name="ListDraftEmails" location="component://party/webapp/partymgr/communication/CommForms.xml" />
                         </widgets>
                     </section>
                 </screenlet>

Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml?rev=761221&r1=761220&r2=761221&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml Thu Apr  2 09:52:20 2009
@@ -260,8 +260,7 @@
             <condition>
                 <if-compare field="parameters.all" operator="equals" value="true" />
             </condition>
-            <link target="${session.getAttribute(&quot;_LAST_VIEW_NAME_&quot;)}" >
-                <parameter param-name="portalPageId" from-field="parameters.portalPageId"/>
+            <link target="${parameters._LAST_VIEW_NAME_}" >
                 <parameter param-name="all" value="false"/>
             </link>
         </menu-item>
@@ -272,8 +271,7 @@
                     <if-empty field="parameters.all"/>
                 </or>
             </condition>
-            <link target="${session.getAttribute(&quot;_LAST_VIEW_NAME_&quot;)}" >
-                <parameter param-name="portalPageId" from-field="parameters.portalPageId"/>
+            <link target="${parameters._LAST_VIEW_NAME_}" >
                 <parameter param-name="all" value="true"/>
             </link>
         </menu-item>