Changeset 6257
- Timestamp:
- 05/21/12 16:28:52 (12 years ago)
- Location:
- sandbox/2.4.1-2/expressoMail1_2
- Files:
-
- 2 added
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
sandbox/2.4.1-2/expressoMail1_2/inc/class.ldap_functions.inc.php
r6139 r6257 436 436 $ldapService->connection = $this->ds; 437 437 $campos_extras = ''; 438 $justthese = array("cn", "mail", "telephonenumber", "mobile", "phpgwaccountvisible", "uid", "employeenumber", "ou" );438 $justthese = array("cn", "mail", "telephonenumber", "mobile", "phpgwaccountvisible", "uid", "employeenumber", "ou","vacationActive","vacationInfo"); 439 439 foreach($searchable_fields as $fields_ldap => $value_field) 440 440 { … … 473 473 $this->ldapConnect(true,$i); 474 474 $filter="(|(cn=*$search_for*)(mail=*$search_for*))"; 475 $justthese = array("cn", "mail", "telephoneNumber", "mobile", "phpgwAccountVisible", "uid","employeeNumber", "ou" );475 $justthese = array("cn", "mail", "telephoneNumber", "mobile", "phpgwAccountVisible", "uid","employeeNumber", "ou","vacationActive","vacationInfo"); 476 476 $sr=@ldap_search($this->ds, $this->ldap_context, $filter, $justthese, 0, $this->max_result+1); 477 477 if(!$sr) -
sandbox/2.4.1-2/expressoMail1_2/js/QuickCatalogSearch.js
r5911 r6257 148 148 } 149 149 } 150 if (data_[id_contact].vacationactive == "TRUE"){ 151 details.append('<p><img src="templates/default/images/mala-big.png"/><span class="title-outoffice">Filtro "Fora do Escritório" ativo</span></p>'); 152 details.append('<div class="outoffice"><span>'+ data_[id_contact].vacationinfo +'</span></div>') 153 var link = $('<a>').html('Ver mais'); 154 link.attr('id','more'); 155 link.bind('click',function(){$('.outoffice').animate({height:'100px',width: '-=15px'},800); $('#more').unbind('click').hide();}); 156 details.append(link); 157 } 150 158 break; 151 159 case 'P': … … 156 164 if(data_[id_contact].telephonenumber != null) 157 165 details.append('<p><label class="attribute">Telefone</label>' + '<span class="value">' + data_[id_contact].telephonenumber + '</span></p>'); 166 if (data_[id_contact].vacationactive == "TRUE"){ 167 details.append('<p><img src="templates/default/images/mala-big.png"/><span class="title-outoffice">Filtro "Fora do Escritório" ativo</span></p>'); 168 details.append('<div class="outoffice"><span>'+ data_[id_contact].vacationinfo +'</span></div>') 169 var link = $('<a>').html('Ver mais'); 170 link.attr('id','more'); 171 link.bind('click',function(){$('.outoffice').animate({height:'100px',width: '-=15px'},800); $('#more').unbind('click').hide();}); 172 details.append(link); 173 } 158 174 break; 159 175 default: … … 189 205 } 190 206 } 207 if (data_[id_contact].vacationactive == "TRUE"){ 208 details.append('<p><img src="templates/default/images/mala-big.png"/><span class="title-outoffice">Filtro "Fora do Escritório" ativo</span></p>'); 209 details.append('<div class="outoffice"><span>'+ data_[id_contact].vacationinfo +'</span></div>') 210 var link = $('<a>').html('Ver mais'); 211 link.attr('id','more'); 212 link.bind('click',function(){$('.outoffice').animate({height:'100px',width: '-=15px'},800); $('#more').unbind('click').hide();}); 213 details.append(link); 214 } 191 215 break; 192 216 } … … 278 302 else if(contact_name.toLowerCase().indexOf(data.search_for.toLowerCase()) != -1 && data.search_for.indexOf(" ") == -1 && data.search_for.indexOf("@") == -1) 279 303 contact_name = contact_name.substring(0, contact_name.toLowerCase().indexOf(data.search_for.toLowerCase())) + "<u>" + contact_name.substr(contact_name.toLowerCase().indexOf(data.search_for.toLowerCase()), data.search_for.length) + "</u>" + contact_name.substring(contact_name.toLowerCase().indexOf(data.search_for.toLowerCase()) + data.search_for.length); 280 var line = '<span class="menu-control"><button class="'+btnClass+'" id="actions_'+i+'" onClick="'+exist+'(document.getElementById(\'contact_' + i + '\').innerHTML, this, \'contact_' + i + '\')">'+ signal +'</button></span><div id="contact_' + i + '" onDblClick="'+exist+'(this.innerHTML, document.getElementById(\'actions_'+i+'\'), \'contact_' + i + '\')"><div class="name_contact"><strong class="name">' + contact_name + '</strong><em class="email">' + ((utf8_decoder(data[i-1].mail) != undefined)? (utf8_decoder(data[i-1].mail) == 'undefined' ? get_lang("No mail") : utf8_decoder(data[i-1].mail)) : get_lang("No mail")) + '</em></div></div>'; 304 var vacationImg = ''; 305 if (data[i-1].vacationactive == "TRUE") 306 vacationImg = '<img src="templates/default/images/mala-small.png"/>'; 307 var line = '<span class="menu-control"><button class="'+btnClass+'" id="actions_'+i+'" onClick="'+exist+'(document.getElementById(\'contact_' + i + '\').innerHTML, this, \'contact_' + i + '\')">'+ signal +'</button></span><div id="contact_' + i + '" onDblClick="'+exist+'(this.innerHTML, document.getElementById(\'actions_'+i+'\'), \'contact_' + i + '\')"><div class="name_contact"><strong class="name">' + contact_name +' '+ vacationImg +'</strong><em class="email">' + ((utf8_decoder(data[i-1].mail) != undefined)? (utf8_decoder(data[i-1].mail) == 'undefined' ? get_lang("No mail") : utf8_decoder(data[i-1].mail)) : get_lang("No mail")) + '</em></div></div>'; 281 308 Op.innerHTML = line; 282 309 $(Op).val(i - 1); … … 316 343 } 317 344 } 318 } 345 } 346 if (data[first_contact].vacationactive == "TRUE"){ 347 details.append('<p><img src="templates/default/images/mala-big.png"/><span class="title-outoffice">Filtro "Fora do Escritório" ativo</span></p>'); 348 details.append('<div class="outoffice"><span>'+ data[first_contact].vacation +'</span></div>') 349 var link = $('<a>').html('Ver mais'); 350 link.attr('id','more'); 351 link.bind('click',function(){$('.outoffice').animate({height:'100px',width: '-=15px'},800); $('#more').unbind('click').hide();}); 352 details.append(link); 353 } 319 354 break; 320 355 case 'P': … … 325 360 if(data[first_contact].telephonenumber != null) 326 361 details.append('<p><label class="attribute">Telefone</label>' + '<span class="value">' + data[first_contact].telephonenumber + '</span></p>'); 362 if (data[first_contact].vacationactive == "TRUE"){ 363 details.append('<p><img src="templates/default/images/mala-big.png"/><span class="title-outoffice">Filtro "Fora do Escritório" ativo</span></p>'); 364 details.append('<div class="outoffice"><span>'+ data[first_contact].vacationinfo +'</span></div>') 365 var link = $('<a>').html('Ver mais'); 366 link.attr('id','more'); 367 link.bind('click',function(){$('.outoffice').animate({height:'100px',width: '-=15px'},800); $('#more').unbind('click').hide();}); 368 details.append(link); 369 } 327 370 break; 328 371 default: … … 357 400 } 358 401 } 402 if (data[first_contact].vacationactive == "TRUE"){ 403 details.append('<p><img src="templates/default/images/mala-big.png"/><span class="title-outoffice">Filtro "Fora do Escritório" ativo</span></p>'); 404 details.append('<div class="outoffice"><span>'+ data[first_contact].vacationinfo +'</span></div>') 405 var link = $('<a>').html('Ver mais'); 406 link.attr('id','more'); 407 link.bind('click',function(){$('.outoffice').animate({height:'100px',width: '-=15px'},800); $('#more').unbind('click').hide();}); 408 details.append(link); 409 } 359 410 break; 360 411 } … … 404 455 } 405 456 } 457 if (data[this.value].vacationactive == "TRUE"){ 458 details.append('<p><img src="templates/default/images/mala-big.png"/><span class="title-outoffice">Filtro "Fora do Escritório" ativo</span></p>'); 459 details.append('<div class="outoffice"><span>'+ data[this.value].vacationinfo +'</span></div>') 460 var link = $('<a>').html('Ver mais'); 461 link.attr('id','more'); 462 link.bind('click',function(){$('.outoffice').animate({height:'100px',width: '-=15px'},800); $('#more').unbind('click').hide();}); 463 details.append(link); 464 } 406 465 break; 407 466 case 'P': … … 412 471 if(data[this.value].telephonenumber != null) 413 472 details.append('<p><label class="attribute">Telefone</label>' + '<span class="value">' + data[this.value].telephonenumber + "</span></p>"); 473 if (data[this.value].vacationactive == "TRUE"){ 474 details.append('<p><img src="templates/default/images/mala-big.png"/><span class="title-outoffice">Filtro "Fora do Escritório" ativo</span></p>'); 475 details.append('<div class="outoffice"><span>'+ data[this.value].vacationinfo+'</span></div>') 476 var link = $('<a>').html('Ver mais'); 477 link.attr('id','more'); 478 link.bind('click',function(){$('.outoffice').animate({height:'100px',width: '-=15px'},800); $('#more').unbind('click').hide();}); 479 details.append(link); 480 } 414 481 break; 415 482 default: … … 443 510 } 444 511 } 512 if (data[this.value].vacationactive == "TRUE"){ 513 details.append('<p><img src="templates/default/images/mala-big.png"/><span class="title-outoffice">Filtro "Fora do Escritório" ativo</span></p>'); 514 details.append('<div class="outoffice"><span>'+ data[this.value].vacationinfo +'</span></div>') 515 var link = $('<a>').html('Ver mais'); 516 link.attr('id','more'); 517 link.bind('click',function(){$('.outoffice').animate({height:'100px',width: '-=15px'},800); $('#more').unbind('click').hide();}); 518 details.append(link); 519 } 445 520 break; 446 521 } -
sandbox/2.4.1-2/expressoMail1_2/templates/default/main.css
r6233 r6257 1256 1256 1257 1257 button.expressomail-button-icon-ative{color:#E17009 !important; border: 1px solid #E17009 !important;background: none repeat scroll 0 0 #FFE1CC !important;} 1258 1259 .outoffice { 1260 width: 295px; 1261 height: 50px; 1262 overflow: hidden; 1263 } 1264 1265 .title-outoffice 1266 { 1267 margin-left: 10px; 1268 font-family: verdana; 1269 font-size: 1.2em; 1270 } 1271 .outoffice span{ 1272 margin: 5px; 1273 }
Note: See TracChangeset
for help on using the changeset viewer.