Index: /trunk/grails-app/views/inventoryItemDetailed/search.gsp
===================================================================
--- /trunk/grails-app/views/inventoryItemDetailed/search.gsp	(revision 568)
+++ /trunk/grails-app/views/inventoryItemDetailed/search.gsp	(revision 569)
@@ -17,30 +17,92 @@
         <div class="body">
             <g:render template="/shared/messages" />
-            <filterpane:currentCriteria domainBean="InventoryItem"
-                                    action="search"
-                                    dateFormat="EEE, dd-MMM-yyyy"
-                                    removeImgDir="images" 
-                                    removeImgFile="bullet_delete.png"
-                                    title="Advanced Search"/>
-
-            <div class="paginateButtons">
-                <span class="searchButtons">
-                    <a href='' onclick="showElement('searchPane'); return false;">Quick</a>
-                </span>
-                Results: ${inventoryItemInstanceList.size()} / ${inventoryItemInstanceTotal}
-                <span class="searchButtons">
-                    <filterpane:filterButton text="Advanced" appliedText="Advanced" />
-                </span>
-            </div>
-
-            <jsUtil:toggleControl toggleId="options"
-                                                    imageId="optionsImg"
-                                                    closedImgUrl="${resource(dir:'images/skin',file:'bullet_arrow_right.png')}"
-                                                    openImgUrl="${resource(dir:'images/skin',file:'bullet_arrow_down.png')}"
-                                                    text="${g.message(code: 'default.options.text')}"
-                                                    />
-
-            <div id="options" style="display:none;">
-                <g:form method="post" >
+
+            <div class="textSearchWrapper">
+                <div class="textSearchInput">
+
+                    <filterpane:isFiltered >
+                        <filterpane:currentCriteria domainBean="InventoryItem"
+                                                action="search"
+                                                dateFormat="EEE, dd-MMM-yyyy"
+                                                removeImgDir="images"
+                                                removeImgFile="bullet_delete.png"
+                                                title="Advanced Search"/>
+                        <div class="paginateButtons">
+                            Results: ${inventoryItemInstanceList.size()} / ${inventoryItemInstanceTotal}
+                        </div>
+                    </filterpane:isFiltered >
+
+                    <filterpane:isNotFiltered >
+                        <g:form method="post" id="textSearchForm" name="textSearchForm" >
+                            <g:hiddenField name="newTextSearch" value="true" />
+
+                                <span> <!--Prevent IE inheriting margin-->
+                                    <input type="text" style="width:450px;" maxlength="75" id="searchText" name="searchText" value="${filterParams.searchText}"/>
+                                    <g:helpBalloon code="inventoryItem.search.searchText" />
+
+                                    <g:if test="${params.searchName || params.searchDescription || params.searchComment || params.searchLocation || params.searchGroup || params.searchSpareFor}" >
+                                        <div id="limitSearch" class="textSearchSelect">
+                                    </g:if>
+                                    <g:else>
+                                        <div id="limitSearch" class="textSearchSelect" style="display:none;">
+                                    </g:else>
+                                            Limit Search:
+                                            <br />
+                                            <g:checkBox name="searchName" value="${params.searchName}" ></g:checkBox>
+                                            <label for="searchName">Name</label>
+                                            <g:checkBox name="searchDescription" value="${params.searchDescription}" ></g:checkBox>
+                                            <label for="searchDescription">Description</label>
+                                            <g:checkBox name="searchComment" value="${params.searchComment}" ></g:checkBox>
+                                            <label for="searchComment">Comment</label>
+                                            <g:checkBox name="searchLocation" value="${params.searchLocation}" ></g:checkBox>
+                                            <label for="searchLocation">Location</label>
+                                            <g:checkBox name="searchGroup" value="${params.searchGroup}" ></g:checkBox>
+                                            <label for="searchGroup">Group</label>
+                                            <br />
+                                            <g:checkBox name="searchSpareFor" value="${params.searchSpareFor}" ></g:checkBox>
+                                            <label for="searchSpareFor">Spare For (Asset: Name, Description and Comment).</label>
+                                        </div>
+
+                                    <div class="paginateButtons">
+                                        <span class="buttons">
+                                            <g:actionSubmit class="search" value="Search" action="search" />
+                                        </span>
+                                        <span class="buttons" style="margin-left: 5px;">
+                                            <g:actionSubmit class="complete" value="Select" action="search" onclick="toggleWithEffectUtil('limitSearch'); return false;"/>
+                                        </span>
+                                        <div class="paginateButtons">
+                                            Results: ${inventoryItemInstanceList.size()} / ${inventoryItemInstanceTotal}
+                                        </div>
+                                    </div><!--paginateButtons-->
+                                </span> <!--Prevent IE inheriting margin-->
+
+                        </g:form>
+                    </filterpane:isNotFiltered >
+
+                </div><!--textSearchInput-->
+
+                <div class="textSearchRightFloat">
+                    <div class="paginateButtons">
+                        <span class="searchButtons">
+                            <a href='' onclick="showElement('searchPane'); return false;">Quick</a>
+                        </span>
+                        <br />
+                        <br />
+                        <span class="searchButtons">
+                            <filterpane:filterButton text="Advanced" appliedText="Advanced" />
+                        </span>
+                    </div>
+
+                    <jsUtil:toggleControl toggleId="options"
+                                                            imageId="optionsImg"
+                                                            closedImgUrl="${resource(dir:'images/skin',file:'bullet_arrow_right.png')}"
+                                                            openImgUrl="${resource(dir:'images/skin',file:'bullet_arrow_down.png')}"
+                                                            text="${g.message(code: 'default.options.text')}"
+                                                            />
+                </div><!--textSearchRightFloat-->
+            </div><!--textSearchWrapper-->
+
+            <div id="options" style="display:none; clear:both;">
+                <g:form method="post">
                     <g:hiddenField name="params" value="${filterParams}" />
                     <div class="dialog">
