Index: branches/WebApplication/MVC2/HLWebOKBQueryPlugin/Views/Filter/Filters.ascx
===================================================================
--- branches/WebApplication/MVC2/HLWebOKBQueryPlugin/Views/Filter/Filters.ascx	(revision 6268)
+++ branches/WebApplication/MVC2/HLWebOKBQueryPlugin/Views/Filter/Filters.ascx	(revision 6303)
@@ -8,27 +8,44 @@
 <script src="/Scripts/MicrosoftMvcValidation.js" type="text/javascript"></script>
 
+<script type="text/javascript">
+    function setAction(action, id) {
+        document.getElementById('selectedFilter').value = id;
+        document.getElementById('action').value = action;
+        document.filterForm.submit();
+    }
+</script>
+
+
 <% Html.EnableClientValidation(); %>
+ <% using (Html.BeginForm("AddFilter", "Filter", FormMethod.Post, new { Name = "filterForm" })) %>
+    <% {  %>  
+<!-- Put all into a form that calls the "AddFilter" Action-->
 
-<!-- Put all into a form that calls the "AddFilter" Action-->
-<div><table>
+    <%
+     CombinedFilter topFilter = ((FilterModel)Model).Content;
+    %>
+    <div><table>
 <tr><td>A<br />N<br />D</td><td>
-<p>
-    <%
-        CombinedFilter topFilter = ((FilterModel)Model).Content;
+
+
+   
+           <%
+     foreach (Filter fNode in topFilter.Filters)
+     {
+
+         CombinedFilter currentFilter = (CombinedFilter)fNode;
+         string comboboxName = FilterModel.ComboboxName + "." + currentFilter.Id;
+         string hiddenName = FilterModel.ParentIdName + "." + currentFilter.Id;
     %>
-    <% using (Html.BeginForm("AddFilterAnd", "Filter", FormMethod.Post, new { id = topFilter.Id, name = topFilter.Id })) %>
-    <% {    
-           
-            foreach (Filter fNode in topFilter.Filters)
-            {
-
-                CombinedFilter currentFilter = (CombinedFilter)fNode;
-                string comboboxName = FilterModel.ComboboxName + "." + currentFilter.Id;
-                string hiddenName = FilterModel.ParentIdName + "." + currentFilter.Id;
-    %>
-    <%: Html.Hidden(hiddenName,currentFilter.Id.ToString()) %>
-    <%: Html.DropDownList( comboboxName, new SelectList(((FilterModel)Model).AvailableFilterForCombobox, "FilterTypeName", "Label"))%>
-    <input type="submit" name="submitButton" value="+.<%:currentFilter.Id%>" />
-</p>
+    <table border="0"><tr><td>
+    <%: Html.Hidden(hiddenName, currentFilter.Id.ToString())%>
+      <%: Html.Hidden("selectedFilter",null, new { Id = "selectedFilter" })%>
+       <%: Html.Hidden("action", null, new { Id = "action" })%>
+    <%: Html.DropDownList(comboboxName, new SelectList(((FilterModel)Model).AvailableFilterForCombobox, "FilterTypeName", "Label"))%>
+   
+   
+    <input type="button" name="submitButton" value="+" class="hl-button-text-plus"   onClick="setAction('add','<%: currentFilter.Id%>');" />
+   <!-- <input type="submit" name="submitButton" value="+.<%:currentFilter.Id%>"  />-->
+</td></tr><tr><td>
 <!-- Build the selected filters. The filtesr will be stored in the session and the
 Controller puts the current filters from the session into the model. Selected Filters
@@ -42,46 +59,46 @@
            {  %>
 
-           <table border="0"><tr><td>
+           <tr><td>
     <%
            
 
-if ("StringComparisonFilter".Equals(f.GetType().Name))
-{  %>
+     if ("StringComparisonFilter".Equals(f.GetType().Name))
+     {  %>
     <% StringComparisonFilter filter = ((StringComparisonFilter)f); %>
     <%: Html.Label(filter.Label)%>
-    <%: Html.DropDownList(f.Id + "." + FilterModel.ComparisonDropDownList, new SelectList(FilterModel.StringComparisons, "Value", "Text",(int)filter.Comparison))%>   
+    <%: Html.DropDownList(f.Id + "." + FilterModel.ComparisonDropDownList, new SelectList(FilterModel.StringComparisons, "Value", "Text", (int)filter.Comparison))%>   
     <%: Html.TextBox(f.Id + "." + FilterModel.ValueTextbox, (filter.Value))%>
-    <%: Html.TextBoxFor(model => ((FilterModel)Model).IntValue, (filter.Value)) %>
-    <%: Html.ValidationMessageFor(model => ((FilterModel)Model).IntValue) %>
+    <%: Html.TextBoxFor(model => ((FilterModel)Model).IntValue, (filter.Value))%>
+    <%: Html.ValidationMessageFor(model => ((FilterModel)Model).IntValue)%>
     <% }
-else if ("NameStringComparisonFilter".Equals(f.GetType().Name))
-{ %>
+     else if ("NameStringComparisonFilter".Equals(f.GetType().Name))
+     { %>
     <% NameStringComparisonFilter filter = ((NameStringComparisonFilter)f); %>
     <%: Html.Label(filter.Label)%>
-    <%: Html.DropDownList(f.Id + "." + FilterModel.ComparisonDropDownList, new SelectList(FilterModel.StringComparisons, "Value", "Text",(int)filter.Comparison))%>   
+    <%: Html.DropDownList(f.Id + "." + FilterModel.ComparisonDropDownList, new SelectList(FilterModel.StringComparisons, "Value", "Text", (int)filter.Comparison))%>   
     <%: Html.TextBox(f.Id + "." + FilterModel.ValueTextbox, filter.Value)%>
     <% }
-else if ("StringComparisonAvailableValuesFilter".Equals(f.GetType().Name))
-{ %>
+     else if ("StringComparisonAvailableValuesFilter".Equals(f.GetType().Name))
+     { %>
     <% StringComparisonAvailableValuesFilter filter = ((StringComparisonAvailableValuesFilter)f); %>
     <%: Html.Label(filter.Label)%>
-    <%: Html.DropDownList(f.Id + "." + FilterModel.ComparisonDropDownList, new SelectList(FilterModel.StringComparisons, "Value", "Text",(int)filter.Comparison))%>   
+    <%: Html.DropDownList(f.Id + "." + FilterModel.ComparisonDropDownList, new SelectList(FilterModel.StringComparisons, "Value", "Text", (int)filter.Comparison))%>   
     <%: Html.DropDownList(f.Id + "." + FilterModel.ValueTextbox, new SelectList(filter.AvailableValues, filter.Value))%>
     <% }
-else if ("NameEqualityComparisonByteArrayFilter".Equals(f.GetType().Name))
-{ %>
+     else if ("NameEqualityComparisonByteArrayFilter".Equals(f.GetType().Name))
+     { %>
     <% NameEqualityComparisonByteArrayFilter filter = ((NameEqualityComparisonByteArrayFilter)f); %>
     <%: Html.Label(filter.Label)%>
     <%: Html.Label("not supported")%>
     <% }
-else if ("NameEqualityComparisonBoolFilter".Equals(f.GetType().Name))
-{ %>
+     else if ("NameEqualityComparisonBoolFilter".Equals(f.GetType().Name))
+     { %>
     <% NameEqualityComparisonBoolFilter filter = ((NameEqualityComparisonBoolFilter)f);   %>
     <%: Html.Label(filter.Label)%>
-    <%: Html.DropDownList(f.Id + "." + FilterModel.ComparisonDropDownList, new SelectList(FilterModel.BoolComparisons, "Value", "Text",(int)filter.Comparison))%>      
+    <%: Html.DropDownList(f.Id + "." + FilterModel.ComparisonDropDownList, new SelectList(FilterModel.BoolComparisons, "Value", "Text", (int)filter.Comparison))%>      
     <%: Html.DropDownList(f.Id + "." + FilterModel.ValueDropDownList, new SelectList(((FilterModel)Model).BoolStates, filter.Value))%>
     <% }
-else if ("NameOrdinalComparisonIntFilter".Equals(f.GetType().Name))
-{ %>
+     else if ("NameOrdinalComparisonIntFilter".Equals(f.GetType().Name))
+     { %>
     <% NameOrdinalComparisonIntFilter filter = ((NameOrdinalComparisonIntFilter)f);   %>
     <%: Html.Label(filter.Label)%>
@@ -89,13 +106,13 @@
     <%: Html.TextBox(f.Id + "." + FilterModel.ValueTextbox, filter.Value)%>
     <% }
-else if ("NameStringComparisonAvailableValuesFilter".Equals(f.GetType().Name))
-{ %>
+     else if ("NameStringComparisonAvailableValuesFilter".Equals(f.GetType().Name))
+     { %>
     <% NameStringComparisonAvailableValuesFilter filter = ((NameStringComparisonAvailableValuesFilter)f);   %>
     <%: Html.Label(filter.Label)%>
-    <%: Html.DropDownList(f.Id + "." + FilterModel.ComparisonDropDownList, new SelectList(FilterModel.StringComparisons, "Value", "Text",(int)filter.Comparison))%>   
+    <%: Html.DropDownList(f.Id + "." + FilterModel.ComparisonDropDownList, new SelectList(FilterModel.StringComparisons, "Value", "Text", (int)filter.Comparison))%>   
     <%: Html.DropDownList(f.Id + "." + FilterModel.ValueDropDownList, new SelectList(filter.AvailableValues, filter.Value))%>
     <% }
-else if ("NameOrdinalComparisonDoubleFilter".Equals(f.GetType().Name))
-{ %>
+     else if ("NameOrdinalComparisonDoubleFilter".Equals(f.GetType().Name))
+     { %>
     <% NameOrdinalComparisonDoubleFilter filter = ((NameOrdinalComparisonDoubleFilter)f);   %>
     <%: Html.Label(filter.Label)%>
@@ -103,6 +120,6 @@
     <%: Html.TextBox(f.Id + "." + FilterModel.ValueTextbox, filter.Value)%>
     <% }
-else if ("NameOrdinalComparisonFloatFilter".Equals(f.GetType().Name))
-{ %>
+     else if ("NameOrdinalComparisonFloatFilter".Equals(f.GetType().Name))
+     { %>
     <% NameOrdinalComparisonFloatFilter filter = ((NameOrdinalComparisonFloatFilter)f);   %>
     <%: Html.Label(filter.Label)%>
@@ -110,6 +127,6 @@
     <%: Html.TextBox(f.Id + "." + FilterModel.ValueTextbox, filter.Value)%>
     <% }
-else if ("NameOrdinalComparisonLongFilter".Equals(f.GetType().Name))
-{ %>
+     else if ("NameOrdinalComparisonLongFilter".Equals(f.GetType().Name))
+     { %>
     <% NameOrdinalComparisonLongFilter filter = ((NameOrdinalComparisonLongFilter)f);   %>
     <%: Html.Label(filter.Label)%>
@@ -117,6 +134,6 @@
     <%: Html.TextBox(f.Id + "." + FilterModel.ValueTextbox, filter.Value)%>
     <% }
-else if ("OrdinalComparisonDateTimeFilter".Equals(f.GetType().Name))
-{ %>
+     else if ("OrdinalComparisonDateTimeFilter".Equals(f.GetType().Name))
+     { %>
     <% OrdinalComparisonDateTimeFilter filter = ((OrdinalComparisonDateTimeFilter)f);   %>
     <%: Html.Label(filter.Label)%>
@@ -126,20 +143,24 @@
                   
     %>
-
-    <input type="submit" name="submitButton" value="-.<%:f.Id%>"    />
+       <!-- <input type="submit" name="submitButton" value="-.<%:f.Id%>"  class="hl-icon-delete"  style="text-indent:-999em;"  />
+       -->
+    <input type="button" name="submitButton" value="-"  class="hl-icon-delete"  onClick="setAction('delete','<%: f.Id%>');" />
    
 <% }%>
-    </td></tr></table>
+    </td></tr>
     <% } %>
+     </table></td></tr>
  <%  }%>
    <% }%>
- <input type="submit" name="submitButton"  value="or" />
+
+
+
+ 
+  </table> <input type="button" name="submitButton"  value="or"  onClick="setAction('or','');"  />
  </br>
- <input type="submit" name="submitButton" value="runs" />
-
-  
-
-<% }
-      
-%> </td></tr>
-</table></div>
+ <input type="button" name="submitButton" value="runs"  onClick="setAction('runs','');" />
+ 
+ 
+<% }    
+%>
+ </div>
Index: branches/WebApplication/MVC2/HLWebOKBQueryPlugin/Views/Filter/Results.aspx
===================================================================
--- branches/WebApplication/MVC2/HLWebOKBQueryPlugin/Views/Filter/Results.aspx	(revision 6303)
+++ branches/WebApplication/MVC2/HLWebOKBQueryPlugin/Views/Filter/Results.aspx	(revision 6303)
@@ -0,0 +1,49 @@
+﻿<%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage" %>
+
+<%@ Import Namespace="HLWebOKBQueryPlugin.Models" %>
+<%@ Import Namespace="HLWebOKBQueryPlugin.OKBQueryService" %>
+<%@ Import Namespace="HLWebOKBQueryPlugin.Helpers" %>
+
+<asp:Content ID="Content1" ContentPlaceHolderID="TitleContent" runat="server">
+    Results
+</asp:Content>
+<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
+    <h2>
+        Results</h2>
+    <table class="hl-dataTable">
+        <thead>
+            <tr>
+                <th>
+                    Number of Run
+                </th>
+                <th>
+                    Action
+                </th>
+            </tr>
+        </thead>
+        <tbody>
+            <%
+         
+                QueryModel model = (QueryModel)Model;
+
+                if (model != null && model.RunCollection != null)
+                {
+                    int i = 0;
+                    foreach (RunCollectionData rc in model.RunCollection)
+                    {
+                        i++;
+            %><tr>
+                <td>
+                    <%= i %>
+                </td>
+                <td>
+                    <%: Html.ActionLink("details", "Details", "Query", rc, null)%>
+                </td>
+            </tr>
+            <%
+}
+        }
+            %>
+        </tbody>
+    </table>
+</asp:Content>
