[icinga-checkins] icinga.org: icinga-core/mbrooks/tac_header: Remove rogue character, fix html/Makefile.in and correct html

git at icinga.org git at icinga.org
Fri Apr 15 13:22:02 CEST 2011


Module: icinga-core
Branch: mbrooks/tac_header
Commit: b481641ff3099613a02fc04bc8ef91f6e9bcc8ee
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=b481641ff3099613a02fc04bc8ef91f6e9bcc8ee

Author: Matthew J. Brooks <matthew at sonomatechpartners.com>
Date:   Fri Apr 15 03:57:44 2011 -0700

Remove rogue character, fix html/Makefile.in and correct html

---

 cgi/cgiutils.c     |    4 ++--
 html/Makefile.in   |    4 ----
 include/cgiutils.h |    2 +-
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/cgi/cgiutils.c b/cgi/cgiutils.c
index 1f6458d..f2ea325 100644
--- a/cgi/cgiutils.c
+++ b/cgi/cgiutils.c
@@ -925,7 +925,7 @@ void document_header(int cgi_id, int use_stylesheet){
 			printf("<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>\n");
 			printf("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n");
 			printf("<head>\n");
-			printf("%s\n",cgi_title);
+			printf("<title>Icinga</title>\n");
 			printf("<meta name='robots' content='noindex, nofollow' />\n");
 			printf("<LINK REL='stylesheet' TYPE='text/css' HREF='%s%s'>\n",url_stylesheets_path,TAC_HEADER_CSS);
 			printf("<link rel=\"shortcut icon\" href=\"%sfavicon.ico\" type=\"image/ico\">\n",url_images_path);
@@ -938,7 +938,7 @@ void document_header(int cgi_id, int use_stylesheet){
 			printf("<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>\n");
 			printf("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n");
 			printf("<head>\n");
-			printf("%s\n",cgi_title);
+			printf("<title>Icinga</title>\n");
 			printf("<meta name='robots' content='noindex, nofollow' />\n");
 
 			/* also used by html/sidebar.html, so we'll leave it as is for now */
diff --git a/html/Makefile.in b/html/Makefile.in
index 47766f0..bfb8935 100644
--- a/html/Makefile.in
+++ b/html/Makefile.in
@@ -90,10 +90,6 @@ install:
 	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images/logos; done
 	for file in images/interface/*.gif; \
 	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images/interface; done
-	for file in images/interface/*.jpg; \
-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images/interface; done
-	for file in images/interface/*.png; \
-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images/interface; done
 	for file in js/*.js; \
 	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/js; done
 
diff --git a/include/cgiutils.h b/include/cgiutils.h
index b77bc6d..fbe21c0 100644
--- a/include/cgiutils.h
+++ b/include/cgiutils.h
@@ -247,7 +247,7 @@ extern "C" {
 #define TAC_HEADER_HOST_ICON		"server.png"
 #define TAC_HEADER_SERVICE_ICON		"application-monitor.png"
 #define TAC_HEADER_EXECUTION_ICON	"hourglass-exclamation.png"
-#define TAC_HEADER_LATENCY_ICON		"hourglass-arrow.png""
+#define TAC_HEADER_LATENCY_ICON		"hourglass-arrow.png"
 
 
 /************************** PLUGIN RETURN VALUES ****************************/





More information about the icinga-checkins mailing list