Changeset 2686

Timestamp:

05/03/10 10:43:25 (14 years ago)

Author:

rodsouza

Message:

Ticket #1058 - Removendo reload de alguns itens do 'admin'.

Location:

trunk

Files:

• admin/inc/class.uiaccess_history.inc.php (modified) (1 diff)
• admin/inc/class.uiaccounts.inc.php (modified) (1 diff)
• admin/inc/class.uiapplications.inc.php (modified) (17 diffs)
• admin/inc/class.uicategories.inc.php (modified) (10 diffs)
• admin/inc/class.uiconfig.inc.php (modified) (5 diffs)
• admin/inc/class.uiserver.inc.php (modified) (1 diff)
• admin/templates/default/application_form.tpl (modified) (1 diff)
• admin/templates/default/applications.tpl (modified) (1 diff)
• admin/templates/default/category_form.tpl (modified) (2 diffs)
• admin/templates/default/config.tpl (modified) (1 diff)
• admin/templates/default/delete_cat.tpl (modified) (1 diff)
• admin/templates/default/delete_common.tpl (modified) (1 diff)
• admin/templates/default/listcats.tpl (modified) (1 diff)
• phpgwapi/inc/class.phpgw.inc.php (modified) (1 diff)
• phpgwapi/inc/class.sessions.inc.php (modified) (1 diff)
• phpgwapi/js/tools/xlink.js (modified) (1 diff)

trunk/admin/inc/class.uiaccess_history.inc.php

@@ -140 +140 @@
                 }
         }
+?>

trunk/admin/inc/class.uiaccounts.inc.php

@@ -527 +527 @@
                                 'hidden_vars' => '<input type="hidden" name="account_id" value="'.$_GET['account_id'].'">',
                                 'yes'         => lang('Yes'),
-                                'no'          => lang('No')
+                                'no'          => lang('No'),
+                                'no_button' => $GLOBALS[ 'phpgw' ] -> link( '/', 'menuaction=admin.uiaccounts.list_groups' )
                         );
                         $p->set_var($var);

trunk/admin/inc/class.uiapplications.inc.php

@@ -34 +34 @@
                         if ($GLOBALS['phpgw']->acl->check('applications_access',1,'admin'))
                         {
-                                $GLOBALS['phpgw']->redirect_link('/index.php');
+                                $GLOBALS['phpgw']->redirect_link('/#');
                         }
                         $can_add    = !$GLOBALS['phpgw']->acl->check('applications_access',2,'admin');
@@ -112 +112 @@
                         $GLOBALS['phpgw']->template->set_var('lang_enabled',lang('Enabled'));
 
-                        $GLOBALS['phpgw']->template->set_var('new_action',$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiapplications.add'));
+                        $GLOBALS['phpgw']->template->set_var('new_action',$GLOBALS['phpgw']->link('/','menuaction=admin.uiapplications.add'));
                         $GLOBALS['phpgw']->template->set_var('lang_note',lang('(To install new applications use<br><a href="setup/" target="setup">Setup</a> [Manage Applications] !!!)'));
                         $GLOBALS['phpgw']->template->set_var('lang_add',lang('add'));
@@ -123 +123 @@
                                 $GLOBALS['phpgw']->template->set_var('name',$app['title']);
 
-                                $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>' : '&nbsp;');
-                                $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>' : '&nbsp;');
+                                $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>' : '&nbsp;');
+                                $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>' : '&nbsp;');
 
                                 if ($app['status'])
@@ -162 +162 @@
                         if ($GLOBALS['phpgw']->acl->check('applications_access',2,'admin'))
                         {
-                                $GLOBALS['phpgw']->redirect_link('/index.php');
+                                $GLOBALS['phpgw']->redirect_link('/#');
                         }
                         $start = get_var('start',array('POST','GET'));
@@ -174 +174 @@
                         if ($_POST['cancel'])
                         {
-                                $GLOBALS['phpgw']->redirect_link('/index.php','menuaction=admin.uiapplications.get_list&start='.$start);
+                                $GLOBALS['phpgw']->redirect_link('/#index.php','menuaction=admin.uiapplications.get_list&start='.$start);
                         }
 
@@ -206 +206 @@
                                         ));
 
