From 9ef9bbc7c9e17a51c8e42459c19e138042217936 Mon Sep 17 00:00:00 2001
From: zarzuelo <noreply@pandorafms.org>
Date: Mon, 3 Jun 2013 11:10:20 +0000
Subject: [PATCH] 2013-06-03  Sergio Martin <sergio.martin@artica.es>

	* include/styles/pandora.css
	index.php: Fix footer layout merged from 4.1



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8246 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
 pandora_console/ChangeLog                  |  5 +++++
 pandora_console/include/styles/pandora.css |  5 +++--
 pandora_console/index.php                  | 19 ++++++++++++++++++-
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 9468db72cf..ddac6b304b 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,8 @@
+2013-06-03  Sergio Martin <sergio.martin@artica.es>
+
+	* include/styles/pandora.css
+	index.php: Fix footer layout merged from 4.1
+
 2013-05-31 Miguel de Dios <miguel.dedios@artica.es>
 
 	* mobile/include/style/main.css: fixed the list of modules in the
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index ac95cbdc4c..5590a5b973 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -238,8 +238,9 @@ div#main_help a.footer {
 	color: #999;
 }
 
-a.footer{
+a.footer, a.footer span{
 	font-size: 9px;
+	color: white;
 }
 
 div#main_help div.databox hr{
@@ -275,7 +276,7 @@ div#foot {
 	padding-top: 8px;
 	padding-bottom: 5px;
 	text-align: center;
-	background: #111;
+	background: #333333;
 	width: 960px;
 	height: 38px;
 	clear: both;
diff --git a/pandora_console/index.php b/pandora_console/index.php
index b824a2c2ec..b9e1b8c3bb 100644
--- a/pandora_console/index.php
+++ b/pandora_console/index.php
@@ -549,10 +549,10 @@ else {
 
 
 if ($config["pure"] == 0) {
+	echo '</div>'; //container div
 	echo '<div id="foot">';
 	require ("general/footer.php");
 	echo '</div>';
-	echo '</div>'; //container div
 }
 while (@ob_end_flush ());
 
@@ -565,3 +565,20 @@ echo "\n<!-- Page generated in $run_time seconds -->\n";
 // Values from PHP to be recovered from JAVASCRIPT
 require('include/php_to_js_values.php');
 ?>
+
+<script type="text/javascript" language="javascript">
+//Initial load of page
+$(document).ready(sizeContent);
+
+//Every resize of window
+$(window).resize(sizeContent);
+
+//Dynamically assign height
+function sizeContent() {
+	var footposition_bottom = $('#foot').position().top + $("#foot").height();
+
+	if(footposition_bottom < $(window).height()) {		
+		$('#container').css('height', $(window).height() - $("#foot").height() - 15 + 'px');
+	}
+}
+</script>