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

Timestamp:

08/08/12 18:06:21 (13 years ago)

Author:

tjcschipper

Message:

• Fixed inheritBgColor CSS classes. Now works for buttons as well. LineWithActions? and the classes that use it still need some changes. LWA needs to get rid of colour "modifier" property and always pass "inheritBgColor (light, optionally) to the buttons". Classes that use LWA need to stop passing modifiers to them;)
• Improved SurveyEditorPreviewItem? design, less of an eyesore, and can now use the correct button colors.

Location:

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

Files:

• QuestionEditorPreviewItem.html (modified) (1 diff)
• QuestionEditorToolkit.html (modified) (1 diff)

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

@@ -1 @@
-<div class="inheritBgColor light">
-        <div class="topBorder inheritBgColor light dojoDndHandle" data-dojo-attach-point="topBorderNode">
+<div>
+        <div class="topBorder inheritBgColor dojoDndHandle">
                 <span class="title" data-dojo-attach-point="titleNode">Default title</span>
-                <span class="floatRight">
-                        <button class="blue" data-dojo-type="dijit.form.Button" data-dojo-props="baseClass: 'rftBlockButton', showLabel: false, iconClass: 'rftIcon rftIconHalfArrowUp'" data-dojo-attach-point="foldButtonNode">Fold</button>
-                        <button class="blue" data-dojo-type="dijit.form.Button" data-dojo-attach-point="removeButtonNode" data-dojo-props="baseClass: 'rftBlockButton', showLabel: false, iconClass: 'rftIcon rftIconDelete'">Remove</button>
+                <span class="floatRight" data-dojo-attach-point="buttonsNode">
+                        <button class="trans" data-dojo-type="dijit.form.Button" data-dojo-attach-point="editButtonNode" data-dojo-props="baseClass: 'rftBlockButton', iconClass: 'rftIcon rftIconEdit'">Edit</button>
+                        <button class="trans" data-dojo-type="dijit.form.Button" data-dojo-attach-point="foldButtonNode" data-dojo-props="baseClass: 'rftBlockButton', showLabel: false, iconClass: 'rftIcon rftIconHalfArrowUp'">Fold</button>
+                        <button class="trans" data-dojo-type="dijit.form.Button" data-dojo-attach-point="removeButtonNode" data-dojo-props="baseClass: 'rftBlockButton', showLabel: false, iconClass: 'rftIcon rftIconDelete'">Remove</button>
                 </span>
         </div>
         
         <div class="surveyEditorPreviewItemInner" data-dojo-attach-point="innerNode">
-                <div class="surveyEditorPreviewItemContent inheritBgColor" data-dojo-attach-point="containerNode">
+                <div class="surveyEditorPreviewItemContent" data-dojo-attach-point="containerNode">
                 </div>
         </div>
-        
-        <div class="bottomBorder inheritBgColor light" data-dojo-attach-point="bottomBorderNode">
-                <span class="floatRight">
-                        <button class="trans" data-dojo-type="dijit.form.Button" data-dojo-attach-point="editButtonNode" data-dojo-props="baseClass: 'rftBlockButton', iconClass: 'rftIcon rftIconEdit'">Edit</button>
-                </span>
-        </div>
 </div>

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

@@ -9 +9 @@
                                         <div data-dojo-attach-point="listNode" class="rftLineListView"></div> 
                                         <div data-dojo-attach-point="categoriesBoxNode"></div>
-                                        <button data-dojo-type="dijit.form.Button" data-dojo-attach-event="onClick:onCategoryAdd" data-dojo-props="baseClass:'rftBlockButton', class:'orange', iconClass: 'rftIcon rftIconPlus'">Add</button><br>
+                                        <button class="inheritBgColor light" data-dojo-type="dijit.form.Button" data-dojo-attach-event="onClick:onCategoryAdd" data-dojo-props="baseClass:'rftBlockButton', iconClass: 'rftIcon rftIconPlus'">Add</button><br>
                                         <label>Topic:</label>
                                         <div data-dojo-attach-point="topicBoxNode"></div>