Index: trunk/grails-app/views/taskDetailed/search.gsp
===================================================================
--- trunk/grails-app/views/taskDetailed/search.gsp	(revision 734)
+++ trunk/grails-app/views/taskDetailed/search.gsp	(revision 736)
@@ -90,4 +90,5 @@
                                                                                                 imgSrc="${resource(dir:'images/skin',file:'flag_red.png')}"
                                                                                                 imgAlt="Flag"
+                                                                                                imgTitle="Attention Flag"
                                                                                                 params="${filterParams}" />
 
@@ -100,7 +101,11 @@
                                 <g:sortableColumn  property="taskType" title="Type" params="${filterParams}" />
 
+                                <custom:sortableColumnWithImg property="taskStatus"
+                                                                                                imgSrc="${resource(dir:'images/skin',file:'status.png')}"
+                                                                                                imgAlt="Status"
+                                                                                                imgTitle="Status"
+                                                                                                params="${filterParams}" />
+
                                 <g:sortableColumn  property="taskPriority" title="Priority" params="${filterParams}" />
-
-                                <g:sortableColumn  property="taskStatus" title="Status" params="${filterParams}" />
 
                                 <custom:sortableColumnWithImg property="defaultSort"
@@ -119,5 +124,5 @@
                                 <td class="idColumn" onclick='window.location = "${request.getContextPath()}/taskDetailed/show/${taskInstance.id}"'>
                                     <g:if test="${taskInstance.attentionFlag}">
-                                        <img  src="${resource(dir:'images/skin',file:'flag_red.png')}" alt="Flag" />
+                                        <img  src="${resource(dir:'images/skin',file:'flag_red.png')}" alt="Flag" title="Attention Flag"/>
                                     </g:if>
                                 </td>
@@ -129,7 +134,32 @@
                                 <td onclick='window.location = "${request.getContextPath()}/taskDetailed/show/${taskInstance.id}"'>
                                     <b>
-                                        Task #${fieldValue(bean:taskInstance, field:'id')}<br />
-                                        ${fieldValue(bean:taskInstance, field:'description')}
+                                        Task #${fieldValue(bean:taskInstance, field:'id')}
                                     </b>
+                                    <g:if test="${taskInstance.approved}" >
+                                        <img  src="${resource(dir:'images/skin',file:'cog.png')}" alt="Approved" title="Approved" />
+                                    </g:if>
+                                    <g:if test="${taskInstance.taskRecurringSchedule?.enabled}" >
+                                        <img  src="${resource(dir:'images/skin',file:'arrow_refresh.png')}" alt="Recurrence Enabled" title="Recurrence Enabled" />
+                                    </g:if>
+                                    <br />
+
+                                    <b>
+                                    ${fieldValue(bean:taskInstance, field:'description')}
+                                    </b>
+                                    <g:if test="${taskInstance.safetyRequirement}" >
+                                        <br />
+                                        <img  src="${resource(dir:'images/skin',file:'lightning.png')}" alt="Safety Requirement" title="Safety Requirement" />
+                                        Safety
+                                    </g:if>
+                                    <g:if test="${taskInstance.regulatoryRequirement}" >
+                                        <br />
+                                        <img  src="${resource(dir:'images/skin',file:'script_lightning.png')}" alt="Regulatory Requirement" title="Regulatory Requirement" />
+                                        Regulatory
+                                    </g:if>
+                                    <g:if test="${taskInstance.mandatoryRequirement}" >
+                                        <br />
+                                        <img  src="${resource(dir:'images/skin',file:'script.png')}" alt="Mandatory Requirement" title="Mandatory Requirement" />
+                                        Mandatory
+                                    </g:if>
                                     <br />
                                     <br />
@@ -161,15 +191,23 @@
                                 </td>
 
+                                <td class="idColumn" onclick='window.location = "${request.getContextPath()}/taskDetailed/show/${taskInstance.id}"'>
+                                    <g:if test="${taskInstance.taskStatus.id == 1}" >
+                                        <img  src="${resource(dir:'images/skin',file:'not_started.png')}" alt="Not Started" title="Not Started" />
+                                    </g:if>
+                                    <g:if test="${taskInstance.taskStatus.id == 2}" >
+                                        <img  src="${resource(dir:'images/skin',file:'arrow_right.png')}" alt="In Progress" title="In Progress" />
+                                    </g:if>
+                                    <g:if test="${taskInstance.taskStatus.id == 3}" >
+                                        <img  src="${resource(dir:'images/skin',file:'tick.png')}" alt="Complete" title="Complete" />
+                                    </g:if>
+                                </td>
+
                                 <td onclick='window.location = "${request.getContextPath()}/taskDetailed/show/${taskInstance.id}"'>
                                     ${fieldValue(bean:taskInstance, field:'taskPriority')}
