Changeset 401 in tmcsimulator for trunk/webapps/einotebook

Timestamp:

05/15/2019 06:07:22 AM (7 years ago)

Author:

jdalbey

Message:

Fix #149, #112. Add emphasis to timebox. Partial fix to highlighting problem. Use Scoreboard font in CMS monitor.

Location:

trunk/webapps/einotebook

Files:

• index.html (modified) (1 diff)
• maps/index.html (modified) (2 diffs)
• notebook.css (modified) (3 diffs)
• script/script.js (modified) (4 diffs)

trunk/webapps/einotebook/index.html

@@ -62 +62 @@
       </tr>
 -->
-      <tr style="height: 120px">
+      <tr style="height: 80px">
         <td colspan='3' class="tabMenu">
         

trunk/webapps/einotebook/maps/index.html

@@ -31 +31 @@
         
             <!-- The Map -->
-            <div id="googleMapContent" style="display:none;">
-<iframe src="https://www.google.com/maps/d/embed?mid=11RLV4iMbnXW7HlZCATvTa9z1Y01gngzR&zoom=9" width="640" height="480"></iframe>
+            <div id="googleMapContent">
+<iframe src="https://www.google.com/maps/d/embed?mid=11RLV4iMbnXW7HlZCATvTa9z1Y01gngzR&z=10" width="640" height="480"></iframe>
         <div>
 <!--
@@ -38 +38 @@
                 scrolling=no src="https://drive.google.com/open?id=11RLV4iMbnXW7HlZCATvTa9z1Y01gngzR&usp=sharing" marginheight=0 marginwidth=0></iframe>  -->
 
-        <div id="atmsMapContent" style="display:inline;"><iframe frameborder=0 width=740 height=600 
+        <div id="atmsMapContent"><iframe frameborder=0 width="740" height="600" 
                 scrolling=no src="../../cptms/index.html" marginheight=0 marginwidth=0></iframe></div>
-<!--        <div id="atmsMapContent" style="display:inline;"><iframe frameborder=0 width=740 height=600 
-                scrolling=no src="../../cptms.html" marginheight=0 marginwidth=0></iframe></div>
--->
+
     </center>
   </body>

trunk/webapps/einotebook/notebook.css

@@ -7 +7 @@
 body
 {
-    margin:0px;
+   margin:0px;
    font-family: Verdana, sans-serif;
    background-color:#FFFFFF;
@@ -86 +86 @@
    margin-bottom: 2px;
    padding-right: 16px;
+   /* Fix #152 attempt 
+   resize: both;
+   overflow: auto; */
    /*width: 30%;*/
     /* width: 30%;   */
@@ -170 +173 @@
    border: 1px solid #66CC66; 
    border-top: 0px; 
-   height:90%;
+   height:100%;
    padding:0px;
    margin:0px;

trunk/webapps/einotebook/script/script.js

@@ -51 +51 @@
                         
                         // IF there was previously a current event THEN
-                        if (highlightLatestEvent.oldEvent.id != Event.invalidID)
+                        if (highlightLatestEvent.oldEvent.id != Event.invalidID && currentEvent.id != 0)
                         {
                                 highlightLatestEvent.oldEvent.unhighlight();
@@ -64 +64 @@
 }
 
+
+/** Change color of text of expired events so they appear disabled.
+  * @param events The list of events
+  * @param currEvent The current event
+  */
+function greyOldEvents(events, currEvent)
+{
+          // Examine all events
+   for (var evtNum = 0; evtNum < events.length; evtNum++)
+   {
+                // Change color of those before current time and Event
+      if (events[evtNum].time.compareTo(currEvent.time) < 0 && currEvent.id != events[evtNum].id) 
+      {
+                        events[evtNum].unhighlight();
+      }
+        }
+}
+
 /**
  * Loads the the script tab for the given document.
@@ -83 +101 @@
                 // add the Event's html
                 html += Script.events[i].html();
-        //console.log(Script.events[i].html());
-        }
+        }
+       
         
         // display events in iframe
@@ -97 +115 @@
         Script.events.win.scrollTo(0, readCookie('scriptScrollY'));
         
+        greyOldEvents(Script.events, Script.events.getLastExecutedEvent(readCookie("time")));
         highlightLatestEvent();