diff options
| author | alecpl <alec@alec.pl> | 2012-02-13 08:39:39 +0000 |
|---|---|---|
| committer | alecpl <alec@alec.pl> | 2012-02-13 08:39:39 +0000 |
| commit | 06c990ead24edee69f07912f8169a0422c411422 (patch) | |
| tree | 81f2c69b23f3756e9faaf78030da1717cff2fda4 /program/steps | |
| parent | bf9ddec776715fd8732a23a1dd0b25b660ed5439 (diff) | |
- Added mailto: protocol handler registration link in User Preferences (#1486580)
Diffstat (limited to 'program/steps')
| -rw-r--r-- | program/steps/settings/edit_prefs.inc | 9 | ||||
| -rw-r--r-- | program/steps/settings/func.inc | 13 |
2 files changed, 19 insertions, 3 deletions
diff --git a/program/steps/settings/edit_prefs.inc b/program/steps/settings/edit_prefs.inc index 6e03b0808..d0abb2843 100644 --- a/program/steps/settings/edit_prefs.inc +++ b/program/steps/settings/edit_prefs.inc @@ -51,8 +51,13 @@ function rcmail_user_prefs_form($attrib) if ($option['advanced']) $table->set_row_attribs('advanced'); - $table->add('title', $option['title']); - $table->add(null, $option['content']); + if (isset($option['title'])) { + $table->add('title', $option['title']); + $table->add(null, $option['content']); + } + else { + $table->add(array('colspan' => 2), $option['content']); + } } $out .= html::tag('fieldset', null, html::tag('legend', null, $block['name']) . $table->show($attrib)); diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc index 35e015dc8..fc836ed50 100644 --- a/program/steps/settings/func.inc +++ b/program/steps/settings/func.inc @@ -159,7 +159,8 @@ function rcmail_user_prefs($current=null) case 'general': $blocks = array( - 'main' => array('name' => Q(rcube_label('mainoptions'))), + 'main' => array('name' => Q(rcube_label('mainoptions'))), + 'browser' => array('name' => Q(rcube_label('browseroptions'))), ); // language selection @@ -263,6 +264,16 @@ function rcmail_user_prefs($current=null) } } + $product_name = $RCMAIL->config->get('product_name', 'Roundcube Webmail'); + $RCMAIL->output->add_script(sprintf("%s.check_protocol_handler('%s', '#mailtoprotohandler');", + JS_OBJECT_NAME, JQ($product_name)), 'foot'); + + $blocks['browser']['options']['mailtoprotohandler'] = array( + 'content' => html::a(array( + 'href' => '#', + 'id' => 'mailtoprotohandler'), Q(rcube_label('mailtoprotohandler'))), + ); + break; // Mailbox view (mail screen) |