-                                </td>
-
-                                <td onclick='window.location = "${request.getContextPath()}/taskDetailed/show/${taskInstance.id}"'>
-                                    ${fieldValue(bean:taskInstance, field:'taskStatus')}
                                 </td>
 
                                 <td class="notClickable">
                                     <g:link action="show" id="${taskInstance.id}">
-                                        <img  src="${resource(dir:'images/skin',file:'database_go.png')}" alt="Show" />
+                                        <img  src="${resource(dir:'images/skin',file:'database_go.png')}" alt="Show" title="Show" />
                                     </g:link>
                                 </td>
Index: trunk/grails-app/views/taskDetailed/show.gsp
===================================================================
--- trunk/grails-app/views/taskDetailed/show.gsp	(revision 734)
+++ trunk/grails-app/views/taskDetailed/show.gsp	(revision 736)
@@ -35,5 +35,5 @@
                     </g:if>
                     <g:if test="${taskInstance.taskStatus.id == 2}" >
-                        <img  src="${resource(dir:'images/skin',file:'bullet_go.png')}" alt="In Progress" title="In Progress" />
+                        <img  src="${resource(dir:'images/skin',file:'arrow_right.png')}" alt="In Progress" title="In Progress" />
                     </g:if>
                     <g:if test="${taskInstance.attentionFlag}" >
@@ -254,5 +254,5 @@
 
                                 <g:if test="${taskInstance.trash}" >
-                                    <span class="button"><g:actionSubmit class="restore" onclick="return confirm('Are you sure?');" value="Restore" /></span>
+                                    <span class="button"><g:actionSubmit class="restore" onclick="return confirm('Are you sure?');" value="Restore"/></span>
                                 </g:if>
                                 <g:else>
@@ -341,5 +341,5 @@
                                                     <td class="notClickable">
                                                         <g:link controller="entryDetailed" action="edit" id="${entry.id}">
-                                                            <img  src="${resource(dir:'images/skin',file:'database_edit.png')}" alt="Edit" />
+                                                            <img  src="${resource(dir:'images/skin',file:'database_edit.png')}" alt="Edit" title="Edit" />
                                                         </g:link>
                                                     </td>
@@ -398,5 +398,5 @@
                                                     <td class="notClickable">
                                                         <g:link controller="entryDetailed" action="edit" id="${entry.id}">
-                                                            <img  src="${resource(dir:'images/skin',file:'database_edit.png')}" alt="Edit" />
+                                                            <img  src="${resource(dir:'images/skin',file:'database_edit.png')}" alt="Edit" title="Edit" />
                                                         </g:link>
                                                     </td>
@@ -460,5 +460,5 @@
                                                     <td class="notClickable">
                                                         <g:link controller="entryDetailed" action="edit" id="${entry.id}">
-                                                            <img  src="${resource(dir:'images/skin',file:'database_edit.png')}" alt="Edit" />
+                                                            <img  src="${resource(dir:'images/skin',file:'database_edit.png')}" alt="Edit" title="Edit" />
                                                         </g:link>
                                                     </td>
@@ -609,5 +609,5 @@
                                 <div class="buttons">
                                     <span class="button">
-                                        <g:actionSubmit value="Add" action="create"  class="add"/>
+                                        <g:actionSubmit value="Add" action="create" class="add" />
                                     </span>
                                 </div>
@@ -731,5 +731,5 @@
                                                 <td class="notClickable">
                                                     <g:link controller="inventoryMovementDetailed" action="show" id="${inventoryMovementInstance.id}">
-                                                        <img  src="${resource(dir:'images/skin',file:'database_go.png')}" alt="Show" />
+                                                        <img  src="${resource(dir:'images/skin',file:'database_go.png')}" alt="Show" title="Show" />
                                                     </g:link>
                                                 </td>
@@ -750,5 +750,5 @@
                                 </g:if>
                                 <span class="button">
-                                    <g:actionSubmit action="findInventoryItemForMovement" class="add" value="Add"/>
+                                    <g:actionSubmit action="findInventoryItemForMovement" class="add" value="Add" />
                                 </span>
                             </div>
@@ -813,5 +813,5 @@
                                             <td class="notClickable">
                                                 <g:link action="show" id="${subTaskInstance.id}">
-                                                    <img  src="${resource(dir:'images/skin',file:'database_go.png')}" alt="Show" />
+                                                    <img  src="${resource(dir:'images/skin',file:'database_go.png')}" alt="Show" title="Show" />
                                                 </g:link>
                                             </td>