Index: trunk/webapps/einotebook/index.html
===================================================================
--- trunk/webapps/einotebook/index.html	(revision 401)
+++ trunk/webapps/einotebook/index.html	(revision 468)
@@ -21,45 +21,12 @@
     <script type="text/javascript" src="scripts/Incident.js"></script>
     <script type="text/javascript" src="scripts/Incidents.js"></script>
-    <script type="text/javascript" src="scripts/LoadEvents.js"></script> 
-    <!--script type="text/javascript" src="scripts/PopulateIncidents.js"></script-->
-    <!--script type="text/javascript" src="scripts/PopulateEvents.js"></script-->
     <script type="text/javascript" src="summary/summary.js"></script> 
     <script type="text/javascript" src="notebook.js"></script> 
+    <!-- LoadEvents contains init() function, the main entry point -->
+    <script type="text/javascript" src="scripts/LoadEvents.js"></script> 
   </head>
-  <body onLoad="showRevision(); setupNotebook(); run();">
+  <body onLoad="showRevision(); init()">
     
     <table class="notebook">
-     <!-- The header which contains the number of evaluations, simulation status, 
-               and time 
-      <tr style="height: 20px">
-        <td>
-          <table class="header">     
-            <tr>
-            
-              <td class="updateStatusBox">
-                <table>
-                  <tr>
-                    <td class="updateStatus" id="updateStatus">New Event</td>
-                  </tr>
-                </table>
-              </td>
-        
-              <td class="statusBox">
-                <center><table>
-                  <tr>
-                    <td class="simulationStatus" id="simulationStatus">NOT STARTED</td>
-                  </tr>
-                </table></center>
-              </td> 
-
-              <td class="simulationTime" id="simulationTime">
-                0:00:00
-              </td>
-
-            </tr>
-          </table>
-        </td>
-      </tr>
--->
       <tr style="height: 80px">
         <td colspan='3' class="tabMenu">
@@ -77,6 +44,6 @@
               Simulation Script
             </li>
-            <li class="notActive" id="CADTab" 
-            	onClick="changeTab(this.id); showContent('cadPageContent')">
+            <li class="notActive" id="currentTab" 
+            	onClick="changeTab(this.id); showContent('currentEventPageContent')">
               Current Event
             </li>
@@ -94,25 +61,21 @@
       <tr>
             <td class='tabPageContent' id='summaryPageContent' style="display:inline">
-            <iframe id='summaryTabPage' src='summary/summary.html' frameborder='0' scrolling='yes'
-		    height='100%' width='100%'
-		    onLoad='incidents.doc = getDocumentFromFrame(&quot;summaryTabPage&quot;);
-		    window.frames[0].loadSummary(incidents);'></iframe>
+            <iframe id='summaryTabPage' src='summary/index.html' frameborder='0' scrolling='yes'
+		    height='100%' width='100%'>
+            </iframe>
 		  </td>
           <td class='tabPageContent' id='scriptPageContent' style="display:none;">
-            <iframe id='tabPage' src='script/script.html' frameborder='0' 
-            scrolling='yes' height='100%' width='100%'
-            onLoad='window.frames[1].loadScript(events, incidents);'
-            >
+            <iframe id='tabPage' src='script/index.html' frameborder='0' 
+            scrolling='yes' height='100%' width='100%'>
 		    </iframe>
 		  </td>
-		  <td class='tabPageContent' id='cadPageContent' style="display:none;">
-		    <iframe src='cad/index.html' frameborder='0' 
-             scrolling='yes' height='100%' width='100%' 
-            onLoad='window.frames[2].loadScript(events, incidents);'>
+		  <td class='tabPageContent' id='currentEventPageContent' style="display:none;">
+		    <iframe id='currentEventPage' src='currentEvent/index.html' frameborder='0' 
+             scrolling='yes' height='100%' width='100%'> 
 		    </iframe>
 		  </td>
           <td class='tabPageContent' id='mapsPageContent' style="display:none;">
             <iframe src='maps/index.html' frameborder='0' 
-                             scrolling='no' height='100%' width='100%' >
+            scrolling='no' height='100%' width='100%' >
 		    </iframe>
           </td>
