You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by bu...@apache.org on 2009/10/17 17:11:33 UTC

svn commit: r826269 [2/2] - in /ofbiz/trunk/applications/content/widget: ./ cms/ compdoc/ content/ forum/ layout/

Modified: ofbiz/trunk/applications/content/widget/layout/LayoutScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/layout/LayoutScreens.xml?rev=826269&r1=826268&r2=826269&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/layout/LayoutScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/layout/LayoutScreens.xml Sat Oct 17 15:11:32 2009
@@ -72,26 +72,15 @@
             <widgets>
                 <decorator-screen name="commonLayoutDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.PageTitleListLayout}"/>
-                                </container>
+                        <screenlet title="${uiLabelMap.PageTitleListLayout}">
+                            <container>
+                                <link target="EditLayoutSubContent" text="${uiLabelMap.CommonCreateNew}" style="buttontext">
+                                    <parameter param-name="mode" value="add"/>
+                                    <parameter param-name="contentIdTo" value="TEMPLATE_MASTER"/>
+                                </link>
                             </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>
-                                        <container>
-                                            <link target="EditLayoutSubContent" text="${uiLabelMap.CommonCreateNew}" style="buttontext">
-                                                <parameter param-name="mode" value="add"/>
-                                                <parameter param-name="contentIdTo" value="TEMPLATE_MASTER"/>
-                                            </link>
-                                        </container>
-                                        <include-form name="listListLayout" location="component://content/webapp/content/layout/LayoutForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>
+                            <include-form name="listListLayout" location="component://content/webapp/content/layout/LayoutForms.xml"/>
+                        </screenlet>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -110,28 +99,15 @@
             <widgets>
                 <decorator-screen name="commonLayoutDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.PageTitleEditLayout}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>
-                                        <include-form name="EditLayout" location="component://content/webapp/content/layout/LayoutForms.xml"/>
-                                        <link target="cloneLayout" text="${uiLabelMap.ContentCloneLayout}" style="buttontext">
-                                            <parameter param-name="contentId" from-field="currentValue.contentId"/>
-                                        </link>
-                                        <platform-specific>
-                                            <html>
-                                                <html-template location="component://content/webapp/content/layout/renderSubContent.ftl"/>
-                                            </html>
-                                        </platform-specific>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>
+                        <screenlet title="${uiLabelMap.PageTitleEditLayout}">
+                            <include-form name="EditLayout" location="component://content/webapp/content/layout/LayoutForms.xml"/>
+                            <link target="cloneLayout" text="${uiLabelMap.ContentCloneLayout}" style="buttontext">
+                                <parameter param-name="contentId" from-field="currentValue.contentId"/>
+                            </link>
+                            <platform-specific>
+                                <html><html-template location="component://content/webapp/content/layout/renderSubContent.ftl"/></html>
+                            </platform-specific>
+                        </screenlet>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -150,20 +126,9 @@
             <widgets>
                 <decorator-screen name="commonLayoutDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.PageTitleEditLayoutSubContent}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>
-                                        <include-form name="EditLayoutSubContent" location="component://content/webapp/content/layout/LayoutForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>
+                        <screenlet title="${uiLabelMap.PageTitleEditLayoutSubContent}">
+                            <include-form name="EditLayoutSubContent" location="component://content/webapp/content/layout/LayoutForms.xml"/>
+                        </screenlet>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -264,20 +229,9 @@
             <widgets>
                 <decorator-screen name="commonLayoutDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.PageTitleEditLayout}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>
-                                        <include-form name="AddLayout" location="component://content/webapp/content/layout/LayoutForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>
+                        <screenlet title="${uiLabelMap.PageTitleEditLayout}">
+                            <include-form name="AddLayout" location="component://content/webapp/content/layout/LayoutForms.xml"/>
+                        </screenlet>
                     </decorator-section>
                 </decorator-screen>
             </widgets>