svn commit: r1618554 [38/38] - in /ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23: ./ applications/accounting/config/ applications/accounting/script/org/ofbiz/accounting/invoice/ applications/accounting/src/org/ofbiz/accounting/invoice/ appli...

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r1618554 [38/38] - in /ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23: ./ applications/accounting/config/ applications/accounting/script/org/ofbiz/accounting/invoice/ applications/accounting/src/org/ofbiz/accounting/invoice/ appli...

jleroux@apache.org
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/flatgrey/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/flatgrey/includes/header.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/flatgrey/includes/header.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/flatgrey/includes/header.ftl Mon Aug 18 07:42:27 2014
@@ -24,7 +24,7 @@ under the License.
 <html lang="${docLangAttr}" dir="${langDir}" xmlns="http://www.w3.org/1999/xhtml">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-    <title>${layoutSettings.companyName}: <#if (page.titleProperty)?has_content>${uiLabelMap[page.titleProperty]}<#else>${(page.title)?if_exists}</#if></title>
+    <title>${layoutSettings.companyName}: <#if (page.titleProperty)?has_content>${uiLabelMap[page.titleProperty]}<#else>${(page.title)!}</#if></title>
     <#if layoutSettings.shortcutIcon?has_content>
       <#assign shortcutIcon = layoutSettings.shortcutIcon/>
     <#elseif layoutSettings.VT_SHORTCUT_ICON?has_content>
@@ -76,21 +76,21 @@ under the License.
             ${extraHead}
         </#list>
     </#if>
-    <#if lastParameters?exists><#assign parametersURL = "&amp;" + lastParameters></#if>
+    <#if lastParameters??><#assign parametersURL = "&amp;" + lastParameters></#if>
     <#if layoutSettings.WEB_ANALYTICS?has_content>
       <script language="JavaScript" type="text/javascript">
         <#list layoutSettings.WEB_ANALYTICS as webAnalyticsConfig>
-          ${StringUtil.wrapString(webAnalyticsConfig.webAnalyticsCode?if_exists)}
+          ${StringUtil.wrapString(webAnalyticsConfig.webAnalyticsCode!)}
         </#list>
       </script>
     </#if>
 </head>
-<#if layoutSettings.headerImageLinkUrl?exists>
+<#if layoutSettings.headerImageLinkUrl??>
   <#assign logoLinkURL = "${layoutSettings.headerImageLinkUrl}">
 <#else>
   <#assign logoLinkURL = "${layoutSettings.commonHeaderImageLinkUrl}">
 </#if>
-<#assign organizationLogoLinkURL = "${layoutSettings.organizationLogoLinkUrl?if_exists}">
+<#assign organizationLogoLinkURL = "${layoutSettings.organizationLogoLinkUrl!}">
 <body>
   <div id="wait-spinner" style="display:none">
     <div id="wait-spinner-image"></div>
@@ -103,14 +103,14 @@ under the License.
   </div>
   <div id="masthead">
     <ul>
-      <#if layoutSettings.headerImageUrl?exists>
+      <#if layoutSettings.headerImageUrl??>
         <#assign headerImageUrl = layoutSettings.headerImageUrl>
-      <#elseif layoutSettings.commonHeaderImageUrl?exists>
+      <#elseif layoutSettings.commonHeaderImageUrl??>
         <#assign headerImageUrl = layoutSettings.commonHeaderImageUrl>
-      <#elseif layoutSettings.VT_HDR_IMAGE_URL?exists>
+      <#elseif layoutSettings.VT_HDR_IMAGE_URL??>
         <#assign headerImageUrl = layoutSettings.VT_HDR_IMAGE_URL.get(0)>
       </#if>
-      <#if headerImageUrl?exists>
+      <#if headerImageUrl??>
         <#if organizationLogoLinkURL?has_content>
             <li class="org-logo-area"><a href="<@ofbizUrl>${logoLinkURL}</@ofbizUrl>"><img alt="${layoutSettings.companyName}" src="<@ofbizContentUrl>${StringUtil.wrapString(organizationLogoLinkURL)}</@ofbizContentUrl>"></a></li>
             <#else>
