]>
Commit | Line | Data |
---|---|---|
bf8055c4 ER |
1 | --- nagios-3.4.1/html/main.php~ 2012-05-12 03:00:53.000000000 +0300 |
2 | +++ nagios-3.4.1/html/main.php 2012-05-28 23:55:54.310721306 +0300 | |
2ba13e8d | 3 | @@ -14,7 +14,7 @@ $this_year = '2017'; |
bf8055c4 | 4 | <title>Nagios Core</title> |
fa363e1f | 5 | <link rel="stylesheet" type="text/css" href="stylesheets/common.css?<?php echo $this_version; ?>" /> |
2ba13e8d | 6 | <link rel="stylesheet" type="text/css" href="stylesheets/nag_funcs.css?<?php echo $this_version; ?>" /> |
bf8055c4 ER |
7 | -<script type="text/javascript" src="js/jquery-1.7.1.min.js"></script> |
8 | +<script type="text/javascript" src="/js/jquery/jquery.js"></script> | |
2ba13e8d | 9 | <script type="text/javascript" src="js/nag_funcs.js"></script> |
bf8055c4 ER |
10 | |
11 | <script type='text/javascript'> | |
bf8055c4 ER |
12 | --- nagios-3.4.1/include/cgiutils.h~ 2012-05-24 17:15:30.000000000 +0300 |
13 | +++ nagios-3.4.1/include/cgiutils.h 2012-05-28 23:56:18.921757228 +0300 | |
2ba13e8d AM |
14 | @@ -93,7 +93,7 @@ NAGIOS_BEGIN_DECL |
15 | #define NAGFUNCS_CSS "nag_funcs.css" | |
bf8055c4 ER |
16 | |
17 | /********************************* JAVASCRIPT INCLUDES **********************/ | |
2ba13e8d AM |
18 | -#define JQUERY_JS "jquery-1.7.1.min.js" |
19 | +#define JQUERY_JS "/js/jquery/jquery.js" | |
20 | #define NAGFUNCS_JS "nag_funcs.js" | |
bf8055c4 ER |
21 | |
22 | /********************************* ICONS ************************************/ | |
bf8055c4 ER |
23 | --- nagios-3.4.1/cgi/status.c~ 2012-05-24 17:15:30.000000000 +0300 |
24 | +++ nagios-3.4.1/cgi/status.c 2012-05-28 23:57:04.933694000 +0300 | |
2ba13e8d | 25 | @@ -531,7 +531,7 @@ void document_header(int use_stylesheet) |
bf8055c4 | 26 | } |
33fd0590 AM |
27 | |
28 | /* added jquery library 1/31/2012 */ | |
2ba13e8d | 29 | - printf("<script type='text/javascript' src='%s%s'></script>\n", url_js_path, JQUERY_JS); |
e277f689 | 30 | + printf("<script type='text/javascript' src='%s'></script>\n",JQUERY_JS); |
2ba13e8d | 31 | printf("<script type='text/javascript' src='%s%s'></script>\n", url_js_path, NAGFUNCS_JS); |
33fd0590 AM |
32 | /* JS function to append content to elements on page */ |
33 | printf("<script type='text/javascript'>\n"); | |
bf8055c4 ER |
34 | --- nagios-3.4.1/html/Makefile.in~ 2012-05-28 23:52:30.000000000 +0300 |
35 | +++ nagios-3.4.1/html/Makefile.in 2012-05-28 23:59:43.973722231 +0300 | |
36 | @@ -61,8 +61,6 @@ | |
37 | do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done | |
38 | for file in contexthelp/*.html; \ | |
39 | do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/contexthelp; done | |
40 | - for file in js/*.js; \ | |
41 | - do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/js; done | |
42 | # for file in docs/*.html; \ | |
43 | # do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs; done | |
44 | # for file in docs/images/*.*; \ |