[icinga-checkins] icinga.org: icinga-core/dev/cgis: classic ui: fixed Log File Navigation in current/ealier/ recent archive clarification #2441

git at icinga.org git at icinga.org
Mon Apr 16 00:06:05 CEST 2012


Module: icinga-core
Branch: dev/cgis
Commit: ee65589d909c8eae9053588e210f2c369e98281d
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=ee65589d909c8eae9053588e210f2c369e98281d

Author: Ricardo Bartels <ricardo at bitchbrothers.com>
Date:   Sat Apr 14 01:43:59 2012 +0200

classic ui: fixed Log File Navigation in current/ealier/recent archive clarification #2441

refs: 2441

hope this is better.

---

 Changelog      |    1 +
 cgi/cgiutils.c |   18 +++++++-----------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/Changelog b/Changelog
index f5c581f..cd8bab3 100644
--- a/Changelog
+++ b/Changelog
@@ -44,6 +44,7 @@ FIXES
 * classic ui: Change Excel icon to odf spreadsheet icon #2391
 * classic ui: fixed Availability Records Break if JavaScript is disabled #2412
 * classic ui: fixed Truncated HTML table when displaying outages in outages.cgi #2323
+* classic ui: fixed Log File Navigation in current/ealier/recent archive clarification #2441
 
 * idoutils: fix ORA-00913 too many values when MERGE INTO eventhandlers #2319
 * idoutils: change standard string escaping for postgresql queries to use the E'foo' notation #1974
diff --git a/cgi/cgiutils.c b/cgi/cgiutils.c
index a3e3ad3..4e31a49 100644
--- a/cgi/cgiutils.c
+++ b/cgi/cgiutils.c
@@ -1870,13 +1870,8 @@ void display_nav_table(char *url, int archive) {
 		printf("<table border=0 cellspacing=0 cellpadding=0 CLASS='navBox'>\n");
 		printf("<tr>\n");
 		printf("<td align=center valign=center CLASS='navBoxItem'>\n");
-		if (archive == 0) {
-			printf("Latest Archive<br>");
-			printf("<a href='%sarchive=1'><img src='%s%s' border=0 alt='Latest Archive' title='Latest Archive'></a>", url, url_images_path, LEFT_ARROW_ICON);
-		} else {
-			printf("Earlier Archive<br>");
-			printf("<a href='%sarchive=%d'><img src='%s%s' border=0 alt='Earlier Archive' title='Earlier Archive'></a>", url, archive + 1, url_images_path, LEFT_ARROW_ICON);
-		}
+		printf("Earlier Archive<br>");
+		printf("<a href='%sarchive=%d'><img src='%s%s' border=0 alt='Earlier Archive' title='Earlier Archive'></a>", url, archive + 1, url_images_path, LEFT_ARROW_ICON);
 		printf("</td>\n");
 
 		printf("<td width=15></td>\n");
@@ -1889,6 +1884,7 @@ void display_nav_table(char *url, int archive) {
 		if (archive == 0)
 			printf("Present..");
 		else {
+			this_scheduled_log_rotation--;
 			get_time_string(&this_scheduled_log_rotation, date_time, (int)sizeof(date_time), LONG_DATE_TIME);
 			printf("%s", date_time);
 		}
@@ -1896,7 +1892,6 @@ void display_nav_table(char *url, int archive) {
 
 		printf("<td width=15></td>\n");
 		if (archive != 0) {
-
 			printf("<td align=center valign=center CLASS='navBoxItem'>\n");
 			if (archive == 1) {
 				printf("Current Log<br>");
@@ -1906,11 +1901,12 @@ void display_nav_table(char *url, int archive) {
 				printf("<a href='%sarchive=%d'><img src='%s%s' border=0 alt='More Recent Archive' title='More Recent Archive'></a>", url, archive - 1, url_images_path, RIGHT_ARROW_ICON);
 			}
 			printf("</td>\n");
-		} else
-			printf("<td><img src='%s%s' border=0 width=75 height=1></td>\n", url_images_path, EMPTY_ICON);
+		} else {
+			printf("<td align=center valign=center CLASS='navBoxItem'>Current Log<br>\n");
+			printf("<img src='%s%s' border=0 width=75 height=16></td>\n", url_images_path, EMPTY_ICON);
+		}
 
 		printf("</tr>\n");
-
 		printf("</table>\n");
 	}
 





More information about the icinga-checkins mailing list