Changeset 6130 in subversion

Timestamp:

Apr 27, 2012 3:13:19 AM (13 months ago)

Author:

alec

Message:

• Applied fixes from trunk up to r6129

Location:

branches/release-0.8

Files:

• index.php (modified) (1 diff)
• program/js/app.js (modified) (8 diffs)
• program/steps/mail/func.inc (modified) (1 diff)
• skins/default/mail.css (modified) (2 diffs)
• skins/larry/iehacks.css (modified) (2 diffs)
• skins/larry/mail.css (modified) (3 diffs)
• skins/larry/svggradients.css (modified) (1 diff)
• skins/larry/ui.js (modified) (3 diffs)

branches/release-0.8/index.php

@@ -130 +130 @@
       if ($query['_task'] == 'login')
         unset($query['_task']);
+
+      // prevent redirect to compose with specified ID (#1488226)
+      if ($query['_action'] == 'compose' && !empty($query['_id']))
+        $query = array();
     }
 

branches/release-0.8/program/js/app.js

@@ -225 +225 @@
         this.env.message_commands = ['show', 'reply', 'reply-all', 'reply-list', 'forward',
           'moveto', 'copy', 'delete', 'open', 'mark', 'edit', 'viewsource', 'download',
-          'print', 'load-attachment', 'load-headers', 'forward-attachment'];
+          'print', 'load-attachment', 'show-headers', 'hide-headers', 'forward-attachment'];
 
         if (this.env.action == 'show' || this.env.action == 'preview') {
@@ -578 +578 @@
         else if (this.task == 'addressbook')
           this.list_contacts(props);
-        break;
-
-      case 'load-headers':
-        this.load_headers(obj);
         break;
 
@@ -1109 +1105 @@
         var func = command.replace(/-/g, '_');
         if (this[func] && typeof this[func] === 'function') {
-          ret = this[func](props);
+          ret = this[func](props, obj);
         }
         break;
@@ -1857 +1853 @@
         html = expando;
       else if (c == 'subject') {
-        if (bw.ie)
+        if (bw.ie) {
           col.onmouseover = function() { rcube_webmail.long_subject_title_ie(this, message.depth+1); };
+          if (bw.ie8)
+            tree = '<span></span>' + tree; // #1487821
+        }
         html = tree + cols[c];
       }
@@ -5830 +5829 @@
 
   // display all-headers row and fetch raw message headers
-  this.load_headers = function(elem)
+  this.show_headers = function(props, elem)
   {
     if (!this.gui_objects.all_headers_row || !this.gui_objects.all_headers_box || !this.env.uid)
@@ -5837 +5836 @@
     $(elem).removeClass('show-headers').addClass('hide-headers');
     $(this.gui_objects.all_headers_row).show();
-    elem.onclick = function() { rcmail.hide_headers(elem); };
+    elem.onclick = function() { rcmail.command('hide-headers', '', elem); };
 
     // fetch headers only once
@@ -5847 +5846 @@
 
   // hide all-headers row
-  this.hide_headers = function(elem)
+  this.hide_headers = function(props, elem)
   {
     if (!this.gui_objects.all_headers_row || !this.gui_objects.all_headers_box)
@@ -5854 +5853 @@
     $(elem).removeClass('hide-headers').addClass('show-headers');
     $(this.gui_objects.all_headers_row).hide();
-    elem.onclick = function() { rcmail.load_headers(elem); };
+    elem.onclick = function() { rcmail.command('show-headers', '', elem); };
   };
 

branches/release-0.8/program/steps/mail/func.inc

@@ -987 +987 @@
   global $OUTPUT;
 
-  $html = html::div(array('class' => "more-headers show-headers", 'onclick' => "return ".JS_OBJECT_NAME.".command('load-headers','',this)"), '');
-  $html .= html::div(array('id' => "all-headers", 'class' => "all", 'style' => 'display:none'), html::div(array('id' => 'headers-source'), ''));
+  $html = html::div(array('id' => "all-headers", 'class' => "all", 'style' => 'display:none'), html::div(array('id' => 'headers-source'), ''));
+  $html .= html::div(array('class' => "more-headers show-headers", 'onclick' => "return ".JS_OBJECT_NAME.".command('show-headers','',this)"), '');
 
   $OUTPUT->add_gui_object('all_headers_row', 'all-headers');

branches/release-0.8/skins/default/mail.css

@@ -1287 +1287 @@
 #headers-source
 {
-  margin: 0 0 2px 0;
+  margin: 2px 0;
   padding: 0.5em;
   height: 145px;
@@ -1293 +1293 @@
   overflow: auto;
   font-size: 11px;
-  border: 1px solid #999999;
+  border: 1px solid #CCC;
   display: none;
   text-align: left;

branches/release-0.8/skins/larry/iehacks.css

@@ -144 +144 @@
 }
 
-#full-headers {
-        filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#eaeaea', endColorstr='#e9e9e9', GradientType=0);
-}
-
-#all-headers {
-        filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f3f3f3', endColorstr='#ffffff', GradientType=0);
-}
-
 #composeoptionsbox {
         border-top: 1px solid #999;
