Changeset 358

Timestamp:

07/12/12 14:39:26 (13 years ago)

Author:

tjcschipper

Message:

Omgevingsbewustzijnde schalingsfunctie

Location:

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

Files:

• css/layout.css (modified) (2 diffs)
• pages/index.html (modified) (3 diffs)
• pages/questions.html (modified) (1 diff)
• pages/survey.js (modified) (1 diff)
• pages/surveys.html (modified) (1 diff)
• pages/surveys.js (modified) (2 diffs)
• ui/Selector.js (modified) (5 diffs)
• ui/SurveyListView.js (modified) (2 diffs)

Dev/branches/rest-dojo-ui/client/rft/css/layout.css

@@ -11 +11 @@
 .claro {
     font-family: 'Segoe UI', Verdana, Arial, Helvetica, sans-serif;
-    color: #ffffff;
+    color: #000000;
 }
 
 /* Headings */
 .claro h1 {   
-    /* Main logo */
     float: left;
     clear: left;
@@ -30 +29 @@
 .claro h2 {
     /* Content pane title */
+    color: #ffffff;
     font-size: 22px;
     line-height: 30px;

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

@@ -42 +42 @@
         'dojo/query',
         'dijit/registry',
-        'rft/content'
+        'rft/content',
+        'dojo/domReady!'
         ], function(on, query, registry, content){
+            debugger;
             registry.byId("btnSessionsCreate").on("click", function(){
                 content.goTo("sessions", null);
@@ -50 +52 @@
                 content.goTo("sessions", null);
             });
-            
+
             registry.byId("btnSurveys").on("click", function(){
                 content.goTo("surveys", null);
@@ -69 +71 @@
 
         });
-</script>
+    </script>
 </div>

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

@@ -1 +1 @@
 <div data-dojo-type="rft.pages.questions">
     <h1>Questions</h1>
-    <div data-dojo-type="dijit.form.Button" data-rft-attach-event="onClick:onNewQuestion">New question</div>
+    <div data-dojo-type="dijit.form.Button" data-rft-attach-event="onClick:onNewQuestion" data-dojo-props="baseClass: 'rftLargeButton', iconClass:'rftIcon rftIconQuestion'">New question</div>
     <div data-rft-attach-point="list">
     </div>

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

@@ -85 +85 @@
                         },
                         /* Store code */
-                        GetQuestion: function(_id) {
+                        getQuestion: function(_id) {
                                 return this.questions.get(_id);
                         },
-                        SetQuestion: function(question) {
+                        setQuestion: function(question) {
                                 return this.questions.put(question);
-                        },
-                        SyncStore: function() {
                         },
                         /* Browser code */

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

@@ -1 +1 @@
 <div data-dojo-type="rft.pages.surveys">
-    <button data-dojo-type="dijit.form.Button" data-dojo-props="disabled: true" data-rft-attach-point="btnEdit">Edit</button>
-    <button data-dojo-type="dijit.form.Button" data-rft-attach-point="btnNew">New</button>
-    <div data-dojo-type="dojox.grid.DataGrid" data-dojo-props="autoWidth:true,autoHeight:true,structure:[{name:'Title',field:'title'}]"
-         data-rft-attach-point="grid"></div>
+        <button data-dojo-type="dijit.form.Button" class="blue" data-dojo-props="disabled: true, baseClass: 'rftBlockButton', iconClass: 'rftIcon rftIconEdit'" data-rft-attach-point="btnEdit">Edit</button>
+        <button data-dojo-type="dijit.form.Button" class="blue" data-dojo-props="baseClass: 'rftBlockButton', iconClass: 'rftIcon rftIconPlus'" data-rft-attach-point="btnNew">New</button>
+        <div data-dojo-type="dojox.grid.DataGrid" data-dojo-props="autoWidth:true,autoHeight:true,structure:[{name:'Title',field:'title'}]"
+        data-rft-attach-point="grid"></div>
 </div>

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

@@ -17 +17 @@
                     content.goTo('/survey',{uid:store.getIdentity(obj)});
                 }));
-                                
+                
                 this.btnNew.on('click',lang.hitch(this,function(){
                     Deferred.when( store.add({type:'Survey',creator:auth.getUser()}) )
@@ -33 +33 @@
             }
         });
-    });
+});
 

Dev/branches/rest-dojo-ui/client/rft/ui/Selector.js

@@ -72 +72 @@
             },
             _toggleDropdown: function() {
-
                 var node = this.optionsNode;
                 var show = fx.wipeIn({
@@ -104 +103 @@
             },
             addQuestion: function(questionId) {
-                var question = this.controller.GetQuestion(questionId);
+                var question = this.controller.getQuestion(questionId);
                 if (question) {
                     var w = new LineWithActionsWidget({
@@ -121 +120 @@
                     });
                     w.placeAt(this.optionsNode);
-                    w.on("Click", lang.hitch(this, function(){
+                    w.on("click", lang.hitch(this, function(){
                         this.selectQuestion(questionId);
                         this._toggleDropdown();
@@ -129 +128 @@
             },
             infoFunction: function(selector) {
-                var question = selector.controller.GetQuestion(this.questionId);
+                var question = selector.controller.getQuestion(this.questionId);
                 console.log(question);
                 alert("Some info here!");
@@ -142 +141 @@
             selectQuestion: function(questionId) {
                 /* TODO: TEST THOROUGHLY! */
-                var question = this.controller.GetQuestion(questionId);
+                var question = this.controller.getQuestion(questionId);
                 if (question) {
                     this.currentlySelectedId = questionId;

Dev/branches/rest-dojo-ui/client/rft/ui/SurveyListView.js

@@ -73 +73 @@
                         creatorMethod: function(controller, listView, item, hint) {
                                 var node,
-                                object = controller.GetQuestion(item);
+                                object = controller.getQuestion(item);
                                 if (!object) {
                                         return false;
@@ -100 +100 @@
                                                         "Info" : {
                                                                 callback: function(){
-                                                                        var question = controller.GetQuestion(item);
+                                                                        var question = controller.getQuestion(item);
                                                                         console.log(question);
                                                                         alert("info goes here yo!");