Changeset 5283 for trunk/prototype/modules/attach_message

Timestamp:

12/22/11 16:54:40 (12 years ago)

Author:

douglasz

Message:

Ticket #2402 - Inconsistencia ao anexar mensagens ao e-mail

Location:

trunk/prototype/modules/attach_message

Files:

• attach_message.css (modified) (2 diffs)
• attach_message.js (modified) (7 diffs)

trunk/prototype/modules/attach_message/attach_message.css

@@ -32 +32 @@
 
 /* especifico */
-#foldertree-container { width:220px;height:240px; display:inline-block;margin:5px 0px 5px 5px;overflow:auto;}
-#mailgrid-container {width:650px;/*height:240px;*/ margin:5px 5px 5px 0px; float:right; overflow:auto;}
-#mailpreview_container {margin:5px;padding:0px;height:200px;}
-#mailpreview_container .ui-tabs-panel {height:145px;overflow:auto;padding:0px;}
+#foldertree-container { width:220px;height:240px; display:inline-block;margin:5px 5px 5px 5px;overflow:auto;float:left;}
+#mailgrid-container {width:640px;/*height:240px;*/ margin:5px 0px 5px 0px; float:right; overflow:auto;}
+#mailpreview_container {margin:5px;padding:0px;height:220px; width:888; float:left; margin:5px 5px 5px 5px;}
+#mailpreview_container .ui-tabs-panel {height:194px;overflow:auto;padding:0px; width:886px;}
 /*#mailpreview_tabs { max-height: 20px; }*/
-#buttons-container {text-align: right;margin:5px;}
+#buttons-container {text-align: right;margin:5px 0px 5px 5px;float:right;}
 #selected_messages_counter {text-align:right;padding:0;}
 #selected_messages_number { }
@@ -66 +66 @@
 .mailpreview-message-body {padding:5px;}
 
+.expresso-window-container{height:520px;}
+#message-attach-dialog {overflow:visible !important;}

trunk/prototype/modules/attach_message/attach_message.js

@@ -119 +119 @@
 }
 
+function numberMonths (months){
+        switch(months){
+                case 'Jan':
+                        return 1;
+                case 'Feb':
+                        return 2;
+                case 'Mar':
+                        return 3;
+                case 'Apr':
+                        return 4;
+                case 'May':
+                        return 5;
+                case 'June':
+                        return 6;
+                case 'July':
+                        return 7;
+                case 'Aug':
+                        return 8;
+                case 'Sept':
+                        return 9;
+                case 'Oct':
+                        return 10;
+                case 'Nov':
+                        return 11;
+                case 'Dec':
+                        return 12;
+        }       
+}
+
 NormaliseFrom = function(cellvalue, options, rowObject) {
         //alert(dump(rowObject));
@@ -132 +161 @@
         } else {
                 date = new Date(timestamp);
-                var b = date.toISOString().split("T")[0].split("-");
-                var c = b[2] + "/" + b[1] + "/" + b[0];
-                return '<span class="datable">' + c + '</span>';
+                if(is_ie){
+                        var b = date.toString().split(' ');
+                        var c = b[2] + "/" + numberMonths(b[1]) + "/" + b[5];
+                        return '<span class="datable">' + c + '</span>';
+                }else{
+                        var b = date.toISOString().split("T")[0].split("-");
+                        var c = b[2] + "/" + b[1] + "/" + b[0];
+                        return '<span class="datable">' + c + '</span>';
+                }
         }
 }
@@ -231 +266 @@
                 var firstFolder = jQuery("#foldertree-container")
                 .removeClass('empty-container')
-                .html(BASE_PATH + 'app/templates/foldertree.ejs', {folders: [tree1, tree2, tree3]})
+                .html(DataLayer.render(BASE_PATH + 'app/templates/foldertree.ejs', {folders: [tree1, tree2, tree3]}))
                 .find("#foldertree").treeview()
                 .click(function(event){
@@ -255 +290 @@
                             id: targetId, 
                             name: child.attr('title'),
-                            class: child.attr('class')
+                            'class': child.attr('class')
                         };
 
@@ -273 +308 @@
                         id: firstFolder.parent().attr('id'), 
                         name: firstFolder.attr('title'),
-                        class: firstFolder.attr('class')
+                        'class': firstFolder.attr('class')
                 };
 
@@ -279 +314 @@
                 jQuery("#mailgrid-container")
                 .removeClass('empty-container')
-                .html(BASE_PATH + 'app/templates/messagegrid.ejs', {data: {}})
+                .html(DataLayer.render(BASE_PATH + 'app/templates/messagegrid.ejs', {}))
                 .find("#message_attacher_grid")
                 .jqGrid({
@@ -444 +479 @@
                                 }
                         },
-                        caption: '<span class="'+selectedFolder.class+'">'+selectedFolder.name+'</span>'
+                        caption: '<span class="'+selectedFolder['class']+'">'+selectedFolder.name+'</span>'
                 });
                 //.jqGrid('navGrid','#message_attacher_grid_pager',{edit:false,add:false,del:false});