[icinga-checkins] icinga.org: icinga-core/rbartels/cgi-current: classic ui: remove sidebar. html inclusion in index.html causing troubles on reload #1632

[git at icinga.org]

Module: icinga-core
Branch: rbartels/cgi-current
Commit: e770ac862c9e81a7d26bb29903a022898075437e
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=e770ac862c9e81a7d26bb29903a022898075437e

Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Thu Jun  9 14:10:38 2011 +0200

classic ui: remove sidebar.html inclusion in index.html causing troubles on reload #1632

refs #1632

---

 Changelog          |    1 +
 html/index.html.in |    5 +----
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/Changelog b/Changelog
index 70c1890..bf97fa4 100644
--- a/Changelog
+++ b/Changelog
@@ -15,6 +15,7 @@ FIXES
 * core: fix retain status file over an init script reload #1579
 
 * classic ui: fix cross site scripting vulnerability in config.cgi on config expander arguments #1605
+* classic ui: remove sidebar.html inclusion in index.html causing troubles on reload #1632
 
 * install: fix event handlers cmd file location in contrib #1501
 
diff --git a/html/index.html.in b/html/index.html.in
index e20d5f5..42dc44d 100644
--- a/html/index.html.in
+++ b/html/index.html.in
@@ -10,10 +10,7 @@
 		<frame src="@cgiurl@/tac.cgi?tac_header" name="top" target="main" scrolling="no" />
 		<frameset frameborder="0" framespacing="0" cols="220,*">
 			<frame src="menu.html" name="menu" target="main" scrolling="auto"/>
-			<frameset frameborder="0" framespacing="0" rows="26,*">
-				<frame src="sidebar.html" name="navigation" />
-				<frame src="@cgiurl@/tac.cgi" name="main" />
-			</frameset>
+			<frame src="@cgiurl@/tac.cgi" name="main" />
 		</frameset>
 	</frameset>
 	<noframes>