Add search to the webapp. Currently all areas are implemented on the backend though we need to tweak out the search forms to allow searching on simulatenous fields and prepopulate the options with fields folks will want to search against.

5 files changed, 85 insertions, 20 deletions

diff --git a/webui_templates/blank.tmpl b/webui_templates/blank.tmpl
index 0b0d4f7d..7b33dd50 100644
--- a/webui_templates/blank.tmpl
+++ b/webui_templates/blank.tmpl
@@ -1,8 +1,12 @@
 #extends cobbler.webui.master
 
 #block body
+#if $getVar('more_blank','') == ''
 You are now logged in to <A HREF="http://fedorahosted.org/cobbler">Cobbler</A>.
 
 Main screen turn on.
-
+#else
+Cobbler awaits your command.
+<!-- for great justice -->
+#end if
 #end block body
diff --git a/webui_templates/empty.tmpl b/webui_templates/empty.tmpl
index 7a76ddad..9f6d6725 100644
--- a/webui_templates/empty.tmpl
+++ b/webui_templates/empty.tmpl
@@ -1,5 +1,9 @@
 #extends cobbler.webui.master
 
 #block body
+#if $getVar('search','') == ''
 No items found.  Add some using the links on the left.
+#else
+No matches found.
+#end if
 #end block body
diff --git a/webui_templates/master.tmpl b/webui_templates/master.tmpl
index 6080b819..80865605 100644
--- a/webui_templates/master.tmpl
+++ b/webui_templates/master.tmpl
@@ -29,43 +29,54 @@
         <li><a href="/cobbler/webui/wui.html" class="menu">Docs</a></li>
         <li><a href="$base_url?mode=settings_view" class="menu">Settings</a></li>
         <li><hr/></li>
-        <li><a href="$base_url?mode=distro_list" class="menu">Distros</a></li>
-	    #if $mode == "distro_list"
+        <li><a class="menu">Distros</span></li>
+	    ##if $mode.find("distro") != -1
     	    <ul id="navaction">
+                <li><a href="$base_url?mode=distro_list" class="menu">View</a></li>
+        	<li><a href="$base_url?mode=distro_search" class="menu">Search</a></li>
         	<li><a href="$base_url?mode=distro_edit" class="menu">Add</a></li>
 	    </ul>
-	    #end if
-        <li><a href="$base_url?mode=profile_list" class="menu">Profiles</a></li>
-	    #if $mode == "profile_list"
+	    ##end if
+        <li><a class="menu">Profiles</span></li>
+	    ##if $mode.find("profile") != -1
     	    <ul id="navaction">
+                <li><a href="$base_url?mode=profile_list" class="menu">View</a></li>
+        	<li><a href="$base_url?mode=profile_search" class="menu">Search</a></li>
         	<li><a href="$base_url?mode=profile_edit" class="menu">Add</a></li>
     		<li><a href="$base_url?mode=subprofile_edit" class="menu">Add child</a></li>
 	    </ul>
-	    #end if	    
-        <li><a href="$base_url?mode=system_list" class="menu">Systems</a></li>
-	    #if $mode == "system_list"       
+	    ##end if	    
+        <li><a class="menu">Systems</span></li>
+	    ##if $mode.find("system") != -1
     	    <ul id="navaction">
+                <li><a href="$base_url?mode=system_list" class="menu">View</a></li>
+        	<li><a href="$base_url?mode=system_search" class="menu">Search</a></li>
     		<li><a href="$base_url?mode=system_edit_new" class="menu">Add</a></li>
 	    </ul>
-	    #end if	    
-        <li><a href="$base_url?mode=ksfile_list" class="menu">Kickstarts</a></li>
-	    #if $mode == "ksfile_list"
+	    ##end if	    
+        <li><a class="menu">Kickstarts</span></li>
+	    ##if $mode.find("ksfile") != -1
     	    <ul id="navaction">
+                <li><a href="$base_url?mode=ksfile_list" class="menu">View</a></li>
 	        <li><a href="$base_url?mode=ksfile_new" class="menu">Add</a></li>
 	    </ul>
-	    #end if	    
-        <li><a href="$base_url?mode=repo_list" class="menu">Repos</a></li>
-	    #if $mode == "repo_list"
+	    ##end if	    
+        <li><a class="menu">Repos</span></li>
+	    ##if $mode.find("repo") != -1
     	    <ul id="navaction">
+                <li><a href="$base_url?mode=repo_list" class="menu">View</a></li>
+        	<li><a href="$base_url?mode=repo_search" class="menu">Search</a></li>
 	        <li><a href="$base_url?mode=repo_edit" class="menu">Add</a></li>
 	    </ul>
-	    #end if	    
-        <li><a href="$base_url?mode=image_list" class="menu">Images</a></li>
-	    #if $mode == "image_list"
+	    ##end if	    
+        <li><a class="menu">Images</span></li>
+	    ##if $mode.find("image") != -1
     	    <ul id="navaction">
+                <li><a href="$base_url?mode=image_list" class="menu">View</a></li>
+        	<li><a href="$base_url?mode=image_search" class="menu">Search</a></li>
 	        <li><a href="$base_url?mode=image_edit" class="menu">Add</a></li>
 	    </ul>
-	    #end if	    
+	    ##end if	    
         <li><hr/><br/></li>
         <li><a class="button sync" href="$base_url?mode=sync">Sync</a></li>
     </ul>
diff --git a/webui_templates/paginate.tmpl b/webui_templates/paginate.tmpl
index 9b20e560..66bf6345 100644
--- a/webui_templates/paginate.tmpl
+++ b/webui_templates/paginate.tmpl
@@ -1,3 +1,4 @@
+#if $page > 0
     ## USAGE:  # set global what="system" 
     ##         # include "/path/to/this/file"
 
@@ -28,4 +29,4 @@
 
     <br/>
     <br/>
-
+#end if
diff --git a/webui_templates/search.tmpl b/webui_templates/search.tmpl
new file mode 100644
index 00000000..f3fca6cb
--- /dev/null
+++ b/webui_templates/search.tmpl
@@ -0,0 +1,45 @@
+#extends cobbler.webui.master
+#block body
+
+<script language="javascript">
+</script>
+
+#set $form_dest=$base_url+"?mode="+$what+"_search_execute"
+
+<form method="POST" action="$form_dest">
+<fieldset id="cform">
+
+    <legend>$caption</legend>
+    <table border=0>
+
+    <tr>
+
+    <td>
+    <select id="key1" name="key1">
+       <option value="name">name</option>
+       #if $what == "distro":
+           <option value="kernel">kernel</option>
+           <option value="initrd">initrd</option>
+       #elif $what == "profile"
+           <option value="distro">distro</option>
+       #elif $what == "system"
+           <option value="profile">profile</option>
+           <option value="image">image</option>
+       ## FIMXE: more values for more fields, add images, add repos
+       #end if
+    </select>
+    </td>
+
+    ## FIXME copy and paste key2,value2 and key3,value3 in a loop
+    <td>
+    <input type="text" id="value1" name="value1"/>
+    </td>
+  
+    </table>
+
+    <input type="submit" value="search"/>
+
+</fieldset>
+
+</form>
+#end block body