[Openfirst-cvscommit] base/style headers.php,1.10,1.11

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/openfirst/base/style
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24888/style

Modified Files:
	headers.php 
Log Message:
changed global site title to $ogSiteTitle, $Title is page-specific. Added $ogMoreHeadItems.

Index: headers.php
===================================================================
RCS file: /cvsroot/openfirst/base/style/headers.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** headers.php	21 Nov 2005 20:26:09 -0000	1.10
--- headers.php	22 Nov 2005 16:32:20 -0000	1.11
***************
*** 3,12 ****

  global $BasePath, $ogModuleManager, $ogMoreStyles, $Home, $ogCurrentModule;
! global $Title, $usersonline, $ogUser, $StylePath;

  if(! isset($BasePath)){
    $BasePath = 'http://openfirst.sourceforge.net';
    $StylePath = 'http://openfirst.sourceforge.net/style';
!   $title = "openFIRST Team";
  } else {
    $headerlinks = array();
--- 3,12 ----

  global $BasePath, $ogModuleManager, $ogMoreStyles, $Home, $ogCurrentModule;
! global $Title, $ogSiteTitle, $ogMoreHeadItems, $usersonline, $ogUser, $StylePath;

  if(! isset($BasePath)){
    $BasePath = 'http://openfirst.sourceforge.net';
    $StylePath = 'http://openfirst.sourceforge.net/style';
!   $Title = "openFIRST Team";
  } else {
    $headerlinks = array();
***************
*** 15,19 ****
        $module =& $ogModuleManager->getModuleFromDir($dir);
        if ($module->getActive() && $module->getShowOnMenu()) {
!         if ($ogCurrentModule->getDir() == $dir){
            $CurrentModule =& $thisModule;
            $headerlinks[] = ' &raquo; <a class="menu selected" href="'.htmlentities("$BasePath/$dir").'">'.htmlentities($module->getName()).'</a>
--- 15,19 ----
        $module =& $ogModuleManager->getModuleFromDir($dir);
        if ($module->getActive() && $module->getShowOnMenu()) {
!         if (is_object($ogCurrentModule) && $ogCurrentModule->getDir() == $dir){
            $CurrentModule =& $thisModule;
            $headerlinks[] = ' &raquo; <a class="menu selected" href="'.htmlentities("$BasePath/$dir").'">'.htmlentities($module->getName()).'</a>
***************
*** 36,40 ****
  <html>
   <head>
!   <title><?php echo htmlentities($Title); ?></title>
    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
    <meta http-equiv="Content-Language" content="en" />
--- 36,48 ----
  <html>
   <head>
!   <title><?php
!     $rtitle = array();
!     if (isset($Title)) $rtitle[] = $Title;
!     if (isset($ogSiteTitle)) $rtitle[] = $ogSiteTitle;
!     $rtitle = implode(' :: ', $rtitle);
!     if ($rtitle == '') $rtitle = 'openFIRST';
!     echo htmlentities($rtitle);
!     unset($rtitle);
!   ?></title>
    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
    <meta http-equiv="Content-Language" content="en" />
***************
*** 44,47 ****
--- 52,60 ----
    <link rel="stylesheet" type="text/css" href="<?php echo htmlentities($StylePath); ?>/style.css" />
    <?php
+   if (isset($ogMoreHeadItems) && is_array($ogMoreHeadItems)) {
+     foreach($ogMoreHeadItems as $i) {
+       echo $i;
+     }
+   }    
    if (isset($ogMoreStyles) && trim($ogMoreStyles) != '') {
      echo '<style type="text/css">
***************
*** 88,97 ****

    // Check if module name has been set then echo
!   if(isset($ogCurrentModule) && !$ogCurrentModule->isBase()){
      echo '<b>'.htmlentities($ogCurrentModule->getName()).'</b> &ndash; ';
    }

    // Check if navigation bar option is set then echo options
!   if (isset($ogCurrentModule) && ($nav = $ogCurrentModule->getNavBar())) {

      // Output module navigation bar
--- 101,110 ----

    // Check if module name has been set then echo
!   if (is_object($ogCurrentModule) && !$ogCurrentModule->isBase()){
      echo '<b>'.htmlentities($ogCurrentModule->getName()).'</b> &ndash; ';
    }

    // Check if navigation bar option is set then echo options
!   if (is_object($ogCurrentModule) && ($nav = $ogCurrentModule->getNavBar())) {

      // Output module navigation bar
***************
*** 107,111 ****
      echo $usersonline;
    } else {
!     echo "Welcome to the <b>$Title</b> website!";
    }

--- 120,124 ----
      echo $usersonline;
    } else {
!     echo "Welcome to the <b>$ogSiteTitle</b> website!";
    }