From 988bc0bb88938680e3a371369e8b6319bc379cc5 Mon Sep 17 00:00:00 2001
From: skeeter <skeeter@alumni.egroupware.org>
Date: Sat, 6 Jan 2001 04:11:13 +0000
Subject: [PATCH] rename ->common->navbar() to parse_navbar

---
 admin/deleteapplication.php     | 2 +-
 admin/deletegroup.php           | 4 ++--
 admin/editaccount.php           | 2 +-
 admin/editapplication.php       | 2 +-
 admin/editgroup.php             | 2 +-
 admin/newaccount.php            | 2 +-
 admin/newapplication.php        | 2 +-
 admin/newgroup.php              | 2 +-
 calendar/edit_entry_handler.php | 2 +-
 calendar/inc/functions.inc.php  | 2 +-
 calendar/preferences.php        | 2 +-
 preferences/changepassword.php  | 4 ++--
 preferences/changetheme.php     | 2 +-
 13 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/admin/deleteapplication.php b/admin/deleteapplication.php
index f1f51116f9..deaceb7c76 100644
--- a/admin/deleteapplication.php
+++ b/admin/deleteapplication.php
@@ -26,7 +26,7 @@
   }
 
   $phpgw->common->phpgw_header();
-  $phpgw->common->navbar();
+  echo parse_navbar();
   ?>
      <center>
       <table border=0 with=65%>
diff --git a/admin/deletegroup.php b/admin/deletegroup.php
index 86fc531738..f9a63ccee5 100755
--- a/admin/deletegroup.php
+++ b/admin/deletegroup.php
@@ -45,7 +45,7 @@
      $phpgw->db->next_record();
      if ($phpgw->db->f(0) != 0) {
         $phpgw->common->phpgw_header();
-        $phpgw->common->navbar();
+        echo parse_navbar();
 
         echo '<p><center>';
 	   echo lang("Sorry, the follow users are still a member of the group x",$group_name)
@@ -86,7 +86,7 @@
   }
 
   $phpgw->common->phpgw_header();
-  $phpgw->common->navbar();
+  echo parse_navbar();
   ?>
      <center>
       <table border=0 with=65%>
diff --git a/admin/editaccount.php b/admin/editaccount.php
index f82c247660..9dc274ce17 100755
--- a/admin/editaccount.php
+++ b/admin/editaccount.php
@@ -125,7 +125,7 @@
   $phpgw->template->set_file(array("form" => "account_form.tpl"));
 
   $phpgw->common->phpgw_header();
