svn commit: r1346537 - in /ofbiz/branches/20120329_portletWidget/framework: common/entitydef/entitymodel.xml common/widget/PortalPageForms.xml widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java widget/templates/htmlScreenMacroLibrary.ftl

[erwan]

Author: erwan
Date: Tue Jun  5 19:09:29 2012
New Revision: 1346537

URL: http://svn.apache.org/viewvc?rev=1346537&view=rev
Log:
Adding OFBIZ-4890 to portlet widget branch

Modified:
    ofbiz/branches/20120329_portletWidget/framework/common/entitydef/entitymodel.xml
    ofbiz/branches/20120329_portletWidget/framework/common/widget/PortalPageForms.xml
    ofbiz/branches/20120329_portletWidget/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java
    ofbiz/branches/20120329_portletWidget/framework/widget/templates/htmlScreenMacroLibrary.ftl

Modified: ofbiz/branches/20120329_portletWidget/framework/common/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/common/entitydef/entitymodel.xml?rev=1346537&r1=1346536&r2=1346537&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/common/entitydef/entitymodel.xml (original)
+++ ofbiz/branches/20120329_portletWidget/framework/common/entitydef/entitymodel.xml Tue Jun  5 19:09:29 2012
@@ -809,6 +809,7 @@ under the License.
         <field name="columnSeqId" type="id-ne"></field>
         <field name="columnWidthPixels" type="numeric"></field>
         <field name="columnWidthPercentage" type="numeric"></field>
+        <field name="newLine" type="indicator"/>
         <prim-key field="portalPageId"/>
         <prim-key field="columnSeqId"/>
         <relation type="one" fk-name="PRTL_PGCOL_PAGE" rel-entity-name="PortalPage">

Modified: ofbiz/branches/20120329_portletWidget/framework/common/widget/PortalPageForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/common/widget/PortalPageForms.xml?rev=1346537&r1=1346536&r2=1346537&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/common/widget/PortalPageForms.xml (original)
+++ ofbiz/branches/20120329_portletWidget/framework/common/widget/PortalPageForms.xml Tue Jun  5 19:09:29 2012
@@ -154,6 +154,7 @@ under the License.
         <field name="columnSeqId"><hidden/></field>
         <field name="columnWidthPixels"><text/></field>
         <field name="columnWidthPercentage"><text/></field>
+        <field name="newLine"><check/></field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
     </form>
 </forms>

Modified: ofbiz/branches/20120329_portletWidget/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java?rev=1346537&r1=1346536&r2=1346537&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java (original)
+++ ofbiz/branches/20120329_portletWidget/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java Tue Jun  5 19:09:29 2012
@@ -1227,6 +1227,10 @@ public class MacroScreenRenderer impleme
         sr.append(colWidthLabel);
         sr.append("\" setColumnSizeHint=\"");
         sr.append(setColumnSizeHint);
+        //#Bam# portletWidget add new field in PortalPageColumn to be able to have multiple line in a portalPage. Each line has multiple column
+        sr.append("\" newLine=\"");
+        sr.append(portalPageColumn.getString("newLine"));
+        //#Eam# portletWidget add new field in PortalPageColumn to be able to have multiple line in a portalPage. Each line has multiple column
         sr.append("\" />");
         executeMacro(writer, sr.toString());
     }  

Modified: ofbiz/branches/20120329_portletWidget/framework/widget/templates/htmlScreenMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/widget/templates/htmlScreenMacroLibrary.ftl?rev=1346537&r1=1346536&r2=1346537&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/widget/templates/htmlScreenMacroLibrary.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/framework/widget/templates/htmlScreenMacroLibrary.ftl Tue Jun  5 19:09:29 2012
@@ -193,7 +193,11 @@ ${menuString}
   </table>
 </#macro>
 
+<#--#Bam# portletWidget  add new field in PortalPageColumn to be able to have multiple line in a portalPage. Each line has multiple column
 <#macro renderPortalPageColumnBegin originalPortalPageId portalPageId columnSeqId confMode="false" width="auto" delColumnLabel="Delete column" delColumnHint="Delete this column" addPortletLabel="Add portlet" addPortletHint="Add a new portlet to this column" colWidthLabel="Col. width:" setColumnSizeHint="Set column size">
+-->
+<#macro renderPortalPageColumnBegin originalPortalPageId portalPageId columnSeqId confMode="false" width="auto" delColumnLabel="Delete column" delColumnHint="Delete this column" addPortletLabel="Add portlet" addPortletHint="Add a new portlet to this column" colWidthLabel="Col. width:" setColumnSizeHint="Set column size" newLine="N">
+<#--#Eam# portletWidget -->
   <#assign columnKey = portalPageId+columnSeqId>
   <#assign columnKeyFields = '<input name="portalPageId" value="' + portalPageId + '" type="hidden"/><input name="columnSeqId" value="' + columnSeqId + '" type="hidden"/>'>
   <script type="text/javascript">
@@ -205,6 +209,11 @@ ${menuString}
       }
     }
   </script>
+  <#--#Bam# portletWidget  add new field in PortalPageColumn to be able to have multiple line in a portalPage. Each line has multiple column -->
+  <#if newLine == "Y">
+    </tr></table><table width="100%"><tr>
+  </#if>
+  <#--#Eam# portletWidget -->
   <td class="portal-column<#if confMode == "true">-config</#if> connectedSortable" style="vertical-align: top; <#if width?has_content> width:${width};</#if>" id="portalColumn_${columnSeqId}">
     <#if confMode == "true">
       <div class="portal-column-config-title-bar">