[Phpgroupware-cvs] CVS: admin/inc class.uiaccess_history.inc.php,1.6,1.7 class.uiaclmanager.inc.php,1.5,1.6 class.uiapplications.inc.php,1.3,1.4 class.uicategories.inc.php,1.13,1.14 class.uiconfig.inc.php,1.10,1.11 class.uicurrentsessions.inc.php,1.5,1.6 class.uilog.inc.php,1.8,1.9 class.uimainscreen.inc.php,1.5,1.6 class.uiserver.inc.php,1.4,1.5

[Dan Kuykendall <address@hidden>]

Update of /cvsroot/phpgroupware/admin/inc
In directory subversions:/tmp/cvs-serv16807/admin/inc

Modified Files:
        class.uiaccess_history.inc.php class.uiaclmanager.inc.php 
        class.uiapplications.inc.php class.uicategories.inc.php 
        class.uiconfig.inc.php class.uicurrentsessions.inc.php 
        class.uilog.inc.php class.uimainscreen.inc.php 
        class.uiserver.inc.php 
Log Message:
made changes to the loading of the header, navbar, appheader, and footers

Index: class.uiaccess_history.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.uiaccess_history.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** class.uiaccess_history.inc.php      21 Dec 2001 03:38:35 -0000      1.6
--- class.uiaccess_history.inc.php      24 May 2002 10:38:02 -0000      1.7
***************
*** 42,46 ****
                        
                        $GLOBALS['phpgw']->common->phpgw_header();
-                       echo parse_navbar();
  
                        $total_records = $this->bo->total($account_id);
--- 42,45 ----

Index: class.uiaclmanager.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.uiaclmanager.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** class.uiaclmanager.inc.php  2 Jan 2002 14:33:02 -0000       1.5
--- class.uiaclmanager.inc.php  24 May 2002 10:38:02 -0000      1.6
***************
*** 30,34 ****
                {
                        $GLOBALS['phpgw']->common->phpgw_header();
-                       echo parse_navbar();
                }
  
--- 30,33 ----

Index: class.uiapplications.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.uiapplications.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** class.uiapplications.inc.php        17 Sep 2001 22:30:14 -0000      1.3
--- class.uiapplications.inc.php        24 May 2002 10:38:02 -0000      1.4
***************
*** 33,37 ****
                {
                        $GLOBALS['phpgw']->common->phpgw_header();
-                       echo parse_navbar();
  
                        
$GLOBALS['phpgw']->template->set_file(array('applications' => 
'applications.tpl'));
--- 33,36 ----
***************
*** 211,215 ****
  
                        $GLOBALS['phpgw']->common->phpgw_header();
-                       echo parse_navbar();
  
                        
$GLOBALS['phpgw']->template->set_var('lang_header',lang('Add new application'));
--- 210,213 ----
***************
*** 296,300 ****
  
                        $GLOBALS['phpgw']->common->phpgw_header();
-                       echo parse_navbar();
  
                        if ($totalerrors)
--- 294,297 ----
***************
*** 350,354 ****
  
                        $GLOBALS['phpgw']->common->phpgw_header();
-                       echo parse_navbar();
  
                        
$GLOBALS['phpgw']->template->set_var('messages',lang('Are you sure you want to 
delete this application ?'));
--- 347,350 ----

Index: class.uicategories.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.uicategories.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** class.uicategories.inc.php  19 Mar 2002 02:35:38 -0000      1.13
--- class.uicategories.inc.php  24 May 2002 10:38:02 -0000      1.14
***************
*** 99,103 ****
  
                        $GLOBALS['phpgw']->common->phpgw_header();
-                       echo parse_navbar();
  
                        $this->template->set_file(array('cat_list_t' => 
'listcats.tpl'));
--- 99,102 ----
***************
*** 248,252 ****
  
                        $GLOBALS['phpgw']->common->phpgw_header();
-                       echo parse_navbar();
  
                        $this->set_langs();
--- 247,250 ----
***************
*** 332,336 ****
  
                        $GLOBALS['phpgw']->common->phpgw_header();
-                       echo parse_navbar();
  
                        $this->set_langs();
--- 330,333 ----
***************
*** 450,454 ****
  
                                $GLOBALS['phpgw']->common->phpgw_header();
-                               echo parse_navbar();
  
                                $hidden_vars = '<input type="hidden" 
name="cat_id" value="' . $this->cat_id . '">' . "\n";
--- 447,450 ----

Index: class.uiconfig.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.uiconfig.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** class.uiconfig.inc.php      20 Mar 2002 00:27:34 -0000      1.10
--- class.uiconfig.inc.php      24 May 2002 10:38:02 -0000      1.11
***************
*** 156,160 ****
  
                        $GLOBALS['phpgw']->common->phpgw_header();
-                       echo parse_navbar();
  
                        $t->set_var('title',lang('Site Configuration'));
--- 156,159 ----

Index: class.uicurrentsessions.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.uicurrentsessions.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** class.uicurrentsessions.inc.php     4 Jan 2002 00:39:00 -0000       1.5
--- class.uicurrentsessions.inc.php     24 May 2002 10:38:02 -0000      1.6
***************
*** 32,36 ****
                {
                        $GLOBALS['phpgw']->common->phpgw_header();
-                       echo parse_navbar();
                }
  
--- 32,35 ----

Index: class.uilog.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.uilog.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** class.uilog.inc.php 4 Jan 2002 00:55:01 -0000       1.8
--- class.uilog.inc.php 24 May 2002 10:38:02 -0000      1.9
***************
*** 257,261 ****
  
                        $GLOBALS['phpgw']->common->phpgw_header();
-                       echo parse_navbar();
                        $this->t->pfp('out','log_list_t');
  //                    $this->set_app_langs();
--- 257,260 ----

Index: class.uimainscreen.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.uimainscreen.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** class.uimainscreen.inc.php  23 Feb 2002 17:19:28 -0000      1.5
--- class.uimainscreen.inc.php  24 May 2002 10:38:02 -0000      1.6
***************
*** 38,42 ****
  
                        $GLOBALS['phpgw']->common->phpgw_header();
-                       echo parse_navbar();
  
                        if ($GLOBALS['HTTP_POST_VARS']['submit'])
--- 38,41 ----

Index: class.uiserver.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.uiserver.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** class.uiserver.inc.php      18 Feb 2002 05:05:09 -0000      1.4
--- class.uiserver.inc.php      24 May 2002 10:38:02 -0000      1.5
***************
*** 96,100 ****
                {
                        $GLOBALS['phpgw']->common->phpgw_header();
-                       echo parse_navbar();
  
                        
$GLOBALS['phpgw']->template->set_file(array('server_list_t' => 
'listservers.tpl'));
--- 96,99 ----
***************
*** 244,248 ****
  
                        $GLOBALS['phpgw']->common->phpgw_header();
-                       echo parse_navbar();
  
                        
$GLOBALS['phpgw']->template->set_var('title_servers',$GLOBALS['HTTP_GET_VARS']['server_id']
 ? lang('Edit Peer Server') : lang('Add Peer Server'));
--- 243,246 ----
***************
*** 298,302 ****
                        {
                                $GLOBALS['phpgw']->common->phpgw_header();
-                               echo parse_navbar();
  
                                
$GLOBALS['phpgw']->template->set_file(array('server_delete' => 
'delete_common.tpl'));
--- 296,299 ----