Changeset 7538 for trunk/expressoMail1_2
- Timestamp:
- 11/21/12 14:48:14 (11 years ago)
- Location:
- trunk/expressoMail1_2
- Files:
-
- 3 added
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/index.php
r7535 r7538 21 21 echo "<script type='text/javascript'>var template = '".$_SESSION['phpgw_info']['expressoMail1_2']['user']['preferences']['common']['template_set']."';</script>"; 22 22 echo ' 23 <link rel="stylesheet" type="text/css" href="templates/default/main.css"></link> 23 <link rel="stylesheet" type="text/css" href="../prototype/plugins/freeow/style/freeow/freeow.css" > 24 <link rel="stylesheet" type="text/css" href="templates/default/main.min.css"></link> 24 25 <link rel="stylesheet" type="text/css" href="../phpgwapi/js/dftree/dftree.css"></link> 25 26 <link rel="Stylesheet" type="text/css" href="../prototype/plugins/jquery/jquery-ui.css" /> … … 28 29 <link rel="stylesheet" href="../prototype/modules/mail/css/followupflag.css" type="text/css" /> 29 30 <link rel="stylesheet" href="../prototype/modules/attach_message/attach_message.css" type="text/css" /> 31 <link rel="stylesheet" href="../prototype/plugins/jqgrid/themes/prognusone/jquery-ui-1.8.2.custom.css" type="text/css" /> 32 <link rel="stylesheet" type="text/css" href="../prototype/plugins/contextmenu/jquery.contextMenu.css"></link> 30 33 <!-- <link rel="stylesheet" href="../prototype/modules/mail/css/label.css" type="text/css" /> --> 31 34 32 35 <script src="js/modal/modal.js"></script> 33 36 <script type="text/javascript" src="../prototype/plugins/jquery/jquery.min.js"></script> … … 58 61 <script src="../prototype/modules/mail/js/foldertree.js" type="text/javascript"></script> 59 62 <script src="../prototype/modules/mail/js/label.js" type="text/javascript"></script> 60 <script src="../prototype/modules/mail/js/followupflag.js" type="text/javascript"></script> 63 <script src="../prototype/modules/mail/js/followupflag.min.js" type="text/javascript"></script> 64 <script type="text/javascript" src="../prototype/plugins/freeow/jquery.freeow.min.js"></script> 61 65 '; 62 66 //---------------------------// … … 318 322 // os demais pois nele contem a função get_lang 319 323 // que é utilizada em diversas partes 320 echo $obj -> getFilesJs("js/common_functions. js",$update_version);324 echo $obj -> getFilesJs("js/common_functions.min.js",$update_version); 321 325 include("inc/load_lang.php"); 322 326 … … 327 331 328 332 $scripts = "js/abas.js," . 329 "js/main. js," .333 "js/main.min.js," . 330 334 "js/draw_api.js,"; 331 335 … … 366 370 <link href="../prototype/modules/filters/filters.css" rel="stylesheet" type="text/css"> 367 371 <link rel="stylesheet" href="../prototype/plugins/farbtastic/farbtastic.css" type="text/css" > 368 <link rel="stylesheet" href="../prototype/plugins/fileupload/jquery.fileupload-ui.css" type="text/css" > 369 <link rel="stylesheet" type="text/css" href="../prototype/plugins/contextmenu/jquery.contextMenu.css"></link> 370 <link rel="stylesheet" href="../prototype/plugins/jqgrid/css/ui.jqgrid.css" type="text/css" /> 371 <link rel="stylesheet" href="../prototype/plugins/jqgrid/themes/prognusone/jquery-ui-1.8.2.custom.css" type="text/css" /> 372 <link rel="stylesheet" href="../prototype/plugins/fileupload/jquery.fileupload-ui.css" type="text/css" > 373 <link rel="stylesheet" href="../prototype/plugins/jqgrid/css/ui.jqgrid.css" type="text/css" /> 372 374 <link rel="Stylesheet" type="text/css" href="../prototype/plugins/timepicker/jquery-ui-timepicker-addon.css" /> 373 375 <link rel="stylesheet" type="text/css" href="../prototype/modules/calendar/css/layout.css" /> … … 383 385 <script type="text/javascript" src="../prototype/plugins/fileupload/jquery.fileupload.js"></script> 384 386 <script type="text/javascript" src="../prototype/plugins/fileupload/jquery.iframe-transport.js"></script> 385 <script type="text/javascript" src="../prototype/plugins/qtip/jquery.qtip-1.0.0-rc3.min.js"></script> 386 <!-- <script type="text/javascript" src="../prototype/plugins/contextmenu/jquery.ui.position.js"></script> --> 387 <script type="text/javascript" src="../prototype/plugins/qtip/jquery.qtip-1.0.0-rc3.min.js"></script> 387 388 <script type="text/javascript" src="../prototype/modules/calendar/js/timezone.js"></script> 388 389 <script type="text/javascript" src="../prototype/plugins/dateFormat/dateFormat.js"></script> … … 392 393 <script type="text/javascript" src="../prototype/modules/calendar/js/calendar.alarms.js"></script> 393 394 <script type="text/javascript" src="../prototype/modules/calendar/js/helpers.js"></script> 394 <link rel="stylesheet" type="text/css" href="../prototype/plugins/freeow/style/freeow/freeow.css" >395 <script type="text/javascript" src="../prototype/plugins/freeow/jquery.freeow.min.js"></script>396 <script type="text/javascript" src="../prototype/plugins/freeow/jquery.freeow.js"></script>397 395 <script src="../prototype/plugins/jqgrid/js/i18n/grid.locale-pt-br.js" type="text/javascript"></script> 398 396 <script src="../prototype/plugins/jqgrid/js/jquery.jqGrid.min.js" type="text/javascript"></script> … … 402 400 <script type="text/javascript" src="../prototype/plugins/timepicker/localization/jquery-ui-timepicker-pt-BR.js"></script> 403 401 <script type="text/javascript" src="../prototype/plugins/jquery/i18n/jquery.ui.datepicker-pt-BR.js"></script> 404 405 406 402 <script type="text/javascript"> 403 User.moduleName = "expressoMail1_2"; 404 </script> 407 405 '; 408 406 ?> -
trunk/expressoMail1_2/js/draw_api.js
r7526 r7538 695 695 data = connector.unserialize(data); 696 696 if(data){ 697 698 697 var _data = {}; 699 698 $.each(data,function(index,value){ 700 if (data[index] && data[index]){699 if (data[index]){ 701 700 _data[data[index]] = data[index]; 702 701 } 703 702 }); 704 705 703 populateSelectedMsgs(_data); 706 707 _data = {};708 709 704 } 710 705 }, … … 1385 1380 */ 1386 1381 if (msg_folder != headers_msgs['folder']) { 1387 1388 1382 if (headers_msgs['folder']) { 1389 1383 array_folder = headers_msgs['folder'].split('/'); … … 1434 1428 var tbody_element = document.createElement("TBODY"); 1435 1429 //add events for column resizing 1436 if (is_ie) { 1437 table_element.attachEvent("onmousemove",changeCursorState); 1438 table_element.attachEvent("onmousedown",startColResize); 1439 } 1440 else { 1441 table_element.addEventListener("mousemove",changeCursorState,false); 1442 table_element.addEventListener("mousedown",startColResize,false); 1443 } 1430 $(table_element).mousemove(changeCursorState); 1431 $(table_element).mousedown(startColResize); 1432 1444 1433 table_element.setAttribute("id", "table_message_header_box_"+numBox); 1445 1434 table_element.className = "table_message_header_box"; … … 2346 2335 2347 2336 function draw_header_box(){ 2348 switch(sort_box_type){ 2349 case 'SORTFROM': 2350 type_name = get_lang("From"); 2351 break; 2352 case 'SORTSUBJECT': 2353 type_name = get_lang("Subject"); 2354 break; 2355 case 'SORTARRIVAL': 2356 type_name = get_lang("Date"); 2357 break; 2358 case 'SORTSIZE': 2359 type_name = get_lang("Size"); 2360 break; 2361 default: 2362 type_name = get_lang("Date"); 2363 break; 2364 } 2337 var types = {'SORTFROM': 'From', 'SORTSUBJECT': 'Subject', 'SORTARRIVAL': 'Date', 'SORTSIZE': 'Size'}; 2338 type_name = ( types[sort_box_type] ? get_lang(types[sort_box_type]) : get_lang("Date") ); 2365 2339 folder = special_folders['Sent']; 2366 2340 current = get_current_folder(); 2367 2341 if ((preferences.from_to_sent == "1") && (current.substr(current.length - folder.length, folder.length) == folder)) { 2368 document.getElementById("message_header_SORTFROM_"+numBox).innerHTML = get_lang("To");2342 $("#message_header_SORTFROM_"+numBox).html(get_lang("To")); 2369 2343 if (sort_box_type == "SORTFROM") 2370 2344 type_name = get_lang("To"); 2371 2345 }else{ 2372 document.getElementById("message_header_SORTFROM_"+numBox).innerHTML = get_lang("From");2346 $("#message_header_SORTFROM_"+numBox).html(get_lang("From")); 2373 2347 } 2374 document.getElementById("message_header_SORTSUBJECT_"+numBox).innerHTML = get_lang("Subject");2375 document.getElementById("message_header_SORTARRIVAL_"+numBox).innerHTML = get_lang("Date");2376 document.getElementById("message_header_SORTSIZE_"+numBox).innerHTML = get_lang("Size");2348 $("#message_header_SORTSUBJECT_"+numBox).html(get_lang("Subject")); 2349 $("#message_header_SORTARRIVAL_"+numBox).html(get_lang("Date")); 2350 $("#message_header_SORTSIZE_"+numBox).html(get_lang("Size")); 2377 2351 document.getElementById("message_header_"+(sort_box_type.lastIndexOf("SORT") != "-1" ? sort_box_type : "SORTARRIVAL")+"_"+numBox ).innerHTML = "<B>"+type_name+"</B><img src ='templates/"+template+"/images/arrow_"+(sort_box_reverse == 1 ? 'desc' : 'asc')+"endant.gif'>"; 2378 2352 } 2353 2379 2354 function verifyOption(name, id){ 2380 2355 var str = name + '' + id;
Note: See TracChangeset
for help on using the changeset viewer.