Changeset 790
- Timestamp:
- 05/05/09 15:52:22 (15 years ago)
- Location:
- trunk
- Files:
-
- 19 edited
- 14 copied
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/index.php
r689 r790 34 34 include('../header.inc.php'); 35 35 $update_version = $GLOBALS['phpgw_info']['flags']['update_version']; 36 $_SESSION['phpgw_info']['expressomail']['user'] = $GLOBALS['phpgw_info']['user']; 37 echo '<link rel="stylesheet" type="text/css" href="templates/'.$_SESSION['phpgw_info']['expressoMail1_2']['user']['preferences']['common']['template_set'].'/main.css">'; 38 echo '<link rel="stylesheet" type="text/css" href="../phpgwapi/js/dftree/dftree.css">'; 39 echo "<script type='text/javascript'>var template = '".$_SESSION['phpgw_info']['expressoMail1_2']['user']['preferences']['common']['template_set']."';</script>"; 36 40 echo "<script src='js/globals.js?".$update_version."' type='text/javascript'></script>"; 37 41 echo "<script src='js/sniff_browser.js?".$update_version."' type='text/javascript'></script>"; … … 41 45 //Enable/Disable VoIP Service -> Voip Server Config 42 46 $voip_enabled = false; 43 $voip_groups = array(); 44 47 $voip_groups = array(); 45 48 if($GLOBALS['phpgw_info']['server']['voip_groups']) { 46 49 $emailVoip = false; … … 71 74 72 75 $_SESSION['phpgw_info']['expressomail']['email_server'] = $boemailadmin->getProfile($emailadmin_profile[0]['profileID']); 73 $_SESSION['phpgw_info']['expressomail']['user'] = $GLOBALS['phpgw_info']['user'];76 // $_SESSION['phpgw_info']['expressomail']['user'] = $GLOBALS['phpgw_info']['user']; 74 77 $_SESSION['phpgw_info']['expressomail']['server'] = $GLOBALS['phpgw_info']['server']; 75 78 $_SESSION['phpgw_info']['expressomail']['ldap_server'] = $ldap_manager ? $ldap_manager->srcs[1] : null; … … 100 103 'use_shortcuts' => $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['use_shortcuts'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['use_shortcuts'] : "0", 101 104 'auto_save_draft' => $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['auto_save_draft'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['auto_save_draft'] : "0", 102 105 'use_dynamic_contacts' => $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['use_dynamic_contacts'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['use_dynamic_contacts'] : "0", 103 106 'number_of_contacts' => $current_config['expressoMail_Number_of_dynamic_contacts'] ? $current_config['expressoMail_Number_of_dynamic_contacts'] : "0", 104 107 'use_cache' => $current_config['expressoMail_enable_cache'], … … 106 109 'remove_attachments_function' => $current_config['expressoMail_remove_attachments_function'], 107 110 'use_important_flag' => $current_config['expressoMail_enable_important_flag'], 108 'use_local_messages' => $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['use_local_messages'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['use_local_messages'] : "0", 111 'use_local_messages' => $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['use_local_messages'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['use_local_messages'] : "0", 109 112 'keep_archived_messages' => $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['keep_archived_messages'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['keep_archived_messages'] : "0" 110 113 111 114 112 115 113 116 114 117 ); 115 118 … … 167 170 var draftsfolder = "'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultDraftsFolder'].'"; 168 171 var sentfolder = "'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder'].'"; 169 var spamfolder = "'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSpamFolder'].'"; 172 var spamfolder = "'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSpamFolder'].'"; 170 173 </script>'; 171 174 … … 175 178 176 179 $obj = createobject("expressoMail1_2.functions"); 180 // este arquivo deve ser carregado antes que 181 // os demais pois nele contem a função get_lang 182 // que é utilizada em diversas partes 183 echo $obj -> getFilesJs("js/common_functions.js"); 177 184 include("inc/load_lang.php"); 185 178 186 // INCLUDE these JS Files: 179 187 echo $obj -> getFilesJs("js/abas.js," . 180 "js/common_functions.js," .181 188 "js/doiMenuData.js," . 182 189 "js/drag_area.js," . … … 203 210 echo "<script>location.href='./preferences.php'</script>"; 204 211 } 212 205 213 ?> 206 214 … … 208 216 <head> 209 217 <title>ExpressoMail</title> 210 <link rel="stylesheet" type="text/css" href="templates/default/main.css">211 218 <link rel="stylesheet" type="text/css" href="../phpgwapi/js/dftree/dftree.css"> 212 219 </head> -
trunk/expressoMail1_2/js/InfoContact.js
r320 r790 11 11 emInfoContact.prototype.createCard = function(){ 12 12 var pic= new Image(); 13 pic.src="./templates/ default/images/card.gif";13 pic.src="./templates/"+template+"/images/card.gif"; 14 14 card = document.createElement("DIV"); 15 15 card.id = "card_cc"; … … 94 94 Element("card_cc_td").innerHTML = "<table cellpadding=0 cellspacing=0 border=0 height='100%' width='100%'><tr><td width='70' height='93' style='padding-top:5px;padding-left:6px' align='center' valign='center'>"+ 95 95 "<img src='./inc/show_img.php?email="+data.email+"'></td><td style='padding-left:2px' align='left' valign='top'>"+ 96 "<br><img align='center' src='templates/ default/images/"+(data.type)+"_catalog.png'><font size=1 color=BLACK> <b>"+get_lang("Sender's Information")+"</b></font>"+96 "<br><img align='center' src='templates/"+template+"/images/"+(data.type)+"_catalog.png'><font size=1 color=BLACK> <b>"+get_lang("Sender's Information")+"</b></font>"+ 97 97 _this.verifyIM(data.uid,data.email)+ 98 "<br><img align='center' src='templates/ default/images/phone.gif'> <font size=1 color=BLACK>"+(phoneUser ? phoneUser : get_lang("None") )+"</font>"+98 "<br><img align='center' src='templates/"+template+"/images/phone.gif'> <font size=1 color=BLACK>"+(phoneUser ? phoneUser : get_lang("None") )+"</font>"+ 99 99 "</td></tr><tr><td valign='top' align='center' colspan='2'>"+ 100 100 "<font size=1 color=BLACK>"+cn+"</font>"+ -
trunk/expressoMail1_2/js/abas.js
r667 r790 14 14 return false; // Not possible to alternate 15 15 show_hide_span_paging(ID); 16 Element("footer_menu").style.display = (ID != "0" ? 'none' : ''); 16 spanD = Element("span_D"); 17 if (spanD) 18 spanD.style.display = (openTab.type[ID] == 0 ? '' : 'none'); 17 19 var len = BordersArray.length; 18 20 for (var i=0; i < len; i++) … … 80 82 numBox=ID; 81 83 } 84 else 85 if (ID.match("search_")) 86 numBox=ID.substr(7); 82 87 currentTab=ID; 83 88 return ID; … … 86 91 function create_border(borderTitle, id_value) 87 92 { 88 var resize = false; 93 var resize = false; 89 94 var offWidth = Element('border_blank').offsetWidth ? Element('border_blank').offsetWidth : Element('border_blank').clientWidth; 90 95 if (offWidth < 200) { … … 95 100 } 96 101 } 97 Element("footer_menu").style.display = 'none';98 102 99 103 if (! id_value) // Is new message? 100 104 var ID = parseInt(BordersArray[(BordersArray.length-1)].sequence) + 1; 101 else{ 102 if (Element("border_id_"+id_value)){ // It's opened already! 103 alternate_border(id_value); 104 return false; 105 } 106 107 if (typeof(id_value) == 'string') 108 for (var bord = 1; bord <= 10; bord++) 109 if (openTab.imapUid[bord] == id_value.substr(0,id_value.length-2)){ 110 alternate_border(bord); // It's opened already! (in a new message) 111 return false; 112 } 113 114 105 else 106 { 107 if (Element("border_id_"+id_value)) // It's opened already! 108 return alternate_border(id_value); 115 109 var ID = id_value; 116 if (Element("border_id_"+id_value+"_r")) // Edit message? if yes treat like new in dragdrop case 117 var id_value = null; 118 } 119 110 } 120 111 td = document.createElement("TD"); 121 112 td.id="border_id_" + ID; … … 126 117 else 127 118 td.setAttribute("width", "200px"); 128 129 td.className = "menu"; 119 130 120 td.setAttribute("align", "right"); 131 121 td.onclick = function(){alternate_border(ID);}; 132 122 td.setAttribute("noWrap","true"); 133 var subject = borderTitle; 134 123 135 124 borderTitle = borderTitle ? borderTitle : id_value ? get_lang("No Subject") : " " ; 136 125 td.value = borderTitle; 137 if (borderTitle.length > 21) {126 if (borderTitle.length > 21) 138 127 borderTitle = borderTitle.substring(0,21) + "..."; 139 } 140 128 141 129 if (resize) 142 130 borderTitle = borderTitle.substring(0, resize*0.08); 143 144 td.innerHTML = "<table width=100% border=0 cellspacing=0 cellpadding=0><tr><td id=font_border_id_" + ID+" class='font-menu' width=*>" + borderTitle + "</td><td width=1px><img onmousedown='javascript:return false' style='cursor:pointer' onclick=delete_border('" + ID + "','false') src='templates/ default/images/close_button.gif'></td></tr></table>";131 132 td.innerHTML = "<table width=100% border=0 cellspacing=0 cellpadding=0><tr><td id=font_border_id_" + ID+" class='font-menu' width=*>" + borderTitle + "</td><td width=1px><img onmousedown='javascript:return false' style='cursor:pointer' onclick=delete_border('" + ID + "','false') src='templates/"+template+"/images/close_button.gif'></td></tr></table>"; 145 133 146 134 bb = document.getElementById("border_blank"); 147 135 parent_bb = bb.parentNode; //Pego o tbody 148 136 parent_bb.insertBefore(td, bb); 149 150 if( (typeof(id_value) == 'string') && id_value.match(/_r$/))137 138 if(! Element("border_id_"+id_value+"_r") ||((typeof(id_value) == 'string') && id_value.match(/_r$/))) 151 139 _dragArea.makeDragged(td, id_value,td.value); 152 140 153 141 BordersArray[BordersArray.length] = new setBorderAttributes(ID); 154 142 155 143 var div = document.createElement("DIV"); 156 144 div.id = "content_id_" + ID; … … 160 148 var bar = document.getElementById("toolbar"); 161 149 var offset = 0; 162 if(bar.style.visibility != 'hidden') 150 if(bar.style.visibility != 'hidden') 163 151 offset = bar.offsetHeight ? bar.offsetHeight : bar.clientHeight; 164 152 165 153 div.style.height = document.body.clientHeight - offset - (is_ie ? 76 : 86); 166 154 div.style.overflow = "hidden"; … … 173 161 174 162 div.style.width = defaultWidth; 175 // div.style.width ="99.3%"; 176 } 177 document.getElementById("exmail_main_body").appendChild(div); 163 } 164 Element("exmail_main_body").insertBefore(div,Element("footer_menu")); 178 165 alternate_border(ID); 179 180 166 return ID; 181 167 } … … 249 235 250 236 hold_session = false; 251 for (i=0;i<BordersArray.length;i++) 252 { 253 m = document.getElementById(BordersArray[i].border_id); 254 if ((m) && (m.className == 'menu-sel')) 255 border_selected = BordersArray[i].border_id; 256 } 257 258 if ('border_id_' + ID == border_selected) 259 { 260 if (BordersArray[i-2].sequence == ID) 237 if (exist_className(Element('border_id_'+ID),'menu-sel')) 238 { 239 if (BordersArray[BordersArray.length-2].sequence == ID) 261 240 this.alternate_border(0); 262 241 else 263 this.alternate_border(BordersArray[ i-2].sequence);242 this.alternate_border(BordersArray[BordersArray.length-2].sequence); 264 243 } 265 244 … … 267 246 border = Element('border_id_' + ID); 268 247 border.parentNode.removeChild(border); 248 var j=0; 249 var new_BordersArray = new Array(); 250 for (i=0;i<BordersArray.length;i++) 251 if (document.getElementById(BordersArray[i].border_id) != null){ 252 new_BordersArray[j] = BordersArray[i]; 253 j++; 254 } 255 if(j == 1) 256 Element("footer_menu").style.display = ''; 257 BordersArray = new_BordersArray; 258 269 259 // Remove Div Content 270 260 content = Element('content_id_' + ID); 271 261 content.parentNode.removeChild(content); 272 273 var new_BordersArray = new Array();274 j = 0;275 for (i=0;i<BordersArray.length;i++)276 {277 if (Element(BordersArray[i].border_id) != null){278 new_BordersArray[j] = BordersArray[i];279 j++;280 }281 }282 if(j == 1)283 Element("footer_menu").style.display = '';284 BordersArray = new_BordersArray;285 262 return true; 286 263 } -
trunk/expressoMail1_2/js/doiMenuData.js
r689 r790 1 _icon_dir="templates/ default/images/menu/";1 _icon_dir="templates/"+template+"/images/menu/"; 2 2 3 3 function ConstructMenuTools(){ … … 85 85 var _tr = document.createElement("TR"); 86 86 var _td = document.createElement("TD"); 87 _td.innerHTML = "<img height=\"16px\" src=\"templates/ default/images/menu/"+item[2]+"\"> "+item[1]+" ";87 _td.innerHTML = "<img height=\"16px\" src=\"templates/"+template+"/images/menu/"+item[2]+"\"> "+item[1]+" "; 88 88 _td.style.color = "DARKBLUE"; 89 89 _td.style.cursor = "pointer"; -
trunk/expressoMail1_2/js/drag_area.js
r689 r790 23 23 this.div_dd.style.display ='none'; 24 24 this.envelope = new Image(); 25 this.envelope.src = "templates/ default/images/envelope.png";25 this.envelope.src = "templates/"+template+"/images/envelope.png"; 26 26 document.body.appendChild(this.div_dd); 27 27 … … 216 216 if(new_folder_name == 'INBOX') 217 217 new_folder_name = get_lang("Inbox"); 218 if (_dragArea.from_list) { 219 if (numBox != 0) 218 if ( _dragArea.from_list ) 219 { 220 if (numBox != 0) 220 221 move_search_msgs("content_id_search_" + numBox, new_folder, new_folder_name); 221 else 222 else 222 223 proxy_mensagens.proxy_move_messages("null", 'selected', 0, new_folder, new_folder_name); 223 224 } 224 else { 225 var msg_number = _dragArea.from_list ? _dragArea.msg_number : _dragArea.msg_number.replace('_r', ''); 225 else 226 { 227 var msg_number = _dragArea.from_list ? _dragArea.msg_number : _dragArea.msg_number.replace('_r',''); 226 228 proxy_mensagens.proxy_move_messages("null", msg_number, msg_number + "_r", new_folder, new_folder_name); 227 229 } -
trunk/expressoMail1_2/js/draw_api.js
r710 r790 21 21 function draw_tree_folders(folders){ 22 22 // Check if the tree folders alredy exist. 23 24 23 if (Element('dftree_tree_folders')){ 25 24 var update_tree_folders = function(data){ 26 25 build_quota(data); 26 var unseen_in_mailbox = 0; 27 var unseen_in_shared_folders = 0; 27 28 for (var i=0; i<data.length; i++){ 29 if ( data[i].folder_unseen > 0 ) 30 { 31 unseen_in_mailbox = parseInt( unseen_in_mailbox + data[ i ].folder_unseen ); 32 if ( data[i].folder_id.indexOf( 'INBOX' ) !== 0 ) 33 unseen_in_shared_folders = parseInt( unseen_in_shared_folders + data[ i ].folder_unseen ); 34 } 35 28 36 var folder_unseen = Element('dftree_'+data[i].folder_id+'_unseen'); 29 37 … … 43 51 } 44 52 45 if(data[i].folder_id == get_current_folder()){53 if(data[i].folder_id == current_folder){ 46 54 var old_new_m = isNaN(parseInt(Element('new_m').innerHTML)) ? parseInt(Element('new_m').firstChild.innerHTML) : parseInt(Element('new_m').innerHTML); 47 55 // if(!isNaN(old_new_m) && old_new_m < data[i].folder_unseen){ … … 52 60 } 53 61 } 62 63 var display_unseen_in_mailbox = tree_folders.getNodeById( 'root' ); 64 //if ( unseen_in_mailbox ) 65 // display_unseen_in_mailbox.alter({caption:'<font style=color:red>[</font><span id="dftree_root_unseen" style="color:red">' + unseen_in_mailbox +'</span><font style=color:red>]</font> ' + get_lang("My Folders")}); 66 //else 67 display_unseen_in_mailbox.alter({caption:get_lang("My Folders")}); 68 display_unseen_in_mailbox._refresh(); 69 70 var display_unseen_in_shared_folders = tree_folders.getNodeById( 'user' ); 71 if ( display_unseen_in_shared_folders ) 72 { 73 if ( unseen_in_shared_folders ) 74 display_unseen_in_shared_folders.alter({caption:'<font style=color:red>[</font><span id="dftree_user_unseen" style="color:red">' + unseen_in_shared_folders +'</span><font style=color:red>]</font> ' + get_lang("Shared folders")}); 75 else 76 display_unseen_in_shared_folders.alter({caption:get_lang("Shared folders")}); 77 display_unseen_in_shared_folders._refresh(); 78 } 54 79 } 55 80 cExecute ("$this.imap_functions.get_folders_list&folder="+current_folder, update_tree_folders); 56 57 81 82 58 83 /** 59 84 * Pastas locais … … 106 131 tree_folders.add(n_root,'anything'); //Places the root; second argument can be anything. 107 132 133 var unseen_in_mailbox = 0; 134 var unseen_in_shared_folders = 0; 108 135 for (var i=0; i<folders.length; i++){ 109 136 if (folders[i].folder_unseen > 0) 110 137 { 138 unseen_in_mailbox = parseInt( unseen_in_mailbox + folders[ i ].folder_unseen ); 139 if ( folders[i].folder_id.indexOf( 'INBOX' ) !== 0 ) 140 unseen_in_shared_folders = parseInt( unseen_in_shared_folders + folders[ i ].folder_unseen ); 141 111 142 var nn = new dNode({id:folders[i].folder_id, caption:lang_folder(folders[i].folder_name) + '<font style=color:red> (</font><span id="dftree_'+folders[i].folder_id+'_unseen" style=color:red>'+folders[i].folder_unseen+'</span><font style=color:red>)</font>', onClick:"change_folder('"+folders[i].folder_id+"','"+folders[i].folder_name+"')", plusSign:folders[i].folder_hasChildren}); 112 143 … … 169 200 } 170 201 171 172 173 202 tree_folders.draw(Element('content_folders')); 174 203 n_root.changeState(); 175 tree_folders.getNodeById('INBOX')._select(); 204 205 var trash_span=document.getElementById('lINBOX/'+trashfolder+'tree_folders'); 206 var draft_span=document.getElementById('lINBOX/'+draftsfolder+'tree_folders'); 207 var sent_span=document.getElementById('lINBOX/'+sentfolder+'tree_folders'); 208 var spam_span=document.getElementById('lINBOX/'+spamfolder+'tree_folders'); 209 210 if (trash_span) 211 trash_span.style.backgroundImage="url(../phpgwapi/templates/"+template+"/images/foldertree_trash.png)"; 212 213 if (draft_span) 214 draft_span.style.backgroundImage="url(../phpgwapi/templates/"+template+"/images/foldertree_draft.png)" 215 216 if (sent_span) 217 sent_span.style.backgroundImage="url(../phpgwapi/templates/"+template+"/images/foldertree_sent.png)"; 218 219 if (spam_span) 220 spam_span.style.backgroundImage="url(../phpgwapi/templates/"+template+"/images/foldertree_spam.png)"; 221 222 tree_folders.getNodeById('INBOX')._select(); 176 223 draw_paging(Element('tot_m').innerHTML); 177 224 // Draw right menu folders. … … 181 228 _dragArea.makeMenuBox(linkBox); 182 229 */ 183 } 184 230 231 var display_unseen_in_mailbox = tree_folders.getNodeById( 'root' ); 232 //if ( unseen_in_mailbox ) 233 // display_unseen_in_mailbox.alter({caption:'<font style=color:red>[</font><span id="dftree_root_unseen" style="color:red">' + unseen_in_mailbox +'</span><font style=color:red>]</font> ' + get_lang("My Folders")}); 234 //else 235 display_unseen_in_mailbox.alter({caption:get_lang("My Folders")}); 236 display_unseen_in_mailbox._refresh(); 237 238 var display_unseen_in_shared_folders = tree_folders.getNodeById( 'user' ); 239 if ( display_unseen_in_shared_folders ) 240 { 241 if ( unseen_in_shared_folders ) 242 display_unseen_in_shared_folders.alter({caption:'<font style=color:red>[</font><span id="dftree_user_unseen" style="color:red">' + unseen_in_shared_folders +'</span><font style=color:red>]</font> ' + get_lang("Shared folders")}); 243 else 244 display_unseen_in_shared_folders.alter({caption:get_lang("Shared folders")}); 245 display_unseen_in_shared_folders._refresh(); 246 } 247 } 248 185 249 var folder_create = ""; 186 250 var nm1 = ""; … … 222 286 if ( data && data.imap_error ) 223 287 { 224 connector.newRequest('error.html', 'templates/ default/error.html', 'GET',288 connector.newRequest('error.html', 'templates/'+template+'/error.html', 'GET', 225 289 function(data) 226 290 { … … 236 300 if(data) { 237 301 build_quota(data); 238 var f_unseen = Element('dftree_'+ get_current_folder()+'_unseen');302 var f_unseen = Element('dftree_'+current_folder+'_unseen'); 239 303 if(f_unseen && f_unseen.innerHTML) 240 304 Element('new_m').innerHTML = '<font face="Verdana" size="1" color="RED">'+f_unseen.innerHTML+'</font>'; … … 279 343 280 344 function open_folder(folder, folder_name){ 281 if ( get_current_folder()!= folder) {345 if (current_folder!= folder) { 282 346 current_folder = folder; 283 347 var handler_draw_box = function(data){ … … 304 368 total_pages = 1; 305 369 306 if(last_folder != get_current_folder()){370 if(last_folder != current_folder){ 307 371 lastPage = 1; 308 372 current_page = 1; 309 last_folder = get_current_folder();373 last_folder = current_folder; 310 374 } 311 375 … … 415 479 openTab.content_id[numBox] = document.getElementById("content_id_"+numBox); 416 480 openTab.imapBox[numBox] = msg_folder; 481 openTab.type[numBox] = 0; 417 482 418 483 table_message_header_box = document.getElementById("table_message_header_box_"+numBox); … … 534 599 } 535 600 536 if(is_ie) { 537 _divScroll.style.overflowY = "auto"; 538 _divScroll.style.overflowX = "hidden"; 539 _divScroll.style.width ="100%"; 540 } 541 else{ 601 _divScroll.style.overflowY = "auto"; 602 _divScroll.style.overflowX = "hidden"; 603 _divScroll.style.width ="100%"; 604 605 if (is_mozilla){ 542 606 _divScroll.style.overflow = "-moz-scrollbars-vertical"; 543 607 _divScroll.style.width ="99.3%"; … … 573 637 f_unseen++; 574 638 tr_element = this.make_tr_message(headers_msgs[i], msg_folder); 575 tbody_element.appendChild(tr_element); 639 if (tr_element) 640 tbody_element.appendChild(tr_element); 576 641 _dragArea.makeDragged(tr_element, headers_msgs[i].msg_number, headers_msgs[i].subject, true); 577 642 } … … 582 647 var tdFolders = Element("folderscol"); 583 648 tdFolders.style.display = preferences.hide_folders == '1' ? "none" : ""; 584 alternate_border(numBox); 649 if ( !currentTab ) 650 alternate_border(numBox); 585 651 draw_footer_box(headers_msgs.num_msgs); 586 652 Element('main_table').style.display = ''; … … 619 685 } 620 686 } 687 621 688 function change_tr_properties(tr_element, newUid, newSubject){ 622 689 var td_who = document.getElementById('td_who_'+tr_element.id); … … 644 711 add_className(tr_element, 'tr_msg_read'); 645 712 } 713 714 if ((headers_msgs.Unseen == 'U') || (headers_msgs.Recent == 'N')) 715 add_className(tr_element, 'tr_msg_unread'); 716 else 717 add_className(tr_element, 'tr_msg_read'); 718 719 if (headers_msgs.Flagged == 'F') 720 add_className(tr_element,'flagged_msg'); 646 721 647 722 td_element1 = document.createElement("TD"); … … 662 737 td_element2.setAttribute("width", "2%"); 663 738 if (headers_msgs.attachment && headers_msgs.attachment.number_attachments > 0) 664 td_element2.innerHTML = "<img src ='templates/default/images/clip.gif' title='" + url_decode(headers_msgs.attachment.names) + "'>"; 739 //td_element2.innerHTML = "<img src ='templates/"+template+"/images/clip.gif' title='" + url_decode(headers_msgs.attachment.names) + "'>"; 740 td_element2.style.background = "url(templates/"+template+"/images/clip.gif) no-repeat center"; 665 741 666 742 td_element21 = document.createElement("TD"); … … 669 745 670 746 if ((headers_msgs.Forwarded == 'F') || (headers_msgs.Draft == 'X' && headers_msgs.Answered == 'A')){ 671 td_element21.innerHTML += "<img src ='templates/default/images/forwarded.gif' title='"+get_lang('Forwarded')+"'>"; 747 //td_element21.innerHTML += "<img src ='templates/"+template+"/images/forwarded.gif' title='"+get_lang('Forwarded')+"'>"; 748 td_element21.style.background = "url(templates/"+template+"/images/forwarded.gif) no-repeat center"; 672 749 headers_msgs.Draft = '' 673 750 headers_msgs.Answered = ''; … … 675 752 } 676 753 else if (headers_msgs.Draft == 'X') 677 td_element2.innerHTML += "<img src ='templates/default/images/draft.gif' title='"+get_lang('Draft')+"'>"; 754 //td_element2.innerHTML += "<img src ='templates/"+template+"/images/draft.gif' title='"+get_lang('Draft')+"'>"; 755 td_element2.style.background = "url(templates/"+template+"/images/draft.gif) no-repeat center"; 678 756 else if (headers_msgs.Answered == 'A') 679 td_element21.innerHTML += "<img src ='templates/default/images/answered.gif' title='"+get_lang('Answered')+"'>"; 757 //td_element21.innerHTML += "<img src ='templates/"+template+"/images/answered.gif' title='"+get_lang('Answered')+"'>"; 758 td_element21.style.background = "url(templates/"+template+"/images/answered.gif) no-repeat center"; 680 759 681 760 td_element22 = document.createElement("TD"); … … 683 762 td_element22.id = "td_message_important_"+headers_msgs.msg_number; 684 763 685 // preload image 686 var _img_important = new Image(); 687 _img_important.src = "templates/default/images/important.gif" 688 if (headers_msgs.Flagged == 'F' || (headers_msgs.Importance.toLowerCase().indexOf("high") != -1 && preferences.use_important_flag == 'True')){ 689 td_element22.innerHTML += "<img src ='templates/default/images/important.gif' title='"+get_lang('Important')+"'>"; 690 } 764 if (headers_msgs.Flagged == 'F' || (headers_msgs.Importance.toLowerCase().indexOf("high") != -1 && preferences.use_important_flag == 'True')) 765 { 766 td_element22.style.background = "url(templates/"+template+"/images/important.gif) no-repeat center"; 767 } 691 768 else 692 769 td_element22.innerHTML += " "; 693 694 770 695 771 td_element23 = document.createElement("TD"); 696 772 td_element23.setAttribute("width", "1%"); … … 699 775 // preload image 700 776 var _img_sent = new Image(); 701 _img_sent.src = "templates/ default/images/sent.gif";777 _img_sent.src = "templates/"+template+"/images/sent.gif"; 702 778 703 779 td_element3 = document.createElement("TD"); … … 708 784 td_element3.innerHTML = ' '; 709 785 786 if (typeof(headers_msgs.from) == 'undefined') 787 return false; 710 788 if(headers_msgs.from.email.toLowerCase() == Element("user_email").value) 711 789 { … … 715 793 else{ 716 794 if(headers_msgs.to.email.toLowerCase() != Element("user_email").value) 717 td_element23.innerHTML = "<img valign='center' src ='templates/ default/images/sent.gif' title='"+get_lang('Sent')+"'>";795 td_element23.innerHTML = "<img valign='center' src ='templates/"+template+"/images/sent.gif' title='"+get_lang('Sent')+"'>"; 718 796 719 797 if ((headers_msgs.to)&&(headers_msgs.to.name != null)) … … 799 877 var message_header = Element("message_header_"+search); 800 878 var handler_draw_box = function(data){ 801 draw_box(data, get_current_folder(),true);879 draw_box(data, current_folder,true); 802 880 draw_paging(Element('tot_m').innerHTML); 803 881 //Mostrar as msgs nao lidas de acordo com o filtro de relevancia … … 825 903 826 904 proxy_mensagens.messages_list(current_folder,1,preferences.max_email_per_page,sort,search,sort_box_reverse,handler_draw_box); 827 // cExecute ("$this.imap_functions.get_range_msgs2&folder="+current_folder+"&msg_range_begin=1&msg_range_end="+preferences.max_email_per_page+"&search_box_type="+search+"&sort_box_type="+sort+"&sort_box_reverse="+sort_box_reverse+"", handler_draw_box);905 cExecute ("$this.imap_functions.get_range_msgs2&folder="+current_folder+"&msg_range_begin=1&msg_range_end="+preferences.max_email_per_page+"&sort_box_type="+sort+"&search_box_type="+search+"&sort_box_reverse="+sort_box_reverse+"", handler_draw_box); 828 906 current_page = 1; 829 907 //Comentado para nao sobrepor o numero de msgs nao lidas ao utilizar os filtros … … 852 930 document.getElementById("message_header_SORTARRIVAL_"+numBox).innerHTML = get_lang("Date"); 853 931 document.getElementById("message_header_SORTSIZE_"+numBox).innerHTML = get_lang("Size"); 854 document.getElementById("message_header_"+(sort_box_type.lastIndexOf("SORT") != "-1" ? sort_box_type : "SORTARRIVAL")+"_"+numBox ).innerHTML = "<B>"+type_name+"</B><img src ='templates/ default/images/arrow_"+(sort_box_reverse == 1 ? 'desc' : 'asc')+"endant.gif'>";932 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'>"; 855 933 } 856 934 function draw_message(info_msg, ID){ … … 870 948 var img_next_msg = document.createElement("IMG"); 871 949 img_next_msg.id = 'msg_opt_next_' + ID; 872 img_next_msg.src = './templates/ default/images/down.button.png';950 img_next_msg.src = './templates/'+template+'/images/down.button.png'; 873 951 img_next_msg.title = get_lang('Next'); 874 952 img_next_msg.style.cursor = 'pointer'; … … 897 975 msg_range_begin = (msg_range_end-(preferences.max_email_per_page)+1); 898 976 kill_current_box(); 899 cExecute ('$this.imap_functions.get_range_msgs2&folder='+ get_current_folder()+'&msg_range_begin='+msg_range_begin+'&msg_range_end='+msg_range_end+'&sort_box_reverse=1', function handler(data){draw_box(data, get_current_folder());}) */977 cExecute ('$this.imap_functions.get_range_msgs2&folder='+current_folder+'&msg_range_begin='+msg_range_begin+'&msg_range_end='+msg_range_end+'&sort_box_reverse=1', function handler(data){draw_box(data, current_folder);}) */ 900 978 delete_border(ID); 901 979 }; … … 905 983 var img_previous_msg = document.createElement("IMG"); 906 984 img_previous_msg.id = 'msg_opt_previous_' + ID; 907 img_previous_msg.src = './templates/ default/images/up.button.png';985 img_previous_msg.src = './templates/'+template+'/images/up.button.png'; 908 986 img_previous_msg.title = get_lang('Previous'); 909 987 img_previous_msg.style.cursor = 'pointer'; … … 966 1044 td.innerHTML = _name.bold() + ', ' + info_msg.smalldate; 967 1045 if (info_msg.attachments.length > 0) 968 td.innerHTML += " <img style='cursor:pointer' onclick='javascript:Element(\"option_hide_more_"+ID+"\").onclick()' src ='templates/ default/images/clip.gif' title='"+info_msg.attachments.names+"'>";1046 td.innerHTML += " <img style='cursor:pointer' onclick='javascript:Element(\"option_hide_more_"+ID+"\").onclick()' src ='templates/"+template+"/images/clip.gif' title='"+info_msg.attachments.names+"'>"; 969 1047 970 1048 if (typeof(info_msg.signature) == 'string') 971 1049 { 972 1050 if (info_msg.signature != "void") 973 td.innerHTML += ' <img style="cursor:pointer" onclick="alert(\''+ get_lang("This message is signed, and you can trust.") + info_msg.signature +'\');" src="templates/ default/images/signed.gif">';1051 td.innerHTML += ' <img style="cursor:pointer" onclick="alert(\''+ get_lang("This message is signed, and you can trust.") + info_msg.signature +'\');" src="templates/'+template+'/images/signed.gif">'; 974 1052 else 975 td.innerHTML += " <img style='cursor:pointer' onclick='alert(\""+get_lang("This message is signed, but it is invalid. You should not trust on it.")+"\");' title='"+get_lang("Voided message")+"' src='templates/ default/images/invalid.gif'>";1053 td.innerHTML += " <img style='cursor:pointer' onclick='alert(\""+get_lang("This message is signed, but it is invalid. You should not trust on it.")+"\");' title='"+get_lang("Voided message")+"' src='templates/"+template+"/images/invalid.gif'>"; 976 1054 } 977 1055 978 1056 if (info_msg.DispositionNotificationTo) 979 1057 { 980 td.innerHTML += ' <img style="cursor:pointer" alt="'+ get_lang('Message with read notification') + '" title="'+ get_lang('Message with read notification') + '" src="templates/ default/images/notification.gif">';1058 td.innerHTML += ' <img style="cursor:pointer" alt="'+ get_lang('Message with read notification') + '" title="'+ get_lang('Message with read notification') + '" src="templates/'+template+'/images/notification.gif">'; 981 1059 } 982 1060 … … 985 1063 { 986 1064 var options = document.createElement("TD"); 987 options.width = " 100%";1065 options.width = "30%"; 988 1066 options.setAttribute("noWrap","true"); 989 1067 var option_hide_more = document.createElement("SPAN"); … … 1012 1090 } 1013 1091 }; 1014 1092 var option_mark = document.createElement('TD'); 1093 option_mark.align = "left"; 1094 option_mark.width = "50%"; 1095 var option_mark_as_unseen = '<span class="message_options" onclick="set_messages_flag(\'unseen\','+info_msg.msg_number+');write_msg(\''+get_lang('Message marked as ')+get_lang("Unseen")+'.\');">'+get_lang("Unseen")+'</span>, '; 1096 var option_mark_as_important = '<span class="message_options" onclick="set_messages_flag(\'flagged\','+info_msg.msg_number+');write_msg(\''+get_lang('Message marked as ')+get_lang("Important")+'.\');">'+get_lang("Important")+'</span>, '; 1097 var option_mark_as_normal = '<span class="message_options" onclick="set_messages_flag(\'unflagged\','+info_msg.msg_number+');write_msg(\''+get_lang('Message marked as ')+get_lang("Normal")+'.\');">'+get_lang("Normal")+'</span>'; 1098 option_mark.innerHTML = option_mark_as_unseen+option_mark_as_important+option_mark_as_normal; 1015 1099 option_hide_more.innerHTML = get_lang('Options'); 1016 1100 options.appendChild(option_hide_more); 1017 1101 1018 1102 var space0 = document.createElement("SPAN"); 1019 space0.innerHTML = ' ';1103 space0.innerHTML = ' | '; 1020 1104 var space1 = document.createElement("SPAN"); 1021 space1.innerHTML = ' ';1105 space1.innerHTML = ' | '; 1022 1106 var space2 = document.createElement("SPAN"); 1023 space2.innerHTML = ' ';1107 space2.innerHTML = ' | '; 1024 1108 var space3 = document.createElement("SPAN"); 1025 space3.innerHTML = ' ';1109 space3.innerHTML = ' | '; 1026 1110 var space4 = document.createElement("SPAN"); 1027 space4.innerHTML = ' '; 1028 1029 var option_print = document.createElement("SPAN"); 1030 option_print.id = 'msg_opt_print_'+ID; 1031 option_print.className = 'message_options'; 1032 option_print.onclick = function(){print_msg(info_msg.msg_folder,info_msg.msg_number,ID);}; 1033 option_print.innerHTML = get_lang('Print'); 1034 options.appendChild(space0); 1035 options.appendChild(option_print); 1111 space4.innerHTML = ' | '; 1112 1036 1113 var option_forward = document.createElement("SPAN"); 1037 1114 option_forward.id = 'msg_opt_forward_'+ID; … … 1048 1125 options.appendChild(space2); 1049 1126 options.appendChild(option_reply); 1050 var option_delete = document.createElement("SPAN"); 1051 option_delete.id = 'msg_opt_delete_'+ID; 1052 option_delete.className = 'message_options'; 1053 option_delete.onclick = function(){proxy_mensagens.delete_msgs(info_msg.msg_folder, info_msg.msg_number, ID);}; 1054 option_delete.innerHTML = get_lang('Delete'); 1055 options.appendChild(space3); 1056 options.appendChild(option_delete); 1127 /* TODO, template == default ? what hell you're doing*/ 1128 if (template == "default"){ 1129 var option_delete = document.createElement("SPAN"); 1130 option_delete.id = 'msg_opt_delete_'+ID; 1131 option_delete.className = 'message_options'; 1132 option_delete.onclick = function(){proxy_mensagens.delete_msgs(info_msg.msg_folder, info_msg.msg_number, ID);}; 1133 option_delete.innerHTML = get_lang('Delete'); 1134 options.appendChild(space3); 1135 options.appendChild(option_delete); 1136 } 1057 1137 1058 1138 tr.appendChild(td); 1139 tr.appendChild(option_mark); 1059 1140 tr.appendChild(options); 1060 1141 tr.appendChild(next_previous_msg_td); … … 1078 1159 1079 1160 var option_move = '<span class="message_options" onclick=wfolders.makeWindow("'+ID+'","move_to");>'+get_lang("Move")+'</span> | '; 1080 var option_reply_to_all = '<span class="message_options" onclick=new_message("reply_to_all_with_history","'+ID+'");>'+get_lang("Reply to all")+'</span> | ';1081 var option_reply_without_history = '<span class="message_options" onclick=new_message("reply_without_history","'+ID+'");>'+get_lang("Reply without history")+'</span> | ';1082 var option_reply_to_all_without_history = '<span class="message_options" onclick=new_message("reply_to_all_without_history","'+ID+'");>'+get_lang("Reply to all without history")+'</span> |';1083 var option_source_msg = '<span class="message_options" onclick=proxy_mensagens.proxy_source_msg("'+ID+'","'+url_encode(info_msg.msg_folder)+'");>'+get_lang("Message Font")+'</span>';1084 1085 div_other_options.innerHTML = option_ mark_as + option_mark_as_unseen + option_mark_as_important + option_mark_as_normal + option_move + option_reply_to_all + option_reply_without_history + option_reply_to_all_without_history + option_source_msg;1161 var option_reply_to_all = '<span onmouseover="this.className=\'message_options_active\'" onmouseout="this.className=\'message_options\'" class="message_options" onclick=new_message("reply_to_all_with_history","'+ID+'");>'+get_lang("Reply to all")+'</span> | '; 1162 var option_reply_without_history = '<span onmouseover="this.className=\'message_options_active\'" onmouseout="this.className=\'message_options\'" class="message_options" onclick=new_message("reply_without_history","'+ID+'");>'+get_lang("Reply without history")+'</span> | '; 1163 var option_reply_to_all_without_history = '<span onmouseover="this.className=\'message_options_active\'" onmouseout="this.className=\'message_options\'" class="message_options" onclick=new_message("reply_to_all_without_history","'+ID+'");>'+get_lang("Reply to all without history")+'</span> </div>'; 1164 var option_source_msg =""; //= '<span class="message_options" onclick=source_msg("'+ID+'","'+url_encode(info_msg.msg_folder)+'");>'+get_lang("Message Font")+'</span>'; 1165 1166 div_other_options.innerHTML = option_reply_to_all + option_reply_without_history + option_reply_to_all_without_history + option_source_msg; 1086 1167 if (use_spam_filter) { 1087 1168 if(info_msg.msg_folder == 'INBOX'+cyrus_delimiter+'Spam') … … 1183 1264 } 1184 1265 1185 1186 1266 var from = document.createElement("TD"); 1187 1267 from.id = "from_"+ID; … … 1196 1276 from_values.type = "HIDDEN"; 1197 1277 from_values.value = info_msg.from.full; //Veio do IMAP, sem images nem links. 1198 1278 1199 1279 var local_message = document.createElement("INPUT"); 1200 1280 local_message.id = "is_local_"+ID; … … 1202 1282 local_message.type = "HIDDEN"; 1203 1283 local_message.value = (info_msg.local_message)?"1":"0"; 1204 1284 1205 1285 tr1.appendChild(td1); 1206 1286 tr1.appendChild(from); 1207 1287 tr1.appendChild(from_values); 1208 1288 tr1.appendChild(local_message); 1209 1210 1211 1289 1290 1291 1212 1292 if (info_msg.reply_to){ 1213 1293 var tr11 = document.createElement("TR"); … … 1331 1411 1332 1412 /* 1333 * The function below is ugly, doesn't possible use its.1413 * The function below is ugly, doesn't possible use this. 1334 1414 * The problem is that the code's function was written 1335 1415 * on a hardcode concept. … … 1342 1422 else{ 1343 1423 /* 1344 * The function below is ugly, it is not possible to use th em.1424 * The function below is ugly, it is not possible to use this. 1345 1425 * The problem is that the code's function was written 1346 1426 * on a hardcode concept. … … 1371 1451 date_hour.type = "HIDDEN"; 1372 1452 date_hour.value = info_msg.msg_hour 1373 1374 1453 date.className = "header_message_field"; 1375 1454 tr4.appendChild(td4); … … 1390 1469 tr5.appendChild(subject); 1391 1470 tbody_message_others_options.appendChild(tr5); 1392 1393 1471 if (info_msg.attachments.length > 0){ 1394 1472 var tr6 = document.createElement("TR"); … … 1428 1506 attachments.appendChild(zipped_attachments); 1429 1507 } 1508 1430 1509 attachments.id = "attachments_" + ID; 1431 1510 for (var i=0; i<info_msg.attachments.length; i++){ … … 1444 1523 //Link para importar calendário 1445 1524 var link_import_attachment = new Image(); 1446 link_import_attachment.src = "templates/ default/images/new.png";1525 link_import_attachment.src = "templates/"+template+"/images/new.png"; 1447 1526 link_import_attachment.setAttribute("onclick","javascript:import_calendar('"+info_msg.msg_folder+"&msg_number="+info_msg.msg_number+"&msg_part="+info_msg.attachments[i].pid+"&idx_file="+i+"&encoding="+info_msg.attachments[i].encoding+"');"); 1448 1527 link_import_attachment.title = get_lang("Import to calendar"); … … 1456 1535 } 1457 1536 else { 1458 link_attachment.innerHTML += '<BR>';1459 attachments.appendChild(link_attachment);1537 link_attachment.innerHTML += '<BR>'; 1538 attachments.appendChild(link_attachment); 1460 1539 } 1461 1540 } … … 1469 1548 var bar = document.getElementById("toolbar"); 1470 1549 var offset = 0; 1471 if(bar.style.visibility != 'hidden') 1472 offset = bar.offsetHeight ? bar.offsetHeight : bar.clientHeight; 1550 if(bar.style.visibility != 'hidden') 1551 offset = bar.offsetHeight ? bar.offsetHeight : bar.clientHeight; 1473 1552 var div = document.createElement("DIV"); 1474 1553 div.id = "div_message_scroll_"+ID; 1475 1554 div.style.background = 'WHITE'; 1476 1555 div.style.height = document.body.clientHeight - offset - 125; 1477 content.style.height = document.body.clientHeight - offset - 80;1556 content.style.height = document.body.clientHeight - offset - 90; 1478 1557 div.style.overflow = "auto"; 1479 1558 div.style.width = defaultWidth - (is_ie ? 5 : 0); … … 1484 1563 td.colSpan = '2'; 1485 1564 div.appendChild(table_message_others_options); 1565 var imgTag = info_msg.body.match(/(<img[^>]*src[^=]*=['"][^'"]*["'][^>]*>)|(<td[^>]*background[^=]*=['"][^'"]*["'][^>]*>)/gi); 1566 var newBody = info_msg.body; 1567 if(!info_msg.showImg && imgTag) 1568 { 1569 var domains = ''; 1570 var blocked = false; 1571 var forbidden = true; 1572 if (preferences.notification_domains != undefined && preferences.notification_domains != "") 1573 domains = preferences.notification_domains.split(','); 1574 for(var j = 0; j < imgTag.length; j++) 1575 { 1576 for (var i = 0; i < domains.length; i++) 1577 { 1578 imgSource = imgTag[j].match(/=['"](http:\/\/)+[^'"\/]*/); 1579 if (imgSource && imgSource.toString().substr(5).match(domains[i])) 1580 forbidden = false; 1581 } 1582 if (forbidden) 1583 { 1584 newBody = newBody.replace(imgTag[j],"<img src='templates/"+template+"/images/forbidden.png'>"); 1585 blocked=true; 1586 } 1587 } 1588 if (blocked) 1589 { 1590 var showImgLink = document.createElement('DIV'); 1591 showImgLink.id="show_img_link"; 1592 showImgLink.onclick = function () { cExecute('$this.imap_functions.get_info_msg&msg_number='+info_msg.msg_number+'&msg_folder='+info_msg.msg_folder,show_msg_img); }; 1593 showImgLink.className="show_img_link"; 1594 showImgLink.innerHTML = get_lang("Show images from")+": "+info_msg.from.email; 1595 td.appendChild(showImgLink); 1596 } 1597 } 1486 1598 td.appendChild(div); 1487 1599 tr.appendChild(td) … … 1491 1603 ////////////////////////////////////////////////////////////////////////////////////////////////////// 1492 1604 //Make the body message. 1493 ////////////////////////////////////////////////////////////////////////////////////////////////////// 1605 /////////////////////////////////////////////////////////////////////////////////////////////////////// 1494 1606 var tr = document.createElement("TR"); 1495 1607 tr.className = "tr_message_body"; 1496 1608 var td = document.createElement("TD"); 1497 1609 //td.setAttribute("colSpan","2"); 1498 info_msg.body = info_msg.body.replace("<body","<span");1499 info_msg.body = info_msg.body.replace("<BODY","<span");1500 div.innerHTML+= "<span id='body_"+ID+"'>"+ info_msg.body+"</span><br><br>";1610 newBody = newBody.replace("<body","<span"); 1611 newBody = newBody.replace("<BODY","<span"); 1612 div.innerHTML+= "<span id='body_"+ID+"'>"+newBody+"</span><br><br>"; 1501 1613 ////////////////////////////////////////////////////////////////////////////////////////////////////// 1502 1614 //Make the thumbs of the message. … … 1526 1638 } 1527 1639 1528 td.innerHTML += "<BR><img src='templates/ default/images/menu/ktip.png'>"+get_lang("<b>Tip:</b> For faster save, click over the image with <u>right button</u>.");1640 td.innerHTML += "<BR><img src='templates/"+template+"/images/menu/ktip.png'>"+get_lang("<b>Tip:</b> For faster save, click over the image with <u>right button</u>."); 1529 1641 td.innerHTML += "<BR>"; 1530 1642 … … 1550 1662 ////////////////////////////////////////////////////////////////////////////////////////////////////// 1551 1663 } 1664 1552 1665 function draw_new_message(border_ID){ 1553 1666 var ID = create_border("",border_ID); … … 1699 1812 1700 1813 var img_search = document.createElement("IMG"); 1701 img_search.src = "./templates/ default/images/search.gif";1814 img_search.src = "./templates/"+template+"/images/search.gif"; 1702 1815 img_search.title = get_lang('Search') + " | " + get_lang('Use F9 Key as shortcut.'); 1703 1816 img_search.onclick = function () {emQuickSearch(document.getElementById('to_'+ID).value, 'to', ID);}; … … 1782 1895 td_cc.appendChild(input_cc); 1783 1896 var img_search = document.createElement("IMG"); 1784 img_search.src = "./templates/ default/images/search.gif";1897 img_search.src = "./templates/"+template+"/images/search.gif"; 1785 1898 img_search.onclick = function () {emQuickSearch(document.getElementById('cc_'+ID).value, 'cc', ID)} 1786 1899 img_search.title = get_lang('Search') + " | " + get_lang('Use F9 Key as shortcut.'); … … 1865 1978 td_cco.appendChild(input_cco); 1866 1979 var img_search = document.createElement("IMG"); 1867 img_search.src = "./templates/ default/images/search.gif";1980 img_search.src = "./templates/"+template+"/images/search.gif"; 1868 1981 img_search.title = get_lang('Search') + " | " + get_lang('Use F9 Key as shortcut.'); 1869 1982 img_search.onclick = function () {emQuickSearch(document.getElementById('cco_'+ID).value, 'cco', ID);}; … … 1962 2075 tbody_message.appendChild(trn); 1963 2076 } 2077 1964 2078 var add_files = document.createElement("A"); 1965 2079 add_files.setAttribute("href", "javascript:void(0)"); … … 2006 2120 var _div = document.createElement("DIV"); 2007 2121 _div.id = "div_message_scroll_"+ID; 2008 // _div.style.background = 'WHITE';2009 2122 _div.style.height = document.body.clientHeight - _offset - 105; 2010 2123 content.style.height = document.body.clientHeight - _offset - 80; 2011 2012 2124 _div.style.overflow = "auto"; 2013 2125 _div.style.width = defaultWidth; … … 2179 2291 td21.height="15"; 2180 2292 td22 = document.createElement("TD"); 2181 td21.setAttribute("background","templates/ default/images/dsunused.gif");2293 td21.setAttribute("background","templates/"+template+"/images/dsunused.gif"); 2182 2294 table221 = document.createElement("TABLE"); 2183 2295 tbody221 = document.createElement("TBODY"); … … 2196 2308 else 2197 2309 write_msg(get_lang("Warning: Your Mailbox is almost full!")); 2198 td221.setAttribute("background","templates/ default/images/dsalert.gif");2310 td221.setAttribute("background","templates/"+template+"/images/dsalert.gif"); 2199 2311 } 2200 2312 else if(value > 80) 2201 td221.setAttribute("background","templates/ default/images/dswarn.gif");2313 td221.setAttribute("background","templates/"+template+"/images/dswarn.gif"); 2202 2314 else 2203 td221.setAttribute("background","templates/ default/images/dsused.gif");2315 td221.setAttribute("background","templates/"+template+"/images/dsused.gif"); 2204 2316 2205 2317 tr221.appendChild(td221); … … 2231 2343 for (var i=0; i<(headers_msgs.length); i++){ 2232 2344 var tr = this.make_tr_message(headers_msgs[i], headers_msgs[i].msg_folder); 2233 tbody.appendChild(tr); 2345 if (tr) 2346 tbody.appendChild(tr); 2234 2347 } 2235 2348 } … … 2291 2404 td_element5.align = "center"; 2292 2405 td_element5.innerHTML = "<B>"+get_lang("Date")+"</B>"; 2293 td_element5.innerHTML += "<img src ='templates/ default/images/arrow_descendant.gif'>";2406 td_element5.innerHTML += "<img src ='templates/"+template+"/images/arrow_descendant.gif'>"; 2294 2407 td_element6 = document.createElement("TD"); 2295 2408 td_element6.setAttribute("width", "10%"); … … 2386 2499 } 2387 2500 var idx_cc = 0; 2388 function draw_plugin_cc(ID, addrs) { 2501 function draw_plugin_cc(ID, addrs) 2502 { 2389 2503 connector.loadScript("ccQuickAdd"); 2390 2504 … … 2416 2530 2417 2531 var sm_envelope_img1 = '<img style="cursor:'+ (is_ie ? 'hand' : 'pointer') +'" title="' + get_lang("Add Contact") + 2418 '" onclick="ccQuickAddOne.showList(\''+cc_data+'\')" src="./templates/ default/images/user_card.png">';2532 '" onclick="ccQuickAddOne.showList(\''+cc_data+'\')" src="./templates/'+template+'/images/user_card.png">'; 2419 2533 var to_addybook_add = "<SPAN id='insert_plugin_"+idx_cc+"_"+ID+"'>"; 2420 2534 to_addybook_add += addrs; … … 2432 2546 dn_em.setAttribute("title",get_lang("Block Sender")); 2433 2547 dn_em.style.cursor = "pointer"; 2434 dn_em.innerHTML = "<img align='top' onclick=filter.new_rule('"+email+"') src='./templates/ default/images/deny.gif'>";2548 dn_em.innerHTML = "<img align='top' onclick=filter.new_rule('"+email+"') src='./templates/"+template+"/images/deny.gif'>"; 2435 2549 return dn_em; 2436 2550 … … 2470 2584 } 2471 2585 2472 span_options.innerHTML = 2473 '<span title="'+get_lang("Delete")+'" style="margin-left:8px" class="message_options" onclick=proxy_mensagens.delete_msgs(\'null\',\'selected\',\'null\')>'+get_lang("Delete")+'</span> | '+ 2474 '<span title="'+get_lang("Move")+'" class="message_options" onclick=wfolders.makeWindow(\"\",\"move_to\")>'+get_lang("Move")+'</span> | '+ 2475 '<span title="'+get_lang("Print")+'" class="message_options" onclick=print_all()>'+get_lang("Print")+'</span> | '+ 2476 '<span title="'+get_lang("Export")+'" class="message_options" onclick="export_all_selected_msgs()">'+get_lang("Export")+'</span> | ' + 2477 '<span title="'+get_lang("Import")+'" class="message_options" onclick="import_window()">'+get_lang("Import")+'</span>'; 2586 var change_font_color = 'onmouseover="var last_class = this.className;'+ 2587 'this.className=\'message_options_active\';'+ 2588 'this.onmouseout=function(){this.className=last_class;}"'; 2589 2590 span_options.innerHTML = 2591 '<span class="message_options_trash"><span ' + change_font_color + ' title="'+get_lang("Delete")+'" class="message_options" onclick=proxy_mensagens.delete_msgs(\'null\',\'selected\',\'null\')>'+get_lang("Delete")+'</span></span>'+ 2592 '<span class="message_options_move"><span ' + change_font_color + ' title="'+get_lang("Move")+'" class="message_options" onclick=wfolders.makeWindow(\"\",\"move_to\")>'+get_lang("Move")+'</span></span>'+ 2593 '<span class="message_options_print"><span ' + change_font_color + ' title="'+get_lang("Print")+'" class="message_options" onclick=print_all()>'+get_lang("Print")+'</span></span>'+ 2594 '<span class="message_options_export"><span ' + change_font_color + ' title="'+get_lang("Export")+'" class="message_options" onclick="export_all_selected_msgs()">'+get_lang("Export")+'</span></span>' + 2595 '<span class="message_options_import"><span ' + change_font_color + ' title="'+get_lang("Import")+'" class="message_options" onclick="import_window()">'+get_lang("Import")+'</span></span>'; 2478 2596 if(preferences.use_local_messages==1) 2479 span_options.innerHTML += ' | <spantitle="'+get_lang("Archive")+'" class="message_options" onclick="archive_msgs(\''+folder+'\',null)">'+get_lang("Archive")+'</span>';2597 span_options.innerHTML += ' <span ' + change_font_color + ' title="'+get_lang("Archive")+'" class="message_options" onclick="archive_msgs(\''+folder+'\',null)">'+get_lang("Archive")+'</span>'; 2480 2598 if (use_spam_filter) { 2481 if ( get_current_folder()== 'INBOX'+cyrus_delimiter+'Spam' ) {2482 span_options.innerHTML += ' | <span title="'+get_lang("Not Spam")+'" class="message_options" onclick="nospam(\'selected\',\'null\',\'null\')">'+get_lang("Not Spam")+'</span>';2599 if ( current_folder == 'INBOX'+cyrus_delimiter+'Spam' ) { 2600 span_options.innerHTML += ' | <span ' + change_font_color + ' title="'+get_lang("Not Spam")+'" class="message_options" onclick="nospam(\'selected\',\'null\',\'null\')">'+get_lang("Not Spam")+'</span>'; 2483 2601 } 2484 2602 else { 2485 span_options.innerHTML += ' | <span title="'+get_lang("Mark as Spam")+'" class="message_options" onclick="spam(\'null\', \'selected\',\'null\')">'+get_lang("Mark as Spam")+'</span>';2603 span_options.innerHTML += ' | <span ' + change_font_color + ' title="'+get_lang("Mark as Spam")+'" class="message_options" onclick="spam(\'null\', \'selected\',\'null\')">'+get_lang("Mark as Spam")+'</span>'; 2486 2604 } 2487 2605 } … … 2496 2614 span_D.innerHTML = 2497 2615 get_lang("List")+': '+ 2498 '<span id="span_flag_SORTARRIVAL" style="'+(search_box_type == 'ALL' ? 'font-weight:bold;text-decoration:underline' : '')+'" title="'+get_lang("All")+'" class="message_options" onclick="if(\'ALL\' == \''+search_box_type+'\') return false;sort_box(\'ALL\',\''+sort_box_type+'\')">'+get_lang("All")+'</span>, '+2499 '<span id="span_flag_UNSEEN" style="'+(search_box_type == 'UNSEEN' ? 'font-weight:bold;text-decoration:underline' : '')+'" title="'+get_lang("l_unseen")+'" class="message_options" onclick="if(\'UNSEEN\' == \''+search_box_type+'\') return false;sort_box(\'UNSEEN\',\''+sort_box_type+'\')">'+get_lang("l_unseen")+'</span>, '+2500 '<span id="span_flag_SEEN" style="'+(search_box_type == 'SEEN' ? 'font-weight:bold;text-decoration:underline' : '')+'" title="'+get_lang("l_seen")+'" class="message_options" onclick="if(\'SEEN\' == \''+search_box_type+'\') return false;sort_box(\'SEEN\',\''+sort_box_type+'\')">'+get_lang("l_seen")+'</span>, '+2501 '<span id="span_flag_ANSWERED" style="'+(search_box_type == 'ANSWERED' ? 'font-weight:bold;text-decoration:underline' : '')+'" title="'+get_lang("l_answered")+'" class="message_options" onclick="if(\'ANSWERED\' == \''+search_box_type+'\') return false;sort_box(\'ANSWERED\',\''+sort_box_type+'\')">'+get_lang("l_answered")+'</span>, '+2502 '<span id="span_flag_FLAGGED" style="'+(search_box_type == 'FLAGGED' ? 'font-weight:bold;text-decoration:underline' : '')+'" title="'+get_lang("l_important")+'" class="message_options" onclick="if(\'FLAGGED\' == \''+search_box_type+'\') return false;sort_box(\'FLAGGED\',\''+sort_box_type+'\')">'+get_lang("l_important")+'</span> ';2616 '<span ' + change_font_color + ' id="span_flag_SORTARRIVAL" class="'+(search_box_type == 'ALL' ? 'message_options_over' : 'message_options')+'" title="'+get_lang("All")+'" onclick="if(\'ALL\' == \''+search_box_type+'\') return false;sort_box(\'ALL\',\''+sort_box_type+'\')">'+get_lang("All")+'</span>, '+ 2617 '<span ' + change_font_color + ' id="span_flag_UNSEEN" class="'+(search_box_type == 'UNSEEN' ? 'message_options_over' : 'message_options')+'" title="'+get_lang("l_unseen")+'" onclick="if(\'UNSEEN\' == \''+search_box_type+'\') return false;sort_box(\'UNSEEN\',\''+sort_box_type+'\')">'+get_lang("l_unseen")+'</span>, '+ 2618 '<span ' + change_font_color + ' id="span_flag_SEEN" class="'+(search_box_type == 'SEEN' ? 'message_options_over' : 'message_options')+'" title="'+get_lang("l_seen")+'" onclick="if(\'SEEN\' == \''+search_box_type+'\') return false;sort_box(\'SEEN\',\''+sort_box_type+'\')">'+get_lang("l_seen")+'</span>, '+ 2619 '<span ' + change_font_color + ' id="span_flag_ANSWERED" class="'+(search_box_type == 'ANSWERED' ? 'message_options_over' : 'message_options')+'" title="'+get_lang("l_answered")+'" onclick="if(\'ANSWERED\' == \''+search_box_type+'\') return false;sort_box(\'ANSWERED\',\''+sort_box_type+'\')">'+get_lang("l_answered")+'</span>, '+ 2620 '<span ' + change_font_color + ' id="span_flag_FLAGGED" class="'+(search_box_type == 'FLAGGED' ? 'message_options_over' : 'message_options')+'" title="'+get_lang("l_important")+'" onclick="if(\'FLAGGED\' == \''+search_box_type+'\') return false;sort_box(\'FLAGGED\',\''+sort_box_type+'\')">'+get_lang("l_important")+'</span> '; 2503 2621 draw_paging(num_msgs); 2504 2622 Element("tot_m").innerHTML = num_msgs; -
trunk/expressoMail1_2/js/globals.js
r427 r790 22 22 '<tr><td align=left height=16px width="1%" nowrap class="table_top"> '+ 23 23 '<a href=# onclick="javascript:new_message(\'new\',\'null\')" align=left>'+ 24 '<img src="templates/ default/images/menu/createmail.gif">'+24 '<img src="templates/'+template+'/images/menu/createmail.gif">'+ 25 25 ' Novo</a> '+ 26 26 '<a href="#" onclick="javascript:wfolders.makeWindow(\'\', \'change_folder\')" align=left>'+ 27 '<img src="templates/ default/images/menu/editfolders.png">'+27 '<img src="templates/'+template+'/images/menu/editfolders.png">'+ 28 28 ' Trocar Pasta</a>  '+ 29 29 '<a href="#" onclick="javascript:refresh();" align=left>'+ 30 '<img src="templates/ default/images/menu/checkmail.gif">'+30 '<img src="templates/'+template+'/images/menu/checkmail.gif">'+ 31 31 ' Atualizar</a> '+ 32 32 '<a id="link_tools" href="#" align=left>'+ 33 '<img height="16px" src="templates/ default/images/menu/tools.gif">'+33 '<img height="16px" src="templates/'+template+'/images/menu/tools.gif">'+ 34 34 ' Ferramentas...</a> </td><td style="padding-left:17px" width="1%" id="content_quota" align=left nowrap></td><td width=* id="div_menu_c3" align="right"></td></tr></table>'; 35 35 -
trunk/expressoMail1_2/js/rich_text_editor.js
r690 r790 34 34 } 35 35 36 document.getElementById('fontname').selectedIndex = 1;37 document.getElementById('fontsize').selectedIndex = 1;36 document.getElementById('fontname').selectedIndex = 3; 37 document.getElementById('fontsize').selectedIndex = 3; 38 38 } 39 39 … … 47 47 iframe.setAttribute("unselectable","on"); 48 48 iframe.setAttribute("tabIndex","1"); 49 50 config_events( iframe, 'onload', function( ) 51 { 52 iframe.contentWindow.document.designMode = "on"; 53 if ( iframe.contentWindow.document.documentElement ) 54 iframe.contentWindow.document.documentElement.style.background = '#fff'; 55 }); 56 49 57 var checkbox = document.createElement("INPUT"); 50 58 checkbox.id = 'viewsource_rt_checkbox'; … … 170 178 img.className = 'imagebutton'; 171 179 img.align = 'center'; 172 img.src = './templates/ default/images/'+buttons[i]+'.gif';180 img.src = './templates/'+template+'/images/'+buttons[i]+'.gif'; 173 181 img.title = get_lang(buttons[i]); 174 182 img.style.cursor = 'pointer'; … … 352 360 form_table.innerHTML = get_lang('Select the table size')+':<br><br><table cellspacing="0"><tbody><tr><td align="center">'+ 353 361 get_lang('Rows')+':</td><td></td><td align="center">'+get_lang('Cols')+':</td><td></td><td align="center">'+get_lang('Border')+':</td></tr>'+ 354 '<tr><td align="right"><input type="text" readonly="true" id="rows" size="2" maxlength="2" value="1"></input></td><td align="left"><img src="templates/ default/images/plus.png" onclick="javascript:RichTextEditor.incrementField(\'rows\');"></img><br><img src="templates/default/images/minus.png" onclick="javascript:RichTextEditor.decrementField(\'rows\');"></img></td>'+355 '<td align="right"><input type="text" readonly="true" id="cols" size="2" maxlength="2" value="1"></input></td><td align="left"><img src="templates/ default/images/plus.png" onclick="javascript:RichTextEditor.incrementField(\'cols\');"></img><br><img src="templates/default/images/minus.png" onclick="javascript:RichTextEditor.decrementField(\'cols\');"></img></td>'+356 '<td align="right"><input type="text" readonly="true" id="border" size="2" maxlength="2" value="1"></input></td><td align="left"><img src="templates/ default/images/plus.png" onclick="javascript:RichTextEditor.incrementField(\'border\');"></img><br><img src="templates/default/images/minus.png" onclick="javascript:RichTextEditor.decrementField(\'border\');"></img></td>'+362 '<tr><td align="right"><input type="text" readonly="true" id="rows" size="2" maxlength="2" value="1"></input></td><td align="left"><img src="templates/'+template+'/images/plus.png" onclick="javascript:RichTextEditor.incrementField(\'rows\');"></img><br><img src="templates/'+template+'/images/minus.png" onclick="javascript:RichTextEditor.decrementField(\'rows\');"></img></td>'+ 363 '<td align="right"><input type="text" readonly="true" id="cols" size="2" maxlength="2" value="1"></input></td><td align="left"><img src="templates/'+template+'/images/plus.png" onclick="javascript:RichTextEditor.incrementField(\'cols\');"></img><br><img src="templates/'+template+'/images/minus.png" onclick="javascript:RichTextEditor.decrementField(\'cols\');"></img></td>'+ 364 '<td align="right"><input type="text" readonly="true" id="border" size="2" maxlength="2" value="1"></input></td><td align="left"><img src="templates/'+template+'/images/plus.png" onclick="javascript:RichTextEditor.incrementField(\'border\');"></img><br><img src="templates/'+template+'/images/minus.png" onclick="javascript:RichTextEditor.decrementField(\'border\');"></img></td>'+ 357 365 '</tr></tbody></table>'+ 358 366 ' <input title="'+get_lang('Close')+'" value="' + get_lang('Close') + '" type="button" onclick="win.close()"> '+ -
trunk/expressoMail1_2/js/sharemailbox.js
r197 r790 145 145 "<td>"+ 146 146 '<br><br><br><br><br><br>'+ 147 '<img onClick="javascript:sharemailbox.add_user();" src="templates/ default/images/arrow_left.png" style="vertical-align:middle;cursor:pointer;">' +147 '<img onClick="javascript:sharemailbox.add_user();" src="templates/'+template+'/images/arrow_left.png" style="vertical-align:middle;cursor:pointer;">' + 148 148 '<br><br>'+ 149 '<img onClick="javascript:sharemailbox.remove_user();" src="templates/ default/images/arrow_right.png" style="vertical-align:middle;cursor:pointer;">' +149 '<img onClick="javascript:sharemailbox.remove_user();" src="templates/'+template+'/images/arrow_right.png" style="vertical-align:middle;cursor:pointer;">' + 150 150 "</td>"+ 151 151 … … 165 165 get_lang('Access right')+':'+ 166 166 '</td></tr>'+ 167 '<tr><td>'+get_lang('Read')+':</td><td><input id=\'em_input_readAcl\' onClick="return sharemailbox.setaclfromuser();" type="checkbox"><img title="'+get_lang("hlp_msg_read_acl")+'." src=\'./templates/ default/images/ajuda.jpg\'></td></tr>'+168 '<tr><td>'+get_lang('Exclusion')+':</td><td><input id=\'em_input_deleteAcl\' onClick="return sharemailbox.setaclfromuser();" type="checkbox"><img title="'+get_lang('hlp_msg_delmov_acl')+'." src=\'./templates/ default/images/ajuda.jpg\'></td></tr>'+169 '<tr><td>'+get_lang('Write')+':</td><td><input id=\'em_input_writeAcl\' onClick="return sharemailbox.setaclfromuser();" type="checkbox"><img title="'+get_lang('hlp_msg_addcreate_acl')+'." src=\'./templates/ default/images/ajuda.jpg\'></td></tr>'+170 '<tr><td>'+get_lang('Send')+':</td><td><input id=\'em_input_sendAcl\' onClick="return sharemailbox.setaclfromuser();" type="checkbox"><img title="'+get_lang('hlp_msg_sendlike_acl')+'." src=\'./templates/ default/images/ajuda.jpg\'></td></tr></tbody></table>'+167 '<tr><td>'+get_lang('Read')+':</td><td><input id=\'em_input_readAcl\' onClick="return sharemailbox.setaclfromuser();" type="checkbox"><img title="'+get_lang("hlp_msg_read_acl")+'." src=\'./templates/'+template+'/images/ajuda.jpg\'></td></tr>'+ 168 '<tr><td>'+get_lang('Exclusion')+':</td><td><input id=\'em_input_deleteAcl\' onClick="return sharemailbox.setaclfromuser();" type="checkbox"><img title="'+get_lang('hlp_msg_delmov_acl')+'." src=\'./templates/'+template+'/images/ajuda.jpg\'></td></tr>'+ 169 '<tr><td>'+get_lang('Write')+':</td><td><input id=\'em_input_writeAcl\' onClick="return sharemailbox.setaclfromuser();" type="checkbox"><img title="'+get_lang('hlp_msg_addcreate_acl')+'." src=\'./templates/'+template+'/images/ajuda.jpg\'></td></tr>'+ 170 '<tr><td>'+get_lang('Send')+':</td><td><input id=\'em_input_sendAcl\' onClick="return sharemailbox.setaclfromuser();" type="checkbox"><img title="'+get_lang('hlp_msg_sendlike_acl')+'." src=\'./templates/'+template+'/images/ajuda.jpg\'></td></tr></tbody></table>'+ 171 171 '</td></tr>'+ 172 172 "</tbody></table>"; -
trunk/expressoMail1_2/js/shortcut.js
r689 r790 249 249 { 250 250 var selected_shortcut_msgs = ''; 251 var current_folder = get_current_folder();252 251 var tbody_box = Element('tbody_box'); 253 252 all_messages = Element('tbody_box').childNodes; … … 442 441 } 443 442 var scrollMain = Element('divScrollMain_0'); 444 var selection_size = 30;443 var selection_size = parseInt(preferences.line_height) + 10; 445 444 if (all_messages[mailPos].offsetTop <= scrollMain.scrollTop) 446 scrollMain.scrollTop -= selection_size ;445 scrollMain.scrollTop -= selection_size+10; 447 446 } 448 447 return true; -
trunk/expressoMail1_2/templates/default/main.css
r220 r790 47 47 background-color: #5194d2; 48 48 } 49 .show_img_link{ 50 width : 100%; 51 color: black; 52 font-weight: bold; 53 background-color: #ffc; 54 border-bottom:1px solid #cfcfcf; 55 cursor: pointer; 56 -moz-user-select: none; 57 } 49 58 /* end class msgs */ 59 60 .show_img_link:hover { 61 color: #000 !important; 62 } 50 63 51 64 .action_info_table { … … 357 370 color: blue; 358 371 white-space: nowrap; 372 /*padding:0 1.8;*/ 373 } 374 .message_options_trash, 375 .message_options_import, 376 .message_options_export, 377 .message_options_print, 378 .message_options_move { 379 padding:0pt 1pt 1pt 8pt; 380 } 381 .message_options_inactive { 382 white-space: nowrap; 383 color: #999; 384 } 385 386 .message_options_active { 387 white-space: nowrap; 388 color: blue; 389 cursor: pointer; 390 } 391 392 .message_options_over { 393 cursor: pointer; 394 color: blue; 395 white-space: nowrap; 396 font-weight: bold; 397 text-decoration: underline; 359 398 } 360 399 … … 423 462 height:15px !important; 424 463 } 464 465 466 467 .l { 468 background-image: url() !important; 469 padding: 0 13 0 0 !important; 470 font-weight: bold !important; 471 font-size: 10px !important; 472 color: #666 !important; 473 text-decoration: none !important; 474 font-family: sans-serif !important; 475 } 476 .sl { 477 background-image: url() !important; 478 padding: 0 13 0 0 !important; 479 font-weight: bold !important; 480 font-size: 10px !important; 481 color: #0000FF !important; 482 font-family: sans-serif !important; 483 } -
trunk/phpgwapi/inc/class.common.inc.php
r368 r790 736 736 while ($entry=$d->read()) 737 737 { 738 if ($entry != 'CVS' && $entry != '.' && $entry != '..' 739 && $entry != 'phpgw_website' 740 && is_dir(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $entry)) 741 { 738 if ($entry != '.' && $entry != '..' && is_dir(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $entry) && file_exists(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $entry . '/head.inc.php')) 739 { 740 $list[$entry]['title'] = $entry; 742 741 $list[$entry]['name'] = $entry; 742 743 743 $f = PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $entry . '/details.inc.php'; 744 744 if (file_exists ($f)) 745 745 { 746 746 include($f); 747 $list[$entry]['title'] = 'Use '.$GLOBALS['phpgw_info']['template'][$entry]['title'].'interface'; 748 } 749 else 750 { 751 $list[$entry]['title'] = $entry; 747 if ( defined( $entry.'_TEMPLATE_TITLE' ) ) 748 $list[$entry]['title'] = utf8_decode( constant($entry.'_TEMPLATE_TITLE') ); 752 749 } 753 750 } -
trunk/phpgwapi/inc/functions.inc.php
r440 r790 385 385 { 386 386 $GLOBALS['phpgw']->template = CreateObject('phpgwapi.Template',PHPGW_APP_TPL); 387 preg_match('/(.*)\/(.*)/', PHPGW_APP_TPL, $matches); 388 389 if ($GLOBALS['phpgw_info']['flags']['currentapp'] != "jabberit_messenger") 390 $_SESSION['phpgw_info'][$GLOBALS['phpgw_info']['flags']['currentapp']]['user']['preferences']['common']['template_set'] = $matches[2]; 387 391 } 388 392 -
trunk/phpgwapi/js/dftree/dftree.css
r2 r790 37 37 /* link */ 38 38 .l { 39 padding: 0px 13px 0px 0px; 39 background-repeat: no-repeat; 40 background-position: left; 41 padding: 0 2em; 40 42 font-weight: bold; 41 43 font-size: 10px; 42 color: # 666666;44 color: #4a79b1; 43 45 text-decoration: none; 44 46 cursor: pointer; … … 54 56 /* selected link */ 55 57 .sl { 56 padding: 0px 13px 0px 0px; 58 background-repeat: no-repeat; 59 background-position: left; 60 padding: 0 2em; 57 61 font-weight: bold; 58 62 font-size: 10px; 59 color: # 0000FF;63 color: #fc6103; 60 64 text-decoration: none; 61 65 cursor: pointer; -
trunk/phpgwapi/js/dftree/dftree.js
r709 r790 228 228 captionSpan.style.backgroundColor = 'white'; 229 229 captionSpan.style.border = '1px solid black'; 230 captionSpan.style.paddingTop = '0px'; 231 captionSpan.style.paddingBottom = '0px'; 230 232 } 231 233 } … … 237 239 captionSpan = getObjectById("l"+this.id+this._myTree.name); 238 240 captionSpan.style.backgroundColor = ''; 239 captionSpan.style.border = '1px solid #f7f7f7'; 241 captionSpan.style.border = '0px'; 242 captionSpan.style.paddingTop = '1px'; 243 captionSpan.style.paddingBottom = '1px'; 240 244 } 241 245 } … … 326 330 spanL.onmouseover = function () { _this._onMouseOver(); }; 327 331 spanL.onmouseout = function () { _this._onMouseOut(); }; 328 spanL.style.border = '1px solid #f7f7f7';332 // spanL.style.border = '1px solid #f7f7f7'; 329 333 spanL.innerHTML = this.caption; 330 334 //spanL.style.border = '1px solid red'; -
trunk/phpgwapi/templates/celepar/head.inc.php
r12 r790 43 43 $pngfix_src = $GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/templates/celepar/js/pngfix.js'; 44 44 $pngfix ='<!-- This solves the Internet Explorer PNG-transparency bug, but only for IE 5.5 and higher --> 45 <!--[if gte IE 5.5000]>45 <!--[if lt IE 7]> 46 46 <script src="'.$pngfix_src.'" type="text/javascript"> 47 47 </script> -
trunk/phpgwapi/templates/celepar/navbar.inc.php
r549 r790 163 163 } 164 164 165 $app_icons .= '<td width="74px" height="40" valign=" top" align="left" onclick="location.href=\''.$GLOBALS['phpgw_info']['navbar']['logout']['url'].'\'" style="cursor:pointer;cursor:hand;background-repeat:no-repeat;padding-left:20px;background-image:url('.$var['img_root'].'/back_app.png)">'.$icon.'</td>';165 $app_icons .= '<td width="74px" height="40" valign="center" align="center" onclick="location.href=\''.$GLOBALS['phpgw_info']['navbar']['logout']['url'].'\'" style="cursor:pointer;cursor:hand;background-repeat:no-repeat;padding-bottom:20px;background-image:url('.$var['img_root'].'/back_app.png)">'.$icon.'</td>'; 166 166 } // window.location.href=\''.$GLOBALS['phpgw_info']['navbar']['logout']['url'].'\' 167 167
Note: See TracChangeset
for help on using the changeset viewer.