Changeset 2802
- Timestamp:
- 05/18/10 09:41:04 (14 years ago)
- Location:
- trunk
- Files:
-
- 1 added
- 27 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/admin/inc/class.uiapplications.inc.php
r2691 r2802 282 282 if ($_POST['delete']) 283 283 { 284 return $this->delete(); 284 echo $GLOBALS[ 'phpgw_info' ][ 'flags' ][ 'java_script' ] .= "<script>ExpressoLivre.link( '{$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiapplications.delete&start=' )}{$start}&app_name={$app_name}' );</script>"; 285 exit; 285 286 } 286 287 … … 300 301 )); 301 302 302 $GLOBALS['phpgw']->redirect_link('/#index.php','menuaction=admin.uiapplications.get_list&start='.$start); 303 $GLOBALS[ 'phpgw_info' ][ 'flags' ][ 'java_script' ] .= "<script>ExpressoLivre.link( '{$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiapplications.get_list&start='.$start)}' );</script>"; 304 exit; 303 305 } 304 306 } … … 354 356 if ($GLOBALS['phpgw']->acl->check('applications_access',8,'admin')) 355 357 { 356 $GLOBALS['phpgw']->redirect_link('/ #');358 $GLOBALS['phpgw']->redirect_link('/'); 357 359 } 358 360 $app_name = get_var('app_name',array('POST','GET')); … … 365 367 $this->bo->delete($app_name); 366 368 } 367 $GLOBALS['phpgw']->redirect_link('/ #index.php','menuaction=admin.uiapplications.get_list&start='.$start);369 $GLOBALS['phpgw']->redirect_link('/index.php','menuaction=admin.uiapplications.get_list&start='.$start); 368 370 } 369 371 -
trunk/admin/inc/class.uicategories.inc.php
r2686 r2802 418 418 unset($values); 419 419 } 420 } 421 if ($redirect_) 422 $GLOBALS['phpgw']->redirect_link('/#index.php',$link_data); 420 } 421 if ($redirect_) 422 { 423 $GLOBALS[ 'phpgw_info' ][ 'flags' ][ 'java_script' ] .= "<script>ExpressoLivre.link( '{$GLOBALS[ 'phpgw' ] -> link('/index.php',$link_data)}' );</script>"; 424 exit; 425 } 423 426 424 427 } … … 427 430 428 431 $this->set_langs(); 429 // if ExpressoMail 1.2 has been installed and enabled, show the plugin using AJAX.430 if($GLOBALS['phpgw_info']['server']['cal_expressoMail']) {431 $this->template_dir = 'calendar/templates/'.$GLOBALS['phpgw_info']['user']['preferences']['common']['template_set'];432 $module_name = 'expressoMail'.(str_replace("1.","1_",$GLOBALS['phpgw_info']['server']['cal_expressoMail']));433 if($GLOBALS['phpgw_info']['user']['apps'][$module_name]){434 $ldap_manager = CreateObject('contactcenter.bo_ldap_manager');435 $_SESSION['phpgw_info']['expressomail']['user'] = $GLOBALS['phpgw_info']['user'];436 $_SESSION['phpgw_info']['expressomail']['user']['owner'] = $GLOBALS['phpgw_info']['user']['account_id'];437 $_SESSION['phpgw_info']['expressomail']['server'] = $GLOBALS['phpgw_info']['server'];438 $_SESSION['phpgw_info']['expressomail']['ldap_server'] = $ldap_manager ? $ldap_manager->srcs[1] : null;439 // Carrega todos scripts necessarios440 $scripts = "<script src='".$module_name."/js/connector.js' type='text/javascript'></script>".441 442 443 // Fim444 $this->template->set_var('scripts',$scripts);445 $this->template->set_var('template_set', $this->template_dir);446 }447 }448 // FIM if.432 // if ExpressoMail 1.2 has been installed and enabled, show the plugin using AJAX. 433 if($GLOBALS['phpgw_info']['server']['cal_expressoMail']) { 434 $this->template_dir = 'calendar/templates/'.$GLOBALS['phpgw_info']['user']['preferences']['common']['template_set']; 435 $module_name = 'expressoMail'.(str_replace("1.","1_",$GLOBALS['phpgw_info']['server']['cal_expressoMail'])); 436 if($GLOBALS['phpgw_info']['user']['apps'][$module_name]){ 437 $ldap_manager = CreateObject('contactcenter.bo_ldap_manager'); 438 $_SESSION['phpgw_info']['expressomail']['user'] = $GLOBALS['phpgw_info']['user']; 439 $_SESSION['phpgw_info']['expressomail']['user']['owner'] = $GLOBALS['phpgw_info']['user']['account_id']; 440 $_SESSION['phpgw_info']['expressomail']['server'] = $GLOBALS['phpgw_info']['server']; 441 $_SESSION['phpgw_info']['expressomail']['ldap_server'] = $ldap_manager ? $ldap_manager->srcs[1] : null; 442 // Carrega todos scripts necessarios 443 $scripts = "<script src='".$module_name."/js/connector.js' type='text/javascript'></script>". 444 "<script type='text/javascript'>var DEFAULT_URL = '".$module_name."/controller.php?action=';</script> ". 445 "<script src='".$this->template_dir."/js/search.js' type='text/javascript'></script>"; 446 // Fim 447 $this->template->set_var('scripts',$scripts); 448 $this->template->set_var('template_set', $this->template_dir); 449 } 450 } 451 // FIM if. 449 452 450 453 $this->template->set_file(array('form' => 'category_form.tpl')); … … 567 570 if (!$this->cat_id || $_POST['cancel']) 568 571 { 569 $GLOBALS['phpgw']->redirect_link('/#index.php',$link_data); 572 $GLOBALS[ 'phpgw_info' ][ 'flags' ][ 'java_script' ] .= "<script>ExpressoLivre.link( '{$GLOBALS[ 'phpgw' ] -> link('/index.php',$link_data)}' );</script>"; 573 exit; 570 574 } 571 575 … … 580 584 $this->bo->delete($this->cat_id,False); 581 585 } 582 $GLOBALS['phpgw']->redirect_link('/#index.php',$link_data); 586 $GLOBALS[ 'phpgw_info' ][ 'flags' ][ 'java_script' ] .= "<script>ExpressoLivre.link( '{$GLOBALS[ 'phpgw' ] -> link('/index.php',$link_data)}' );</script>"; 587 exit; 583 588 } 584 589 $this->template->set_file(array('category_delete' => 'delete_cat.tpl')); -
trunk/admin/inc/class.uiconfig.inc.php
r2686 r2802 126 126 if(!$errors) 127 127 { 128 $GLOBALS['phpgw']->redirect_link('/#admin/'); 128 $GLOBALS[ 'phpgw_info' ][ 'flags' ][ 'java_script' ] .= "<script>ExpressoLivre.link( '{$GLOBALS[ 'phpgw' ] -> link('/admin/')}' );</script>"; 129 exit; 129 130 } 130 131 } -
trunk/admin/inc/class.uimainscreen.inc.php
r2703 r2802 24 24 25 25 $html = createObject('phpgwapi.html'); 26 $section = addslashes($_ POST['section']);27 $select_lang = addslashes($_ POST['select_lang']);26 $section = addslashes($_REQUEST['section']); 27 $select_lang = addslashes($_REQUEST['select_lang']); 28 28 $message = addslashes($_POST['message']); 29 29 … … 41 41 $acl_ok['loginhelp'] = True; 42 42 } 43 if ($_POST['cancel'] && !isset($_POST['message']) || 44 43 44 if ($_POST['cancel'] && !isset($_POST['message']) || !count($acl_ok) || $_POST['submit'] && !isset($acl_ok[$section])) 45 45 { 46 46 $GLOBALS['phpgw']->redirect_link('/admin/index.php'); … … 56 56 $GLOBALS['phpgw']->db->query("DELETE FROM phpgw_lang WHERE message_id='$section" . "_message' AND app_name='" 57 57 . "$section' AND lang='$select_lang'",__LINE__,__FILE__); 58 58 59 $GLOBALS['phpgw']->db->query("INSERT INTO phpgw_lang (message_id,app_name,lang,content)VALUES ('$section" . "_message','$section','$select_lang','" 59 60 . $message . "')",__LINE__,__FILE__); 60 $feedback_message = '<center>'.lang('message has been updated').'</center>'; 61 62 $section = '';61 62 $GLOBALS[ 'phpgw_info' ][ 'flags' ][ 'java_script' ] .= "<script>ExpressoLivre.link( '{$GLOBALS[ 'phpgw' ] -> link( '/index.php','menuaction=admin.uimainscreen.index' ) }§ion={$section}&saved=true' );</script>"; 63 exit; 63 64 } 64 65 if ($_POST['cancel']) // back to section/lang-selection … … 86 87 } 87 88 88 89 90 89 if ( array_key_exists( 'saved', $_GET ) && $_GET[ 'saved' ] == 'true' ) 90 { 91 $feedback_message = '<center>'.lang('message has been updated').'</center>'; 92 $section = ''; 93 } 94 91 95 if (empty($section)) 92 96 { … … 126 130 { 127 131 $select_section .= ' <option value="'.$key.'"'. 128 ($key == $_ POST['section'] ? ' selected' : '') . '>' .132 ($key == $_REQUEST['section'] ? ' selected' : '') . '>' . 129 133 ($key == 'mainscreen' ? lang('Main screen') : lang($key)) . "</option>\n"; 130 134 } … … 136 140 $tr_color = $GLOBALS['phpgw']->nextmatchs->alternate_row_color($tr_color); 137 141 $GLOBALS['phpgw']->template->set_var('tr_color',$tr_color); 138 $GLOBALS['phpgw']->template->set_var('value','<input type="submit" value="' . lang('Edit') 142 $GLOBALS['phpgw']->template->set_var('value','<input type="button" value="' . lang('Edit') 143 . '" onclick="ExpressoLivre.link( \'' . $GLOBALS[ 'phpgw' ] -> link( '/index.php','menuaction=admin.uimainscreen.index' ) 144 . '\' + \'§ion=\' + escape( this.form.section.item( 1 ).value ) + \'&select_lang=\' + escape( this.form.select_lang.item( 1 ).value ) )' 139 145 . '"><input type="button" name="cancel" value="'. lang('cancel') .'" onclick="ExpressoLivre.link( \'' . $GLOBALS[ 'phpgw' ] -> link( '/admin/index.php' ) . '\' )">'); 140 146 $GLOBALS['phpgw']->template->fp('rows','row_2',True); … … 148 154 $current_message = $GLOBALS['phpgw']->db->f('content'); 149 155 150 if($_POST['htmlarea']) 151 { 152 $text_or_htmlarea=$html->htmlarea('message',stripslashes($current_message)); 153 $htmlarea_button='<input type="submit" name="no-htmlarea" onclick="self.location.href=\''.$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uimainscreen.index&htmlarea=true').'\'" value="'.lang('disable WYSIWYG-editor').'">'; 156 if($_REQUEST['htmlarea']) 157 { 158 //$text_or_htmlarea=$html->htmlarea('message',stripslashes($current_message)); 159 160 include_once("news_admin/inc/fckeditor.php"); 161 $oFCKeditor = new FCKeditor( 'message' ); 162 163 $webserver_url = $GLOBALS['phpgw_info']['server']['webserver_url']; 164 $webserver_url = ( !empty($webserver_url) ) ? $webserver_url : '/'; 165 166 if(strrpos($webserver_url,'/') === false || strrpos($webserver_url,'/') != (strlen($webserver_url)-1)) 167 $webserver_url .= '/'; 168 169 $oFCKeditor->BasePath = $webserver_url . 'news_admin/templates/default/fckeditor/'; 170 $oFCKeditor->ToolbarSet = 'Basic'; 171 $oFCKeditor->Value = $current_message; 172 173 $text_or_htmlarea = $oFCKeditor->Create( ); 174 175 $htmlarea_button='<input type="button" name="no-htmlarea" onclick="ExpressoLivre.link( \''.$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uimainscreen.index&htmlarea=true§ion=' . $section ) . '\');" value="'.lang('disable WYSIWYG-editor').'">'; 154 176 } 155 177 else 156 178 { 157 158 $htmlarea_button='<input type="submit" name="htmlarea" onclick="self.location.href=\''.$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uimainscreen.index&htmlarea=true').'\'" value="'.lang('activate WYSIWYG-editor').'">';179 $text_or_htmlarea='<textarea name="message" style="width:100%; min-width:350px; height:300px;" wrap="virtual">' . stripslashes($current_message) . '</textarea>'; 180 $htmlarea_button='<input type="button" name="htmlarea" onclick="ExpressoLivre.link( \''.$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uimainscreen.index&htmlarea=true§ion=' . $section ) . '\' );" value="'.lang('activate WYSIWYG-editor').'">'; 159 181 160 182 } … … 163 185 //$GLOBALS['phpgw']->common->phpgw_header(); 164 186 //echo parse_navbar(); 165 187 166 188 $GLOBALS['phpgw']->template->set_var('form_action',$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uimainscreen.index')); 167 189 $GLOBALS['phpgw']->template->set_var('select_lang',$select_lang); … … 184 206 $GLOBALS['phpgw']->template->set_var('tr_color',$tr_color); 185 207 $GLOBALS['phpgw']->template->set_var('value','<input type="submit" name="submit" value="' . lang('Save') 186 . '"><input type=" submit" name="cancel" value="'. lang('cancel') .'">'.$htmlarea_button);208 . '"><input type="button" name="cancel" value="'. lang('cancel') .'" onclick="ExpressoLivre.link( \'' . $GLOBALS[ 'phpgw' ] -> link( '/index.php','menuaction=admin.uimainscreen.index' ) . '\' )">'.$htmlarea_button); 187 209 $GLOBALS['phpgw']->template->fp('rows','row_2',True); 188 210 } -
trunk/admin/templates/classic/config.tpl
r1517 r2802 1 1 <!-- BEGIN header --> 2 <script> 3 function FCKeditor_OnComplete( editorInstance ) 4 { 5 editorInstance.LinkedField.form.onsubmit = function( ) 6 { 7 document.getElementById( 'newsettings[agree_term]' ).value = FCKeditorAPI.GetInstance( editorInstance.Name ).GetHTML( ); 8 return ExpressoLivre.form( editorInstance.LinkedField.form ); 9 }; 10 } 11 </script> 2 12 <form method="POST" action="{action_url}"> 3 13 <table align="center" width="85%" callspacing="0" style="{ border: 1px solid #000000; }"> -
trunk/admin/templates/default/application_form.tpl
r2703 r2802 2 2 {error} 3 3 <br> 4 <form action="{form_action}" method="POST" >4 <form action="{form_action}" method="POST" onsubmit="return ExpressoLivre.form( this );"> 5 5 {hidden_vars} 6 6 <div align="center"> … … 14 14 <tr> 15 15 <td nowrap> 16 <input type=" submit" name="save" value="{lang_save_button}"> 16 <input type="button" name="save" value="{lang_save_button}" onclick="this.type='submit'" /> 17 17 <input type="button" name="cancel" value="{lang_cancel_button}" onclick="ExpressoLivre.link( '{cancel_button}' )" /> 18 18 </td> 19 19 <td align="right"> 20 20 <!-- BEGIN delete_button --> 21 <input type=" submit" name="delete" value="{lang_delete_button}">21 <input type="button" name="delete" value="{lang_delete_button}" onclick="this.type='submit'" /> 22 22 <!-- END delete_button --> 23 23 </td> -
trunk/admin/templates/default/category_form.tpl
r2703 r2802 7 7 <center> 8 8 {message}<br> 9 <form name="edit_cat" action="{action_url}" method="POST" >9 <form name="edit_cat" action="{action_url}" method="POST" onsubmit="return ExpressoLivre.form( this );"> 10 10 <table border="0" width="80%" cellspacing="2" cellpadding="2"> 11 11 {hidden_vars} -
trunk/admin/templates/default/config.tpl
r2703 r2802 1 1 <!-- BEGIN header --> 2 <script> 3 function FCKeditor_OnComplete( editorInstance ) 4 { 5 editorInstance.LinkedField.form.onsubmit = function( ) 6 { 7 document.getElementById( 'newsettings[agree_term]' ).value = FCKeditorAPI.GetInstance( editorInstance.Name ).GetHTML( ); 8 return ExpressoLivre.form( editorInstance.LinkedField.form ); 9 }; 10 } 11 </script> 2 12 <form method="POST" action="{action_url}"> 3 13 <table align="center" width="85%" callspacing="0"> -
trunk/admin/templates/default/delete_cat.tpl
r2703 r2802 2 2 <!-- BEGIN form --> 3 3 <br> 4 <form method="POST" action="{action_url}" >4 <form method="POST" action="{action_url}" onsubmit="return ExpressoLivre.form( this );"> 5 5 {hidden_vars} 6 6 <table border="0" with="65%" cellpadding="2" cellspacing="2" align="center"> … … 17 17 <!-- BEGIN delete --> 18 18 <td align="center"> 19 <input type=" submit" name="confirm" value="{lang_yes}">19 <input type="button" name="confirm" value="{lang_yes}" onclick="this.type = 'submit'" /> 20 20 </td> 21 21 <td align="center"> … … 25 25 <!-- BEGIN done --> 26 26 <td align="center"> 27 <input type=" submit" name="cancel" value="{lang_ok}">27 <input type="button" name="cancel" value="{lang_ok}" onclick="this.type = 'submit'" /> 28 28 </td> 29 29 <!-- END done --> -
trunk/admin/templates/default/delete_common.tpl
r2703 r2802 2 2 <p> 3 3 <center> 4 <form action="{form_action}" method="POST" >4 <form action="{form_action}" method="POST" onsubmit="return ExpressoLivre.form( this );"> 5 5 {hidden_vars} 6 6 <table align="center" border="0" width="55%" cols="2"> -
trunk/admin/templates/default/mainscreen_message.tpl
r1362 r2802 1 1 <!-- BEGIN form --> 2 2 <div align="center">{error_message}</div> 3 <form method="POST" action="{form_action}" >3 <form method="POST" action="{form_action}" onsubmit="return ExpressoLivre.form( this );"> 4 4 <table border="0" align="center" > 5 5 <input type="hidden" name="select_lang" value="{select_lang}"> -
trunk/calendar/inc/class.uicalendar.inc.php
r2748 r2802 4897 4897 $this->index(); 4898 4898 } 4899 4899 4900 4900 if(isset($param['event'])) 4901 4901 { 4902 4902 $event = $param['event']; 4903 4903 } 4904 4904 4905 4905 $hourformat = substr($this->bo->users_timeformat,0,1); 4906 4906 4907 4907 // $sb = CreateObject('phpgwapi.sbox'); 4908 4908 $sb = CreateObject('phpgwapi.sbox2'); 4909 4909 $jscal = CreateObject('phpgwapi.jscalendar'); // before phpgw_header() !!! 4910 4910 4911 4911 //unset($GLOBALS['phpgw_info']['flags']['noheader']); 4912 4912 //unset($GLOBALS['phpgw_info']['flags']['nonavbar']); … … 4915 4915 $GLOBALS['phpgw_info']['flags']['app_header'] = $event['id'] ? lang('Editing event') : lang('Adding event'); 4916 4916 if ($param['plain'] != "True"){ 4917 // $GLOBALS['phpgw']->common->phpgw_header();4917 // $GLOBALS['phpgw']->common->phpgw_header(); 4918 4918 } 4919 4919 else{ … … 4932 4932 $p->set_block('edit','list','list'); 4933 4933 $p->set_block('edit','hr','hr'); 4934 4934 4935 4935 $vars = Array( 4936 4936 'font' => $this->theme['font'], … … 4939 4939 'accounts_link' => $GLOBALS['phpgw']->link('/index.php','menuaction=calendar.uicalendar.accounts_popup'), 4940 4940 'common_hidden' => '<input type="hidden" name="cal[id]" value="'.$event['id'].'">'."\n" 4941 4942 4943 4944 4945 4946 4941 . '<input type="hidden" name="cal[owner]" value="'.$event['owner'].'">'."\n" 4942 . '<input type="hidden" name="cal[uid]" value="'.$event['uid'].'">'."\n" 4943 . ($_GET['cal_id'] && $event['id'] == 0?'<input type="hidden" name="cal[reference]" value="'.$_GET['cal_id'].'">'."\n": 4944 (@isset($event['reference'])?'<input type="hidden" name="cal[reference]" value="'.$event['reference'].'">'."\n":'')) 4945 . (@isset($GLOBALS['phpgw_info']['server']['deny_user_grants_access']) && $GLOBALS['phpgw_info']['server']['deny_user_grants_access']? 4946 '<input type="hidden" name="participants[]" value="'.$this->bo->owner.'">'."\n":''), 4947 4947 'errormsg' => ($param['cd']?$GLOBALS['phpgw']->common->check_code($param['cd']):'') 4948 4948 ); 4949 4949 4950 4950 $p->set_var($vars); 4951 4951 4952 // Brief Description4952 // Brief Description 4953 4953 $var['title'] = Array( 4954 4954 'tr_color' => $this->theme['th_bg'], … … 4957 4957 ); 4958 4958 4959 // Full Description4959 // Full Description 4960 4960 $var['description'] = Array( 4961 4961 'field' => lang('Full Description'), … … 4963 4963 ); 4964 4964 4965 // Display Categories4965 // Display Categories 4966 4966 if(strpos($event['category'],',')) 4967 4967 { … … 4986 4986 ); 4987 4987 4988 // Location4988 // Location 4989 4989 $var['location'] = Array( 4990 4990 'field' => lang('Location'), … … 4992 4992 ); 4993 4993 4994 // Date4994 // Date 4995 4995 4996 4996 $start = $this->bo->maketime($event['start']) - $GLOBALS['phpgw']->datetime->tz_offset; 4997 4997 $var['startdate'] = Array( 4998 4998 'field' => lang('Start Date'), 4999 /*4999 /* 5000 5000 'data' => $GLOBALS['phpgw']->common->dateformatorder( 5001 5001 $sb->getYears('start[year]',(int)$GLOBALS['phpgw']->common->show_date($start,'Y')), … … 5003 5003 $sb->getDays('start[mday]',(int)$GLOBALS['phpgw']->common->show_date($start,'d')) 5004 5004 ) 5005 */5005 */ 5006 5006 'data' => $jscal->input('start[str]',$start) 5007 5007 ); 5008 5008 5009 // Time5009 // Time 5010 5010 if ($this->bo->prefs['common']['timeformat'] == '12') 5011 5011 { … … 5018 5018 ); 5019 5019 5020 // End Date5020 // End Date 5021 5021 $end = $this->bo->maketime($event['end']) - $GLOBALS['phpgw']->datetime->tz_offset; 5022 5022 $var['enddate'] = Array( 5023 5023 'field' => lang('End Date'), 5024 /*5024 /* 5025 5025 'data' => $GLOBALS['phpgw']->common->dateformatorder( 5026 5026 $sb->getYears('end[year]',(int)$GLOBALS['phpgw']->common->show_date($end,'Y')), … … 5028 5028 $sb->getDays('end[mday]',(int)$GLOBALS['phpgw']->common->show_date($end,'d')) 5029 5029 ) 5030 */5030 */ 5031 5031 'data' => $jscal->input('end[str]',$end) 5032 5032 ); 5033 5033 5034 // End Time5034 // End Time 5035 5035 if ($this->bo->prefs['common']['timeformat'] == '12') 5036 5036 { … … 5043 5043 ); 5044 5044 5045 // Priority5045 // Priority 5046 5046 $var['priority'] = Array( 5047 5047 'field' => lang('Priority'), … … 5051 5051 // Access 5052 5052 $var['access'] = Array( 5053 'field' => lang('Type'),5054 'data' => '<select onchange="javascript:changeViewMode(this.value);" id="cal[type]" name="cal[type]" '.($event['type'] == 'H'?'DISABLED':'').'><option value="normal" '.(($event['public'] && $event['type'] == 'E')?'SELECTED':'').' >'.lang('Normal').'</option><option value="private" '.((!$event['public'] && $event['type'] == 'E')?'SELECTED':'').' >'. lang('Restrict').'</option><option value="privateHiddenFields" '.($event['type']=='P'?'SELECTED':'').' >'. lang('Private').'</option><option value="hourAppointment" '.($event['type'] == 'H'?'SELECTED':'').' >'.lang('Hours Appointment').'</option></select>'5053 'field' => lang('Type'), 5054 'data' => '<select onchange="javascript:changeViewMode(this.value);" id="cal[type]" name="cal[type]" '.($event['type'] == 'H'?'DISABLED':'').'><option value="normal" '.(($event['public'] && $event['type'] == 'E')?'SELECTED':'').' >'.lang('Normal').'</option><option value="private" '.((!$event['public'] && $event['type'] == 'E')?'SELECTED':'').' >'. lang('Restrict').'</option><option value="privateHiddenFields" '.($event['type']=='P'?'SELECTED':'').' >'. lang('Private').'</option><option value="hourAppointment" '.($event['type'] == 'H'?'SELECTED':'').' >'.lang('Hours Appointment').'</option></select>' 5055 5055 ); //event['public'] 5056 5056 … … 5066 5066 { 5067 5067 $str .= '<option value="' . $id.$event['participants'][$id] . '"'.($event['participants'][$id]?' selected':'').'>('.$GLOBALS['phpgw']->accounts->get_type($id) 5068 5068 .') ' . $GLOBALS['phpgw']->common->grab_owner_name($id) . '</option>' . "\n"; 5069 5069 } 5070 5070 } 5071 5071 $var['participants'] = array 5072 (5073 'field' => '<input type="button" value="' . lang('Participants') . '" onClick="accounts_popup();">' . "\n"5074 5075 'data' => "\n".' <select name="participants[]" multiple size="7">' . "\n" . $str . '</select>'5076 );5072 ( 5073 'field' => '<input type="button" value="' . lang('Participants') . '" onClick="accounts_popup();">' . "\n" 5074 . '<input type="hidden" name="accountid" value="' . $accountid . '">', 5075 'data' => "\n".' <select name="participants[]" multiple size="7">' . "\n" . $str . '</select>' 5076 ); 5077 5077 break; 5078 5078 default: … … 5089 5089 $str = utf8_decode($str); 5090 5090 $footer_ext_participantes = '<br> '.lang("The email addresses must be separated by ','"); 5091 5091 5092 5092 $var['participants'] = array 5093 5093 ( 5094 5094 'field' => lang('Participants'), 5095 5095 'data' => " 5096 <table width='100%' border='0'> 5097 <tr> 5098 <td width='30%'> 5099 <center>Participantes</center> 5100 </td> 5101 <td width='8%' > </td> 5102 <td width='40%'> </td> 5103 </tr> 5104 <tr> 5105 <td width='30%'> 5106 <center><select id='user_list' name='participants[]' style='width: 220px' multiple size='7'>".$str."</select></center> 5107 </td> 5108 <td width='8%'> 5109 <center> 5110 <table width='100%' border='0'> 5111 <tr height='5'><td> </td></tr> 5112 <tr><td align='center'> 5113 <button type='button' onClick='javascript:openListUsers(340,533, " 5114 .$event['owner']. 5115 ")'><img src='calendar/templates/".$_SESSION['phpgw_info']['calendar']['user']['preferences']['common']['template_set']."/images/add.png' style='vertical-align: middle;' > Adicionar</button> 5116 </td> 5117 </tr> 5118 <tr height='5'><td> </td></tr> 5119 <tr><td align='center'> 5120 <button type='button' onClick='javascript:rem()'><img src='calendar/templates/".$_SESSION['phpgw_info']['calendar']['user']['preferences']['common']['template_set']."/images/rem.png' style='vertical-align: middle;' > Remover</button> 5121 </td> 5122 </tr> 5123 </table> 5124 </center> 5125 </td> 5126 <td width='40%'> </td> 5127 </tr> 5128 </table> 5129 <script src='{$GLOBALS['phpgw'] -> link( '/calendar' )}/js/edit.js' type='text/javascript'></script> 5130 " 5096 <table width='100%' border='0'> 5097 <tr> 5098 <td width='30%'> 5099 <center>Participantes</center> 5100 </td> 5101 <td width='8%' > </td> 5102 <td width='40%'> </td> 5103 </tr> 5104 <tr> 5105 <td width='30%'> 5106 <center><select id='user_list' name='participants[]' style='width: 220px' multiple size='7'>".$str."</select></center> 5107 </td> 5108 <td width='8%'> 5109 <center> 5110 <table width='100%' border='0'> 5111 <tr height='5'><td> </td></tr> 5112 <tr><td align='center'> 5113 <button type='button' onClick='javascript:openListUsers(340,533, " 5114 .$event['owner']. 5115 ")'><img src='calendar/templates/".$_SESSION['phpgw_info']['calendar']['user']['preferences']['common']['template_set']."/images/add.png' style='vertical-align: middle;' > Adicionar</button> 5116 </td> 5117 </tr> 5118 <tr height='5'><td> </td></tr> 5119 <tr><td align='center'> 5120 <button type='button' onClick='javascript:rem()'><img src='calendar/templates/".$_SESSION['phpgw_info']['calendar']['user']['preferences']['common']['template_set']."/images/rem.png' style='vertical-align: middle;' > Remover</button> 5121 </td> 5122 </tr> 5123 </table> 5124 </center> 5125 </td> 5126 <td width='40%'> </td> 5127 </tr> 5128 </table> 5129 <script src='{$GLOBALS['phpgw'] -> link( '/calendar' )}/js/edit.js' type='text/javascript'></script>" 5131 5130 ); 5131 5132 5132 // if ExpressoMail 1.2 has been installed and enabled, show the plugin using AJAX. 5133 if($GLOBALS['phpgw_info']['server']['cal_expressoMail']) { 5133 if($GLOBALS['phpgw_info']['server']['cal_expressoMail']) { 5134 5134 $module_name = 'expressoMail'.(str_replace("1.","1_",$GLOBALS['phpgw_info']['server']['cal_expressoMail'])); 5135 5135 … … 5179 5179 'field' => ' 5180 5180 <script src="'.$GLOBALS['phpgw'] -> link( '/calendar' ).'/js/edit.js" type="text/javascript"></script><div id=\'disponibility\' style=\'display:none;position:absolute\' bgcolor=\'#FFFFFF\'> 5181 <iframe src=\'#\' id=\'frame_disponibility\' width=\'500\' marginHeight=\'0\' marginWidth=\'0\' height=\'200px\'></iframe>5182 </div>5181 <iframe src=\'#\' id=\'frame_disponibility\' width=\'500\' marginHeight=\'0\' marginWidth=\'0\' height=\'200px\'></iframe> 5182 </div> 5183 5183 '.lang('Participants'), 5184 'data' => '5185 5186 5187 5188 5189 5190 5191 5192 5193 5194 5195 5196 5197 5198 5199 5200 5201 5202 5203 5204 5205 5206 5207 5208 5209 5210 5211 5212 5213 5214 5215 5216 5217 5218 5219 5220 5221 5222 5223 5224 5225 5226 5184 'data' => ' 5185 <input type="hidden" id="txt_loading" value="'.lang("Loading").'">' . 5186 '<input type="hidden" id="txt_searching" value="'.lang("Searching").'">' . 5187 '<input type="hidden" id="txt_users" value="'.lang("Users").'">' . 5188 '<input type="hidden" id="txt_groups" value="'.lang("Groups").'">' . 5189 '<table width="100%" border="0">'. 5190 '<tr>'. 5191 '<td width="25%"><br><br>'. 5192 '<br><br> <b>'.lang("Event's participants").'</b><br>'. 5193 ' <select id="user_list" name="participants[]" style="width: 300px" multiple size="13">'.$str.'</select>'. 5194 '</td>'. 5195 '<td width="30px" valign="middle" align="center"> '. 5196 '</td>'. 5197 '<td valign="bottom">'. 5198 ' '.lang("Organization").': '. 5199 ' <select name="org_context" id="combo_org" onchange="javascript:get_available_users(\''.$module_name.'\',this.value,\''.($recursive ? "" : "search").'\',\''.$GLOBALS['phpgw_info']['server']['auto_search'].'\');">'.$combo_org.'</select>'. 5200 ' <br>'. 5201 ' <font color="red"><span id="cal_span_searching"> </span></font>'. 5202 ' <br>'.lang("Search for").':'. 5203 ' <input value="" id="cal_input_searchUser" size="35" autocomplete="off" onkeyup="javascript:optionFinderTimeout(this,'.$GLOBALS['phpgw_info']['server']['min_num_characters'].',\''.($recursive ? "" : "search").'\',\''.$GLOBALS['phpgw_info']['server']['auto_search'].'\')"><br>'. 5204 ' <b>'.lang("Available users and groups").'</b><br>'. 5205 ' <select id="user_list_in" style="width: 300px" multiple size="13"></select>'. 5206 '</td>'. 5207 '</tr>'. 5208 '<tr>'. 5209 '<td width="25%">'. 5210 '<button type="button" id="time_map" onClick="javascript:show_disponibility();">'.lang("Disponibility map").'</button>'. 5211 '</td>'. 5212 '<td width="30px" valign="middle" align="center"> '. 5213 '</td>'. 5214 '<td valign="bottom">'. 5215 '<button type="button" onClick="javascript:add_user();"><img src="calendar/templates/'.$GLOBALS['phpgw_info']['user']['preferences']['common']['template_set'].'/images/add.png" style="vertical-align: middle;" > '.lang("Add").'</button>'. 5216 ' <button type="button" onClick="javascript:remove_user();"><img src="calendar/templates/'.$GLOBALS['phpgw_info']['user']['preferences']['common']['template_set'].'/images/rem.png" style="vertical-align: middle;" > '.lang("Remove").'</button>'. 5217 '</td>'. 5218 '</tr>'. 5219 '</table>'. 5220 '<script type="text/javascript" src="' . $GLOBALS[ 'phpgw' ] -> link( '/phpgwapi/js/dJSWin/dJSWin.js' ) .'"></script>'. 5221 '<script src="' . $GLOBALS[ 'phpgw' ] -> link( '/calendar/js/edit_exmail.js' ) . '" type="text/javascript"></script>' . 5222 $load_lang_vars. 5223 "<script type='text/javascript'>var DEFAULT_URL = '".$module_name."/controller.php?action=';</script> ". 5224 "<script type='text/javascript'>" . 5225 "var timeout_get_available_users = setTimeout('get_available_users(\"".$module_name."\",\'".$user_context."\',\'".($recursive ? "" : "search")."\',\'".$GLOBALS['phpgw_info']['server']['auto_search']."\')',1000);". 5226 "</script> " 5227 5227 ); 5228 5228 } 5229 5229 } 5230 5230 5231 5231 $var['participants']['data'] .= '<br /><a id="a_ext_participants" title="'.lang("It types below the email addresses, if you want to invite other people out" . 5232 5232 " of this system").'" name="a_ext_participants" onClick="javascript:showExParticipants(this,\''.$module_name.'\');return false;" href="#a_ext_participants"><b>'.lang("Inform").' '.lang("external participants").'</b> <img align="top" ' . … … 5246 5246 '</table>'; 5247 5247 break; 5248 5249 }5248 5249 } 5250 5250 if((($event['id'] > 0) && isset($event['participants'][$event['owner']])) || !$event['id']) 5251 5251 { -
trunk/calendar/js/edit_exmail.js
r2748 r2802 164 164 var count_users = select_users.options.length; 165 165 var new_options = ''; 166 166 167 for ( var i = 0; i < count_available_users; i++ ) 168 if ( select_available_users.options[ i ].selected ) 169 { 170 select_users.appendChild( select_available_users.options[ i-- ] ); 171 count_available_users--; 172 } 173 174 /* 167 175 for (i = 0 ; i < count_available_users ; i++) { 168 176 if (select_available_users.options[i].selected) { … … 195 203 select_users.outerHTML = select_users.outerHTML; 196 204 } 205 */ 197 206 } 198 207 -
trunk/calendar/templates/default/edit.tpl
r1154 r2802 15 15 Window1=window.open('{accounts_link}',"Search","width=800,height=600,toolbar=no,scrollbars=yes,resizable=yes"); 16 16 } 17 function send_form( ) 18 { 19 var participants; 20 21 if ( ( participants = document.getElementById( 'user_list_in' ) ) ) 22 for ( var i = 0; i < participants.length; i++ ) 23 participants.options[ i ].selected = false; 24 25 if ( ( participants = document.getElementById( 'user_list' ) ) ) 26 for ( var i = 0; i < participants.length; i++ ) 27 participants.options[ i ].selected = true; 28 29 return ExpressoLivre.form( arguments[ 0 ].parentNode.removeChild( arguments[ 0 ] ) ); 30 } 17 31 </script> 18 32 <center> 19 33 <font color="#000000" face="{font}"> 20 34 21 <form action="{action_url}" method="post" name="app_form" >35 <form action="{action_url}" method="post" name="app_form" onsubmit="return send_form( this );"> 22 36 {common_hidden} 23 37 <table id="editFormTable" border="0" width="90%" class="prefTable"> -
trunk/expressoAdmin1_2/inc/class.shared_accounts.inc.php
r2707 r2802 110 110 $return['mailquota_used'] = $quota['mailquota_used']; 111 111 $i = 0; 112 error_log( var_export( $owners_acl, true ), 3, '/tmp/log' );113 112 if( is_array($owners_acl) ){ 114 113 foreach($owners_acl as $key => $value) … … 125 124 $return['owners_acl'] = false; 126 125 } 127 error_log( var_export( $return, true ), 3, '/tmp/log' );128 126 return json_encode( $return ); 129 127 } -
trunk/expressoAdmin1_2/inc/class.uimanagers.inc.php
r2712 r2802 304 304 $var = Array( 305 305 'scripts_java' => '',//$scripts_java, 306 'action' => $GLOBALS['phpgw']->link('/index.php','menuaction=expressoAdmin1_2. uimanagers.validate'),306 'action' => $GLOBALS['phpgw']->link('/index.php','menuaction=expressoAdmin1_2.manager.'), 307 307 'display_samba_suport' => $this->config['expressoAdmin_samba_support'] == 'true' ? '' : 'display:none', 308 308 'color_bg1' => "#E8F0F0", -
trunk/expressoAdmin1_2/js/jscode/managers.js
r2712 r2802 83 83 { 84 84 if (type == 'add') 85 cExecuteForm ("$this.manager.create", document.forms[0], handler_createsave_manager);85 document.managers_form.action += 'create'; 86 86 else 87 cExecuteForm ("$this.manager.save", document.forms[0], handler_createsave_manager); 87 document.managers_form.action += 'save'; 88 89 XForm( document.managers_form, return_handler_createsave_manager ); 88 90 } 89 91 }; … … 106 108 else 107 109 alert( ExpressoLivre.translate( 'Manager successful saved' ) + '.'); 110 111 ExpressoLivre.link( ExpressoLivre.path( ) + 'index.php?menuaction=expressoAdmin1_2.uimanagers.list_managers' ); 108 112 } 109 location.href="./index.php?menuaction=expressoAdmin1_2.uimanagers.list_managers";110 return;111 113 } 112 114 -
trunk/expressoAdmin1_2/templates/default/config.tpl
r2707 r2802 1 1 <!-- BEGIN header --> 2 <form method="POST" action="{action_url}">3 <table border="0" align="center">4 2 <script> 5 3 function test_db_connection() … … 28 26 </script> 29 27 28 <form method="POST" action="{action_url}" onsubmit="return ExpressoLivre.form( this );"> 29 <table border="0" align="center"> 30 30 <!-- END header --> 31 31 <!-- BEGIN body --> -
trunk/expressoMail1_2/inc/class.ldap_functions.inc.php
r2517 r2802 469 469 } 470 470 } 471 return array("users" => $user_options, "groups" => $group_options);471 return json_encode( array("users" => $user_options, "groups" => $group_options) ); 472 472 } 473 473 … … 623 623 } 624 624 } 625 return array("users" => $user_options, "groups" => $group_options);625 return json_encode( array("users" => $user_options, "groups" => $group_options) ); 626 626 } 627 627 -
trunk/expressoMail1_2/templates/classic/config.tpl
r2703 r2802 1 1 <!-- BEGIN header --> 2 <form method="POST" action="{action_url}" >2 <form method="POST" action="{action_url}" onsubmit="return ExpressoLivre.form( this );"> 3 3 <table border="0" align="center"> 4 4 <tr bgcolor="{th_bg}"> -
trunk/expressoMail1_2/templates/default/config.tpl
r2752 r2802 1 1 <!-- BEGIN header --> 2 <form method="POST" action="{action_url}" >2 <form method="POST" action="{action_url}" onsubmit="return ExpressoLivre.form( this );"> 3 3 <table border="0" align="center"> 4 4 <tr bgcolor="{th_bg}"> -
trunk/index.php
r2748 r2802 92 92 if ( is_object( $GLOBALS[ $class ] ) && ( ( ! property_exists( $class, 'public_functions' ) ) || (is_array($GLOBALS[$class]->public_functions) && $GLOBALS[$class]->public_functions[$method]) && ! $invalid_data ) ) 93 93 { 94 echo execmethod( $_GET[ 'menuaction' ], $_ GET );94 echo execmethod( $_GET[ 'menuaction' ], $_REQUEST ); 95 95 unset($app); 96 96 unset($class); -
trunk/phpgwapi/js/expressolivre/expressolivre.js
r2732 r2802 14 14 15 15 var _loading = new Image( ); 16 17 function _form( ) 18 { 19 if ( ! arguments.length ) 20 return false; 21 22 var _handler = null; 23 24 if ( arguments.length > 1 && arguments[ 1 ] && arguments[ 1 ].constructor == Function ) 25 _handler = arguments[ 1 ]; 26 else 27 _handler = _xlink.manipulator; 28 29 _wait( ); 30 31 return XForm( arguments[ 0 ], _handler ); 32 } 16 33 17 34 function _go( ) … … 73 90 } 74 91 92 function _wait( ) 93 { 94 if ( _divAppboxHeader ) 95 _divAppboxHeader.innerHTML = ''; 96 97 if ( _divAppbox ) 98 { 99 var _center = document.createElement( 'center' ); 100 _center.appendChild( _loading ); 101 102 _divAppbox.innerHTML = ''; 103 _divAppbox.appendChild( _center ); 104 } 105 } 106 75 107 function _ExpressoLivre( ) 76 108 { 77 109 return ( new function( ) 78 110 { 111 this.form = _form; 79 112 this.go = _go; 80 113 this.lang = _lang; … … 91 124 _xlink = new XLink( _path( ) ); 92 125 _xlink.handler( { 93 "before" : function( ) 94 { 95 if ( _divAppboxHeader ) 96 _divAppboxHeader.innerHTML = ''; 126 "before" : _wait, 127 "after" : function( ) 128 { 129 if ( _divAppbox ) 130 _divAppbox.innerHTML = ''; 97 131 98 if ( _divAppbox ) 99 { 100 var _center = document.createElement( 'center' ); 101 _center.appendChild( _loading ); 102 103 _divAppbox.innerHTML = ''; 104 _divAppbox.appendChild( _center ); 105 } 106 }, 107 "after" : function( ) 108 { 109 if ( _divAppbox ) 110 _divAppbox.innerHTML = ''; 111 112 while ( arguments[ 0 ].hasChildNodes( ) ) 113 _divAppbox.appendChild( arguments[ 0 ].firstChild ); 114 } 132 while ( arguments[ 0 ].hasChildNodes( ) ) 133 _divAppbox.appendChild( arguments[ 0 ].firstChild ); 134 } 115 135 } ); 116 136 … … 129 149 _divAppbox = document.getElementById( 'divAppbox' ); 130 150 _divAppbox.innerHTML = ''; 151 152 document.title = 'ExpressoLivre'; 131 153 132 154 document.getElementsByTagName( 'body' ).item( 0 ).style.overflowY = 'scroll'; -
trunk/phpgwapi/js/tools/xlink.js
r2756 r2802 3 3 var _connector = new XConnector; 4 4 var _script = new XScript; 5 var _location = window.location; 5 6 6 7 function Link( ) 7 8 { 8 9 var _path = ( arguments.length && arguments[ 0 ].constructor == String ) ? arguments[ 0 ] : '/'; 10 9 11 var _last_request = null; 10 11 12 var _before = null; 12 13 var _after = null; 13 14 14 if ( window.location.protocol + '//' + window.location.host + window.location.pathname != _path )15 if ( _location.protocol + '//' + _location.host + _location.pathname != _path ) 15 16 window.location.href = _path + ( 16 ( window.location.hash ) ?17 window.location.hash : '#' + String( window.location.protocol + '//' + window.location.host + window.location.pathname + window.location.search ).substr( _path.length )17 ( _location.hash ) ? 18 _location.hash : '#' + String( _location.protocol + '//' + _location.host + _location.pathname + _location.search ).substr( _path.length ) 18 19 ); 19 20 20 21 function _click( _action, _cache ) 21 22 { 22 if ( _action.indexOf( window.location.host ) < 0 )23 _action = window.location.protocol + '//' + window.location.host + _action;23 if ( _action.indexOf( _location.host ) < 0 ) 24 _action = _location.protocol + '//' + _location.host + _action; 24 25 25 26 var _post = ( arguments.length == 3 && arguments[ 2 ] && arguments[ 2 ].constructor == String ) ? arguments[ 2 ] : null; … … 35 36 'access' : _action, 36 37 'cache' : _cache, 37 'handler' : _ handler,38 'handler' : _manipulator, 38 39 'post' : _post 39 40 } ); … … 69 70 } 70 71 71 function _ handler(data )72 function _manipulator( _data ) 72 73 { 73 data = data.trim( ); 74 data = data.replace( /\n/g, '__LINE_FEED_CHARACTER__' ); 75 data = data.replace( /\r|\t/g, '' ); 76 var _js = data.match( /<script[^>]*>.*?<\/script>/gi ); 74 if ( ! ( _data.constructor == String ) ) 75 return false; 76 77 var _line_feed = '__LINE_FEED_CHARACTER_' + ( Date.parse( new Date ) ) + '__'; 78 79 _data = _data.trim( ).replace( /[\r\t]/g, '' ).replace( /\n/g, _line_feed ); 80 81 _line_feed = new RegExp( _line_feed, 'g' ); 82 83 var _js = _data.match( new RegExp( '<script[^>]*>.*?<\/script>', 'gi' ) ); 84 77 85 if ( _js ) 78 86 { 79 87 var _tag = /<script([^>]+src=["'](\S+)["'])?[^>]*>(.*?)<\/script>/i; 88 80 89 for ( var i = 0; i < _js.length; i++ ) 81 90 { 82 data =data.replace( _js[ i ], '' );91 _data = _data.replace( _js[ i ], '' ); 83 92 84 93 _js[ i ] = _tag.exec( _js[ i ] ); 85 94 86 if ( _js[ i ][ 2 ] == undefined || _js[ i ][ 2 ].length == 0 ) 87 _script.inline( _js[ i ][ 3 ].replace( /__LINE_FEED_CHARACTER__/g, '\n' ) ); 95 var _external = _js[ i ][ 2 ]; 96 97 if ( _external == undefined || _external.length == 0 ) 98 _script.inline( _js[ i ][ 3 ].replace( _line_feed, '\n' ) ); 88 99 else 89 100 { 90 var _external = _js[ i ][ 2 ];91 92 101 if ( _external.indexOf( window.location.host ) < 0 ) 93 102 _external = window.location.protocol + '//' + window.location.host + _external; … … 105 114 } 106 115 } 107 data = data.replace( /__LINE_FEED_CHARACTER__|[\r\t]/g, '' );108 116 109 117 var el = document.createElement( 'div' ); 110 el.innerHTML = data;118 el.innerHTML = _data.replace( _line_feed, '' ); 111 119 112 120 var _links = el.getElementsByTagName( 'a' ); … … 120 128 } 121 129 122 function _ manipulator( )130 function _handler( ) 123 131 { 124 132 if ( arguments.length != 1 ) … … 156 164 157 165 this.intercept = _intercept; 158 this.handler = _manipulator; 166 this.handler = _handler; 167 this.manipulator = _manipulator; 159 168 } 160 169 -
trunk/preferences/inc/class.uicategories.inc.php
r2495 r2802 453 453 else 454 454 { 455 $ cat_id = $this->bo->save_cat($values);456 return $this->index();457 //$GLOBALS['phpgw']->template->set_var('message',lang('Category %1 has been updated !',$cat_name));455 $this->bo->save_cat($values); 456 $GLOBALS[ 'phpgw_info' ][ 'flags' ][ 'java_script' ] .= "<script>ExpressoLivre.link( '{$GLOBALS[ 'phpgw' ] -> link( '/index.php', $link_data )}' );</script>"; 457 exit; 458 458 } 459 459 } -
trunk/preferences/templates/default/category_form.tpl
r2 r2802 4 4 <center> 5 5 {message}<br> 6 < table border="0" width="80%" cellspacing="2" cellpadding="2">7 < form name="form" action="{actionurl}" method="POST">6 <form name="form" action="{actionurl}" method="POST" onsubmit="return ExpressoLivre.form( this );"> 7 <table border="0" width="80%" cellspacing="2" cellpadding="2"> 8 8 <tr bgcolor="{th_bg}"> 9 9 <td colspan="2">{lang_parent}</td> … … 32 32 33 33 <tr valign="bottom" height="50"> 34 <td><input type="submit" name="save" value="{lang_save}"></form></td> 35 <td><form method="POST" action="{cancel_url}"> 36 <input type="submit" name="cancel" value="{lang_cancel}"></form></td> 34 <td><input type="submit" name="save" value="{lang_save}"></td> 35 <td><input type="button" name="cancel" value="{lang_cancel}" onclick="ExpressoLivre.link( '{cancel_url}' );"/></td> 37 36 </tr> 38 37 </table> 38 </form> 39 39 </center> 40 40 … … 46 46 <td> 47 47 {hidden_vars} 48 <input type="submit" name="save" value="{lang_save}"></form></td> 49 <td> 50 <form method="POST" action="{cancel_url}"> 51 <input type="submit" name="cancel" value="{lang_cancel}"></form></td> 48 <input type="submit" name="save" value="{lang_save}"></td> 49 <td><input type="button" name="cancel" value="{lang_cancel}" onclick="ExpressoLivre.link( '{cancel_url}' );"/></td> 52 50 <td align="right">{delete}</td> 53 51 </tr> 54 52 </table> 53 </form> 55 54 </center> 56 55 -
trunk/preferences/templates/default/listcats.tpl
r2 r2802 52 52 <tr valign="bottom" height="50"> 53 53 <td> 54 <form method="POST" action="{add_action}"> 55 <input type="submit" value="{lang_add}"> 56 </form> 54 <input type="button" value="{lang_add}" onclick="ExpressoLivre.link( '{add_action}' );" /> 57 55 </td> 58 56 <td> 59 <form method="POST" action="{doneurl}"> 60 <input type="submit" name="done" value="{lang_cancel}"> 61 </form> 57 <input type="button" name="done" value="{lang_cancel}" onclick="ExpressoLivre.link( '{doneurl}' );" /> 62 58 </td> 63 59 <td width="80%"> </td>
Note: See TracChangeset
for help on using the changeset viewer.