Changeset 5283
- Timestamp:
- 12/22/11 16:54:40 (12 years ago)
- Location:
- trunk
- Files:
-
- 11 added
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/index.php
r5229 r5283 18 18 //jquery and Editor 19 19 echo " <script src='../library/jquery/jquery.js' language='javascript'></script> 20 <script src='../prototype/app/plugins/json2/json2.js' language='javascript'></script> 21 <script src='../prototype/app/plugins/ejs/ejs.js' language='javascript'></script> 22 <script src='../prototype/app/plugins/store/store.js' language='javascript'></script> 23 <script src='../prototype/app/datalayer.js' language='javascript'></script> 20 24 <script src='../library/ckeditor/ckeditor.js' language='javascript'></script> 21 25 <script src='../library/ckeditor/adapters/jquery.js' language='javascript'></script> … … 36 40 37 41 echo ' 38 <script type="text/javascript" src="../prototype/app/plugins/view/jquerymx-1.0.custom.min.js"></script>42 39 43 <script type="text/javascript" src="../prototype/app/plugins/treeview/jquery.treeview.js"></script> 40 44 <script type="text/javascript" src="../prototype/app/plugins/block/jquery.blockUI.js"></script> … … 298 302 </head> 299 303 <body scroll="no" style="overflow:hidden"> 304 305 <link rel="stylesheet" href="../prototype/modules/attach_message/attach_message.css" type="text/css" /> 306 300 307 </body> 301 308 </html> -
trunk/expressoMail1_2/js/draw_api.js
r5280 r5283 3538 3538 3539 3539 jQuery(add_msgs).click(function(event){ 3540 jQuery('#message-attach-dialog').html("../prototype/modules/attach_message/attach_message.ejs", {data:{}}).dialog({ 3540 jQuery('#message-attach-dialog').html(DataLayer.render("../prototype/modules/attach_message/attach_message.ejs", {})); 3541 jQuery('#message-attach-dialog').dialog({ 3541 3542 width:920, 3542 3543 height:550, -
trunk/prototype/app/templates/foldertree.ejs
r5136 r5283 36 36 <ul id="foldertree" class="filetree foldertree-skin-prognus"> 37 37 <li><span class="folder">Minhas Pastas</span> 38 <% recursive_forest( folders[0]); %>38 <% recursive_forest(data.folders[0]); %> 39 39 </li> 40 <% if( folders[1].length > 0) { %>40 <% if(data.folders[1].length > 0) { %> 41 41 <li><span class="folder">Pastas compartilhadas</span> 42 <% recursive_forest( folders[1]); %>42 <% recursive_forest(data.folders[1]); %> 43 43 </li> 44 44 <%}%> 45 45 <% if(preferences.use_local_messages == 1) { %> 46 46 <li><span class="folder">Pastas locais</span> 47 <% recursive_forest( folders[2]); %>47 <% recursive_forest(data.folders[2]); %> 48 48 </li> 49 49 <%}%> -
trunk/prototype/modules/attach_message/attach_message.css
r5278 r5283 32 32 33 33 /* especifico */ 34 #foldertree-container { width:220px;height:240px; display:inline-block;margin:5px 0px 5px 5px;overflow:auto;}35 #mailgrid-container {width:6 50px;/*height:240px;*/ margin:5px 5px 5px 0px; float:right; overflow:auto;}36 #mailpreview_container {margin:5px;padding:0px;height:2 00px;}37 #mailpreview_container .ui-tabs-panel {height:1 45px;overflow:auto;padding:0px;}34 #foldertree-container { width:220px;height:240px; display:inline-block;margin:5px 5px 5px 5px;overflow:auto;float:left;} 35 #mailgrid-container {width:640px;/*height:240px;*/ margin:5px 0px 5px 0px; float:right; overflow:auto;} 36 #mailpreview_container {margin:5px;padding:0px;height:220px; width:888; float:left; margin:5px 5px 5px 5px;} 37 #mailpreview_container .ui-tabs-panel {height:194px;overflow:auto;padding:0px; width:886px;} 38 38 /*#mailpreview_tabs { max-height: 20px; }*/ 39 #buttons-container {text-align: right;margin:5px ;}39 #buttons-container {text-align: right;margin:5px 0px 5px 5px;float:right;} 40 40 #selected_messages_counter {text-align:right;padding:0;} 41 41 #selected_messages_number { } … … 66 66 .mailpreview-message-body {padding:5px;} 67 67 68 .expresso-window-container{height:520px;} 69 #message-attach-dialog {overflow:visible !important;} -
trunk/prototype/modules/attach_message/attach_message.js
r5278 r5283 119 119 } 120 120 121 function numberMonths (months){ 122 switch(months){ 123 case 'Jan': 124 return 1; 125 case 'Feb': 126 return 2; 127 case 'Mar': 128 return 3; 129 case 'Apr': 130 return 4; 131 case 'May': 132 return 5; 133 case 'June': 134 return 6; 135 case 'July': 136 return 7; 137 case 'Aug': 138 return 8; 139 case 'Sept': 140 return 9; 141 case 'Oct': 142 return 10; 143 case 'Nov': 144 return 11; 145 case 'Dec': 146 return 12; 147 } 148 } 149 121 150 NormaliseFrom = function(cellvalue, options, rowObject) { 122 151 //alert(dump(rowObject)); … … 132 161 } else { 133 162 date = new Date(timestamp); 134 var b = date.toISOString().split("T")[0].split("-"); 135 var c = b[2] + "/" + b[1] + "/" + b[0]; 136 return '<span class="datable">' + c + '</span>'; 163 if(is_ie){ 164 var b = date.toString().split(' '); 165 var c = b[2] + "/" + numberMonths(b[1]) + "/" + b[5]; 166 return '<span class="datable">' + c + '</span>'; 167 }else{ 168 var b = date.toISOString().split("T")[0].split("-"); 169 var c = b[2] + "/" + b[1] + "/" + b[0]; 170 return '<span class="datable">' + c + '</span>'; 171 } 137 172 } 138 173 } … … 231 266 var firstFolder = jQuery("#foldertree-container") 232 267 .removeClass('empty-container') 233 .html( BASE_PATH + 'app/templates/foldertree.ejs', {folders: [tree1, tree2, tree3]})268 .html(DataLayer.render(BASE_PATH + 'app/templates/foldertree.ejs', {folders: [tree1, tree2, tree3]})) 234 269 .find("#foldertree").treeview() 235 270 .click(function(event){ … … 255 290 id: targetId, 256 291 name: child.attr('title'), 257 class: child.attr('class')292 'class': child.attr('class') 258 293 }; 259 294 … … 273 308 id: firstFolder.parent().attr('id'), 274 309 name: firstFolder.attr('title'), 275 class: firstFolder.attr('class')310 'class': firstFolder.attr('class') 276 311 }; 277 312 … … 279 314 jQuery("#mailgrid-container") 280 315 .removeClass('empty-container') 281 .html( BASE_PATH + 'app/templates/messagegrid.ejs', {data: {}})316 .html(DataLayer.render(BASE_PATH + 'app/templates/messagegrid.ejs', {})) 282 317 .find("#message_attacher_grid") 283 318 .jqGrid({ … … 444 479 } 445 480 }, 446 caption: '<span class="'+selectedFolder .class+'">'+selectedFolder.name+'</span>'481 caption: '<span class="'+selectedFolder['class']+'">'+selectedFolder.name+'</span>' 447 482 }); 448 483 //.jqGrid('navGrid','#message_attacher_grid_pager',{edit:false,add:false,del:false});
Note: See TracChangeset
for help on using the changeset viewer.