Author: deepak
Date: Wed Apr 11 18:15:02 2018
New Revision: 1828917

URL: http://svn.apache.org/viewvc?rev=1828917&view=rev
Log:
Improved: Standardise Layout throughout Applications
(OFBIZ-10242)
This fix the content and marketing component layout
Thanks Dennis Balkir for your contribution

Modified:
    ofbiz/ofbiz-framework/trunk/applications/content/widget/cms/CMSForms.xml
    
ofbiz/ofbiz-framework/trunk/applications/marketing/widget/MarketingCampaignScreens.xml

Modified: 
ofbiz/ofbiz-framework/trunk/applications/content/widget/cms/CMSForms.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/widget/cms/CMSForms.xml?rev=1828917&r1=1828916&r2=1828917&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/content/widget/cms/CMSForms.xml 
(original)
+++ ofbiz/ofbiz-framework/trunk/applications/content/widget/cms/CMSForms.xml 
Wed Apr 11 18:15:02 2018
@@ -18,7 +18,7 @@ specific language governing permissions
 under the License.
 -->
 
-<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
+<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
         xmlns="http://ofbiz.apache.org/Widget-Form"; 
xsi:schemaLocation="http://ofbiz.apache.org/Widget-Form 
http://ofbiz.apache.org/dtds/widget-form.xsd";>
     <form name="FindContent" 
default-entity-name="ContentAssocDataResourceViewFrom" target="CMSContentFind" 
title="" type="single"
         header-row-style="header-row" default-table-style="basic-table">
@@ -397,11 +397,11 @@ under the License.
             use-when="&quot;${caContentIdTo}&quot;.length()==0" >
             <text />
         </field>
-        <field name="caMapKey" position="2"
+        <field name="caMapKey" position="1"
             use-when="&quot;${caMapKey}&quot;.length()==0" >
             <text />
         </field>
-        <field name="caMapKey" position="2"
+        <field name="caMapKey" position="1"
             use-when="&quot;${caMapKey}&quot;.length()>0" >
             <text />
         </field>
@@ -426,10 +426,10 @@ under the License.
         <field name="caFromDate" title="${uiLabelMap.CommonFromDate}" 
widget-style="buttontext" position="1" 
use-when="&quot;${caFromDate}&quot;.length()==0">
             <date-time default-value="${nowTimestamp}"/>
         </field>
-        <field name="caThruDate" title="${uiLabelMap.CommonThruDate}" 
widget-style="buttontext" position="2" 
use-when="&quot;${caThruDate}&quot;.length()>0">
+        <field name="caThruDate" title="${uiLabelMap.CommonThruDate}" 
widget-style="buttontext" position="1" 
use-when="&quot;${caThruDate}&quot;.length()>0">
             <date-time/>
         </field>
-        <field name="caThruDate" title="${uiLabelMap.CommonThruDate}" 
widget-style="buttontext" position="2" 
use-when="&quot;${caThruDate}&quot;.length()==0">
+        <field name="caThruDate" title="${uiLabelMap.CommonThruDate}" 
widget-style="buttontext" position="1" 
use-when="&quot;${caThruDate}&quot;.length()==0">
             <date-time/>
         </field>
         <field name="contentTitle" title="${uiLabelMap.ContentContent}" 
title-style="h1" map-name="dummy">

Modified: 
ofbiz/ofbiz-framework/trunk/applications/marketing/widget/MarketingCampaignScreens.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/marketing/widget/MarketingCampaignScreens.xml?rev=1828917&r1=1828916&r2=1828917&view=diff
==============================================================================
--- 
ofbiz/ofbiz-framework/trunk/applications/marketing/widget/MarketingCampaignScreens.xml
 (original)
+++ 
ofbiz/ofbiz-framework/trunk/applications/marketing/widget/MarketingCampaignScreens.xml
 Wed Apr 11 18:15:02 2018
@@ -93,7 +93,9 @@ under the License.
                                 </container>
                             </widgets>
                         </section>
-                        <include-form name="EditMarketingCampaign" 
location="component://marketing/widget/MarketingCampaignForms.xml" />
+                        <screenlet>
+                            <include-form name="EditMarketingCampaign" 
location="component://marketing/widget/MarketingCampaignForms.xml" />
+                        </screenlet>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -120,7 +122,9 @@ under the License.
                                 <parameter param-name="DONE_PAGE" 
from-field="donePage" />
                             </link>
                         </container>
-                        <include-form name="ListMarketingCampaign" 
location="component://marketing/widget/MarketingCampaignForms.xml" />
+                        <screenlet>
+                            <include-form name="ListMarketingCampaign" 
location="component://marketing/widget/MarketingCampaignForms.xml" />
+                        </screenlet>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -146,8 +150,10 @@ under the License.
                         <container style="page-title">
                             <label text="${uiLabelMap[titleProperty]}" />
                         </container>
-                        <include-form name="EditMarketingCampaignRoles" 
location="component://marketing/widget/MarketingCampaignForms.xml" />
-                        <!-- 
+                        <screenlet>
+                            <include-form name="EditMarketingCampaignRoles" 
location="component://marketing/widget/MarketingCampaignForms.xml" />
+                        </screenlet>
+                        <!--
                         <container>
                             <label style="h2" 
text="${uiLabelMap.CommonStatusHistory}" />
                         </container>
@@ -179,7 +185,9 @@ under the License.
                                 <parameter param-name="DONE_PAGE" 
from-field="donePage" />
                             </link>
                         </container>
-                        <include-form name="ListMarketingCampaignRoles" 
location="component://marketing/widget/MarketingCampaignForms.xml" />
+                        <screenlet>
+                            <include-form name="ListMarketingCampaignRoles" 
location="component://marketing/widget/MarketingCampaignForms.xml" />
+                        </screenlet>
                     </decorator-section>
                 </decorator-screen>
             </widgets>


Reply via email to