X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=testing%2FMCTXWeb%2Fpublic_html%2Findex.html;h=9f2ab04c9d218e33e34861b0dabbe7fdd0676407;hb=0bcd433fc420fa29bfaaca732acf689c9603e59d;hp=7953e069d55cc5c3b65be491f65ff8cb4fab624f;hpb=dc38a33770173351a325fe5944c376aadf705716;p=matches%2FMCTX3420.git

diff --git a/testing/MCTXWeb/public_html/index.html b/testing/MCTXWeb/public_html/index.html
index 7953e06..9f2ab04 100644
--- a/testing/MCTXWeb/public_html/index.html
+++ b/testing/MCTXWeb/public_html/index.html
@@ -14,25 +14,28 @@
     <link rel="stylesheet" type="text/css" href="static/style.css">
     <link rel="stylesheet" type="text/css" href="static/nav-menu.css">
     <script type="text/javascript">
-      //runBeforeLoad();
-      $(document).ready(function () {
-        //$("#menu-container").populateNavbar();
-        $("#login").submit(function () {
-          $("#login").login();
-          return false;
-        });
-        
-        $("#logout").click(function () {
-          $("#logout").logout();
-        });
-        
-        $("#main_controls").submit(function () {
-          //Validate!
-          return false;
-        });
-        
-        $("#errorlog").setErrorLog();
-      });
+      runBeforeLoad().done(function () {
+        $(document).ready(function () {
+         //Show the content!
+         $("#content").css("display", "block");
+         //Set the welcome bar
+         var name = " " + (mctx.friendlyName ? mctx.friendlyName : "");
+         $("#welcome-container").text("Welcome"+ name + "!");
+         //$("#menu-container").populateNavbar();
+
+         $("#logout").click(function () {
+           $("#logout").logout();
+         });
+
+         $("#main_controls").submit(function () {
+           //Validate!
+           return false;
+         });
+
+         $("#errorlog").setErrorLog();
+       });       
+      })
+
     </script>
   </head>
   
@@ -49,7 +52,6 @@
         <div id="menu-container" class="nav-menu">
         </div>
         <span id="welcome-container">
-          Welcome, Joe Bloggs!
         </span>
         <span id="date">
           <script type="text/javascript">getDate();</script>