-                                        $GLOBALS['phpgw']->redirect_link('/index.php','menuaction=admin.uiapplications.get_list&start='.$start);
+                                        $GLOBALS['phpgw']->redirect_link('/#index.php','menuaction=admin.uiapplications.get_list&start='.$start);
                                         $GLOBALS['phpgw']->common->phpgw_exit();
                                 }
@@ -231 +231 @@
 
                         $GLOBALS['phpgw']->template->set_var('hidden_vars','<input type="hidden" name="start" value="'.$start.'">');
-                        $GLOBALS['phpgw']->template->set_var('form_action',$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiapplications.add'));
+                        $GLOBALS['phpgw']->template->set_var('form_action',$GLOBALS['phpgw']->link('/','menuaction=admin.uiapplications.add'));
 
                         $this->display_row(lang('application name'),'<input name="n_app_name" value="' . $n_app_name . '">');
@@ -255 +255 @@
 
                         $GLOBALS['phpgw']->template->set_var('lang_save_button',lang('Add'));
+
                         $GLOBALS['phpgw']->template->set_var('lang_cancel_button',lang('Cancel'));
+                        $GLOBALS['phpgw']->template->set_var( 'cancel_button', $GLOBALS[ 'phpgw' ] -> link( '/', 'menuaction=admin.uiapplications.get_list' ) );
+
                         $GLOBALS['phpgw']->template->pparse('phpgw_body','form');
                 }
@@ -263 +266 @@
                         if ($GLOBALS['phpgw']->acl->check('applications_access',4,'admin'))
                         {
-                                $GLOBALS['phpgw']->redirect_link('/index.php');
+                                $GLOBALS['phpgw']->redirect_link('/#');
                         }
                         $app_name = get_var('app_name',array('POST','GET'));
@@ -274 +277 @@
                         if ($_POST['cancel'])
                         {
-                                $GLOBALS['phpgw']->redirect_link('/index.php','menuaction=admin.uiapplications.get_list&start='.$start);
+                                $GLOBALS['phpgw']->redirect_link('/#index.php','menuaction=admin.uiapplications.get_list&start='.$start);
                         }
                         
@@ -297 +300 @@
                                         ));
 
-                                        $GLOBALS['phpgw']->redirect_link('/index.php','menuaction=admin.uiapplications.get_list&start='.$start);
+                                        $GLOBALS['phpgw']->redirect_link('/#index.php','menuaction=admin.uiapplications.get_list&start='.$start);
                                 }
                         }
@@ -328 +331 @@
                         $GLOBALS['phpgw']->template->set_var('lang_status',lang('Status'));
                         $GLOBALS['phpgw']->template->set_var('lang_save_button',lang('Save'));
+
                         $GLOBALS['phpgw']->template->set_var('lang_cancel_button',lang('Cancel'));
+                        $GLOBALS['phpgw']->template->set_var( 'cancel_button', $GLOBALS[ 'phpgw' ] -> link( '/', 'menuaction=admin.uiapplications.get_list' ) );
+
                         $GLOBALS['phpgw']->template->set_var('lang_delete_button',lang('Delete'));
 
@@ -348 +354 @@
                         if ($GLOBALS['phpgw']->acl->check('applications_access',8,'admin'))
                         {
-                                $GLOBALS['phpgw']->redirect_link('/index.php');
+                                $GLOBALS['phpgw']->redirect_link('/#');
                         }
                         $app_name = get_var('app_name',array('POST','GET'));
@@ -359 +365 @@
                                         $this->bo->delete($app_name);
                                 }
-                                $GLOBALS['phpgw']->redirect_link('/index.php','menuaction=admin.uiapplications.get_list&start='.$start);
+                                $GLOBALS['phpgw']->redirect_link('/#index.php','menuaction=admin.uiapplications.get_list&start='.$start);
                         }
 
@@ -373 +379 @@
 
                         $GLOBALS['phpgw']->template->set_var('messages',lang('Are you sure you want to delete the application %1 ?',$GLOBALS['phpgw_info']['apps'][$app_name]['title']));
