Changeset 524ead18 in github

Timestamp:

May 25, 2012 7:49:48 AM (12 months ago)

Author:

Aleksander Machniak <alec@…>

Branches:

release-0.8

Children:

d4d2e42

Parents:

c993e10

git-author:

Aleksander Machniak <alec@…> (05/25/12 07:45:38)

git-committer:

Aleksander Machniak <alec@…> (05/25/12 07:49:48)

Message:

Move messages forwarding mode setting into Preferences

Conflicts:

CHANGELOG

Files:

• CHANGELOG (modified) (1 diff)
• program/localization/en_US/labels.inc (modified) (1 diff)
• program/steps/settings/func.inc (modified) (1 diff)
• program/steps/settings/save_prefs.inc (modified) (1 diff)
• skins/default/includes/messagetoolbar.html (modified) (1 diff)

CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- Move messages forwarding mode setting into Preferences
 - Fix HTML entities handling in HTML editor (#1488483)
 - Fix listing shared folders on Courier IMAP (#1488466)

program/localization/en_US/labels.inc

@@ -458 +458 @@
 $labels['addtodict'] = 'Add to dictionary';
 $labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
+$labels['forwardmode'] = 'Messages forwarding';
+$labels['inline'] = 'inline';
+$labels['asattachment'] = 'as attachment';
 
 $labels['folder']  = 'Folder';

program/steps/settings/func.inc

@@ -618 +618 @@
     }
 
+    if (!isset($no_override['forward_attachment'])) {
+      $field_id = 'rcmfd_forward_attachment';
+      $select = new html_select(array('name' => '_forward_attachment', 'id' => $field_id));
+      $select->add(rcube_label('inline'), 0);
+      $select->add(rcube_label('asattachment'), 1);
+
+      $blocks['main']['options']['forward_attachment'] = array(
+        'title' => html::label($field_id, Q(rcube_label('forwardmode'))),
+        'content' => $select->show(intval($config['forward_attachment'])),
+      );
+    }
+
     if (!isset($no_override['default_font'])) {
       $field_id     = 'rcmfd_default_font';

program/steps/settings/save_prefs.inc

@@ -90 +90 @@
       'sig_above'          => !empty($_POST['_sig_above']) && !empty($_POST['_top_posting']),
       'default_font'       => get_input_value('_default_font', RCUBE_INPUT_POST),
+      'forward_attachment' => !empty($_POST['_forward_attachment']),
     );
 

skins/default/includes/messagetoolbar.html

@@ -27 +27 @@
 
 <div id="forwardmenu" class="popupmenu">
-    <ul class="toolbarmenu">
-        <li class="block">
-            <input type="radio" name="forwardtype" value="0" onchange="rcmail.command('save-pref', {name: 'forward_attachment', value: 0, env: 'forward_attachment'});" />
-            <roundcube:button command="forward" label="forwardinline" prop="sub" classAct="forwardlink active" class="forwardlink" />
-        </li>
-        <li class="block">
-            <input type="radio" name="forwardtype" value="1" onchange="rcmail.command('save-pref', {name: 'forward_attachment', value: 1, env: 'forward_attachment'})" />
-            <roundcube:button command="forward-attachment" label="forwardattachment" prop="sub" classAct="forwardattachmentlink active" class="forwardattachmentlink" />
-        </li>    
+    <ul>
+        <li><roundcube:button command="forward" label="forwardinline" prop="sub" classAct="forwardlink active" class="forwardlink" /></li>
+        <li><roundcube:button command="forward-attachment" label="forwardattachment" prop="sub" classAct="forwardattachmentlink active" class="forwardattachmentlink" /></li>
         <roundcube:container name="forwardmenu" id="forwardmenu" />
     </ul>