- jQuery'fied GoogieSpell 4.0 + some changes in compose

4 files changed, 49 insertions, 24 deletions

diff --git a/skins/default/common.css b/skins/default/common.css
index 4e520fff5..a01985413 100644
--- a/skins/default/common.css
+++ b/skins/default/common.css
@@ -286,11 +286,6 @@ a.button-logout
   background-image: url(images/listheader_aqua.gif);
 }
 
-.radios-left label
-{
-  padding-left: 0.3em;
-}
-
 /***** common table settings ******/
 
 table.records-table thead tr td
diff --git a/skins/default/googiespell.css b/skins/default/googiespell.css
index f6ee59fd5..02314f355 100644
--- a/skins/default/googiespell.css
+++ b/skins/default/googiespell.css
@@ -12,6 +12,20 @@
   visibility: hidden;
 }
 
+.googie_edit_layer {
+  border: 1px solid #666666;
+  background-color: #ffffff;
+  padding: 1px 4px;
+  margin: 1px 0px;
+  font-size: 9pt;
+  font-family: "Courier New", Courier, monospace;
+}
+
+.googie_edit_layer span {
+  font-size: 9pt;
+  font-family: "Courier New", Courier, monospace;
+}
+
 .googie_list {
   width: 100%;
   margin: 0;
@@ -62,34 +76,33 @@
   cursor: pointer;
 }
 
-.googie_resume_editing,
-.googie_check_spelling_link {
+.googie_check_spelling_link {  
   color: #CC0000;
   font-size: 11px;
   text-decoration: none;
   cursor: pointer;
 }
 
-.googie_resume_editing:hover,
 .googie_check_spelling_link:hover {
   text-decoration: underline;
 }
 
-.googie_resume_editing {
-  color: green;
-}
-
 .googie_no_style {
   text-decoration: none;
 }
 
-.googie_check_spelling_ok {
+.googie_check_spelling_ok, 
+.googie_resume_editing {
   color: green;
   font-size: 11px;
-  text-decoration: underline;
   cursor: pointer;
 }
 
+.googie_check_spelling_ok:hover,
+.googie_resume_editing:hover {
+  text-decoration: underline;
+}
+
 .googie_lang_3d_click img {
   vertical-align: middle;
   border-top: 1px solid #555;
diff --git a/skins/default/mail.css b/skins/default/mail.css
index c66998dd9..93c63de0f 100644
--- a/skins/default/mail.css
+++ b/skins/default/mail.css
@@ -19,11 +19,13 @@
   padding-right: 10px;
 }
 
-#messagetoolbar select
+#messagetoolbar select,
+#compose-container select
 {
   font-family: "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;
   font-size: 11px;
   color: #333333;
+  height: 21px;
 }
 
 #messagetoolbar select.mboxlist
@@ -913,6 +915,7 @@ div.message-htmlpart div.rcmBody
 #receipt-selector
 {
   padding-left: 30px;
+  white-space: nowrap;
 }
 
 #compose-container
@@ -928,13 +931,25 @@ div.message-htmlpart div.rcmBody
   height: expression((parseInt(document.documentElement.clientHeight)-120)+'px');
 }
 
+#spellcheck-control
+{
+  text-align: right;
+  padding-top: 3px;
+}
+
+#editor-select
+{
+  float: left;
+}
+
 #compose-div
 {
   position: absolute;
-  top: 110px;
-  bottom: 40px;
+  top: 130px;
+  bottom: 30px;
   width: 100%;
   vertical-align: top;
+  padding-top: 2px;
 }
 
 #compose-headers
diff --git a/skins/default/templates/compose.html b/skins/default/templates/compose.html
index 73e657594..99a4185b2 100644
--- a/skins/default/templates/compose.html
+++ b/skins/default/templates/compose.html
@@ -66,24 +66,26 @@
 	    </tr><tr>
 		<td class="title"><label for="compose-subject"><roundcube:label name="subject" /></label></td>
 		<td><roundcube:object name="composeSubject" id="compose-subject" form="form" tabindex="6" /></td>
+	    </tr><tr>
+		<td class="title"><roundcube:label name="editortype" /></td>
+		<td>
+		    <div id="editor-select"><roundcube:object name="editorSelector" editorid="compose-body" tabindex="7" /></div>
+		    <div id="spellcheck-control"></div>
+		</td>
 	    </tr>
 	</tbody>
 	</table>
     </div>
     <div id="compose-div">
-	<roundcube:object name="composeBody" id="compose-body" form="form" cols="70" rows="20" tabindex="7" />
+	<roundcube:object name="composeBody" id="compose-body" form="form" cols="70" rows="20" tabindex="8" />
 	<table border="0" cellspacing="0" summary="" style="width:100%; margin-top: 5px;"><tbody>
 	    <tr>
 		<td style="white-space: nowrap">
 		    <roundcube:button type="input" command="send" class="button mainaction" label="sendmessage" tabindex="8" />
 		    <roundcube:button type="input" command="list" class="button" label="cancel" tabindex="9" />
 		</td>
-		<td style="text-align:center; white-space: nowrap">
-		    <label><roundcube:label name="savesentmessagein" />: <roundcube:object name="storetarget" maxlength="30" /></label>
-		</td>
-		<td style="text-align:right; white-space:nowrap">
-		    <roundcube:label name="editortype" />:&nbsp;
-		    <span class="radios-left"><roundcube:object name="editorSelector" editorid="compose-body" tabindex="10" /></span>
+		<td style="text-align:right; white-space: nowrap">
+		    <label><roundcube:label name="savesentmessagein" />: <roundcube:object name="storetarget" maxlength="30" tabindex="10" /></label>
 		</td>
 	    </tr>
 	</tbody></table>