-                        $GLOBALS['phpgw']->template->set_var('no',lang('No'));
+
+                        $GLOBALS['phpgw']->template->set_var( 'no', lang('No'));
+                        $GLOBALS['phpgw']->template->set_var( 'no_button', $GLOBALS[ 'phpgw' ] -> link( '/', 'menuaction=admin.uiapplications.get_list' ) );
+
                         $GLOBALS['phpgw']->template->set_var('yes',lang('Yes'));
                         $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'))
                         {
-                                $GLOBALS['phpgw']->redirect_link('/index.php');
+                                $GLOBALS['phpgw']->redirect_link('/');
                         }
                         if (!is_object($GLOBALS['phpgw']->hooks))
@@ -393 +402 @@
                         $GLOBALS['phpgw']->hooks->register_all_hooks();
                         
-                        $GLOBALS['phpgw']->redirect_link('/admin/index.php');
+                        $GLOBALS['phpgw']->redirect_link('/admin/');
                 }
         }

trunk/admin/inc/class.uicategories.inc.php

@@ -38 +38 @@
                         if ($GLOBALS['phpgw']->acl->check('global_categories_access',1,'admin'))
                         {
-                                $GLOBALS['phpgw']->redirect_link('/index.php');
+                                $GLOBALS['phpgw']->redirect_link( '/#' );
                         }
 
@@ -157 +157 @@
                         if ($_POST['add'])
                         {
-                                $GLOBALS['phpgw']->redirect_link('/index.php',$link_data);
+                                $GLOBALS['phpgw']->redirect_link('/#index.php',$link_data);
                         }
 
                         if ($_POST['done'])
                         {
-                                $GLOBALS['phpgw']->redirect_link('/admin/index.php');
+                                $GLOBALS['phpgw']->redirect_link( '/#admin/' );
                         }
         
@@ -204 +204 @@
                         $this->template->set_var('template_set',$this->template_dir);
 
+                        $this->template->set_var( 'add_button', $GLOBALS[ 'phpgw' ] -> link( '/index.php', $link_data ) );
+                        $this->template->set_var( 'done_button', $GLOBALS[ 'phpgw' ] -> link( '/admin/' ) );
+
                         $link_data['menuaction'] = 'admin.uicategories.index';
                         $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)
                         {
-                                $GLOBALS['phpgw']->redirect_link('/index.php');
+                                $GLOBALS['phpgw']->redirect_link( '/#' );
                         }
                         if ($_POST['cancel'] || $this->cat_id && !$this->acl_edit || $this->cat_id &&
                                 (!$this->acl_add && $cat_parent == 0 || !$this->acl_add_sub && $cat_parent != 0))
                         {
-                                $GLOBALS['phpgw']->redirect_link('/index.php',$link_data);
+                                $GLOBALS['phpgw']->redirect_link('/#index.php',$link_data);
                         }
 
@@ -417 +420 @@
                                         }
                                         if ($redirect_)
-                                                $GLOBALS['phpgw']->redirect_link('/index.php',$link_data);
+                                                $GLOBALS['phpgw']->redirect_link('/#index.php',$link_data);
 
                         }
@@ -447 +450 @@
                         $this->template->set_file(array('form' => 'category_form.tpl'));
 
+                        $this->template->set_var( 'cancel_button', $GLOBALS[ 'phpgw' ] -> link( '/index.php', $link_data ) );
+
                         if ($this->cat_id)
                         {
@@ -487 +492 @@
                                 $link_data['menuaction'] = 'admin.uicategories.delete';
 
-                                $this->template->set_var('delete','<form method="POST" action="' . $GLOBALS['phpgw']->link('/index.php',$link_data)
-                                        . '"><input type="submit" value="' . lang('Delete') .'"></form>');
+                                $this->template->set_var( 'lang_delete', lang('Delete') );
+                                $this->template->set_var( 'delete_button', $GLOBALS[ 'phpgw' ] -> link( '/index.php', $link_data ) );
                         }
                         else
