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

Timestamp:

06/04/12 18:09:33 (13 years ago)

Author:

tjcschipper

Message:

• Switched away from using custom themes, this allows us to use the default Claro theme off of a CDN, then override the needed properties using our own, much smaller stylesheets. Retains graceful degradation of dijit style.
• Made rftLineWithActions also work outside of the context of an rftSelector.css
• Fixed some general layout issues
• Redid the tabs styling

File:

• Dev/branches/rest-dojo-ui/client/rft/ui/LineWithActionsWidgetThijs.js (modified) (4 diffs)

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

@@ -2 +2 @@
     'dijit/_WidgetBase','dijit/_TemplatedMixin','dijit/_WidgetsInTemplateMixin',
     'dojo/text!./templates/LineWithActionsWidget.html'
-],
+    ],
     function(declare,lang,on,dom,domClass,Button,_WidgetBase,_TemplatedMixin,_WidgetsInTemplateMixin,templateString){
         return declare('rft.ui.LineWithActionsWidgetThijs',[_WidgetBase,_TemplatedMixin,_WidgetsInTemplateMixin],{
@@ -8 +8 @@
             baseClass: 'rftLineWithButtons',
             title: '',
-            modifiers: "red",
+            modifiers: "blue",
             userObject: null,
             actions: {},
@@ -25 +25 @@
                     
                     if (this.actions[action].properties.blockButton == true) {  // BlockButton
-                        var properties = lang.mixin(
-                        {
+                        var properties = lang.mixin({
                             baseClass: 'rftBlockButton',
                             modifiers: this.modifiers,
@@ -38 +37 @@
                         this.actions[action].properties);
                         properties["class"] = properties.modifiers;
-                        
                         new Button(properties).placeAt(this.buttonsNode);
                     } else {    //InlineButton
-                        new Button(
-                            lang.mixin({
-                                baseClass: 'rftInlineButton',
-                                "class": "black",
-                                showLabel: false,
-                                iconClass: 'rftIcon rftIcon'+action,
-                                title: action,
-                                onClick: lang.hitch(this, function(){
-                                    this.actions[action].callback(this.userObject);
-                                })
-                            }, this.actions[action].properties)).placeAt(this.buttonsNode);
+                        var properties = lang.mixin({
+                            baseClass: 'rftInlineButton',
+                            modifiers: 'black',
+                            showLabel: false,
+                            iconClass: 'rftIcon rftIcon'+action,
+                            title: action,
+                            onClick: lang.hitch(this, function(){
+                                this.actions[action].callback(this.userObject);
+                            })
+                        },
+                        this.actions[action].properties);
+                        properties["class"] = properties.modifiers;
+                        new Button(properties).placeAt(this.buttonsNode);
                     }
                 }