From: Florian G. <re...@us...> - 2008-07-03 23:50:37
|
Update of /cvsroot/perfparse/_perfparse-phpgui/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23252/phpgui/templates Modified Files: all_bin.tpl.html all_raw.tpl.html Log Message: Fixed biug while sorting in raw and bin reports. Added RFS from Christian Viesser about sorting service. Fixed default sort order (ascending hosts). Index: all_raw.tpl.html =================================================================== RCS file: /cvsroot/perfparse/_perfparse-phpgui/templates/all_raw.tpl.html,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** all_raw.tpl.html 23 Jan 2008 22:33:53 -0000 1.11 --- all_raw.tpl.html 3 Jul 2008 23:50:43 -0000 1.12 *************** *** 43,56 **** <tr> <td bgcolor="#FFFFCC" align=center><font face="Arial, Helvetica" size=2> ! <a href="perfparse.php?page=all_raw&group_name={$group_name}&sort=host%5Fname%2Easc"> <img src="{$http_image_path}inc{if $sort=="host_name.asc"}1{else}0{/if}.png" border=0></a> ! <a href="perfparse.php?page=all_raw&group_name={$group_name}&sort=host%5Fname%2Edesc"> <img src="{$http_image_path}dec{if $sort=="host_name.desc"}1{else}0{/if}.png" border=0></a> {tr}Host{/tr} </td> <td bgcolor="#FFFFCC" align=center><font face="Arial, Helvetica" size=2> ! <a href="perfparse.php?page=all_raw&group_name={$group_name}&sort=service%5Fdescription%2Easc"> <img src="{$http_image_path}inc{if $sort=="service_description.asc"}1{else}0{/if}.png" border=0></a> ! <a href="perfparse.php?page=all_raw&group_name={$group_name}&sort=service%5Fdescription%2Edesc"> <img src="{$http_image_path}dec{if $sort=="service_description.desc"}1{else}0{/if}.png" border=0></a> {tr}Service{/tr} --- 43,56 ---- <tr> <td bgcolor="#FFFFCC" align=center><font face="Arial, Helvetica" size=2> ! <a href="perfparse.php?page=all_raw&group_id={$group_id}&sort=host%5Fname%2Easc&normal={$normal}&warning={$warning}&critical={$critical}&unknown={$unknown}"> <img src="{$http_image_path}inc{if $sort=="host_name.asc"}1{else}0{/if}.png" border=0></a> ! <a href="perfparse.php?page=all_raw&group_id={$group_id}&sort=host%5Fname%2Edesc&normal={$normal}&warning={$warning}&critical={$critical}&unknown={$unknown}"> <img src="{$http_image_path}dec{if $sort=="host_name.desc"}1{else}0{/if}.png" border=0></a> {tr}Host{/tr} </td> <td bgcolor="#FFFFCC" align=center><font face="Arial, Helvetica" size=2> ! <a href="perfparse.php?page=all_raw&group_id={$group_id}&sort=service%5Fdescription%2Easc&normal={$normal}&warning={$warning}&critical={$critical}&unknown={$unknown}"> <img src="{$http_image_path}inc{if $sort=="service_description.asc"}1{else}0{/if}.png" border=0></a> ! <a href="perfparse.php?page=all_raw&group_id={$group_id}&sort=service%5Fdescription%2Edesc&normal={$normal}&warning={$warning}&critical={$critical}&unknown={$unknown}"> <img src="{$http_image_path}dec{if $sort=="service_description.desc"}1{else}0{/if}.png" border=0></a> {tr}Service{/tr} *************** *** 60,73 **** </td> <td bgcolor="#FFFFCC" align=center width="1%"><font face="Arial, Helvetica" size=2> ! <a href="perfparse.php?page=all_raw&group_name={$group_name}&sort=ctime%2Easc"> <img src="{$http_image_path}inc{if $sort=="ctime.asc"}1{else}0{/if}.png" border=0></a> ! <a href="perfparse.php?page=all_raw&group_name={$group_name}&sort=ctime%2Edesc"> <img src="{$http_image_path}dec{if $sort=="ctime.desc"}1{else}0{/if}.png" border=0></a> {tr}Last Reading{/tr} </td> <td bgcolor="#FFFFCC" align=center><font face="Arial, Helvetica" size=2> ! <a href="perfparse.php?page=all_raw&group_name={$group_name}&sort=txt_data%2Easc"> <img src="{$http_image_path}inc{if $sort=="txt_data.asc"}1{else}0{/if}.png" border=0></a> ! <a href="perfparse.php?page=all_raw&group_name={$group_name}&sort=txt_data%2Edesc"> <img src="{$http_image_path}dec{if $sort=="txt_data.desc"}1{else}0{/if}.png" border=0></a> {tr}Plugin Output{/tr} --- 60,73 ---- </td> <td bgcolor="#FFFFCC" align=center width="1%"><font face="Arial, Helvetica" size=2> ! <a href="perfparse.php?page=all_raw&group_id={$group_id}&sort=ctime%2Easc&normal={$normal}&warning={$warning}&critical={$critical}&unknown={$unknown}"> <img src="{$http_image_path}inc{if $sort=="ctime.asc"}1{else}0{/if}.png" border=0></a> ! <a href="perfparse.php?page=all_raw&group_id={$group_id}&sort=ctime%2Edesc&normal={$normal}&warning={$warning}&critical={$critical}&unknown={$unknown}"> <img src="{$http_image_path}dec{if $sort=="ctime.desc"}1{else}0{/if}.png" border=0></a> {tr}Last Reading{/tr} </td> <td bgcolor="#FFFFCC" align=center><font face="Arial, Helvetica" size=2> ! <a href="perfparse.php?page=all_raw&group_id={$group_id}&sort=txt_data%2Easc&normal={$normal}&warning={$warning}&critical={$critical}&unknown={$unknown}"> <img src="{$http_image_path}inc{if $sort=="txt_data.asc"}1{else}0{/if}.png" border=0></a> ! <a href="perfparse.php?page=all_raw&group_id={$group_id}&sort=txt_data%2Edesc&normal={$normal}&warning={$warning}&critical={$critical}&unknown={$unknown}"> <img src="{$http_image_path}dec{if $sort=="txt_data.desc"}1{else}0{/if}.png" border=0></a> {tr}Plugin Output{/tr} Index: all_bin.tpl.html =================================================================== RCS file: /cvsroot/perfparse/_perfparse-phpgui/templates/all_bin.tpl.html,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** all_bin.tpl.html 23 Jan 2008 22:33:53 -0000 1.11 --- all_bin.tpl.html 3 Jul 2008 23:50:43 -0000 1.12 *************** *** 43,56 **** <tr> <td bgcolor="#FFFFCC" align=center><font face="Arial, Helvetica" size=2> ! <a href="perfparse.php?page=all_bin&group_name={$group_name}&sort=host%5Fname%2Easc"> <img src="{$http_image_path}inc{if $sort=="host_name.asc"}1{else}0{/if}.png" border=0></a> ! <a href="perfparse.php?page=all_bin&group_name={$group_name}&sort=host%5Fname%2Edesc"> <img src="{$http_image_path}dec{if $sort=="host_name.desc"}1{else}0{/if}.png" border=0></a> {tr}Host{/tr} </td> <td bgcolor="#FFFFCC" align=center><font face="Arial, Helvetica" size=2> ! <a href="perfparse.php?page=all_bin&group_name={$group_name}&sort=service%5Fdescription%2Easc"> <img src="{$http_image_path}inc{if $sort=="service_description.asc"}1{else}0{/if}.png" border=0></a> ! <a href="perfparse.php?page=all_bin&group_name={$group_name}&sort=service%5Fdescription%2Edesc"> <img src="{$http_image_path}dec{if $sort=="service_description.desc"}1{else}0{/if}.png" border=0></a> {tr}Service{/tr} --- 43,56 ---- <tr> <td bgcolor="#FFFFCC" align=center><font face="Arial, Helvetica" size=2> ! <a href="perfparse.php?page=all_bin&group_id={$group_id}&sort=host%5Fname%2Easc"> <img src="{$http_image_path}inc{if $sort=="host_name.asc"}1{else}0{/if}.png" border=0></a> ! <a href="perfparse.php?page=all_bin&group_id={$group_id}&sort=host%5Fname%2Edesc"> <img src="{$http_image_path}dec{if $sort=="host_name.desc"}1{else}0{/if}.png" border=0></a> {tr}Host{/tr} </td> <td bgcolor="#FFFFCC" align=center><font face="Arial, Helvetica" size=2> ! <a href="perfparse.php?page=all_bin&group_id={$group_id}&sort=service%5Fdescription%2Easc"> <img src="{$http_image_path}inc{if $sort=="service_description.asc"}1{else}0{/if}.png" border=0></a> ! <a href="perfparse.php?page=all_bin&group_id={$group_id}&sort=service%5Fdescription%2Edesc"> <img src="{$http_image_path}dec{if $sort=="service_description.desc"}1{else}0{/if}.png" border=0></a> {tr}Service{/tr} *************** *** 60,87 **** </td> <td bgcolor="#FFFFCC" align=center><font face="Arial, Helvetica" size=2> ! <a href="perfparse.php?page=all_bin&group_name={$group_name}&sort=metric%2Easc"> <img src="{$http_image_path}inc{if $sort=="metric.asc"}1{else}0{/if}.png" border=0></a> ! <a href="perfparse.php?page=all_bin&group_name={$group_name}&sort=metric%2Edesc"> <img src="{$http_image_path}dec{if $sort=="metric.desc"}1{else}0{/if}.png" border=0></a> {tr}Metric{/tr} </td> <td bgcolor="#FFFFCC" align=center width="1%"><font face="Arial, Helvetica" size=2> ! <a href="perfparse.php?page=all_bin&group_name={$group_name}&sort=ctime%2Easc"> <img src="{$http_image_path}inc{if $sort=="ctime.asc"}1{else}0{/if}.png" border=0></a> ! <a href="perfparse.php?page=all_bin&group_name={$group_name}&sort=ctime%2Edesc"> <img src="{$http_image_path}dec{if $sort=="ctime.desc"}1{else}0{/if}.png" border=0></a> {tr}Last Reading{/tr} </td> <td bgcolor="#FFFFCC" align=center width="1%"><font face="Arial, Helvetica" size=2> ! <a href="perfparse.php?page=all_bin&group_name={$group_name}&sort=value%2Easc"> <img src="{$http_image_path}inc{if $sort=="value.asc"}1{else}0{/if}.png" border=0></a> ! <a href="perfparse.php?page=all_bin&group_name={$group_name}&sort=value%2Edesc"> <img src="{$http_image_path}dec{if $sort=="value.desc"}1{else}0{/if}.png" border=0></a> {tr}Value{/tr} </td> <td bgcolor="#FFFFCC" align=center width="1%"><font face="Arial, Helvetica" size=2> ! <a href="perfparse.php?page=all_bin&group_name={$group_name}&sort=unit%2Easc"> <img src="{$http_image_path}inc{if $sort=="unit.asc"}1{else}0{/if}.png" border=0></a> ! <a href="perfparse.php?page=all_bin&group_name={$group_name}&sort=unit%2Edesc"> <img src="{$http_image_path}dec{if $sort=="unit.desc"}1{else}0{/if}.png" border=0></a> {tr}Unit{/tr} --- 60,87 ---- </td> <td bgcolor="#FFFFCC" align=center><font face="Arial, Helvetica" size=2> ! <a href="perfparse.php?page=all_bin&group_id={$group_id}&sort=metric%2Easc"> <img src="{$http_image_path}inc{if $sort=="metric.asc"}1{else}0{/if}.png" border=0></a> ! <a href="perfparse.php?page=all_bin&group_id={$group_id}&sort=metric%2Edesc"> <img src="{$http_image_path}dec{if $sort=="metric.desc"}1{else}0{/if}.png" border=0></a> {tr}Metric{/tr} </td> <td bgcolor="#FFFFCC" align=center width="1%"><font face="Arial, Helvetica" size=2> ! <a href="perfparse.php?page=all_bin&group_id={$group_id}&sort=ctime%2Easc"> <img src="{$http_image_path}inc{if $sort=="ctime.asc"}1{else}0{/if}.png" border=0></a> ! <a href="perfparse.php?page=all_bin&group_id={$group_id}&sort=ctime%2Edesc"> <img src="{$http_image_path}dec{if $sort=="ctime.desc"}1{else}0{/if}.png" border=0></a> {tr}Last Reading{/tr} </td> <td bgcolor="#FFFFCC" align=center width="1%"><font face="Arial, Helvetica" size=2> ! <a href="perfparse.php?page=all_bin&group_id={$group_id}&sort=value%2Easc"> <img src="{$http_image_path}inc{if $sort=="value.asc"}1{else}0{/if}.png" border=0></a> ! <a href="perfparse.php?page=all_bin&group_id={$group_id}&sort=value%2Edesc"> <img src="{$http_image_path}dec{if $sort=="value.desc"}1{else}0{/if}.png" border=0></a> {tr}Value{/tr} </td> <td bgcolor="#FFFFCC" align=center width="1%"><font face="Arial, Helvetica" size=2> ! <a href="perfparse.php?page=all_bin&group_id={$group_id}&sort=unit%2Easc"> <img src="{$http_image_path}inc{if $sort=="unit.asc"}1{else}0{/if}.png" border=0></a> ! <a href="perfparse.php?page=all_bin&group_id={$group_id}&sort=unit%2Edesc"> <img src="{$http_image_path}dec{if $sort=="unit.desc"}1{else}0{/if}.png" border=0></a> {tr}Unit{/tr} |