-  $phpgw->common->navbar();
+  echo parse_navbar();
 
   if ($totalerrors) {
      $phpgw->template->set_var("error_messages","<center>" . $phpgw->common->error_list($error) . "</center>");
diff --git a/admin/editapplication.php b/admin/editapplication.php
index d5074a9621..9e1d2432c4 100644
--- a/admin/editapplication.php
+++ b/admin/editapplication.php
@@ -71,7 +71,7 @@
 
   if ($totalerrors) {
      $phpgw->common->phpgw_header();
-     $phpgw->common->navbar();
+     echo parse_navbar();
 
      $phpgw->template->set_var("error","<p><center>" . $phpgw->common->error_list($error) . "</center><br>");
   } else {
diff --git a/admin/editgroup.php b/admin/editgroup.php
index e1c6213078..e4d884d648 100755
--- a/admin/editgroup.php
+++ b/admin/editgroup.php
@@ -104,7 +104,7 @@
 
   if ($error) {
      $phpgw->common->phpgw_header();
-     $phpgw->common->navbar();
+     echo parse_navbar();
      $phpgw->template->set_var("error","<p><center>$error</center>");
   } else {
      $phpgw->template->set_var("error","");
diff --git a/admin/newaccount.php b/admin/newaccount.php
index e790584018..18c888f999 100755
--- a/admin/newaccount.php
+++ b/admin/newaccount.php
@@ -88,7 +88,7 @@
   $phpgw->template->set_file(array("form"	=> "account_form.tpl"));
 
   $phpgw->common->phpgw_header();
-  $phpgw->common->navbar();
+  echo parse_navbar();
 
   $phpgw->template->set_var("lang_action",lang("Add new account"));
 
diff --git a/admin/newapplication.php b/admin/newapplication.php
index baf255c031..6a328ebaa1 100644
--- a/admin/newapplication.php
+++ b/admin/newapplication.php
@@ -69,7 +69,7 @@
      $phpgw->template->set_var("error","");
   }
   $phpgw->common->phpgw_header();
-  $phpgw->common->navbar();
+  echo parse_navbar();
 
   $phpgw->template->set_var("lang_header",lang("Add new application"));
   $phpgw->template->set_var("th_bg",$phpgw_info["theme"]["th_bg"]);
diff --git a/admin/newgroup.php b/admin/newgroup.php
index b4f5a6b8d4..c7d6d45bea 100755
--- a/admin/newgroup.php
+++ b/admin/newgroup.php
@@ -93,7 +93,7 @@
 
   if ($error) {
      $phpgw->common->phpgw_header();
-     $phpgw->common->navbar();
+     echo parse_navbar();
      $phpgw->template->set_var("error","<p><center>$error</center>");
   } else {
      $phpgw->template->set_var("error","");
diff --git a/calendar/edit_entry_handler.php b/calendar/edit_entry_handler.php
index 892318cf42..02bc90137e 100755
--- a/calendar/edit_entry_handler.php
+++ b/calendar/edit_entry_handler.php
@@ -89,7 +89,7 @@
     Header("Location: ".$phpgw->link("edit_entry.php","readsess=".$cal_info->id."&cd=".$datetime_check));
   } elseif($overlapping_events) {
     $phpgw->common->phpgw_header();
-    $phpgw->common->navbar();
+    echo parse_navbar();
     $phpgw->template->set_file(array("overlap" => "overlap.tpl",
 				   "form_button"     => "form_button_script.tpl"));
 
diff --git a/calendar/inc/functions.inc.php b/calendar/inc/functions.inc.php
index a5ca8d1e51..292216543e 100755
--- a/calendar/inc/functions.inc.php
+++ b/calendar/inc/functions.inc.php
@@ -935,7 +935,7 @@
       $str .= "</tr>";
       $str .= "<tr>";
       for($i=0;$i<7;$i++) {
-	$str .= "<td bgcolor=\"".$phpgw_info["theme"]["cal_dayview"]."\".<font size=\"-2\">".substr(lang($days[$i]),0,2)."</td>";
+	$str .= "<td bgcolor=\"".$phpgw_info["theme"]["cal_dayview"]."\"><font size=\"-2\">".substr(lang($days[$i]),0,2)."</td>";
       }
       $str .= "</tr>";
       for($i=$weekstarttime;date("Ymd",$i)<=$monthend;$i += (24 * 3600 * 7)) {
diff --git a/calendar/preferences.php b/calendar/preferences.php
index dbb41e5e63..c13c69c17e 100644
--- a/calendar/preferences.php
+++ b/calendar/preferences.php
@@ -32,7 +32,7 @@
   }
 
   $phpgw->common->phpgw_header();
-  $phpgw->common->navbar();
+  echo parse_navbar();
 
   if ($totalerrors) {  
      echo "<p><center>" . $phpgw->common->error_list($errors) . "</center>";
diff --git a/preferences/changepassword.php b/preferences/changepassword.php
index edf0ab55f8..0cf5e6e5d8 100755
--- a/preferences/changepassword.php
+++ b/preferences/changepassword.php
@@ -24,7 +24,7 @@
 
   if (! $submit) {
      $phpgw->common->phpgw_header();
-     $phpgw->common->navbar();
+     echo parse_navbar();
 
     ?>
    <form method="POST" acion="<?php echo $phpgw->link("changepassword.php"); ?>">
@@ -68,7 +68,7 @@
     $error = lang("you must enter a password");
 
   if ($error) {
-    $phpgw->common->navbar();
+    echo parse_navbar();
     echo "<p><br>$error</p>";
     $phpgw->common->phpgw_exit();
   }
diff --git a/preferences/changetheme.php b/preferences/changetheme.php
index 91e900369f..49dd33a737 100755
--- a/preferences/changetheme.php
+++ b/preferences/changetheme.php
@@ -36,7 +36,7 @@
   }
 
   $phpgw->common->phpgw_header();
-  $phpgw->common->navbar();
+  echo parse_navbar();
 
   echo "<br>" . lang("your current theme is: x",$phpgw_info["user"]["preferences"]["theme"]);
   echo "<br>" . lang("please, select a new theme") . ":";