* Applied a patch sent in by David Given for handling of the "&" character

[citadel.git] / webcit / static / mainframeset.html
diff --git a/webcit/static/mainframeset.html b/webcit/static/mainframeset.html

index b0e340b0ee6127dbfed1b68ec9e78b56aa17ecf0..d54b04c444bb084f062b95d097c0d5c4f9192f33 100644 (file)
--- a/webcit/static/mainframeset.html
+++ b/webcit/static/mainframeset.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/frameset.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
  <HTML>
  <HEAD>
         <TITLE>Citadel</TITLE>
@@ -6,12 +6,12 @@
         <META HTTP-EQUIV="Content-Language" CONTENT="en">
  </HEAD>
  
-<FRAMESET COLS="80, *" FRAMESPACING="0" BORDER="FALSE" FRAMEBORDER="0">
-       <FRAME NAME="left" SRC="/static/iconbar.html" SCROLLING="no">
+<FRAMESET COLS="100, *" FRAMESPACING="0" BORDER="FALSE" FRAMEBORDER="0">
+       <FRAME NAME="iconbarframe" SRC="/iconbar" SCROLLING="no">
         <FRAMESET ROWS="*, 45" FRAMESPACING=0 BORDER="FALSE" FRAMEBORDER="0">
                 <FRAME NAME="workspace" SRC="<?STARTPAGE>">
                 <FRAMESET COLS="*, 1" FRAMESPACING="0" BORDER="FALSE" FRAMEBORDER="0">
-                       <FRAME NAME="bottom" SRC="/static/navbar.html" SCROLLING="no">
+                       <FRAME NAME="bottom" SRC="do_template?template=navbar" SCROLLING="no">
                         <FRAME NAME="ka" SRC="/blank" SCROLLING="no">
                 </FRAMESET>
         </FRAMESET>