Changeset 3706 for branches/2.2/mobile
- Timestamp:
- 01/19/11 11:22:18 (13 years ago)
- Location:
- branches/2.2/mobile
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2/mobile/inc/class.bo_mobilecc.inc.php
r3629 r3706 49 49 $what = array('contact.names_ordered',$id); 50 50 } 51 52 if ((strpos($ catalog,'bo_global_ldap_catalog')!==false) &&51 52 if ((strpos($this->page_info['actual_catalog'],'bo_global_ldap_catalog')!==false) && 53 53 (!$this->page_info['is_external_catalog'])) { //Ldap do expresso, leva em conta alguns atributos do expresso 54 54 … … 94 94 )); 95 95 } 96 97 98 96 $ids = $this->bo->find($what,$rules,array('order'=>$search),false,true); 99 97 -
branches/2.2/mobile/inc/class.ui_home.inc.php
r3690 r3706 122 122 123 123 function search($params) { 124 124 125 if($_SERVER["HTTP_REFERER"] && strpos($_SERVER["HTTP_REFERER"], "ui_home.index")) { 125 126 if(!$params["default_folders"] && … … 146 147 //Langs gerais da página 147 148 $p->set_block('search','home_search'); 149 $p->set_block("search","row_events"); 150 $p->set_block("search","no_events"); 148 151 $p->set_block('home_search_bar','search_bar'); 149 152 … … 174 177 175 178 $p->set_var('search',$p->fp('out','search_bar')); 179 180 //E-mails 181 $no_mail_search=false; 182 if((!isset($params['folder_to_search'])) || ($params['folder_to_search']==="")) { 183 if($params['default_folders']==="1") { 184 if($params['personal_folders']!=="1") 185 $mail_params['folderType'] = 'default'; 186 } 187 else { 188 if($params['personal_folders']==="1") 189 $mail_params['folderType'] = 'personal'; 190 else 191 $no_mail_search = true; 192 } 193 } 194 else { 195 $mail_params['folder'] = $params['folder_to_search']; 196 } 197 198 if(!$no_mail_search) { 199 $imap_functions = CreateObject('expressoMail1_2.imap_functions'); 200 $mail_params['filter'] = $params["name"]; 201 $mail_params['max_msgs'] = isset($params['max_msgs'])?$params['max_msgs']:10; 202 203 $p->set_var('next_max_msgs',$mail_params['max_msgs']+10); 204 $p->set_var('max_msgs',$mail_params['max_msgs']); 205 206 $messages = $imap_functions->mobile_search($mail_params); 207 if($mail_params['max_msgs']>=$messages["total_msgs"]) 208 $p->set_var('show_more_messages',"none"); 209 else 210 $p->set_var('show_more_messages',"block"); 211 $p->set_var('mails',$ui_mobilemail->print_mails_list($messages)); 212 } 213 else { 214 $p->set_var('show_mails',"none"); 215 } 216 217 //Agenda 218 if($params["calendar_search"]==="1") { 219 220 $bo_calendar = CreateObject('calendar.bocalendar',1); 221 $functions = CreateObject('mobile.common_functions'); 222 223 $max_events = isset($params['max_events'])?$params['max_events']:10; 224 $p->set_var('next_max_events',$max_events+10); 225 $p->set_var('max_events',$max_events); 226 227 $event_ids = $bo_calendar->search_keywords($params['name']); 228 229 $bg = "fundo-azul-alinha"; 230 if(!empty($event_ids)) { 231 $total_events_search = count($event_ids); 232 $event_ids = array_slice($event_ids,0,$max_events,true); 233 if($total_events_search>count($event_ids)) 234 $p->set_var('show_more_events',"block"); 235 foreach($event_ids as $key => $id) 236 { 237 $event = $bo_calendar->read_entry($id); 238 239 if(!$bo_calendar->check_perms(PHPGW_ACL_READ,$event)) 240 { 241 continue; 242 } 243 244 $p->set_var("bg",$bg=="fundo-azul-alinha"?$bg="fundo-branco-alinha":$bg="fundo-azul-alinha"); 245 $p->set_var("date",$functions->complete_string($event["start"]["mday"],2,"R","0")."/". 246 $functions->complete_string($event["start"]["month"],2,"R","0")."/". 247 $event["start"]["year"]." ". 248 $functions->complete_string($event["start"]["hour"],2,"R","0").":". 249 $functions->complete_string($event["start"]["min"],2,"R","0")); 250 $p->set_var("title",$event["title"],40); 251 $p->fp("calendar_results","row_events",True); 252 253 } 254 } 255 else { 256 $p->set_var("lang_no_results",lang("no results found")); 257 $p->parse("calendar_results","no_events"); 258 } 259 } 260 else { 261 $p->set_var("show_calendar","none"); 262 } 176 263 177 264 //Contatos … … 225 312 $p->set_var('show_contacts',"none"); 226 313 } 227 228 //E-mails 229 $no_mail_search=false; 230 if((!isset($params['folder_to_search'])) || ($params['folder_to_search']==="")) { 231 if($params['default_folders']==="1") { 232 if($params['personal_folders']!=="1") 233 $mail_params['folderType'] = 'default'; 234 } 235 else { 236 if($params['personal_folders']==="1") 237 $mail_params['folderType'] = 'personal'; 238 else 239 $no_mail_search = true; 240 } 241 } 242 else { 243 $mail_params['folder'] = $params['folder_to_search']; 244 } 245 246 if(!$no_mail_search) { 247 $imap_functions = CreateObject('expressoMail1_2.imap_functions'); 248 $mail_params['filter'] = $params["name"]; 249 $mail_params['max_msgs'] = isset($params['max_msgs'])?$params['max_msgs']:10; 250 251 $p->set_var('next_max_msgs',$mail_params['max_msgs']+10); 252 $p->set_var('max_msgs',$mail_params['max_msgs']); 253 254 $messages = $imap_functions->mobile_search($mail_params); 255 if($mail_params['max_msgs']>=$messages["total_msgs"]) 256 $p->set_var('show_more_messages',"none"); 257 else 258 $p->set_var('show_more_messages',"block"); 259 $p->set_var('mails',$ui_mobilemail->print_mails_list($messages)); 260 } 261 else { 262 $p->set_var('show_mails',"none"); 263 } 264 265 //Agenda 266 if($params["calendar_search"]==="1") { 267 $bo_calendar = CreateObject('calendar.bocalendar',1); 268 $functions = CreateObject('mobile.common_functions'); 269 270 $max_events = isset($params['max_events'])?$params['max_events']:10; 271 $p->set_var('next_max_events',$max_events+10); 272 $p->set_var('max_events',$max_events); 273 274 $event_ids = $bo_calendar->search_keywords($params['name']); 275 $p->set_block("search","row_events"); 276 $p->set_block("search","no_events"); 277 $bg = "par"; 278 if(!empty($event_ids)) { 279 $total_events_search = count($event_ids); 280 $event_ids = array_slice($event_ids,0,$max_events,true); 281 if($total_events_search>count($event_ids)) 282 $p->set_var('show_more_events',"block"); 283 foreach($event_ids as $key => $id) 284 { 285 $event = $bo_calendar->read_entry($id); 286 287 if(!$bo_calendar->check_perms(PHPGW_ACL_READ,$event)) 288 { 289 continue; 290 } 291 292 $p->set_var("bg",$bg=="par"?$bg="reset-dt":$bg="par"); 293 $p->set_var("date",$functions->complete_string($event["start"]["mday"],2,"R","0")."/". 294 $functions->complete_string($event["start"]["month"],2,"R","0")."/". 295 $event["start"]["year"]." ". 296 $functions->complete_string($event["start"]["hour"],2,"R","0").":". 297 $functions->complete_string($event["start"]["min"],2,"R","0")); 298 $p->set_var("title",$functions->strach_string($event["title"],40)); 299 $p->set_var("description",$functions->strach_string($event["description"],80)); 300 $p->fp("calendar_results","row_events",True); 301 302 } 303 } 304 else { 305 $p->set_var("lang_no_results",lang("no results found")); 306 $p->parse("calendar_results","no_events"); 307 } 308 } 309 else { 310 $p->set_var("show_calendar","none"); 311 } 314 312 315 $GLOBALS['phpgw_info']['mobiletemplate']->set_content($p->fp('out','home_search')); 313 316 -
branches/2.2/mobile/inc/class.ui_mobilecc.inc.php
r3700 r3706 261 261 $p->set_block('cc_t', 'no_contacts'); 262 262 263 $bg = " par";263 $bg = "bg-azul"; 264 264 if(!empty($contacts)) { 265 265 foreach($contacts as $id => $contact) { 266 266 267 267 $p->set_var('show_check',$show_checkbox?"inline":"none"); 268 $p->set_var('bg',$bg=="par"?$bg="reset-dt":$bg="par"); 269 268 $p->set_var('bg',$bg=="bg-azul"?$bg="bg-branco":$bg="bg-azul"); 269 if($show_checkbox) 270 $p->set_var("details","email-corpo"); 271 else 272 $p->set_var("details","limpar_div margin-geral"); 270 273 if($contact["catalog"]!=="bo_group_manager") { //Contatos 271 274 $id=strpos($contact["catalog"],"ldap")===false?$contact["id_contact"]:$id; … … 316 319 317 320 if($request_from==null) { 318 $p->set_var('lang_see_details',lang(" seedetails"));321 $p->set_var('lang_see_details',lang("details")); 319 322 $cat_encode = urlencode($contact["catalog"]); 320 323 $p->set_var('href_details',"ui_mobilecc.contact_view&id=$id&catalog=".urlencode($contact["catalog"])); -
branches/2.2/mobile/templates/css/mobile.css
r3699 r3706 47 47 .fundo-azul-alinha{background:#EEF7FA; margin-left:8px} 48 48 49 .espacamento{padding:5px 0 5px 25px; margin:0 0 5px 0 }49 .espacamento{padding:5px 0 5px 5px; margin:0 0 5px 0 } 50 50 #palavra-procurada {background:#C0DCE9; height:22px; padding-top:4px; width:100%} 51 51 #editando{font-size:120%; color:#666; margin-left:5px} … … 288 288 289 289 .email-geral{width:100%; padding:5px 0} 290 .email-cabecalho {overflow: hidden; width:74%; height:22px; float:left;}290 .email-cabecalho,.contato-cabecalho{overflow: hidden; width:74%; height:22px; float:left;} 291 291 .email-cabecalho p,.email-cabecalho a,.email-cabecalho a:visited{font-size:medium; color:#000} 292 .contato-cabecalho{font-size:medium} 292 293 .email-anexo{width:16px; height:16px; float:left; margin-top:5px} 293 294 .email-data{width:69px; float:right; margin:5px 3px 0 0; margin-top:5px; text-align:right; font-size:x-small;} -
branches/2.2/mobile/templates/default/contacts_list.tpl
r3595 r3706 3 3 <!-- END rows_contacts --> 4 4 <!-- BEGIN row_contacts --> 5 <dt class="titulo_mensagem {bg}"> 6 <div class="nome-item"><input type="checkbox" name="contacts[]" style="display:{show_check};" value="{contact_id}"> {contact_name} 7 </div> 8 </dt> 9 10 <dd class="dd-mensagem {bg}"> 11 <div class="sobre-mensagem"> 12 <p>{email}</p> 13 <p style="display:{show_tel};"><span>{lang_tel}:</span>{tel}</p> 14 </div> 15 <a href="index.php?menuaction=mobile.{href_details}" class="btn-anexo">{lang_see_details}</a> 16 17 </dd> 5 6 <div class="email-geral {bg}"> 7 <div class="contato-cabecalho margin-geral" > 8 <p><input type="checkbox" name="contacts[]" style="display:{show_check};" value="{contact_id}"> {contact_name}</p> 9 </div> 10 <span class="btn-anexo"><a href="index.php?menuaction=mobile.{href_details}">{lang_see_details}</a></span> 11 <div class="{details}"> 12 <p>{email}</p> 13 <p style="display:{show_tel};"><span>{lang_tel}:</span>{tel}</p> 14 </div> 15 </div> 16 18 17 <!-- END row_contacts --> 19 18 <!-- BEGIN row_groups --> 20 19 <dt class="titulo_mensagem {bg}"> 21 <div class="nome-item"><input type="checkbox" name="contacts[]" style="display:{show_check};" value="{group_id}"> {group_name} 22 <a href="index.php?menuaction=mobile.{href_details}" class="btn-anexo">{lang_see_details}</a></div> 20 <div class="email-cabecalho margin-geral" > 21 <p><input type="checkbox" name="contacts[]" style="display:{show_check};" value="{group_id}"> {group_name}</p> 22 </div> 23 <span class="btn-anexo"><a href="index.php?menuaction=mobile.{href_details}">{lang_see_details}</a></span> 23 24 </dt> 24 25 <!-- END row_groups --> -
branches/2.2/mobile/templates/default/home_search.tpl
r3641 r3706 19 19 20 20 <dl id="lista_miolo"> 21 22 <dt>{lang_your_search_was_by}: {search_param}</dt> 23 <dt style="display:{show_mails};">{lang_emails}</dt>21 <dt id="palavra-procurada"> {lang_your_search_was_by}: <strong><i>{search_param}</i></strong></dt> 22 23 <dt class="resultado-titulo" style="display:{show_mails};"> {lang_emails}</dt> 24 24 {mails} 25 <div class="menu-contexto " style="display:{show_more_messages};">25 <div class="menu-contexto centraliza" style="display:{show_more_messages};"> 26 26 <form method="post" action="index.php"> 27 27 <input type="hidden" name="menuaction" value="mobile.ui_home.search"> … … 36 36 <input type="hidden" name="max_contacts" value="{max_contacts}"> 37 37 <input type="hidden" name="max_events" value="{max_events}"> 38 < input type="submit" class="btn-contexto" value="{lang_more} 10 {lang_messages}">38 <button type="submit" title="" class="btn-contexto"> {lang_more} 10 {lang_messages}</button> 39 39 </form> 40 40 </div> 41 <dt style="display:{show_contacts};">{lang_contacts}</dt>41 <dt class="resultado-titulo" style="display:{show_contacts};"> {lang_contacts}</dt> 42 42 {contacts} 43 <div class="menu-contexto " style="display:{show_more_contacts};">43 <div class="menu-contexto centraliza" style="display:{show_more_contacts};"> 44 44 <form method="post" action="index.php"> 45 45 <input type="hidden" name="menuaction" value="mobile.ui_home.search"> … … 54 54 <input type="hidden" name="max_contacts" value="{next_max_contacts}"> 55 55 <input type="hidden" name="max_events" value="{max_events}"> 56 < input type="submit" class="btn-contexto" value="{lang_more} 10 {lang_contacts}">56 <button type="submit" title="" class="btn-contexto"> {lang_more} 10 {lang_contacts}</button> 57 57 </form> 58 58 </div> 59 <dt style="display:{show_calendar};">{lang_calendar}</dt>59 <dt class="resultado-titulo" style="display:{show_calendar};"> {lang_calendar}</dt> 60 60 {calendar_results} 61 <div class="menu-contexto " style="display:{show_more_events};">61 <div class="menu-contexto centraliza" style="display:{show_more_events};"> 62 62 <form method="post" action="index.php"> 63 63 <input type="hidden" name="menuaction" value="mobile.ui_home.search"> … … 72 72 <input type="hidden" name="max_contacts" value="{next_max_contacts}"> 73 73 <input type="hidden" name="max_events" value="{next_max_events}"> 74 < input type="submit" class="btn-contexto" value="{lang_more} 10 {lang_events}">74 <button type="submit" title="" class="btn-contexto"> {lang_more} 10 {lang_events}</button> 75 75 </form> 76 76 </div> … … 79 79 80 80 <!-- BEGIN row_events --> 81 <dt class="titulo_mensagem {bg}"> 82 {date} - {title} 83 </dt> 84 85 <dd class="dd-mensagem {bg}"> 86 <p>{description}</p> 87 </dd> 81 <p class="{bg} espacamento"><strong>{date}</strong> - {title}</p> 88 82 <!-- END row_events --> 89 83 <!-- BEGIN no_events -->
Note: See TracChangeset
for help on using the changeset viewer.