[Phpgroupware-cvs] CVS: wcm/inc hook_config.inc.php,NONE,1.1 class.uielement.inc.php,1.11,1.12 class.uipage.inc.php,1.13,1.14 class.uisite.inc.php,1.7,1.8 class.uiwcm.inc.php,1.1.1.1,1.2

[Miles Lott <address@hidden>]

Update of /cvsroot/phpgroupware/wcm/inc
In directory subversions:/tmp/cvs-serv24848/inc

Modified Files:
        class.uielement.inc.php class.uipage.inc.php 
        class.uisite.inc.php class.uiwcm.inc.php 
Added Files:
        hook_config.inc.php 
Log Message:
Move application nav to a header include; add start of admin config using new
referer capability there



***** Error reading new file: [Errno 2] No such file or directory: 
'hook_config.inc.php'
Index: class.uielement.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/wcm/inc/class.uielement.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** class.uielement.inc.php     19 Feb 2002 13:57:48 -0000      1.11
--- class.uielement.inc.php     21 Feb 2002 12:26:24 -0000      1.12
***************
*** 163,166 ****
--- 163,167 ----
                        $GLOBALS['phpgw']->common->phpgw_header();
                        echo parse_navbar();
+                       include(PHPGW_APP_INC . SEP . 'header.inc.php');
  
                        
$GLOBALS['phpgw']->template->set_file(array('element_list_t' => 
'listelements.tpl'));
***************
*** 433,436 ****
--- 434,438 ----
                                $GLOBALS['phpgw']->common->phpgw_header();
                                echo parse_navbar();
+                               include(PHPGW_APP_INC . SEP . 'header.inc.php');
  
                                
$GLOBALS['phpgw']->template->set_file(array('element_delete' => 
'delete_common.tpl'));

Index: class.uipage.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/wcm/inc/class.uipage.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** class.uipage.inc.php        17 Feb 2002 17:56:22 -0000      1.13
--- class.uipage.inc.php        21 Feb 2002 12:26:24 -0000      1.14
***************
*** 111,114 ****
--- 111,115 ----
                        $GLOBALS['phpgw']->common->phpgw_header();
                        echo parse_navbar();
+                       include(PHPGW_APP_INC . SEP . 'header.inc.php');
  
                        
$GLOBALS['phpgw']->template->set_file(array('page_list_t' => 'listpages.tpl'));
***************
*** 429,432 ****
--- 430,434 ----
                                $GLOBALS['phpgw']->common->phpgw_header();
                                echo parse_navbar();
+                               include(PHPGW_APP_INC . SEP . 'header.inc.php');
  
                                
$GLOBALS['phpgw']->template->set_file(array('page_delete' => 
'delete_common.tpl'));

Index: class.uisite.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/wcm/inc/class.uisite.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** class.uisite.inc.php        17 Feb 2002 17:11:29 -0000      1.7
--- class.uisite.inc.php        21 Feb 2002 12:26:24 -0000      1.8
***************
*** 110,113 ****
--- 110,114 ----
                        $GLOBALS['phpgw']->common->phpgw_header();
                        echo parse_navbar();
+                       include(PHPGW_APP_INC . SEP . 'header.inc.php');
  
                        
$GLOBALS['phpgw']->template->set_file(array('site_list_t' => 'listsites.tpl'));
***************
*** 286,290 ****
                        
$GLOBALS['phpgw']->template->set_var('actionurl',$GLOBALS['phpgw']->link('/index.php','menuaction=wcm.uisite.edit&site_id='
 . $site_id));
                        
$GLOBALS['phpgw']->template->set_var('deleteurl',$GLOBALS['phpgw']->link('/index.php','menuaction=wcm.uisite.delete&site_id='
 . $site_id));
!                       
$GLOBALS['phpgw']->template->set_var('doneurl',$GLOBALS['phpgw']->link('/wcm/index.php','menuaction=wcm.uisite.index'));
  
                        
$GLOBALS['phpgw']->template->set_var('lang_name',lang('Site name'));
--- 287,291 ----
                        
