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

Naparuba naparuba at gmail.com
Tue Feb 28 22:14:43 UTC 2012


The following commit has been merged in the debian/master branch:
commit 68f27e93d4e741330609ee9f12ef94a26931727d
Author: Naparuba <naparuba at gmail.com>
Date:   Wed Jan 18 14:50:07 2012 +0100

    Enh : make the autocompletion lib common.

diff --git a/shinken/webui/plugins/problems/htdocs/js/autocompleter.Request.js b/shinken/webui/htdocs/js/autocompleter.Request.js
similarity index 100%
rename from shinken/webui/plugins/problems/htdocs/js/autocompleter.Request.js
rename to shinken/webui/htdocs/js/autocompleter.Request.js
diff --git a/shinken/webui/plugins/problems/htdocs/js/autocompleter.js b/shinken/webui/htdocs/js/autocompleter.js
similarity index 100%
rename from shinken/webui/plugins/problems/htdocs/js/autocompleter.js
rename to shinken/webui/htdocs/js/autocompleter.js
diff --git a/shinken/webui/plugins/problems/htdocs/js/autocompleterObserver.js b/shinken/webui/htdocs/js/autocompleterObserver.js
similarity index 100%
rename from shinken/webui/plugins/problems/htdocs/js/autocompleterObserver.js
rename to shinken/webui/htdocs/js/autocompleterObserver.js
diff --git a/shinken/webui/plugins/problems/views/problems.tpl b/shinken/webui/plugins/problems/views/problems.tpl
index 2027612..62cb12a 100644
--- a/shinken/webui/plugins/problems/views/problems.tpl
+++ b/shinken/webui/plugins/problems/views/problems.tpl
@@ -7,7 +7,7 @@
 %top_right_banner_state = datamgr.get_overall_state()
 
 
-%rebase layout title='All problems', top_right_banner_state=top_right_banner_state, js=['problems/js/img_hovering.js', 'problems/js/accordion.js', 'problems/js/autocompleter.js', 'problems/js/autocompleter.Request.js', 'problems/js/autocompleterObserver.js'], css=['problems/css/accordion.css', 'problems/css/pagenavi.css', 'problems/css/autocompleter.css', 'problems/css/perfometer.css', 'problems/css/img_hovering.css'], refresh=True, menu_part='/'+page, user=user
+%rebase layout title='All problems', top_right_banner_state=top_right_banner_state, js=['problems/js/img_hovering.js', 'problems/js/accordion.js'], css=['problems/css/accordion.css', 'problems/css/pagenavi.css', 'problems/css/autocompleter.css', 'problems/css/perfometer.css', 'problems/css/img_hovering.css'], refresh=True, menu_part='/'+page, user=user
 
 
 %# " If the auth got problem, we bail out"
diff --git a/shinken/webui/views/layout.tpl b/shinken/webui/views/layout.tpl
index c460284..43beb6d 100644
--- a/shinken/webui/views/layout.tpl
+++ b/shinken/webui/views/layout.tpl
@@ -55,6 +55,11 @@
       <script type="text/javascript" src="/static/js/opacity.js"></script>
       <script type="text/javascript" src="/static/js/multibox.js"></script>
       <script type="text/javascript" src="/static/js/deptree.js"></script>
+      
+      %# Auto completer part
+      <script type="text/javascript" src="/static/js/autocompleter.js"></script>
+      <script type="text/javascript" src="/static/js/autocompleter.Request.js"></script>
+      <script type="text/javascript" src="/static/js/autocompleterObserver.js"></script>
 
       %if user is not None and print_header:
         <script type="text/javascript" src="/static/js/userinfo.js"></script>

-- 
UNNAMED PROJECT



More information about the Pkg-nagios-changes mailing list