Removed image buttons from message view and replaced with textual button.

3 files changed, 25 insertions, 15 deletions

diff --git a/roundcubemail/program/localization/en_US/labels.inc b/roundcubemail/program/localization/en_US/labels.inc
index bc250100e..0dca19737 100644
--- a/roundcubemail/program/localization/en_US/labels.inc
+++ b/roundcubemail/program/localization/en_US/labels.inc
@@ -180,6 +180,7 @@ $labels['buttonbarforward'] = 'Forward';
 $labels['buttonbarmove'] = 'Move';
 $labels['buttonbarcopy'] = 'Copy';
 $labels['buttonbarnotspam'] = 'Not Spam';
+$labels['buttonviewsource'] = 'Source';
 
 $labels['archivemessages'] = 'Move to archives folder';
 $labels['movemessages'] = 'Move to selected folder';
diff --git a/roundcubemail/skins/npk/mail.css b/roundcubemail/skins/npk/mail.css
index acb68c2b9..b57070670 100644
--- a/roundcubemail/skins/npk/mail.css
+++ b/roundcubemail/skins/npk/mail.css
@@ -98,6 +98,15 @@
   font-size: x-small;
 }
 
+.testme {
+  background: none;
+  border: 0;
+  border-color: 0;
+  margin: 0;
+  padding: 0;
+  font-size: x-small;
+}
+
 #messagecontrols
 {
   position: absolute;
diff --git a/roundcubemail/skins/npk/templates/message.html b/roundcubemail/skins/npk/templates/message.html
index f25bcf489..3e7b74841 100644
--- a/roundcubemail/skins/npk/templates/message.html
+++ b/roundcubemail/skins/npk/templates/message.html
@@ -18,27 +18,27 @@
 <roundcube:include file="/includes/taskbar.html" />
 <roundcube:include file="/includes/header.html" />
 
-<div id="messagecountbar">
+<div id="messagetoolbar">
+
+<ul id="actionmenu">
+<li style="margin-right: 2em;"><roundcube:button name="archivemessage" id="archivemessage" type="link" label="buttonbararchive" image="NONE" title="archivemessage" onclick="rcmail.command('moveto', 'archives')" title="archivemessages" /></li>
+<li><roundcube:button command="compose" type="link" label="buttonbarcompose" title="writenewmessage" /></li>
+<li><roundcube:button command="reply" type="link" label="buttonbarreply" title="replytomessage" /></li>
+<li><roundcube:button command="reply-all" type="link" label="buttonbarreplyall" title="replytoallmessage" /></li>
+<li><roundcube:button command="forward" type="link" label="buttonbarforward" title="forwardmessage" /></li>
+<li><roundcube:button command="viewsource" type="link" label="buttonviewsource" title="viewsource" /></li>
+<li id="hamnotspamli" style="display: none"><roundcube:button name="hamnotspambutton" id="hamnotspambutton" type="link" label="buttonbarnotspam" title="notspammessages" onclick="rcmail.command('copyto','INBOX',this);rcmail.command('moveto','HamNotSpam',this)" /></li>
+
+<li style="background: transparent; border: 0;">
+&nbsp;&nbsp;
 <roundcube:button command="firstmessage" imageSel="/images/buttons/first_sel.png" imageAct="/images/buttons/first_act.png" imagePas="/images/buttons/first_pas.png" width="11" height="11" title="firstmessage" />
 <roundcube:button command="previousmessage" imageSel="/images/buttons/previous_sel.png" imageAct="/images/buttons/previous_act.png" imagePas="/images/buttons/previous_pas.png" width="11" height="11" title="previousmessage" />
 &nbsp;<roundcube:object name="messageCountDisplay" />&nbsp;
 <roundcube:button command="nextmessage" imageSel="/images/buttons/next_sel.png" imageAct="/images/buttons/next_act.png" imagePas="/images/buttons/next_pas.png" width="11" height="11" title="nextmessage" />
 <roundcube:button command="lastmessage" imageSel="/images/buttons/last_sel.png" imageAct="/images/buttons/last_act.png" imagePas="/images/buttons/last_pas.png" width="11" height="11" title="lastmessage" />
-</div>
-
-<div id="messagetoolbar">
-<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="compose" imageSel="/images/buttons/compose_sel.png" imageAct="/images/buttons/compose_act.png" imagePas="/images/buttons/compose_pas.png" width="32" height="32" title="writenewmessage" />
-<roundcube:button command="reply" imageSel="/images/buttons/reply_sel.png" imageAct="/images/buttons/reply_act.png" imagePas="/images/buttons/reply_pas.png" width="32" height="32" title="replytomessage" />
-<roundcube:button command="reply-all" imageSel="/images/buttons/replyall_sel.png" imageAct="/images/buttons/replyall_act.png" imagePas="/images/buttons/replyall_pas.png" width="32" height="32" title="replytoallmessage" />
-<roundcube:button command="forward" imageSel="/images/buttons/forward_sel.png" imageAct="/images/buttons/forward_act.png" imagePas="/images/buttons/forward_pas.png" width="32" height="32" title="forwardmessage" />
-<roundcube:button command="delete" imageSel="/images/buttons/delete_sel.png" imageAct="/images/buttons/delete_act.png" imagePas="/images/buttons/delete_pas.png" width="32" height="32" title="deletemessage" />
-<roundcube:button command="print" imageSel="/images/buttons/print_sel.png" imageAct="/images/buttons/print_act.png" imagePas="/images/buttons/print_pas.png" width="32" height="32" title="printmessage" />
-<roundcube:button command="viewsource" imageSel="/images/buttons/source_sel.png" imageAct="/images/buttons/source_act.png" imagePas="/images/buttons/source_pas.png" width="32" height="32" title="viewsource" />
-<roundcube:object name="mailboxlist" type="select" noSelection="moveto" maxlength="25" onchange="rcmail.command('moveto', this.options[this.selectedIndex].value)" class="mboxlist" />
-
+</li>
 
-<roundcube:object name="mailboxlist" type="select" noSelection="copyto" maxlength="25" onchange="rcmail.command('copyto', this.options[this.selectedIndex].value)" class="copy_mboxlist" />
+</ul>
 
 </div>