@@ -120,24 +120,24 @@ under the License.
       <#if layoutSettings.middleTopMessage1?has_content && layoutSettings.middleTopMessage1 != " ">
         <li>
         <div class="last-system-msg">
-        <center>${layoutSettings.middleTopHeader?if_exists}</center>
-        <a href="${layoutSettings.middleTopLink1?if_exists}">${layoutSettings.middleTopMessage1?if_exists}</a><br/>
-        <a href="${layoutSettings.middleTopLink2?if_exists}">${layoutSettings.middleTopMessage2?if_exists}</a><br/>
-        <a href="${layoutSettings.middleTopLink3?if_exists}">${layoutSettings.middleTopMessage3?if_exists}</a>
+        <center>${layoutSettings.middleTopHeader!}</center>
+        <a href="${layoutSettings.middleTopLink1!}">${layoutSettings.middleTopMessage1!}</a><br/>
+        <a href="${layoutSettings.middleTopLink2!}">${layoutSettings.middleTopMessage2!}</a><br/>
+        <a href="${layoutSettings.middleTopLink3!}">${layoutSettings.middleTopMessage3!}</a>
         </div>
         </li>
       </#if>
       <li class="preference-area">
           <ul>
-          <#if userLogin?exists>
+          <#if userLogin??>
             <#if layoutSettings.topLines?has_content>
               <#list layoutSettings.topLines as topLine>
-                <#if topLine.text?exists>
-                  <li>${topLine.text}<a href="${StringUtil.wrapString(topLine.url?if_exists)}${StringUtil.wrapString(externalKeyParam)}">${topLine.urlText?if_exists}</a></li>
-                <#elseif topLine.dropDownList?exists>
+                <#if topLine.text??>
+                  <li>${topLine.text}<a href="${StringUtil.wrapString(topLine.url!)}${StringUtil.wrapString(externalKeyParam)}">${topLine.urlText!}</a></li>
+                <#elseif topLine.dropDownList??>
                   <li><#include "component://common/webcommon/includes/insertDropDown.ftl"/></li>
                 <#else>
-                  <li>${topLine?if_exists}</li>
+                  <li>${topLine!}</li>
                 </#if>
               </#list>
             <#else>
@@ -147,10 +147,10 @@ under the License.
           <#else/>
             <li>${uiLabelMap.CommonWelcome}! <a href="<@ofbizUrl>${checkLoginUrl}</@ofbizUrl>">${uiLabelMap.CommonLogin}</a></li>
           </#if>
-          <#---if webSiteId?exists && requestAttributes._CURRENT_VIEW_?exists && helpTopic?exists-->
-          <#if parameters.componentName?exists && requestAttributes._CURRENT_VIEW_?exists && helpTopic?exists>
+          <#---if webSiteId?? && requestAttributes._CURRENT_VIEW_?? && helpTopic??-->
+          <#if parameters.componentName?? && requestAttributes._CURRENT_VIEW_?? && helpTopic??>
             <#include "component://common/webcommon/includes/helplink.ftl" />
-            <li><a <#if pageAvail?has_content>class="alert"</#if> href="javascript:lookup_popup1('showHelp?helpTopic=${helpTopic}&amp;portalPageId=${parameters.portalPageId?if_exists}','help' ,500,500);">${uiLabelMap.CommonHelp}</a></li>
+            <li><a <#if pageAvail?has_content>class="alert"</#if> href="javascript:lookup_popup1('showHelp?helpTopic=${helpTopic}&amp;portalPageId=${parameters.portalPageId!}','help' ,500,500);">${uiLabelMap.CommonHelp}</a></li>
           </#if>
           </ul>
       </li>

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/multiflex/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/multiflex/includes/header.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/multiflex/includes/header.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/multiflex/includes/header.ftl Mon Aug 18 07:42:27 2014
@@ -30,11 +30,11 @@ under the License.
         <!-- Sitelogo and sitename -->
         <a class="sitelogo" href="<@ofbizUrl>main</@ofbizUrl>" title="${uiLabelMap.CommonMain}"></a>
         <div class="sitename">
-          <#if !productStore?exists>
+          <#if !productStore??>
             <h1><a href="<@ofbizUrl>main</@ofbizUrl>" title="Go to Start page">${uiLabelMap.EcommerceNoProductStore}</a></h1>
           </#if>
