Changeset 60
- Timestamp:
- 08/21/07 17:28:27 (17 years ago)
- Location:
- trunk
- Files:
-
- 21 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/calendar/inc/class.boicalendar.inc.php
r15 r60 2830 2830 } 2831 2831 2832 function build_ical($ical)2833 {2834 $var = Array(2835 'timezone',2836 'event',2837 'todo',2838 'journal',2839 'freebusy'2840 );2841 2842 $str = 'BEGIN:VCALENDAR'."\r\n";2843 $str .= $this->fold('PRODID'.$this->build_text($ical['prodid'],'prodid'));2844 $str .= $this->fold('VERSION'.$this->build_text($ical['version'],'version'));2845 $str .= $this->fold('METHOD'.$this->build_text($ical['method'],'method'));2846 foreach($var as $vtype)2847 {2848 if($ical[$vtype])2849 {2850 for($i=0;$i<count($ical[$vtype]);$i++)2851 {2852 $str .= 'BEGIN:V'.strtoupper($vtype)."\r\n";2853 $str .= $this->build_card_internals('v'.$vtype,$ical[$vtype][$i]);2854 $str .= 'END:V'.strtoupper($vtype)."\r\n";2855 }2856 }2857 }2858 $str .= 'END:VCALENDAR'."\r\n";2859 2860 return $str;2861 }2862 2832 2863 2833 function switch_to_phpgw_status($partstat) -
trunk/calendar/inc/class.uiicalendar.inc.php
r2 r60 76 76 } 77 77 78 function test()79 {80 $print_events = True;81 82 unset($GLOBALS['phpgw_info']['flags']['noheader']);83 unset($GLOBALS['phpgw_info']['flags']['nonavbar']);84 $GLOBALS['phpgw']->common->phpgw_header();85 86 echo "Start Time : ".$GLOBALS['phpgw']->common->show_date()."<br>\n";87 @set_time_limit(0);88 89 $icsfile=PHPGW_APP_INC.'/events.ics';90 $fp=fopen($icsfile,'rt');91 $contents = explode("\n",fread($fp, filesize($icsfile)));92 fclose($fp);93 94 $vcalendar = $this->bo->parse($contents);95 96 if($print_events)97 {98 $this->print_test($vcalendar['prodid'],'Product ID');99 $this->print_test($vcalendar['method'],'Method');100 $this->print_test($vcalendar['version'],'Version');101 102 for($i=0;$i<count($vcalendar['event']);$i++)103 {104 $event = $vcalendar['event'][$i];105 106 echo "<br>\nEVENT<br>\n";107 // echo 'TEST Debug : '._debug_array($event,False)."<br>\n";108 $this->print_test($event['uid'],'UID','X-');109 $this->print_test($event['valscale'],'Calscale','X-');110 $this->print_test($event['description'],'Description','X-');111 $this->print_test($event['summary'],'Summary','X-');112 $this->print_test($event['comment'],'Comment','X-');113 $this->print_test($event['location'],'Location','X-');114 $this->print_test($event['sequence'],'Sequence','X-');115 $this->print_test($event['priority'],'Priority','X-');116 $this->print_test($event['categories'],'Categories','X-');117 $this->print_test($event['dtstart'],'Date Start','X-');118 $this->print_test($event['dtstamp'],'Date Stamp','X-');119 $this->print_test($event['rrule'],'Recurrence','X-');120 121 echo "Class = ".$this->bo->switch_class($event['class'])."<br>\n";122 123 $this->print_test($event['organizer'],'Organizer','X-');124 $this->print_test($event['attendee'],'Attendee','X-');125 $this->print_test($event['x_type'],'X-Type','X-');126 $this->print_test($event['alarm'],'Alarm','X-');127 }128 }129 130 /*131 for($i=0;$i<count($vcalendar->todo);$i++)132 {133 echo "<br>\nTODO<br>\n";134 if($vcalendar['todo'][$i]['summary']['value'])135 {136 echo "Summary = ".$vcalendar['todo'][$i]['summary']['value']."<br>\n";137 }138 if($vcalendar['todo'][$i]['description']['value'])139 {140 echo "Description (Value) = ".$vcalendar['todo'][$i]['description']['value']."<br>\n";141 }142 if($vcalendar['todo'][$i]['description']['altrep'])143 {144 echo "Description (Alt Rep) = ".$vcalendar['todo'][$i]['description']['altrep']."<br>\n";145 }146 if($vcalendar['todo'][$i]['location']['value'])147 {148 echo "Location = ".$vcalendar['todo'][$i]['location']['value']."<br>\n";149 }150 echo "Sequence = ".$vcalendar['todo'][$i]['sequence']."<br>\n";151 echo "Date Start : ".$GLOBALS['phpgw']->common->show_date(mktime($vcalendar['todo'][$i]['dtstart']['hour'],$vcalendar['todo'][$i]['dtstart']['min'],$vcalendar['todo'][$i]['dtstart']['sec'],$vcalendar['todo'][$i]['dtstart']['month'],$vcalendar['todo'][$i]['dtstart']['mday'],$vcalendar['todo'][$i]['dtstart']['year']) - $this->datatime->tz_offset)."<br>\n";152 echo "Class = ".$vcalendar['todo'][$i]['class']['value']."<br>\n";153 }154 155 */156 include(PHPGW_APP_INC.'/../setup/setup.inc.php');157 158 $this->bo->set_var($vcalendar['prodid'],'value','-//phpGroupWare//phpGroupWare '.$setup_info['calendar']['version'].' MIMEDIR//'.strtoupper($GLOBALS['phpgw_info']['user']['preferences']['common']['lang']));159 $this->bo->set_var($vcalendar['version'],'value','2.0');160 $this->bo->set_var($vcalendar['method'],'value',strtoupper('publish'));161 echo "<br><br><br>\n";162 echo nl2br($this->bo->build_ical($vcalendar));163 echo "End Time : ".$GLOBALS['phpgw']->common->show_date()."<br>\n";164 }165 166 78 function import() 167 79 { -
trunk/expressoMail1_2/index.php
r57 r60 4 4 'nonavbar' => False, 5 5 'currentapp' => 'expressoMail1_2', 6 'update_version' => '1.210 ',6 'update_version' => '1.2101', 7 7 'enable_nextmatchs_class' => True 8 8 ); -
trunk/expressoMail1_2/setup/setup.inc.php
r51 r60 12 12 $setup_info['expressoMail1_2']['name'] = 'expressoMail1_2'; 13 13 $setup_info['expressoMail1_2']['title'] = 'ExpressoMail 1.2'; 14 $setup_info['expressoMail1_2']['version'] = '1.210 ';14 $setup_info['expressoMail1_2']['version'] = '1.2101'; 15 15 $setup_info['expressoMail1_2']['app_order'] = 2; 16 16 // $setup_info['expressoMail1_2']['tables'][] = 'phpgw_expressoMail1_2'; -
trunk/expressoMail1_2/templates/default/index.tpl
r58 r60 56 56 <tbody> 57 57 <tr id="table_message"></tr> 58 </tbody> 59 </table> 58 </tbody> 59 </table> 60 60 </div> 61 61 </div> -
trunk/instant_messenger/docs/change_log.txt
r57 r60 15 15 - Permanência de estado ( online, offline, ausente, invisível), quando é feito o refresh 16 16 de página no expresso. 17 18 21/08/2007 19 - Corrigido a mudança de status automática 20 - Layout do adicionar contato não gera mais scrolls -
trunk/instant_messenger/js/im_preferences.js
r59 r60 387 387 IM_Preferences.prototype.vCardAdd = function() 388 388 { 389 var el_vcard = new Array('FN','NICKNAME',' ROLE','ORGNAME','ORGUNIT','BDAY','DESC');389 var el_vcard = new Array('FN','NICKNAME','ORGNAME','ORGUNIT','ROLE','BDAY','DESC'); 390 390 var vcard = ""; 391 391 var value = ""; … … 414 414 }; 415 415 XMLTools.request('$this.Ujabber.newVcard','POST',handler_vcard_add,"vcard="+escape(vcard)); 416 alert('Informações Cadastradas / Adicionad s !!!');416 alert('Informações Cadastradas / Adicionadas !!!'); 417 417 } 418 418 -
trunk/instant_messenger/js/im_win.js
r59 r60 10 10 try 11 11 { 12 backFantom = func.newEl('div');12 var backFantom = func.newEl('div'); 13 13 func.confEl(backFantom, 'id', 'backFantom'); 14 14 func.confEl(backFantom, 'style', 'position:absolute;top:0px;left:0px;width:100%;height:100%;z-Index:-1;'); 15 15 16 test = func.newEl('div'); 17 func.confEl(test, 'id', 'test'); 18 func.confEl(test, 'style', 'visibility: hidden;'); 19 20 menu_contato = func.newEl('div'); 16 var menu_contato = func.newEl('div'); 21 17 func.confEl(menu_contato, 'id', 'menu_contato'); 22 18 func.confEl(menu_contato, 'class', 'menu_im'); 23 19 func.confEl(menu_contato, 'style', 'position:absolute;z-index:99999'); 24 20 25 emotions = func.newEl('div');21 var emotions = func.newEl('div'); 26 22 func.confEl(emotions, 'id', 'shared_emotions'); 27 23 func.confEl(emotions, 'class', 'emotionFrame'); 28 24 func.confEl(emotions, 'style', 'position:absolute;padding:1px;left:350px;visibility:hidden;top:0px'); 29 25 30 font_name = func.newEl('div');26 var font_name = func.newEl('div'); 31 27 func.confEl(font_name, 'id', 'shared_fontName'); 32 28 func.confEl(font_name, 'class', 'statusMenu'); 33 29 func.confEl(font_name, 'style', 'position:absolute;visibility:hidden;padding:1px;left:400px;top:0px'); 34 30 35 font_size = func.newEl('div');31 var font_size = func.newEl('div'); 36 32 func.confEl(font_size, 'id', 'shared_fontSize'); 37 33 func.confEl(font_size, 'class', 'statusMenu'); 38 34 func.confEl(font_size, 'style', 'position:absolute;visibility:hidden;padding:1px;left:400px;top:0px'); 39 35 40 font_color = func.newEl('div');36 var font_color = func.newEl('div'); 41 37 func.confEl(font_color, 'id', 'shared_fontColor'); 42 38 func.confEl(font_color, 'class', 'statusMenu'); 43 39 func.confEl(font_color, 'style', 'position:absolute;visibility:hidden;padding:1px;left:400px;top:0px'); 44 40 45 font_style = func.newEl('div');41 var font_style = func.newEl('div'); 46 42 func.confEl(font_style, 'id', 'shared_fontStyle'); 47 43 func.confEl(font_style, 'class', 'statusMenu'); 48 44 func.confEl(font_style, 'style', 'position:absolute;visibility:hidden;padding:1px;left:400px;top:0px'); 49 45 50 func.insEl(backFantom, test,menu_contato, emotions, font_name, font_size, font_color, font_style, false);46 func.insEl(backFantom, menu_contato, emotions, font_name, font_size, font_color, font_style, false); 51 47 52 48 emotions.innerHTML = Templates.emotions(); … … 56 52 font_style.innerHTML = Templates.font_style(); 57 53 58 pId = 'contacts';59 60 main_menu_all = func.newEl('div');54 var pId = 'contacts'; 55 56 var main_menu_all = func.newEl('div'); 61 57 func.confEl(main_menu_all, 'style', 'margin: 3px;'); 62 58 63 main_menu_head = func.newEl('div');59 var main_menu_head = func.newEl('div'); 64 60 func.confEl(main_menu_head, 'id', pId + '_im_window_body_inner_head'); 65 61 func.confEl(main_menu_head, 'style', 'margin: 0px 0px 3px 0px; border: 1px solid #809aa9; display: block;'); 66 62 67 main_menu_vcard = func.newEl('div');63 var main_menu_vcard = func.newEl('div'); 68 64 func.confEl(main_menu_vcard, 'id', 'im_vcard_contacts'); 69 65 func.confEl(main_menu_vcard, 'style', 'display: none;'); 70 66 71 main_menu_body = func.newEl('div');67 var main_menu_body = func.newEl('div'); 72 68 func.confEl(main_menu_body, 'id', 'div_contacts'); 73 69 func.confEl(main_menu_body, 'style', 'border: 1px solid #809aa9;'); … … 75 71 func.insEl(main_menu_head, main_menu_vcard, main_menu_body, main_menu_all); 76 72 77 main_menu_head_picture = func.newEl('img');73 var main_menu_head_picture = func.newEl('img'); 78 74 func.confEl(main_menu_head_picture, 'id', pId + '_avatar'); 79 75 func.confEl(main_menu_head_picture, 'src', img_photo.src); 80 76 func.confEl(main_menu_head_picture, 'style', 'float: left; height: 65px; margin: 2px; width: 49px;'); 81 77 82 main_menu_head_name = func.newEl('span');78 var main_menu_head_name = func.newEl('span'); 83 79 func.confEl(main_menu_head_name, 'id', 'span_nickname'); 84 main_menu_head_name_txt = document.createTextNode(" your nickname");80 var main_menu_head_name_txt = document.createTextNode(" your nickname"); 85 81 func.insEl(main_menu_head_name_txt, main_menu_head_name); 86 82 87 br1 = func.newEl('br');88 89 main_menu_head_message = func.newEl('span');83 var br1 = func.newEl('br'); 84 85 var main_menu_head_message = func.newEl('span'); 90 86 func.confEl(main_menu_head_message, 'id', 'span_message'); 91 main_menu_head_message_txt = document.createTextNode(' your message');87 var main_menu_head_message_txt = document.createTextNode(' your message'); 92 88 func.insEl(main_menu_head_message_txt, main_menu_head_message); 93 89 94 br2 = func.newEl('br');90 var br2 = func.newEl('br'); 95 91 96 92 func.insEl(main_menu_head_picture, main_menu_head_name, br1, main_menu_head_message, br2, main_menu_head); 97 93 98 main_menu_head_div = func.newEl("div");94 var main_menu_head_div = func.newEl("div"); 99 95 func.confEl(main_menu_head_div,'id','menu_preferences'); 100 96 func.confEl(main_menu_head_div,'class','menu_im'); … … 122 118 main_menu_head.innerHTML += '<span id="span_menu_pref" style="float: left;" onmousedown="IM.menu_preferences(event ,\'menu_preferences\'); document.oncontextmenu = new Function(\'return false\');"></span>'; 123 119 124 br3 = func.newEl('br');120 var br3 = func.newEl('br'); 125 121 func.confEl(br3, 'style', 'clear: both'); 126 122 127 div_ie = func.newEl('div');123 var div_ie = func.newEl('div'); 128 124 129 125 func.insEl(br3, div_ie, main_menu_head); … … 468 464 "showWindowItem" : function(pId) 469 465 { 466 /* 467 * Não tire esta linha 468 * Isso deve estar aqui para a janela 'oculta' 469 * não 'piscar' na tela no momento que é criada. 470 */ 471 func.byId(pId + '_im_window_body_inner').style.overflow = 'auto'; 472 470 473 if ( (name_document = document.getElementById(pId + '_divEdita')) ) 471 474 { … … 488 491 dd.elements[pId + "_im_window_resize"].show(); 489 492 dd.elements[pId + "_im_window_movable"].show(); 493 490 494 }, 491 495 … … 523 527 524 528 "windowMaximizeRestore" : function(objName) 525 { 529 { 526 530 with(objName) 527 531 objName = substr(0, indexOf('_im')); … … 681 685 // Photo Ldap; 682 686 this.get_photo_ldap(pId); 683 687 684 688 name_document = document.getElementById(pId + '_edita'); 685 689 name_document.contentWindow.document.write('<html><body id="' + pId.replace('@', '_at_').replace(/\./g, '_dot_') + '" style="margin:0px;padding:0px"></body></html>'); -
trunk/instant_messenger/templates/default/index.tpl
r20 r60 5 5 <li><a href="#intro">Introdução</a> 6 6 <li><a href="#supported">Browsers Suportados</a> 7 <li><a href="#prefe">Menu Preferências</a>7 <li><a href="#prefe">Menu Opções</a> 8 8 <li><a href="#contact_list">Lista de Contatos</a> 9 9 <ol> … … 14 14 <li><a href="#menu_right">Preferências Avançadas</a> 15 15 <li><a href="#info_ad">Informações Adicionais</a> 16 <li><a href="#info_prefe">Preferências</a> 16 17 <li><a href="#troca_mens">Troca de Mensagens</a> 17 18 <li><a href="#troca_status">Troca de Status</a> … … 26 27 <br> 27 28 ( figura 1 ) 28 <img src="templates/default/images/lista_contatos.png" width="2 56" height="371" alt="Im Screenshot" align="left" style="padding-right:4px;">29 <img src="templates/default/images/lista_contatos.png" width="244" height="369" alt="Im Screenshot" align="left" style="padding-right:4px;"> 29 30 30 31 <br clear="all"> … … 46 47 </p> 47 48 48 <h2><a name="prefe">3. Menu Preferências</a></h2>49 <h2><a name="prefe">3. Menu Opções</a></h2> 49 50 ( figura 2 ) 50 <img src="templates/default/images/menu_preferencias.png" width="25 9" height="188" alt="Menu Preferências" align="left">51 <img src="templates/default/images/menu_preferencias.png" width="253" height="158" alt="Menu Preferências" align="left"> 51 52 <br clear="all"> 52 53 <br> 53 54 54 Para acessar suas "Preferências" ( conforme figura 2 ), basta dar um clique com o mouse e abrirá uma menu com as opções de Adicionar Contato ( <b>veja <a href="#useradd">Adicionando um novo contato</a></b> ), Remover Contato ( <b>veja <a href="#userdel">Removendo um contato</a></b> ) e55 Informações Adicionais ( <b>veja <a href="#info_ad">Informações Adicionais</a></b> ) .55 Para acessar o menu "Opções" ( conforme figura 2 ), basta dar um clique com o mouse e abrirá uma menu com as opções de Adicionar Contato ( <b>veja <a href="#useradd">Adicionando um novo contato</a></b> ), Remover Contato ( <b>veja <a href="#userdel">Removendo um contato</a></b> ), 56 Informações Adicionais ( <b>veja <a href="#info_ad">Informações Adicionais</a></b> ) e Preferências ( <b>veja <a href="#info_prefe">Preferências</a></b> ). 56 57 57 58 <h2><a name="contact_list">4. Lista de Contatos</a></h2> 58 59 ( figura 3 ) 59 <img src="templates/default/images/lista_contatos1.png" width="23 0" height="248" alt="Lista de Contatos" align="left">60 <img src="templates/default/images/lista_contatos1.png" width="236" height="242" alt="Lista de Contatos" align="left"> 60 61 <br clear="all"> 61 62 <br> … … 64 65 <h3><a name="status">1. Status dos Usuários</a></h3> 65 66 66 <img src="templates/default/images/ online.gif" align="top"> - Contato Online<br>67 <img src="templates/default/images/ offline.gif" align="top"> - Contato Offline<br>68 <img src="templates/default/images/ not_authorized.gif" align="top"> - Contato aguardando autorização ou não autorizado<br>69 <img src="templates/default/images/ chat.gif" align="top"> - Existe uma janela aberta para a troca de mensagens<br>67 <img src="templates/default/images/available.gif" align="top"> - Contato Online<br> 68 <img src="templates/default/images/away.gif" align="top"> - Contato Ausente<br> 69 <img src="templates/default/images/dnd.gif" align="top"> - Contato Ocupado<br> 70 <img src="templates/default/images/unavailable.gif" align="top"> - Contato Offline<br> 70 71 71 72 <h3><a name="useradd">2. Adicionando um novo contato </a></h3> 72 73 ( figura 3.1 ) 73 <img src="templates/default/images/adicionar_contato.png" width="5 10" height="337" alt="Adicionar Contato" align="left">74 <img src="templates/default/images/adicionar_contato.png" width="536" height="342" alt="Adicionar Contato" align="left"> 74 75 <br clear="all"> 75 76 <br> … … 81 82 <h3><a name="userdel">3. Removendo um contato </a></h3> 82 83 ( figura 3.2 ) 83 <img src="templates/default/images/remover_contato.png" width=" 410" height="164" alt="Remover Contato" align="left">84 <img src="templates/default/images/remover_contato.png" width="314" height="157" alt="Remover Contato" align="left"> 84 85 <br clear="all"> 85 86 <br> … … 89 90 <h2><a name="menu_right">5. Preferências Avançadas</a></h2> 90 91 ( figura 3.3 ) 91 <img src="templates/default/images/menu_right.png" width=" 259" height="359" alt="Preferências Avançadas" align="left">92 <img src="templates/default/images/menu_right.png" width="152" height="130" alt="Preferências Avançadas" align="left"> 92 93 <br clear="all"> 93 94 <br> … … 96 97 97 98 <ul> 98 <li>Apelido: Renomeia o Apelido (Nickanem) do seu contato99 < !--<li>Envio Arquivo: Troca de arquivos entre você e seus contatos-->99 <li>Apelido: Renomeia o Apelido ( Nickname ) do seu contato 100 <li>Envio Arquivo: Troca de arquivos entre você e seus contatos ( Caso esta opção esteja habilitada ) 100 101 <li>Grupo: Muda seu contato para um novo grupo 101 102 <li>Remover: Exclui o contato 103 <li>(Re)-requisitar Autorização: Requisitar autorização 102 104 <li>Ver Info: Visualize as informações dos seus contatos 103 105 </ul> … … 105 107 <h2><a name="info_ad">6. Informações Adicionais</a></h2> 106 108 ( figura 4 ) 107 <img src="templates/default/images/info_adicionais.png" width="410" height="2 74" alt="Informações Adicionais" align="left">109 <img src="templates/default/images/info_adicionais.png" width="410" height="267" alt="Informações Adicionais" align="left"> 108 110 <br clear="all"> 109 111 <br> … … 114 116 <h2><a name="troca_mens">7. Troca de Mensagens</a></h2> 115 117 ( figura 5 ) 116 <img src="templates/default/images/troca_mensagem.png" width=" 485" height="270" alt="Troca de Mensagens" align="left">118 <img src="templates/default/images/troca_mensagem.png" width="332" height="272" alt="Troca de Mensagens" align="left"> 117 119 <br clear="all"> 118 120 <br> … … 123 125 <h2><a name="troca_status">8. Troca de Status</a></h2> 124 126 ( figura 6 ) 125 <img src="templates/default/images/troca_status.png" width=" 391" height="250" alt="Troca de Status" align="left">127 <img src="templates/default/images/troca_status.png" width="449" height="313" alt="Troca de Status" align="left"> 126 128 <br clear="all"> 127 129 <br> 128 130 129 Já está disponível o recurso de mudar o status para "online/offline". 131 Para mudar o seu status basta dar um click em cima do status desejado. 132 133 <br><br> 134 135 <img src="templates/default/images/available.gif" align="top"> - Online <br> 136 <img src="templates/default/images/away.gif" align="top"> - Ausente <br> 137 <img src="templates/default/images/dnd.gif" align="top"> - Ocupado <br> 138 <img src="templates/default/images/unavailable.gif" align="top"> - Offline - Não recebe mensagem <br> 139 <img src="templates/default/images/img/icon_edit.gif" align="top"> - Mensagem - Personalize sua mensagem <br> 130 140 131 141 <hr noshade> -
trunk/instant_messenger/templates/default/messenger.css
r55 r60 322 322 left: 4px; 323 323 margin: 0px 0px 15px 0px; 324 overflow: auto;325 324 position: absolute; 326 325 top: 23px; -
trunk/instant_messenger/xsl/information_user.xsl
r57 r60 32 32 </tr> 33 33 <tr> 34 <td width="30%" align="right"><xsl:value-of select="getlang/ROLE"/> .: </td>35 <xsl:choose>36 <xsl:when test="vcard/role">37 <td><input id="ORGNAME" type="text" size="17" maxlength="17" value="{vcard/role}"/></td>38 </xsl:when>39 <xsl:otherwise>40 <td><input id="ORGNAME" type="text" size="17" maxlength="17" value="{vcard/ROLE}"/></td>41 </xsl:otherwise>42 </xsl:choose>43 </tr>44 <tr>45 34 <td width="30%" align="right"><xsl:value-of select="getlang/ORGNAME"/> .: </td> 46 35 <xsl:choose> 47 36 <xsl:when test="vcard/orgname"> 48 <td><input id="ORG UNIT" type="text" size="10" maxlength="10" value="{vcard/orgname}"/></td>37 <td><input id="ORGNAME" type="text" size="17" maxlength="17" value="{vcard/orgname}"/></td> 49 38 </xsl:when> 50 39 <xsl:otherwise> 51 <td><input id="ORG UNIT" type="text" size="10" maxlength="10" value="{vcard/ORGNAME}"/></td>40 <td><input id="ORGNAME" type="text" size="17" maxlength="17" value="{vcard/ORGNAME}"/></td> 52 41 </xsl:otherwise> 53 42 </xsl:choose> … … 57 46 <xsl:choose> 58 47 <xsl:when test="vcard/orgunit"> 59 <td><input id=" ROLE" type="text" size="25" maxlength="25" value="{vcard/orgunit}"/></td>48 <td><input id="ORGUNIT" type="text" size="10" maxlength="10" value="{vcard/orgunit}"/></td> 60 49 </xsl:when> 61 50 <xsl:otherwise> 62 <td><input id="ROLE" type="text" size="25" maxlength="25" value="{vcard/ORGUNIT}"/></td> 51 <td><input id="ORGUNIT" type="text" size="10" maxlength="10" value="{vcard/ORGUNIT}"/></td> 52 </xsl:otherwise> 53 </xsl:choose> 54 </tr> 55 <tr> 56 <td width="30%" align="right"><xsl:value-of select="getlang/ROLE"/> .: </td> 57 <xsl:choose> 58 <xsl:when test="vcard/role"> 59 <td><input id="ROLE" type="text" size="25" maxlength="25" value="{vcard/role}"/></td> 60 </xsl:when> 61 <xsl:otherwise> 62 <td><input id="ROLE" type="text" size="25" maxlength="25" value="{vcard/ROLE}"/></td> 63 63 </xsl:otherwise> 64 64 </xsl:choose> -
trunk/instant_messenger/xsl/window.xsl
r55 r60 8 8 </head> 9 9 <body> 10 <div id="{@id}_im_window_master" class="master" style="top:{@top};left:{@left};height:{(@height + 48)};width:{(@width + 12)};{@style} ">11 <div id="{@id}_im_window" class="pai" style="height:{(@height + 40)}">10 <div id="{@id}_im_window_master" class="master" style="top:{@top};left:{@left};height:{(@height + 48)};width:{(@width + 12)};{@style};"> 11 <div id="{@id}_im_window" class="pai" style="height:{(@height + 40)};"> 12 12 <div id="{@id}_im_window_icon" class="im_window_icon" /> 13 13 <div class="tit"><xsl:value-of select="@title" /></div> 14 14 <xsl:apply-templates select="/" mode='buttons' /> 15 <div class="filho" id="{@id}_im_window_body_inner" style="width:{@width};height:{@height} " />16 </div> 15 <div class="filho" id="{@id}_im_window_body_inner" style="width:{@width};height:{@height};" /> 16 </div> 17 17 </div> 18 18 19 <div class="im-windowfantom-des" id="{@id}_im_window_fantom" /> 19 20 <div class="im-windowfantom-des" id="{@id}_im_window_movable" />
Note: See TracChangeset
for help on using the changeset viewer.