Index: trunk/webapps/cmsmonitor/index.html
===================================================================
--- trunk/webapps/cmsmonitor/index.html	(revision 377)
+++ trunk/webapps/cmsmonitor/index.html	(revision 377)
@@ -0,0 +1,114 @@
+<!DOCTYPE html>
+<html>
+  <head>
+<!-- Launch with  python -m CGIHTTPServer 80  -->
+  <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
+    <title>CMS Monitor v0.2</title> 
+<style>
+* {
+  box-sizing: border-box;
+}
+body {
+   background-color: #000033;
+}
+/* Create three unequal columns that float next to each other */
+.column {
+  float: left;
+  padding: 10px;
+  background-color:black; 
+  color:goldenrod
+}
+
+.left {
+  width: 50%;
+}
+
+.middle, .right {
+  width: 25%;
+}
+
+/* Clear floats after the columns */
+.row:after {
+  content: "";
+  display: table;
+  clear: both;
+}
+</style>
+</head>
+<body>
+<div class="row">
+  <div class="column left" >
+    <h2>Active CMS Messages</h2>
+    <p id="msgs"></p>
+  </div>
+  <div class="column middle" >
+    <h2>Active HAR Messages</h2>
+    <p>Not implemented yet.</p>
+  </div>
+  <div class="column right" >
+    <h2>Active Lane Closures</h2>
+    <p>Not implemented yet.</p>
+  </div>
+</div>
+
+
+    <script  src="../common/js/fileutils.js"></script>
+   <script>
+    var cmsLocations = {};
+    // Load the CMS locations from the geojson file
+    function loadCMSlocations()
+    {
+        loadJSON("../cptms/data_layers/cms_locations_D12.gjson", function(response)
+        {
+            // Parse JSON string into object
+            var cmsjson = JSON.parse(response);
+            for (var i = 0; i < cmsjson.features.length; i++)
+            {
+                var item = cmsjson.features[i];
+                // Add each item to a lookup dictionary
+                cmsLocations[item.id] = item;
+            }
+        });
+    }
+    // Load the file of CMS messages
+    function loadAllcmsMessages()
+    {
+        var display = document.getElementById("msgs");
+        display.innerHTML = ""
+        loadJSON("../dynamicdata/cms_messages.json", function(response)
+        {
+            // Parse JSON string into object
+            messagejson = JSON.parse(response);
+            // Consider each message 
+            for (var i = 0; i < messagejson.data.length; i++)
+            {
+                var item = messagejson.data[i];
+                // Find the location for this message
+                var cmsLoc = cmsLocations[item.cms.index];
+                // Build the message display
+                var current = (item.cms.message.phase1.Line1.toUpperCase() + ":" +
+                    item.cms.message.phase1.Line2.toUpperCase() + ":" +
+                    item.cms.message.phase1.Line3.toUpperCase() + ":" +
+                    item.cms.message.phase2.Line1.toUpperCase() +  ":" +
+                    item.cms.message.phase2.Line2.toUpperCase() + ":" +
+                    item.cms.message.phase2.Line3.toUpperCase())
+                // If the message isn't blank, append it to the list
+                if (current != ":::::")
+                {
+                    display.innerHTML += "<br>" + item.cms.index + ": " + 
+                        cmsLoc.properties.location + " " + cmsLoc.properties.street;
+                    display.innerHTML += "<br>" + current + "<br>";
+                }
+            }
+        });
+    }
+
+// Start
+loadCMSlocations();
+loadAllcmsMessages();
+// start an interval timer to refresh the cms icons every 10 seconds
+var cmsTimer = setInterval(loadAllcmsMessages, 10000);
+
+   </script>
+  </body>
+</html>
Index: trunk/webapps/cmsmonitor/cms_monitor.html
===================================================================
--- trunk/webapps/cmsmonitor/cms_monitor.html	(revision 372)
+++ 	(revision )
@@ -1,114 +1,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-<!-- Launch with  python -m CGIHTTPServer 80  -->
-  <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
-    <title>CMS Monitor v0.2</title> 
-<style>
-* {
-  box-sizing: border-box;
-}
-body {
-   background-color: #000033;
-}
-/* Create three unequal columns that float next to each other */
-.column {
-  float: left;
-  padding: 10px;
-  background-color:black; 
-  color:goldenrod
-}
-
-.left {
-  width: 50%;
-}
-
-.middle, .right {
-  width: 25%;
-}
-
-/* Clear floats after the columns */
-.row:after {
-  content: "";
-  display: table;
-  clear: both;
-}
-</style>
-</head>
-<body>
-<div class="row">
-  <div class="column left" >
-    <h2>Active CMS Messages</h2>
-    <p id="msgs"></p>
-  </div>
-  <div class="column middle" >
-    <h2>Active HAR Messages</h2>
-    <p>Not implemented yet.</p>
-  </div>
-  <div class="column right" >
-    <h2>Active Lane Closures</h2>
-    <p>Not implemented yet.</p>
-  </div>
-</div>
-
-
-    <script  src="js/common.js"></script>
-   <script>
-    var cmsLocations = {};
-    // Load the CMS locations from the geojson file
-    function loadCMSlocations()
-    {
-        loadJSON("data_layers/cms_locations_D12.gjson", function(response)
-        {
-            // Parse JSON string into object
-            var cmsjson = JSON.parse(response);
-            for (var i = 0; i < cmsjson.features.length; i++)
-            {
-                var item = cmsjson.features[i];
-                // Add each item to a lookup dictionary
-                cmsLocations[item.id] = item;
-            }
-        });
-    }
-    // Load the file of CMS messages
-    function loadAllcmsMessages()
-    {
-        var display = document.getElementById("msgs");
-        display.innerHTML = ""
-        loadJSON("cms_messages.json", function(response)
-        {
-            // Parse JSON string into object
-            messagejson = JSON.parse(response);
-            // Consider each message 
-            for (var i = 0; i < messagejson.data.length; i++)
-            {
-                var item = messagejson.data[i];
-                // Find the location for this message
-                var cmsLoc = cmsLocations[item.cms.index];
-                // Build the message display
-                var current = (item.cms.message.phase1.Line1.toUpperCase() + ":" +
-                    item.cms.message.phase1.Line2.toUpperCase() + ":" +
-                    item.cms.message.phase1.Line3.toUpperCase() + ":" +
-                    item.cms.message.phase2.Line1.toUpperCase() +  ":" +
-                    item.cms.message.phase2.Line2.toUpperCase() + ":" +
-                    item.cms.message.phase2.Line3.toUpperCase())
-                // If the message isn't blank, append it to the list
-                if (current != ":::::")
-                {
-                    display.innerHTML += "<br>" + item.cms.index + ": " + 
-                        cmsLoc.properties.location + " " + cmsLoc.properties.street;
-                    display.innerHTML += "<br>" + current + "<br>";
-                }
-            }
-        });
-    }
-
-// Start
-loadCMSlocations();
-loadAllcmsMessages();
-// start an interval timer to refresh the cms icons every 10 seconds
-var cmsTimer = setInterval(loadAllcmsMessages, 10000);
-
-   </script>
-  </body>
-</html>
