Changeset 3137 in subversion

Timestamp:

Nov 25, 2009 10:01:49 AM (3 years ago)

Author:

alec

Message:

• disable threads switch if server doesn't support THREADS

Location:

branches/devel-threads

Files:

• program/steps/mail/func.inc (modified) (1 diff)
• skins/default/common.css (modified) (1 diff)
• skins/default/templates/mail.html (modified) (2 diffs)

branches/devel-threads/program/steps/mail/func.inc

@@ -99 +99 @@
   $OUTPUT->set_env('delimiter', $IMAP->get_hierarchy_delimiter());
   $OUTPUT->set_env('threading', (bool) $IMAP->threading);
+  $OUTPUT->set_env('threads', $IMAP->threading
+        || $IMAP->get_capability('thread=references')
+        || $IMAP->get_capability('thread=orderedsubject')
+        || $IMAP->get_capability('thread=refs')  
+  );
 
   if ($CONFIG['flag_for_deletion'])

branches/devel-threads/skins/default/common.css

@@ -598 +598 @@
   padding-top: 2px;
 }
+
+.disabled
+{
+  color: #999;
+}

branches/devel-threads/skins/default/templates/mail.html

@@ -155 +155 @@
 <div><roundcube:label name="listcolumns" /></div>
   <ul class="toolbarmenu">
-    <li><input type="checkbox" name="list_col[]" value="subject" id="cols_subject" checked="checked" disabled="disabled" /><label for="cols_subject"><roundcube:label name="subject" /></label></li>
+    <li><input type="checkbox" name="list_col[]" value="subject" id="cols_subject" checked="checked" disabled="disabled" /><label for="cols_subject" class="disabled"><roundcube:label name="subject" /></label></li>
     <li><input type="checkbox" name="list_col[]" value="from" id="cols_fromto" /><label for="cols_fromto"><roundcube:label name="fromto" /></label></li>
     <li><input type="checkbox" name="list_col[]" value="replyto" id="cols_replyto" /><label for="cols_replyto"><roundcube:label name="replyto" /></label></li>
@@ -183 +183 @@
   <ul class="toolbarmenu">
     <li><input type="radio" name="view" value="list" id="view_default" /><label for="view_default"><roundcube:label name="nonedefault" /></label></li>
+    <roundcube:if condition="env:threads" />
     <li><input type="radio" name="view" value="thread" id="view_thread" /><label for="view_thread"><roundcube:label name="threaded" /></label></li>
+    <roundcube:else />
+    <li><input type="radio" name="view" value="thread" id="view_thread" disabled="disabled" /><label for="view_thread" class="disabled"><roundcube:label name="threaded" /></label></li>
+    <roundcube:endif />
   </ul>
 <a href="javascript:rcmail_ui.save_listmenu()"><roundcube:label name="save" /></a>