Changeset 2686 for trunk/admin
- Timestamp:
- 05/03/10 10:43:25 (14 years ago)
- Location:
- trunk/admin
- Files:
-
- 13 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/admin/inc/class.uiaccess_history.inc.php
r2419 r2686 140 140 } 141 141 } 142 ?> -
trunk/admin/inc/class.uiaccounts.inc.php
r2 r2686 527 527 'hidden_vars' => '<input type="hidden" name="account_id" value="'.$_GET['account_id'].'">', 528 528 'yes' => lang('Yes'), 529 'no' => lang('No') 529 'no' => lang('No'), 530 'no_button' => $GLOBALS[ 'phpgw' ] -> link( '/', 'menuaction=admin.uiaccounts.list_groups' ) 530 531 ); 531 532 $p->set_var($var); -
trunk/admin/inc/class.uiapplications.inc.php
r2419 r2686 34 34 if ($GLOBALS['phpgw']->acl->check('applications_access',1,'admin')) 35 35 { 36 $GLOBALS['phpgw']->redirect_link('/ index.php');36 $GLOBALS['phpgw']->redirect_link('/#'); 37 37 } 38 38 $can_add = !$GLOBALS['phpgw']->acl->check('applications_access',2,'admin'); … … 112 112 $GLOBALS['phpgw']->template->set_var('lang_enabled',lang('Enabled')); 113 113 114 $GLOBALS['phpgw']->template->set_var('new_action',$GLOBALS['phpgw']->link('/ index.php','menuaction=admin.uiapplications.add'));114 $GLOBALS['phpgw']->template->set_var('new_action',$GLOBALS['phpgw']->link('/','menuaction=admin.uiapplications.add')); 115 115 $GLOBALS['phpgw']->template->set_var('lang_note',lang('(To install new applications use<br><a href="setup/" target="setup">Setup</a> [Manage Applications] !!!)')); 116 116 $GLOBALS['phpgw']->template->set_var('lang_add',lang('add')); … … 123 123 $GLOBALS['phpgw']->template->set_var('name',$app['title']); 124 124 125 $GLOBALS['phpgw']->template->set_var('edit',$can_edit ? '<a href="' . $GLOBALS['phpgw']->link('/ index.php','menuaction=admin.uiapplications.edit&app_name=' . urlencode($app['name'])) . '&start='.$start.'"> ' . lang('Edit') . ' </a>' : ' ');126 $GLOBALS['phpgw']->template->set_var('delete',$can_delete ? '<a href="' . $GLOBALS['phpgw']->link('/ index.php','menuaction=admin.uiapplications.delete&app_name=' . urlencode($app['name'])) . '&start='.$start.'"> ' . lang('Delete') . ' </a>' : ' ');125 $GLOBALS['phpgw']->template->set_var('edit',$can_edit ? '<a href="' . $GLOBALS['phpgw']->link('/','menuaction=admin.uiapplications.edit&app_name=' . urlencode($app['name'])) . '&start='.$start.'"> ' . lang('Edit') . ' </a>' : ' '); 126 $GLOBALS['phpgw']->template->set_var('delete',$can_delete ? '<a href="' . $GLOBALS['phpgw']->link('/','menuaction=admin.uiapplications.delete&app_name=' . urlencode($app['name'])) . '&start='.$start.'"> ' . lang('Delete') . ' </a>' : ' '); 127 127 128 128 if ($app['status']) … … 162 162 if ($GLOBALS['phpgw']->acl->check('applications_access',2,'admin')) 163 163 { 164 $GLOBALS['phpgw']->redirect_link('/ index.php');164 $GLOBALS['phpgw']->redirect_link('/#'); 165 165 } 166 166 $start = get_var('start',array('POST','GET')); … … 174 174 if ($_POST['cancel']) 175 175 { 176 $GLOBALS['phpgw']->redirect_link('/ index.php','menuaction=admin.uiapplications.get_list&start='.$start);176 $GLOBALS['phpgw']->redirect_link('/#index.php','menuaction=admin.uiapplications.get_list&start='.$start); 177 177 } 178 178 … … 206 206 )); 207 207 208 $GLOBALS['phpgw']->redirect_link('/ index.php','menuaction=admin.uiapplications.get_list&start='.$start);208 $GLOBALS['phpgw']->redirect_link('/#index.php','menuaction=admin.uiapplications.get_list&start='.$start); 209 209 $GLOBALS['phpgw']->common->phpgw_exit(); 210 210 } … … 231 231 232 232 $GLOBALS['phpgw']->template->set_var('hidden_vars','<input type="hidden" name="start" value="'.$start.'">'); 233 $GLOBALS['phpgw']->template->set_var('form_action',$GLOBALS['phpgw']->link('/ index.php','menuaction=admin.uiapplications.add'));233 $GLOBALS['phpgw']->template->set_var('form_action',$GLOBALS['phpgw']->link('/','menuaction=admin.uiapplications.add')); 234 234 235 235 $this->display_row(lang('application name'),'<input name="n_app_name" value="' . $n_app_name . '">'); … … 255 255 256 256 $GLOBALS['phpgw']->template->set_var('lang_save_button',lang('Add')); 257 257 258 $GLOBALS['phpgw']->template->set_var('lang_cancel_button',lang('Cancel')); 259 $GLOBALS['phpgw']->template->set_var( 'cancel_button', $GLOBALS[ 'phpgw' ] -> link( '/', 'menuaction=admin.uiapplications.get_list' ) ); 260 258 261 $GLOBALS['phpgw']->template->pparse('phpgw_body','form'); 259 262 } … … 263 266 if ($GLOBALS['phpgw']->acl->check('applications_access',4,'admin')) 264 267 { 265 $GLOBALS['phpgw']->redirect_link('/ index.php');268 $GLOBALS['phpgw']->redirect_link('/#'); 266 269 } 267 270 $app_name = get_var('app_name',array('POST','GET')); … … 274 277 if ($_POST['cancel']) 275 278 { 276 $GLOBALS['phpgw']->redirect_link('/ index.php','menuaction=admin.uiapplications.get_list&start='.$start);279 $GLOBALS['phpgw']->redirect_link('/#index.php','menuaction=admin.uiapplications.get_list&start='.$start); 277 280 } 278 281 … … 297 300 )); 298 301 299 $GLOBALS['phpgw']->redirect_link('/ index.php','menuaction=admin.uiapplications.get_list&start='.$start);302 $GLOBALS['phpgw']->redirect_link('/#index.php','menuaction=admin.uiapplications.get_list&start='.$start); 300 303 } 301 304 } … … 328 331 $GLOBALS['phpgw']->template->set_var('lang_status',lang('Status')); 329 332 $GLOBALS['phpgw']->template->set_var('lang_save_button',lang('Save')); 333 330 334 $GLOBALS['phpgw']->template->set_var('lang_cancel_button',lang('Cancel')); 335 $GLOBALS['phpgw']->template->set_var( 'cancel_button', $GLOBALS[ 'phpgw' ] -> link( '/', 'menuaction=admin.uiapplications.get_list' ) ); 336 331 337 $GLOBALS['phpgw']->template->set_var('lang_delete_button',lang('Delete')); 332 338 … … 348 354 if ($GLOBALS['phpgw']->acl->check('applications_access',8,'admin')) 349 355 { 350 $GLOBALS['phpgw']->redirect_link('/ index.php');356 $GLOBALS['phpgw']->redirect_link('/#'); 351 357 } 352 358 $app_name = get_var('app_name',array('POST','GET')); … … 359 365 $this->bo->delete($app_name); 360 366 } 361 $GLOBALS['phpgw']->redirect_link('/ index.php','menuaction=admin.uiapplications.get_list&start='.$start);367 $GLOBALS['phpgw']->redirect_link('/#index.php','menuaction=admin.uiapplications.get_list&start='.$start); 362 368 } 363 369 … … 373 379 374 380 $GLOBALS['phpgw']->template->set_var('messages',lang('Are you sure you want to delete the application %1 ?',$GLOBALS['phpgw_info']['apps'][$app_name]['title'])); 375 $GLOBALS['phpgw']->template->set_var('no',lang('No')); 381 382 $GLOBALS['phpgw']->template->set_var( 'no', lang('No')); 383 $GLOBALS['phpgw']->template->set_var( 'no_button', $GLOBALS[ 'phpgw' ] -> link( '/', 'menuaction=admin.uiapplications.get_list' ) ); 384 376 385 $GLOBALS['phpgw']->template->set_var('yes',lang('Yes')); 377 386 $GLOBALS['phpgw']->template->set_var('form_action',$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiapplications.delete')); … … 385 394 if ($GLOBALS['phpgw']->acl->check('applications_access',16,'admin')) 386 395 { 387 $GLOBALS['phpgw']->redirect_link('/ index.php');396 $GLOBALS['phpgw']->redirect_link('/'); 388 397 } 389 398 if (!is_object($GLOBALS['phpgw']->hooks)) … … 393 402 $GLOBALS['phpgw']->hooks->register_all_hooks(); 394 403 395 $GLOBALS['phpgw']->redirect_link('/admin/ index.php');404 $GLOBALS['phpgw']->redirect_link('/admin/'); 396 405 } 397 406 } -
trunk/admin/inc/class.uicategories.inc.php
r2419 r2686 38 38 if ($GLOBALS['phpgw']->acl->check('global_categories_access',1,'admin')) 39 39 { 40 $GLOBALS['phpgw']->redirect_link( '/index.php');40 $GLOBALS['phpgw']->redirect_link( '/#' ); 41 41 } 42 42 … … 157 157 if ($_POST['add']) 158 158 { 159 $GLOBALS['phpgw']->redirect_link('/ index.php',$link_data);159 $GLOBALS['phpgw']->redirect_link('/#index.php',$link_data); 160 160 } 161 161 162 162 if ($_POST['done']) 163 163 { 164 $GLOBALS['phpgw']->redirect_link( '/admin/index.php');164 $GLOBALS['phpgw']->redirect_link( '/#admin/' ); 165 165 } 166 166 … … 204 204 $this->template->set_var('template_set',$this->template_dir); 205 205 206 $this->template->set_var( 'add_button', $GLOBALS[ 'phpgw' ] -> link( '/index.php', $link_data ) ); 207 $this->template->set_var( 'done_button', $GLOBALS[ 'phpgw' ] -> link( '/admin/' ) ); 208 206 209 $link_data['menuaction'] = 'admin.uicategories.index'; 207 210 $this->template->set_var('action_url',$GLOBALS['phpgw']->link('/index.php',$link_data)); … … 370 373 if (!$this->acl_add && $cat_parent == 0 || !$this->acl_add_sub && $cat_parent != 0) 371 374 { 372 $GLOBALS['phpgw']->redirect_link( '/index.php');375 $GLOBALS['phpgw']->redirect_link( '/#' ); 373 376 } 374 377 if ($_POST['cancel'] || $this->cat_id && !$this->acl_edit || $this->cat_id && 375 378 (!$this->acl_add && $cat_parent == 0 || !$this->acl_add_sub && $cat_parent != 0)) 376 379 { 377 $GLOBALS['phpgw']->redirect_link('/ index.php',$link_data);380 $GLOBALS['phpgw']->redirect_link('/#index.php',$link_data); 378 381 } 379 382 … … 417 420 } 418 421 if ($redirect_) 419 $GLOBALS['phpgw']->redirect_link('/ index.php',$link_data);422 $GLOBALS['phpgw']->redirect_link('/#index.php',$link_data); 420 423 421 424 } … … 447 450 $this->template->set_file(array('form' => 'category_form.tpl')); 448 451 452 $this->template->set_var( 'cancel_button', $GLOBALS[ 'phpgw' ] -> link( '/index.php', $link_data ) ); 453 449 454 if ($this->cat_id) 450 455 { … … 487 492 $link_data['menuaction'] = 'admin.uicategories.delete'; 488 493 489 $this->template->set_var( 'delete','<form method="POST" action="' . $GLOBALS['phpgw']->link('/index.php',$link_data)490 . '"><input type="submit" value="' . lang('Delete') .'"></form>');494 $this->template->set_var( 'lang_delete', lang('Delete') ); 495 $this->template->set_var( 'delete_button', $GLOBALS[ 'phpgw' ] -> link( '/index.php', $link_data ) ); 491 496 } 492 497 else … … 552 557 if (!$this->acl_delete) 553 558 { 554 $GLOBALS['phpgw']->redirect_link('/ index.php');559 $GLOBALS['phpgw']->redirect_link('/#'); 555 560 } 556 561 $link_data = array … … 562 567 if (!$this->cat_id || $_POST['cancel']) 563 568 { 564 $GLOBALS['phpgw']->redirect_link('/ index.php',$link_data);569 $GLOBALS['phpgw']->redirect_link('/#index.php',$link_data); 565 570 } 566 571 … … 575 580 $this->bo->delete($this->cat_id,False); 576 581 } 577 $GLOBALS['phpgw']->redirect_link('/ index.php',$link_data);582 $GLOBALS['phpgw']->redirect_link('/#index.php',$link_data); 578 583 } 579 584 $this->template->set_file(array('category_delete' => 'delete_cat.tpl')); 585 586 $this -> template -> set_var( 'no_button', $GLOBALS[ 'phpgw' ] -> link( '/index.php', $link_data ) ); 580 587 581 588 if ($this->appname) -
trunk/admin/inc/class.uiconfig.inc.php
r2419 r2686 20 20 if ($GLOBALS['phpgw']->acl->check('site_config_access',1,'admin')) 21 21 { 22 $GLOBALS['phpgw']->redirect_link('/ index.php');22 $GLOBALS['phpgw']->redirect_link('/#'); 23 23 } 24 24 … … 47 47 case '': 48 48 /* This keeps the admin from getting into what is a setup-only config */ 49 $GLOBALS['phpgw']->redirect_link('/ admin/index.php');49 $GLOBALS['phpgw']->redirect_link('/#admin/'); 50 50 break; 51 51 default: … … 72 72 if ($_POST['cancel'] || $_POST['submit'] && $GLOBALS['phpgw']->acl->check('site_config_access',2,'admin')) 73 73 { 74 $GLOBALS['phpgw']->redirect_link('/ admin/index.php');74 $GLOBALS['phpgw']->redirect_link('/#admin/'); 75 75 } 76 76 … … 126 126 if(!$errors) 127 127 { 128 $GLOBALS['phpgw']->redirect_link('/ admin/index.php');128 $GLOBALS['phpgw']->redirect_link('/#admin/'); 129 129 } 130 130 } … … 288 288 289 289 $t->set_var('lang_submit', $GLOBALS['phpgw']->acl->check('site_config_access',2,'admin') ? lang('Cancel') : lang('Save')); 290 290 291 $t->set_var('lang_cancel', lang('Cancel')); 292 $t->set_var( 'cancel_button', $GLOBALS[ 'phpgw' ] -> link( '/admin/' ) ); 293 291 294 $t->pfp('out','footer'); 292 295 } -
trunk/admin/inc/class.uiserver.inc.php
r2 r2686 356 356 'messages' => lang('Are you sure you want to delete this server?'), 357 357 'no' => lang('No'), 358 'no_button' => $GLOBALS[ 'phpgw' ] -> link( '/', 'menuaction=admin.uiserver.list_servers' ), 358 359 'yes' => lang('Yes'), 359 360 )); -
trunk/admin/templates/default/application_form.tpl
r2 r2686 15 15 <td nowrap> 16 16 <input type="submit" name="save" value="{lang_save_button}"> 17 <input type=" submit" name="cancel" value="{lang_cancel_button}">17 <input type="button" name="cancel" value="{lang_cancel_button}" onclick="XLink( '{cancel_button}' )" /> 18 18 </td> 19 19 <td align="right"> -
trunk/admin/templates/default/applications.tpl
r2 r2686 29 29 <tr> 30 30 <td align="left" nobreak> 31 <form method="POST" action="{new_action}"> 32 <input type="submit" value="{lang_add}"> 33 </form> 31 <input type="button" value="{lang_add}" onclick="XLink( '{new_action}' )" /> 34 32 </td> 35 33 <td> -
trunk/admin/templates/default/category_form.tpl
r662 r2686 7 7 <center> 8 8 {message}<br> 9 <form name="edit_cat" action="{action_url}" method="POST"> 9 10 <table border="0" width="80%" cellspacing="2" cellpadding="2"> 10 <form name="edit_cat" action="{actionurl}" method="POST">11 11 {hidden_vars} 12 12 <tr class="th"> … … 60 60 <input type="hidden" id="idgroup" name="idgroup" value="{cat_id_group}"> 61 61 <td><input onclick="return verifyCatOwners('td_group')" type="submit" name="save" value="{lang_save}"></td> 62 <td>< form method="POST" action="{cancel_url}"><input type="submit" name="cancel" value="{lang_cancel}"></form></td>63 <td align="right"> {delete}</td>62 <td><input type="button" name="cancel" value="{lang_cancel}" onclick="XLink( '{cancel_button}' )" /></td> 63 <td align="right"><input type="button" name="delete" value="{lang_delete}" onclick="XLink( '{delete_button}' )" /></td> 64 64 </tr> 65 65 </table> -
trunk/admin/templates/default/config.tpl
r2640 r2686 236 236 <td colspan="2" align="center"> 237 237 <input type="submit" name="submit" value="{lang_submit}"> 238 <input type=" submit" name="cancel" value="{lang_cancel}">238 <input type="button" name="cancel" value="{lang_cancel}" onclick="XLink( '{cancel_button}' )"> 239 239 <br> 240 240 </td> -
trunk/admin/templates/default/delete_cat.tpl
r2 r2686 20 20 </td> 21 21 <td align="center"> 22 <input type=" submit" name="cancel" value="{lang_no}">22 <input type="button" name="cancel" value="{lang_no}" onclick="XLink( '{no_button}' )"> 23 23 </td> 24 24 <!-- END delete --> -
trunk/admin/templates/default/delete_common.tpl
r2 r2686 8 8 <tr> 9 9 <td width="50%" align="center"> 10 <input type=" submit" name="no" value="{no}">10 <input type="button" name="no" value="{no}" onclick="XLink( '{no_button}' )" > 11 11 </td> 12 12 <td width="50%" align="center"> -
trunk/admin/templates/default/listcats.tpl
r2419 r2686 57 57 <tr valign="bottom" height="50"> 58 58 <td> 59 < form method="POST" action="{action_url}">60 <input type=" submit" name="add" value="{lang_add}"> 61 <input type=" submit" name="done" value="{lang_cancel}">62 < /form>59 <!form method="POST" action="{action_url}"> 60 <input type="button" name="add" value="{lang_add}" onclick="XLink( '{add_button}' )" /> 61 <input type="button" name="done" value="{lang_cancel}" onclick="XLink( '{done_button}' )" /> 62 <!/form> 63 63 </td> 64 64 <td colspan="5"> </td>
Note: See TracChangeset
for help on using the changeset viewer.