Changeset 1363 for trunk/include

Timestamp:

Jun 18, 2006, 2:04:59 PM (18 years ago)

Author:

nikrou

Message:

Issue 426: first step; separation of admin and public into two templates
Need to simplify and delete files not needed

Location:

trunk/include

Files:

• common.inc.php (modified) (1 diff)
• functions.inc.php (modified) (1 diff)
• page_header.php (modified) (1 diff)

trunk/include/common.inc.php

@@ -202 +202 @@
 // TODO : replace initial $user['template'] by $user['layout']
 
+if (IN_ADMIN) 
+{
+  $template_root = 'admin';
+} 
+else 
+{
+  $template_root = 'public';
+}
 include(
   PHPWG_ROOT_PATH
-  .'template/'.$user['template']
+  .'template/'.$template_root.'/'.$user['template']
   .'/theme/'.$user['theme']
   .'/themeconf.inc.php'

trunk/include/functions.inc.php

@@ -598 +598 @@
  * returns available template/theme
  */
-function get_pwg_themes()
+function get_pwg_themes($template_root = 'public')
 {
   $themes = array();
 
-  $template_dir = PHPWG_ROOT_PATH.'template';
+  $template_dir = PHPWG_ROOT_PATH.'template'.'/'.$template_root;
 
   foreach (get_dirs($template_dir) as $template)

trunk/include/page_header.php

@@ -29 +29 @@
 // Start output of page
 //
-$template->set_filenames(array('header'=>'header.tpl'));
+if (IN_ADMIN)
+{
+  $template->set_rootdir(PHPWG_ROOT_PATH.'template/admin/'.$user['template']);
+  $template->set_filenames(array('header'=>'header.tpl'));
+}
+else
+{
+  $template->set_rootdir(PHPWG_ROOT_PATH.'template/public/'.$user['template']);
+  $template->set_filenames(array('header'=>'header.tpl'));
+}
 
 $template->assign_vars(