Add tooltips and formatting to profiles in the Web UI.

2 files changed, 118 insertions, 21 deletions

diff --git a/webui_templates/distro_edit.tmpl b/webui_templates/distro_edit.tmpl
index 5c52136..c791d0d 100644
--- a/webui_templates/distro_edit.tmpl
+++ b/webui_templates/distro_edit.tmpl
@@ -179,7 +179,7 @@ function disablename(value)
     <td>
        <input type="checkbox" name="delete1" value="delete1">Yes
        <input type="checkbox" name="delete2" value="delete2">Really
-       <p class="context-tip">Check both buttons and click Save to delete this system</p>
+       <p class="context-tip">Check both buttons and click save to delete this object</p>
     </td>
     </tr>
     #end if
diff --git a/webui_templates/profile_edit.tmpl b/webui_templates/profile_edit.tmpl
index 5c46d6b..070c330 100644
--- a/webui_templates/profile_edit.tmpl
+++ b/webui_templates/profile_edit.tmpl
@@ -31,8 +31,13 @@ function disablename(value)
         <input type="hidden" name="new_or_edit" value="new"/>
     #end if
 
+    <table border=0>
 
+    <tr>
+    <td>
     <label for="name">Profile Name</label>
+    </td>
+    <td>
     #if $profile
     <input type="text" size="32" style="width: 150px;" name="name" id="name" disabled="true"
     #else
@@ -42,18 +47,29 @@ function disablename(value)
             value="$profile.name"
         #end if
     />
-    <br/>
+    <p class="context-tip">Example:  RHEL-5-i386-webserver</p>
+    </td>
+    </tr>
 
     #if $profile
+    <tr>
+    <td>
     <label for="mode">Edit Mode</label>
+    </td>
+    <td>
     <input type="radio" name="editmode" value="edit" checked onclick="javascript:disablename(true)">Edit
     <input type="radio" name="editmode" value="rename" onclick="javascript:disablename(false)">Rename + Edit
     <input type="radio" name="editmode" value="copy" onclick="javascript:disablename(false)">Copy + Edit
-    <br/>
+    <p class="context-tip">How do you want to modify this object?</p>
+    </td>
+    </tr>
     #end if
 
-
+    <tr>
+    <td>
     <label for="distro">Distribution</label>
+    </td>
+    <td>
     <select name="distro" id="distro">
         #for $distro in $distros:
         <option name="$distro.name"
@@ -64,94 +80,175 @@ function disablename(value)
         </option>
         #end for
     </select>
-    <br/>
+    <p class="context-tip">What OS is this profile based on?</p>
+    </td>
+    </tr>
 
     <!-- should allow freeform input but still show a list of choices? -->
     <!-- probably should implement a combo box eventually -->
 
+    <tr>
+    <td>
     <label for="kickstart">Kickstart File</label>
+    </td>
+    <td>
     <input type="text" size="128" style="width: 150px;" name="kickstart" id="kickstart"
         #if $profile
             value="$profile.kickstart" 
         #end if
     />
-    <br/>
+    <p class="context-tip">An absolute filesystem path to a template (preferred), or http:// URL</p>
+    </td>
+    </tr>
 
+    <tr>
+    <td>
     <label for="kopts">Kernel Options</label>
+    </td>
+    <td>
     <input type="text" size="128" style="width: 150px;" name="kopts" id="kopts"
         #if $profile
             value="$profile.kernel_options"
         #end if
     />
-    <br/>
+    <p class="context-tip">Example: noipv6 magic=foo</p>
+    </td>
+    </tr>
 
+    <tr>
+    <td>
     <label for="ksmeta">Kickstart Metadata</label>
+    </td>
+    <td>
     <input type="text" size="128" style="width: 150px;" name="ksmeta" id="ksmeta"
         #if $profile
            value="$profile.ks_meta"
         #end if
     />
-    <br/>
+    <p class="context-tip">Example: dog=fido gnome=yes</p>
+    </td>
+    </tr>
 
+    <tr>
+    <td>
     <label for="virtfilesize">Virt File Size (GB)</label>
