Index: trunk/webapps/js/cmsLayer.js
===================================================================
--- trunk/webapps/js/cmsLayer.js	(revision 326)
+++ trunk/webapps/js/cmsLayer.js	(revision 327)
@@ -13,5 +13,5 @@
             pic = "images/btnDepressed_CMS.png"
             // It's nice when icons become visible that the messages have been refreshed.
-            loadAllMessages();
+            loadAllcmsMessages();
         }
         else
@@ -48,5 +48,5 @@
     cmsLayer.addListener('click', function(event)
     {
-        var dialog = document.getElementById('dialog');
+        var dialog = document.getElementById('cms-dialog');
         // Note: If the dialog is already being displayed when someone else
         // updates the message, it won't be reflected in the dialog, until
@@ -63,10 +63,13 @@
         document.getElementById('msgcontent2').value = "";
         document.getElementById('msgcontent3').value = "";
+        document.getElementById('msgcontent4').value = "";
+        document.getElementById('msgcontent5').value = "";
+        document.getElementById('msgcontent6').value = "";
         document.getElementById('msgcontent1').focus();
-        var span = document.getElementsByClassName("close")[0]
+        var span = document.getElementById("cms-close");
             // When the user clicks on <span> (x), close the modal
         span.onclick = function()
         {
-            handleDialogClose();
+            handleDialogClose('cms-dialog');
         }
     });
@@ -76,6 +79,10 @@
     function justifyCMStext(message)
     {
+        // don't bother justifying a blank message
+        if (message.length == 0) return message;    
+        // determine how much padding is needed
         var kBlanks = "                ";
         var padLen = (16 - message.length) / 2;
+        // apply the padding
         var padding = kBlanks.substring(0, padLen);
         return padding + message;
@@ -88,8 +95,11 @@
         var response2 = justifyCMStext(document.getElementById('msgcontent2').value.trim());
         var response3 = justifyCMStext(document.getElementById('msgcontent3').value.trim());
-        var newMsg = response1 + response2 + response3;
+        var response4 = justifyCMStext(document.getElementById('msgcontent4').value.trim());
+        var response5 = justifyCMStext(document.getElementById('msgcontent5').value.trim());
+        var response6 = justifyCMStext(document.getElementById('msgcontent6').value.trim());
+        var newMsg = response1 + response2 + response3 + response4 + response5 + response6;
         if (newMsg.length == 0)
         {
-            alert("Nothing to Send ... Proposed is empty.");
+            alert("Nothing to Send ... input fields are empty.");
         }
         else
@@ -98,12 +108,10 @@
             document.getElementById('msgdisplay2').value = response2;
             document.getElementById('msgdisplay3').value = response3;
-            saveMessage(response1 + "|" + response2 + "|" + response3);
-        }
-    }
-
-    function handleDialogClose()
-    {
-        // hide the display
-        document.getElementById('dialog').style.display = 'none'
+            document.getElementById('msgdisplay4').value = response4;
+            document.getElementById('msgdisplay5').value = response5;
+            document.getElementById('msgdisplay6').value = response6;
+            saveMessage(response1 + "|" + response2 + "|" + response3 + "|" +
+                        response4 + "|" + response5 + "|" + response6);
+        }
     }
 
@@ -113,10 +121,52 @@
         document.getElementById('msgdisplay2').value = "";
         document.getElementById('msgdisplay3').value = "";