@@ -552 +557 @@
                         if (!$this->acl_delete)
                         {
-                                $GLOBALS['phpgw']->redirect_link('/index.php');
+                                $GLOBALS['phpgw']->redirect_link('/#');
                         }
                         $link_data = array
@@ -562 +567 @@
                         if (!$this->cat_id || $_POST['cancel'])
                         {
-                                $GLOBALS['phpgw']->redirect_link('/index.php',$link_data);
+                                $GLOBALS['phpgw']->redirect_link('/#index.php',$link_data);
                         }
 
@@ -575 +580 @@
                                         $this->bo->delete($this->cat_id,False);
                                 }
-                                $GLOBALS['phpgw']->redirect_link('/index.php',$link_data);
+                                $GLOBALS['phpgw']->redirect_link('/#index.php',$link_data);
                         }
                         $this->template->set_file(array('category_delete' => 'delete_cat.tpl'));
+
+                        $this -> template -> set_var( 'no_button', $GLOBALS[ 'phpgw' ] -> link( '/index.php', $link_data ) );
 
                         if ($this->appname)

trunk/admin/inc/class.uiconfig.inc.php

@@ -20 +20 @@
                         if ($GLOBALS['phpgw']->acl->check('site_config_access',1,'admin'))
                         {
-                                $GLOBALS['phpgw']->redirect_link('/index.php');
+                                $GLOBALS['phpgw']->redirect_link('/#');
                         }
 
@@ -47 +47 @@
                                 case '':
                                         /* This keeps the admin from getting into what is a setup-only config */
-                                        $GLOBALS['phpgw']->redirect_link('/admin/index.php');
+                                        $GLOBALS['phpgw']->redirect_link('/#admin/');
                                         break;
                                 default:
@@ -72 +72 @@
                         if ($_POST['cancel'] || $_POST['submit'] && $GLOBALS['phpgw']->acl->check('site_config_access',2,'admin'))
                         {
-                                $GLOBALS['phpgw']->redirect_link('/admin/index.php');
+                                $GLOBALS['phpgw']->redirect_link('/#admin/');
                         }
 
@@ -126 +126 @@
                                 if(!$errors)
                                 {
-                                        $GLOBALS['phpgw']->redirect_link('/admin/index.php');
+                                        $GLOBALS['phpgw']->redirect_link('/#admin/');
                                 }
                         }
@@ -288 +288 @@
 
                         $t->set_var('lang_submit', $GLOBALS['phpgw']->acl->check('site_config_access',2,'admin') ? lang('Cancel') : lang('Save'));
+
                         $t->set_var('lang_cancel', lang('Cancel'));
+                        $t->set_var( 'cancel_button', $GLOBALS[ 'phpgw' ] -> link( '/admin/' ) );
+
                         $t->pfp('out','footer');
                 }

trunk/admin/inc/class.uiserver.inc.php

@@ -356 +356 @@
                                         'messages' => lang('Are you sure you want to delete this server?'),
                                         'no' => lang('No'),
+                                        'no_button' => $GLOBALS[ 'phpgw' ] -> link( '/', 'menuaction=admin.uiserver.list_servers' ),
                                         'yes' => lang('Yes'),
                                 ));

trunk/admin/templates/default/application_form.tpl

@@ -15 +15 @@
    <td nowrap>
     <input type="submit" name="save" value="{lang_save_button}"> &nbsp;
-    <input type="submit" name="cancel" value="{lang_cancel_button}">
+    <input type="button" name="cancel" value="{lang_cancel_button}" onclick="XLink( '{cancel_button}' )" />
    </td>
    <td align="right">&nbsp;

trunk/admin/templates/default/applications.tpl

@@ -29 +29 @@
   <tr>
    <td align="left" nobreak>
-    <form method="POST" action="{new_action}">
-     <input type="submit" value="{lang_add}"> 
-    </form>
+    <input type="button" value="{lang_add}" onclick="XLink( '{new_action}' )" />
    </td>
    <td>

trunk/admin/templates/default/category_form.tpl

@@ -7 +7 @@
 <center>
 {message}<br>
+<form name="edit_cat" action="{action_url}" method="POST">
 <table border="0" width="80%" cellspacing="2" cellpadding="2"> 
