You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by de...@apache.org on 2017/10/16 11:31:42 UTC
svn commit: r1812285 [4/4] - in /ofbiz/ofbiz-framework/trunk:
applications/accounting/template/ap/invoices/
applications/accounting/template/common/
applications/accounting/template/finaccounttrans/
applications/accounting/template/payment/ application...
Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/template/labelmanager/ViewHardcodedLabels.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/template/labelmanager/ViewHardcodedLabels.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webtools/template/labelmanager/ViewHardcodedLabels.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webtools/template/labelmanager/ViewHardcodedLabels.ftl Mon Oct 16 11:31:40 2017
@@ -30,13 +30,13 @@ under the License.
<#assign labelFound = 'N'>
<#assign refNum = factory.getLabelReferenceFile(reference)>
<#if (refNum > 0)>
- <tr <#if rowNum == "1">class="alternate-row"</#if>>
+ <tr <#if "1" == rowNum>class="alternate-row"</#if>>
<td>${rowNumber}</td>
<td>${reference}</td>
<td align="center"><#if (refNum > 0)><a href="<@o...@ofbizUrl>">${refNum}</a><#else>${refNum}</#if></td>
</tr>
<#assign rowNumber = rowNumber + 1>
- <#if rowNum == "2">
+ <#if "2" == rowNum>
<#assign rowNum = "1">
<#else>
<#assign rowNum = "2">
Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/template/labelmanager/ViewLabels.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/template/labelmanager/ViewLabels.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webtools/template/labelmanager/ViewLabels.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webtools/template/labelmanager/ViewLabels.ftl Mon Oct 16 11:31:40 2017
@@ -64,8 +64,8 @@ under the License.
</#if>
</#if>
<#assign showLabel = true>
- <#if parameters.onlyMissingTranslations?? && parameters.onlyMissingTranslations == "Y"
- && parameters.labelLocaleName?? && parameters.labelLocaleName != "">
+ <#if parameters.onlyMissingTranslations?? && "Y" == parameters.onlyMissingTranslations
+ && parameters.labelLocaleName?? && "" != parameters.labelLocaleName>
<#assign labelValue = label.getLabelValue(parameters.labelLocaleName)!>
<#if labelValue?? && labelValue?has_content>
<#assign value = labelValue.getLabelValue()!>
@@ -74,17 +74,17 @@ under the License.
</#if>
</#if>
</#if>
- <#if showLabel && parameters.onlyNotUsedLabels?? && parameters.onlyNotUsedLabels == "Y" && (referenceNum > 0)>
+ <#if showLabel && parameters.onlyNotUsedLabels?? && "Y" == parameters.onlyNotUsedLabels && (referenceNum > 0)>
<#assign showLabel = false>
</#if>
- <#if showLabel && parameters.labelKey?? && parameters.labelKey != "" && parameters.labelKey != label.labelKey>
+ <#if showLabel && parameters.labelKey?? && "" != parameters.labelKey && parameters.labelKey != label.labelKey>
<#assign showLabel = false>
</#if>
- <#if showLabel && parameters.labelFileName?? && parameters.labelFileName != "" && parameters.labelFileName != label.fileName>
+ <#if showLabel && parameters.labelFileName?? && "" != parameters.labelFileName && parameters.labelFileName != label.fileName>
<#assign showLabel = false>
</#if>
<#if showLabel == true>
- <tr <#if rowNum == "1">class="alternate-row"</#if>>
+ <tr <#if "1" == rowNum>class="alternate-row"</#if>>
<td>${rowNumber}</td>
<td><a href="<@o...@ofbizUrl>" <#if previousKey == labelKey>class="submenutext"</#if>>${label.labelKey}</a></td>
<td>${label.fileName}</td>
@@ -106,7 +106,7 @@ under the License.
</#if>
</#list>
</tr>
- <#if rowNum == "2">
+ <#if "2" == rowNum>
<#assign rowNum = "1">
<#else>
<#assign rowNum = "2">
Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/template/labelmanager/ViewReferences.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/template/labelmanager/ViewReferences.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webtools/template/labelmanager/ViewReferences.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webtools/template/labelmanager/ViewReferences.ftl Mon Oct 16 11:31:40 2017
@@ -38,20 +38,20 @@ under the License.
<#if reference?? && reference?has_content>
<#assign entries = reference.entrySet()>
<#list entries as entry>
- <tr <#if rowNum == "1">class="alternate-row"</#if>>
+ <tr <#if "1" == rowNum>class="alternate-row"</#if>>
<td>${rowNumber}</td>
<td><a href="<@o...@ofbizUrl>">${entry.getKey()}</a></td>
<td>${entry.getValue()}</td>
</tr>
<#assign totalRefs = totalRefs + entry.getValue()/>
- <#if rowNum == "2">
+ <#if "2" == rowNum>
<#assign rowNum = "1">
<#else>
<#assign rowNum = "2">
</#if>
<#assign rowNumber = rowNumber + 1>
</#list>
- <tr <#if rowNum == "1">class="alternate-row"</#if>>
+ <tr <#if "1" == rowNum>class="alternate-row"</#if>>
<td> </td>
<td><b>${uiLabelMap.CommonTotal}</b></td>
<td>${totalRefs}</td>
Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/template/service/SetServiceParameter.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/template/service/SetServiceParameter.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webtools/template/service/SetServiceParameter.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webtools/template/service/SetServiceParameter.ftl Mon Oct 16 11:31:40 2017
@@ -27,8 +27,8 @@ under the License.
<tr>
<td class="label">${serviceParameter.name} (${serviceParameter.type})</td>
<td>
- <input type="text" size="20" name="${serviceParameter.name}" value="${serviceParameter.value!}" <#if serviceParameter.optional == "N">class="required"</#if>/>
- <#if serviceParameter.optional == "N"><span class="tooltip">${uiLabelMap.CommonRequired}</span></#if>
+ <input type="text" size="20" name="${serviceParameter.name}" value="${serviceParameter.value!}" <#if "N" == serviceParameter.optional>class="required"</#if>/>
+ <#if "N" == serviceParameter.optional><span class="tooltip">${uiLabelMap.CommonRequired}</span></#if>
<#if serviceParameter.defaultValue?has_content>${uiLabelMap.WebtoolsServiceDefault} ${serviceParameter.defaultValue}</#if>
</td>
</tr>
Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/template/service/SetServiceParameterSync.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/template/service/SetServiceParameterSync.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webtools/template/service/SetServiceParameterSync.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webtools/template/service/SetServiceParameterSync.ftl Mon Oct 16 11:31:40 2017
@@ -27,8 +27,8 @@ under the License.
<tr>
<td class="label">${serviceParameter.name} (${serviceParameter.type})</td>
<td>
- <input type="text" size="20" name="${serviceParameter.name}" value="<#if serviceParameter.value??>${serviceParameter.value?string}</#if>"<#if serviceParameter.optional == "N"> class="required"</#if>/>
- <#if serviceParameter.optional == "N"><span class="tooltip">${uiLabelMap.CommonRequired}</span></#if>
+ <input type="text" size="20" name="${serviceParameter.name}" value="<#if serviceParameter.value??>${serviceParameter.value?string}</#if>"<#if "N" == serviceParameter.optional> class="required"</#if>/>
+ <#if "N" == serviceParameter.optional><span class="tooltip">${uiLabelMap.CommonRequired}</span></#if>
<#if serviceParameter.defaultValue?has_content>${uiLabelMap.WebtoolsServiceDefault} ${serviceParameter.defaultValue?string}</#if>
<#if serviceParameter_index == 0>
<script language="JavaScript" type="text/javascript">
Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/template/tempexpr/TempExprMaint.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/template/tempexpr/TempExprMaint.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webtools/template/tempexpr/TempExprMaint.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webtools/template/tempexpr/TempExprMaint.ftl Mon Oct 16 11:31:40 2017
@@ -45,25 +45,25 @@ under the License.
<td>${temporalExpression.get("description",locale)!}</td>
</tr>
</#if>
- <#if temporalExpression.tempExprTypeId == "DATE_RANGE">
+ <#if "DATE_RANGE" == temporalExpression.tempExprTypeId>
<@DateRange formName="updateExpression" fromDate=temporalExpression.dateRange1 toDate=temporalExpression.dateRange2/>
- <#elseif temporalExpression.tempExprTypeId == "DAY_IN_MONTH">
+ <#elseif "DAY_IN_MONTH" == temporalExpression.tempExprTypeId>
<@DayInMonth occurrence=temporalExpression.integer2 day=temporalExpression.integer1/>
- <#elseif temporalExpression.tempExprTypeId == "DAY_OF_MONTH_RANGE">
+ <#elseif "DAY_OF_MONTH_RANGE" == temporalExpression.tempExprTypeId>
<@DayOfMonthRange fromDay=temporalExpression.integer1 toDay=temporalExpression.integer2/>
- <#elseif temporalExpression.tempExprTypeId == "DAY_OF_WEEK_RANGE">
+ <#elseif "DAY_OF_WEEK_RANGE" == temporalExpression.tempExprTypeId>
<@DayOfWeekRange fromDay=temporalExpression.integer1 toDay=temporalExpression.integer2/>
- <#elseif temporalExpression.tempExprTypeId == "FREQUENCY">
+ <#elseif "FREQUENCY" == temporalExpression.tempExprTypeId>
<@Frequency formName="updateExpression" fromDate=temporalExpression.dateFreq1 freqType=temporalExpression.integer1 freqValue=temporalExpression.integer2/>
- <#elseif temporalExpression.tempExprTypeId == "DAY_OF_WEEK_RANGE">
+ <#elseif "DAY_OF_WEEK_RANGE" == temporalExpression.tempExprTypeId>
<@DayOfWeekRange fromDay=temporalExpression.integer1 toDay=temporalExpression.integer2/>
- <#elseif temporalExpression.tempExprTypeId == "HOUR_RANGE">
+ <#elseif "HOUR_RANGE" == temporalExpression.tempExprTypeId>
<@HourOfDayRange fromHour=temporalExpression.integer1 toHour=temporalExpression.integer2/>
- <#elseif temporalExpression.tempExprTypeId == "MINUTE_RANGE">
+ <#elseif "MINUTE_RANGE" == temporalExpression.tempExprTypeId>
<@MinuteRange fromMinute=temporalExpression.integer1 toMinute=temporalExpression.integer2/>
- <#elseif temporalExpression.tempExprTypeId == "MONTH_RANGE">
+ <#elseif "MONTH_RANGE" == temporalExpression.tempExprTypeId>
<@MonthRange fromMonth=temporalExpression.integer1 toMonth=temporalExpression.integer2/>
- <#elseif temporalExpression.tempExprTypeId == "TIME_OF_DAY_RANGE">
+ <#elseif "TIME_OF_DAY_RANGE" == temporalExpression.tempExprTypeId>
<@TimeOfDayRange fromTime=temporalExpression.string1 toTime=temporalExpression.string2 freqType=temporalExpression.integer1 freqValue=temporalExpression.integer2/>
<#elseif "INTERSECTION.UNION.DIFFERENCE.SUBSTITUTION"?contains(temporalExpression.tempExprTypeId)>
<#assign candidateIdList = Static["org.apache.ofbiz.service.calendar.ExpressionUiHelper"].getCandidateIncludeIds(delegator, temporalExpression.tempExprId)/>
@@ -76,11 +76,11 @@ under the License.
<#assign hasInclude = false hasExclude = false hasSubstitution = false/>
<#if childExpressionList?has_content>
<#list childExpressionList as childExpression>
- <#if childExpression.exprAssocType == "INCLUDE">
+ <#if "INCLUDE" == childExpression.exprAssocType>
<#assign hasInclude = true/>
- <#elseif childExpression.exprAssocType == "EXCLUDE">
+ <#elseif "EXCLUDE" == childExpression.exprAssocType>
<#assign hasExclude = true/>
- <#elseif childExpression.exprAssocType == "SUBSTITUTION">
+ <#elseif "SUBSTITUTION" == childExpression.exprAssocType>
<#assign hasSubstitution = true/>
</#if>
</#list>
@@ -97,7 +97,7 @@ under the License.
<td><@CreateExprAssocForm formName="excludeExpression" exprAssocType="EXCLUDE"/></td>
</tr>
</#if>
- <#if !hasSubstitution && temporalExpression.tempExprTypeId == "SUBSTITUTION">
+ <#if !hasSubstitution && "SUBSTITUTION" == temporalExpression.tempExprTypeId>
<tr>
<td class="label">${uiLabelMap.TemporalExpression_SUBSTITUTION}</td>
<td><@CreateExprAssocForm formName="substitutionExpression" exprAssocType="SUBSTITUTION"/></td>
Modified: ofbiz/ofbiz-framework/trunk/themes/common/template/ChangePassword.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common/template/ChangePassword.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/common/template/ChangePassword.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/themes/common/template/ChangePassword.ftl Mon Oct 16 11:31:40 2017
@@ -38,7 +38,7 @@ under the License.
<td class="label">${uiLabelMap.CommonUsername}</td>
<td>${username}</td>
</tr>
- <#if forgotPwdFlag?has_content && forgotPwdFlag?string == "true">
+ <#if forgotPwdFlag?has_content && "true" == forgotPwdFlag?string>
<tr>
<td><input type="hidden" name="PASSWORD" value="${parameters.password!}" size="20"/></td>
</tr>
Modified: ofbiz/ofbiz-framework/trunk/themes/common/template/includes/CommonMacros.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common/template/includes/CommonMacros.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/common/template/includes/CommonMacros.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/themes/common/template/includes/CommonMacros.ftl Mon Oct 16 11:31:40 2017
@@ -43,7 +43,7 @@ your template file:
size="25"/>
</#if>
<span class="tooltip">${uiLabelMap.CommonFormatDateTime}</span>
- <#if fieldClass == "required">
+ <#if "required" == fieldClass>
<span class="tooltip">${uiLabelMap.CommonRequired}</span>
</#if>
</#macro>
@@ -55,7 +55,7 @@ your template file:
selected="selected"</#if>>${monthValue.description}</option>
</#list>
</select>
- <#if fieldClass == "required">
+ <#if "required" == fieldClass>
<span class="tooltip">${uiLabelMap.CommonRequired}</span>
</#if>
</#macro>
@@ -66,7 +66,7 @@ your template file:
<option value="${i}"<#if i == fieldValue> selected="selected"</#if>>${i}</option>
</#list>
</select>
- <#if fieldClass == "required">
+ <#if "required" == fieldClass>
<span class="tooltip">${uiLabelMap.CommonRequired}</span>
</#if>
</#macro>
@@ -77,7 +77,7 @@ your template file:
<option value="${i}"<#if i == fieldValue> selected="selected"</#if>>${i}</option>
</#list>
</select>
- <#if fieldClass == "required">
+ <#if "required" == fieldClass>
<span class="tooltip">${uiLabelMap.CommonRequired}</span>
</#if>
</#macro>
@@ -89,7 +89,7 @@ your template file:
selected="selected"</#if>>${dayValue.description}</option>
</#list>
</select>
- <#if fieldClass == "required">
+ <#if "required" == fieldClass>
<span class="tooltip">${uiLabelMap.CommonRequired}</span>
</#if>
</#macro>
@@ -100,7 +100,7 @@ your template file:
<option value="${i}"<#if i == fieldValue> selected="selected"</#if>>${i}</option>
</#list>
</select>
- <#if fieldClass == "required">
+ <#if "required" == fieldClass>
<span class="tooltip">${uiLabelMap.CommonRequired}</span>
</#if>
</#macro>
Modified: ofbiz/ofbiz-framework/trunk/themes/common/template/includes/GeoLocation.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common/template/includes/GeoLocation.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/common/template/includes/GeoLocation.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/themes/common/template/includes/GeoLocation.ftl Mon Oct 16 11:31:40 2017
@@ -36,7 +36,7 @@ under the License.
<#-- ================================= Google Maps Init ======================================-->
<#if geoChart.dataSourceId?has_content>
- <#if geoChart.dataSourceId?substring(geoChart.dataSourceId?length-6 , geoChart.dataSourceId?length) == "GOOGLE">
+ <#if "GOOGLE" == geoChart.dataSourceId?substring(geoChart.dataSourceId?length-6 , geoChart.dataSourceId?length)>
<div id="${id}"
style="border:1px solid #979797; background-color:#e5e3df; width:${geoChart.width}; height:${geoChart.height}; margin:2em auto;">
<div style="padding:1em; color:gray;">${uiLabelMap.CommonLoading}</div>
@@ -45,7 +45,7 @@ under the License.
</#if>
<#-- ========================== Here we go with different types of maps renderer ===========================-->
- <#if geoChart.dataSourceId == "GEOPT_GOOGLE">
+ <#if "GEOPT_GOOGLE" == geoChart.dataSourceId>
<script type="text/javascript">
function showAllMarkers(map, points) {
if (points.length > 1) {
@@ -86,10 +86,10 @@ under the License.
showAllMarkers(map, latlngs);
</#if>
</script>
- <#elseif geoChart.dataSourceId == "GEOPT_YAHOO">
- <#elseif geoChart.dataSourceId == "GEOPT_MICROSOFT">
- <#elseif geoChart.dataSourceId == "GEOPT_MAPTP">
- <#elseif geoChart.dataSourceId == "GEOPT_ADDRESS_GOOGLE">
+ <#elseif "GEOPT_YAHOO" == geoChart.dataSourceId>
+ <#elseif "GEOPT_MICROSOFT" == geoChart.dataSourceId>
+ <#elseif "GEOPT_MAPTP" == geoChart.dataSourceId>
+ <#elseif "GEOPT_ADDRESS_GOOGLE" == geoChart.dataSourceId>
<script type="text/javascript">
var geocoder = new google.maps.Geocoder();
var map = new google.maps.Map(document.getElementById("${id}"),
@@ -112,7 +112,7 @@ under the License.
}
});
</script>
- <#elseif geoChart.dataSourceId == "GEOPT_OSM">
+ <#elseif "GEOPT_OSM" == geoChart.dataSourceId>
<div id="${id}" style="border:1px solid #979797; background-color:#e5e3df; width:${geoChart.width}; height:${geoChart.height}; margin:2em auto;"></div>
<#--
due to https://github.com/openlayers/openlayers/issues/1025
Modified: ofbiz/ofbiz-framework/trunk/themes/common/template/includes/Lookup.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common/template/includes/Lookup.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/common/template/includes/Lookup.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/themes/common/template/includes/Lookup.ftl Mon Oct 16 11:31:40 2017
@@ -72,12 +72,12 @@ under the License.
<link rel="stylesheet" href="<@o...@ofbizContentUrl>" type="text/css"/>
</#list>
</#if>
- <#if layoutSettings.rtlStyleSheets?has_content && langDir == "rtl">
+ <#if layoutSettings.rtlStyleSheets?has_content && "rtl" == langDir>
<#list layoutSettings.rtlStyleSheets as styleSheet>
<link rel="stylesheet" href="<@o...@ofbizContentUrl>" type="text/css"/>
</#list>
</#if>
- <#if layoutSettings.VT_RTL_STYLESHEET?has_content && langDir == "rtl">
+ <#if layoutSettings.VT_RTL_STYLESHEET?has_content && "rtl" == langDir>
<#list layoutSettings.VT_RTL_STYLESHEET as styleSheet>
<link rel="stylesheet" href="<@o...@ofbizContentUrl>" type="text/css"/>
</#list>
Modified: ofbiz/ofbiz-framework/trunk/themes/common/template/includes/Simple.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common/template/includes/Simple.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/common/template/includes/Simple.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/themes/common/template/includes/Simple.ftl Mon Oct 16 11:31:40 2017
@@ -43,7 +43,7 @@ under the License.
<link rel="stylesheet" href="<@o...@ofbizContentUrl>" type="text/css"/>
</#list>
</#if>
- <#if layoutSettings.rtlStyleSheets?has_content && langDir == "rtl">
+ <#if layoutSettings.rtlStyleSheets?has_content && "rtl" == langDir>
<#--layoutSettings.rtlStyleSheets is a list of rtl style sheets.-->
<#list layoutSettings.rtlStyleSheets as styleSheet>
<link rel="stylesheet" href="<@o...@ofbizContentUrl>" type="text/css"/>
Modified: ofbiz/ofbiz-framework/trunk/themes/common/template/macro/HtmlFormMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common/template/macro/HtmlFormMacroLibrary.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/common/template/macro/HtmlFormMacroLibrary.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/themes/common/template/macro/HtmlFormMacroLibrary.ftl Mon Oct 16 11:31:40 2017
@@ -218,8 +218,8 @@ under the License.
<#rt/>
<#if isTwelveHour>
<select name="${ampmName}" <#if classString?has_content>class="${classString}"</#if>><#rt/>
- <option value="AM" <#if amSelected == "selected">selected="selected"</#if> >AM</option><#rt/>
- <option value="PM" <#if pmSelected == "selected">selected="selected"</#if>>PM</option><#rt/>
+ <option value="AM" <#if "selected" == amSelected>selected="selected"</#if> >AM</option><#rt/>
+ <option value="PM" <#if "selected" == pmSelected>selected="selected"</#if>>PM</option><#rt/>
</select>
<#rt/>
</#if>
@@ -498,7 +498,7 @@ under the License.
<input id="${name?html}_fld0_value" type="text" <@renderClass className alert /><#if name?has_content> name="${name?html}_fld0_value"</#if><#if localizedInputTitle?has_content> title="${localizedInputTitle}"</#if><#if value?has_content> value="${value}"</#if><#if size?has_content> size="${size}"</#if><#if maxlength?has_content> maxlength="${maxlength}"</#if>/><#if tabindex?has_content> tabindex="${tabindex}"</#if><#rt/>
<#if dateType != "time">
<script type="text/javascript">
- <#if dateType == "date">
+ <#if "date" == dateType>
jQuery("#${name?html}_fld0_value").datepicker({
<#else>
jQuery("#${name?html}_fld0_value").datetimepicker({
@@ -535,7 +535,7 @@ under the License.
<input id="${name?html}_fld1_value" type="text" <@renderClass className alert /><#if name?has_content> name="${name}_fld1_value"</#if><#if localizedInputTitle??> title="${localizedInputTitle?html}"</#if><#if value2?has_content> value="${value2}"</#if><#if size?has_content> size="${size}"</#if><#if maxlength?has_content> maxlength="${maxlength}"</#if>/><#rt/>
<#if dateType != "time">
<script type="text/javascript">
- <#if dateType == "date">
+ <#if "date" == dateType>
jQuery("#${name?html}_fld1_value").datepicker({
<#else>
jQuery("#${name?html}_fld1_value").datetimepicker({
@@ -675,7 +675,7 @@ Parameter: delegatorName, String, option
<#if size?has_content> size="${size}"</#if><#if maxlength?has_content> maxlength="${maxlength}"</#if><#if id?has_content> id="${id}"</#if><#rt/>
<#if readonly?has_content && readonly> readonly="readonly"</#if><#rt/><#if event?has_content && action?has_content> ${event}="${action}"</#if><#rt/>
<#if autocomplete?has_content> autocomplete="off"</#if>/><#rt/></#if>
- <#if presentation?has_content && descriptionFieldName?has_content && presentation == "window">
+ <#if presentation?has_content && descriptionFieldName?has_content && "window" == presentation>
<a href="javascript:call_fieldlookup3(document.${formName?html}.${name?html},document.${formName?html}.${descriptionFieldName},'${fieldFormName}', '${presentation}'<#rt/>
<#if targetParameterIter?has_content>
<#list targetParameterIter as item>
@@ -683,7 +683,7 @@ Parameter: delegatorName, String, option
</#list>
</#if>
);"></a><#rt>
- <#elseif presentation?has_content && presentation == "window">
+ <#elseif presentation?has_content && "window" == presentation>
<a href="javascript:call_fieldlookup2(document.${formName?html}.${name?html},'${fieldFormName}', '${presentation}'<#rt/>
<#if targetParameterIter?has_content>
<#list targetParameterIter as item>
@@ -697,7 +697,7 @@ Parameter: delegatorName, String, option
<#assign defaultDelay = modelTheme.getAutocompleterDefaultDelay()>
<#local ajaxUrl = ajaxUrl + "&_LAST_VIEW_NAME_=" + lastViewName />
<#if !ajaxUrl?contains("searchValueFieldName=")>
- <#if descriptionFieldName?has_content && showDescription == "true">
+ <#if descriptionFieldName?has_content && "true" == showDescription>
<#local ajaxUrl = ajaxUrl + "&searchValueFieldName=" + descriptionFieldName />
<#else>
<#local ajaxUrl = ajaxUrl + "&searchValueFieldName=" + name />
@@ -755,7 +755,7 @@ Parameter: delegatorName, String, option
</a>
</#if>
</span>
- <#if ajaxEnabled?has_content && ajaxEnabled && (presentation?has_content && presentation == "window")>
+ <#if ajaxEnabled?has_content && ajaxEnabled && (presentation?has_content && "window" == presentation)>
<#if ajaxUrl?index_of("_LAST_VIEW_NAME_") < 0>
<#local ajaxUrl = ajaxUrl + "&_LAST_VIEW_NAME_=" + lastViewName />
</#if>
Modified: ofbiz/ofbiz-framework/trunk/themes/common/template/macro/HtmlScreenMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common/template/macro/HtmlScreenMacroLibrary.ftl?rev=1812285&r1=1812284&r2=1812285&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/common/template/macro/HtmlScreenMacroLibrary.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/themes/common/template/macro/HtmlScreenMacroLibrary.ftl Mon Oct 16 11:31:40 2017
@@ -43,18 +43,18 @@ under the License.
<div<#if id?has_content> id="${id}"</#if><#if style?has_content> class="${style}"</#if>>
</#macro>
<#macro renderContainerEnd></div></#macro>
-<#macro renderContentBegin editRequest enableEditValue editContainerStyle><#if editRequest?has_content && enableEditValue == "true"><div class=${editContainerStyle}></#if></#macro>
+<#macro renderContentBegin editRequest enableEditValue editContainerStyle><#if editRequest?has_content && "true" == enableEditValue><div class=${editContainerStyle}></#if></#macro>
<#macro renderContentBody></#macro>
<#macro renderContentEnd urlString editMode editContainerStyle editRequest enableEditValue>
-<#if editRequest?? && enableEditValue == "true">
+<#if editRequest?? && "true" == enableEditValue>
<#if urlString??><a href="${urlString}">${editMode}</a><#rt/></#if>
<#if editContainerStyle??></div><#rt/></#if>
</#if>
</#macro>
-<#macro renderSubContentBegin editContainerStyle editRequest enableEditValue><#if editRequest?? && enableEditValue == "true"><div class="${editContainerStyle}"></#if></#macro>
+<#macro renderSubContentBegin editContainerStyle editRequest enableEditValue><#if editRequest?? && "true" == enableEditValue><div class="${editContainerStyle}"></#if></#macro>
<#macro renderSubContentBody></#macro>
<#macro renderSubContentEnd urlString editMode editContainerStyle editRequest enableEditValue>
-<#if editRequest?? && enableEditValue == "true">
+<#if editRequest?? && "true" == enableEditValue>
<#if urlString??><a href="${urlString}">${editMode}</a><#rt/></#if>
<#if editContainerStyle??></div><#rt/></#if>
</#if>
@@ -187,7 +187,7 @@ ${menuString}
</#macro>
<#macro renderPortalPageBegin originalPortalPageId portalPageId confMode="false" addColumnLabel="Add column" addColumnHint="Add a new column to this portal">
- <#if confMode == "true">
+ <#if "true" == confMode>
<a class="buttontext" href="javascript:document.addColumn_${portalPageId}.submit()" title="${addColumnHint}">${addColumnLabel}</a> <b>PortalPageId: ${portalPageId}</b>
<form method="post" action="addPortalPageColumn" name="addColumn_${portalPageId}">
<input name="portalPageId" value="${portalPageId}" type="hidden"/>
@@ -214,8 +214,8 @@ ${menuString}
}
}
</script>
- <td class="portal-column<#if confMode == "true">-config</#if> connectedSortable" style="vertical-align: top; <#if width?has_content> width:${width};</#if>" id="portalColumn_${columnSeqId}">
- <#if confMode == "true">
+ <td class="portal-column<#if "true" == confMode>-config</#if> connectedSortable" style="vertical-align: top; <#if width?has_content> width:${width};</#if>" id="portalColumn_${columnSeqId}">
+ <#if "true" == confMode>
<div class="portal-column-config-title-bar">
<ul>
<li>
@@ -250,7 +250,7 @@ ${menuString}
<#assign portletKey = portalPageId+portalPortletId+portletSeqId>
<#assign portletKeyFields = '<input name="portalPageId" value="' + portalPageId + '" type="hidden"/><input name="portalPortletId" value="' + portalPortletId + '" type="hidden"/><input name="portletSeqId" value="' + portletSeqId + '" type="hidden"/>'>
<div id="PP_${portletKey}" name="portalPortlet" class="noClass" portalPageId="${portalPageId}" portalPortletId="${portalPortletId}" columnSeqId="${columnSeqId}" portletSeqId="${portletSeqId}">
- <#if confMode == "true">
+ <#if "true" == confMode>
<div class="portlet-config" id="PPCFG_${portletKey}">
<div class="portlet-config-title-bar">
<ul>
@@ -261,7 +261,7 @@ ${menuString}
</form>
<a href="javascript:document.delPortlet_${portletKey}.submit()" title="${delPortletHint}"> </a>
</li>
- <#if editAttribute == "true">
+ <#if "true" == editAttribute>
<li class="edit">
<form method="post" action="editPortalPortletAttributes" name="editPortlet_${portletKey}">
${portletKeyFields}
@@ -325,7 +325,7 @@ ${menuString}
<#macro renderPortalPagePortletEnd confMode="false">
</div>
- <#if confMode == "true">
+ <#if "true" == confMode>
</div>
</#if>
</#macro>