-          <#if (productStore.title)?exists><h1><a href="<@ofbizUrl>main</@ofbizUrl>" title="Go to Start page">${productStore.title}</a></h1></#if>
-          <#if (productStore.subtitle)?exists><h2>${productStore.subtitle}</h2></#if>
+          <#if (productStore.title)??><h1><a href="<@ofbizUrl>main</@ofbizUrl>" title="Go to Start page">${productStore.title}</a></h1></#if>
+          <#if (productStore.subtitle)??><h2>${productStore.subtitle}</h2></#if>
         </div>
 
         <!-- Navigation Level 0 -->

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/tomahawk/includes/appbarClose.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/tomahawk/includes/appbarClose.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/tomahawk/includes/appbarClose.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/tomahawk/includes/appbarClose.ftl Mon Aug 18 07:42:27 2014
@@ -18,21 +18,21 @@ under the License.
 -->
 <#assign appModelMenu = Static["org.ofbiz.widget.menu.MenuFactory"].getMenuFromLocation(applicationMenuLocation,applicationMenuName,delegator,dispatcher)>
 <#if person?has_content>
-  <#assign userName = person.firstName?if_exists + " " + person.middleName?if_exists + " " + person.lastName?if_exists>
+  <#assign userName = person.firstName! + " " + person.middleName! + " " + person.lastName!>
 <#elseif partyGroup?has_content>
-  <#assign userName = partyGroup.groupName?if_exists>
-<#elseif userLogin?exists>
+  <#assign userName = partyGroup.groupName!>
+<#elseif userLogin??>
   <#assign userName = userLogin.userLoginId>
 <#else>
   <#assign userName = "">
 </#if>
 <#if defaultOrganizationPartyGroupName?has_content>
-  <#assign orgName = " - " + defaultOrganizationPartyGroupName?if_exists>
+  <#assign orgName = " - " + defaultOrganizationPartyGroupName!>
 <#else>
   <#assign orgName = "">
 </#if>
 
-<#if appModelMenu.getModelMenuItemByName(headerItem)?exists>
+<#if appModelMenu.getModelMenuItemByName(headerItem)??>
   <#if headerItem!="main">
     <div id="app-nav-selected-item">
       ${appModelMenu.getModelMenuItemByName(headerItem).getTitle(context)}
@@ -40,19 +40,19 @@ under the License.
   </#if>
 </#if>
 
-<#if parameters.portalPageId?has_content && !appModelMenu.getModelMenuItemByName(headerItem)?exists && userLogin?exists>
+<#if parameters.portalPageId?has_content && !appModelMenu.getModelMenuItemByName(headerItem)?? && userLogin??>
     <#assign findMap = Static["org.ofbiz.base.util.UtilMisc"].toMap("portalPageId", parameters.portalPageId)>
-    <#assign portalPage = delegator.findOne("PortalPage", findMap, true)?if_exists>
+    <#assign portalPage = delegator.findOne("PortalPage", findMap, true)!>
     <#if portalPage?has_content>
       <div id="app-nav-selected-item">
-        ${portalPage.get("portalPageName", locale)?if_exists}
+        ${portalPage.get("portalPageName", locale)!}
       </div>
     </#if>
 </#if>
 
 <div id="control-area">
   <ul id="preferences-menu">
-    <#if userLogin?exists>
+    <#if userLogin??>
       <#if (userPreferences.COMPACT_HEADER)?default("N") == "Y">
         <li class="collapsed"><a href="javascript:document.setUserPreferenceCompactHeaderN.submit()">&nbsp;</a>
           <form name="setUserPreferenceCompactHeaderN" method="post" action="<@ofbizUrl>setUserPreference</@ofbizUrl>">
@@ -71,11 +71,11 @@ under the License.
         </li>
       </#if>
     </#if>