@@ -97,5 +159,5 @@
             <br />
 
-            <g:if test="${inventoryItemInstanceList.size() > 10}">
+            <g:if test="${inventoryItemInstanceList.size() > 2}">
                 <g:if test="${inventoryItemInstanceTotal > inventoryItemInstanceList.size()}">
                     <div class="paginateButtons">
@@ -256,58 +318,6 @@
                 </table>
 
-                <table>
-                    <tbody>
-
-                        <tr class="prop">
-                            <td valign="top" class="name">
-                                <label for="searchText">Search:</label>
-                            </td>
-                            <td valign="top" class="value">
-                                <input type="text" style="width:450px" maxlength="75" id="searchText" name="searchText" value="${filterParams.searchText}"/>
-                                <g:helpBalloon code="inventoryItem.search.searchText" />
-                            </td>
-                        </tr>
-
-                        <tr class="prop">
-                            <td valign="top" class="name">
-
-                                <jsUtil:toggleControl toggleId="limitSearch"
-                                                                        imageId="limitSearchImg"
-                                                                        closedImgUrl="${resource(dir:'images/skin',file:'bullet_toggle_plus.png')}"
-                                                                        openImgUrl="${resource(dir:'images/skin',file:'bullet_toggle_minus.png')}"
-                                                                        effect="fade"
-                                                                        text="Limit Search"
-                                                                        />
-                            </td>
-                            <td valign="top" class="value">
-                                <g:if test="${params.searchName || params.searchDescription || params.searchComment || params.searchLocation || params.searchGroup || params.searchSpareFor}" >
-                                    <div id="limitSearch">
-                                </g:if>
-                                <g:else>
-                                    <div id="limitSearch" style="display:none;">
-                                </g:else>
-                                    <g:checkBox name="searchName" value="${params.searchName}" ></g:checkBox>
-                                    <label for="searchName">Name</label>
-                                    <g:checkBox name="searchDescription" value="${params.searchDescription}" ></g:checkBox>
-                                    <label for="searchDescription">Description</label>
-                                    <g:checkBox name="searchComment" value="${params.searchComment}" ></g:checkBox>
-                                    <label for="searchComment">Comment</label>
-                                    <g:checkBox name="searchLocation" value="${params.searchLocation}" ></g:checkBox>
-                                    <label for="searchLocation">Location</label>
-                                    <g:checkBox name="searchGroup" value="${params.searchGroup}" ></g:checkBox>
-                                    <label for="searchGroup">Group</label>
-                                    <br />
-                                    <g:checkBox name="searchSpareFor" value="${params.searchSpareFor}" ></g:checkBox>
-                                    <label for="searchSpareFor">Spare For (Asset: Name, Description and Comment).</label>
-                                </div>
-                            </td>
-                        </tr>
-
-                    </tbody>
-                </table>
-
                 <div class="buttons">
                     <span class="button">
-                        <g:actionSubmit class="save" value="Update" action="search" />
                         <g:actionSubmit class="cancel" value="${g.message(code:'fp.tag.filterPane.button.cancel.text', default:'Cancel')}" onclick="return hideElement('searchPane');" />
                     </span>
Index: /trunk/web-app/css/main.css
===================================================================
--- /trunk/web-app/css/main.css	(revision 568)
+++ /trunk/web-app/css/main.css	(revision 569)
@@ -5,5 +5,5 @@
 }
 
-/** 
+/**
 * GENERAL.
 * Commonly used application colours:
@@ -147,4 +147,16 @@
 }
 
+/* Ask IE to behave. Margin, width and height might be ignored by some FF versions. */
+input[type="checkbox"] {
+    background: transparent;
+    border: 0;
+    margin-bottom: -1px;
+}
+input[type="radio"] {
+    background: transparent;
+    border: 0;
+    margin-bottom: -1px;
+}
+
 /* Logout and Top Navigation Level */
 
@@ -341,4 +353,7 @@
 /* LIST */
 
+div.list {
+    clear:both;
+}
 .list table {
     border-collapse: collapse;
@@ -506,4 +521,28 @@
   width: 1020px;
   height: 100px;
+}
+
+/* Text Search */
+div.textSearchWrapper {
+    float: left;
+    width: 100%;
+}
+
+div.textSearchInput {
+    float: left;
+    width: 500px;
+    margin: 0 0 0 220px;
+    padding: 0;
+}
+
+div.textSearchSelect {
+    text-align: left;
+    padding: 5px 5px 5px 15px;
+}
+
+div.textSearchRightFloat {
+    float: right;
+    text-align: right;
+    margin: 0 10px 0 0;
 }