Apply AT Web UI patchset.

4 files changed, 30 insertions, 21 deletions

diff --git a/webui_templates/ksfile_edit.tmpl b/webui_templates/ksfile_edit.tmpl
index a28fe74..8b0eeec 100644
--- a/webui_templates/ksfile_edit.tmpl
+++ b/webui_templates/ksfile_edit.tmpl
@@ -3,11 +3,11 @@
 
 #block body
 <form method="post" action="$base_url/ksfile_save">
-    <input type="hidden" name="ksfile" value="$ksfile"/>
+    <input type="hidden" name="name" value="$name"/>
     <fieldset id="cform">
         <legend>Edit Kickstart File</legend>
 
-        <pre><textarea rows="40" cols="120" name="ksdata">$ksdata</textarea></pre>
+        <pre><textarea rows="40" cols="120" name="ksdata" id="ksdata">$ksdata</textarea></pre>
         <br/>
 
         <input type="submit" name="submit" value="Save"/>
diff --git a/webui_templates/login.tmpl b/webui_templates/login.tmpl
index bd3cf39..891dc4c 100644
--- a/webui_templates/login.tmpl
+++ b/webui_templates/login.tmpl
@@ -7,7 +7,7 @@
     <h1>$message</h1>
 #end if
 
-<fieldset id="login">
+<fieldset id="cform">
     <legend>Log In</legend>
 
     <label for="username">Username:</label>
diff --git a/webui_templates/repo_edit.tmpl b/webui_templates/repo_edit.tmpl
index b0907fd..100997d 100644
--- a/webui_templates/repo_edit.tmpl
+++ b/webui_templates/repo_edit.tmpl
@@ -76,18 +76,12 @@ function disablename(value)
 
     <tr>
     <td>
-    <label for="keepupdated">Keep Updated</label>
+    <label for="keep_updated">Keep Updated</label>
     </td>
     <td>
-    <input type="checkbox" name="keepupdated" id="keepupdated"
-        #if $repo
-            #if $repo.keep_updated
-                selected="True"
-            #else
-                selected="False"
-            #end if
-        #else
-            selected = "True"  
+    <input type="checkbox" name="keep_updated" id="keep_updated"
+        #if not $repo or $repo.keep_updated is True
+            checked="true"  
         #end if
     />
     <p class="context-tip">Disable to prevent the mirror from being updated.</p>    
@@ -115,10 +109,10 @@ function disablename(value)
 
     <tr>
     <td>
-    <label for="rpmlist">RPM List</label>
+    <label for="rpm_list">RPM List</label>
     </td>
     <td>
-    <input type="text" size="512" style="width: 150px;" name="rpmlist" id="rpmlist"
+    <input type="text" size="512" style="width: 150px;" name="rpm_list" id="rpm_list"
         #if $repo
             value="$repo.rpm_list"
         #end if
diff --git a/webui_templates/system_edit.tmpl b/webui_templates/system_edit.tmpl
index 133b579..f57cf98 100644
--- a/webui_templates/system_edit.tmpl
+++ b/webui_templates/system_edit.tmpl
@@ -3,8 +3,8 @@
 
 #block body
 
-#if $system
 <script language="javascript">
+#if $system
 function disablename(value)
 {
     document.getElementById("name").disabled=value;
@@ -12,8 +12,21 @@ function disablename(value)
         document.getElementById("name").value = "$system.name";
     }
 }
-</script>
+#else
+function get_random_mac()
+{
+    xmlHttp = new XMLHttpRequest();
+    xmlHttp.open("GET", "$base_url/random_mac", true);
+    xmlHttp.onreadystatechange = function () {
+        if (xmlHttp.readyState == 4 && xmlHttp.status == 200) {
+            var mac_field = document.getElementById("mac")
+            mac_field.value = xmlHttp.responseText;
+        }
+    };
+    xmlHttp.send(null);
+}
 #end if
+</script>
 
 <form method="post" action="$base_url/system_save">
 <fieldset id="cform">
@@ -89,6 +102,7 @@ function disablename(value)
             value="$system.mac_address"
         #end if
     />
+    <a href="javascript: get_random_mac()" style="font-size: 0.8em;">random</a>
     <p class="context-tip">Example: AA:BB:CC:DD:EE:FF</p>
     </td>
     </tr>
@@ -152,13 +166,13 @@ function disablename(value)
     <tr>
     <td>
     <label for="netboot">Netboot Enabled</label>
-    #if $system
     </td>
     <td>
-    <input type="checkbox" checked="$system.netboot_enabled" name="netboot" id="netboot">
-    #else
-    <input type="checkbox" checked="True" name="netboot" id="netboot">
+    <input type="checkbox" name="netboot" id="netboot"
+    #if not $system or $system.netboot_enabled is True
+        checked="True"
     #end if
+    >
     <p class="context-tip">Deselect to keep this system from PXE booting</p>
     </td>
     </tr>
@@ -201,4 +215,5 @@ function disablename(value)
 
 </fieldset>
 </form>
+
 #end block body