-    <#if userLogin?exists>
-      <#--if webSiteId?exists && requestAttributes._CURRENT_VIEW_?exists && helpTopic?exists-->
-      <#if parameters.componentName?exists && requestAttributes._CURRENT_VIEW_?exists && helpTopic?exists>
+    <#if userLogin??>
+      <#--if webSiteId?? && requestAttributes._CURRENT_VIEW_?? && helpTopic??-->
+      <#if parameters.componentName?? && requestAttributes._CURRENT_VIEW_?? && helpTopic??>
         <#include "component://common/webcommon/includes/helplink.ftl" />
-        <li><a class="help-link <#if pageAvail?has_content> alert</#if>" href="javascript:lookup_popup1('showHelp?helpTopic=${helpTopic}&amp;portalPageId=${parameters.portalPageId?if_exists}','help' ,500,500);" title="${uiLabelMap.CommonHelp}"></a></li>
+        <li><a class="help-link <#if pageAvail?has_content> alert</#if>" href="javascript:lookup_popup1('showHelp?helpTopic=${helpTopic}&amp;portalPageId=${parameters.portalPageId!}','help' ,500,500);" title="${uiLabelMap.CommonHelp}"></a></li>
       </#if>
       <li><a href="<@ofbizUrl>logout</@ofbizUrl>">${uiLabelMap.CommonLogout}</a></li>
       <li><a href="<@ofbizUrl>ListVisualThemes</@ofbizUrl>">${uiLabelMap.CommonVisualThemes}</a></li>
@@ -83,11 +83,11 @@ under the License.
       <li><a href="<@ofbizUrl>${checkLoginUrl}</@ofbizUrl>">${uiLabelMap.CommonLogin}</a></li>
     </#if>
     <li class="first"><a href="<@ofbizUrl>ListLocales</@ofbizUrl>">${uiLabelMap.CommonLanguageTitle}</a></li>
-    <#if userLogin?exists>
+    <#if userLogin??>
       <#if orgName?has_content>
         <li class="org">${orgName}</li>
       </#if>
-      <#if userLogin.partyId?exists>
+      <#if userLogin.partyId??>
         <li class="user"><a href="<@ofbizUrl>passwordChange</@ofbizUrl>">${userName}</a></li>
       <#else>
         <li class="user">${userName}</li>
@@ -99,7 +99,7 @@ under the License.
 <div class="clear">
 </div>
 
-<#if userLogin?exists>
+<#if userLogin??>
 <script type="text/javascript">
   var mainmenu = new DropDownMenu(jQuery('#main-navigation'));
   var appmenu = new DropDownMenu(jQuery('#app-navigation'));

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/tomahawk/includes/appbarOpen.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/tomahawk/includes/appbarOpen.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/tomahawk/includes/appbarOpen.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/tomahawk/includes/appbarOpen.ftl Mon Aug 18 07:42:27 2014
@@ -17,25 +17,25 @@ specific language governing permissions
 under the License.
 -->
 
-<#if (requestAttributes.externalLoginKey)?exists><#assign externalKeyParam = "?externalLoginKey=" + requestAttributes.externalLoginKey?if_exists></#if>
-<#if (externalLoginKey)?exists><#assign externalKeyParam = "?externalLoginKey=" + requestAttributes.externalLoginKey?if_exists></#if>
+<#if (requestAttributes.externalLoginKey)??><#assign externalKeyParam = "?externalLoginKey=" + requestAttributes.externalLoginKey!></#if>
+<#if (externalLoginKey)??><#assign externalKeyParam = "?externalLoginKey=" + requestAttributes.externalLoginKey!></#if>
 <#assign ofbizServerName = application.getAttribute("_serverId")?default("default-server")>
 <#assign contextPath = request.getContextPath()>
 <#assign displayApps = Static["org.ofbiz.webapp.control.LoginWorker"].getAppBarWebInfos(security, userLogin, ofbizServerName, "main")>
 <#assign displaySecondaryApps = Static["org.ofbiz.webapp.control.LoginWorker"].getAppBarWebInfos(security, userLogin, ofbizServerName, "secondary")>
 
 <#assign appModelMenu = Static["org.ofbiz.widget.menu.MenuFactory"].getMenuFromLocation(applicationMenuLocation,applicationMenuName,delegator,dispatcher)>
