Changeset 342 for Dev/branches/rest-dojo-ui/client/rft/ui

Timestamp:

06/14/12 18:34:52 (13 years ago)

Author:

tjcschipper

Message:

• Fixed callbacks/actions in LineWithActionsWidgetThijs?.js. Previously an onClick event would not fire the correct callback. They were also incorrectly bound to the context of the widget, so the this keyword referred to the properties object instead of the LineWithActions?.
• Changed a bunch of stuff in CSS files, general layout.
• Added another mockup page to show the Session selection page.

Location:

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

Files:

• LineWithActionsWidgetThijs.js (modified) (3 diffs)
• SelectorThijs.js (modified) (4 diffs)
• templates/List.html (modified) (1 diff)

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

@@ -28 +28 @@
                             baseClass: 'rftBlockButton',
                             modifiers: this.modifiers,
-                            label: action,
-                            iconClass: 'rftIcon rftIcon'+action,
+                            label: "Default",
+                            iconClass: 'rftIcon rftIcon'+this.actions[action].properties.icon,
                             title: action,
-                            onClick: lang.hitch(this, function(){
-                                this.actions[action].callback(this.userObject);
-                            })
-                        },
-                        this.actions[action].properties);
+                            onClick: lang.hitch(this, this.actions[action].callback)
+                        }, this.actions[action].properties);
                         properties["class"] = properties.modifiers;
                         new Button(properties).placeAt(this.buttonsNode);
@@ -42 +39 @@
                             baseClass: 'rftInlineButton',
                             modifiers: 'black',
+                            label: "Default",
                             showLabel: false,
-                            iconClass: 'rftIcon rftIcon'+action,
+                            iconClass: 'rftIcon rftIcon'+this.actions[action].properties.icon,
                             title: action,
-                            onClick: lang.hitch(this, function(){
-                                this.actions[action].callback(this.userObject);
-                            })
-                        },
-                        this.actions[action].properties);
+                            onClick: lang.hitch(this, this.actions[action].callback)
+                        }, this.actions[action].properties);
                         properties["class"] = properties.modifiers;
                         new Button(properties).placeAt(this.buttonsNode);
@@ -65 +60 @@
                 return !preventDefault;
             },
-            onClick: function(e) {}
+            onClick: function(e) {},
+            _setTitleAttr: function(value){
+                this.title = value;
+                this.refresh();
+            }
         });
     });

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

@@ -37 +37 @@
                     modifiers: this.modifiers,
                     actions: {
-                        "Accept" : {
+                        "AddToSurvey" : {
                             callback: function(arg){},
                             properties: {
                                 blockButton: true,
-                                modifiers: this.modifiers
+                                modifiers: this.modifiers,
+                                icon: "Accept",
+                                label: "Include"
                             }
                         }
@@ -50 +52 @@
                     modifiers: this.modifiers,
                     actions: {
-                        "HalfArrowDown" : {
+                        "ToggleDropdown" : {
                             callback: lang.hitch(this,function(){
                                 var node = this.optionsNode;
@@ -87 +89 @@
                                 blockButton: true,
                                 modifiers: this.modifiers,
-                                showLabel: false
+                                showLabel: false,
+                                icon: "HalfArrowDown"
                             }
                         }
@@ -95 +98 @@
                     title: 'Are there direct colleagues among the other participants?',
                     actions: {
-                        "Inspect" : {
+                        "InfoHover" : {
                             callback: infoFunction,
                             properties: {
                                 blockButton: false,
-                                showLabel: false
+                                showLabel: false,
+                                icon: "Inspect"
                             }
                         }

Dev/branches/rest-dojo-ui/client/rft/ui/templates/List.html

@@ -1 +1 @@
 <div>
     <div data-dojo-attach-point="containerNode"></div>
-    <div>
-        <span>Move selected</span>
-        <button data-dojo-type="dijit.form.Button">Up</button>
-        <button data-dojo-type="dijit.form.Button">Down</button>
+    <div style="float: right;">
+        <span>Move selected: </span>
+        <button data-dojo-type="dijit.form.Button" data-dojo-props="baseClass: 'rftBlockButton', iconClass:'rftIcon rftIconFullArrowUp'" class="trans"></button>
+        <button data-dojo-type="dijit.form.Button" data-dojo-props="baseClass: 'rftBlockButton', iconClass:'rftIcon rftIconFullArrowDown'" class="trans"></button>
     </div>
 </div>