+    </td>
+    <td>
     <input type="text" size="128" style="width: 150px;" name="virtfilesize" id="virtfilesize"
         #if $profile
            value="$profile.virt_file_size"
         #end if
     />
-    <br/>
+    <p class="context-tip">For virtual installs only, require this disk size in GB.</p>
+    </td>
+    </tr>
 
+    <tr>
+    <td>
     <label for="virtram">Virt RAM (MB)</label>
+    </td>
+    <td>
     <input type="text" size="128" style="width: 150px;" name="virtram" id="virtram"
         #if $profile
            value="$profile.virt_ram"
         #end if
     />
-    <br/>
+    <p class="context-tip">For virtual installs only, allocate this amount of RAM, in MB.</p>
+    </td>
+    </tr>
 
+    <tr>
+    <td>
     <label for="virttype">Virt Type (xenpv, qemu)</label>
-    <input type="text" size="128" style="width: 150px;" name="virttype" id="virttype"
+    </td>
+    <td>
+    #if $profile and $profile.virt_type == "auto"
+        <input type="radio" name="virttype" id="virttype" value="auto" checked>Any
+    #else
         #if $profile
-           value="$profile.virt_type"
-        #end if
-    />
-    <br/>
+            <input type="radio" name="virttype" id="virttype" value="auto">Any
+        #else
+            <input type="radio" name="virttype" id="virttype" value="auto" checked>Any
+        #end if 
+    #end if
+    #if $profile and $profile.virt_type == "xenpv"
+        <input type="radio" name="virttype" id="virttype" value="xenpv" checked>Xen (pv)
+    #else
+        <input type="radio" name="virttype" id="virttype" value="xenpv">Xen (pv)
+    #end if
+    #if $profile and $profile.virt_type == "qemu"
+        <input type="radio" name="virttype" id="virttype" value="qemu" checked>qemu/KVM
+    #else
+        <input type="radio" name="virttype" id="virttype" value="qemu">qemu/KVM
+    #end if
+    <p class="context-tip">What virtualization technology should koan use?</p>
+    </td>
+    </tr>
 
+    <tr>
+    <td>
     <label for="virtpath">Virt Path</label>
+    </td>
+    <td>
     <input type="text" size="128" style="width: 150px;" name="virtpath" id="virtpath"
         #if $profile
            value="$profile.virt_path"
         #end if
     />
-    <br/>
+    <p class="context-tip">Sets koan's storage preferences, read manpage or leave blank.</p>
+    </td>
+    </tr>
 
+    ## FIXME: this should be a multi-select
+    <tr>
+    <td>
     <label for="repos">Repo Names</label>
+    </td>
+    <td>
     <input type="text" size="128" style="width: 150px;" name="repos" id="repos"
         #if $profile
            value="$profile.repos"
         #end if
     />
-    <br/>
+    <p class="context-tip">Example: "el5i386updates el5epeltesting el5mycontent"</p>
+    </td>
+    </tr>
 
+    <tr>
+    <td>
     <label for="dhcptag">DHCP Tag</label>
+    </td>
+    <td>
     <input type="text" size="128" style="width: 150px;" name="dhcptag" id="dhcptag"
         #if $profile
            value="$profile.dhcp_tag" 
         #end if
     />
-    <br/>
+    <p class="context-tip">Specifies alternative DHCP configuration, see manpage or leave blank</p>
+    </td>
+    </tr>
 
     #if $profile
+    <tr>
+    <td>
     <label for="delete">Delete</label>
+    </td>
+    <td>
        <input type="checkbox" name="delete1" value="delete1">Yes
        <input type="checkbox" name="delete2" value="delete2">Really
-    <br/>
+    <p class="context-tip">Check both buttons and click save to delete this object</p>
+    </td>
+    </tr>
     #end if
 
-
-
+    <tr>
+    <td>
+    </td>
+    <td>
     <input type="submit" name="submit" value="Save"/>
     <input type="reset" name="reset" value="Reset"/>
+    </td>
+    </tr>
 
 </fieldset>
 #end block body