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

Timestamp:

03/08/14 22:51:23 (11 years ago)

Author:

hendrikvanantwerpen

Message:

• Mark content as dirty to prevent moving away from unsaved data.
• Better change propagation from lists and our own widgets.
• Generate notifications for errors and show correct message.
• Moved all path/url generation to the class stores, not everywhere we use it.
• Give user always a choice between Save and Save & Close.
• Better refresh behaviour on form changes and saves.
• Don't generate duplicate code error when existing object is the one you're storing.

Location:

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

Files:

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

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

@@ -1 @@
-<form class="orange">
+<div class="orange">
     <div data-dojo-type="dijit/layout/ContentPane" data-dojo-props="region:'top'">
         <h2>
@@ -6 +6 @@
         </h2>
     </div>
-    <div data-dojo-type="dijit/layout/BorderContainer" data-dojo-props="region:'left', design:'headline'" style="width: 300px;">
-        <div data-dojo-type="dijit/layout/ContentPane" data-dojo-props="region:'center'">
-            <div data-dojo-attach-point="QuestionEditorToolkitNode"></div>
+    <form data-dojo-type="dijit/form/Form"
+         data-dojo-props="region:'left'"
+         data-dojo-attach-point="propertiesForm"
+         data-dojo-attach-event="onSubmit:_ignore">
+        <div data-dojo-type="dijit/layout/BorderContainer" data-dojo-props="design:'headline'" style="width: 300px;">
+            <div data-dojo-type="dijit/layout/ContentPane" data-dojo-props="region:'center'">
+                <div data-dojo-type="../model/widgets/QuestionEditorToolkit"
+                     data-dojo-attach-point="QuestionEditorToolkitNode"></div>
+            </div>
+            <div data-dojo-type="dijit/layout/ContentPane" data-dojo-props="region:'top'">
+                <button data-dojo-type="dijit/form/Button"
+                        data-dojo-props="baseClass: 'rftLargeButton', iconClass: 'rftIcon rftIconAccept'"
+                        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-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-event="onClick:_onDiscard">
+                  Discard &amp; Close</button>
+            </div>
         </div>
-        <div data-dojo-type="dijit/layout/ContentPane" data-dojo-props="region:'top'">
-            <button data-dojo-type="dijit/form/Button" data-dojo-props="baseClass: 'rftLargeButton', iconClass: 'rftIcon rftIconCancel'" data-dojo-attach-event="onClick:_onDiscard">Discard</button>
-            <button data-dojo-type="dijit/form/Button" data-dojo-props="baseClass: 'rftLargeButton', iconClass: 'rftIcon rftIconAccept'" data-dojo-attach-event="onClick:_onSave">Save and exit</button>
-        </div>
-    </div>
-</form>
+    </form>
+    <div data-dojo-type="../model/widgets/QuestionEditorPreview"
+         data-dojo-attach-point="contentList"
+         data-dojo-props="name:'content',delay:5,region:'center'"></div>
+</div>

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

@@ -24 +24 @@
                     data-dojo-attach-event="onClick:_onSave"
                     data-dojo-props="baseClass: 'rftLargeButton', iconClass: 'rftIcon rftIconAccept'">
-                Save Changes</button>
+                Save</button>
             <button data-dojo-type="dijit/form/Button"
-                    data-dojo-attach-event="onClick:_onDiscard"
+                    data-dojo-attach-event="onClick:_onSaveAndClose"
+                    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-props="baseClass: 'rftLargeButton', iconClass: 'rftIcon rftIconCancel'">
-                Discard changes</button>
+                Discard &amp; Close</button>
             <button data-dojo-type="dijit/form/Button"
                     data-dojo-attach-event="onClick:_onShowPreview"

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

@@ -45 +45 @@
             <div>
                 <div class="qedLabel">Export results</div>
-                <a target="_blank" href="/api/surveyRuns/${surveyRunId}/responses.csv" class="qedField">To CSV</a>
+                <a target="_blank" href="/api/surveyRuns/${objectId}/responses.csv" class="qedField">To CSV</a>
             </div>
         </fieldset>
@@ -55 +55 @@
                 class="blue"
                 data-dojo-props="baseClass: 'rftBlockButton', iconClass: 'rftIcon rftIconSave'"
-                data-dojo-attach-event="onClick:_onSave">Save &amp; Close</button>
+                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-event="onClick:_onSaveAndClose">Save &amp; Close</button>
         <button data-dojo-type="dijit/form/Button"
                 class="blue"