Author: adrianc
Date: Thu May 1 16:44:31 2008
New Revision: 652714
URL: http://svn.apache.org/viewvc?rev=652714&view=rev
Log:
IE7 and general layout fixups for the Example and ExampleExt components.
Modified:
ofbiz/trunk/framework/example/widget/example/CommonScreens.xml
ofbiz/trunk/framework/example/widget/example/ExampleFeatureScreens.xml
ofbiz/trunk/framework/exampleext/widget/example/CommonScreens.xml
ofbiz/trunk/framework/exampleext/widget/example/ExampleMenus.xml
Modified: ofbiz/trunk/framework/example/widget/example/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/widget/example/CommonScreens.xml?rev=652714&r1=652713&r2=652714&view=diff
==============================================================================
--- ofbiz/trunk/framework/example/widget/example/CommonScreens.xml (original)
+++ ofbiz/trunk/framework/example/widget/example/CommonScreens.xml Thu May 1
16:44:31 2008
@@ -54,6 +54,19 @@
</actions>
<widgets>
<decorator-screen name="main-decorator">
+ <decorator-section name="pre-body">
+ <section>
+ <condition>
+ <and>
+ <if-has-permission permission="EXAMPLE"
action="_VIEW"/>
+ <not><if-empty field-name="example"/></not>
+ </and>
+ </condition>
+ <widgets>
+ <include-menu name="EditExample"
location="component://example/widget/example/ExampleMenus.xml"/>
+ </widgets>
+ </section>
+ </decorator-section>
<decorator-section name="body">
<section>
<!-- do check for EXAMPLE, _VIEW permission -->
@@ -66,9 +79,8 @@
<not><if-empty
field-name="example"/></not>
</condition>
<widgets>
- <include-menu name="EditExample"
location="component://example/widget/example/ExampleMenus.xml"/>
<container style="button-bar"><link
target="EditExample" text="${uiLabelMap.ExampleNewExample}"
style="buttontext"/></container>
- <container style="button-bar"><label
style="h1">${uiLabelMap.${titleProperty}}</label><label style="h2">
${uiLabelMap.CommonFor} "${example.exampleName}"
[${exampleId}]</label></container>
+ <container
style="h1"><label>${uiLabelMap.${titleProperty}} ${uiLabelMap.CommonFor}
"${example.exampleName}" [${exampleId}]</label></container>
</widgets>
</section>
@@ -93,6 +105,19 @@
</actions>
<widgets>
<decorator-screen name="main-decorator"
location="${mainDecoratorLocation}">
+ <decorator-section name="pre-body">
+ <section>
+ <condition>
+ <and>
+ <if-has-permission permission="EXAMPLE"
action="_VIEW"/>
+ <not><if-empty
field-name="exampleFeature"/></not>
+ </and>
+ </condition>
+ <widgets>
+ <include-menu name="EditExampleFeature"
location="component://example/widget/example/ExampleMenus.xml"/>
+ </widgets>
+ </section>
+ </decorator-section>
<decorator-section name="body">
<section>
<!-- do check for EXAMPLE, _VIEW permission -->
@@ -105,12 +130,11 @@
<not><if-empty
field-name="exampleFeature"/></not>
</condition>
<widgets>
- <include-menu
name="EditExampleFeature"
location="component://example/widget/example/ExampleMenus.xml"/>
- <container style="button-bar">
- <link target="EditExampleFeature"
text="${uiLabelMap.ExampleNewExampleFeature}" style="buttontext"/>
+ <container style="h1">
+
<label>${uiLabelMap.${titleProperty}} ${uiLabelMap.CommonFor}
"${exampleFeature.description}" [${exampleFeatureId}]</label>
</container>
<container style="button-bar">
- <label
style="h1">${uiLabelMap.${titleProperty}}</label><label style="h2">
${uiLabelMap.CommonFor} "${exampleFeature.description}"
[${exampleFeatureId}]</label>
+ <link target="EditExampleFeature"
text="${uiLabelMap.ExampleNewExampleFeature}" style="buttontext"/>
</container>
</widgets>
</section>
Modified: ofbiz/trunk/framework/example/widget/example/ExampleFeatureScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/widget/example/ExampleFeatureScreens.xml?rev=652714&r1=652713&r2=652714&view=diff
==============================================================================
--- ofbiz/trunk/framework/example/widget/example/ExampleFeatureScreens.xml
(original)
+++ ofbiz/trunk/framework/example/widget/example/ExampleFeatureScreens.xml Thu
May 1 16:44:31 2008
@@ -34,7 +34,7 @@
<if-has-permission permission="EXAMPLE"
action="_VIEW"/>
</condition>
<widgets>
- <container><label
style="h1">${uiLabelMap.${titleProperty}}</label></container>
+ <container
style="h1"><label>${uiLabelMap.${titleProperty}}</label></container>
<container style="button-bar">
<link target="EditExampleFeature"
text="${uiLabelMap.ExampleNewExampleFeature}" style="buttontext"/>
</container>
Modified: ofbiz/trunk/framework/exampleext/widget/example/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/exampleext/widget/example/CommonScreens.xml?rev=652714&r1=652713&r2=652714&view=diff
==============================================================================
--- ofbiz/trunk/framework/exampleext/widget/example/CommonScreens.xml (original)
+++ ofbiz/trunk/framework/exampleext/widget/example/CommonScreens.xml Thu May
1 16:44:31 2008
@@ -42,6 +42,19 @@
</actions>
<widgets>
<decorator-screen name="main-decorator">
+ <decorator-section name="pre-body">
+ <section>
+ <condition>
+ <and>
+ <if-has-permission permission="EXAMPLE"
action="_VIEW"/>
+ <not><if-empty field-name="example"/></not>
+ </and>
+ </condition>
+ <widgets>
+ <include-menu name="EditExample"
location="component://exampleext/widget/example/ExampleMenus.xml"/>
+ </widgets>
+ </section>
+ </decorator-section>
<decorator-section name="body">
<section>
<!-- do check for EXAMPLE, _VIEW permission -->
@@ -54,9 +67,8 @@
<not><if-empty
field-name="example"/></not>
</condition>
<widgets>
- <include-menu name="EditExample"
location="component://exampleext/widget/example/ExampleMenus.xml"/>
+ <container
style="h1"><label>${uiLabelMap.${titleProperty}} ${uiLabelMap.CommonFor}
"${example.exampleName}" [${exampleId}]</label></container>
<container style="button-bar"><link
target="EditExample" text="${uiLabelMap.ExampleNewExample}"
style="buttontext"/></container>
- <container style="button-bar"><label
style="h1">${uiLabelMap.${titleProperty}}</label><label style="h2">
${uiLabelMap.CommonFor} "${example.exampleName}"
[${exampleId}]</label></container>
</widgets>
</section>
Modified: ofbiz/trunk/framework/exampleext/widget/example/ExampleMenus.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/exampleext/widget/example/ExampleMenus.xml?rev=652714&r1=652713&r2=652714&view=diff
==============================================================================
--- ofbiz/trunk/framework/exampleext/widget/example/ExampleMenus.xml (original)
+++ ofbiz/trunk/framework/exampleext/widget/example/ExampleMenus.xml Thu May 1
16:44:31 2008
@@ -19,9 +19,7 @@
-->
<menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd";>
- <menu name="EditExample" default-selected-style="selected" type="simple"
- menu-container-style="button-bar button-style-1"
selected-menuitem-context-field-name="tabButtonItem"
- extends="EditExample"
extends-resource="component://example/widget/example/ExampleMenus.xml">
+ <menu name="EditExample" extends="EditExample"
extends-resource="component://example/widget/example/ExampleMenus.xml">
<menu-item name="EditExampleOriginal"
title="${uiLabelMap.ExampleOriginalExample}">
<link target="/example/control/EditExample?exampleId=${exampleId}"
url-mode="inter-app"/>
</menu-item>
