tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
zarzuelo 2013-06-03 11:10:20 +00:00
parent 5e1e3efe24
commit 9ef9bbc7c9
3 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/ChangeLog
View File

@ -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> 2013-05-31 Miguel de Dios <miguel.dedios@artica.es>
* mobile/include/style/main.css: fixed the list of modules in the * mobile/include/style/main.css: fixed the list of modules in the

5
pandora_console/include/styles/pandora.css
View File

@ -238,8 +238,9 @@ div#main_help a.footer {
color: #999; color: #999;
} }
a.footer{ a.footer, a.footer span{
font-size: 9px; font-size: 9px;
color: white;
} }
div#main_help div.databox hr{ div#main_help div.databox hr{
@ -275,7 +276,7 @@ div#foot {
padding-top: 8px; padding-top: 8px;
padding-bottom: 5px; padding-bottom: 5px;
text-align: center; text-align: center;
background: #111; background: #333333;
width: 960px; width: 960px;
height: 38px; height: 38px;
clear: both; clear: both;

19
pandora_console/index.php
View File

@ -549,10 +549,10 @@ else {
if ($config["pure"] == 0) { if ($config["pure"] == 0) {
echo '</div>'; //container div
echo '<div id="foot">'; echo '<div id="foot">';
require ("general/footer.php"); require ("general/footer.php");
echo '</div>'; echo '</div>';
echo '</div>'; //container div
} }
while (@ob_end_flush ()); 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 // Values from PHP to be recovered from JAVASCRIPT
require('include/php_to_js_values.php'); 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>