- allow tabindex in buttons and #1484171

2 files changed, 6 insertions, 6 deletions

diff --git a/program/include/rcube_template.php b/program/include/rcube_template.php
index 2173784b6..0c0a9211b 100755
--- a/program/include/rcube_template.php
+++ b/program/include/rcube_template.php
@@ -760,7 +760,7 @@ class rcube_template extends rcube_html_page
                 array(
                     'style', 'class', 'id', 'width',
                     'height', 'border', 'hspace',
-                    'vspace', 'align', 'alt',
+                    'vspace', 'align', 'alt', 'tabindex'
                 )
             );
             $btn_content = sprintf('<img src="%s"%s />', $this->abs_url($attrib['image']), $attrib_str);
@@ -771,7 +771,7 @@ class rcube_template extends rcube_html_page
         }
         else if ($attrib['type']=='link') {
             $btn_content = $attrib['label'] ? $attrib['label'] : $attrib['command'];
-            $link_attrib = array('href', 'onclick', 'title', 'id', 'class', 'style');
+            $link_attrib = array('href', 'onclick', 'title', 'id', 'class', 'style', 'tabindex');
         }
         else if ($attrib['type']=='input') {
             $attrib['type'] = 'button';
@@ -784,7 +784,7 @@ class rcube_template extends rcube_html_page
                 $attrib,
                 array(
                     'type', 'value', 'onclick',
-                    'id', 'class', 'style'
+                    'id', 'class', 'style', 'tabindex'
                 )
             );
             $out = sprintf('<input%s disabled="disabled" />', $attrib_str);
diff --git a/skins/default/templates/compose.html b/skins/default/templates/compose.html
index 25a3ef91f..a666bed90 100644
--- a/skins/default/templates/compose.html
+++ b/skins/default/templates/compose.html
@@ -133,12 +133,12 @@ function rcmail_prev_sibling(elm)
 <table border="0" cellspacing="0" width="100%" summary=""><tbody>
 <tr>
 <td>
-<roundcube:button type="input" command="send" class="button" label="sendmessage" />
-<roundcube:button type="input" command="list" class="button" label="cancel" />
+<roundcube:button type="input" command="send" class="button" label="sendmessage" tabindex="8" />
+<roundcube:button type="input" command="list" class="button" label="cancel" tabindex="9" />
 </td>
 <td align="right">
  <roundcube:label name="editortype" />:&nbsp;
- <span class="radios-left"><roundcube:object name="editorSelector" tabindex="9" /></span>
+ <span class="radios-left"><roundcube:object name="editorSelector" tabindex="10" /></span>
 </td>
 </tr>
 </tbody></table>