Changeset 492 for Dev/trunk/src/client/qed-client/pages/templates

Timestamp:

03/09/14 14:23:42 (11 years ago)

Author:

hendrikvanantwerpen

Message:

• Enable/disable buttons on content change.
• One place to do date formatting, because it was going wrong again.
• Serialize questions in survey properly.
• _ComplexValueMixin consumes submit events, but does trigger outer forms if present.
• Trigger dialog show/hide for login only after previous effect is finished.
• Check that documents are actually valid, not just that validator returned a result.
• Validate email and timestamp formats.
• Prepared for live runs.

Location:

Dev/trunk/src/client/qed-client/pages/templates

Files:

• question.html (modified) (1 diff)
• survey.html (modified) (2 diffs)
• surveyRun.html (modified) (1 diff)

Dev/trunk/src/client/qed-client/pages/templates/question.html

@@ -18 +18 @@
                 <button data-dojo-type="dijit/form/Button"
                         data-dojo-props="baseClass: 'rftLargeButton', iconClass: 'rftIcon rftIconAccept'"
+                        data-dojo-attach-point="saveBtn"
                         data-dojo-attach-event="onClick:_onSave">
                   Save</button>
                 <button data-dojo-type="dijit/form/Button"
                         data-dojo-props="baseClass: 'rftLargeButton', iconClass: 'rftIcon rftIconAccept'"
+                        data-dojo-attach-point="saveAndCloseBtn"
                         data-dojo-attach-event="onClick:_onSaveAndClose">
                   Save &amp; Close</button>
                 <button data-dojo-type="dijit/form/Button"
                         data-dojo-props="baseClass: 'rftLargeButton', iconClass: 'rftIcon rftIconCancel'"
+                        data-dojo-attach-point="discardBtn"
                         data-dojo-attach-event="onClick:_onDiscard">
                   Discard &amp; Close</button>

Dev/trunk/src/client/qed-client/pages/templates/survey.html

@@ -23 +23 @@
             <button data-dojo-type="dijit/form/Button"
                     data-dojo-attach-event="onClick:_onSave"
+                    data-dojo-attach-point="saveBtn"
                     data-dojo-props="baseClass: 'rftLargeButton', iconClass: 'rftIcon rftIconAccept'">
                 Save</button>
             <button data-dojo-type="dijit/form/Button"
                     data-dojo-attach-event="onClick:_onSaveAndClose"
+                    data-dojo-attach-point="saveAndCloseBtn"
                     data-dojo-props="baseClass: 'rftLargeButton', iconClass: 'rftIcon rftIconAccept'">
                 Save &amp; Close</button>
             <button data-dojo-type="dijit/form/Button"
                     data-dojo-attach-event="onClick:_onDiscardAndClose"
+                    data-dojo-attach-point="discardBtn"
                     data-dojo-props="baseClass: 'rftLargeButton', iconClass: 'rftIcon rftIconCancel'">
                 Discard &amp; Close</button>
@@ -41 +44 @@
 
     <div data-dojo-type="dijit/Dialog"
-         title="Survey properties"
-         data-dojo-attach-point="propertiesDialog"
-         data-dojo-attach-event="onSubmit:_onPropertiesOk">
-        <fieldset class="qedFieldset">
-            <div data-dojo-type="../model/widgets/SurveyWidget" data-dojo-props="name:'survey'"></div>
-        </fieldset>
-        <button data-dojo-type="dijit/form/Button"
-                type="submit"
-                data-dojo-attach-event="onClick:_onPropertiesOk">
-            OK</button>
-        <button data-dojo-type="dijit/form/Button"
-                type="button"
-                data-dojo-attach-event="onClick:_onPropertiesCancel">
-            Cancel</button>
+         data-dojo-props="'title':'Survey properties'"
+         data-dojo-attach-point="propertiesDialog">
+        <form data-dojo-type="dijit/form/Form"
+              data-dojo-attach-point="propertiesForm"
+              data-dojo-attach-event="onSubmit:_onPropertiesOk">
+            <fieldset class="qedFieldset">
+                <div data-dojo-type="../model/widgets/SurveyWidget" data-dojo-props="name:'survey'"></div>
+            </fieldset>
+            <button data-dojo-type="dijit/form/Button"
+                    type="submit"
+                    data-dojo-attach-event="onClick:_onPropertiesOk">
+                OK</button>
+            <button data-dojo-type="dijit/form/Button"
+                    type="button"
+                    data-dojo-attach-event="onClick:_onPropertiesCancel">
+                Cancel</button>
+        </form>
     </div>
 

Dev/trunk/src/client/qed-client/pages/templates/surveyRun.html

@@ -55 +55 @@
                 class="blue"
                 data-dojo-props="baseClass: 'rftBlockButton', iconClass: 'rftIcon rftIconSave'"
+                data-dojo-attach-point="saveBtn"
                 data-dojo-attach-event="onClick:_onSave">Save</button>
         <button data-dojo-type="dijit/form/Button"
                 class="blue"
                 data-dojo-props="baseClass: 'rftBlockButton', iconClass: 'rftIcon rftIconSave'"
+                data-dojo-attach-point="saveAndCloseBtn"
                 data-dojo-attach-event="onClick:_onSaveAndClose">Save &amp; Close</button>
         <button data-dojo-type="dijit/form/Button"
                 class="blue"
                 data-dojo-props="baseClass: 'rftBlockButton', iconClass: 'rftIcon rftIconClose'"
+                data-dojo-attach-point="discardBtn"
                 data-dojo-attach-event="onClick:_onDiscard">Discard &amp; Close</button>
     </div>