Changeset 3641
- Timestamp:
- 12/29/10 09:49:47 (13 years ago)
- Location:
- branches/2.2/mobile
- Files:
-
- 1 added
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2/mobile/inc/class.ui_home.inc.php
r3600 r3641 22 22 function index($params) { 23 23 $this->template->set_file(array('home_index' => 'home_index.tpl')); 24 $this->template->set_file(array('home_search_bar' => 'search_bar.tpl')); 25 24 26 $this->template->set_block('home_index','page'); 25 27 $this->template->set_block('home_index','folder_block'); 26 $this->template->set_block('home_index','commitment_block'); 28 $this->template->set_block('home_index','commitment_block'); 29 $this->template->set_block('home_search_bar','search_bar'); 27 30 28 31 //langs … … 39 42 $this->template->set_var('lang_selected', lang("selected")); 40 43 44 $this->template->set_var('search',$this->template->fp('out','search_bar')); 45 41 46 $accountId = $GLOBALS['phpgw_info']['user']['account_id']; 42 47 … … 131 136 $ui_mobilemail = CreateObject("mobile.ui_mobilemail");//Necessário para lista de emails, que é uma função estática 132 137 133 $p = CreateObject('phpgwapi.Template', PHPGW_SERVER_ROOT . '/mobile/templates/'.$GLOBALS['phpgw_info']['server']['template_set']);138 $p = $this->template; 134 139 $p->set_file( 135 140 Array( 136 'search' => 'home_search.tpl' 141 'search' => 'home_search.tpl', 142 'home_search_bar' => 'search_bar.tpl' 137 143 ) 138 144 ); … … 140 146 //Langs gerais da página 141 147 $p->set_block('search','home_search'); 148 $p->set_block('home_search_bar','search_bar'); 149 142 150 $p->set_var('search_param',$params['name']); 143 151 $p->set_var('lang_back',lang('back')); … … 164 172 isset($params["request_from"])? 165 173 $params["request_from"]:"none"); 174 175 $p->set_var('search',$p->fp('out','search_bar')); 166 176 167 177 //Contatos -
branches/2.2/mobile/inc/class.ui_mobilecalendar.inc.php
r3599 r3641 26 26 27 27 function index($params) { 28 $this->template->set_file(array('calendar' => 'calendar.tpl')); 28 $this->template->set_file( 29 array( 30 'calendar' => 'calendar.tpl', 31 'home_search_bar' => 'search_bar.tpl' 32 ) 33 ); 29 34 $this->template->set_block("calendar","page"); 30 35 $this->template->set_block('calendar','event_block'); … … 33 38 $this->template->set_block('calendar','type_option_block'); 34 39 $this->template->set_block('calendar','bar_block'); 40 $this->template->set_block('home_search_bar','search_bar'); 35 41 $this->template->set_var('lang_back',lang("back")); 36 42 $this->template->set_var('lang_calendar',lang("Calendar")); 37 43 $this->template->set_var('lang_search',lang("search")); 44 45 $this->template->set_var('search',$this->template->fp('out','search_bar')); 38 46 39 47 if(!function_exists("get_events")){ -
branches/2.2/mobile/inc/class.ui_mobilecc.inc.php
r3634 r3641 123 123 $this->template->set_file( 124 124 Array( 125 'contacts_list' => 'cc_main.tpl' 125 'contacts_list' => 'cc_main.tpl', 126 'home_search_bar' => 'search_bar.tpl' 126 127 ) 127 128 ); … … 129 130 $this->template->set_block("contacts_list","main_body"); 130 131 $this->template->set_block("contacts_list","pagging_block"); 132 $this->template->set_block('home_search_bar','search_bar'); 131 133 132 134 //Langs gerais da página … … 142 144 $this->page_info["request_from"]==null? 143 145 "none":$this->page_info["request_from"]); 146 147 $this->template->set_var('search',$this->template->fp('out','search_bar')); 144 148 145 149 //Combo de catálogos -
branches/2.2/mobile/inc/class.ui_mobilemail.inc.php
r3609 r3641 422 422 $p->set_file( 423 423 Array( 424 'mail_t' => 'mobilemail.tpl' 424 'mail_t' => 'mobilemail.tpl', 425 'home_search_bar' => 'search_bar.tpl' 425 426 ) 426 427 ); 428 429 $p->set_block('home_search_bar','search_bar'); 430 427 431 $p->set_var("page",$this->current_page+1); 428 432 $p->set_var("lang_new_message",lang("new message")); … … 433 437 $p->set_var("lang_back",lang("back")); 434 438 $p->set_var("lang_new_message",lang("new message")); 435 $p->set_var( "lang_search_message",lang("search"));439 $p->set_var('lang_search',lang('search')); 436 440 $p->set_var("lang_more",lang("more")); 437 441 $p->set_var("lang_messages",lang("messages")); 442 $p->set_var('search',$p->fp('out','search_bar')); 438 443 439 444 $max_per_page = -
branches/2.2/mobile/templates/css/mobile.css
r3605 r3641 1 1 /**********GLOBAL RESET*************/ 2 body {margin:0;padding:0;border:0;font-weight:inherit;font-style:inherit;font-size:medium;font-family:Arial, Helvetica, sans-serif;} 3 body { -webkit-text-size-adjust: none; } 2 4 3 5 html, body, div, span, iframe, h1, h2, h3, h4, h5, h6, p, 4 6 blockquote, pre, a, abbr, acronym, address, code, del, 5 dfn, em, img, q, dl, dt, dd, ol, ul, li,fieldset, form,7 dfn, em, img, q, dl, dt, dd, ol, fieldset, form, 6 8 label, legend, table, caption, tbody, tfoot, thead, tr, th, 7 td {margin:0;padding:0;border:0;font-weight:inherit;font-style:inherit;font-size:100%;font-family:Arial, Helvetica, sans-serif;} 8 body { -webkit-text-size-adjust: none; } 9 td {margin:0;padding:0;border:0;font-weight:inherit;font-style:inherit;} 10 11 /*INSERIDOS*/ 12 9 13 table {border-collapse:separate;border-spacing:0;} 10 caption, th, td {text-align:left;font-weight:normal;} 14 15 16 #busca table { width:100%;} 17 .gd {width:90%; padding:2px 0;} 18 .pq {width:10%; padding-left:5px; padding-right:5px;text-align:center;} 19 .bt {width:10%; padding-left:10px; } 20 21 22 caption, th, td {text-align:left;} 11 23 table, td, th {vertical-align:middle;} 12 24 blockquote:before, blockquote:after, q:before, q:after {content:"";} 13 25 blockquote, q {quotes:"" "";} 14 26 a img {border:none;} 15 a:link, a:visited {text-decoration: none }27 a:link, a:visited {text-decoration: none; font-size:small;} 16 28 li {list-style:none;} 17 body {margin:0;padding:0;border:0;font-weight:inherit;font-style:inherit;font-size:100%;font-family:Arial, Helvetica, sans-serif;vertical-align:baseline;} 18 19 20 /***************Elementos******************/X 21 22 *{font-family:Arial; font-size: 10px;} 23 h1{ padding-top: 5px; height:20px; font-size: 90%; padding-left:5px; color:#FFFFFF;} 24 dt{ padding:2px 0px 0px 5px; height:20px; font-weight:bold; font-size: 80%; color:#3E3E3D; background-color:#CEE5EF;} 25 dt.seen {font-weight:normal;} 29 30 31 32 33 34 /***************Elementos******************/ 35 36 h1{ padding-top: 5px; height:20px; font-size:small; padding-left:5px; color:#FFFFFF; float:left; } 37 dt { padding:3px 3px 3px 10px; font-size:small; color:#3E3E3D; background-color:#CEE5EF; width:100%;} 38 dt input[type="checkbox"] { 39 width: 13px; 40 height: 13px; 41 padding: 0; 42 margin:0; 43 vertical-align: bottom; 44 position: relative; 45 top: -1px; 46 *overflow: hidden; 47 } 48 .dt-azul, .dt-branco {background:#EEF7FA; clear:both; display:table; margin-top:10px; width:100%; padding:10px; 0} 49 .dt-branco {background:#FFF;} 50 dt.seen {font-weight:normal;width:100%;} 26 51 dt.important, dt.important a {color:#FF0000;} 27 dd{ min-width:200px; padding-top:3px; padding-left:25px; vertical-align:middle; min-height:20px; font-size:70%;} 28 input{ height: 15px; } 29 textarea { width: 100%; } 30 dt select, div.menu-contexto select{font-size:80%; border:none; color:#ffffff; background-color:#2B84AF;} 31 div.menu-contexto select{font-size:90%; border:none; color:#ffffff; background-color:#2B84AF;} 32 div.menu-contexto a{color:#FFFFFF; text-decoration:underline;} 33 #operacao_lista{ padding-left: 5px; padding-top:5px; height:25px; font-size:70%; background-color:#C9C9C9; } 34 #menu_rodape{background-color:#F2F2F2;} 35 #menu_rodape a{ padding-left:10px; color:#2B84AF; font-size:90%; } 36 #corpo_mensagem{ padding:10px;font-size:11px; min-width:200px;} 37 #corpo_mensagem p{min-height:25px;} 38 #corpo_mensagem input {height:10px;} 52 dd{ padding-top:3px; padding-left:25px; vertical-align:middle; font-size:small;} 53 input{height: 15px;} 54 textarea {width: 93%;} 55 dt select, div.menu-contexto select {font-size:x-small; border:none; color:#ffffff; background-color:#2B84AF;} 56 div.menu-contexto select{font-size:small; border:none; color:#ffffff; background-color:#2B84AF;} 57 div.menu-contexto a {color:#FFFFFF; text-decoration:underline;} 58 #operacao_lista {padding:5px; min-height:25px; font-size:small; background-color:#C9C9C9; width:100%;} 59 #operacao_lista span {font-size:x-small;} 60 #menu_rodape {background-color:#F2F2F2; } 61 62 /*novo*/ 63 #menu_rodape ul { width:100%; margin:0px 0 0 -10px; } 64 #menu_rodape ul li { text-align:left; } 65 #menu_rodape a {color:#2B84AF; font-size:x-small; } 66 67 68 69 /*ALTERADOS*/ 70 71 #corpo_mensagem {clear:both; padding-top:15px; color:#666; background-color:#CEE5EF; width:100%; padding-left:10px; min-height:230px; padding-bottom:10px;font-size:small;} 72 #corpo_mensagem #foto {padding:5px 0px 10px 10px;} 73 #corpo_mensagem #foto img {border:1px solid #2B84AF;} 74 #corpo_mensagem #nome {font-size:small; width:100%; padding:15px 0px 10px 10px; font-weight:bold;} 75 #corpo_mensagem #itens {font-size:x-small; float:left; font-weight:bold; text-align:right; padding-right:10px;} 76 #corpo_mensagem #itens-preenchidos {font-size:x-small; width:50%; float:left; font-weight:normal;} 77 #corpo_mensagem input {height:15px;} 78 79 #campos-correspondencia {font-weight:bold; text-align:right;color:#666; background-color:#CEE5EF; width:100%; padding-left:10px; min-height:120px; padding-bottom:30px;} 80 #posiciona-esquerda {font-size:small; float:left; font-weight:normal; text-align:left;} 81 #posiciona-direita {font-size:x-small; float:right; margin-right:50px; font-weight:normal; text-align:left;} 82 83 #lista_miolo {clear:both; color:#666; width:100%; /*min-height:165px;*/font-size:small; } 84 #lista_miolo dd {background-color:#FFFFFF; padding:3px 3px 3px 10px; width:100%; } 85 #lista_miolo dd.par {background-color:#EEF7FA; } 86 #lista_miolo #iten {width:80%; float:left; font-weight:normal; text-align:left;} 87 #lista_miolo #iten a {font-size:small;} 88 #lista_miolo #contagem {font-size:x-small; width:20%; float:left; font-weight:normal; text-align:left;} 89 90 91 39 92 40 93 /***************Classes******************/ 41 94 42 43 .busca{ padding-left: 5px; padding-top:5px; height:25px;; background-color:#E4E4E4} 44 .busca input{height:15px;} 45 .busca input.btn-generico{height:20px;} 46 .par{background-color:#EEF7FA} 47 .topo{background-color:#3E3E3D;} 95 /*ALTERADOS*/ 96 97 #busca{ padding-left:10px; padding-top:5px;background-color:#E4E4E4; min-height:35px; width:100%;} 98 #busca input[type="text"] {height:20px; width:90%; margin-right:5px} 99 #busca input[type="button"] {height:20px; min-width:100px;} 100 /*.busca input {height:10px; width:87%; float:left;}*/ 101 102 .limpar_div { 103 clear:both 104 } 105 106 107 108 .topo {width:100%; padding-left:10px; background:#333; display:table } 109 .topo a{color:#FFF; text-decoration:underline; float:right; margin:4px 20px 0 0 } 110 48 111 .rodape{ padding-top:4px; height:16px; text-align:center; font-size:50%; background-color:#F6F6F6; color:#333333;} 49 .btn-generico{color:#FFFFFF; background-color:#434343; border:none;} 50 .contagem{ text-align:right;} 51 .nome-item{ float:left;width:160px;} 52 .menu-contexto{ padding-top:3px; padding-left:5px; height:23px; font-size:70%; background-color:#3399CC; color:#FFFFFF;} 53 .btn-contexto{ font-size:90%; background-color:#2B84AF; color:#FFFFFF; border:none;} 54 .btn-generico, .btn-contexto{ height:20px; } 55 .titulo_mensagem{ font-size:75%; font-weight:bold; overflow: hidden;} 56 .titulo-sdt{ padding:2px 0px 0px 5px; height:20px; font-weight:bold; font-size: 80%; color:#3E3E3D; background-color:#CEE5EF;} 112 .btn-generico{color:#FFFFFF; background-color:#434343; border:none; min-width:60px;} 113 .contagem {text-align:right; width:20%;} 114 .nome-item{float:left;width:77%;font-size:small; color:#3E3E3D} 115 .nome-item-telefone{margin-left:21px} 116 .bg-branco{background:#FFF} 117 118 .menu-contexto {padding-left:16px; padding-top:10px; font-size:x-small; background-color:#3399CC; color:#FFFFFF; width:100%; min-height:35px;} 119 .btn-contexto {font-size:x-small; background-color:#2B84AF; color:#FFFFFF; border:none; min-height:20px;} 120 .btn-generico, .btn-contexto{padding:6px; 4px; } 121 122 /*novo*/ 123 .btn-busca {padding:4px; font-size:x-small; background-color:#2B84AF; color:#FFFFFF; border:none; min-height:20px;} 124 #voltar {margin:0; padding:0} 125 126 127 #titulo {width:100%; } 128 .titulo_mensagem {font-size:small; font-weight:bold; overflow: hidden; padding:15px 15px 5px 10px;} 129 .titulo-sdt{ padding:2px 0px 0px 5px; height:20px; font-weight:bold; font-size: x-small; color:#3E3E3D; } 130 57 131 58 132 .menu-diverso{ height:35px;} 59 .menu-diverso a{ margin-right:3px; padding:5px; font-size: 110%; background-color:#EEF7FA; color:#434343;}133 .menu-diverso a{ margin-right:3px; padding:5px; font-size:x-small; background-color:#EEF7FA; color:#434343;} 60 134 .menu-diverso a:hover,.menu-diverso a.letter-contact-selected {color:#FFFFFF;background-color:#3399CC;} 61 dt.menu-diverso div{margin-top:8px;} 62 63 .reset-dt{background-color:#ffffff;} 64 .dd-mensagem{height:30px;overflow: hidden;} 65 .btn-anexo{ padding:2px; font-size: 80%; background-color:#FAD364;} 66 a.btn-anexo{ padding:2px; font-size: 80%; color:#3E3E3D; background-color:#FAD364;} 67 .sobre-mensagem{ min-width:140px; float:left;} 135 dt.menu-diverso div {margin-top:8px;} 136 137 .reset-dt {background-color:#ffffff; width:98%; padding:10px 3px 3px 10px;} 138 .reset-dt1 {width:98%; padding:3px 3px 3px 10px;} 139 .dd-mensagem {height:30px;overflow: hidden;padding:3px 0px 15px 10px;} 140 .btn-anexo {padding:2px; font-size: x-small; background-color:#FAD364;} 141 .btn-anexo a {padding:3px; font-size: x-small; background-color:#FAD364;} 142 .sobre-mensagem {float:left;} 143 144 145 #ver-detalhes {float:left;padding:2px; background-color:#FAD364;} 146 #ver-detalhes a {padding:3px;color:#666;font-size:x-small;} 147 148 68 149 69 150 .alerta{ font-style:italic; color:#FF3300;} … … 73 154 .label-normal{font-style:italic;} 74 155 75 .campos-entrada{ height:110px; font-size:70%; background-color:#CEE5EF;} 76 .campos-correspondencia{ min-height:80px; font-size:70%; background-color:#CEE5EF;} 77 .campos-correspondencia input{height:15px;} 78 .campos-correspondencia p{height:25px;} 79 .campos-correspondencia p label{float:left;width:75px;} 80 .campos-entrada input{height:10px;} 81 .campos-correspondencia, .campos-entrada { padding:5px 0px 0px 10px; } 156 #campos {width:99%; height:auto;background-color:#CEE5EF;} 157 .campos-entrada{ font-size:70%; background-color:#CEE5EF;height:auto;} 158 .campos-correspondencia {font-size:x-small; padding:5px;} 159 .campos-correspondencia input {height:17px; float:left;} 160 .campos-correspondencia p { } 161 .campos-correspondencia p label {float:left;width:100%;} 162 .campos-entrada input {height:15px; } 163 .campos-correspondencia, .campos-entrada { } 82 164 83 165 .login{ background-color:#EEF7FA;} 84 166 .login p{padding:3px;} 85 167 .avisos{background-color:#FAE1E1;} 86 .aviso-positivo{ padding:5px; font-size: 70%; color:#333333; background-color:#CEE5EF; }87 .aviso-negativo{ padding:5px; font-size: 70%; color:#333333; background-color:#FAE1E1; }168 .aviso-positivo{ padding:5px; font-size:x-small; color:#333333; background-color:#CEE5EF; } 169 .aviso-negativo{ padding:5px; font-size:x-small; color:#333333; background-color:#FAE1E1; } 88 170 .aviso-positivo a,.aviso-negativo a{text-decoration:underline; color:#333333;} 89 171 … … 91 173 .bg-neutro{padding:5px; background-color:#EEF7FA;} 92 174 93 .rotulo-complementar{font-size: 9px; text-decoration:underline; font-weight:normal;}175 .rotulo-complementar{font-size:x-small; text-decoration:underline; padding:3px;} 94 176 95 177 .mes_corrente { padding: 0 10px } … … 98 180 #semanal { border: none; margin-bottom: 5px } 99 181 100 #calendario thead tr th { color: #333; font-size: 12px; font-weight:bold;}182 #calendario thead tr th { color: #333; font-size:small; font-weight:bold;} 101 183 #calendario thead tr th, #calendario tbody tr td { text-align: center } 102 .semana { color: #333; font-size: 12px; width:100%; font-weight:bold; width: 14%; }184 .semana { color:#333;font-size:small; width:100%; font-weight:bold; width: 14%; } 103 185 .dias { border: none } 104 186 .dias a { … … 130 212 .btn_off a { margin: 0 1px; display: inline; padding: 0 6px } 131 213 214 215 216 /*---------------------------------------- MODIFICAÇÕES ---------------------------------------------*/ 217 218 219 .email-item{color:#3E3E3D; font:bold small Arial, Helvetica, sans-serif; vertical-align:middle} 220 .email-campos{color:#3E3E3D; font:bold small Arial, Helvetica, sans-serif; text-decoration:underline !important} 221 222 223 .campos-email {width:100%; clear:both; margin-left:10px} 224 .campos-email input {width:99%; clear:both} 225 .campos-email a{float:left; text-align:right; margin-bottom:5px;} -
branches/2.2/mobile/templates/default/calendar.tpl
r3599 r3641 11 11 <form method="post" action="index.php?menuaction=mobile.ui_home.search" id="form_search"> 12 12 <input type="hidden" name="calendar_search" value="1"> 13 <div class="busca"> 14 <input type="text" name="name" id="name"> 15 <button name="buscar_compromisso" class="btn-generico" onclick="document.getElementById('form_search').submit()">{lang_search}</button> 16 </div> 13 {search} 17 14 </form> 18 15 -
branches/2.2/mobile/templates/default/cc_main.tpl
r3634 r3641 12 12 </div> 13 13 14 < div class="busca"> <form id="formu_busca" action="index.php" method="post">14 <form id="formu_busca" action="index.php" method="post"> 15 15 <input type="hidden" name="menuaction" value="mobile.ui_home.search"> 16 16 <input type="hidden" name="catalog_to_search" value="{actual_catalog}"> 17 17 <input type="hidden" name="contacts_request_from" value="{contacts_request_from}"> 18 <input type="text" name="name"> 19 <button name="buscar_contato" class="btn-generico" onClick="document.getElementById('formu_busca').submit()">{lang_search}</button> 18 {search} 20 19 </form> 21 </div>20 22 21 23 22 <dl id="lista_miolo"> -
branches/2.2/mobile/templates/default/home_index.tpl
r3600 r3641 1 1 <!-- BEGIN page --> 2 2 <form method="post" action="index.php?menuaction=mobile.ui_home.search" id="form_search"> 3 <div class="busca"> 4 <input type="text" name="name" id="name" /> 5 <button id="buscar" class="btn-generico" onclick="document.getElementById('form_search').submit()">{lang_search}</button> 6 </div> 3 {search} 4 7 5 8 6 <div class="menu-contexto"> … … 14 12 15 13 <dl id="lista_miolo"> 16 <dt><input type="checkbox" name="default_folders" value='1' ></input>{lang_my_mail} | <span class="rotulo-complementar">Usados {quota_percent}% [{quota_used}/{quota_limit}]</span></dt>14 <dt><input type="checkbox" name="default_folders" value='1'/> {lang_my_mail} | <span class="rotulo-complementar">Usados {quota_percent}% [{quota_used}/{quota_limit}]</span></dt> 17 15 {default_folders_box} 18 <dt><input type="checkbox" name="personal_folders" value='1'><a href="index.php?menuaction=mobile.ui_home.index&expand_folders={expand_folders}"> {lang_my_folders}</a></dt>16 <dt><input type="checkbox" name="personal_folders" value='1'><a href="index.php?menuaction=mobile.ui_home.index&expand_folders={expand_folders}"> {lang_my_folders}</a></dt> 19 17 {personal_folders_box} 20 <dt><input type="checkbox" name="calendar_search" value='1'><a href="index.php?menuaction=mobile.ui_mobilecalendar.index"> {lang_my_commitments}</a></dt>18 <dt><input type="checkbox" name="calendar_search" value='1'><a href="index.php?menuaction=mobile.ui_mobilecalendar.index"> {lang_my_commitments}</a></dt> 21 19 {commitments_box} 22 <dt><input type="checkbox" name="contacts_search" value='1'> {lang_my_contacts}</dt>20 <dt><input type="checkbox" name="contacts_search" value='1'> {lang_my_contacts}</dt> 23 21 </dl> 24 22 </form> -
branches/2.2/mobile/templates/default/home_search.tpl
r3596 r3641 4 4 </div> 5 5 6 <div class="busca">7 6 <form method="post" action="index.php"> 8 7 <input type="hidden" name="menuaction" value="mobile.ui_home.search"> … … 15 14 16 15 <input type="hidden" name="contacts_request_from" value="{contacts_request_from}"> 17 <input type="hidden" name="name" value="{search_param}"> 18 <input type="text" name="name"> <input type="submit" class="btn-generico" value="{lang_search}" ></form> 19 </div> 20 16 17 {search} 18 </form> 21 19 22 20 <dl id="lista_miolo"> -
branches/2.2/mobile/templates/default/mobilemail.tpl
r3589 r3641 4 4 </div> 5 5 6 < div class="busca"><form action="index.php" method="post" id="formu_busca">6 <form action="index.php" method="post" id="formu_busca"> 7 7 <input type="hidden" name="menuaction" value="mobile.ui_home.search"> 8 8 <input type="hidden" name="folder_to_search" value="{folder_id}"> 9 <input type="text" name="name">10 < button name="search_message" class="btn-generico" onClick="document.getElementById('formu_busca').submit();">{lang_search_message}</button></form></div>9 {search} 10 </form> 11 11 12 12
Note: See TracChangeset
for help on using the changeset viewer.