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

2013-04-15 Miguel de Dios <miguel.dedios@artica.es> 

* include/functions_html.php, include/javascript/jquery.pandora.js:
	improved the source code style.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7983 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-04-15 14:32:50 +00:00
parent 5830c04c0a
commit 9b705e4643
3 changed files with 16 additions and 11 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-04-15 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_html.php, include/javascript/jquery.pandora.js:
improved the source code style.
2013-04-15 Sergio Martin <sergio.martin@artica.es> 2013-04-15 Sergio Martin <sergio.martin@artica.es>
* include/functions_html.php * include/functions_html.php

4
pandora_console/include/functions_html.php
View File

@ -1640,7 +1640,7 @@ function html_print_image ($src, $return = false, $options = false, $return_src
// If metaconsole is activated and image doesn't exists try to search on normal console // If metaconsole is activated and image doesn't exists try to search on normal console
if (defined('METACONSOLE')) { if (defined('METACONSOLE')) {
if (!$relative) { if (!$relative) {
if (false === @file_get_contents($src,0,null,0,1)) { if (false === @file_get_contents($src, 0, null, 0, 1)) {
$src = ui_get_full_url('../../' . $src_tmp); $src = ui_get_full_url('../../' . $src_tmp);
} }
} }
@ -1658,7 +1658,7 @@ function html_print_image ($src, $return = false, $options = false, $return_src
return io_safe_input($src); return io_safe_input($src);
} }
$output = '<img src="'.$src.'" '; // Dont use safe_input here or the performance will dead $output = '<img src="' . $src . '" '; // Dont use safe_input here or the performance will dead
$style = ''; $style = '';
if (!empty ($options)) { if (!empty ($options)) {

6
pandora_console/include/javascript/jquery.pandora.js
View File

@ -214,20 +214,20 @@ function forced_title_callback() {
// Deduct padding of both sides // Deduct padding of both sides
var layer_top = img_top - layer_height - (layer_padding * 2) - 5; var layer_top = img_top - layer_height - (layer_padding * 2) - 5;
if(layer_top < 0) { if (layer_top < 0) {
layer_top = img_top + img_height + (layer_padding * 2); layer_top = img_top + img_height + (layer_padding * 2);
} }
// Deduct padding of one side // Deduct padding of one side
var layer_left = img_left_mid - (layer_width / 2) - layer_padding; var layer_left = img_left_mid - (layer_width / 2) - layer_padding;
if(layer_left < 0) { if (layer_left < 0) {
layer_left = 0; layer_left = 0;
} }
var real_layer_width = layer_width + (layer_padding * 2) + 5; var real_layer_width = layer_width + (layer_padding * 2) + 5;
var layer_right = layer_left + real_layer_width; var layer_right = layer_left + real_layer_width;
var screen_width = $(window).width(); var screen_width = $(window).width();
if(screen_width < layer_right) { if (screen_width < layer_right) {
layer_left = screen_width - real_layer_width; layer_left = screen_width - real_layer_width;
} }