Changeset 1141

Timestamp:

12/01/08 14:28:31 (4 years ago)

Author:

ray

Message:

* #1348 spice up dialog appearance with some CSS3 eyecandy
* add nice Tango icon for SuperClean
* use original icon for SmartReplace? again

Location:

trunk

Files:

• Xinha.css (modified) (4 diffs)
• XinhaCore.js (modified) (1 diff)
• iconsets/Tango/ed_buttons_main.png (modified) (previous)
• iconsets/Tango/iconset.xml (modified) (1 diff)
• images/ed_buttons_main.png (modified) (previous)
• modules/Dialogs/XinhaDialog.js (modified) (2 diffs)
• plugins/SmartReplace/SmartReplace.js (modified) (1 diff)
• plugins/SmartReplace/img/smartquotes.gif (deleted)
• plugins/SuperClean/SuperClean.js (modified) (1 diff)

trunk/Xinha.css

@@ -13 +13 @@
   border-color: ButtonHighlight ButtonShadow ButtonShadow ButtonHighlight;
 }
-.htmlarea .toolbar table { margin: 0; font-family: tahoma,verdana,sans-serif; font-size: 11px; }
+.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; }
@@ -120 +120 @@
 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: 4px 4px 5px #888;
+  -moz-box-shadow: 4px 4px 5px #888;
+  -webkit-box-shadow: 4px 4px 5px #888;
+}
+div.dialog.modal {
+  box-shadow: 9px 9px 10px #444;
+  -moz-box-shadow: 9px 9px 10px #444;
+  -webkit-box-shadow: 9px 9px 10px #444;
+}
+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 {
@@ -164 +189 @@
   letter-spacing: 0.01em;
 }
-.dialog h1 { margin:0;}
+.dialog h1 { 
+  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;
@@ -241 +277 @@
     border-bottom: 2px solid #000;
     border-right: 2px solid #000;
-    cursor : nw-resize;
+    cursor : se-resize;
 }
 .popupwin {

trunk/XinhaCore.js

@@ -155 +155 @@
 */
 Xinha.is_safari  = (Xinha.agt.indexOf("safari") != -1);
+
+/** Browser is Google Chrome
+@type string 
+*/
+Xinha.is_chrome = (Xinha.agt.indexOf("chrome") != -1);
+
 /** OS is MacOS
 @type string 

trunk/iconsets/Tango/iconset.xml

@@ -230 +230 @@
       </default>
     </icon>
-    <icon id="smartreplace">
-      <default type="map">
-        <path>iconsets/Tango/ed_buttons_main.png</path>
-        <x>3</x>
-        <y>8</y>
-      </default>
-    </icon>
-
   </icons>
 </iconset>

trunk/modules/Dialogs/XinhaDialog.js

@@ -172 +172 @@
   // rootElem.style.MozUserSelect = "none";
   
-  rootElem.className = 'dialog';
+  rootElem.className = 'dialog' + (this.modal ? ' modal' : ' modeless');
+  if (Xinha.is_chrome) rootElem.className += ' chrome'; // Hack because border-raadius & box-shadow don't go well together in chrome
   
  // this.background[1].appendChild(rootElem);
@@ -683 +684 @@
   var rootElemStyle = dialog.rootElem.style;
   
-  dialog.size.top  = dialog.rootElem.style.top;
-  dialog.size.left = dialog.rootElem.style.left;
+  dialog.size.top  = rootElemStyle.top;
+  dialog.size.left = rootElemStyle.left;
   
   if (!this.modal)

trunk/plugins/SmartReplace/SmartReplace.js

@@ -15 +15 @@
                 id       : "smartreplace",
                 tooltip  : this._lc("SmartReplace"),
-                image    : Xinha.getPluginDir('SmartReplace')+"/img/smartquotes.png",
+                image    : [_editor_url +'iconsets/Tango/ed_buttons_main.png',3,8],
                 textMode : false,
                 action   : function(e, objname, obj) { self.buttonPress(null, obj); }

trunk/plugins/SuperClean/SuperClean.js

@@ -7 +7 @@
   var superclean = this;
   editor._superclean_on = false;
-  editor.config.registerButton('superclean', this._lc("Clean up HTML"), editor.imgURL('ed_superclean.gif', 'SuperClean'), true, function(e, objname, obj) { superclean._superClean(null, obj); });
+  editor.config.registerButton('superclean', this._lc("Clean up HTML"), [_editor_url +'iconsets/Tango/ed_buttons_main.png',6,4], true, function(e, objname, obj) { superclean._superClean(null, obj); });
 
   // See if we can find 'killword' and replace it with superclean