-<#if appModelMenu.getModelMenuItemByName(headerItem)?exists>
+<#if appModelMenu.getModelMenuItemByName(headerItem)??>
   <#if headerItem!="main">
     <#assign show_last_menu = true>
   </#if>
 </#if>
 
-<#if parameters.portalPageId?exists && !appModelMenu.getModelMenuItemByName(headerItem)?exists>
+<#if parameters.portalPageId?? && !appModelMenu.getModelMenuItemByName(headerItem)??>
   <#assign show_last_menu = true>
 </#if>
 
-<div id="navigation" <#if show_last_menu?exists>class="menu_selected"</#if>>
+<div id="navigation" <#if show_last_menu??>class="menu_selected"</#if>>
     <#if userLogin?has_content>
       <div id="main-navigation">
         <h2>${uiLabelMap.CommonApplications}</h2>
@@ -54,10 +54,10 @@ under the License.
               <#if thisApp != "/">
                 <#assign thisURL = thisURL + "/control/main">
               </#if>
-              <#if layoutSettings.suppressTab?exists && display.name == layoutSettings.suppressTab>
+              <#if layoutSettings.suppressTab?? && display.name == layoutSettings.suppressTab>
                 <!-- do not display this component-->
               <#else>
-                <li<#if selected> class="selected"</#if>><a href="${thisURL + externalKeyParam}"<#if uiLabelMap?exists> title="${uiLabelMap[display.description]}">${uiLabelMap[display.title]}<#else> title="${display.description}">${display.title}</#if></a></li>
+                <li<#if selected> class="selected"</#if>><a href="${thisURL + externalKeyParam}"<#if uiLabelMap??> title="${uiLabelMap[display.description]}">${uiLabelMap[display.title]}<#else> title="${display.description}">${display.title}</#if></a></li>
               </#if>
             </#list>
            </ul></li>
@@ -74,10 +74,10 @@ under the License.
               <#if thisApp != "/">
                 <#assign thisURL = thisURL + "/control/main">
               </#if>
-              <#if layoutSettings.suppressTab?exists && display.name == layoutSettings.suppressTab>
+              <#if layoutSettings.suppressTab?? && display.name == layoutSettings.suppressTab>
                 <!-- do not display this component-->
               <#else>
-                  <li<#if selected> class="selected"</#if>><a href="${thisURL + externalKeyParam}"<#if uiLabelMap?exists> title="${uiLabelMap[display.description]}">${uiLabelMap[display.title]}<#else> title="${display.description}">${display.title}</#if></a></li>
+                  <li<#if selected> class="selected"</#if>><a href="${thisURL + externalKeyParam}"<#if uiLabelMap??> title="${uiLabelMap[display.description]}">${uiLabelMap[display.title]}<#else> title="${display.description}">${display.title}</#if></a></li>
               </#if>
             </#list>
             </ul>

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/tomahawk/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/tomahawk/includes/header.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/tomahawk/includes/header.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/tomahawk/includes/header.ftl Mon Aug 18 07:42:27 2014
@@ -16,10 +16,10 @@ KIND, either express or implied.  See th
 specific language governing permissions and limitations
 under the License.
 -->
-<#assign externalKeyParam = "&amp;externalLoginKey=" + requestAttributes.externalLoginKey?if_exists>
+<#assign externalKeyParam = "&amp;externalLoginKey=" + requestAttributes.externalLoginKey!>
 
-<#if (requestAttributes.person)?exists><#assign person = requestAttributes.person></#if>
-<#if (requestAttributes.partyGroup)?exists><#assign partyGroup = requestAttributes.partyGroup></#if>
+<#if (requestAttributes.person)??><#assign person = requestAttributes.person></#if>
+<#if (requestAttributes.partyGroup)??><#assign partyGroup = requestAttributes.partyGroup></#if>
 <#assign docLangAttr = locale.toString()?replace("_", "-")>
 <#assign langDir = "ltr">
 <#if "ar.iw"?contains(docLangAttr?substring(0, 2))>
@@ -28,7 +28,7 @@ under the License.
 <html lang="${docLangAttr}" dir="${langDir}" xmlns="http://www.w3.org/1999/xhtml">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-    <title>${layoutSettings.companyName}: <#if (page.titleProperty)?has_content>${uiLabelMap[page.titleProperty]}<#else>${(page.title)?if_exists}</#if></title>
