Changeset 1297 for trunk

Timestamp:

03/28/11 18:08:39 (1 year ago)

Author:

gogo

Message:

See ticket #1502

Update to enhance reliability and functionality of MootoolsFileManager?.

1. A couple of race type conditions caused various issues with loading the MFM.
   
2. Add preselection of current image
   
3. Add documentation for HSpace/VSpace in config.php
   

Also snuck in a couple of other bugfixes/additions:

1. add support for having attribute "onxinhaready" on a textarea
   
2. add a Xinha._posturlcontent as an analog to _geturlcontent, synchronouse post
   
3. some PHP deprecation issues in the old ExtendedFileManager and ImageManager
   
4. add a skin.xml to blue-look skin
   

Note: This is an older version of MFM, I am about to create a branch to work on bringing in a large update to MFM in a couple of stages.

Location:

trunk

Files:

• Xinha.css (modified) (2 diffs)
• XinhaCore.js (modified) (5 diffs)
• plugins/ExtendedFileManager/ExtendedFileManager.js (modified) (2 diffs)
• plugins/ExtendedFileManager/assets/manager.js (modified) (1 diff)
• plugins/ImageManager/Classes/Transform.php (modified) (1 diff)
• plugins/ImageManager/backend.php (modified) (1 diff)
• plugins/MootoolsFileManager/MootoolsFileManager.ImageManager.js (modified) (11 diffs)
• plugins/MootoolsFileManager/MootoolsFileManager.js (modified) (4 diffs)
• plugins/MootoolsFileManager/backend.php (modified) (2 diffs)
• plugins/MootoolsFileManager/config.php (modified) (1 diff)
• plugins/MootoolsFileManager/mootools-filemanager/.git/index (modified) (previous)
• plugins/MootoolsFileManager/mootools-filemanager/Backend/Upload.php (modified) (1 diff)
• plugins/MootoolsFileManager/mootools-filemanager/Source/FileManager.js (modified) (5 diffs)
• plugins/PersistentStorage/dialog.css (copied) (copied from trunk/Xinha.css) (1 diff)
• skins/blue-look/skin.css (modified) (1 diff)
• skins/blue-look/skin.xml (added)

trunk/Xinha.css

@@ -1 +1 @@
 .htmlarea { background: #fff; }
-.htmlarea td { margin:0;padding:0; }
+.htmlarea td { margin:0 !important;padding:0 !important; }
 
 .htmlarea .toolbarRow {
@@ -387 +387 @@
 display: none;
 }
-
-.placesmanager
-{
-  width: 95%;
-  overflow: auto;
-}
-
-.filemanager
-{
-  width: 95%;
-  height: 200px;
-  overflow: auto;
-  background-color: #fff;
-}
-.filemanager div.file
-{
-  min-width: 80px;
-  height: 100px;
-  position: relative;
-  float: left;
-  border: 1px outset #666;
-  margin: 4px;
-}
-.placesmanager div.file
-{
-  min-width: 60px;
-  height: 70px;
-  position: relative;
-  float: left;
-  border: 1px outset #666;
-  margin: 4px;
-}
-.filemanager div.file:hover,
-.placesmanager div.file:hover
-{
-  border: 1px solid #333;
-  background: #fffff3;
-}
-
-.filemanager div.selected,
-.filemanager div.selected:hover,
-.placesmanager div.selected,
-.placesmanager div.selected:hover
-{
-  background: #ffffda;
-  border: 1px solid #000;
-}
-.filemanager .filename {
-        margin: 0.5em;
-        color: #222;
-}
-.filemanager div.selected .filename {
-  color: #000;
-}
-.filemanager img.thumb
-{
-  width: 50px;
-  height: 50px;
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  margin: -25px 0 0 -25px;
-  border: 1px solid black;
-}
-.filemanager img.icon
-{
-  width: 32px;
-  height: 32px;
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  margin: -16px 0 0 -16px;
-}
-.filemanager img.action
-{
-  width: 15px;
-  height: 15px;
-  position: absolute;
-}
-.filemanager img.delete
-{
-  bottom: 3px;
-  left: 20px;
-}
-.filemanager img.copy
-{
-  bottom: 3px;
-  left: 3px;
-}

trunk/XinhaCore.js

@@ -3658 +3658 @@
         editor._onGenerate();
       }
