From a418d8ca1e04fc4f216aa74e7827f755b02e0874 Mon Sep 17 00:00:00 2001
From: Niklas
Date: Thu, 27 Oct 2011 19:58:45 +0200
Subject: disabled right click context menu, changed dialog button size (see
 css), changed customdhcp logger. it now sends all log messages through the
 socket

---
 src/html/js/networkDiscovery.js      | 8 +++++---
 src/html/networkdiscovery.css        | 4 ++++
 src/html/networkdiscovery.html       | 2 +-
 src/html/networkdiscovery_debug.html | 4 ++--
 4 files changed, 12 insertions(+), 6 deletions(-)

(limited to 'src/html')

diff --git a/src/html/js/networkDiscovery.js b/src/html/js/networkDiscovery.js
index 1057bd7..bc99a7c 100644
--- a/src/html/js/networkDiscovery.js
+++ b/src/html/js/networkDiscovery.js
@@ -47,7 +47,9 @@ var showLog = function (t) {
   //$("#nd_show_log_msg").attr('readonly','readonly');
   $('#nd_show_log_dialog').resizable("enable");
   $("#nd_show_log_dialog").dialog(
-    { minWidth: 600, 
+    { buttons: { "Cancel": function() {
+                  $(this).dialog("close");}},
+      minWidth: 600, 
       maxHeight: 400,
       modal: true,
       draggable: false,
@@ -127,7 +129,7 @@ var ip4_manualConfigurationDialog = function () {
     $("#nd_manual_configuration_dialog").dialog(
       { buttons: { "Cancel": function() { 
                      $(this).dialog("close");}, 
-                   "Ok": function() {
+                   "Continue": function() {
                      var bValid = true;
                      allFields.removeClass("ui-state-error");
 
@@ -239,7 +241,7 @@ var chooseInterfaceDialog = function (i) {
 
 
 var updateStatus = function (s){
-
+  $("#nd_status").html(s);
 };
 
 
diff --git a/src/html/networkdiscovery.css b/src/html/networkdiscovery.css
index 1d3b406..cf4121d 100644
--- a/src/html/networkdiscovery.css
+++ b/src/html/networkdiscovery.css
@@ -69,6 +69,10 @@ aside {
   margin-right: auto;
 }
 
+ .ui-button-text {
+        font-size: 10px;
+}
+
 textarea {
   width: 400px;
   height: 200px;
diff --git a/src/html/networkdiscovery.html b/src/html/networkdiscovery.html
index b8c24cd..25efee1 100644
--- a/src/html/networkdiscovery.html
+++ b/src/html/networkdiscovery.html
@@ -35,7 +35,7 @@ $(document).ready(function() {
         <div id="mainContent">
           <section>  
             <!-- Main content area -->
-            <p id="nd_status">test</p>
+            <p id="nd_status"></p>
             <!-- anchor for the show log dialog -->
             <div id="nd_show_log_dialog" title="Log File">
               <pre id="nd_show_log_msg"></pre>
diff --git a/src/html/networkdiscovery_debug.html b/src/html/networkdiscovery_debug.html
index 5f17a0c..9d539a3 100644
--- a/src/html/networkdiscovery_debug.html
+++ b/src/html/networkdiscovery_debug.html
@@ -23,7 +23,7 @@ $(document).ready(function() {
       <h1>Network Discovery</h1>  
     </header> 
       <section id="intro">  
-        <p>Welcome to the Network Discovery. We are now looking for usable interfaces and will go on as soon as we found one. This may take a few seconds.</p> 
+        <p id="into_msg">Welcome to the Network Discovery. We are now looking for usable interfaces and will go on as soon as we found one. This may take a few seconds.</p> 
       </section> 
       <div id="content">
         <div id="left_spacer">        
@@ -34,7 +34,7 @@ $(document).ready(function() {
         <div id="mainContent">
           <section>  
             <!-- Main content area -->
-            <p id="nd_status">test</p>
+            <p id="nd_status"></p>
             <!-- anchor for the show log dialog -->
             <div id="nd_show_log_dialog" title="Log File">
               <pre id="nd_show_log_msg"></pre>
-- 
cgit v1.2.3-55-g7522