$GLOBALS['phpgw']->template->set_var('actionurl',$GLOBALS['phpgw']->link('/index.php','menuaction=wcm.uisite.edit&site_id='
 . $site_id));
                        
$GLOBALS['phpgw']->template->set_var('deleteurl',$GLOBALS['phpgw']->link('/index.php','menuaction=wcm.uisite.delete&site_id='
 . $site_id));
!                       
$GLOBALS['phpgw']->template->set_var('doneurl',$GLOBALS['phpgw']->link('/index.php','menuaction=wcm.uisite.index'));
  
                        
$GLOBALS['phpgw']->template->set_var('lang_name',lang('Site name'));
***************
*** 377,380 ****
--- 378,382 ----
                                $GLOBALS['phpgw']->common->phpgw_header();
                                echo parse_navbar();
+                               include(PHPGW_APP_INC . SEP . 'header.inc.php');
  
                                
$GLOBALS['phpgw']->template->set_file(array('site_delete' => 
'delete_common.tpl'));

Index: class.uiwcm.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/wcm/inc/class.uiwcm.inc.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** class.uiwcm.inc.php 3 Feb 2002 15:16:22 -0000       1.1.1.1
--- class.uiwcm.inc.php 21 Feb 2002 12:26:24 -0000      1.2
***************
*** 15,18 ****
--- 15,23 ----
        class uiwcm
        {
+               var $public_functions = array(
+                       'index' => True,
+                       'admin' => True
+               );
+ 
                function uiwcm()
                {
***************
*** 24,32 ****
                        echo parse_navbar();
  
!                       echo '<br><a href="' . 
$GLOBALS['phpgw']->link('/index.php','menuaction=wcm.uielement.index') . '">' . 
lang('Edit Page Elements') . '</a>' . "\n";
!                       echo '<br><a href="' . 
$GLOBALS['phpgw']->link('/index.php','menuaction=wcm.uipage.index') . '">' . 
lang('Edit Site Pages') . '</a>' . "\n";
!                       echo '<br><a href="' . 
$GLOBALS['phpgw']->link('/index.php','menuaction=wcm.uisite.index') . '">' . 
lang('Edit Sites') . '</a>' . "\n";
  
!                       $GLOBALS['phpgw']->common->phpgw_footer();
                }
        }
--- 29,53 ----
                        echo parse_navbar();
  
!                       
$GLOBALS['phpgw']->template->set_file(array('app_header' => 'header.tpl'));
! 
!                       
$GLOBALS['phpgw']->template->set_var('lang_wcm',lang('wcm'));
!                       
$GLOBALS['phpgw']->template->set_var('th_bg',$GLOBALS['phpgw_info']['theme']['th_bg']);
! 
!                       
$GLOBALS['phpgw']->template->set_var('link_elements','<a href="' . 
$GLOBALS['phpgw']->link('/index.php','menuaction=wcm.uielement.index') . '">' . 
lang('Edit Page Elements') . '</a>');
!                       $GLOBALS['phpgw']->template->set_var('link_pages','<a 
href="' . $GLOBALS['phpgw']->link('/index.php','menuaction=wcm.uipage.index') . 
'">' . lang('Edit Site Pages'));
!                       $GLOBALS['phpgw']->template->set_var('link_sites','<a 
href="' . $GLOBALS['phpgw']->link('/index.php','menuaction=wcm.uisite.index') . 
'">' . lang('Edit Sites'));
! 
!                       $_referer = 
urlencode($GLOBALS['phpgw']->link('/index.php','menuaction=wcm.uiwcm.index'));
! 
!                       $GLOBALS['phpgw']->template->set_var('link_admin','<a 
href="' . 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiconfig.index&appname=wcm&referer='
 . $_referer) . '">' . lang('Admin') . '</a>');
  
!                       $GLOBALS['phpgw']->template->pfp('out','app_header');
!               }
! 
!               function admin()
!               {
!                       $GLOBALS['phpgw']->common->phpgw_header();
!                       echo parse_navbar();
!                       include(PHPGW_APP_INC . SEP . 'header.inc.php');
                }
        }