diff options
Diffstat (limited to 'program/include')
| -rw-r--r-- | program/include/rcmail.php | 9 | ||||
| -rw-r--r-- | program/include/rcmail_output_html.php | 33 |
2 files changed, 39 insertions, 3 deletions
diff --git a/program/include/rcmail.php b/program/include/rcmail.php index a9e717b86..1a227927e 100644 --- a/program/include/rcmail.php +++ b/program/include/rcmail.php @@ -1077,14 +1077,17 @@ class rcmail extends rcube } else { foreach ($table_data as $row_data) { - $class = !empty($row_data['class']) ? $row_data['class'] : ''; + $class = !empty($row_data['class']) ? $row_data['class'] : null; + if (!empty($attrib['rowclass'])) + $class = trim($class . ' ' . $attrib['rowclass']); $rowid = 'rcmrow' . rcube_utils::html_identifier($row_data[$id_col]); $table->add_row(array('id' => $rowid, 'class' => $class)); // format each col foreach ($a_show_cols as $col) { - $table->add($col, $this->Q(is_array($row_data[$col]) ? $row_data[$col][0] : $row_data[$col])); + $val = is_array($row_data[$col]) ? $row_data[$col][0] : $row_data[$col]; + $table->add($col, empty($attrib['ishtml']) ? $this->Q($val) : $val); } } } @@ -1490,7 +1493,7 @@ class rcmail extends rcube $html_name = $this->Q($foldername) . ($unread ? html::span('unreadcount', sprintf($attrib['unreadwrap'], $unread)) : ''); $link_attrib = $folder['virtual'] ? array() : array( 'href' => $this->url(array('_mbox' => $folder['id'])), - 'onclick' => sprintf("return %s.command('list','%s',this)", rcmail_output::JS_OBJECT_NAME, $js_name), + 'onclick' => sprintf("return %s.command('list','%s',this,event)", rcmail_output::JS_OBJECT_NAME, $js_name), 'rel' => $folder['id'], 'title' => $title, ); diff --git a/program/include/rcmail_output_html.php b/program/include/rcmail_output_html.php index 43d73a6b4..6594209f6 100644 --- a/program/include/rcmail_output_html.php +++ b/program/include/rcmail_output_html.php @@ -893,6 +893,14 @@ EOF; 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 @@ -1165,6 +1173,17 @@ EOF; $attrib['alt'] = html::quote($this->app->gettext($attrib['alt'], $attrib['domain'])); } + // set accessibility attributes + if (!$attrib['role']) { + $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'; + } + // set title to alt attribute for IE browsers if ($this->browser->ie && !$attrib['title'] && $attrib['alt']) { $attrib['title'] = $attrib['alt']; @@ -1353,6 +1372,20 @@ EOF; $is_empty = true; } + // set default page title + if (empty($this->pagetitle)) { + $this->pagetitle = 'Roundcube Mail'; + } + + // declare page language + if (!empty($_SESSION['language'])) { + $lang = substr($_SESSION['language'], 0, 2); + $output = preg_replace('/<html/', '<html lang="' . html::quote($lang) . '"', $output, 1); + if (!headers_sent()) { + header('Content-Language: ' . $lang); + } + } + // replace specialchars in content $page_title = html::quote($this->pagetitle); $page_header = ''; |