Changeset 01538da in github

Timestamp:

Aug 30, 2010 3:21:03 AM (3 years ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

1d8cbca

Parents:

b0d46b1

Message:

• Show disabled checkboxes for protected folders instead of dots (#1485498)

Files:

• CHANGELOG (modified) (1 diff)
• program/steps/settings/manage_folders.inc (modified) (1 diff)

CHANGELOG

@@ -17 +17 @@
 - 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

program/steps/settings/manage_folders.inc

@@ -293 +293 @@
     $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'] ? '' :