+      
+      if(editor._textArea.hasAttribute('onxinhaready'))
+      {               
+        (function() { eval(editor._textArea.getAttribute('onxinhaready')) }).call(editor.textArea);
+      }
+      
       //ticket #1407 IE8 fires two resize events on one actual resize, seemingly causing an infinite loop (but not  when Xinha is in an frame/iframe) 
       Xinha.addDom0Event(window, 'resize', function(e) 
@@ -4205 +4211 @@
           return this.loadNext();
         
-        case 'text/javascript':
+        case 'text/javascript':          
+          this.loadedScripts.push(nxt);
           Xinha.loadScript(nxt.url, nxt.plugin, function() { self.loadNext(); });
       }
@@ -4231 +4238 @@
     {
       if(this.loadedScripts[i].url == url && this.loadedScripts[i].plugin == plugin)
+      {
+        if(!this.loaderRunning) this.loadNext();
         return this; // Already done (or in process)
+      }
     }
     
+    for(var i = 0; i < this.pendingAssets.length; i++)
+    {
+      if(this.pendingAssets[i].url == url && this.pendingAssets[i].plugin == plugin)
+      {
+        if(!this.loaderRunning) this.loadNext();
+        return this; // Already pending
+      }
+    }
+        
     return this.loadScript(url, plugin);
   }
@@ -7202 +7221 @@
 };
 
+
+/** Use XMLHTTPRequest to send some some data to the server and return the result synchronously
+ *
+ * @param {String} url The address for the HTTPRequest
+ * @param data the data to send, streing or array
+ */
+Xinha._posturlcontent = function(url, data, returnXML)
+{
+  var req = null;
+  req = Xinha.getXMLHTTPRequestObject();
+
+  var content = '';
+  if (typeof data == 'string')
+  {
+    content = data;
+  }
+  else if(typeof data == "object")
+  {
+    for ( var i in data )
+    {
+      content += (content.length ? '&' : '') + i + '=' + encodeURIComponent(data[i]);
+    }
+  }
+
+  req.open('POST', url, false);    
+  req.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded'+(Xinha._postback_send_charset ? '; charset=UTF-8' : ''));
+  req.send(content);
+  
+  if ( ((req.status / 100) == 2) || Xinha.isRunLocally && req.status === 0 )
+  {
+    return (returnXML) ? req.responseXML : req.responseText;
+  }
+  else
+  {
+    return '';
+  }
+  
+};
 // Unless somebody already has, make a little function to debug things
 
@@ -7266 +7323 @@
   /** Walks through an array and, if the specified item exists in it, returns the position
   * @param {String} needle The string to search for
-  * @returns {Integer|null} Index position if item found, null otherwise 
+  * @returns {Integer|-1} Index position if item found, -1 otherwise (same as built in js)
   */
   Array.prototype.indexOf = function(needle)

trunk/plugins/ExtendedFileManager/ExtendedFileManager.js

@@ -239 +239 @@
             baseHref: editor.config.baseHref
         };
