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

Timestamp:

06/29/12 19:56:22 (13 years ago)

Author:

tjcschipper

Message:

• Finally fixed icon offsets and added a couple new icons for use in the Question/Survey? editors,as well as general purpose ones.
• Styled the dropdown menu in the MainMenu?
• Fixed a weird offset bug in the IndexMenu?
• Included another way of colouring objects by their parent classes, not applied yet (in layout.css)
• Styled the AccordionContainer?, to be used in Survey/Question? editors.
• Removed default colour in LineWithActionsWidgetThijs?, this would override the colours inherited from parent elements (not desirable).
• Drank a lot of coffee.

Location:

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

Files:

• LineWithActionsWidgetThijs.js (modified) (4 diffs)
• ObjectBox.js (modified) (4 diffs)
• templates/MainMenu.html (modified) (1 diff)

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

@@ -1 @@
-define(['dojo/_base/declare','dojo/_base/lang','dojo/on','dojo/dom', 'dojo/dom-class', 'dijit/form/Button',
-    'dijit/_WidgetBase','dijit/_TemplatedMixin','dijit/_WidgetsInTemplateMixin',
+define([
+    'dojo/_base/declare',
+    'dojo/_base/lang',
+    'dojo/on',
+    'dojo/dom', 
+    'dojo/dom-class', 
+    'dijit/form/Button',
+    'dijit/_WidgetBase',
+    'dijit/_TemplatedMixin',
+    'dijit/_WidgetsInTemplateMixin',
     'dojo/text!./templates/LineWithActionsWidget.html'
     ],
-    function(declare,lang,on,dom,domClass,Button,_WidgetBase,_TemplatedMixin,_WidgetsInTemplateMixin,templateString){
+    function(
+        declare,
+        lang,
+        on,
+        dom,
+        domClass,
+        Button,
+        _WidgetBase,
+        _TemplatedMixin,
+        _WidgetsInTemplateMixin,
+        templateString) {
         return declare('rft.ui.LineWithActionsWidgetThijs',[_WidgetBase,_TemplatedMixin,_WidgetsInTemplateMixin],{
+
             templateString: templateString,
             baseClass: 'rftLineWithButtons',
             title: '',
-            modifiers: "blue",
+            modifiers: "",
             userObject: null,
             actions: {},
+            
             postCreate: function() {
                 dom.setSelectable(this.domNode, false);
@@ -23 +43 @@
             _setupActions: function() {
                 for (var action in this.actions) {
-                    
+
                     if (this.actions[action].properties.blockButton == true) {  // BlockButton
                         var properties = lang.mixin({
@@ -51 +71 @@
             },
             refresh: function() {
+
                 this.titleNode.innerHTML = this.title;
             },
@@ -66 +87 @@
             }
         });
-    });
+});

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

@@ -60 +60 @@
                             label: "Edit/View",
                             modifiers: "trans",
-                            icon: "Settings"
+                            icon: "Edit"
                         }
                     };
@@ -93 +93 @@
             _setObjectReference: function(identifier) {
             // TODO: Set this ObjectBox to refer to a certain database object
-            },
-            _getObjectInfo: function() {
+        },
+        _getObjectInfo: function() {
             // TODO: Query the database and retrieve a JSON array of object properties
-            },
-            _inspectObject: function() {
+        },
+        _inspectObject: function() {
             // TODO: Get object information (or retrieve from cache), then display in popup
-            },
-            _editObject: function(customFunction) {
+        },
+        _editObject: function(customFunction) {
                 // TODO: Pass an edit call to the page script, along with reference to the object contained in this ObjectBox
                 alert("Default edit code");
@@ -138 +138 @@
              * TODO: Check with Hendrik if I should do this or not!
              * */
-            CreateNew: function(arguments, reference, location) {
+             CreateNew: function(arguments, reference, location) {
                 var newBox = new rft.ui.ObjectBox(arguments);
                 newBox.startup();
@@ -144 +144 @@
             }
         });
-    });
+});

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

@@ -5 +5 @@
             <span>Content</span>
             <div data-dojo-type="dijit.DropDownMenu">
-                <div data-dojo-type="rft.ui.MenuLink" data-dojo-props="pageId:'surveys'">Surveys</div>
-                <div data-dojo-type="rft.ui.MenuLink" data-dojo-props="pageId:'questions'">Questions</div>
-                <div data-dojo-type="rft.ui.MenuLink" data-dojo-props="pageId:'applications'">Applications</div>
-                <div data-dojo-type="rft.ui.MenuLink" data-dojo-props="pageId:'dashboards'">Dashboards</div>
+                <div data-dojo-type="rft.ui.MenuLink" class="blue" data-dojo-props="pageId:'surveys', iconClass:'rftIcon rftIconSurvey'">Surveys</div>
+                <div data-dojo-type="rft.ui.MenuLink" class="orange" data-dojo-props="pageId:'questions', iconClass:'rftIcon rftIconQuestion'">Questions</div>
+                <div data-dojo-type="rft.ui.MenuLink" class="purple" data-dojo-props="pageId:'applications', iconClass: 'rftIcon rftIconApplication'">Applications</div>
+                <div data-dojo-type="rft.ui.MenuLink" class="red" data-dojo-props="pageId:'dashboards', iconClass: 'rftIcon rftIconDashboard'">Dashboards</div>
             </div>
         </div>