svn commit: r1618313 [11/11] - in /ofbiz/trunk: specialpurpose/assetmaint/weba
Locked
svn commit: r1618313 [11/11] - in /ofbiz/trunk: specialpurpose/assetmaint/weba
 
|
Modified: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/payment/PayCreditCard.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/webapp/webpos/payment/PayCreditCard.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/webpos/webapp/webpos/payment/PayCreditCard.ftl (original) +++ ofbiz/trunk/specialpurpose/webpos/webapp/webpos/payment/PayCreditCard.ftl Sat Aug 16 08:40:28 2014 @@ -87,9 +87,9 @@ under the License. <option value="12" <#if expMonth?default('') == '12'> selected="selected"</#if>>${uiLabelMap.CommonDecember}</option> </select> <select id="expYear" name="expYear"> - <#assign ccExprYear = requestParameters.expYear?if_exists> + <#assign ccExprYear = requestParameters.expYear!> <#if ccExprYear?has_content> - <option value="${ccExprYear?if_exists}">${ccExprYear?if_exists}</option> + <option value="${ccExprYear!}">${ccExprYear!}</option> </#if> ${screens.render("component://common/widget/CommonScreens.xml#ccyears")} </select> Modified: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/search/CustomerAddress.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/webapp/webpos/search/CustomerAddress.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/webpos/webapp/webpos/search/CustomerAddress.ftl (original) +++ ofbiz/trunk/specialpurpose/webpos/webapp/webpos/search/CustomerAddress.ftl Sat Aug 16 08:40:28 2014 @@ -34,23 +34,23 @@ under the License. <input type="hidden" id="shippingLocation" name="shippingLocation" value="N"/> <div id="billingAddress"> <table class="basic-table" cellspacing="0"> - <#if billingPostalAddress?exists> - <#if personBillTo?exists> + <#if billingPostalAddress??> + <#if personBillTo??> <tr> <td><b><#if personBillTo.lastName?has_content>${personBillTo.lastName}</#if> <#if personBillTo.firstName?has_content>${personBillTo.firstName}</#if></b></td> </tr> </#if> - <#assign state = billingPostalAddress.getRelatedOne("StateProvinceGeo", false)?if_exists/> - <#assign country = billingPostalAddress.getRelatedOne("CountryGeo", false)?if_exists/> + <#assign state = billingPostalAddress.getRelatedOne("StateProvinceGeo", false)!/> + <#assign country = billingPostalAddress.getRelatedOne("CountryGeo", false)!/> <tr> <td><#if billingPostalAddress.address1?has_content>${billingPostalAddress.address1}</#if></td> </tr> <tr> - <td><#if billingPostalAddress.city?has_content>${billingPostalAddress.city},</#if> <#if state?exists && state?has_content && state.geoCode?has_content>${state.geoCode}</#if> <#if billingPostalAddress.postalCode?has_content>${billingPostalAddress.postalCode}</#if> + <td><#if billingPostalAddress.city?has_content>${billingPostalAddress.city},</#if> <#if state?? && state?has_content && state.geoCode?has_content>${state.geoCode}</#if> <#if billingPostalAddress.postalCode?has_content>${billingPostalAddress.postalCode}</#if> </td> </tr> <tr> - <td><#if country?exists && country?has_content &&country.get("geoName", locale)?has_content>${country.get("geoName", locale)}</#if> + <td><#if country?? && country?has_content &&country.get("geoName", locale)?has_content>${country.get("geoName", locale)}</#if> </td> </tr> <#else> @@ -65,25 +65,25 @@ under the License. </div> <div id="shippingAddress" style="display:none"> <table class="basic-table" cellspacing="0"> - <#if shippingPostalAddress?exists> - <#if personShipTo?exists> + <#if shippingPostalAddress??> + <#if personShipTo??> <tr> <td><b><#if personShipTo.lastName?has_content>${personShipTo.lastName}</#if> <#if personShipTo.firstName?has_content>${personShipTo.firstName}</#if></b></td> </tr> </#if> - <#assign state = shippingPostalAddress.getRelatedOne("StateProvinceGeo", false)?if_exists/> - <#assign country = shippingPostalAddress.getRelatedOne("CountryGeo", false)?if_exists/> + <#assign state = shippingPostalAddress.getRelatedOne("StateProvinceGeo", false)!/> + <#assign country = shippingPostalAddress.getRelatedOne("CountryGeo", false)!/> <tr> <td><#if shippingPostalAddress.address1?has_content>${shippingPostalAddress.address1}</#if></td> </tr> <tr> - <td><#if shippingPostalAddress.city?has_content>${shippingPostalAddress.city},</#if> <#if state?exists && state?has_content && state.geoCode?has_content>${state.geoCode}</#if> <#if shippingPostalAddress.postalCode?has_content>${shippingPostalAddress.postalCode}</#if> + <td><#if shippingPostalAddress.city?has_content>${shippingPostalAddress.city},</#if> <#if state?? && state?has_content && state.geoCode?has_content>${state.geoCode}</#if> <#if shippingPostalAddress.postalCode?has_content>${shippingPostalAddress.postalCode}</#if> </td> </tr> <tr> <td> <input type="hidden" id="shipToSelected" value="Y"/> - <#if country?exists && country?has_content && country.get("geoName", locale)?has_content>${country.get("geoName", locale)}</#if> + <#if country?? && country?has_content && country.get("geoName", locale)?has_content>${country.get("geoName", locale)}</#if> </td> </tr> <#else> Modified: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/search/SearchProducts.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/webapp/webpos/search/SearchProducts.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/webpos/webapp/webpos/search/SearchProducts.ftl (original) +++ ofbiz/trunk/specialpurpose/webpos/webapp/webpos/search/SearchProducts.ftl Sat Aug 16 08:40:28 2014 @@ -19,7 +19,7 @@ under the License. <form name="SearchProducts" method="post" action="<@ofbizUrl>AddItem</@ofbizUrl>"> <div> <input type="hidden" id="quantity" name="quantity" value="1" /> - <input type="hidden" id="add_product_id" name="add_product_id" value="${parameters.add_product_id?if_exists}" /> + <input type="hidden" id="add_product_id" name="add_product_id" value="${parameters.add_product_id!}" /> <input type="hidden" id="goodIdentificationTypeId" name="goodIdentificationTypeId" value="" /> <label for="searchBy"><b> ${uiLabelMap.WebPosSearchBy}</b></label> <select id="searchBy" name="searchBy"> Modified: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/search/SearchSalesReps.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/webapp/webpos/search/SearchSalesReps.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/webpos/webapp/webpos/search/SearchSalesReps.ftl (original) +++ ofbiz/trunk/specialpurpose/webpos/webapp/webpos/search/SearchSalesReps.ftl Sat Aug 16 08:40:28 2014 @@ -18,12 +18,12 @@ under the License. --> <div> <div id="SearchSalesRepsList"> - <#if salesReps?exists && salesReps?has_content> + <#if salesReps?? && salesReps?has_content> <table id="salesRepsResults" name="salesRepsResults" cellspacing="0" cellpadding="2" class="basic-table"> <#assign alt_row = false> <#list salesReps as salesRep> <#assign salesRepInCart = false> - <#if cartSalesReps?exists && cartSalesReps?has_content> + <#if cartSalesReps?? && cartSalesReps?has_content> <#list cartSalesReps as cartSalesRep> <#if cartSalesRep == salesRep.partyId> <#assign salesRepInCart = true> Modified: ofbiz/trunk/themes/bizznesstime/includes/appbar.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bizznesstime/includes/appbar.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/themes/bizznesstime/includes/appbar.ftl (original) +++ ofbiz/trunk/themes/bizznesstime/includes/appbar.ftl Sat Aug 16 08:40:28 2014 @@ -16,8 +16,8 @@ KIND, either express or implied. See th specific language governing permissions and limitations 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")> @@ -39,10 +39,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><a href="${thisURL + externalKeyParam}" <#if uiLabelMap?exists> title="${uiLabelMap[display.description]}">${uiLabelMap[display.title]}<#else> title="${display.description}">${display.title}</#if></a></li> + <li><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/trunk/themes/bizznesstime/includes/header.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bizznesstime/includes/header.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/themes/bizznesstime/includes/header.ftl (original) +++ ofbiz/trunk/themes/bizznesstime/includes/header.ftl Sat Aug 16 08:40:28 2014 @@ -16,8 +16,8 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> -<#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))> @@ -34,7 +34,7 @@ under the License. <meta http-equiv="expires" content="0" /> <meta http-equiv="imagetoolbar" content="false" /> - <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> <meta name="robots" content="index, follow" /> <meta name="googlebot" content="index,follow" /> @@ -78,7 +78,7 @@ under the License. <link rel="stylesheet" href="<@ofbizContentUrl>${StringUtil.wrapString(styleSheet)}</@ofbizContentUrl>" media="screen,projection" type="text/css" charset="UTF-8"/> </#list> </#if> - ${layoutSettings.extraHead?if_exists} + ${layoutSettings.extraHead!} <#if layoutSettings.VT_EXTRA_HEAD?has_content> <#list layoutSettings.VT_EXTRA_HEAD as extraHead> ${extraHead} @@ -102,17 +102,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="wrap"> <div id="wait-spinner" style="display:none"> @@ -136,26 +136,26 @@ under the License. </span> <span> <#if person?has_content> - ${uiLabelMap.CommonWelcome}, ${person.firstName?if_exists} ${person.lastName?if_exists} ( ${userLogin.userLoginId} ) + ${uiLabelMap.CommonWelcome}, ${person.firstName!} ${person.lastName!} ( ${userLogin.userLoginId} ) <#elseif partyGroup?has_content> - ${uiLabelMap.CommonWelcome}, ${partyGroup.groupName?if_exists} ( ${userLogin.userLoginId} ) + ${uiLabelMap.CommonWelcome}, ${partyGroup.groupName!} ( ${userLogin.userLoginId} ) <#else> ${uiLabelMap.CommonWelcome} </#if> </span> <span><a href="<@ofbizUrl>logout</@ofbizUrl>">${uiLabelMap.CommonLogout}</a></span> - <#--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" /> - <span><a href="javascript:lookup_popup1('showHelp?helpTopic=${helpTopic}&portalPageId=${parameters.portalPageId?if_exists}','help' ,500,500);">${uiLabelMap.CommonHelp}</a></span> + <span><a href="javascript:lookup_popup1('showHelp?helpTopic=${helpTopic}&portalPageId=${parameters.portalPageId!}','help' ,500,500);">${uiLabelMap.CommonHelp}</a></span> </#if> <#if layoutSettings.middleTopMessage1?has_content && layoutSettings.middleTopMessage1 != " "> <span id="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> </span> </#if> </div> Modified: ofbiz/trunk/themes/bizznesstime/includes/messages.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bizznesstime/includes/messages.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/themes/bizznesstime/includes/messages.ftl (original) +++ ofbiz/trunk/themes/bizznesstime/includes/messages.ftl Sat Aug 16 08:40:28 2014 @@ -18,20 +18,20 @@ under the License. --> <#if requestAttributes.errorMessageList?has_content><#assign errorMessageList=requestAttributes.errorMessageList></#if> <#if requestAttributes.eventMessageList?has_content><#assign eventMessageList=requestAttributes.eventMessageList></#if> -<#if requestAttributes.serviceValidationException?exists><#assign serviceValidationException = requestAttributes.serviceValidationException></#if> +<#if requestAttributes.serviceValidationException??><#assign serviceValidationException = requestAttributes.serviceValidationException></#if> <#if requestAttributes.uiLabelMap?has_content><#assign uiLabelMap = requestAttributes.uiLabelMap></#if> <#if !errorMessage?has_content> - <#assign errorMessage = requestAttributes._ERROR_MESSAGE_?if_exists> + <#assign errorMessage = requestAttributes._ERROR_MESSAGE_!> </#if> <#if !errorMessageList?has_content> - <#assign errorMessageList = requestAttributes._ERROR_MESSAGE_LIST_?if_exists> + <#assign errorMessageList = requestAttributes._ERROR_MESSAGE_LIST_!> </#if> <#if !eventMessage?has_content> - <#assign eventMessage = requestAttributes._EVENT_MESSAGE_?if_exists> + <#assign eventMessage = requestAttributes._EVENT_MESSAGE_!> </#if> <#if !eventMessageList?has_content> - <#assign eventMessageList = requestAttributes._EVENT_MESSAGE_LIST_?if_exists> + <#assign eventMessageList = requestAttributes._EVENT_MESSAGE_LIST_!> </#if> <#-- display the error messages --> Modified: ofbiz/trunk/themes/bizznesstime/includes/secondary-appbar.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bizznesstime/includes/secondary-appbar.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/themes/bizznesstime/includes/secondary-appbar.ftl (original) +++ ofbiz/trunk/themes/bizznesstime/includes/secondary-appbar.ftl Sat Aug 16 08:40:28 2014 @@ -18,8 +18,8 @@ under the License. --> <#assign nowTimestamp = Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp()> -<#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, "secondary")> @@ -38,7 +38,7 @@ under the License. <#if thisApp != "/"> <#assign thisURL = thisURL + "/control/main"> </#if> - <li><a<#if selected> class="current-section"</#if> href="${thisURL}${StringUtil.wrapString(externalKeyParam)}" <#if uiLabelMap?exists> title="${uiLabelMap[display.description]}">${uiLabelMap[display.title]}<#else> title="${display.description}"> ${display.title}</#if></a></li> + <li><a<#if selected> class="current-section"</#if> href="${thisURL}${StringUtil.wrapString(externalKeyParam)}" <#if uiLabelMap??> title="${uiLabelMap[display.description]}">${uiLabelMap[display.title]}<#else> title="${display.description}"> ${display.title}</#if></a></li> </#list> </ul> </#if> \ No newline at end of file Modified: ofbiz/trunk/themes/bluelight/includes/appbarClose.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bluelight/includes/appbarClose.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/themes/bluelight/includes/appbarClose.ftl (original) +++ ofbiz/trunk/themes/bluelight/includes/appbarClose.ftl Sat Aug 16 08:40:28 2014 @@ -19,9 +19,9 @@ under the License. </div> </div> <div class="breadcrumbs-sep"> - <#if titleProperty?exists> + <#if titleProperty??> ${uiLabelMap[titleProperty]} - <#else>${(page.title)?if_exists} + <#else>${(page.title)!} </#if> </div> <div class="breadcrumbs-end"> @@ -30,7 +30,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/trunk/themes/bluelight/includes/appbarOpen.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bluelight/includes/appbarOpen.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/themes/bluelight/includes/appbarOpen.ftl (original) +++ ofbiz/trunk/themes/bluelight/includes/appbarOpen.ftl Sat Aug 16 08:40:28 2014 @@ -16,22 +16,22 @@ KIND, either express or implied. See th specific language governing permissions and limitations 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> <div class="tabbar"> - <div class="breadcrumbs<#if show_last_menu?exists> menu_selected</#if>"> + <div class="breadcrumbs<#if show_last_menu??> menu_selected</#if>"> <div class="breadcrumbs-start"> <div id="main-navigation"> <h2>${uiLabelMap.CommonApplications}</h2> @@ -50,10 +50,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> @@ -70,10 +70,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/trunk/themes/bluelight/includes/header.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bluelight/includes/header.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/themes/bluelight/includes/header.ftl (original) +++ ofbiz/trunk/themes/bluelight/includes/header.ftl Sat Aug 16 08:40:28 2014 @@ -16,10 +16,10 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> -<#assign externalKeyParam = "&externalLoginKey=" + requestAttributes.externalLoginKey?if_exists> +<#assign externalKeyParam = "&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,30 +83,30 @@ 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!}"> <#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> @@ -132,14 +132,14 @@ under the License. </#if> </#if> <#else> - <#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><a href="<@ofbizUrl>${logoLinkURL}</@ofbizUrl>"><img alt="${layoutSettings.companyName}" src="<@ofbizContentUrl>${StringUtil.wrapString(organizationLogoLinkURL)}</@ofbizContentUrl>"></a></li> <#else> @@ -149,19 +149,19 @@ 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> </#if> <li class="control-area"> <ul id="preferences-menu"> - <#if userLogin?exists> - <#if userLogin.partyId?exists> - <li class="user"><a href="/partymgr/control/viewprofile?partyId=${userLogin.partyId}${externalKeyParam?if_exists}">${userName}</a></li> + <#if userLogin??> + <#if userLogin.partyId??> + <li class="user"><a href="/partymgr/control/viewprofile?partyId=${userLogin.partyId}${externalKeyParam!}">${userName}</a></li> <#else> <li class="user">${userName}</li> </#if> @@ -170,18 +170,18 @@ under the License. </#if> </#if> <li class="first"><a href="<@ofbizUrl>ListLocales</@ofbizUrl>">${uiLabelMap.CommonLanguageTitle} : ${locale.getDisplayName(locale)}</a></li> - <#if userLogin?exists> + <#if userLogin??> <li><a href="<@ofbizUrl>ListVisualThemes</@ofbizUrl>">${uiLabelMap.CommonVisualThemes}</a></li> <li><a href="<@ofbizUrl>logout</@ofbizUrl>">${uiLabelMap.CommonLogout}</a></li> <#else> <li><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 class="help-link <#if pageAvail?has_content> alert</#if>" href="javascript:lookup_popup1('showHelp?helpTopic=${helpTopic}&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}&portalPageId=${parameters.portalPageId!}','help' ,500,500);" title="${uiLabelMap.CommonHelp}"></a></li> </#if> - <#if userLogin?exists> + <#if userLogin??> <#if (userPreferences.COMPACT_HEADER)?default("N") == "Y"> <li class="collapsed"><a href="javascript:document.setUserPreferenceCompactHeaderN.submit()"> </a> <form name="setUserPreferenceCompactHeaderN" method="post" action="<@ofbizUrl>setUserPreference</@ofbizUrl>"> Modified: ofbiz/trunk/themes/droppingcrumbs/includes/appbarClose.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/droppingcrumbs/includes/appbarClose.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/themes/droppingcrumbs/includes/appbarClose.ftl (original) +++ ofbiz/trunk/themes/droppingcrumbs/includes/appbarClose.ftl Sat Aug 16 08:40:28 2014 @@ -17,7 +17,7 @@ specific language governing permissions under the License. --> <#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"> <div class="breadcrumbs-sep"> ${appModelMenu.getModelMenuItemByName(headerItem).getTitle(context)} @@ -29,7 +29,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/trunk/themes/droppingcrumbs/includes/appbarOpen.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/droppingcrumbs/includes/appbarOpen.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/themes/droppingcrumbs/includes/appbarOpen.ftl (original) +++ ofbiz/trunk/themes/droppingcrumbs/includes/appbarOpen.ftl Sat Aug 16 08:40:28 2014 @@ -17,22 +17,22 @@ 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> <div class="tabbar"> - <div class="breadcrumbs<#if show_last_menu?exists> menu_selected</#if>"> + <div class="breadcrumbs<#if show_last_menu??> menu_selected</#if>"> <div id="main-navigation"> <h2>${uiLabelMap.CommonApplications}</h2> <ul> @@ -50,10 +50,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> @@ -70,10 +70,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/trunk/themes/droppingcrumbs/includes/header.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/droppingcrumbs/includes/header.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/themes/droppingcrumbs/includes/header.ftl (original) +++ ofbiz/trunk/themes/droppingcrumbs/includes/header.ftl Sat Aug 16 08:40:28 2014 @@ -16,10 +16,10 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> -<#assign externalKeyParam = "&externalLoginKey=" + requestAttributes.externalLoginKey?if_exists> +<#assign externalKeyParam = "&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,30 +83,30 @@ 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!}"> <#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> @@ -135,14 +135,14 @@ under the License. </#if> </li> <#else> - <#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> @@ -152,10 +152,10 @@ 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> @@ -163,18 +163,18 @@ under the License. <li class="control-area"> <ul id="preferences-menu"> <li class="first"><a href="<@ofbizUrl>ListLocales</@ofbizUrl>">${uiLabelMap.CommonLanguageTitle} : ${locale.getDisplayName(locale)}</a></li> - <#if userLogin?exists> + <#if userLogin??> <li><a href="<@ofbizUrl>ListVisualThemes</@ofbizUrl>">${uiLabelMap.CommonVisualThemes}</a></li> <li><a href="<@ofbizUrl>logout</@ofbizUrl>">${uiLabelMap.CommonLogout}</a></li> <#else> <li><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 class="help-link <#if pageAvail?has_content> alert</#if>" href="javascript:lookup_popup1('showHelp?helpTopic=${helpTopic}&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}&portalPageId=${parameters.portalPageId!}','help' ,500,500);" title="${uiLabelMap.CommonHelp}"></a></li> </#if> - <#if userLogin?exists> + <#if userLogin??> <#if (userPreferences.COMPACT_HEADER)?default("N") == "Y"> <li class="collapsed"><a href="javascript:document.setUserPreferenceCompactHeaderN.submit()"> </a> <form name="setUserPreferenceCompactHeaderN" method="post" action="<@ofbizUrl>setUserPreference</@ofbizUrl>"> @@ -193,9 +193,9 @@ under the License. </li> </#if> </#if> - <#if userLogin?exists> - <#if userLogin.partyId?exists> - <li class="user"><a href="/partymgr/control/viewprofile?partyId=${userLogin.partyId}${externalKeyParam?if_exists}">${userName}</a></li> + <#if userLogin??> + <#if userLogin.partyId??> + <li class="user"><a href="/partymgr/control/viewprofile?partyId=${userLogin.partyId}${externalKeyParam!}">${userName}</a></li> <#else> <li class="user">${userName}</li> </#if> Modified: ofbiz/trunk/themes/flatgrey/includes/appbar.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/flatgrey/includes/appbar.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/themes/flatgrey/includes/appbar.ftl (original) +++ ofbiz/trunk/themes/flatgrey/includes/appbar.ftl Sat Aug 16 08:40:28 2014 @@ -17,8 +17,8 @@ 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")> @@ -40,7 +40,7 @@ under the License. <#if thisApp != "/"> <#assign thisURL = thisURL + "main"> </#if> - <#if layoutSettings.suppressTab?exists && display.name == layoutSettings.suppressTab> + <#if layoutSettings.suppressTab?? && display.name == layoutSettings.suppressTab> <#-- do not display this component--> <#else> <#if appCount % 4 == 0> @@ -52,7 +52,7 @@ under the License. <li> </#if> </#if> - <a href="${thisURL}${StringUtil.wrapString(externalKeyParam)}"<#if selected> class="selected"</#if><#if uiLabelMap?exists> title="${uiLabelMap[display.description]}">${uiLabelMap[display.title]}<#else> title="${display.description}">${display.title}</#if></a> + <a href="${thisURL}${StringUtil.wrapString(externalKeyParam)}"<#if selected> class="selected"</#if><#if uiLabelMap??> title="${uiLabelMap[display.description]}">${uiLabelMap[display.title]}<#else> title="${display.description}">${display.title}</#if></a> <#assign appCount = appCount + 1> </#if> </#list> @@ -76,7 +76,7 @@ under the License. <li> </#if> </#if> - <a href="${thisURL}${StringUtil.wrapString(externalKeyParam)}"<#if selected> class="selected"</#if><#if uiLabelMap?exists> title="${uiLabelMap[display.description]}">${uiLabelMap[display.title]}<#else> title="${display.description}">${display.title}</#if></a> + <a href="${thisURL}${StringUtil.wrapString(externalKeyParam)}"<#if selected> class="selected"</#if><#if uiLabelMap??> title="${uiLabelMap[display.description]}">${uiLabelMap[display.title]}<#else> title="${display.description}">${display.title}</#if></a> <#assign appCount = appCount + 1> </#list> <#if appCount != 0> Modified: ofbiz/trunk/themes/flatgrey/includes/header.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/flatgrey/includes/header.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/themes/flatgrey/includes/header.ftl (original) +++ ofbiz/trunk/themes/flatgrey/includes/header.ftl Sat Aug 16 08:40:28 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 = "&" + lastParameters></#if> + <#if lastParameters??><#assign parametersURL = "&" + 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}&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}&portalPageId=${parameters.portalPageId!}','help' ,500,500);">${uiLabelMap.CommonHelp}</a></li> </#if> </ul> </li> Modified: ofbiz/trunk/themes/multiflex/includes/header.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/multiflex/includes/header.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/themes/multiflex/includes/header.ftl (original) +++ ofbiz/trunk/themes/multiflex/includes/header.ftl Sat Aug 16 08:40:28 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/trunk/themes/tomahawk/includes/appbarClose.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/tomahawk/includes/appbarClose.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/themes/tomahawk/includes/appbarClose.ftl (original) +++ ofbiz/trunk/themes/tomahawk/includes/appbarClose.ftl Sat Aug 16 08:40:28 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()"> </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}&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}&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/trunk/themes/tomahawk/includes/appbarOpen.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/tomahawk/includes/appbarOpen.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/themes/tomahawk/includes/appbarOpen.ftl (original) +++ ofbiz/trunk/themes/tomahawk/includes/appbarOpen.ftl Sat Aug 16 08:40:28 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/trunk/themes/tomahawk/includes/header.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/tomahawk/includes/header.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/themes/tomahawk/includes/header.ftl (original) +++ ofbiz/trunk/themes/tomahawk/includes/header.ftl Sat Aug 16 08:40:28 2014 @@ -16,10 +16,10 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> -<#assign externalKeyParam = "&externalLoginKey=" + requestAttributes.externalLoginKey?if_exists> +<#assign externalKeyParam = "&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> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |