Author: jonesde
Date: Thu Jan 14 05:52:57 2010
New Revision: 899068
URL:
http://svn.apache.org/viewvc?rev=899068&view=revLog:
Small change to not blow up if there is neither an appheaderTemplate nor an applicationMenu* in place, and simply do nothing in that case
Modified:
ofbiz/trunk/framework/common/widget/CommonScreens.xml
Modified: ofbiz/trunk/framework/common/widget/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/CommonScreens.xml?rev=899068&r1=899067&r2=899068&view=diff==============================================================================
--- ofbiz/trunk/framework/common/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/framework/common/widget/CommonScreens.xml Thu Jan 14 05:52:57 2010
@@ -162,22 +162,19 @@
</condition>
<widgets>
<section>
- <condition>
- <if-empty field="applicationMenuName"/>
- </condition>
+ <condition><not><if-empty field="appheaderTemplate"/></not></condition>
<widgets>
<platform-specific><html><html-template location="${appheaderTemplate}"/></html></platform-specific>
</widgets>
<fail-widgets>
<section>
- <condition>
- <not><if-empty field="parameters.applicationTitle"/></not>
- </condition>
- <widgets>
- <label style="apptitle">${parameters.applicationTitle}</label>
- </widgets>
+ <condition><not><if-empty field="parameters.applicationTitle"/></not></condition>
+ <widgets><label style="apptitle">${parameters.applicationTitle}</label></widgets>
+ </section>
+ <section>
+ <condition><not><if-empty field="applicationMenuLocation"/></not></condition>
+ <widgets><include-menu name="${applicationMenuName}" location="${applicationMenuLocation}"/></widgets>
</section>
- <include-menu name="${applicationMenuName}" location="${applicationMenuLocation}"/>
</fail-widgets>
</section>
</widgets>
Locked
