Merge branch 'tinymce4'

Conflicts:
	program/js/app.js
	program/js/editor.js
	program/js/tiny_mce/tiny_mce.js
	program/steps/utils/spell_html.inc

4 files changed, 124 insertions, 19 deletions

diff --git a/skins/classic/common.css b/skins/classic/common.css
index 1f6b25d5f..ddcf53a3a 100644
--- a/skins/classic/common.css
+++ b/skins/classic/common.css
@@ -606,6 +606,7 @@ img.uploading
   height: 16px;
 }
 
+
 /***** common table settings ******/
 
 table.records-table thead tr td
@@ -1220,3 +1221,122 @@ fieldset.tabbed
 .quota_text_high { color: white; }
 .quota_text_mid { color: #666; }
 .quota_text_low { color: #666; }
+
+
+/********** TinyMCE styles **********/
+.mce-btn-small button
+{
+  height: 22px;
+}
+
+.mce-btn-small i
+{
+  line-height: 16px !important;
+  vertical-align: text-top !important;
+}
+
+.mce-combobox button
+{
+    padding: 6px 8px !important;
+}
+
+.mce-tinymce,
+.mce-panel.mce-toolbar-grp
+{
+  border: 0 !important;
+}
+
+#image-selector-list
+{
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 152px;
+  height: 100%;
+  overflow-x: hidden;
+  overflow-y: auto;
+}
+
+#image-selector-form
+{
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  right: 0;
+  width: 150px;
+  border: 0;
+  border: 1px solid #FFF;
+  border-left: 1px solid #DDD;
+  background: url(images/filedrop.png) center bottom no-repeat;
+  text-align: center;
+  padding-top: 10px;
+}
+
+#image-upload-button
+{
+  width: 80%;
+  height: 30px;
+}
+
+#image-upload-button span
+{
+  position: absolute;
+  width: 100%;
+  text-align: center;
+  line-height: 30px;
+}
+
+#image-selector-list li
+{
+  line-height: 80px;
+  padding: 2px 0 2px 3px;
+  cursor: pointer;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+#image-selector-list li:hover
+{
+  background-color: #F0F0F0;
+}
+
+#image-selector-list ul li img
+{
+  vertical-align: middle;
+  max-height: 80px;
+}
+
+#image-selector-list ul li span.name
+{
+  vertical-align: middle;
+  font-weight: bold;
+  padding-left: 10px;
+  line-height: 80px;
+  vertical-align: middle;
+}
+
+#image-selector-list ul li span.img
+{
+  width: 80px;
+  text-align: center;
+  display: inline-block;
+  overflow: hidden;
+  line-height: 80px;
+  vertical-align: middle;
+}
+
+#image-selector-form.droptarget.hover
+{
+  background-color: #F0F0EE;
+  box-shadow: 0 0 5px 0 #999;
+  -moz-box-shadow: 0 0 5px 0 #999;
+  -o-box-shadow: 0 0 5px 0 #999;
+}
+
+div.mce-abs-end div.hint
+{
+  line-height: 50px;
+  padding-left: 10px;
+  color: #999;
+  text-shadow: 0 1px 1px #FFF;
+}
diff --git a/skins/classic/functions.js b/skins/classic/functions.js
index 3a8b1a002..b4f6ed766 100644
--- a/skins/classic/functions.js
+++ b/skins/classic/functions.js
@@ -557,10 +557,9 @@ resize_compose_body: function()
     w = div.width() - 2, h = div.height(),
     x = bw.ie || bw.opera ? 4 : 0;
 
-  $('#compose-body_tbl').width((w+3)+'px').height('');
-  $('#compose-body_ifr').width((w+3)+'px').height((h-54)+'px');
-  $('#compose-body').width((w-x)+'px').height(h+'px');
-  $('#googie_edit_layer').height(h+'px');
+  $('#compose-body_ifr').width(w+3).height(h-2 - $('div.mce-toolbar').height());
+  $('#compose-body').width(w-x).height(h);
+  $('#googie_edit_layer').height(h);
 },
 
 resize_compose_body_ev: function()
@@ -954,10 +953,7 @@ function percent_indicator(obj, data)
 };
 
 // Optional parameters used by TinyMCE
-var rcmail_editor_settings = {
-  skin: "default", // "default", "o2k7"
-  skin_variant: "" // "", "silver", "black"
-};
+var rcmail_editor_settings = {};
 
 var rcmail_ui;
 
diff --git a/skins/classic/images/filedrop.png b/skins/classic/images/filedrop.png
new file mode 100644
index 000000000..d4d455bdf
--- /dev/null
+++ b/skins/classic/images/filedrop.png
diff --git a/skins/classic/mail.css b/skins/classic/mail.css
index 29c9d1140..a0d1f17cd 100644
--- a/skins/classic/mail.css
+++ b/skins/classic/mail.css
@@ -1561,17 +1561,6 @@ div.hide-headers
   outline: none;
 }
 
-#compose-body_tbl,
-#compose-body_tbl td
-{
-  border: none;
-}
-
-#compose-body_tbl tr.mceFirst td.mceToolbar
-{
-  border-bottom: 1px solid #ccc;
-}
-
 #compose-headers
 {
   width: 100%;