Changeset 566 for trunk/grails-app/views

Timestamp:

Jun 3, 2010, 4:31:44 AM (15 years ago)

Author:

gav

Message:

Improvements to inventory text search, add inventoryGroup and hide Limit Search unless one of the values is true.

File:

• trunk/grails-app/views/inventoryItemDetailed/search.gsp (modified) (1 diff)

trunk/grails-app/views/inventoryItemDetailed/search.gsp

@@ -271 +271 @@
                         <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:checkBox name="searchName" value="${true}" ></g:checkBox> -->
-                                <label for="searchName">Name,</label>
-<!--                                 <g:checkBox name="searchDescription" value="${true}" ></g:checkBox> -->
-                                <label for="searchDescription">Description,</label>
-<!--                                 <g:checkBox name="searchComment" value="${true}" ></g:checkBox> -->
-                                <label for="searchComment">Comment,</label>
-<!--                                 <g:checkBox name="searchLocation" value="${true}" ></g:checkBox> -->
-                                <label for="searchLocation">Location and</label>
-<!--                                 <g:checkBox name="searchSpareFor" value="${true}" ></g:checkBox> -->
-                                <label for="searchSpareFor">Spare For (Asset: name, description and comment).</label>
+                                <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>