svn commit: r1746779 - in /ofbiz/trunk/applications/content: template/survey/EditSurveyQuestions.ftl widget/survey/SurveyForms.xml

[pranayp]

Author: pranayp
Date: Sat Jun  4 05:48:55 2016
New Revision: 1746779

URL: http://svn.apache.org/viewvc?rev=1746779&view=rev
Log:
[OFBIZ-7154] UI improvement, made question field read-only as not being edited with SurveyQuestionAppl and corrected button labels for Survey Question Create/Update form.

Thanks Swapnil M Mane for reporting the issue, thanks Vaibhav Jain for providing the patch.

Modified:
    ofbiz/trunk/applications/content/template/survey/EditSurveyQuestions.ftl
    ofbiz/trunk/applications/content/widget/survey/SurveyForms.xml

Modified: ofbiz/trunk/applications/content/template/survey/EditSurveyQuestions.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/template/survey/EditSurveyQuestions.ftl?rev=1746779&r1=1746778&r2=1746779&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/template/survey/EditSurveyQuestions.ftl (original)
+++ ofbiz/trunk/applications/content/template/survey/EditSurveyQuestions.ftl Sat Jun  4 05:48:55 2016
@@ -63,7 +63,7 @@ under the License.
               <td>${questionType.get("description",locale)}</td>
               <td>${(questionCat.description)!}</td>
               <td>${surveyQuestionAndAppl.description!}</td>
-              <td><input type="text" name="question" size="30" value="${surveyQuestionAndAppl.question!?html}" />
+              <td>${surveyQuestionAndAppl.question!}</td>
               <td>
                 <select name="surveyPageSeqId">
                   <#if surveyQuestionAndAppl.surveyPageSeqId?has_content>

Modified: ofbiz/trunk/applications/content/widget/survey/SurveyForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/survey/SurveyForms.xml?rev=1746779&r1=1746778&r2=1746779&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/survey/SurveyForms.xml (original)
+++ ofbiz/trunk/applications/content/widget/survey/SurveyForms.xml Sat Jun  4 05:48:55 2016
@@ -205,8 +205,8 @@ under the License.
             </drop-down>
         </field>
 
-        <field use-when="surveyQuestion!=null" name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
         <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>
+        <field use-when="surveyQuestion!=null" name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
     <form name="CreateSurveyQuestionCategory" type="single" target="createSurveyQuestionCategory" title=""
         header-row-style="header-row" default-table-style="basic-table">