OFBiz › OFBiz - Commits

svn commit: r529140 - in /ofbiz/trunk/framework/example: webapp/example/includes/ widget/example/

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

jacopoc

svn commit: r529140 - in /ofbiz/trunk/framework/example: webapp/example/includes/ widget/example/

Author: jacopoc
Date: Sun Apr 15 23:28:12 2007
New Revision: 529140

URL: http://svn.apache.org/viewvc?view=rev&rev=529140
Log:
Applied patch from Adrian Crum to clean up the layout of the Example application: OFBIZ-887

Modified:
ofbiz/trunk/framework/example/webapp/example/includes/appheader.ftl
ofbiz/trunk/framework/example/widget/example/CommonScreens.xml
ofbiz/trunk/framework/example/widget/example/ExampleFeatureScreens.xml
ofbiz/trunk/framework/example/widget/example/ExampleForms.xml
ofbiz/trunk/framework/example/widget/example/ExampleMenus.xml
ofbiz/trunk/framework/example/widget/example/ExampleScreens.xml

Modified: ofbiz/trunk/framework/example/webapp/example/includes/appheader.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/webapp/example/includes/appheader.ftl?view=diff&rev=529140&r1=529139&r2=529140
==============================================================================
--- ofbiz/trunk/framework/example/webapp/example/includes/appheader.ftl (original)
+++ ofbiz/trunk/framework/example/webapp/example/includes/appheader.ftl Sun Apr 15 23:28:12 2007
@@ -17,21 +17,19 @@
under the License.
-->

-<#assign unselectedLeftClassName = "headerButtonLeft">
-<#assign unselectedRightClassName = "headerButtonRight">
-<#assign selectedLeftClassMap = {headerItem?default("void") : "headerButtonLeftSelected"}>
-<#assign selectedRightClassMap = {headerItem?default("void") : "headerButtonRightSelected"}>
-
-<div class="apptitle">${uiLabelMap.ExampleApplication}</div>
-<div class="row">
- <div class="col"><a href="<@ofbizUrl>main</@ofbizUrl>" class="${selectedLeftClassMap.main?default(unselectedLeftClassName)}">${uiLabelMap.CommonMain}</a></div>
- <div class="col"><a href="<@ofbizUrl>FindExample</@ofbizUrl>" class="${selectedLeftClassMap.Example?default(unselectedLeftClassName)}">${uiLabelMap.ExampleExample}</a></div>
- <div class="col"><a href="<@ofbizUrl>FindExampleFeature</@ofbizUrl>" class="${selectedLeftClassMap.ExampleFeature?default(unselectedLeftClassName)}">${uiLabelMap.ExampleFeature}</a></div>
+<#assign selected = headerItem?default("void")>

+<div id="app-navigation">
+ <h2>${uiLabelMap.ExampleApplication}</h2>
+ <ul>
+ <li<#if selected = "main"> class="selected"</#if>><a href="<@ofbizUrl>main</@ofbizUrl>">${uiLabelMap.CommonMain}</a></li>
+ <li<#if selected = "Example"> class="selected"</#if>><a href="<@ofbizUrl>FindExample</@ofbizUrl>">${uiLabelMap.ExampleExample}</a></li>
+ <li<#if selected = "ExampleFeature"> class="selected"</#if>><a href="<@ofbizUrl>FindExampleFeature</@ofbizUrl>">${uiLabelMap.ExampleFeature}</a></li>
<#if userLogin?has_content>
- <div class="col-right"><a href="<@ofbizUrl>logout</@ofbizUrl>" class="${selectedRightClassMap.logout?default(unselectedRightClassName)}">${uiLabelMap.CommonLogout}</a></div>
+ <li class="opposed"><a href="<@ofbizUrl>logout</@ofbizUrl>">${uiLabelMap.CommonLogout}</a></li>
<#else>
- <div class="col-right"><a href='<@ofbizUrl>${checkLoginUrl?if_exists}</@ofbizUrl>' class='${selectedRightClassMap.login?default(unselectedRightClassName)}'>${uiLabelMap.CommonLogin}</a></div>
+ <li class="opposed"><a href="<@ofbizUrl>${checkLoginUrl?if_exists}</@ofbizUrl>">${uiLabelMap.CommonLogin}</a></li>
</#if>
- <div class="col-fill"> </div>
+ </ul>
+ <br class="clear" />
</div>

Modified: ofbiz/trunk/framework/example/widget/example/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/widget/example/CommonScreens.xml?view=diff&rev=529140&r1=529139&r2=529140
==============================================================================
--- ofbiz/trunk/framework/example/widget/example/CommonScreens.xml (original)
+++ ofbiz/trunk/framework/example/widget/example/CommonScreens.xml Sun Apr 15 23:28:12 2007
@@ -54,10 +54,10 @@
<section>
<condition><if-empty field-name="userLogin"/></condition>
<widgets>
- <container><label style="tabletext" text="${uiLabelMap.ExampleMessage}"/></container>
+ <container><label text="${uiLabelMap.ExampleMessage}"/></container>
</widgets>
</section>
- <container><label style="tabletext" text="${uiLabelMap.ExampleWelcome}"/></container>
+ <container><label text="${uiLabelMap.ExampleWelcome}"/></container>
</container>
</container>
</decorator-section>

