From 54251c3fea6e048138ac9e7f7d2e8b33c473ff10 Mon Sep 17 00:00:00 2001
From: skeeter <skeeter@alumni.egroupware.org>
Date: Mon, 8 Jan 2001 04:35:04 +0000
Subject: [PATCH] Fixes for home portal pages

---
 calendar/inc/hook_home.inc.php              | 4 ++--
 index.php                                   | 3 +--
 phpgwapi/templates/default/portal_main.tpl  | 2 --
 phpgwapi/templates/verdilak/portal_main.tpl | 2 --
 4 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/calendar/inc/hook_home.inc.php b/calendar/inc/hook_home.inc.php
index 6ce16786ee..89e7faae23 100755
--- a/calendar/inc/hook_home.inc.php
+++ b/calendar/inc/hook_home.inc.php
@@ -10,14 +10,14 @@
 
   if ($phpgw_info["user"]["preferences"]["calendar"]["mainscreen_showevents"]) {
     include($phpgw_info["server"]["app_inc"].'/functions.inc.php');
-    echo '<!-- Calendar info -->'."\n";
+    echo "\n".'<tr><td align="left"><!-- Calendar info -->'."\n";
     echo $phpgw->calendar->mini_calendar($phpgw->calendar->today["day"],$phpgw->calendar->today["month"],$phpgw->calendar->today["year"],"day.php");
     $now = $phpgw->calendar->splitdate(mktime (0, 0, 0, $phpgw->calendar->today["month"], $phpgw->calendar->today["day"], $phpgw->calendar->today["year"]) - ((60 * 60) * $phpgw_info["user"]["preferences"]["common"]["tz_offset"]));
     echo '<table border="0" width="70%" cellspacing="0" cellpadding="0"><tr><td align="center">'
 	    . lang(date("F",$phpgw->calendar->today["raw"])).' '.$phpgw->calendar->today["day"].', '.$phpgw->calendar->today["year"].'</tr></td>'
         . '<tr><td bgcolor="'.$phpgw_info["theme"]["bg_text"].'" valign="top">'
 	    . $phpgw->calendar->print_day_at_a_glance($now).'</td></tr></table>'."\n";
-    echo '<!-- Calendar info -->'."\n";
+    echo "\n".'<!-- Calendar info --></td></tr>'."\n";
     unset($phpgw->calendar);
   } 
 
diff --git a/index.php b/index.php
index 098c9c30a3..9e99af69eb 100755
--- a/index.php
+++ b/index.php
@@ -109,8 +109,6 @@
 	   . "http://www.phpgroupware.org\">http://www.phpgroupware.org</a>";
      }
   }
-
-  echo '<p><table border="0" width="100%" align="center">';
 ?>
  <script langague="JavaScript">
     function opennotifywindow()
@@ -120,6 +118,7 @@
  </script>
 
 <?php
+  echo '<p><table border="0" width="100%" align="center">';
   //echo '<a href="javascript:opennotifywindow()">Open notify window</a>';
   
   if ($phpgw_info["user"]["apps"]["stocks"] && $phpgw_info["user"]["preferences"]["stocks"]["enabled"]) {
diff --git a/phpgwapi/templates/default/portal_main.tpl b/phpgwapi/templates/default/portal_main.tpl
index 75d3d28e35..57434c5155 100755
--- a/phpgwapi/templates/default/portal_main.tpl
+++ b/phpgwapi/templates/default/portal_main.tpl
@@ -6,9 +6,7 @@
   <td>
    <table border="1" cellpadding="0" cellspacing="0" width="{inner_width}" bgcolor="{inner_bgcolor}">
     <tr>
-     <td>
 {output}
-     </td>
     </tr>
    </table>
   </td>
diff --git a/phpgwapi/templates/verdilak/portal_main.tpl b/phpgwapi/templates/verdilak/portal_main.tpl
index 75d3d28e35..57434c5155 100755
--- a/phpgwapi/templates/verdilak/portal_main.tpl
+++ b/phpgwapi/templates/verdilak/portal_main.tpl
@@ -6,9 +6,7 @@
   <td>
    <table border="1" cellpadding="0" cellspacing="0" width="{inner_width}" bgcolor="{inner_bgcolor}">
     <tr>
-     <td>
 {output}
-     </td>
     </tr>
    </table>
   </td>