Changeset 4008 in subversion

Timestamp:

Sep 29, 2010 8:24:01 AM (3 years ago)

Author:

alec

Message:

• Add link to identities in compose window (#1486729)

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (1 diff)
• program/js/app.js (modified) (4 diffs)
• program/localization/en_US/labels.inc (modified) (1 diff)
• skins/default/mail.css (modified) (2 diffs)
• skins/default/templates/compose.html (modified) (2 diffs)

trunk/roundcubemail/CHANGELOG

@@ -3 +3 @@
 
 - Messages caching: performance improvements, fixed syncing, fixes related with #1486748
+- Add link to identities in compose window (#1486729)
 
 RELEASE 0.4.1

trunk/roundcubemail/program/js/app.js

@@ -226 +226 @@
         }
         else if (this.env.action == 'compose') {
-          this.enable_command('send-attachment', 'remove-attachment', 'send', 'toggle-editor', true);
+          this.env.compose_commands = ['send-attachment', 'remove-attachment', 'send', 'toggle-editor'];
+
+          if (this.env.drafts_mailbox)
+            this.env.compose_commands.push('savedraft')
+
+          this.enable_command(this.env.compose_commands, 'identities', true);
 
           if (this.env.spellcheck) {
             this.env.spellcheck.spelling_state_observer = function(s){ ref.set_spellcheck_state(s); };
+            this.env.compose_commands.push('spellcheck')
             this.set_spellcheck_state('ready');
             if ($("input[name='_is_html']").val() == '1')
               this.display_spellcheck_controls(false);
           }
-
-          if (this.env.drafts_mailbox)
-            this.enable_command('savedraft', true);
 
           document.onmouseup = function(e){ return p.doc_mouse_up(e); };
@@ -426 +429 @@
 
     // check input before leaving compose step
-    if (this.task=='mail' && this.env.action=='compose'
-        && (command == 'list' || command == 'mail' || command == 'addressbook' || command == 'settings')) {
+    if (this.task=='mail' && this.env.action=='compose' && $.inArray(command, this.env.compose_commands)<0) {
       if (this.cmp_hash != this.compose_field_hash() && !confirm(this.get_label('notsentwarning')))
         return false;
@@ -975 +977 @@
 
       case 'identities':
-        this.goto_url('identities');
+        this.goto_url('settings/identities');
         break;
 
       case 'folders':
-        this.goto_url('folders');
+        this.goto_url('settings/folders');
         break;
 
@@ -2943 +2945 @@
 
     // enable manual signature insert
-    if (this.env.signatures && this.env.signatures[id])
+    if (this.env.signatures && this.env.signatures[id]) {
       this.enable_command('insert-sig', true);
+      this.env.compose_commands.push('insert-sig');
+    }
     else
       this.enable_command('insert-sig', false);

trunk/roundcubemail/program/localization/en_US/labels.inc

@@ -205 +205 @@
 $labels['returnreceipt']  = 'Return receipt';
 
+$labels['editidents']    = 'Edit identities';
 $labels['checkspelling'] = 'Check spelling';
 $labels['resumeediting'] = 'Resume editing';

trunk/roundcubemail/skins/default/mail.css

@@ -1234 +1234 @@
 }
 
-#formlinks a,
-#formlinks a:visited
+.formlinks a,
+.formlinks a:visited
 {
   color: #999999;
@@ -1242 +1242 @@
 }
 
-#formlinks a,
-#formlinks a:visited
+.formlinks a,
+.formlinks a:visited
 {
   color: #CC0000;

trunk/roundcubemail/skins/default/templates/compose.html

@@ -54 +54 @@
         <tr>
             <td class="title"><label for="_from"><roundcube:label name="from" /></label></td>
-            <td class="editfield"><roundcube:object name="composeHeaders" part="from" form="form" id="_from" tabindex="1" /></td>
+            <td class="editfield formlinks">
+                <roundcube:object name="composeHeaders" part="from" form="form" id="_from" tabindex="1" />
+                <a href="#identities" onclick="return rcmail.command('identities')"><roundcube:label name="editidents" /></a>
+            </td>
         </tr><tr>
             <td class="title top"><label for="_to"><roundcube:label name="to" /></label></td>
@@ -78 +81 @@
         </tr><tr>
             <td></td>
-            <td id="formlinks">
+            <td class="formlinks">
                 <a href="#cc" onclick="return rcmail_ui.show_header_form('cc')" id="cc-link"><roundcube:label name="addcc" /></a>
                 <span class="separator">|</span>