Skip to content
This repository has been archived by the owner on Apr 4, 2024. It is now read-only.

Commit

Permalink
Merge cb22f97 into 031d86b
Browse files Browse the repository at this point in the history
  • Loading branch information
David Durieux committed Nov 2, 2016
2 parents 031d86b + cb22f97 commit 565fbcf
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 4 deletions.
5 changes: 5 additions & 0 deletions css/views.css
Original file line number Diff line number Diff line change
Expand Up @@ -784,4 +784,9 @@ table.runs td.comment {
background-image: url('../../../plugins/fusioninventory/pics/lock.png');
background-repeat: no-repeat;
background-position: right;
}

.copyleft {
display:inline-block;
transform: rotate(180deg);
}
11 changes: 11 additions & 0 deletions js/footer.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
var fifooter = "<br/> \
<a class='copyright' href='http://fusioninventory.org/'> \
FusionInventory 9.1+1.0 - Copyleft \
<span style='display:inline-block;transform: rotate(180deg);font-size: 12px;'>&copy;</span> \
2010-2016 by FusionInventory Team \
</a>";

$(window).bind("load", function() {
$('#footer').css('height', 'auto');
$("#footer td.right").append(fifooter);
});
Binary file removed pics/copyleft.png
Binary file not shown.
5 changes: 1 addition & 4 deletions setup.php
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,7 @@ function plugin_init_fusioninventory() {
"lib/expanding/expanding".($debug_mode?"":".min").".js"
);
}
$PLUGIN_HOOKS['add_javascript']['fusioninventory'][] = 'js/footer.js';
if (script_endswith("timeslot.form.php")) {
$PLUGIN_HOOKS['add_javascript']['fusioninventory'][] = "lib/timeslot".($debug_mode?"":".min").".js";
}
Expand Down Expand Up @@ -389,10 +390,6 @@ function plugin_init_fusioninventory() {
}

if (isset($_SESSION["glpiname"])) {
if (strstr(filter_input(INPUT_SERVER, "SCRIPT_NAME"), '/front/')
&& !strstr(filter_input(INPUT_SERVER, "SCRIPT_NAME"), 'report.dynamic.php')) {
register_shutdown_function('plugin_fusioninventory_footer', $CFG_GLPI['root_doc']);
}
$report_list = array();
if (Session::haveRight('plugin_fusioninventory_reportprinter', READ)) {
$report_list["front/printerlogreport.php"] = __('Printed page counter', 'fusioninventory');
Expand Down

0 comments on commit 565fbcf

Please sign in to comment.