svn commit: r744838 - in /ofbiz/trunk/framework: common/webcommon/WEB-INF/actions/includes/ common/webcommon/portal/ common/widget/ example/widget/example/

[hansbak-2]

Author: hansbak
Date: Mon Feb 16 07:40:28 2009
New Revision: 744838

URL: http://svn.apache.org/viewvc?rev=744838&view=rev
Log:
several small bug fixes in example, portalpages

Modified:
    ofbiz/trunk/framework/common/webcommon/WEB-INF/actions/includes/GetParentPortalPageId.groovy
    ofbiz/trunk/framework/common/webcommon/portal/editPortalPage.ftl
    ofbiz/trunk/framework/common/widget/PortalPageScreens.xml
    ofbiz/trunk/framework/example/widget/example/ExampleAjaxScreens.xml
    ofbiz/trunk/framework/example/widget/example/ExampleFeatureScreens.xml
    ofbiz/trunk/framework/example/widget/example/FormWidgetExampleScreens.xml

Modified: ofbiz/trunk/framework/common/webcommon/WEB-INF/actions/includes/GetParentPortalPageId.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/WEB-INF/actions/includes/GetParentPortalPageId.groovy?rev=744838&r1=744837&r2=744838&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/WEB-INF/actions/includes/GetParentPortalPageId.groovy (original)
+++ ofbiz/trunk/framework/common/webcommon/WEB-INF/actions/includes/GetParentPortalPageId.groovy Mon Feb 16 07:40:28 2009
@@ -50,6 +50,8 @@
  context.parameters.parentPortalPageId = portalPage.orginalPortalPageId;
  }
  context.parameters.portalPageId = portalPage.portalPageId; //make sure we have a starting portalPageId
- context.headerItem = portalPage.portalPageId; // and the menu item is highlighted
+ if (!context.headerItem) {
+ context.headerItem = portalPage.portalPageId; // and the menu item is highlighted
+ }
  }
 }

Modified: ofbiz/trunk/framework/common/webcommon/portal/editPortalPage.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/portal/editPortalPage.ftl?rev=744838&r1=744837&r2=744838&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/portal/editPortalPage.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/portal/editPortalPage.ftl Mon Feb 16 07:40:28 2009
@@ -58,7 +58,7 @@
               <div class="portlet-config">
               <div class="portlet-config-title-bar">
                 <ul>
-                  <li class="title">Portlet : ${portlet.portletName}</li>
+                  <li class="title">Portlet : ${portlet.portletName?if_exists} [${portlet.portalPortletId}]</li>
                   <li class="remove"><a href="<@ofbizUrl>deletePortalPagePortlet?${portletUrlLink}</@ofbizUrl>" title="${uiLabelMap.CommonRemovePortlet}">&nbsp;&nbsp;&nbsp;</a></li>
 
                   <#if (portlet.editFormName?has_content && portlet.editFormLocation?has_content)>

Modified: ofbiz/trunk/framework/common/widget/PortalPageScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/PortalPageScreens.xml?rev=744838&r1=744837&r2=744838&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/PortalPageScreens.xml (original)
+++ ofbiz/trunk/framework/common/widget/PortalPageScreens.xml Mon Feb 16 07:40:28 2009
@@ -32,9 +32,14 @@
                         <section>
                             <actions>
                                 <entity-one entity-name="PortalPage" value-field="portalPage"/>
-                                <get-related value-field="portalPage" relation-name="PortalPageColumn" list="portalPageColumns"/>
+                                <entity-and entity-name="PortalPageColumn" list="portalPageColumns">
+                                    <field-map field-name="portalPageId" from-field="parameters.portalPageId"/>
+                                    <order-by field-name="columnSeqId"/>
+                                </entity-and>
                                 <entity-and entity-name="PortalPagePortletView" list="portalPagePortlets">
                                     <field-map field-name="portalPageId" from-field="portalPage.portalPageId"/>
+                                    <order-by field-name="columnSeqId"/>
+                                    <order-by field-name="sequenceNum"/>
                                 </entity-and>
                             </actions>
                             <widgets>
@@ -79,7 +84,7 @@
                                 </entity-condition>
                             </actions>
                             <widgets>
-                                <screenlet title="Edit portal page: ${portalPage.portalPageName} [${parameters.portalPageId}]">
+                                <screenlet title="Edit portal page: ${portalPage.portalPageName} [${portalPage.portalPageId}]">
                                     <link target="addPortalPageColumn?portalPageId=${portalPage.portalPageId}&amp;parentPortalPageId=${portalPage.parentPortalPageId}" text="${uiLabelMap.CommonAddColumn}" style="buttontext"/>
                                     <platform-specific><html><html-template location="component://common/webcommon/portal/editPortalPage.ftl"/></html></platform-specific>
                                 </screenlet>

Modified: ofbiz/trunk/framework/example/widget/example/ExampleAjaxScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/widget/example/ExampleAjaxScreens.xml?rev=744838&r1=744837&r2=744838&view=diff
==============================================================================
--- ofbiz/trunk/framework/example/widget/example/ExampleAjaxScreens.xml (original)
+++ ofbiz/trunk/framework/example/widget/example/ExampleAjaxScreens.xml Mon Feb 16 07:40:28 2009
@@ -25,7 +25,7 @@
         <section>
             <actions>
                 <set field="layoutSettings.styleSheets[+0]" value="/images/prototypejs/scriptaculouscontrols.css" global="true"/>
-                <set field="headerItem" value="${uiLabelMap.ExampleAjaxExamples}"/>
+                <set field="headerItem" value="AjaxExample"/>
                 <set field="titleProperty" value="PageTitleFindExample"/>
                 <set field="exampleCtx" from-field="parameters"/>
             </actions>

Modified: ofbiz/trunk/framework/example/widget/example/ExampleFeatureScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/widget/example/ExampleFeatureScreens.xml?rev=744838&r1=744837&r2=744838&view=diff
==============================================================================
--- ofbiz/trunk/framework/example/widget/example/ExampleFeatureScreens.xml (original)
+++ ofbiz/trunk/framework/example/widget/example/ExampleFeatureScreens.xml Mon Feb 16 07:40:28 2009
@@ -25,7 +25,7 @@
     <screen name="FindExampleFeature">
         <section>
             <actions>
-                <set field="headerItem" value="Feature"/>
+                <set field="headerItem" value="ExampleFeature"/>
                 <set field="titleProperty" value="PageTitleFindExampleFeature"/>
                 <set field="exampleFeatureCtx" from-field="parameters"/>
             </actions>

Modified: ofbiz/trunk/framework/example/widget/example/FormWidgetExampleScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/widget/example/FormWidgetExampleScreens.xml?rev=744838&r1=744837&r2=744838&view=diff
==============================================================================
--- ofbiz/trunk/framework/example/widget/example/FormWidgetExampleScreens.xml (original)
+++ ofbiz/trunk/framework/example/widget/example/FormWidgetExampleScreens.xml Mon Feb 16 07:40:28 2009
@@ -24,7 +24,7 @@
     <screen name="FormWidgetExamples">
         <section>
             <actions>
-                <set field="headerItem" value="Form Widget Examples"/>
+                <set field="headerItem" value="FormWidgetExamples"/>
                 <set field="titleProperty" value="PageTitleFormWidgetExamples"/>
             </actions>
             <widgets>