From 633bcb36d205e5876485b7d0130840a46256ebcd Mon Sep 17 00:00:00 2001
From: seek3r <seek3r@alumni.egroupware.org>
Date: Sat, 25 May 2002 06:54:12 +0000
Subject: [PATCH] updated idsociety so that the footer is always at the bottom
 of the page

---
 phpgwapi/templates/idsociety/footer.tpl     | 6 +++---
 phpgwapi/templates/idsociety/navbar.inc.php | 1 +
 phpgwapi/templates/idsociety/navbar.tpl     | 4 +---
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/phpgwapi/templates/idsociety/footer.tpl b/phpgwapi/templates/idsociety/footer.tpl
index d6246b5dd7..32db4b1e28 100644
--- a/phpgwapi/templates/idsociety/footer.tpl
+++ b/phpgwapi/templates/idsociety/footer.tpl
@@ -1,5 +1,8 @@
 <!-- BEGIN footer -->
 			<br>
+		</td>
+	</tr>
+</table>
 			<!-- BEGIN B_powered_bottom -->
 			<table border="0" cellspacing="0" cellpadding="0" width="100%">
 				<tr>
@@ -10,9 +13,6 @@
 			</table>
 				<!-- END B_powered_bottom -->
 			<p>&nbsp;</p>
-		</td>
-	</tr>
-</table>
 </BODY>
 <!-- END footer -->
 </HTML>
diff --git a/phpgwapi/templates/idsociety/navbar.inc.php b/phpgwapi/templates/idsociety/navbar.inc.php
index 847b60fbda..27dde82785 100644
--- a/phpgwapi/templates/idsociety/navbar.inc.php
+++ b/phpgwapi/templates/idsociety/navbar.inc.php
@@ -228,6 +228,7 @@
 				'power_textcolor'	=> $GLOBALS['phpgw_info']['theme']['navbar_text']
 //				'version'	=> $GLOBALS['phpgw_info']['server']['versions']['phpgwapi']
 			);
+			$var['em_img'] = $GLOBALS['phpgw']->common->image('phpgwapi','em');
 			$tpl->set_var($var);
  			$tpl->parse('V_powered_bottom','B_powered_bottom');
 		}
diff --git a/phpgwapi/templates/idsociety/navbar.tpl b/phpgwapi/templates/idsociety/navbar.tpl
index 2eac03a5fa..d97b40d572 100755
--- a/phpgwapi/templates/idsociety/navbar.tpl
+++ b/phpgwapi/templates/idsociety/navbar.tpl
@@ -9,7 +9,7 @@
   the margin items could be merged into head, as head already supplies some
   the variables for onLoad are set in navbar -->
 
-<table border="0" width="100%" height="73" cellspacing="0" cellpadding="0">
+<table border="0" width="100%" height="%95" cellspacing="0" cellpadding="0">
 	<tr>
 		<!-- top row back images are 58px high, but the row may be smaller than that -->
 		<!-- row 2 images are 15 px high, so this table with these 2 rows is 58 plus 15 equals 73px high  -->
@@ -55,8 +55,6 @@
 			</table>
 		</td>
 	</tr>
-</table>
-<table border="0" width="100%" height="100%" cellspacing="0" cellpadding="0">
 	<tr>
 		<td width="154" align="left" valign="top" background="{nav_bar_left_spacer_img}">
 			<!-- left nav table -->