[checkmk-commits] Check_MK Git: check_mk: FIX: rename check_mk.js into checkmk.js

Module: check_mk Branch: master Commit: 1f2526686aba18af01eee0e1c3c2df4561b52612 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1f2526686aba18… Author: Mathias Kettner &lt;mk(a)mathias-kettner.de&gt; Date: Fri Dec 23 13:49:05 2011 +0100 FIX: rename check_mk.js into checkmk.js --- ChangeLog | 2 ++ web/htdocs/htmllib.py | 2 +- web/htdocs/js/{check_mk.js => checkmk.js} | 0 web/htdocs/mobile.py | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 46aa366..b9e63f6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,8 @@ * Several cleanups to prevent css/js warning messages in e.g. Firefox * Made texts in selectable rows selectable again * FIX: ship missing CSS files for mobile GUI + * FIX: rename check_mk.js into checkmk.js in order to avoid browser + caching problems during version update WATO: * Optimized wraps in host lists tag column diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 1572a03..02b2d82 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -635,7 +635,7 @@ class html: self.write('<link rel="stylesheet" type="text/css" href="%s">\n' % config.custom_style_sheet) # Load specified Javascript files - for js in [ "check_mk", "hover" ] + javascripts: + for js in [ "checkmk", "hover" ] + javascripts: self.write('<script type="text/javascript" src="js/%s.js"></script>\n' % js) if self.browser_reload != 0: diff --git a/web/htdocs/js/check_mk.js b/web/htdocs/js/checkmk.js similarity index 100% rename from web/htdocs/js/check_mk.js rename to web/htdocs/js/checkmk.js diff --git a/web/htdocs/mobile.py b/web/htdocs/mobile.py index f22adea..9d441bc 100644 --- a/web/htdocs/mobile.py +++ b/web/htdocs/mobile.py @@ -57,7 +57,7 @@ def mobile_html_head(title, ready_code=""): <script type='text/javascript' src='jquery/jquery-1.6.4.min.js'></script> <script type='text/javascript' src='jquery/jquery.mobile-1.0.min.js'></script> <script type='text/javascript' src='js/mobile.js'></script> - <script type='text/javascript' src='js/check_mk.js'></script> + <script type='text/javascript' src='js/checkmk.js'></script> <script type='text/javascript'> $(document).ready(function() { %s }); </script>