@@ -160 +152 @@
         height: 18px;
 }
-
-

branches/release-0.8/skins/larry/mail.css

@@ -735 +735 @@
 }
 
-#full-headers {
-        position: relative;
-        color: #666;
-        text-align: center;
-        background-color: #f9f9f9;
-        background: -moz-linear-gradient(top, #eaeaea 0%, #e9e9e9 100%);
-        background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#eaeaea), color-stop(100%,#e9e9e9));
-        background: -o-linear-gradient(top, #eaeaea 0%, #e9e9e9 100%);
-        background: -ms-linear-gradient(top, #eaeaea 0%, #e9e9e9 100%);
-        background: linear-gradient(top, #eaeaea 0%, #e9e9e9 100%);
-}
-
 div.more-headers {
         cursor: pointer;
@@ -758 +746 @@
 
 #all-headers {
-        position: absolute;
-        top: 11px;
-        left: 10px;
-        right: 10px;
+    position: relative;
+        margin: 0 10px;
+        padding: 0;
         height: 180px;
-        z-index: 500;
         border: 1px solid #bbb;
-        border-top: 0;
-        border-radius: 0 0 4px 4px;
-        -webkit-box-shadow: 0px 3px 4px 0px rgba(80, 80, 80, 0.6);
-        -moz-box-shadow: 0px 3px 4px 0px rgba(80, 80, 80, 0.6);
-        box-shadow: 0px 3px 4px 0px rgba(80, 80, 80, 0.6);
+        border-radius: 4px;
         background: #fff;
-        background: -moz-linear-gradient(top, #f0f0f0 0%, #fff 8%, #fff 100%);
-        background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f0f0f0), color-stop(8%,#fff), color-stop(100%,#fff));
-        background: -o-linear-gradient(top, #f0f0f0 0%, #fff 8%, #fff 100%);
-        background: -ms-linear-gradient(top, #f0f0f0 0%, #fff 8%, #fff 100%);
-        background: linear-gradient(top,  #f0f0f0 0%, #fff 8%, #fff 100%);
-}
-
-#all-headers .ui-resizable-s {
-        bottom: -2px;
 }
 
@@ -785 +758 @@
         display: none;
         position: absolute;
-        top: 8px;
+        top: 0;
         left: 0;
         right: 0;
-        bottom: 8px;
-        padding: 0 10px;
+        bottom: 0;
+        padding: 2px 5px;
         overflow: auto;
         text-align: left;

branches/release-0.8/skins/larry/svggradients.css

@@ -138 +138 @@
 }
 
-#full-headers {
-        background-image: url(svggradient.php?c=eaeaea;e9e9e9);
-}
-
-#all-headers {
-        background-image: url(svggradient.php?c=f3f3f3;ffffff);
-}
-
 
 /*** jqueryui theme ***/

branches/release-0.8/skins/larry/ui.js

@@ -77 +77 @@
       if (rcmail.env.action == 'show' || rcmail.env.action == 'preview') {
         layout_messageview();
-        $("#all-headers").resizable({ handles: 's', minHeight: 50 });
+        rcmail.addEventListener('aftershow-headers', function() { layout_messageview(); });
+        rcmail.addEventListener('afterhide-headers', function() { layout_messageview(); });
         $('#previewheaderstoggle').click(function(e){ toggle_preview_headers(this); return false });
       }
@@ -292 +293 @@
     $('#messagecontent').css('top', ($('#messageheader').outerHeight() + 10) + 'px');
     $('#message-objects div a').addClass('button');
-    
+
     if (!$('#attachment-list li').length) {
       $('div.rightcol').hide();
@@ -550 +551 @@
       for (i in rcmail.env.spell_langs) {
         li = $('<li>');
-        link = $('<a href="#">').text(rcmail.env.spell_langs[i])
+        link = $('<a href="#"></a>').text(rcmail.env.spell_langs[i])
           .addClass('active').data('lang', i)
           .click(function() {