-<form name="edit_cat" action="{actionurl}" method="POST">
 {hidden_vars}
         <tr class="th">
@@ -60 +60 @@
         <input type="hidden" id="idgroup" name="idgroup" value="{cat_id_group}">
         <td><input onclick="return verifyCatOwners('td_group')" type="submit" name="save" value="{lang_save}"></td>
-                <td><form method="POST" action="{cancel_url}"><input type="submit" name="cancel" value="{lang_cancel}"></form></td>
-                <td align="right">{delete}</td>
+                <td><input type="button" name="cancel" value="{lang_cancel}" onclick="XLink( '{cancel_button}' )" /></td>
+                <td align="right"><input type="button" name="delete" value="{lang_delete}" onclick="XLink( '{delete_button}' )" /></td>
         </tr>
 </table>

trunk/admin/templates/default/config.tpl

@@ -236 +236 @@
     <td colspan="2" align="center">
       <input type="submit" name="submit" value="{lang_submit}">
-      <input type="submit" name="cancel" value="{lang_cancel}">
+      <input type="button" name="cancel" value="{lang_cancel}" onclick="XLink( '{cancel_button}' )">
                   <br>
     </td>

trunk/admin/templates/default/delete_cat.tpl

@@ -20 +20 @@
                                 </td>
                                 <td align="center">
-                                        <input type="submit" name="cancel" value="{lang_no}">
+                                        <input type="button" name="cancel" value="{lang_no}" onclick="XLink( '{no_button}' )">
                                 </td>
 <!-- END delete -->

trunk/admin/templates/default/delete_common.tpl

@@ -8 +8 @@
    <tr>
     <td width="50%" align="center">
-     <input type="submit" name="no" value="{no}">
+     <input type="button" name="no" value="{no}" onclick="XLink( '{no_button}' )" >
     </td>
     <td width="50%" align="center">

trunk/admin/templates/default/listcats.tpl

@@ -57 +57 @@
                         <tr valign="bottom" height="50">
                                 <td>
-                                        <form method="POST" action="{action_url}">
-                                                <input type="submit" name="add" value="{lang_add}"> &nbsp;
-                                                <input type="submit" name="done" value="{lang_cancel}">
-                                        </form>
+                                        <!form method="POST" action="{action_url}">
+                                                <input type="button" name="add" value="{lang_add}" onclick="XLink( '{add_button}' )" /> &nbsp;
+                                                <input type="button" name="done" value="{lang_cancel}" onclick="XLink( '{done_button}' )" />
+                                        <!/form>
                                 </td>
                                 <td colspan="5">&nbsp;</td>

trunk/phpgwapi/inc/class.phpgw.inc.php

@@ -166 +166 @@
                         else
                         {
-                                Header("Location: $url");
+                                Header("Location: {$url}");
                                 print("\n\n");
                                 exit;

trunk/phpgwapi/inc/class.sessions.inc.php

@@ -1176 +1176 @@
                         {
                                 $webserver_url_count = strlen($GLOBALS['phpgw_info']['server']['webserver_url'])-1;
-                                if(substr($GLOBALS['phpgw_info']['server']['webserver_url'] ,$webserver_url_count,1) != '/' && $url_firstchar != '/')
-                                {
-                                        $url = $GLOBALS['phpgw_info']['server']['webserver_url'] .'/'. $url;
-                                }
-                                else
-                                {
-                                        $url = $GLOBALS['phpgw_info']['server']['webserver_url'] . $url;
-                                }
+                                if ( ! ( substr($GLOBALS['phpgw_info']['server']['webserver_url'] ,$webserver_url_count,1) != '/' && $url_firstchar != '/' ) )
+                                        $url = substr( $url, 1 );
+
+                                $url = "{$GLOBALS['phpgw_info']['server']['webserver_url']}/{$url}";
                         }
 

trunk/phpgwapi/js/tools/xlink.js

@@ -11 +11 @@
         function _click( _action, _cache )
         {
-
                 if ( _action.indexOf( window.location.host ) < 0 )
                         _action = window.location.protocol + '//' + window.location.host + _action;