Index: /trunk/grails-app/controllers/AssetDetailedController.groovy
===================================================================
--- /trunk/grails-app/controllers/AssetDetailedController.groovy	(revision 325)
+++ /trunk/grails-app/controllers/AssetDetailedController.groovy	(revision 326)
@@ -16,4 +16,20 @@
     @Secured(['ROLE_AppAdmin', 'ROLE_Manager', 'ROLE_AssetManager', 'ROLE_AssetUser'])
     def index = { redirect(action:search,params:params) }
+
+    /**
+    * Set session.assetSearchParamsMax
+    */
+    @Secured(['ROLE_AppAdmin', 'ROLE_Manager', 'ROLE_AssetManager', 'ROLE_AssetUser'])
+    def setSearchParamsMax = {
+        def max = 1000
+        if(params.newMax.isInteger()) {
+            def i = params.newMax.toInteger()
+            if(i > 0 && i <= max)
+                session.assetSearchParamsMax = params.newMax
+            if(i > max)
+                session.assetSearchParamsMax = max
+        }
+        forward(action: 'search', params: params)
+    }
 
     /**
@@ -167,5 +183,5 @@
 
             response.contentType = ConfigurationHolder.config.grails.mime.types[params.format]
-            response.setHeader("Content-disposition", "attachment; filename=tasks.${params.extension}")
+            response.setHeader("Content-disposition", "attachment; filename=assets.${params.extension}")
             List fields = ["section.site",
                                 "section",
Index: /trunk/grails-app/controllers/TaskDetailedController.groovy
===================================================================
--- /trunk/grails-app/controllers/TaskDetailedController.groovy	(revision 325)
+++ /trunk/grails-app/controllers/TaskDetailedController.groovy	(revision 326)
@@ -26,5 +26,5 @@
 
     @Secured(['ROLE_AppAdmin', 'ROLE_Manager', 'ROLE_TaskManager', 'ROLE_TaskUser'])
-    def setTaskSearchParamsMax = {
+    def setSearchParamsMax = {
         def max = 1000
         if(params.newMax.isInteger()) {
Index: /trunk/grails-app/views/assetDetailed/search.gsp
===================================================================
--- /trunk/grails-app/views/assetDetailed/search.gsp	(revision 325)
+++ /trunk/grails-app/views/assetDetailed/search.gsp	(revision 326)
@@ -25,9 +25,70 @@
 
             <div class="paginateButtons">
+                Results: ${assetInstanceList.size()} / ${assetInstanceTotal}
                 <span class="searchButtons">
                     <filterpane:filterButton text="Search" appliedText="Change Search" />
                 </span>
-                Results:${assetInstanceTotal}
             </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" >
+                    <g:hiddenField name="params" value="${filterParams}" />
+                    <div class="dialog">
+                        <table>
+                            <tbody>
+
+                                <tr class="prop">
+                                    <td valign="top" class="name">
+                                        <label for="max">Results per page:</label>
+                                    </td>
+                                    <td valign="top" class="value">
+                                        <input type="text" maxlength="4" id="description" name="newMax" value="${params.max}"/>
+
+                                        <span class="buttons">
+                                            <g:actionSubmit action="setSearchParamsMax" class="go" value="Update" />
+                                        </span>
+                                    </td>
+                                </tr>
+
+                                <tr class="prop">
+                                    <td valign="top" class="name">
+                                        <label for="max">Asset Tree:</label>
+                                    </td>
+                                    <td valign="top" class="value">
+                                        <g:link action="exportAssetTree">
+                                            Export
+                                        </g:link>
+                                        /
+                                        <g:link action="exportAssetTreeTemplate">
+                                            Template
+                                        </g:link>
+                                        /
+                                        <g:link action="importAssetTree">
+                                            Import
+                                        </g:link>
+                                    </td>
+                                </tr>
+
+                            </tbody>
+                        </table>
+                    </div>
+                </g:form>
+                <export:formats  params="${filterParams}" formats="['csv', 'excel', 'pdf', 'rtf']"/>
+            </div>
+
+            <br />
+
+            <g:if test="${assetInstanceList.size() > 10}">
+                <div class="paginateButtons">
+                    <g:paginate total="${assetInstanceTotal}" params="${filterParams}" />
+                </div>
+            </g:if>
 
             <div class="list">
@@ -78,18 +139,4 @@
                 <g:paginate total="${assetInstanceTotal}" params="${filterParams}" />
             </div>
-            <export:formats  params="${filterParams}" formats="['csv', 'excel', 'pdf', 'rtf']"/>
-            <br />
-            Asset Tree:
-            <g:link action="exportAssetTree">
-                Export
-            </g:link>
-            /
-            <g:link action="exportAssetTreeTemplate">
-                Template
-            </g:link>
-            /
-            <g:link action="importAssetTree">
-                Import
-            </g:link>
 
             <filterpane:filterPane domainBean="Asset"
Index: /trunk/grails-app/views/taskDetailed/search.gsp
===================================================================
--- /trunk/grails-app/views/taskDetailed/search.gsp	(revision 325)
+++ /trunk/grails-app/views/taskDetailed/search.gsp	(revision 326)
@@ -64,5 +64,5 @@
 
                                         <span class="buttons">
-                                            <g:actionSubmit action="setTaskSearchParamsMax" class="go" value="Update" />
+                                            <g:actionSubmit action="setSearchParamsMax" class="go" value="Update" />
                                         </span>
                                     </td>