From 01538da5801d425e32121865a0bcbb28c539aa81 Mon Sep 17 00:00:00 2001 From: alecpl Date: Mon, 30 Aug 2010 07:21:03 +0000 Subject: - Show disabled checkboxes for protected folders instead of dots (#1485498) --- CHANGELOG | 1 + program/steps/settings/manage_folders.inc | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 61d434d12..79f4ce47a 100644 --- a/CHANGELOG +++ b/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/program/steps/settings/manage_folders.inc b/program/steps/settings/manage_folders.inc index f19d855ac..666447802 100644 --- a/program/steps/settings/manage_folders.inc +++ b/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))); -- cgit v1.2.3