-        saveMessage("||");
-    }
+        document.getElementById('msgdisplay4').value = "";
+        document.getElementById('msgdisplay5').value = "";
+        document.getElementById('msgdisplay6').value = "";
+        saveMessage("|||||");
+    }
+
+    // Save an updated cms message to the file
+    function saveMessage(outMessage)
+    {
+        // Fetch cmsID from hidden field where it was put when dialog opened.
+        var cmsID = document.getElementById('cmsID').value;
+        //console.log("Saving " + outMessage + " for cmsID " + cmsID)
+        msgParts = outMessage.split("|");
+        messageDict[cmsID].cms.message.phase1.Line1 = msgParts[0];
+        messageDict[cmsID].cms.message.phase1.Line2 = msgParts[1];
+        messageDict[cmsID].cms.message.phase1.Line3 = msgParts[2];
+        messageDict[cmsID].cms.message.phase2.Line1 = msgParts[3];
+        messageDict[cmsID].cms.message.phase2.Line2 = msgParts[4];
+        messageDict[cmsID].cms.message.phase2.Line3 = msgParts[5];
+        // Set icon to reflect message state
+        if (outMessage == "|||||")
+        {
+            currentIcon = {icon: yellowFlag};
+        }
+        else
+        {
+            currentIcon = {icon: blueFlag};
+        }
+        cmsLayer.overrideStyle(cmsLayer.getFeatureById(cmsID), currentIcon)
+        // break the json string into lines for readability
+        jsonstring = JSON.stringify(Object.values(messageDict)); //,null,4);
+        outString = "{\"data\":" + jsonstring + "}";
+
+        var xhttp = new XMLHttpRequest();
+        xhttp.open("GET", "cgi-bin/saveCMSmessage.py?msg=" + outString, true);
+        xhttp.send();
+        // Using POST might be a better idea ... haven't tried this yet
+        //      var xhr = new XMLHttpRequest();
+        //      xhr.open("POST", "/cgi-bin/saveMessage.py?", true);
+        //      xhr.setRequestHeader('Content-Type', 'application/json; charset=UTF-8');
+        // send the collected data as JSON
+        //      xhr.send(JSON.stringify(messageList));
+    }
+
     // retrieve the current cms message file
     function showMessage(cmsID)
     {
-        loadAllMessages();  // because someone else may have made a recent update
+        loadAllcmsMessages();  // because someone else may have made a recent update
         // lookup the message for this cms ID
         var message = messageDict[cmsID].cms.message;
@@ -125,6 +175,9 @@
         document.getElementById('msgdisplay2').value = message.phase1.Line2;
         document.getElementById('msgdisplay3').value = message.phase1.Line3;
-    }
-    function loadAllMessages()
+        document.getElementById('msgdisplay4').value = message.phase2.Line1;
+        document.getElementById('msgdisplay5').value = message.phase2.Line2;
+        document.getElementById('msgdisplay6').value = message.phase2.Line3;
+    }
+    function loadAllcmsMessages()
     {
         loadJSON("cms_messages.json", function(response)
@@ -141,5 +194,8 @@
                 if (item.cms.message.phase1.Line1 + 
                     item.cms.message.phase1.Line2 +
-                    item.cms.message.phase1.Line3 == "")
+                    item.cms.message.phase1.Line3 +
+                    item.cms.message.phase2.Line1 + 
+                    item.cms.message.phase2.Line2 +
+                    item.cms.message.phase2.Line3 == "")
                 {
                     cmsLayer.overrideStyle(cmsLayer.getFeatureById(item.cms.index), {icon: yellowFlag})
@@ -153,35 +209,3 @@
     }
 
-    // Save an updated cms message to the file
-    function saveMessage(outMessage)
-    {
-        // Fetch cmsID from hidden field where it was put when dialog opened.
-        var cmsID = document.getElementById('cmsID').value;
-        //console.log("Saving " + outMessage + " for cmsID " + cmsID)
-        msgParts = outMessage.split("|");
-        messageDict[cmsID].cms.message.phase1.Line1 = msgParts[0];
-        messageDict[cmsID].cms.message.phase1.Line2 = msgParts[1];
-        messageDict[cmsID].cms.message.phase1.Line3 = msgParts[2];
-        // Set icon to reflect message state
-        if (outMessage == "||")
-        {
-            currentIcon = {icon: yellowFlag};
-        }
-        else
-        {
-            currentIcon = {icon: blueFlag};
-        }
-        cmsLayer.overrideStyle(cmsLayer.getFeatureById(cmsID), currentIcon)
-        outString = "{\n\t\"data\":\n\t\t" + JSON.stringify(Object.values(messageDict)) + "}";
-
-        var xhttp = new XMLHttpRequest();
-        xhttp.open("GET", "cgi-bin/saveMessage.py?msg=" + outString, true);
-        xhttp.send();
-        // Using POST might be a better idea ... haven't tried this yet
-        //      var xhr = new XMLHttpRequest();
-        //      xhr.open("POST", "/cgi-bin/saveMessage.py?", true);
-        //      xhr.setRequestHeader('Content-Type', 'application/json; charset=UTF-8');
-        // send the collected data as JSON
-        //      xhr.send(JSON.stringify(messageList));
-    }
-
+