-    } else
+    } 
+    else
+    {      
         outparam.param = {
             f_href   : Xinha.is_ie ? link.href : link.getAttribute("href"),
@@ -247 +249 @@
             baseHref: editor.config.baseHref
         };
+    }
 
     Dialog(this.config.ExtendedFileManager.manager+'&mode=link', function(param){

trunk/plugins/ExtendedFileManager/assets/manager.js

@@ -152 +152 @@
     {
         var target_select = document.getElementById("f_target");
-        var absoluteURL = new RegExp('^https?://');
+        var absoluteURL = new RegExp('^(/|(https?://))');
 
         if (param.f_href.length > 0 && !absoluteURL.test(param.f_href) && typeof param.baseHref == "string") {

trunk/plugins/ImageManager/Classes/Transform.php

@@ -131 +131 @@
 
         $classname = "Image_Transform_Driver_{$driver}";
-        $obj =& new $classname;
+        $obj = new $classname;
         return $obj;
     }

trunk/plugins/ImageManager/backend.php

@@ -31 +31 @@
 
 // Strip slashes if MQGPC is on
-set_magic_quotes_runtime(0);
+if(function_exists('set_magic_quotes_runtime')) @set_magic_quotes_runtime(0);
 if(get_magic_quotes_gpc())
 {

trunk/plugins/MootoolsFileManager/MootoolsFileManager.ImageManager.js

@@ -37 +37 @@
     outparam =
       {
-        f_url    : Xinha.is_ie ? image.src : image.src,
+        f_url    : image.getAttribute('src'), //Xinha.is_ie ? image.src : image.src,
         f_alt    : image.alt,
         f_border : image.style.borderWidth ? image.style.borderWidth : image.border,
@@ -73 +73 @@
       onComplete:     function(path, file) { self.ImageManagerReturn(path,file); },
       onHide:         function() { if(this.swf && this.swf.box) this.swf.box.style.display = 'none'; },
-      onShow:         function() { if(this.swf && this.swf.box) this.swf.box.style.display = ''; },
+      onShow:         function() {        
+        if(this.swf && this.swf.box) this.swf.box.style.display = ''; 
+        if(self.current_image)
+        {
+            var src  = self.current_image.getAttribute('src');
+            if(!src.match(/^(([a-z]+:)|\/)/i))
+            {
+                src = self.editor.config.baseHref.replace(/\/[^\/]*$/, '') + '/' + src;
+                if(src.match(/^[a-z]+:/i) && !self.phpcfg.images_url.match(/^[a-z]:/i))
+                {
+                  src = src.replace(/^[a-z]+:(\/\/?)[^/]*/i, '');
+                }
+            }
+            var path = src.replace(self.phpcfg.images_url+'/', '').split('/');
+            var base = path.pop();
+            path     = self.phpcfg.images_url.split('/').pop() + (path.length ? ('/' + path.join('/')) : '');  
+            this.load(path, true, (function() { this.fillInfo(base); }).bind(this));            
+        }
+      },
       onDetails:      function(details) 
                       {                                                 
@@ -178 +196 @@
           
           var img   = div.appendChild(document.createElement('img'));
-          img.src   = '/plugins/ImageManager/img/locked.gif';
+          img.src   =  Xinha.getPluginDir("ImageManager") + '/img/locked.gif';
           img.width = 25;
           img.height = 32;
@@ -201 +219 @@
         { // HSPACE/VSPACE        
           var th    = tr.appendChild(document.createElement('th'));
-          var label = th.appendChild(document.createTextNode('Margin:'));
+          var label = th.appendChild(document.createTextNode('L/R Margin:'));
           
           var td    = tr.appendChild(document.createElement('td'));
@@ -208 +226 @@
           input.size = 3;    
           input.type = 'text';
-          
-          td.appendChild(document.createTextNode(' x '));        
+          td.appendChild(document.createTextNode(' px '));               
+          th.className = td.className = 'filemanager-f_hspace';      
+          
+          var th    = tr.appendChild(document.createElement('th'));
+          var label = th.appendChild(document.createTextNode('T/B Margin:'));
+          var td    = tr.appendChild(document.createElement('td'));
           var input = td.appendChild(document.createElement('input'));
           input.name   = 'f_vspace';
@@ -215 +237 @@
           input.type = 'text';
           td.appendChild(document.createTextNode(' px '));               
-          th.className = td.className = 'filemanager-f_hspace filemanager-f_vspace';      
+          th.className = td.className = 'filemanager-f_vspace';      
         }
         else
@@ -291 +313 @@
           input.title = 'Positioning of this image';
           input.options[0] = new Option('', true, true);
-          input.options[1] = new Option('Left');
-          input.options[2] = new Option('Right');
-          input.options[3] = new Option('Top');
-          input.options[4] = new Option('Middle');
-          input.options[5] = new Option('Bottom');
+          input.options[1] = new Option('Left', 'left');
+          input.options[2] = new Option('Right', 'right');
+          input.options[3] = new Option('Top', 'top');
+          input.options[4] = new Option('Middle', 'middle');
+          input.options[5] = new Option('Bottom', 'bottom');
           
           // @TODO Constrain Ratio
@@ -420 +442 @@
       
       table: this._ImageManagerAttributesTable
-    }
-    
+    } 
     return details;
   }
@@ -427 +448 @@
   // If details were supplied, we set the appropriate ones.  
   if(
-      (f('f_width').value  && f('f_width').value  != details.width)   
-   || (f('f_height').value && f('f_height').value != details.height)   
+   (   (f('f_width').value  && f('f_width').value  != details.width)   
+    || (f('f_height').value && f('f_height').value != details.height)  )
+   && 
+    (!details.url || !this.current_image || this.current_image.getAttribute('src') != details.url)
   )
   {
-    new Dialog('This image is a different size, would you like to use the new size?', {
-      language: {        
-        confirm: 'Shrink/Grow To Fit',        
-        decline: 'Fullsize'
-      },
-        
-      buttons: [
-        'confirm',
-        'decline'
-      ],
+    // Check if this is the same image
+    var warn = function() {      
+      new Dialog('This image is a different size, would you like to use the new size?', {
+        language: {        
+          confirm: 'Shrink/Grow To Fit',        
+          decline: 'Fullsize'
+        },
+          
+        buttons: [
+          'confirm',
+          'decline'
+        ],
+        
+        onConfirm: function(){
+          if(f('f_constrain').checked)
+          {
+            var new_size = self.ScaleImage(details, {width: f('f_width').value, height: f('f_height').value});
+            
+            f('f_width').value = f('f_width').value   ? new_size.width : '';
+            f('f_height').value = f('f_height').value ? new_size.height : '';
+          }
+        },
+        
+        onDecline: function(){
+          f('f_width').value = '';
+          f('f_height').value = '';
+        }
+      });
+    }
       
-      onConfirm: function(){
-        if(f('f_constrain').checked)
-        {
-          var new_size = self.ScaleImage(details, {width: f('f_width').value, height: f('f_height').value});
-          
-          f('f_width').value = f('f_width').value   ? new_size.width : '';
-          f('f_height').value = f('f_height').value ? new_size.height : '';
-        }
-      },
-      
-      onDecline: function(){
-        f('f_width').value = '';
-        f('f_height').value = '';
-      }
-    });
+      if(!details.url) warn();
+      else if(!this.current_image) warn();
+      else
+      {
+          var src  = self.current_image.getAttribute('src');
+          if(!src.match(/^(([a-z]+:)|\/)/i))
+          {
+              src = self.editor.config.baseHref.replace(/\/[^\/]*$/, '') + '/' + src;
+              if(src.match(/^[a-z]+:/i) && !self.phpcfg.images_url.match(/^[a-z]:/i))
+              {
+                src = src.replace(/^[a-z]+:(\/\/?)[^/]*/i, '');
+              }
+          }
+          if(details.url != src) warn();
+      }
+    
   }
   
@@ -537 +580 @@
         case "f_margin": 
         {
-          if(value.length)
+          if(value && value.length)
           {
             img.style.margin = /[^0-9]/.test(value) ? value :  (parseInt(value) + 'px'); 
@@ -548 +591 @@
         break;
         
-        case "f_align"  : if(img.align && img.align !== true) { img.align  = value; } else { img.removeAttribute('align'); } break;
+        case "f_align"  : if(value && value !== true) { img.align  = value; } else { img.removeAttribute('align'); } break;
           
         case "f_width" : 

trunk/plugins/MootoolsFileManager/MootoolsFileManager.js

@@ -52 +52 @@
     .loadStyle('mootools-filemanager/Css/FileManager.css', 'MootoolsFileManager')
     .loadStyle('mootools-filemanager/Css/Additions.css', 'MootoolsFileManager')
-    .loadScript('mootools-filemanager/Source/FileManager.js', 'MootoolsFileManager')
-    .loadScript('mootools-filemanager/Language/Language.en.js', 'MootoolsFileManager')
-    .loadScript('mootools-filemanager/Source/Additions.js', 'MootoolsFileManager')
+    .loadScript('mootools-filemanager/Source/Additions.js', 'MootoolsFileManager')        
     .loadScript('mootools-filemanager/Source/Uploader/Fx.ProgressBar.js', 'MootoolsFileManager')
     .loadScript('mootools-filemanager/Source/Uploader/Swiff.Uploader.js', 'MootoolsFileManager')
-    .loadScript('mootools-filemanager/Source/Uploader.js', 'MootoolsFileManager');
+    .loadScript('mootools-filemanager/Source/FileManager.js', 'MootoolsFileManager')
+    .loadScript('mootools-filemanager/Source/Uploader.js', 'MootoolsFileManager')
+    .loadScript('mootools-filemanager/Language/Language.en.js', 'MootoolsFileManager');
 }
 MootoolsFileManager.AssetLoader.loadStyle('MootoolsFileManager.css', 'MootoolsFileManager');
@@ -63 +63 @@
 
 function MootoolsFileManager(editor)
-{
+{  
   this.editor = editor;
   var self = this;
@@ -69 +69 @@
     
   // Do a callback to the PHP backend and get it to "decode" the configuration for us into a 
-  // javascript object.
-  Xinha._postback(editor.config.MootoolsFileManager.backend+'__function=read-config', editor.config.MootoolsFileManager.backend_data, 
-    function(phpcfg) 
-    { 
-      eval ('var f = '+phpcfg+';'); 
-      self.phpcfg = f; self.hookUpButtons(); 
-    });  
+  // javascript object.  
+  
+  // IMPORTANT: we need to do this synchronously to ensure that the buttons are added to the toolbar
+  //  before the toolbar is drawn.
+  
+  var phpcfg = Xinha._posturlcontent(editor.config.MootoolsFileManager.backend+'__function=read-config', editor.config.MootoolsFileManager.backend_data);
+
+  eval ('var f = '+phpcfg+';'); 
+  self.phpcfg = f; 
+  self.hookUpButtons(); 
     
   return;  
@@ -116 +119 @@
     
     // Override our Editors insert image button action.  
-    self.editor._insertImage = function()
-    {
-      MootoolsFileManager.AssetLoader.whenReady(function() { self.OpenImageManager(); });
+    self.editor._insertImage = function(image)
+    {
+      MootoolsFileManager.AssetLoader.whenReady(function() { self.OpenImageManager(image); });
     }              
   } 

trunk/plugins/MootoolsFileManager/backend.php

@@ -31 +31 @@
 
 // Strip slashes if MQGPC is on
-set_magic_quotes_runtime(0);
-if(get_magic_quotes_gpc())
+if(function_exists('set_magic_quotes_runtime')) @set_magic_quotes_runtime(0);
+if(function_exists('get_magic_quotes_gpc') && @get_magic_quotes_gpc())
 {
   $to_clean = array(&$_GET, &$_POST, &$_REQUEST, &$_COOKIE);
@@ -57 +57 @@
   if(preg_match('/([0-9\.])+([a-zA-Z]+)/', $s, $M))
   {
-    switch(strtolower($M))
+    switch(strtolower($M[2]))
     {      
       case 'm':

trunk/plugins/MootoolsFileManager/config.php

@@ -137 +137 @@
 $IMConfig['base_url'] = preg_replace('/\/backend\.php.*/', '', $_SERVER['REQUEST_URI']);
 
+/**
+
+== HTML Compatability ==
+
+ For most people the default of using CSS will be fine, but if the HTML you are editing
+ in Xinha is destined for an email you will probably want to use hspace and vspace
+ instead of CSS margins because of poor Email support for CSS.
+ 
+*/
+
+$IMConfig['UseHSpaceVSpace'] = TRUE;
 
  /**

trunk/plugins/MootoolsFileManager/mootools-filemanager/Backend/Upload.php

@@ -93 +93 @@
                         'extension' => strtolower(pathinfo($file, PATHINFO_EXTENSION)),
                 ), $options);
-                
+                $options['extension'] = strtolower($options['extension']);
                 $mime = null;
                 $ini = error_reporting(0);

trunk/plugins/MootoolsFileManager/mootools-filemanager/Source/FileManager.js

@@ -310 +310 @@
         },
 
-        load: function(dir, nofade){
+        /* XINHA: We add a callback capability which will be called whe the loading is completed. 
+    *  NOTE: For some reason, MFM wants the dir to include the last component of the prefix
+    *  eg if your images_dir is /fancy/images and you want to load /fancy/images/foo/bar you must pass
+    *   images/foo/bar -- crazy annoying
+    */
+
+        load: function(dir, nofade, callback){
                 this.deselect();
                 if (!nofade) this.info.fade(0);
@@ -320 +326 @@
                         onSuccess: (function(j){
                                 this.fill(j, nofade);
+        if(callback) callback(j);
                         }).bind(this),
                         data: {
@@ -444 +451 @@
                         icons = $$(icons.map(function(icon){ return icon.appearOn(icon, [1, 0.7]); })).appearOn(el.getParent('li'), 0.7);
                 }, this);
-
+       this.CurrentFiles = j.files;  // XINHA - fillInfo() will use this to find a pre-selected file
+    
                 var self = this, revert = function(el){
                         el.set('opacity', 1).store('block', true).removeClass('drag').removeClass('move').setStyles({
@@ -454 +462 @@
                                 top: 0
                         }).inject(el.retrieve('parent'));
-                        el.getElements('img.browser-icon').set('opacity', 0);
+                //      el.getElements('img.browser-icon').set('opacity', 0); // XINHA - NOT REQUIRED?
                         
                         document.removeEvents('keydown', self.bound.keydown).removeEvents('keyup', self.bound.keydown);
@@ -552 +560 @@
                 if (!file) file = this.CurrentDir;
                 if (!path) path = this.Directory;
-
+  
                 if (!file) return;
+       
+       /* XINHA: In order to facilitate pre-selecting an image/file for modification, we can pass in a filename (just the basename)
+           as file and we will search in the current files for it.  You must have done a load first, and call the fillInfo as a result of the load.
+           YourImageManager.load('path/to/dir', true, function() { YourImageManager.fillInfo('file.jpg'); });
+        */
+       var self = this;
+        if(typeof file == 'string')
+    {
+        if(this.CurrentFiles)
+        {
+          this.CurrentFiles.each(function(f)
+          {
+            if(typeof file != 'string') return;
+            if(f.name == file) 
+            {
+                file = f;
+                if(file.element) 
+                {
+                  self.Current = file.element.addClass('selected');
+                  self.switchButton();
+                }
+               
+            }
+          });
+        }
+    }
+    
                 var size = this.size(file.size);
 

trunk/plugins/PersistentStorage/dialog.css

@@ -1 @@
-.htmlarea { background: #fff; }
-.htmlarea td { margin:0;padding:0; }
-
-.htmlarea .toolbarRow {
-  width:1px;
-}
-
-.htmlarea .toolbar {
-  cursor: default;
-  background: ButtonFace;
-  padding: 3px;
-  border: 1px solid;
-  border-color: ButtonHighlight ButtonShadow ButtonShadow ButtonHighlight;
-}
-.htmlarea .toolbar table { margin: 0; font-family: Tahoma, Verdana,sans-serif; font-size: 11px; }
-.htmlarea .toolbar img { border: none; vertical-align: top; }
-.htmlarea .toolbar .label { padding: 0 3px; }
-
-.htmlarea .toolbar .button {
-  background: ButtonFace;
-  color: ButtonText;
-  border: 1px solid ButtonFace;
-  padding: 1px;
-  margin: 0;
-  width: 18px;
-  height: 18px;
-}
-.htmlarea .toolbar a.button:hover {
-  border: 1px solid;
-  border-color: ButtonHighlight ButtonShadow ButtonShadow ButtonHighlight;
-}
-.htmlarea .toolbar a.buttonDisabled:hover {
-  border-color: ButtonFace;
-}
-.htmlarea .toolbar .buttonActive,
-.htmlarea .toolbar .buttonPressed
-{
-  padding: 2px 0 0 2px;
-  border: 1px solid;
-  border-color: ButtonShadow ButtonHighlight ButtonHighlight ButtonShadow;
-}
-.htmlarea .toolbar .buttonPressed {
-  background: ButtonHighlight;
-}
-.htmlarea .toolbar .indicator {
-  padding: 0 3px;
-  overflow: hidden;
-  width: 20px;
-  text-align: center;
-  cursor: default;
-  border: 1px solid ButtonShadow;
-}
-
-.htmlarea .toolbar .buttonDisabled img {
-  filter: gray() alpha(opacity = 25);
-  -moz-opacity: 0.25;
-  opacity: 0.25;
-}
-
-.htmlarea .toolbar .separator {
-  /*position: relative;*/
-  margin:0 3px;
-  border-left: 1px solid ButtonShadow;
-  border-right: 1px solid ButtonHighlight;
-  width: 0;
-  height: 18px;
-  padding: 0;
-}
-
-.htmlarea .toolbar .space { width: 5px; }
-
-.htmlarea .toolbar select, .htmlarea .toolbar option { font: 11px Tahoma,Verdana,sans-serif;}
-
-.htmlarea .toolbar select,
-.htmlarea .toolbar select:hover,
-.htmlarea .toolbar select:active { 
-  position:relative;
-  top:-2px;
-  margin-bottom:-2px;
-  color: ButtonText;
-}
-
-.htmlarea iframe.xinha_iframe, .htmlarea textarea.xinha_textarea
-{
-  border: none; /*1px solid;*/
-}
-
-.htmlarea .statusBar {
-  border: 1px solid;
-  border-color: ButtonShadow ButtonHighlight ButtonHighlight ButtonShadow;
-  padding: 2px 4px;
-  background-color: ButtonFace;
-  color: ButtonText;
-  font: 11px Tahoma,Verdana,sans-serif;
-  height:16px;
-  overflow: hidden;
-}
-
-.htmlarea .statusBar .statusBarTree a {
-  padding: 2px 5px;
-  color: #00f;
-}
-
-.htmlarea .statusBar .statusBarTree a:visited { color: #00f; }
-.htmlarea .statusBar .statusBarTree a:hover {
-  background-color: Highlight;
-  color: HighlightText;
-  padding: 1px 4px;
-  border: 1px solid HighlightText;
-}
-
-.statusBarWidgetContainer {
-  background-color: ButtonFace;
-}
-
-/* popup dialogs */
-
-.dialog {
-  color: ButtonText;
-  background: ButtonFace; 
-  border: 1px outset; 
-  border-color: WindowFrame;
-}
-div.dialog {
-  padding-bottom:10px;
-  border-radius: 8px 8px 0 0;
-  -moz-border-radius: 8px 8px 0 0;
-  -webkit-border-top-left-radius: 8px;
-  -webkit-border-top-right-radius: 8px;
-  
-  box-shadow: 9px 9px 10px #444;
-  -moz-box-shadow: 9px 9px 10px #444;
-  -webkit-box-shadow: 9px 9px 10px #444;
-}
-div.dialog.modeless {
-  box-shadow: 4px 4px 5px #888;
-  -moz-box-shadow: 4px 4px 5px #888;
-  -webkit-box-shadow: 4px 4px 5px #888;
-}
-div.dialog.chrome {
-  -webkit-box-shadow: none !IMPORTANT;
-}
-.panels div.dialog.panel {
-  border-radius:0;
-  -moz-border-radius: 0;
-  -webkit-border-radius:0;
-  
-  box-shadow: none;
-  -moz-box-shadow: none;
-  -webkit-box-shadow: none;
-}
-.xinha_dialog_background {
-  filter: alpha(opacity=0);
-  -moz-opacity: 0;
-  opacity: 0;
-  border:none;
-}
-.xinha_dialog_background_modal_greyout {
-  background-color:#666;
-  filter: alpha(opacity=70) !IMPORTANT;
-  -moz-opacity: 0.7;
-  opacity: 0.7;
-}
-.xinha_dialog_background_modal {
-  filter: alpha(opacity=0) !IMPORTANT;
-  -moz-opacity: 0;
-  opacity: 0;
-  border:none;
-}
-body.xinha_dialog_background_modal_greyout {
-  filter: alpha(opacity=100) !IMPORTANT;
-}
-body.xinha_dialog_background_modal {
-  filter: alpha(opacity=0);
-}
-.dialog .content { padding: 2px; }
-
-.dialog, .dialog button, .dialog input, .dialog select, .dialog textarea, .dialog table {
-  font: 11px Tahoma,Verdana,sans-serif;
-}
-
-.dialog table { border-collapse: collapse; }
-
-.dialog .title, .dialog h1
-{
-  background: ActiveCaption;
-  color: CaptionText;
-  border-bottom: 1px solid #000;
-  padding: 1px 0 2px 5px;
-  font-size: 12px;
-  font-weight: bold;
-  cursor: default;
-  letter-spacing: 0.01em;
-}
-.dialog h1 { 
-  padding-left:22px;
-  margin:0;
-  border-radius: 8px 8px 0 0;
-  -moz-border-radius: 8px 8px 0 0;
-  -webkit-border-top-left-radius: 8px;
-  -webkit-border-top-right-radius: 8px;
-}
-.panels .dialog.panel h1 { 
-  -moz-border-radius: 0;
-  -webkit-border-radius:0;
-}
-
-.dialog .title .button {
-  float: right;
-  border: 1px solid #66a;
-  padding: 0 1px 0 2px;
-  margin-right: 1px;
-  color: #fff;
-  text-align: center;
-}
-
-.dialog .title .button-hilite { border-color: #88f; background: #44c; }
-
-.dialog button {
-  width: 5.5em;
-  padding: 0;
-}
-.dialog .closeButton {
-  padding: 0;
-  cursor: default;
-  border: 1px solid;
-  border-color: ButtonHighlight ButtonShadow ButtonShadow ButtonHighlight;
-  height : 11px;
-  width : 11px;
-  vertical-align : top;
-  position : absolute;
-  top : 3px;
-  right : 2px;
-  background-color: ButtonFace;
-  color: ButtonText;
-  font-size: 13px;
-  font-family: Tahoma,Verdana,sans-serif;
-  text-align:center;
-  letter-spacing:0;
-  overflow:hidden;
-}
-.dialog .buttonColor {
-  width :1em;
-  padding: 1px;
-  cursor: default;
-  border: 1px solid;
-  border-color: ButtonHighlight ButtonShadow ButtonShadow ButtonHighlight;
-}
-
-.dialog .buttonColor .chooser, .dialog .buttonColor .nocolor {
-  height: 0.6em;
-  border: 1px solid;
-  padding: 0 1em;
-  border-color: ButtonShadow ButtonHighlight ButtonHighlight ButtonShadow;
-}
-
-.dialog .buttonClick {
-  border-color: ButtonShadow ButtonHighlight ButtonHighlight ButtonShadow;
-}
-.dialog .buttonColor-hilite {
-   border-color: ButtonShadow ButtonHighlight ButtonHighlight ButtonShadow;
-}
-
-.dialog .buttonColor .nocolor { padding: 0; }
-.dialog .buttonColor .nocolor-hilite { background-color: #fff; color: #f00; }
-
-.dialog .label { text-align: right; width: 6em; }
-.dialog .value input { width: 100%; }
-
-.dialog legend { font-weight: bold; }
-.dialog fieldset table { margin: 2px 0; }
- 
-.dialog  .buttons {
-
-      padding: 1em; 
-      text-align: center;
-}
-.dialog .resizeHandle {
-    -moz-appearance : resizer;
-    width: 12px;
-    height: 12px;
-    border-bottom: 2px solid #000;
-    border-right: 2px solid #000;
-    cursor : se-resize;
-}
-.popupwin {
-  padding: 0;
-  margin: 0;
-}
-
-.popupwin .title {
-  background: #fff;
-  color: #000;
-  font-weight: bold;
-  font-size: 120%;
-  padding: 3px 10px;
-  margin-bottom: 10px;
-  border-bottom: 1px solid black;
-  letter-spacing: 2px;
-}
-
-form { margin: 0; border: none; }
-
-
-/** Panels **/
-.htmlarea .panels_top
-{
-  border-bottom : 1px solid;
-  border-color: ButtonShadow;
-}
-
-.htmlarea .panels_right
-{
-  border-left : 1px solid;
-  border-color: ButtonShadow;
-}
-
-.htmlarea .panels_left
-{
-  border-right : 1px solid;
-  border-color: ButtonShadow;
-}
-
-.htmlarea .panels_bottom
-{
-  border-top : 1px solid;
-  border-color: ButtonShadow;
-}
-
-.htmlarea .panel h1 {
-  clear:left;
-  font-size:0.9em;
-}
-
-.htmlarea .panel { 
-  overflow:hidden; 
-  background-color:white;
-  padding-bottom:0 !IMPORTANT;
-  border: none !IMPORTANT;
-}
-.htmlarea .panels_left  .panel { border-right:none; border-left:none; }
-.htmlarea .panels_left  h1     { border-right:none;  }
-.htmlarea .panels_right .panel { border-right:none; border-left:none; }
-.htmlarea .panels_left  h1     { border-left:none;  }
-.htmlarea { border: 1px solid black; }
-
-.loading
-{
-  font-family:sans-serif;
-  position:absolute;
-  z-index:998;
-  text-align:center;
-  width:212px;
-  padding: 55px 0 5px 0;
-  border:2px solid #ccc;
-  /* border-color: ButtonHighlight ButtonShadow ButtonShadow ButtonHighlight;*/
-  background: url(images/xinha_logo.gif) no-repeat #fff center 5px;
-}
-.loading_main
-{
-  font-size:11px;
-  color:#000;
- 
-}
-.loading_sub
-{
-  font-size:9px;
-  color:#666;
-  text-align:center;
-}
-/* Classes for filemanager styles in a dialog. */
-.dialog a img
-{
-border: 0 none transparent;
-}
-
-.dialog fieldset.collapsed {
-border: 0 none transparent;
-}
-
-.dialog fieldset.collapsed form {
-display: none;
-}
-
-.hidden
-{
-display: none;
-}
 
 .placesmanager

trunk/skins/blue-look/skin.css

@@ -13 +13 @@
   margin:4px;
   height:25px;
+}
+
+.htmlarea .toolbarRow td.toolBarElement
+{
+  margin:0px; padding:0px;
 }