classic ui: remove sidebar.html inclusion in index.html causing troub…

…les on reload #1632

refs #1632

Changelog

@@ -2,17 +2,29 @@
 Icinga 1.4.x Change Log
 #######################
 
-1.4.1 - ??/06/2011
+1.4.2 - ??/??/2011
+
+ENHANCEMENTS
+
+FIXES
+* classic ui: re-fix xss vulnerability and string escaping for command expansion #1605 #1624
+* classic ui: remove sidebar.html inclusion in index.html causing troubles on reload #1632
+
+
+1.4.1 - 08/06/2011
 
 ENHANCEMENTS
 
 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
+<<<<<<< HEAD
 * classic ui: better handling of writing to cgi.log in cmd.cgi #1161
 * classic ui: fixing tac.cgi header problems with counting and adding pending and descritptions #1505 #1506 #1508
 * classic ui: corrected behaviour of pending states in tac header #1508
+=======
+>>>>>>> e770ac8... classic ui: remove sidebar.html inclusion in index.html causing troubles on reload #1632
 
 * install: fix event handlers cmd file location in contrib #1501
 

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>