Changeset 1322

Timestamp:

06/11/09 22:09:19 (9 months ago)

Author:

admc

Message:

Drawing UI actions correctly in IE without bandaids

Location:

trunk/windmill/html

Files:

• css/windmill.css (modified) (3 diffs)
• js/wm/ide/remote.js (modified) (4 diffs)
• js/wm/ide/results.js (modified) (1 diff)

trunk/windmill/html/css/windmill.css

@@ -52 +52 @@
 
 .action {
-/*  position:relative;
-  border-top: 1px solid #aaa;
+  position:relative;
+  /*border-top: 1px solid #aaa;
   background: lightyellow;*/
   padding:2px;
@@ -67 +67 @@
 .buttons {
  position:absolute;
- right:5px;
+ right:8px;
+ z-index:100;
 }
 
@@ -218 +219 @@
 .tab {
  height:100%;
- overflow-x: hidden;
+ overflow: hidden;
 }
 

trunk/windmill/html/js/wm/ide/remote.js

@@ -295 +295 @@
       
       var select = document.createElement('select');
-      select.className = 'smalloption floatLeft';
+      select.className = 'smalloption';
       select.id = state.action.id + 'method';
       //Setup default method
@@ -536 +536 @@
           return action;
         }
-
+        
+        //Build the buttons
         var templ = new fleegix.ejs.Template({ node: $('actionButtonsTemplate') });
         var buttons = templ.process({ data: { id: action.id } });
@@ -542 +543 @@
         jQuery(buttonNode).html(buttons);
         
-        //IE is breaking because of the absolute positioning
-        if (windmill.browser.isIE){
-          buttonNode.style.position = "relative";
-          buttonNode.style.left = "20%";
-        }
         var state = {method: method, params: params, action: action};
         
+        //Get all the form elements for actions
         var methods = _this.getMethods(state);
         var locators = _this.getLocators(state);
@@ -555 +552 @@
         var optionInput = _this.getOptionInput(state);
         
+        //add methods and buttons
         jQuery(action).append(jQuery(methods));
         jQuery(action).append(jQuery(buttonNode));
-
+        
+        //if this action has locators, add them in a container
         if (locators){
-          jQuery(action).append(jQuery($elem('div', {className:'clearBoth'})));
-          jQuery(action).append(jQuery(locators));
-          jQuery(action).append(jQuery(locatorInput));
-        }
+          var locCont = document.createElement('div');
+          locCont.appendChild(locators)
+          locCont.appendChild(locatorInput);
+          jQuery(action).append(jQuery(locCont));
+        }
+        
+        //if this action has options, add them in a container
         if (options){
-          jQuery(action).append(jQuery($elem('div', {className:'clearBoth'})));
-          jQuery(action).append(jQuery(options));
+          var optCont = document.createElement('div');
+          optCont.appendChild(options);
           
+          //if its a string not a drop down: only one option
           if (options.tagName.toLowerCase() != "select"){
-            jQuery(action).append(jQuery(document.createElement('span')).html(': ').addClass("textSpan"));
-          }
-          jQuery(action).append(jQuery(optionInput));
+            jQuery(optCont).append(jQuery(document.createElement('span')).html(': ').addClass("textSpan"));
+          }
+          jQuery(optCont).append(jQuery(optionInput));
+          //append options
+          jQuery(action).append(jQuery(optCont));
         }        
         return action;

trunk/windmill/html/js/wm/ide/results.js

@@ -120 +120 @@
       }
       else {
-        resDiv.innerHTML = "<strong>"+method + "</strong>: " + resDiv.innerHTML;
+        resDiv.innerHTML = "<strong>"+method + "</strong> " + resDiv.innerHTML;
       }