Modified: ofbiz/trunk/framework/example/widget/example/ExampleFeatureScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/widget/example/ExampleFeatureScreens.xml?view=diff&rev=529140&r1=529139&r2=529140
==============================================================================
--- ofbiz/trunk/framework/example/widget/example/ExampleFeatureScreens.xml (original)
+++ ofbiz/trunk/framework/example/widget/example/ExampleFeatureScreens.xml Sun Apr 15 23:28:12 2007
@@ -35,7 +35,7 @@
</condition>
<widgets>
<container><label style="head1">${uiLabelMap.${titleProperty}}</label></container>
- <container>
+ <container style="button-bar">
<link target="EditExampleFeature" text="${uiLabelMap.ExampleNewExampleFeature}" style="buttontext"/>
</container>
<include-form name="ListExampleFeatures" location="component://example/widget/example/ExampleFeatureForms.xml"/>
@@ -73,10 +73,10 @@
</condition>
<widgets>
<include-menu name="EditExampleFeature" location="component://example/widget/example/ExampleMenus.xml"/>
- <container>
+ <container style="button-bar">
<link target="EditExampleFeature" text="${uiLabelMap.ExampleNewExampleFeature}" style="buttontext"/>
</container>
- <container>
+ <container style="button-bar">
<label style="head1">${uiLabelMap.${titleProperty}}</label><label style="head2"> ${uiLabelMap.CommonFor} "${exampleFeature.description}" [${exampleFeatureId}]</label>
</container>
</widgets>

Modified: ofbiz/trunk/framework/example/widget/example/ExampleForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/widget/example/ExampleForms.xml?view=diff&rev=529140&r1=529139&r2=529140
==============================================================================
--- ofbiz/trunk/framework/example/widget/example/ExampleForms.xml (original)
+++ ofbiz/trunk/framework/example/widget/example/ExampleForms.xml Sun Apr 15 23:28:12 2007
@@ -43,7 +43,7 @@
<alt-target use-when="example==null" target="createExample"/>
<auto-fields-service service-name="updateExample"/>

- <field use-when="example!=null" name="exampleId" title="${uiLabelMap.ExampleExampleId}" tooltip="${uiLabelMap.CommonNotModifRecreat}" widget-style="tabletext"><display/></field>
+ <field use-when="example!=null" name="exampleId" title="${uiLabelMap.ExampleExampleId}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
<field use-when="example==null&&exampleId==null" name="exampleId" title="${uiLabelMap.ExampleExampleId}"><ignored/></field>
<field use-when="example==null&&exampleId!=null" name="exampleId" title="${uiLabelMap.ExampleExampleId}"><display description="${uiLabelMap.CommonCannotBeFound}: [${exampleId}]" also-hidden="false"/></field>

Modified: ofbiz/trunk/framework/example/widget/example/ExampleMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/widget/example/ExampleMenus.xml?view=diff&rev=529140&r1=529139&r2=529140
==============================================================================
--- ofbiz/trunk/framework/example/widget/example/ExampleMenus.xml (original)
+++ ofbiz/trunk/framework/example/widget/example/ExampleMenus.xml Sun Apr 15 23:28:12 2007
@@ -20,10 +20,10 @@

<menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-menu.xsd">
- <menu name="EditExample" default-title-style="tabButton" default-selected-style="tabButtonSelected"
- default-tooltip-style="tabletext" default-widget-style="tabButton"
+ <menu name="EditExample" default-selected-style="selected"
+ menu-container-style="button-bar button-style-1"
selected-menuitem-context-field-name="tabButtonItem"
- orientation="horizontal" title="" type="simple">
+ type="simple">
<menu-item name="EditExample" title="${uiLabelMap.ExampleExample}">
<link target="EditExample?exampleId=${exampleId}"/>
</menu-item>
@@ -34,10 +34,10 @@
<link target="EditExampleFeatureAppls?exampleId=${exampleId}"/>
</menu-item>
</menu>
- <menu name="EditExampleFeature" default-title-style="tabButton" default-selected-style="tabButtonSelected"
- default-tooltip-style="tabletext" default-widget-style="tabButton"
+ <menu name="EditExampleFeature" default-selected-style="selected"
+ menu-container-style="button-bar button-style-1"
selected-menuitem-context-field-name="tabButtonItem"
- orientation="horizontal" title="" type="simple">
+ type="simple">
<menu-item name="EditExampleFeature" title="${uiLabelMap.ExampleFeature}">
<link target="EditExampleFeature?exampleFeatureId=${exampleFeatureId}"/>
</menu-item>

Modified: ofbiz/trunk/framework/example/widget/example/ExampleScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/widget/example/ExampleScreens.xml?view=diff&rev=529140&r1=529139&r2=529140
==============================================================================
--- ofbiz/trunk/framework/example/widget/example/ExampleScreens.xml (original)
+++ ofbiz/trunk/framework/example/widget/example/ExampleScreens.xml Sun Apr 15 23:28:12 2007
@@ -35,7 +35,7 @@
</condition>
<widgets>
<container><label style="head1">${uiLabelMap.${titleProperty}}</label></container>
- <container><link target="EditExample" text="${uiLabelMap.ExampleNewExample}" style="buttontext"/></container>
+ <container style="button-bar"><link target="EditExample" text="${uiLabelMap.ExampleNewExample}" style="buttontext"/></container>
<include-form name="ListExamples" location="component://example/widget/example/ExampleForms.xml"/>
</widgets>
<fail-widgets>
@@ -71,8 +71,8 @@
</condition>
<widgets>
<include-menu name="EditExample" location="component://example/widget/example/ExampleMenus.xml"/>
- <container><link target="EditExample" text="${uiLabelMap.ExampleNewExample}" style="buttontext"/></container>
- <container><label style="head1">${uiLabelMap.${titleProperty}}</label><label style="head2"> ${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="head1">${uiLabelMap.${titleProperty}}</label><label style="head2"> ${uiLabelMap.CommonFor} "${example.exampleName}" [${exampleId}]</label></container>
</widgets>
</section>