diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2010-08-30 07:21:03 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2010-08-30 07:21:03 +0000 |
| commit | 8717e5314d76b81eb129d6bd0f7c957df22c0be5 (patch) | |
| tree | 6b5441867601a7fdaa3b8d635311bf83fbbdc547 | |
| parent | a7159a98674c6a966c132b3b875f8124b9ceb1b8 (diff) | |
- Show disabled checkboxes for protected folders instead of dots (#1485498)
git-svn-id: https://svn.roundcube.net/trunk@3920 208e9e7b-5314-0410-a742-e7e81cd9613c
| -rw-r--r-- | roundcubemail/CHANGELOG | 1 | ||||
| -rw-r--r-- | roundcubemail/program/steps/settings/manage_folders.inc | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG index 61d434d12..79f4ce47a 100644 --- a/roundcubemail/CHANGELOG +++ b/roundcubemail/CHANGELOG @@ -16,6 +16,7 @@ CHANGELOG RoundCube Webmail - Display inline images with known extensions and non-image content-type (#1486934) - Fix "Threaded" checkbox after subfolder creation (#1486928) - Fix timezone string in sent mail (#1486961) +- Show disabled checkboxes for protected folders instead of dots (#1485498) RELEASE 0.4 ----------- diff --git a/roundcubemail/program/steps/settings/manage_folders.inc b/roundcubemail/program/steps/settings/manage_folders.inc index f19d855ac..666447802 100644 --- a/roundcubemail/program/steps/settings/manage_folders.inc +++ b/roundcubemail/program/steps/settings/manage_folders.inc @@ -292,8 +292,8 @@ function rcube_subscription_form($attrib) $table->add('name', Q($display_folder)); $table->add('msgcount', ($folder['virtual'] ? '' : $IMAP->messagecount($folder['id'], 'ALL', false, false))); - $table->add('subscribed', ($protected || $folder['virtual']) ? ($subscribed ? ' •' : ' ') : - $checkbox_subscribe->show(($subscribed ? $folder_utf8 : ''), array('value' => $folder_utf8))); + $table->add('subscribed', $checkbox_subscribe->show(($subscribed ? $folder_utf8 : ''), + array('value' => $folder_utf8, 'disabled' => $protected ? 'disabled' : ''))); if ($threading_supported) { $table->add('threaded', $folder['virtual'] ? '' : $checkbox_threaded->show(($threaded ? $folder_utf8 : ''), array('value' => $folder_utf8))); |