+    <title>${layoutSettings.companyName}: <#if (page.titleProperty)?has_content>${uiLabelMap[page.titleProperty]}<#else>${(page.title)!}</#if></title>
     <#if layoutSettings.shortcutIcon?has_content>
       <#assign shortcutIcon = layoutSettings.shortcutIcon/>
     <#elseif layoutSettings.VT_SHORTCUT_ICON?has_content>
@@ -83,17 +83,17 @@ under the License.
     <#if layoutSettings.WEB_ANALYTICS?has_content>
       <script language="JavaScript" type="text/javascript">
         <#list layoutSettings.WEB_ANALYTICS as webAnalyticsConfig>
-          ${StringUtil.wrapString(webAnalyticsConfig.webAnalyticsCode?if_exists)}
+          ${StringUtil.wrapString(webAnalyticsConfig.webAnalyticsCode!)}
         </#list>
       </script>
     </#if>
 </head>
-<#if layoutSettings.headerImageLinkUrl?exists>
+<#if layoutSettings.headerImageLinkUrl??>
   <#assign logoLinkURL = "${layoutSettings.headerImageLinkUrl}">
 <#else>
   <#assign logoLinkURL = "${layoutSettings.commonHeaderImageLinkUrl}">
 </#if>
-<#assign organizationLogoLinkURL = "${layoutSettings.organizationLogoLinkUrl?if_exists}">
+<#assign organizationLogoLinkURL = "${layoutSettings.organizationLogoLinkUrl!}">
 
 <body>
   <div id="wait-spinner" style="display:none">
@@ -108,14 +108,14 @@ under the License.
     <#if (userPreferences.COMPACT_HEADER)?default("N") == "N">
       <div id="masthead">
         <ul>
-          <#if layoutSettings.headerImageUrl?exists>
+          <#if layoutSettings.headerImageUrl??>
             <#assign headerImageUrl = layoutSettings.headerImageUrl>
-          <#elseif layoutSettings.commonHeaderImageUrl?exists>
+          <#elseif layoutSettings.commonHeaderImageUrl??>
             <#assign headerImageUrl = layoutSettings.commonHeaderImageUrl>
-          <#elseif layoutSettings.VT_HDR_IMAGE_URL?exists>
+          <#elseif layoutSettings.VT_HDR_IMAGE_URL??>
             <#assign headerImageUrl = layoutSettings.VT_HDR_IMAGE_URL.get(0)>
           </#if>
-          <#if headerImageUrl?exists>
+          <#if headerImageUrl??>
             <#if organizationLogoLinkURL?has_content>
                 <li id="org-logo-area"><a href="<@ofbizUrl>${logoLinkURL}</@ofbizUrl>"><img alt="${layoutSettings.companyName}" src="<@ofbizContentUrl>${StringUtil.wrapString(organizationLogoLinkURL)}</@ofbizContentUrl>"></a></li>
                 <#else>
@@ -124,9 +124,9 @@ under the License.
           </#if>
           <#if layoutSettings.middleTopMessage1?has_content && layoutSettings.middleTopMessage1 != " ">
             <li class="last-system-msg">
-                <a href="${StringUtil.wrapString(layoutSettings.middleTopLink1!)}">${layoutSettings.middleTopMessage1?if_exists}</a><br/>
-                <a href="${StringUtil.wrapString(layoutSettings.middleTopLink2!)}">${layoutSettings.middleTopMessage2?if_exists}</a><br/>
-                <a href="${StringUtil.wrapString(layoutSettings.middleTopLink3!)}">${layoutSettings.middleTopMessage3?if_exists}</a>
+                <a href="${StringUtil.wrapString(layoutSettings.middleTopLink1!)}">${layoutSettings.middleTopMessage1!}</a><br/>
+                <a href="${StringUtil.wrapString(layoutSettings.middleTopLink2!)}">${layoutSettings.middleTopMessage2!}</a><br/>
+                <a href="${StringUtil.wrapString(layoutSettings.middleTopLink3!)}">${layoutSettings.middleTopMessage3!}</a>
             </li>
           </#if>
         </ul>