From 2dfa10442e4eb437375eced99b500129d5160b04 Mon Sep 17 00:00:00 2001
From: Nathan Kinkade <nkinkade@nkinka.de>
Date: Thu, 12 Mar 2009 01:49:57 +0000
Subject: Replaced image buttons on compose screen with texual buttons.

---
 .../program/localization/en_US/labels.inc          |  5 ++++-
 roundcubemail/skins/npk/templates/compose.html     | 23 ++++++++--------------
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/roundcubemail/program/localization/en_US/labels.inc b/roundcubemail/program/localization/en_US/labels.inc
index 0dca19737..ad4fd8b9c 100644
--- a/roundcubemail/program/localization/en_US/labels.inc
+++ b/roundcubemail/program/localization/en_US/labels.inc
@@ -180,7 +180,10 @@ $labels['buttonbarforward'] = 'Forward';
 $labels['buttonbarmove'] = 'Move';
 $labels['buttonbarcopy'] = 'Copy';
 $labels['buttonbarnotspam'] = 'Not Spam';
-$labels['buttonviewsource'] = 'Source';
+$labels['buttonbarviewsource'] = 'Source';
+$labels['buttonbarback'] = 'Back';
+$labels['buttonbarsend'] = 'Send';
+$labels['buttonbarspellcheck'] = 'Spellcheck';
 
 $labels['archivemessages'] = 'Move to archives folder';
 $labels['movemessages'] = 'Move to selected folder';
diff --git a/roundcubemail/skins/npk/templates/compose.html b/roundcubemail/skins/npk/templates/compose.html
index 73e657594..8797d2154 100644
--- a/roundcubemail/skins/npk/templates/compose.html
+++ b/roundcubemail/skins/npk/templates/compose.html
@@ -15,21 +15,14 @@
 <form name="form" action="./" method="post">
 
 <div id="messagetoolbar">
-<table border="0" cellspacing="0" cellpadding="0"><tr>
-    <td id="compose-toolbar">
-	<roundcube:button command="list" image="/images/buttons/back_act.png" imageSel="/images/buttons/back_sel.png" imageAct="/images/buttons/back_act.png" width="32" height="32" title="backtolist" />
-	<roundcube:button command="send" imageSel="/images/buttons/send_sel.png" imageAct="/images/buttons/send_act.png" imagePas="/images/buttons/send_pas.png" width="32" height="32" title="sendmessage" />
-	<roundcube:button command="spellcheck" imageSel="/images/buttons/spellcheck_sel.png" imageAct="/images/buttons/spellcheck_act.png" imagePas="/images/buttons/spellcheck_pas.png" width="32" height="32" title="checkspelling" />
-	<roundcube:button command="add-attachment" imageSel="/images/buttons/attach_sel.png" imageAct="/images/buttons/attach_act.png" imagePas="/images/buttons/attach_pas.png" width="32" height="32" title="addattachment" />
-	<roundcube:button command="savedraft" imageSel="/images/buttons/drafts_sel.png" imageAct="/images/buttons/drafts_act.png" imagePas="/images/buttons/drafts_pas.png" width="32" height="32" title="savemessage" />
-    </td>
-    <td id="priority-selector">
-	<label for="rcmcomposepriority"><roundcube:label name="priority" />:</label>&nbsp;<roundcube:object name="prioritySelector" form="form" id="rcmcomposepriority" />
-    </td>
-    <td id="receipt-selector">
-	<roundcube:object name="receiptCheckBox" form="form" id="rcmcomposereceipt" />&nbsp;<label for="rcmcomposereceipt"><roundcube:label name="returnreceipt" /></label>
-    </td>
-</tr></table>
+  <ul id="actionmenu">
+    <li><roundcube:button command="list" type="link" label="buttonbarback" title="backtolist" /></li>&nbsp;&nbsp;
+    <li><roundcube:button command="send" type="link" label="buttonbarsend" title="sendmessage" /></li>
+    <li><roundcube:button command="spellcheck" type="link" label="buttonbarspellcheck" title="checkspelling" /></li>
+    <li><roundcube:button command="savedraft" type="link" label="save" title="savemessage" /></li>&nbsp;&nbsp;
+    <span><label for="rcmcomposepriority"><roundcube:label name="priority" />:</label>&nbsp;<roundcube:object name="prioritySelector" form="form" id="rcmcomposepriority" /></span>&nbsp;&nbsp;
+    <roundcube:object name="receiptCheckBox" form="form" id="rcmcomposereceipt" />&nbsp;<label for="rcmcomposereceipt"><roundcube:label name="returnreceipt" /></label>
+  </ul>
 </div>
 
 <div id="compose-container">
-- 
cgit v1.2.3