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

2014-08-03 Junichi Satoh <junichi@rworks.jp> 

* include/functions_ui.php: Fixed that the fast forward and the going
	to the last of pagination doesn't work in the modal window for module
	data display.
	And fixed incorrect offset calculation for the fast forward.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10373 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
jsatoh 2014-08-03 01:52:06 +00:00
parent 5a0ab35647
commit 676e9b66d6
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/ChangeLog
View File

@ -1,3 +1,10 @@
2014-08-03 Junichi Satoh <junichi@rworks.jp>
* include/functions_ui.php: Fixed that the fast forward and the going
to the last of pagination doesn't work in the modal window for module
data display.
And fixed incorrect offset calculation for the fast forward.
2014-08-02 Junichi Satoh <junichi@rworks.jp>
* operation/agentes/estado_monitores.php: Fixed that module data

21
pandora_console/include/functions_ui.php
View File

@ -1576,9 +1576,9 @@ function ui_pagination ($count, $url = false, $offset = 0, $pagination = 0, $ret
// Show GOTO FIRST button
if ($other_class == '') {
$output .= '<a class="pagination go_first" href="'.$url.'&amp;'.$offset_name.'=0">'.html_print_image ("images/go_first.png", true, array ("class" => "bot")).'</a>&nbsp;';
$output .= '<a class="pagination offset_0" href="'.$url.'&amp;' .$offset_name.'=0">'.html_print_image ("images/go_first.png", true, array ("class" => "bot")).'</a>&nbsp;';
} else {
$output .= "<a class='pagination $other_class go_first' href='$url.&amp;$offset_name=0'>".html_print_image ("images/go_first.png", true, array ("class" => "bot"))."</a>&nbsp;";
$output .= "<a class='pagination $other_class offset_0' href='$url.&amp;$offset_name=0'>".html_print_image ("images/go_first.png", true, array ("class" => "bot"))."</a>&nbsp;";
}
// Show PREVIOUS button
@ -1588,9 +1588,9 @@ function ui_pagination ($count, $url = false, $offset = 0, $pagination = 0, $ret
$index_page_prev = 0;
if ($other_class == '') {
$output .= '<a class="pagination go_rewind" href="'.$url.'&amp;'.$offset_name.'='.$index_page_prev.'">'.html_print_image ("images/go_previous.png", true, array ("class" => "bot")).'</a>';
$output .= '<a class="pagination offset_' . $index_page_prev . '" href="'.$url.'&amp;'.$offset_name.'='.$index_page_prev.'">'.html_print_image ("images/go_previous.png", true, array ("class" => "bot")).'</a>';
} else {
$output .= "<a class='pagination $other_class go_rewind' href='$url &amp;$offset_name = $index_page_prev'>".html_print_image ("images/go_previous.png", true, array ("class" => "bot"))."</a>";
$output .= "<a class='pagination $other_class offset_$index_page_prev' href='$url &amp;$offset_name = $index_page_prev'>".html_print_image ("images/go_previous.png", true, array ("class" => "bot"))."</a>";
}
}
@ -1629,13 +1629,12 @@ function ui_pagination ($count, $url = false, $offset = 0, $pagination = 0, $ret
// Index_counter stores max of blocks
if (($paginacion_maxima == 1) AND (($index_counter - $i) > 0)) {
$prox_bloque = ($i + ceil ($block_limit / 2)) * $pagination;
if ($prox_bloque > $count)
$prox_bloque = ($count -1) - $pagination;
if ($prox_bloque >= $count)
$prox_bloque = (int) (($count - 1) / $pagination) * $pagination;
if ($other_class == '') {
$output .= '<a class="pagination go_fastforward" href="'.$url.'&amp;'.$offset_name.'='.$prox_bloque.'">'.html_print_image ("images/go_next.png", true, array ("class" => "bot")).'</a>';
$output .= '<a class="pagination offset_' . $prox_bloque . '" href="'.$url.'&amp;'.$offset_name.'='.$prox_bloque.'">'.html_print_image ("images/go_next.png", true, array ("class" => "bot")).'</a>';
} else {
$output .= "<a class='pagination $other_class go_fastforward' href='$url&amp;$offset_name=$prox_bloque'>".html_print_image ("images/go_next.png", true, array ("class" => "bot"))."</a>";
$output .= "<a class='pagination $other_class offset_$prox_bloque' href='$url&amp;$offset_name=$prox_bloque'>".html_print_image ("images/go_next.png", true, array ("class" => "bot"))."</a>";
}
$i = $index_counter;
}
@ -1647,9 +1646,9 @@ function ui_pagination ($count, $url = false, $offset = 0, $pagination = 0, $ret
$myoffset = floor (($count - 1) / $pagination) * $pagination;
if ($other_class == '') {
$output .= '<a class="pagination go_last" href="'.$url.'&amp;'.$offset_name.'='.$myoffset.'">'.html_print_image ("images/go_last.png", true, array ("class" => "bot")).'</a>';
$output .= '<a class="pagination offset_' . $myoffset . '" href="'.$url. '&amp;'.$offset_name.'='.$myoffset.'">'.html_print_image ("images/go_last.png", true, array ("class" => "bot")).'</a>';
} else {
$output .= "<a class='pagination $other_class go_last' href='$url&amp;$offset_name=$myoffset'>".html_print_image ("images/go_last.png", true, array ("class" => "bot"))."</a>";
$output .= "<a class='pagination $other_class offset_$myoffset' href='$url&amp;$offset_name=$myoffset'>".html_print_image ("images/go_last.png", true, array ("class" => "bot"))."</a>";
}
}