Index: trunk/grails-app/views/taskProcedureDetailed/create.gsp
===================================================================
--- trunk/grails-app/views/taskProcedureDetailed/create.gsp	(revision 134)
+++ trunk/grails-app/views/taskProcedureDetailed/create.gsp	(revision 147)
@@ -5,13 +5,12 @@
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
         <meta name="layout" content="main" />
-        <title>Create TaskProcedure</title>         
+        <title>Create TaskProcedure</title>
+        <nav:resources override="true"/>
     </head>
     <body>
         <div class="nav">
-            <span class="menuButton"><a class="home" href="${createLinkTo(dir:'')}">Home</a></span>
-            <span class="menuButton"><g:link class="list" action="list">TaskProcedure List</g:link></span>
+            <nav:renderSubItems group="navAlt"/>
         </div>
         <div class="body">
-            <h1>Create TaskProcedure</h1>
             <g:if test="${flash.message}">
             <div class="message">${flash.message}</div>
Index: trunk/grails-app/views/taskProcedureDetailed/edit.gsp
===================================================================
--- trunk/grails-app/views/taskProcedureDetailed/edit.gsp	(revision 134)
+++ trunk/grails-app/views/taskProcedureDetailed/edit.gsp	(revision 147)
@@ -6,13 +6,11 @@
         <meta name="layout" content="main" />
         <title>Edit TaskProcedure</title>
+        <nav:resources override="true"/>
     </head>
     <body>
         <div class="nav">
-            <span class="menuButton"><a class="home" href="${createLinkTo(dir:'')}">Home</a></span>
-            <span class="menuButton"><g:link class="list" action="list">TaskProcedure List</g:link></span>
-            <span class="menuButton"><g:link class="create" action="create">New TaskProcedure</g:link></span>
+            <nav:renderSubItems group="navAlt"/>
         </div>
         <div class="body">
-            <h1>Edit TaskProcedure</h1>
             <g:if test="${flash.message}">
             <div class="message">${flash.message}</div>
Index: trunk/grails-app/views/taskProcedureDetailed/list.gsp
===================================================================
--- trunk/grails-app/views/taskProcedureDetailed/list.gsp	(revision 134)
+++ trunk/grails-app/views/taskProcedureDetailed/list.gsp	(revision 147)
@@ -6,15 +6,21 @@
         <meta name="layout" content="main" />
         <title>TaskProcedure List</title>
+        <filterpane:includes />
+        <nav:resources override="true"/>
     </head>
     <body>
         <div class="nav">
-            <span class="menuButton"><a class="home" href="${createLinkTo(dir:'')}">Home</a></span>
-            <span class="menuButton"><g:link class="create" action="create">New TaskProcedure</g:link></span>
+            <nav:renderSubItems group="navAlt"/>
         </div>
         <div class="body">
-            <h1>TaskProcedure List</h1>
             <g:if test="${flash.message}">
             <div class="message">${flash.message}</div>
             </g:if>
+            <filterpane:currentCriteria domainBean="TaskProcedureDetailed"
+                                    action="list"
+                                    dateFormat="${'EEE, dd-MMM-yyyy'}"
+                                    removeImgDir="images" 
+                                    removeImgFile="bullet_delete.png"
+                                    title="Search"/>
             <div class="list">
                 <table>
@@ -22,11 +28,13 @@
                         <tr>
                         
-                   	        <g:sortableColumn property="id" title="Id" />
+                   	        <g:sortableColumn property="id" title="Id"  params="${filterParams}" />
                         
-                   	        <g:sortableColumn property="name" title="Name" />
+                   	        <g:sortableColumn property="name" title="Name"  params="${filterParams}" />
                         
-                   	        <g:sortableColumn property="description" title="Description" />
+                   	        <g:sortableColumn property="description" title="Description"  params="${filterParams}" />
                         
-                   	        <g:sortableColumn property="isActive" title="Is Active" />
+                   	        <g:sortableColumn property="isActive" title="Is Active"  params="${filterParams}" />
+
+                            <th></th>
                         
                         </tr>
@@ -34,7 +42,7 @@
                     <tbody>
                     <g:each in="${taskProcedureInstanceList}" status="i" var="taskProcedureInstance">
-                        <tr class="${(i % 2) == 0 ? 'odd' : 'even'}">
+                        <tr class="${(i % 2) == 0 ? 'clickableOdd' : 'clickableEven'}" onclick='window.location = "${request.getContextPath()}/taskProcedureDetailed/show/${taskProcedureInstance.id}"'/>
                         
-                            <td><g:link action="show" id="${taskProcedureInstance.id}">${fieldValue(bean:taskProcedureInstance, field:'id')}</g:link></td>
+                            <td>${fieldValue(bean:taskProcedureInstance, field:'id')}</td>
                         
                             <td>${fieldValue(bean:taskProcedureInstance, field:'name')}</td>
@@ -43,4 +51,10 @@
                         
                             <td>${fieldValue(bean:taskProcedureInstance, field:'isActive')}</td>
+                            
+                            <td>
+                                <g:link action="show" id="${taskProcedureInstance.id}">
+                                    <img  src="${createLinkTo(dir:'images/skin',file:'database_go.png')}" alt="Show" />
+                                </g:link>
+                            </td>
                         
                         </tr>
@@ -49,7 +63,15 @@
                 </table>
             </div>
+
             <div class="paginateButtons">
-                <g:paginate total="${taskProcedureInstanceTotal}" />
+                <g:paginate total="${taskProcedureInstanceTotal}" params="${filterParams}" />
+                <filterpane:filterButton text="Search" appliedText="Change Search" />
+                Results:${askProcedureInstanceTotal}
             </div>
+
+            <filterpane:filterPane domainBean="TaskProcedure"
+                                    title="Search"
+                                    action="list"
+                                    excludeProperties="" />
         </div>
     </body>
Index: trunk/grails-app/views/taskProcedureDetailed/show.gsp
===================================================================
--- trunk/grails-app/views/taskProcedureDetailed/show.gsp	(revision 134)
+++ trunk/grails-app/views/taskProcedureDetailed/show.gsp	(revision 147)
@@ -6,13 +6,11 @@
         <meta name="layout" content="main" />
         <title>Show TaskProcedure</title>
+        <nav:resources override="true"/>
     </head>
     <body>
         <div class="nav">
-            <span class="menuButton"><a class="home" href="${createLinkTo(dir:'')}">Home</a></span>
-            <span class="menuButton"><g:link class="list" action="list">TaskProcedure List</g:link></span>
-            <span class="menuButton"><g:link class="create" action="create">New TaskProcedure</g:link></span>
+            <nav:renderSubItems group="navAlt"/>
         </div>
         <div class="body">
-            <h1>Show TaskProcedure</h1>
             <g:if test="${flash.message}">
             <div class="message">${flash.message}</div>
