You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ja...@apache.org on 2007/04/20 09:08:26 UTC
svn commit: r530672 - in /ofbiz/trunk/framework:
common/webcommon/includes/footer.ftl common/webcommon/includes/header.ftl
webtools/widget/EntitySyncForms.xml webtools/widget/EntitySyncScreens.xml
Author: jacopoc
Date: Fri Apr 20 00:08:23 2007
New Revision: 530672
URL: http://svn.apache.org/viewvc?view=rev&rev=530672
Log:
Applied patch from Adrian Crum (OFBIZ-906) with a fix for a broken form definition, minor layout improvements to the entity sync screens. Plus minor improvements to the header and footer templates.
Modified:
ofbiz/trunk/framework/common/webcommon/includes/footer.ftl
ofbiz/trunk/framework/common/webcommon/includes/header.ftl
ofbiz/trunk/framework/webtools/widget/EntitySyncForms.xml
ofbiz/trunk/framework/webtools/widget/EntitySyncScreens.xml
Modified: ofbiz/trunk/framework/common/webcommon/includes/footer.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/footer.ftl?view=diff&rev=530672&r1=530671&r2=530672
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/footer.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/footer.ftl Fri Apr 20 00:08:23 2007
@@ -22,8 +22,8 @@
<div id="footer">
<p><a href="http://jigsaw.w3.org/css-validator/"><img src="<@o...@ofbizContentUrl>" alt="Valid CSS!"/></a>
<a href="http://validator.w3.org/check?uri=referer"><img src="<@o...@ofbizContentUrl>" alt="Valid XHTML 1.0!"/></a></p>
- <p>Copyright (c) 2001-${nowTimestamp?string("yyyy")} The Apache Software Foundation - <a href="http://www.apache.org" target="_blank">www.apache.org</a></p>
- <p>Powered by <a href="http://ofbiz.apache.org" target="_blank">Apache OFBiz</a></p>
+ <p>Copyright (c) 2001-${nowTimestamp?string("yyyy")} The Apache Software Foundation - <a href="http://www.apache.org" target="_blank">www.apache.org</a><br />
+ Powered by <a href="http://ofbiz.apache.org" target="_blank">Apache OFBiz</a></p>
</div>
</body>
</html>
Modified: ofbiz/trunk/framework/common/webcommon/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/header.ftl?view=diff&rev=530672&r1=530671&r2=530672
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/header.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/header.ftl Fri Apr 20 00:08:23 2007
@@ -61,9 +61,9 @@
<br />
<p>
<#if person?has_content>
- ${uiLabelMap.CommonWelcome} ${person.firstName?if_exists} ${person.lastName?if_exists} [${userLogin.userLoginId}]
+ ${uiLabelMap.CommonWelcome} ${person.firstName?if_exists} ${person.lastName?if_exists} [${userLogin.userLoginId}]
<#elseif partyGroup?has_content>
- ${uiLabelMap.CommonWelcome} ${partyGroup.groupName?if_exists} [${userLogin.userLoginId}]
+ ${uiLabelMap.CommonWelcome} ${partyGroup.groupName?if_exists} [${userLogin.userLoginId}]
<#else>
${uiLabelMap.CommonWelcome}!
</#if>
Modified: ofbiz/trunk/framework/webtools/widget/EntitySyncForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/EntitySyncForms.xml?view=diff&rev=530672&r1=530671&r2=530672
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/EntitySyncForms.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/EntitySyncForms.xml Fri Apr 20 00:08:23 2007
@@ -35,21 +35,21 @@
<display-entity entity-name="StatusItem" key-field-name="statusId"/>
</field>
- <field use-when=""ESR_RUNNING".equals(runStatusId)" name="resetStatus" title="" widget-style="buttontext">
+ <field use-when=""ESR_RUNNING".equals(runStatusId)" name="resetStatus" title="" widget-style="smallSubmit">
<hyperlink also-hidden="false" description="${uiLabelMap.WebtoolsSyncResetRunStatus}" target="resetEntitySyncStatusToNotStarted?entitySyncId=${entitySyncId}"/>
</field>
- <field use-when=""ESR_NOT_STARTED".equals(runStatusId) || "ESR_COMPLETE".equals(runStatusId)" name="runOfflineSync" title="" widget-style="buttontext">
+ <field use-when=""ESR_NOT_STARTED".equals(runStatusId) || "ESR_COMPLETE".equals(runStatusId)" name="runOfflineSync" title="" widget-style="smallSubmit">
<hyperlink also-hidden="false" description="${uiLabelMap.WebtoolsSyncRunOffline}" target="runOfflineEntitySync?entitySyncId=${entitySyncId}"/>
</field>
- <field use-when=""ESR_PENDING".equals(runStatusId)" name="acceptOffline" title="" widget-style="buttontext">
+ <field use-when=""ESR_PENDING".equals(runStatusId)" name="acceptOffline" title="" widget-style="smallSubmit">
<hyperlink also-hidden="false" description="${uiLabelMap.WebtoolsSyncAcceptOffline}" target="updateOfflineEntitySync?entitySyncId=${entitySyncId}&updateType=ACCEPT"/>
</field>
- <field use-when=""ESR_PENDING".equals(runStatusId)" name="rejectOffline" title="" widget-style="buttontext">
+ <field use-when=""ESR_PENDING".equals(runStatusId)" name="rejectOffline" title="" widget-style="smallSubmit">
<hyperlink also-hidden="false" description="${uiLabelMap.WebtoolsSyncRejectOffline}" target="updateOfflineEntitySync?entitySyncId=${entitySyncId}&updateType=REJECT"/>
</field>
</form>
- <form name="EntitySyncLoadOffline" type="single" target="loadOfflineEntitySyncData" title=""
+ <form name="EntitySyncLoadOffline" type="single" target="loadOfflineEntitySyncData" title="">
<auto-fields-service service-name="loadOfflineEntitySyncData"/>
<field name="submitButton" title="${uiLabelMap.CommonSubmit}"><submit button-type="button"/></field>
</form>
Modified: ofbiz/trunk/framework/webtools/widget/EntitySyncScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/EntitySyncScreens.xml?view=diff&rev=530672&r1=530671&r2=530672
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/EntitySyncScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/EntitySyncScreens.xml Fri Apr 20 00:08:23 2007
@@ -31,11 +31,11 @@
<decorator-section name="body">
<section>
<widgets>
- <container>
+ <container style="button-bar">
<label style="head1">${uiLabelMap.${labelTitleProperty}}</label>
</container>
- <container>
- <link target="EntitySyncStatus" style="buttontext" text="${uiLabelMap.CommonRefresh}"/>
+ <container style="button-bar">
+ <link target="EntitySyncStatus" style="smallSubmit" text="${uiLabelMap.CommonRefresh}"/>
</container>
<!-- Now call the SimpleScreen form -->
@@ -62,7 +62,9 @@
<decorator-screen name="GenericDecorator">
<decorator-section name="body">
<include-form name="EntitySyncStatus" location="component://webtools/widget/EntitySyncForms.xml"/>
- <label style="head1">${uiLabelMap.WebtoolsLoadOfflineData}</label>
+ <container style="button-bar">
+ <label style="head1">${uiLabelMap.WebtoolsLoadOfflineData}</label>
+ </container>
<include-form name="EntitySyncLoadOffline" location="component://webtools/widget/EntitySyncForms.xml"/>
</decorator-section>
</decorator-screen>