[Phpgroupware-cvs] CVS: addressbook/inc class.uiXport.inc.php,1.13,1.14 class.uiaddressbook.inc.php,1.46,1.47 class.uifields.inc.php,1.5,1.6 class.uivcard.inc.php,1.6,1.7

[Dan Kuykendall <address@hidden>]

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

Modified Files:
        class.uiXport.inc.php class.uiaddressbook.inc.php 
        class.uifields.inc.php class.uivcard.inc.php 
Log Message:
made changes to the loading of the header, navbar, appheader, and footers

Index: class.uiXport.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/addressbook/inc/class.uiXport.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** class.uiXport.inc.php       24 Apr 2002 13:27:15 -0000      1.13
--- class.uiXport.inc.php       24 May 2002 10:38:01 -0000      1.14
***************
*** 91,95 ****
                                        {
                                                
$GLOBALS['phpgw']->common->phpgw_header();
-                                               echo parse_navbar();
                                                echo "<pre>$buffer</pre>";
                                                echo '<a 
href="'.$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.index')
 . '">'.lang('OK').'</a>';
--- 91,94 ----
***************
*** 100,104 ****
                                {
                                        
$GLOBALS['phpgw']->common->phpgw_header();
-                                       echo parse_navbar();
                                        echo "<pre>$buffer</pre>";
                                        echo '<a 
href="'.$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.index').
 '">'.lang('OK').'</a>';
--- 99,102 ----
***************
*** 110,114 ****
                        {
                                $GLOBALS['phpgw']->common->phpgw_header();
-                               echo parse_navbar();
  
                                $this->template->set_file(array('import' => 
'import.tpl'));
--- 108,111 ----
***************
*** 174,178 ****
                                        
$GLOBALS['phpgw_info']['flags']['noheader'] = True;
                                        
$GLOBALS['phpgw']->common->phpgw_header();
-                                       echo parse_navbar();
                                        echo lang('<b>No conversion type 
&lt;none&gt; could be located.</b>  Please choose a conversion type from the 
list');
                                        echo '&nbsp<a 
href="'.$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiXport.export')
 . '">' . lang('OK') . '</a>';
--- 171,174 ----
***************
*** 193,197 ****
                                {
                                        
$GLOBALS['phpgw']->common->phpgw_header();
-                                       echo parse_navbar();
                                        echo "<pre>\n";
                                        echo $buffer;
--- 189,192 ----
***************
*** 204,208 ****
                        {
                                $GLOBALS['phpgw']->common->phpgw_header();
-                               echo parse_navbar();
  
                                $this->template->set_file(array('export' => 
'export.tpl'));
--- 199,202 ----

Index: class.uiaddressbook.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/addressbook/inc/class.uiaddressbook.inc.php,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -r1.46 -r1.47
*** class.uiaddressbook.inc.php 13 May 2002 00:43:35 -0000      1.46
--- class.uiaddressbook.inc.php 24 May 2002 10:38:01 -0000      1.47
***************
*** 263,267 ****
                {
                        $GLOBALS['phpgw']->common->phpgw_header();
-                       echo parse_navbar();
  
                        $this->template->set_file(array('addressbook_list_t' => 
'index.tpl'));
--- 263,266 ----
***************
*** 714,718 ****
  
                        $GLOBALS['phpgw']->common->phpgw_header();
-                       echo parse_navbar();
  
                        $custom = $this->fields->read_custom_fields();
--- 713,716 ----
***************
*** 774,778 ****
  
                        $GLOBALS['phpgw']->common->phpgw_header();
-                       echo parse_navbar();
  
                        /* Read in user custom fields, if any */
--- 772,775 ----
***************
*** 839,843 ****
                        {
                                $GLOBALS['phpgw']->common->phpgw_header();
-                               echo parse_navbar();
  
                                $this->template->set_var('lang_sure',lang('Are 
you sure you want to delete this entry ?'));
--- 836,839 ----
***************
*** 882,886 ****
                        {
                                $GLOBALS['phpgw']->common->phpgw_header();
-                               echo parse_navbar();
                        }
  
--- 878,881 ----
***************
*** 1149,1153 ****
  
                        $GLOBALS['phpgw']->common->phpgw_header();
-                       echo parse_navbar();
  
                        if($totalerrors)
--- 1144,1147 ----

Index: class.uifields.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/addressbook/inc/class.uifields.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** class.uifields.inc.php      13 Apr 2002 03:34:23 -0000      1.5
--- class.uifields.inc.php      24 May 2002 10:38:01 -0000      1.6
***************
*** 35,39 ****
                        {
                                $GLOBALS['phpgw']->common->phpgw_header();
-                               echo parse_navbar();
                                echo lang('access not permitted');
                                $GLOBALS['phpgw']->common->phpgw_exit();
--- 35,38 ----
***************
*** 81,85 ****
  
                        $GLOBALS['phpgw']->common->phpgw_header();
-                       echo parse_navbar();
  
                        
$GLOBALS['phpgw']->template->set_var('left',$GLOBALS['phpgw']->nextmatchs->left('/index.php',$start,$total_records,'menuaction=addressbook.uifields.index'));
--- 80,83 ----
***************
*** 120,124 ****
                        {
                                $GLOBALS['phpgw']->common->phpgw_header();
-                               echo parse_navbar();
                                echo lang('access not permitted');
                                $GLOBALS['phpgw']->common->phpgw_exit();
--- 118,121 ----
***************
*** 159,163 ****
  
                        $GLOBALS['phpgw']->common->phpgw_header();
-                       echo parse_navbar();
  
                        if($errorcount)
--- 156,159 ----
***************
*** 198,202 ****
                        {
                                $GLOBALS['phpgw']->common->phpgw_header();
-                               echo parse_navbar();
                                echo lang('access not permitted');
                                $GLOBALS['phpgw']->common->phpgw_exit();
--- 194,197 ----
***************
*** 241,245 ****
  
                        $GLOBALS['phpgw']->common->phpgw_header();
-                       echo parse_navbar();
  
                        if($errorcount)
--- 236,239 ----
***************
*** 293,297 ****
                        {
                                $GLOBALS['phpgw']->common->phpgw_header();
-                               echo parse_navbar();
                                echo lang('access not permitted');
                                $GLOBALS['phpgw']->common->phpgw_exit();
--- 287,290 ----
***************
*** 317,321 ****
                        {
                                $GLOBALS['phpgw']->common->phpgw_header();
-                               echo parse_navbar();
  
                                $hidden_vars = '<input type="hidden" 
name="sort" value="' . $sort . '">' . "\n"
--- 310,313 ----

Index: class.uivcard.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/addressbook/inc/class.uivcard.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** class.uivcard.inc.php       17 Jan 2002 03:52:56 -0000      1.6
--- class.uivcard.inc.php       24 May 2002 10:38:01 -0000      1.7
***************
*** 47,51 ****
  
                        $GLOBALS['phpgw']->common->phpgw_header();
-                       echo parse_navbar();
  
                        echo '<body bgcolor="' . 
$GLOBALS['phpgw_info']['theme']['bg_color'] . '">';
--- 47,50 ----
***************
*** 77,81 ****
                        {
                                $GLOBALS['phpgw']->common->phpgw_header();
-                               echo parse_navbar();
                        }
  
--- 76,79 ----