Changeset 700 for trunk/modules

Timestamp:

01/28/07 01:52:59 (13 years ago)

Author:

ray

Message:

Ticket #923 colorPicker face lift & localisation

Location:

trunk/modules

Files:

• ColorPicker/ColorPicker.js (modified) (12 diffs)
• FullScreen/full-screen.js (modified) (1 diff)

trunk/modules/ColorPicker/ColorPicker.js

@@ -77 +77 @@
    * }}}
    */
-
+  ColorPicker._pluginInfo =
+  {
+    name     : "colorPicker",
+    version  : "1.0",
+    developer: "James Sleeman",
+    developer_url: "http://www.gogo.co.nz/",
+    c_owner      : "Gogo Internet Services",
+    license      : "htmlArea",
+    sponsor      : "Gogo Internet Services",
+    sponsor_url  : "http://www.gogo.co.nz/"
+  };
+  function ColorPicker() 
+  {
+        // dummy function for Xinha plugin api, note the different names
+  }
+  //the actual function is below
   function colorPicker(params)
   {
@@ -102 +117 @@
     this.saved_cells = null;
     this.table = document.createElement('table');
+    this.table.className = "dialog";
     this.table.cellSpacing = this.table.cellPadding = 0;
     this.table.onmouseup = function()
@@ -111 +127 @@
     this.table.appendChild(this.tbody);
     this.table.style.border = '1px solid WindowFrame';
-    this.table.style.backgroundColor = '#fff';
     this.table.style.zIndex = '1000';
     // Add a title bar and close button
@@ -118 +133 @@
     var td = document.createElement('td');
     td.colSpan = this.side;
-    td.style.backgroundColor = '#ccc';
-    td.style.color = '#000';
+    td.className= "title";
     td.style.fontFamily = 'small-caption,caption,sans-serif';
     td.style.fontSize = 'x-small';
-    td.appendChild(document.createTextNode('Click a color...'));
+    td.appendChild(document.createTextNode(Xinha._lc('Click a color...')));
     td.style.borderBottom = '1px solid WindowFrame';
     tr.appendChild(td);
@@ -128 +142 @@
 
     var td = document.createElement('td');
+    td.className= "title";
     td.colSpan = 2;
-    td.style.backgroundColor = '#ccc'; //'ActiveCaption';
+    td.style.fontFamily = 'Tahoma,Verdana,sans-serif';
     td.style.borderBottom = '1px solid WindowFrame';
+    td.style.paddingRight = '0';
     tr.appendChild(td);
+    
 
     var but = document.createElement('div');
-    but.style.height = '12px';
-    but.style.width = '12px';
-    but.style.border = '2px outset';
+    but.title = Xinha._lc("Close");
+    but.className= 'buttonColor';
+    but.style.height = '11px';
+    but.style.width = '11px';
     but.style.cursor = 'pointer';
     but.onclick = function() { picker.close(); };
@@ -145 +163 @@
     but.style.cssFloat = 'right';
     but.style.styleFloat = 'right';
-    but.style.backgroundColor = '#eee';
+    but.style.padding = '0';
+    but.style.margin = '2px';
+    but.style.backgroundColor = 'transparent';
+    but.style.fontSize= '11px';
+    if ( !Xinha.is_ie) but.style.lineHeight= '9px'; // line-height:9px is better for centering the x, but IE cuts it off at the bottom :(
+    but.style.letterSpacing= '0';
+    
+        
     td.appendChild(but);
 
@@ -157 +182 @@
     this.chosenColor.type = 'text';
     this.chosenColor.maxLength = 7;
-    this.chosenColor.style.width = '56px';
+    this.chosenColor.style.width = '50px';
+    this.chosenColor.style.fontSize = '11px';
+    
     this.chosenColor.onchange = function()
       {
@@ -174 +201 @@
 
     this.foreSample = document.createElement('div');
-    this.foreSample.appendChild(document.createTextNode('Sample'));
+    this.foreSample.appendChild(document.createTextNode(Xinha._lc('Sample')));
     this.foreSample.style.fontWeight = 'bold';
     this.foreSample.style.fontFamily = 'small-caption,caption,sans-serif';
@@ -609 +636 @@
         var div = document.createElement('div');
         var label = document.createElement('label');
-        label.appendChild(document.createTextNode('Web Safe: '));
+        label.appendChild(document.createTextNode(Xinha._lc('Web Safe: ')));
 
         this.constrain_cb.onclick = function() { picker.pick_color(); };
@@ -624 +651 @@
         label.style.fontFamily = 'small-caption,caption,sans-serif';
         label.style.fontSize = 'x-small';
-        label.appendChild(document.createTextNode('Color: '));
+        label.appendChild(document.createTextNode(Xinha._lc('Color: ')));
         label.appendChild(this.chosenColor);
         div.appendChild(label);
         var but = document.createElement('span');
-        but.style.height = '12px';
+        but.className = "buttonColor ";
+        but.style.fontSize = '13px';
         but.style.width = '24px';
-        but.style.border = '2px outset';
-        but.style.backgroundColor = '#eee';
-        but.style.marginLeft = '6px';
+        but.style.marginLeft = '2px';
+        but.style.padding = '0px 4px';
         but.style.cursor = 'pointer';
         but.onclick = function() { colorPicker.remember(picker.chosenColor.value, picker.savecolors); picker.callback(picker.chosenColor.value); picker.close(); };
@@ -751 +778 @@
       @*/
     };
-
   }
 
@@ -794 +820 @@
   }
 };
+
+colorPicker._lc = function(string) {
+  return Xinha._lc(string);
+}

trunk/modules/FullScreen/full-screen.js

@@ -40 +40 @@
 
 FullScreen.prototype._lc = function(string) {
-    return HTMLArea._lc(string, {url : _editor_url + 'modules/FullScreen/lang/'});
+    return HTMLArea._lc(string, {url : _editor_url + 'modules/FullScreen/lang/',context:"FullScreen"});
 };