[Pkg-nagios-changes] [SCM] UNNAMED PROJECT branch, debian/master, updated. 810edbdd3feedbfe37f4a65bee50b57b2f60fa2a

Gabès Jean naparuba at gmail.com
Tue Feb 28 22:22:10 UTC 2012


The following commit has been merged in the debian/master branch:
commit 972649a7ba445a22bf703a4ff2790a097f1a37c5
Merge: 3df78cf686a0f691a24dc82517117bfeec920e74 c9d3d25f15f2e9fab9f0be123abd3e1482cc5ea7
Author: Gabès Jean <naparuba at gmail.com>
Date:   Tue Feb 21 06:42:41 2012 -0800

    Merge pull request #192 from jogaulupeau/master
    
    (by jogaulupeau) Fix Issue #185 (search and navigation page where not compatible)

diff --combined shinken/webui/plugins/problems/views/problems.tpl
index 8619687,8b54946..0fb13e1
--- a/shinken/webui/plugins/problems/views/problems.tpl
+++ b/shinken/webui/plugins/problems/views/problems.tpl
@@@ -144,6 -144,8 +144,8 @@@ document.addEvent('domready', function(
  	        <span class='current'>{{name}}</span>
  	     %elif start == None or end == None:
  		<span class='extend'>...</span>
+ 	     %elif search:
+                 <a href='/{{page}}?start={{start}}&end={{end}}&search={{search}}' class='page larger'>{{name}}</a>
               %else:
  		<a href='/{{page}}?start={{start}}&end={{end}}' class='page larger'>{{name}}</a>
  	     %end
@@@ -214,7 -216,7 +216,7 @@@
  		%else:
                    <td   class=" no_border" style="width:120px;"></td>
                  %end
 -		<td class=" no_border" style="width:50px;"> {{pb.state}}</td>
 +		<td class=" no_border {{pb.__class__.my_type}}_{{pb.state_id}}" style="width:50px;"> {{pb.state}}</td>
  		<td title='{{helper.print_date(pb.last_state_change)}}' class=" no_border" style="width:50px;">{{helper.print_duration(pb.last_state_change, just_duration=True, x_elts=2)}}</td>
  		%# "We put a title (so a tip) on the output onlly if need"
  		%if len(pb.output) > 100:

-- 
UNNAMED PROJECT



More information about the Pkg-nagios-changes mailing list