From 3412e50b54e3daac8745234e21ab6e72be0ed165 Mon Sep 17 00:00:00 2001 From: Thomas Bruederli <thomas@roundcube.net> Date: Wed, 04 Jun 2014 11:20:33 -0400 Subject: [PATCH] Fix attachment menu structure and aria-attributes --- program/include/rcmail_output_html.php | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/program/include/rcmail_output_html.php b/program/include/rcmail_output_html.php index ff660a4..e8b5c98 100644 --- a/program/include/rcmail_output_html.php +++ b/program/include/rcmail_output_html.php @@ -858,6 +858,14 @@ return ''; } + // localize title and summary attributes + if ($command != 'button' && !empty($attrib['title']) && $this->app->text_exists($attrib['title'])) { + $attrib['title'] = $this->app->gettext($attrib['title']); + } + if ($command != 'button' && !empty($attrib['summary']) && $this->app->text_exists($attrib['summary'])) { + $attrib['summary'] = $this->app->gettext($attrib['summary']); + } + // execute command switch ($command) { // return a button @@ -1135,6 +1143,8 @@ $attrib['role'] = 'button'; } if (!empty($attrib['class']) && !empty($attrib['classact']) || !empty($attrib['imagepas']) && !empty($attrib['imageact'])) { + if (array_key_exists('tabindex', $attrib)) + $attrib['data-tabindex'] = $attrib['tabindex']; $attrib['tabindex'] = '-1'; // disable button by default $attrib['aria-disabled'] = 'true'; } -- Gitblit v1.9.1