Author: deepak
Date: Mon Oct 16 11:56:21 2017
New Revision: 1812287
URL: http://svn.apache.org/viewvc?rev=1812287&view=rev
Log:
Fixed: Corrected elseif tag closing in GenericSurvey.ftl file found this while
working on OFBIZ-9254
Modified:
ofbiz/ofbiz-framework/trunk/applications/content/template/survey/GenericSurvey.ftl
Modified:
ofbiz/ofbiz-framework/trunk/applications/content/template/survey/GenericSurvey.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/template/survey/GenericSurvey.ftl?rev=1812287&r1=1812286&r2=1812287&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/content/template/survey/GenericSurvey.ftl
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/content/template/survey/GenericSurvey.ftl
Mon Oct 16 11:56:21 2017
@@ -42,37 +42,37 @@ under the License.
<option <#if "Y" == selectedOption>selected="selected"</#if>>Y</option>
<option <#if "N" == selectedOption>selected="selected"</#if>>N</option>
</select>
- <#elseif "TEXTAREA" == surveyQuestionAndAppl.surveyQuestionTypeId/>
+ <#elseif "TEXTAREA" == surveyQuestionAndAppl.surveyQuestionTypeId>
<textarea cols="40" rows="5"
name="${questionFieldName}">${(answer.textResponse)!}</textarea>
- <#elseif "TEXT_SHORT" == surveyQuestionAndAppl.surveyQuestionTypeId/>
+ <#elseif "TEXT_SHORT" == surveyQuestionAndAppl.surveyQuestionTypeId>
<input type="text" size="15" class="inputBox" name="${questionFieldName}"
value="${(answer.textResponse)?default(defValue!)}" />
- <#elseif "TEXT_LONG" == surveyQuestionAndAppl.surveyQuestionTypeId/>
+ <#elseif "TEXT_LONG" == surveyQuestionAndAppl.surveyQuestionTypeId>
<input type="text" size="35" class="inputBox" name="${questionFieldName}"
value="${(answer.textResponse)?default(defValue!)}" />
- <#elseif "EMAIL" == surveyQuestionAndAppl.surveyQuestionTypeId/>
+ <#elseif "EMAIL" == surveyQuestionAndAppl.surveyQuestionTypeId>
<input type="text" size="30" class="inputBox" name="${questionFieldName}"
value="${(answer.textResponse)?default(defValue!)}" />
- <#elseif "URL" == surveyQuestionAndAppl.surveyQuestionTypeId/>
+ <#elseif "URL" == surveyQuestionAndAppl.surveyQuestionTypeId>
<input type="text" size="40" class="inputBox" name="${questionFieldName}"
value="${(answer.textResponse)?default(defValue!)}" />
- <#elseif "DATE" == surveyQuestionAndAppl.surveyQuestionTypeId/>
+ <#elseif "DATE" == surveyQuestionAndAppl.surveyQuestionTypeId>
<input type="text" size="12" class="inputBox" name="${questionFieldName}"
value="${(answer.textResponse)?default(defValue!)}" />
- <#elseif "CREDIT_CARD" == surveyQuestionAndAppl.surveyQuestionTypeId/>
+ <#elseif "CREDIT_CARD" == surveyQuestionAndAppl.surveyQuestionTypeId>
<input type="text" size="20" class="inputBox" name="${questionFieldName}"
value="${(answer.textResponse)?default(defValue!)}" />
- <#elseif "GIFT_CARD" == surveyQuestionAndAppl.surveyQuestionTypeId/>
+ <#elseif "GIFT_CARD" == surveyQuestionAndAppl.surveyQuestionTypeId>
<input type="text" size="20" class="inputBox" name="${questionFieldName}"
value="${(answer.textResponse)?default(defValue!)}" />
- <#elseif "NUMBER_CURRENCY" == surveyQuestionAndAppl.surveyQuestionTypeId/>
+ <#elseif "NUMBER_CURRENCY" == surveyQuestionAndAppl.surveyQuestionTypeId>
<input type="text" size="6" class="inputBox" name="${questionFieldName}"
value="${(answer.currencyResponse)?default(defValue!)}" />
- <#elseif "NUMBER_FLOAT" == surveyQuestionAndAppl.surveyQuestionTypeId/>
+ <#elseif "NUMBER_FLOAT" == surveyQuestionAndAppl.surveyQuestionTypeId>
<input type="text" size="6" class="inputBox" name="${questionFieldName}"
value="${(answer.floatResponse)?default(defValue!)}" />
- <#elseif "NUMBER_LONG" == surveyQuestionAndAppl.surveyQuestionTypeId/>
+ <#elseif "NUMBER_LONG" == surveyQuestionAndAppl.surveyQuestionTypeId>
<input type="text" size="6" class="inputBox" name="${questionFieldName}"
value="${(answer.numericResponse?default(defValue)?string("#"))!}" />
- <#elseif "PASSWORD" == surveyQuestionAndAppl.surveyQuestionTypeId/>
+ <#elseif "PASSWORD" == surveyQuestionAndAppl.surveyQuestionTypeId>
<input type="password" size="30" class="textBox"
name="${questionFieldName}" autocomplete="off"
value="${(answer.textResponse)?default(defValue!)}" />
- <#elseif "CONTENT" == surveyQuestionAndAppl.surveyQuestionTypeId/>
+ <#elseif "CONTENT" == surveyQuestionAndAppl.surveyQuestionTypeId>
<#if (answer.contentId)?has_content>
<#assign content = answer.getRelatedOne("Content", false)>
<a href="/content/control/img?imgId=${content.dataResourceId}"
class="buttontext">${answer.contentId}</a> - ${content.contentName!}
</#if>
<input type="file" size="15" name="${questionFieldName}" class="inputBox"/>
- <#elseif "OPTION" == surveyQuestionAndAppl.surveyQuestionTypeId/>
+ <#elseif "OPTION" == surveyQuestionAndAppl.surveyQuestionTypeId>
<#assign options =
surveyQuestionAndAppl.getRelated("SurveyQuestionOption", null, sequenceSort,
false)!/>
<#assign selectedOption = (answer.surveyOptionSeqId)?default("_NA_")/>
<select name="${questionFieldName}">
@@ -87,7 +87,7 @@ under the License.
<option value="">Nothing to choose</option>
</#if>
</select>
- <#elseif "ENUMERATION" == surveyQuestionAndAppl.surveyQuestionTypeId/>
+ <#elseif "ENUMERATION" == surveyQuestionAndAppl.surveyQuestionTypeId>
<select name="${questionFieldName}">
<#assign formatString = surveyQuestionAndAppl.get("formatString")!/>
<#assign enums = surveyQuestionAndAppl.getRelated("Enumeration", null,
null, false)/>
@@ -104,7 +104,7 @@ under the License.
<option value='${enum.enumId}' ${selected}>${description}</option>
</#list>
</select>
- <#elseif "GEO" == surveyQuestionAndAppl.surveyQuestionTypeId/>
+ <#elseif "GEO" == surveyQuestionAndAppl.surveyQuestionTypeId>
<select name="${questionFieldName}">
<#assign formatString = surveyQuestionAndAppl.get("formatString")!/>
<#assign parentGeoId = surveyQuestionAndAppl.get("geoId")!/>
@@ -122,14 +122,14 @@ under the License.
<option value='${geo.geoId}' ${selected}>${description}</option>
</#list>
</select>
- <#elseif "STATE_PROVINCE" == surveyQuestionAndAppl.surveyQuestionTypeId/>
+ <#elseif "STATE_PROVINCE" == surveyQuestionAndAppl.surveyQuestionTypeId>
<select name="${questionFieldName}">
<#assign states =
Static["org.apache.ofbiz.common.CommonWorkers"].getStateList(delegator)>
<#list states as state>
<option
value='${state.geoId}'>${state.geoName?default(state.geoId)}</option>
</#list>
</select>
- <#elseif "COUNTRY" == surveyQuestionAndAppl.surveyQuestionTypeId/>
+ <#elseif "COUNTRY" == surveyQuestionAndAppl.surveyQuestionTypeId>
<select name="${questionFieldName}">
${screens.render("component://common/widget/CommonScreens.xml#countries")}
</select>
@@ -270,7 +270,7 @@ under the License.
<#-- seperator options -->
<#if "SEPERATOR_TEXT" == surveyQuestionAndAppl.surveyQuestionTypeId>
<td colspan="5"><div>${surveyQuestionAndAppl.question!}</div></td>
- <#elseif "SEPERATOR_LINE" == surveyQuestionAndAppl.surveyQuestionTypeId/>
+ <#elseif "SEPERATOR_LINE" == surveyQuestionAndAppl.surveyQuestionTypeId>
<td colspan="5"><hr /></td>
<#else>
<#-- standard question options -->
