Changeset 366 for Dev/branches/rest-dojo-ui/client/rft/pages

Timestamp:

07/18/12 18:49:11 (13 years ago)

Author:

tjcschipper

Message:

• AdaptiveForm? really isn't anything yet, but it's supposed to become a way to encapsulate forms that add/remove inputs based on other input's (selected) values.
• Created a skeleton for the question editor. It's almost an exact copy of SurveyAdvanced?.

Location:

Dev/branches/rest-dojo-ui/client/rft/pages

Files:

• question.html (moved) (moved from Dev/branches/rest-dojo-ui/client/rft/pages/surveyAdvanced.html) (2 diffs)
• question.js (moved) (moved from Dev/branches/rest-dojo-ui/client/rft/pages/surveyAdvanced.js) (2 diffs)
• questions.js (modified) (4 diffs)

Dev/branches/rest-dojo-ui/client/rft/pages/question.html

@@ -1 @@
-<div data-dojo-type="rft.pages.surveyAdvanced">
+<div data-dojo-type="rft.pages.question" class="orange">
         <div data-dojo-type="dijit.layout.BorderContainer" data-dojo-props="region:'center'" style="height: 500px;">
                 <div data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region:'top'">
                         <h2>
                                 <span class="rftIcon rftIconSurvey"></span>
-                                <span class="headerText">Survey A [Design]</span>
+                                <span class="headerText">Question 123 [Editing]</span>
                         </h2>
                 </div>
@@ -10 +10 @@
                         
                         <div data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region:'center'">
-                                <div data-dojo-type="dijit.layout.AccordionContainer" class="blue">
-                                        <div data-dojo-type="dijit.layout.ContentPane" title="Content" data-dojo-props="iconClass:'rftIcon rftIconPlus'">
-                                                <div id="SurveyEditorToolkit" data-dojo-props="skipForm: true, accept:[], selfAccept: false, copyOnly: true, horizontal: false, singular: true">
-                                                        
-                                                </div>
-                                        </div>
-                                </div>
+                                <div id="QuestionEditorToolkit"></div>
                         </div>
                         <div data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region:'bottom'">
-                                <button id="btnSave" data-dojo-type="dijit.form.Button" data-dojo-props="baseClass: 'rftLargeButton', iconClass: 'rftIcon rftIconAccept'">Save</button>
                                 <button id="btnDiscard" data-dojo-type="dijit.form.Button" data-dojo-props="baseClass: 'rftLargeButton', iconClass: 'rftIcon rftIconCancel'">Discard</button>
-                                <button id="btnBack" data-dojo-type="dijit.form.Button" data-dojo-props="baseClass: 'rftLargeButton', iconClass: 'rftIcon rftIconUndo'">Exit Design</button>
+                                <button id="btnSave" data-dojo-type="dijit.form.Button" data-dojo-props="baseClass: 'rftLargeButton', iconClass: 'rftIcon rftIconAccept'">Save and exit</button>
                         </div>
                 </div>
                 <div data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region:'center'">
-                        <div id="SurveyEditorPreview">
+                        <div id="QuestionEditorPreview">
                                 
                         </div>
-
-                        <button data-dojo-type="dijit.form.Button" data-dojo-props="baseClass: 'rftLargeButton', iconClass: 'rftIcon rftIconPlus'">Add new</button>
                 </div>
         </div>

Dev/branches/rest-dojo-ui/client/rft/pages/question.js

@@ -8 +8 @@
     'rft/content',
     'dijit/registry',
-    'dojo/on'],
-    function(declare, lang, Deferred, LineWithActionsWidget, store, _Page, api, content, registry, on){
-        return declare('rft.pages.surveyAdvanced', [_Page], {
+    'dojo/on',
+    'dojo/behavior',
+    'dojo/query',
+    'rft/ui/QuestionEditorPreview',
+    'rft/ui/QuestionEditorToolkit',
+    'dijit/form/FilteringSelect'],
+    function(declare, lang, Deferred, LineWithActionsWidget, store, _Page, api, content, registry, on, behavior, query){
+        return declare('rft.pages.question', [_Page], {
             object: null,
+            preview: null,
+            
             onVisit: function() {
                 if (this.pageArgs.uid) {
@@ -23 +30 @@
 
                 this._setupButtons();
+                this._setupEditor();
             },
             onLeave: function() {
                 this.inherited(arguments);
             },
-            _confirmSave: function() {
-                return confirm("Do you want to save?");
+            _setupButtons: function() {
+                var behaviorMap = {
+                    "#btnSave": {
+                        onclick: lang.hitch(this, function(){
+                            this._saveSurvey();
+                        })
+                    },
+                    "#btnDiscard": {
+                        onclick: lang.hitch(this, function(){
+                            this._restartEditor();
+                        })
+                    }
+                }
+                behavior.add(behaviorMap);
+                behavior.apply();
             },
-            _saveSurvey: function() {
-            },
-            _restartEditor: function() {
-            },
-            _backToEditor: function() {
-                if (this._confirmSave()) {
-                    this._saveSurvey()
-                    content.goTo('survey', {uid: this.object._id}); 
-                } else {
-                    content.goTo('survey', {uid: this.object._id});
-                }
-            },
-            _setupButtons: function() {
-                registry.byId("btnSave").on("click", lang.hitch(this, function() {
-                    this._saveSurvey();
-                }));
-                registry.byId("btnDiscard").on("click", lang.hitch(this, function() {
-                    this._restartEditor();
-                }));
-                registry.byId("btnBack").on("click", lang.hitch(this, function() {
-                    this._backToEditor();
-                }));
+            _setupEditor: function() {
+                this.toolkit = new rft.ui.QuestionEditorToolkit();
+                this.toolkit.placeAt("QuestionEditorToolkit");
+
+                this.preview = new rft.ui.QuestionEditorPreview();
+                this.preview.placeAt("QuestionEditorPreview");
             }
         });

Dev/branches/rest-dojo-ui/client/rft/pages/questions.js

@@ -1 +1 @@
 define(['dojo/_base/declare','dojo/_base/lang','dojo/_base/event',
-    'dojo/_base/Deferred','rft/store','rft/ui/_Page','rft/ui/AccordionList'],
-    function(declare,lang,event,Deferred,store,_Page,AccordionList) {
+    'dojo/_base/Deferred','rft/store','rft/ui/_Page','rft/ui/AccordionList', 'rft/content'],
+    function(declare,lang,event,Deferred,store,_Page,AccordionList,content) {
         return declare('rft.pages.questions',[_Page],{
             constructor: function() {
@@ -8 +8 @@
             },
             onVisit: function() {
+                debugger;
                 this._list = new AccordionList({
                     actions: {
-                        'Edit': lang.hitch(this,'_editQuestion')
+                        'Edit': {
+                            callback: lang.hitch(this,'_editQuestion'),
+                            properties: {
+                                blockButton: true,
+                                icon: "Edit",
+                                label: "Edit"
+                            }
+                        }
+
+                        
                     },
                     idProperty: store.idProperty,
@@ -32 +42 @@
             },
             _editQuestion: function(question) {
-                this.questionForm.reset();
-                this.questionWidget.set('value',question);
-                this.questionDialog.show();
+                content.goTo("question", {uid: question._id});
+                // this.questionForm.reset();
+                // this.questionWidget.set('value',question);
+                // this.questionDialog.show();
             },
             onSaveQuestion: function(evt) {
@@ -52 +63 @@
             }
         });
-    });
+});