diff options
author | Aleksander Machniak <alec@alec.pl> | 2013-03-15 10:30:53 +0100 |
---|---|---|
committer | Aleksander Machniak <alec@alec.pl> | 2013-03-15 10:30:53 +0100 |
commit | a02c77c584906f629d382409e76f0df4d2cfaf01 (patch) | |
tree | ad7fdd393e02b4be1dc2d49db3cfe59614b97049 /skins | |
parent | 0ef894ec2949100aee8624701edbf38087ea9047 (diff) |
Add ability to toggle between view as HTML and text while viewing a message (#1486939)
Diffstat (limited to 'skins')
-rw-r--r-- | skins/classic/images/icons/html.png | bin | 0 -> 379 bytes | |||
-rw-r--r-- | skins/classic/images/icons/text.png | bin | 0 -> 372 bytes | |||
-rw-r--r-- | skins/classic/mail.css | 19 | ||||
-rw-r--r-- | skins/classic/templates/message.html | 8 | ||||
-rw-r--r-- | skins/classic/templates/messagepreview.html | 10 |
5 files changed, 30 insertions, 7 deletions
diff --git a/skins/classic/images/icons/html.png b/skins/classic/images/icons/html.png Binary files differnew file mode 100644 index 000000000..3f022f678 --- /dev/null +++ b/skins/classic/images/icons/html.png diff --git a/skins/classic/images/icons/text.png b/skins/classic/images/icons/text.png Binary files differnew file mode 100644 index 000000000..94891be80 --- /dev/null +++ b/skins/classic/images/icons/text.png diff --git a/skins/classic/mail.css b/skins/classic/mail.css index 4d42d98ff..7c350ca3d 100644 --- a/skins/classic/mail.css +++ b/skins/classic/mail.css @@ -1312,20 +1312,27 @@ div.message-htmlpart div.rcmBody text-decoration: underline; } -#openextwinlink +#messagelinks { position: absolute; top: 8px; right: 10px; - width: 15px; - height: 15px; - border: 0; + height: 16px; + text-align: right; +} + +#messageframe #messagelinks +{ + top: 2px; + right: 2px; } #compose-headers #openextwinlink { - top: 4px; - right: 2px; + position: absolute; + height: 15px; + top: 4px; + right: 2px; } #full-headers diff --git a/skins/classic/templates/message.html b/skins/classic/templates/message.html index 73dfcb976..11e58c711 100644 --- a/skins/classic/templates/message.html +++ b/skins/classic/templates/message.html @@ -39,6 +39,14 @@ <div id="messageframe"> <div class="boxlistcontent" style="top:0; overflow-x:auto"> + <div id="messagelinks"> + <roundcube:if condition="env:optional_format=='text'" /> + <roundcube:button command="change-format" prop="text" image="/images/icons/text.png" width="15" height="15" title="changeformattext" id="changeformattext" /> + <roundcube:endif /> + <roundcube:if condition="env:optional_format=='html'" /> + <roundcube:button command="change-format" prop="html" image="/images/icons/html.png" width="15" height="15" title="changeformathtml" id="changeformathtml" /> + <roundcube:endif /> + </div> <roundcube:object name="messageHeaders" class="headers-table" cellspacing="0" cellpadding="2" addicon="/images/icons/silhouette.png" summary="Message headers" /> <roundcube:object name="messageFullHeaders" id="full-headers" /> <roundcube:object name="messageAttachments" id="attachment-list" /> diff --git a/skins/classic/templates/messagepreview.html b/skins/classic/templates/messagepreview.html index 935238edf..80dbe381a 100644 --- a/skins/classic/templates/messagepreview.html +++ b/skins/classic/templates/messagepreview.html @@ -9,7 +9,15 @@ <body class="iframe" onload="rcube_init_mail_ui()"> <div class="messageheaderbox"> -<roundcube:button command="extwin" image="/images/icons/extwin.png" width="15" height="15" title="openinextwin" id="openextwinlink" /> + <div id="messagelinks"> + <roundcube:if condition="env:optional_format=='text'" /> + <roundcube:button command="change-format" prop="text" image="/images/icons/text.png" width="15" height="15" title="changeformattext" id="changeformattext" /> + <roundcube:endif /> + <roundcube:if condition="env:optional_format=='html'" /> + <roundcube:button command="change-format" prop="html" image="/images/icons/html.png" width="15" height="15" title="changeformathtml" id="changeformathtml" /> + <roundcube:endif /> + <roundcube:button command="extwin" image="/images/icons/extwin.png" width="15" height="15" title="openinextwin" id="openextwinlink" /> + </div> <roundcube:object name="messageHeaders" class="headers-table" cellspacing="0" cellpadding="2" addicon="/images/icons/silhouette.png" summary="Message headers" /> <roundcube:object name="messageFullHeaders" id="full-headers" /> <roundcube:object name="messageAttachments" id="attachment-list" /> |