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

Merge branch '813-Footer-no-muestra-la-versión-correctamente' into 'develop' 

Show package version rather build version in footer (ext. fix update manager css) - #813

See merge request !454
This commit is contained in:
vgilc 2017-05-17 17:51:25 +02:00
parent 4cee2eaea8 746eab7666
commit 19a76701a3
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/general/alert_enterprise.php
View File

@ -185,7 +185,7 @@ echo "
</div>";
if($open){
echo "<div class='modalgobutton gopandora'>
<span class='modalokbuttontext'>About Enterprise</span>
<span class='modalgobuttontext'>About Enterprise</span>
</div>";
}

10
pandora_console/general/footer.php
View File

@ -32,7 +32,15 @@ if (!$config["MR"]) {
echo '<a class="white_bold footer" target="_blank" href="' . $config["homeurl"] . $license_file. '">';
echo sprintf(__('Pandora FMS %s - Build %s - MR %s', $pandora_version, $build_version, $config["MR"]));
if($current_package == 0){
$build_package_version = $build_version;
}
else{
$build_package_version = $current_package;
}
echo sprintf(__('Pandora FMS %s - Build %s - MR %s', $pandora_version, $build_package_version, $config["MR"]));
echo '</a><br />';
echo '<a class="white footer">'. __('Page generated at') . ' '. date('F j, Y h:i a'); //Always use timestamp here

2
pandora_console/godmode/update_manager/update_manager.online.php
View File

@ -147,7 +147,7 @@ var open = "<?php echo $open;?>";
if(open){
$(document).ready(function() {
$('body').append( "<div id='opacidad' style='position:fixed;background:black;opacity:0.6;z-index:1'></div>" );
jQuery.get ("ajax.php",
jQuery.post ("ajax.php",
{
"page": "general/alert_enterprise",
"message":"infomodal"},