Changeset 5486
- Timestamp:
- 02/09/12 15:57:23 (11 years ago)
- Location:
- trunk
- Files:
-
- 12 added
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/index.php
r5467 r5486 74 74 75 75 <script type="text/javascript" src="../prototype/plugins/treeview/jquery.treeview.js"></script> 76 <script type="text/javascript" src="../prototype/plugins/treeview/lib/jquery.cookie.js"></script> 76 77 <script type="text/javascript" src="../prototype/plugins/block/jquery.blockUI.js"></script> 77 78 <script type="text/javascript" src="../prototype/plugins/scrollto/jquery.scrollTo.js"></script> 78 79 79 80 <link rel="stylesheet" href="../prototype/plugins/treeview/jquery.treeview.css" type="text/css" media="screen" /> 81 80 82 <script src="../prototype/plugins/jqgrid/js/i18n/grid.locale-pt-br.js" type="text/javascript"></script> 81 83 <script src="../prototype/plugins/jqgrid/js/jquery.jqGrid.min.js" type="text/javascript"></script> 84 <script src="../prototype/modules/mail/js/foldertree.js" type="text/javascript"></script> 85 <link rel="stylesheet" href="../prototype/modules/mail/css/foldertree.css" type="text/css" media="screen" /> 86 82 87 <link rel="stylesheet" href="../prototype/plugins/jqgrid/css/ui.jqgrid.css" type="text/css" /> 83 88 <link rel="stylesheet" href="../prototype/plugins/jqgrid/themes/prognusone/jquery-ui-1.8.2.custom.css" type="text/css" /> … … 278 283 var locale = "'.$GLOBALS['phpgw']->common->getPreferredLanguage().'"; 279 284 var new_agenda = "'.$current_config['new_agenda'].'"; 285 $("#sideboxdragarea").addClass("hidden"); 286 $("#menu2Container").addClass("hidden"); 280 287 </script>'; 281 288 … … 314 321 315 322 echo $obj -> getFilesJs($scripts, $update_version); 316 echo '<script type="text/javascript">init();</script>'; 323 echo ' 324 <link rel="stylesheet" href="../prototype/modules/attach_message/attach_message.css" type="text/css" /> 325 <script type="text/javascript"> 326 init(); 327 </script>'; 317 328 318 329 if ($GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['use_shortcuts']) … … 336 347 </head> 337 348 <body scroll="no" style="overflow:hidden"> 338 339 349 <link rel="stylesheet" href="../prototype/modules/attach_message/attach_message.css" type="text/css" /> 340 350 <link rel='stylesheet' type='text/css' href='../prototype/modules/calendar/css/layout.css' /> -
trunk/expressoMail1_2/js/TreeShow.js
r5443 r5486 18 18 19 19 // Update dftree_tree_folders; 20 if(Element('content_folders'))21 {22 Element('content_folders').innerHTML = "";23 }24 25 draw_ tree_folders(folders);20 //if(Element('content_folders')) 21 //{ 22 //Element('content_folders').innerHTML = ""; 23 //} 24 25 draw_new_tree_folder(); 26 26 27 27 ttree.FOLDER = ttreeBox.name_folder; … … 33 33 tree_folders.getNodeById('local_root').changeState(); 34 34 } 35 36 35 if(!expresso_offline) 37 36 cExecute ("$this.imap_functions.get_folders_list&folder="+current_folder, handler_update_folders); -
trunk/expressoMail1_2/js/abas.js
r5485 r5486 267 267 parent_bb.insertBefore(td, bb); 268 268 269 if(! Element("border_id_"+id_value+"_r") ||((typeof(id_value) == 'string') && id_value.match(/_r$/))) 270 _dragArea.makeDragged(td, id_value,td.value); 269 if(! Element("border_id_"+id_value+"_r") ||((typeof(id_value) == 'string') && id_value.match(/_r$/))){ 270 $(td).draggable({ 271 helper: function(event){ 272 if( borderTitle.length > 18 ) 273 return $(DataLayer.render('../prototype/modules/mail/templates/draggin_box.ejs', {texto : borderTitle.substring(0,18) + "...", type: "messages"})); 274 else 275 return $(DataLayer.render('../prototype/modules/mail/templates/draggin_box.ejs', {texto : borderTitle, type: "messages"})); 276 }, 277 cursorAt: { cursor: "move", top: 5, left: 56 }, 278 refreshPositions: true , 279 scroll: true, 280 scrollSensitivity: 100, 281 scrollSpeed: 100, 282 containment: "#divAppbox" 283 }); 284 } 285 //_dragArea.makeDragged(td, id_value,td.value); 271 286 272 287 BordersArray[BordersArray.length] = new setBorderAttributes(ID); -
trunk/expressoMail1_2/js/draw_api.js
r5483 r5486 320 320 } 321 321 } 322 if(folder_create != ""){323 if(confirm(get_lang("There are folders with invalid format. Do you want to fix them?"))){324 var handler_correct_folders = function(data){325 //Timeout to release HTTPRequest , loadScript and update tree folders.326 if(data)327 setTimeout("connector.loadScript('TreeShow');ttreeBox.update_folder();",500);328 }329 cExecute("$this.imap_functions.create_extra_mailbox",handler_correct_folders,"nw_folders="+folder_create);330 }331 }332 322 } 333 323 … … 430 420 return false; 431 421 } 432 433 draw_tree_folders(data);422 423 434 424 if(data) { 435 425 draw_tree_folders(data); 436 426 build_quota(data); 437 427 var f_unseen = Element('dftree_'+current_folder+'_unseen'); … … 445 435 folders = data; 446 436 } 437 draw_new_tree_folder(); 447 438 } 448 439 … … 468 459 draw_paging(data.num_msgs); 469 460 Element("tot_m").innerHTML = data.num_msgs; 470 update_menu(); 461 $("#new_m").html(($(".selected").find(".folder_unseen").html() != "0" && $(".selected").find(".folder_unseen").html() != null)? $(".selected").find(".folder_unseen").html() : "0").css("color", "red"); 462 //update_menu(); 471 463 return true; 472 464 } … … 1178 1170 add_className(tr_element, i%2 != 0 ? 'tr_msg_read2' : 'tr_msg_read'); 1179 1171 } 1180 _dragArea.makeDragged(tr_element, headers_msgs[i].msg_number, headers_msgs[i].subject, true); 1172 //_dragArea.makeDragged(tr_element, headers_msgs[i].msg_number, headers_msgs[i].subject, true); 1173 $(tr_element).draggable({ 1174 helper: function(event){ 1175 $(this).find("input:checkbox").attr("checked", true); 1176 if($("#table_box").find("tr input:checked").length > 1) 1177 return $(DataLayer.render('../prototype/modules/mail/templates/draggin_box.ejs', {texto : (($("#table_box").find("tr input:checked")).length+" mensagens selecionadas"), type: "messages"})); 1178 if( $(this).find(".td_msg_subject").text().length > 18 ) 1179 return $(DataLayer.render('../prototype/modules/mail/templates/draggin_box.ejs', {texto : $(this).find(".td_msg_subject").text().substring(0,18) + "...", type: "messages"})); 1180 else 1181 return $(DataLayer.render('../prototype/modules/mail/templates/draggin_box.ejs', {texto : $(this).find(".td_msg_subject").text(), type: "messages"})); 1182 }, 1183 cursorAt: { cursor: "move", top: 5, left: 56 }, 1184 refreshPositions: true , 1185 scroll: true, 1186 scrollSensitivity: 100, 1187 scrollSpeed: 100, 1188 containment: "#divAppbox" 1189 }); 1181 1190 } 1182 1191 … … 1429 1438 1430 1439 td_element4 = createTDElement(0,8,"td_msg td_resizable","left"); 1440 td_element4.className += " td_msg_subject"; 1431 1441 td_element4.onclick = _onclick; 1432 1442 td_element4.innerHTML = !is_ie ? "<a nowrap id='a_message_"+tr_element.id+"'> " : " "; -
trunk/expressoMail1_2/js/main.js
r5485 r5486 10 10 function mount_url_folder(folders){ 11 11 return folders.join(cyrus_delimiter); 12 } 12 } 13 13 function init(){ 14 14 if (!is_ie) … … 59 59 60 60 } 61 //Substituido por padrão Jquery 61 62 cExecute ("$this.imap_functions.get_range_msgs2&folder=INBOX&msg_range_begin=1&msg_range_end="+preferences.max_email_per_page+"&sort_box_type=SORTARRIVAL&search_box_type=ALL&sort_box_reverse=1", handler_draw_box); 62 cExecute ("$this.imap_functions.get_folders_list&onload=true", update_menu);63 63 cExecute ("$this.db_functions.get_dropdown_contacts", save_contacts); //Save contacts needs preferences. 64 64 if(preferences.hide_folders == "1") … … 80 80 loadApplet(); 81 81 } 82 // Fim da inserção da applet 83 82 // Fim da inserção da applet 83 84 85 if($.cookie('collapse_folders') == "true"){ 86 $("#folderscol").addClass( "hidden"); 87 $(".collapse_folders").addClass("ui-icon ui-icon-triangle-1-e").children().attr('title', "Expandir"); 88 refresh(); 89 resizeWindow(); 90 } 91 else{ 92 $(".collapse_folders").addClass("ui-icon ui-icon-triangle-1-w").children().attr('title', "Ocultar"); 93 refresh(); 94 resizeWindow(); 95 96 } 97 98 $(".collapse_folders_td").attr('title', "Ocultar/Expandir").click(function(){ 99 if($("#folderscol").css("display") != "none"){ 100 $("#folderscol").addClass( "hidden"); 101 $(".collapse_folders").removeClass("ui-icon-triangle-1-w"); 102 $(".collapse_folders").addClass("ui-icon-triangle-1-e").attr('title', "Expandir"); 103 $.cookie('collapse_folders', "true"); 104 refresh(); 105 resizeWindow(); 106 }else{ 107 $("#folderscol").removeClass( "hidden"); 108 $(".collapse_folders").removeClass("ui-icon-triangle-1-e"); 109 $(".collapse_folders").addClass("ui-icon-triangle-1-w").attr('title', "Ocultar"); 110 $.cookie('collapse_folders', "false"); 111 refresh(); 112 resizeWindow(); 113 } 114 resizeWindow(); 115 116 }).hover( 117 function(){ 118 $(this).addClass("collapse_folders_td_over"); 119 }, 120 function(){ 121 $(this).removeClass("collapse_folders_td_over"); 122 } 123 ); 124 cExecute("$this.imap_functions.get_folders_list&onload=true", update_menu); 84 125 } 85 126 var handler_automatic_trash_cleanness = function(data){ … … 96 137 97 138 cExecute ("$this.functions.get_preferences", save_preferences); 98 cExecute ("phpgwapi.browser.isMobile", function( data ) 99 { 139 cExecute ("phpgwapi.browser.isMobile", function( data ){ 100 140 mobile_device = ( ( data.constructor == Boolean ) ? data : ( data === 'true' ) ); 101 } 141 }); 102 142 setTimeout('auto_refresh()', time_refresh); 103 143 144 $("#divAppbox").css("padding-left", "0px"); 145 $("#divAppbox").css("margin", "0px"); 146 104 147 } 105 148 … … 488 531 { 489 532 var new_msg = this.make_tr_message(data[i], current_folder, data.offsetToGMT); 490 _dragArea.makeDragged(new_msg, data[i].msg_number, data[i].subject, true); 533 $(new_msg).draggable({ 534 start : function(){ 535 }, 536 stop: function(){ 537 }, 538 helper: function(event){ 539 $(this).find("input:checkbox").attr("checked", true); 540 if($("#table_box").find("tr input:checked").length > 1) 541 return $(DataLayer.render('../prototype/modules/mail/templates/draggin_box.ejs', {texto : (($("#table_box").find("tr input:checked")).length+" mensagens selecionadas"), type: "messages"})); 542 if( $(this).find(".td_msg_subject").text().length > 18 ) 543 return $(DataLayer.render('../prototype/modules/mail/templates/draggin_box.ejs', {texto : $(this).find(".td_msg_subject").text().substring(0,18) + "...", type: "messages"})); 544 else 545 return $(DataLayer.render('../prototype/modules/mail/templates/draggin_box.ejs', {texto : $(this).find(".td_msg_subject").text(), type: "messages"})); 546 }, 547 cursorAt: { cursor: "move", top: 5, left: 56 }, 548 refreshPositions: true , 549 scroll: true, 550 scrollSensitivity: 100, 551 scrollSpeed: 100, 552 containment: "#divAppbox" 553 }); 554 //_dragArea.makeDragged(new_msg, data[i].msg_number, data[i].subject, true); 491 555 492 556 if( data[i].next_msg_number != undefined && data[i].next_msg_number != null ){ … … 847 911 //cExecute("$this.imap_functions.get_info_msg&msg_number="+previous_msg+"&msg_folder=" + current_folder, show_msg); 848 912 if(!not_opem_previus){ 849 cExecute("$this.imap_functions.get_info_msg&msg_number="+previous_msg+"&msg_folder=" + url_encode(folder), show_msg);850 }913 Execute("$this.imap_functions.get_info_msg&msg_number="+previous_msg+"&msg_folder=" + url_encode(folder), show_msg); 914 } 851 915 } 852 916 else … … 3058 3122 if(!verify_session(data)) 3059 3123 return; 3060 tree_folders.getNodeById(mount_url_folder(["INBOX",special_folders["Trash"]])).alter({caption: get_lang("Trash")});3061 tree_folders.getNodeById(mount_url_folder(["INBOX",special_folders["Trash"]]))._refresh();3124 //tree_folders.getNodeById(mount_url_folder(["INBOX",special_folders["Trash"]])).alter({caption: get_lang("Trash")}); 3125 //tree_folders.getNodeById(mount_url_folder(["INBOX",special_folders["Trash"]]))._refresh(); 3062 3126 update_quota(get_current_folder()); 3127 draw_new_tree_folder(); 3063 3128 if (data){ 3064 3129 write_msg(get_lang('Your Trash folder was empty.')); … … 3121 3186 remove_rows(document.getElementById("table_box")); 3122 3187 } 3123 tree_folders.getNodeById(mount_url_folder(["INBOX",special_folders["Spam"]])).alter({caption: get_lang("Spam")}); 3124 tree_folders.getNodeById(mount_url_folder(["INBOX",special_folders["Spam"]]))._refresh(); 3188 //tree_folders.getNodeById(mount_url_folder(["INBOX",special_folders["Spam"]])).alter({caption: get_lang("Spam")}); 3189 //tree_folders.getNodeById(mount_url_folder(["INBOX",special_folders["Spam"]]))._refresh(); 3190 draw_new_tree_folder(); 3125 3191 update_quota(get_current_folder()); 3126 3192 if (data) … … 3129 3195 write_msg(get_lang('ERROR emptying your Spam folder.')); 3130 3196 } 3131 var realyEmptySpam=confirm(get_lang('Do you really want to empty your spam folder?')); 3132 if (realyEmptySpam) 3133 cExecute ("$this.imap_functions.empty_folder&clean_folder="+"imapDefaultSpamFolder", handler_empty_spam); 3197 3198 var _div = document.createElement("div"); 3199 _div.innerHTML = '<p style="margin:10px 5px 5px 5px;">' + 3200 '<span class="ui-icon ui-icon-alert" style="float:left; margin:0 7px 20px 0;"></span>'+ 3201 get_lang('Do you really want to empty your spam folder?') + 3202 '</p>'; 3203 $(_div).dialog( 3204 { 3205 resizable: false, 3206 title: get_lang('Empty Spam'), 3207 position: 'center', 3208 width: 350, 3209 height:140, 3210 modal: true, 3211 buttons: [ 3212 { 3213 text: get_lang("Yes"), 3214 click: function() 3215 { 3216 cExecute ("$this.imap_functions.empty_folder&clean_folder="+"imapDefaultSpamFolder", handler_empty_spam); 3217 $( this ).dialog( "close" ); 3218 }, 3219 style: "margin-top: -2.1em" 3220 }, 3221 { 3222 text: get_lang("No"), 3223 click: function() 3224 { 3225 $( this ).dialog( "close" ); 3226 }, 3227 style: "margin-top: -2.1em" 3228 }, 3229 ] 3230 }); 3231 3232 $(_div).dialog('open'); 3134 3233 } 3135 3234 -
trunk/expressoMail1_2/js/search.js
r5484 r5486 576 576 577 577 td.setAttribute("width", colSizes[1][7]); 578 td.className = "td_resizable ";578 td.className = "td_resizable td_msg_search_subject"; 579 579 td.onclick = _onclick; 580 580 td.setAttribute("NoWrap","true"); … … 637 637 } 638 638 639 _dragArea.makeDragged(tr, uid_msg, subject, true, mailbox); 640 639 //_dragArea.makeDragged(tr, uid_msg, subject, true, mailbox); 640 $(tr).draggable({ 641 helper: function(event){ 642 $(this).find("input:checkbox").attr("checked", true); 643 if($("#content_id_"+border_id).find("tr input:checked").length > 1) 644 return $(DataLayer.render('../prototype/modules/mail/templates/draggin_box.ejs', {texto : (($("#content_id_"+border_id).find("tr input:checked")).length+" mensagens selecionadas"), type: "messages"})); 645 if( $(this).find(".td_msg_search_subject").text().length > 18 ) 646 return $(DataLayer.render('../prototype/modules/mail/templates/draggin_box.ejs', {texto : $(this).find(".td_msg_search_subject").text().substring(0,18) + "...", type: "messages"})); 647 else 648 return $(DataLayer.render('../prototype/modules/mail/templates/draggin_box.ejs', {texto : $(this).find(".td_msg_search_subject").text(), type: "messages"})); 649 }, 650 cursorAt: { cursor: "crosshair", top: -5, left: -5 }, 651 refreshPositions: true , 652 scroll: true, 653 scrollSensitivity: 100, 654 scrollSpeed: 100, 655 containment: "#divAppbox" 656 }); 641 657 return tr; 642 658 } -
trunk/expressoMail1_2/templates/default/index.tpl
r5399 r5486 14 14 <tr> 15 15 <td id="folderscol" width="170px" height="100%" valign="top"> 16 <table id="folders_tbl" width=" 170px" border="0" cellspacing="0" cellpadding="0">16 <table id="folders_tbl" width="200px" border="0" cellspacing="0" cellpadding="0"> 17 17 <tbody> 18 18 <tr> … … 62 62 <tr> 63 63 <td class="image-menu" valign="top" style="padding:0px"> 64 <div id="content_folders" class="menu-degrade" style="width: 170px;height:100%;overflow:auto"></div>64 <div id="content_folders" class="menu-degrade" style="width:200px;height:100%;overflow:auto"></div> 65 65 </td> 66 66 </tr> … … 94 94 </script> 95 95 </td> 96 <td class="whiteSpace"> </td> 96 <td class="collapse_folders_td"> 97 <span class="collapse_folders" style="width: 12px; height: 12px;"/> 98 </td> 97 99 <td width="*" valign="top" align="left"> 98 100 <div id="exmail_main_body" class="messagescol"> -
trunk/phpgwapi/templates/default/css/base.css
r5270 r5486 83 83 } 84 84 85 ul85 .tr_message_header ul 86 86 { 87 87 list-style-image: url( "../images/orange-ball.png" ); -
trunk/phpgwapi/templates/default/navbar.inc.php
r5141 r5486 43 43 $var['table_bg_color'] = $GLOBALS['phpgw_info']['theme']['navbar_bg']; 44 44 45 if($GLOBALS['phpgw_info']['user']['preferences']['common']['click_or_onmouseover']=='onmouseover') 46 { 47 $show_menu_event = 'onMouseOver'; 48 } 49 else 50 { 51 $show_menu_event = 'onClick'; 52 } 53 45 $show_menu_event = 'onClick'; 46 54 47 55 48 $applications = ''; … … 203 196 <td colspan="2" nowrap="nowrap" align="right" style="background-color:#dddddd;padding:1px;"> 204 197 <a href="#" '.$show_menu_event.'="ypSlideOutMenu.hide(\'menu1\')" title="'.lang('close').'"> 205 <img style="" border="0" src="'.$var['img_root'].'/close.png"/></a></span></td></tr> 206 <tr> 207 <td colspan="1" valign="top" nowrap="nowrap" align="left" style="background-color:#dddddd;padding:1px;"> 208 <a href="#" onClick="javascript:ypSlideOutMenu.hide(\'menu1\');showBar()" title="'.lang('Expand Menu').'"> 209 <img src = "'.$var['img_root'].'/down.button.png"></a> 210 </td> 211 <td colspan="1" valign="top" nowrap="nowrap" align="left" style="background-color:#dddddd;padding:1px;"> 212 <a href="#" onClick="javascript:ypSlideOutMenu.hide(\'menu1\');showBar()" title="'.lang('Expand Menu').'"> 213 <b>'.lang('Expand Menu').'</b></a></td></tr> 198 <img style="" border="0" src="'.$var['img_root'].'/close.png"/></a></span></td></tr> 214 199 '.$app_extra_icons.'</table> 215 200 </div> … … 220 205 221 206 $var['app_extra_icons_div']= $app_extra_icons_div; 222 $var['app_extra_icons_icon']= '<td width="26" valign="top" align="right" style="zIndex:10000;padding-right:3px;padding-top:10px;"><a title="'.lang('show_more_apps').'" href="#" '.$show_menu_event.'="ypSlideOutMenu.showMenu(\'menu1\')"><img src="'.$var['img_root'].'/extra_icons.png" border="0" /></a></td>';207 $var['app_extra_icons_icon']= '<td width="26" valign="top" align="right" style="zIndex:10000;padding-right:3px;padding-top:10px;"><a title="'.lang('show_more_apps').'" href="#" onMouseOver="ypSlideOutMenu.showMenu(\'menu1\')" onClick="javascript:ypSlideOutMenu.hide(\'menu1\');showBar()"><img src="'.$var['img_root'].'/extra_icons.png" border="0" /></a></td>'; 223 208 224 209 -
trunk/prototype/modules/attach_message/attach_message.css
r5457 r5486 1 1 .foldertree-skin-prognus span.selected {font-weight:bold;} 2 2 .foldertree-skin-prognus span.inbox {} 3 .foldertree-skin-prognus span.trash {background-image: url(images/bin.png) ;}4 .foldertree-skin-prognus span.drafts {background-image: url(images/folder_page_white.png) ;}5 .foldertree-skin-prognus span.spam {background-image: url(images/folder_delete.png) ;}6 .foldertree-skin-prognus span.sent {background-image: url(images/folder_go.png) ;}3 .foldertree-skin-prognus span.trash {background-image: url(images/bin.png)!important;} 4 .foldertree-skin-prognus span.drafts {background-image: url(images/folder_page_white.png)!important;} 5 .foldertree-skin-prognus span.spam {background-image: url(images/folder_delete.png)!important;} 6 .foldertree-skin-prognus span.sent {background-image: url(images/folder_go.png)!important;} 7 7 .foldertree-skin-prognus span.folder {display: block;padding-bottom: 1px;padding-left: 18px;padding-right: 0;padding-top: 1px;} 8 8 .treeview .closed {display:block;}
Note: See TracChangeset
for help on using the changeset viewer.