Index: trunk/grails-app/views/taskDetailed/createBreakin.gsp
===================================================================
--- trunk/grails-app/views/taskDetailed/createBreakin.gsp	(revision 410)
+++ 	(revision )
@@ -1,132 +1,0 @@
-<html>
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-        <meta name="layout" content="main" />
-        <title>Create Breakin</title>
-        <nav:resources override="true"/>
-        <resource:dateChooser />
-    </head>
-    <body onload="document.createTaskForm.description.focus();">
-        <div class="nav">
-            <nav:renderSubItems group="nav"/>
-        </div>
-        <div class="body">
-            <g:render template="/shared/messages" />
-            <g:hasErrors bean="${taskInstance}">
-            <div class="errors">
-                <g:renderErrors bean="${taskInstance}" as="list" />
-            </div>
-            </g:hasErrors>
-            <g:hasErrors bean="${entryFaultInstance}">
-            <div class="errors">
-                <g:renderErrors bean="${entryFaultInstance}" as="list" />
-            </div>
-            </g:hasErrors>
-            <g:hasErrors bean="${entryWorkDoneInstance}">
-            <div class="errors">
-                <g:renderErrors bean="${entryWorkDoneInstance}" as="list" />
-            </div>
-            </g:hasErrors>
-
-            <g:form action="saveBreakin" method="post" name="createTaskForm">
-                <div class="dialog">
-                    <table>
-                        <tbody>
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="description">Breakin Description:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'description','errors')}">
-                                    <input type="text"  class="description" maxlength="75" id="description" name="description" value="${fieldValue(bean:taskInstance,field:'description')}"/>
-                                    <g:helpBalloon class="helpballoon" code="task.description" />
-                                </td>
-                            </tr>
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="comment">${entryFaultInstance?.entryType.encodeAsHTML()}:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:entryFaultInstance,field:'comment','errors')}">
-                                    <textarea rows="5" cols="40" name="entryFault.comment">${fieldValue(bean:entryFaultInstance, field:'comment')}</textarea>
-                                        <g:helpBalloon code="entry.comment.fault" />
-                                </td>
-                            </tr>
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="durationHour">Fault Duration:</label>
-                                </td>
-
-                                <td valign="top" class="value">
-                                    <input class="time ${hasErrors(bean:entryFaultInstance,field:'durationHour','errors')}"
-                                        type="text" id="entryFault.durationHour" name="entryFault.durationHour"
-                                        value="${fieldValue(bean:entryFaultInstance,field:'durationHour')}" />
-                                    :
-                                    <input class="time ${hasErrors(bean:entryFaultInstance,field:'durationMinute','errors')}"
-                                        type="text" id="entryFault.durationMinute" name="entryFault.durationMinute" 
-                                        value="${fieldValue(bean:entryFaultInstance,field:'durationMinute')}" />
-                                    <g:helpBalloon code="entry.duration" />
-                                </td> 
-                            </tr>
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="comment">${entryWorkDoneInstance?.entryType.encodeAsHTML()}:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:entryWorkDoneInstance,field:'comment','errors')}">
-                                    <textarea rows="5" cols="40" name="entryWorkDone.comment">${fieldValue(bean:entryWorkDoneInstance, field:'comment')}</textarea>
-                                        <g:helpBalloon code="entry.comment.work.done" />
-                                </td>
-                            </tr>
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="durationHour">Work Duration:</label>
-                                </td>
-
-                                <td valign="top" class="value">
-                                    <input class="time ${hasErrors(bean:entryWorkDoneInstance,field:'durationHour','errors')}"
-                                        type="text" id="entryWorkDone.durationHour" name="entryWorkDone.durationHour"
-                                        value="${fieldValue(bean:entryWorkDoneInstance,field:'durationHour')}" />
-                                    :
-                                    <input class="time ${hasErrors(bean:entryWorkDoneInstance,field:'durationMinute','errors')}"
-                                        type="text" id="entryWorkDone.durationMinute" name="entryWorkDone.durationMinute" 
-                                        value="${fieldValue(bean:entryWorkDoneInstance,field:'durationMinute')}" />
-                                    <g:helpBalloon code="entry.duration" />
-                                </td> 
-                            </tr>
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="primaryAsset">Primary Asset:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'primaryAsset','errors')}">
-                                    <g:select optionKey="id" from="${Asset.list()}" name="primaryAsset.id" value="${taskInstance?.primaryAsset?.id}" noSelection="['null':'--None--']"></g:select>
-                                    <g:helpBalloon code="task.primaryAsset" />
-                                </td>
-                            </tr>
-
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="associatedAssets">Associated Assets:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'associatedAssets','errors')}">
-                                    <g:select id="associatedAssets" name="associatedAssets"
-                                                    from="${Asset.list()}"
-                                                    size="5" multiple="yes" optionKey="id"
-                                                    value="${taskInstance?.associatedAssets?.id}"  noSelection="['':'--None--']"/>
-                                    <g:helpBalloon code="task.associatedAssets" />
-                                </td>
-                            </tr>
-                        
-                        </tbody>
-                    </table>
-                </div>
-                <div class="buttons">
-                    <span class="button"><input class="save" type="submit" value="Create" /></span>
-                </div>
-            </g:form>
-        </div>
-    </body>
-</html>
Index: trunk/grails-app/views/taskDetailed/createImmediateCallout.gsp
===================================================================
--- trunk/grails-app/views/taskDetailed/createImmediateCallout.gsp	(revision 418)
+++ trunk/grails-app/views/taskDetailed/createImmediateCallout.gsp	(revision 418)
@@ -0,0 +1,147 @@
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+        <meta name="layout" content="main" />
+        <title>Create Immediate Callout</title>
+        <nav:resources override="true"/>
+        <resource:dateChooser />
+    </head>
+    <body onload="document.createTaskForm.description.focus();">
+        <div class="nav">
+            <nav:renderSubItems group="nav"/>
+        </div>
+        <div class="body">
+            <g:render template="/shared/messages" />
+            <g:hasErrors bean="${taskInstance}">
+            <div class="errors">
+                <g:renderErrors bean="${taskInstance}" as="list" />
+            </div>
+            </g:hasErrors>
+            <g:hasErrors bean="${entryFaultInstance}">
+            <div class="errors">
+                <g:renderErrors bean="${entryFaultInstance}" as="list" />
+            </div>
+            </g:hasErrors>
+            <g:hasErrors bean="${entryCauseInstance}">
+            <div class="errors">
+                <g:renderErrors bean="${entryCauseInstance}" as="list" />
+            </div>
+            </g:hasErrors>
+            <g:hasErrors bean="${entryWorkDoneInstance}">
+            <div class="errors">
+                <g:renderErrors bean="${entryWorkDoneInstance}" as="list" />
+            </div>
+            </g:hasErrors>
+
+            <g:form action="saveImmediateCallout" method="post" name="createTaskForm">
+                <div class="dialog">
+                    <table>
+                        <tbody>
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="description">Callout Description:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'description','errors')}">
+                                    <input type="text"  class="description" maxlength="75" id="description" name="description" value="${fieldValue(bean:taskInstance,field:'description')}"/>
+                                    <g:helpBalloon class="helpballoon" code="task.description" />
+                                </td>
+                            </tr>
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="durationHour">Down Time:</label>
+                                </td>
+
+                                <td valign="top" class="value">
+                                    <input class="time ${hasErrors(bean:entryFaultInstance,field:'durationHour','errors')}"
+                                        type="text" id="entryFault.durationHour" name="entryFault.durationHour"
+                                        value="${fieldValue(bean:entryFaultInstance,field:'durationHour')}" />
+                                    :
+                                    <input class="time ${hasErrors(bean:entryFaultInstance,field:'durationMinute','errors')}"
+                                        type="text" id="entryFault.durationMinute" name="entryFault.durationMinute" 
+                                        value="${fieldValue(bean:entryFaultInstance,field:'durationMinute')}" />
+                                    <g:helpBalloon code="entry.duration" />
+                                </td> 
+                            </tr>
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="comment">${entryFaultInstance?.entryType.encodeAsHTML()}:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:entryFaultInstance,field:'comment','errors')}">
+                                    <textarea rows="5" cols="40" name="entryFault.comment">${fieldValue(bean:entryFaultInstance, field:'comment')}</textarea>
+                                        <g:helpBalloon code="entry.comment.fault" />
+                                </td>
+                            </tr>
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="comment">${entryCauseInstance?.entryType.encodeAsHTML()}:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:entryCauseInstance,field:'comment','errors')}">
+                                    <textarea rows="5" cols="40" name="entryCause.comment">${fieldValue(bean:entryCauseInstance, field:'comment')}</textarea>
+                                        <g:helpBalloon code="entry.comment.cause" />
+                                </td>
+                            </tr>
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="comment">${entryWorkDoneInstance?.entryType.encodeAsHTML()}:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:entryWorkDoneInstance,field:'comment','errors')}">
+                                    <textarea rows="5" cols="40" name="entryWorkDone.comment">${fieldValue(bean:entryWorkDoneInstance, field:'comment')}</textarea>
+                                        <g:helpBalloon code="entry.comment.work.done" />
+                                </td>
+                            </tr>
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="durationHour">Work Duration:</label>
+                                </td>
+
+                                <td valign="top" class="value">
+                                    <input class="time ${hasErrors(bean:entryWorkDoneInstance,field:'durationHour','errors')}"
+                                        type="text" id="entryWorkDone.durationHour" name="entryWorkDone.durationHour"
+                                        value="${fieldValue(bean:entryWorkDoneInstance,field:'durationHour')}" />
+                                    :
+                                    <input class="time ${hasErrors(bean:entryWorkDoneInstance,field:'durationMinute','errors')}"
+                                        type="text" id="entryWorkDone.durationMinute" name="entryWorkDone.durationMinute" 
+                                        value="${fieldValue(bean:entryWorkDoneInstance,field:'durationMinute')}" />
+                                    <g:helpBalloon code="entry.duration" />
+                                </td> 
+                            </tr>
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="primaryAsset">Primary Asset:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'primaryAsset','errors')}">
+                                    <g:select optionKey="id" from="${Asset.list()}" name="primaryAsset.id" value="${taskInstance?.primaryAsset?.id}" noSelection="['null':'--None--']"></g:select>
+                                    <g:helpBalloon code="task.primaryAsset" />
+                                </td>
+                            </tr>
+
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="associatedAssets">Associated Assets:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'associatedAssets','errors')}">
+                                    <g:select id="associatedAssets" name="associatedAssets"
+                                                    from="${Asset.list()}"
+                                                    size="5" multiple="yes" optionKey="id"
+                                                    value="${taskInstance?.associatedAssets?.id}"  noSelection="['':'--None--']"/>
+                                    <g:helpBalloon code="task.associatedAssets" />
+                                </td>
+                            </tr>
+                        
+                        </tbody>
+                    </table>
+                </div>
+                <div class="buttons">
+                    <span class="button"><input class="save" type="submit" value="Create" /></span>
+                </div>
+            </g:form>
+        </div>
+    </body>
+</html>
Index: trunk/grails-app/views/taskDetailed/list.gsp
===================================================================
--- trunk/grails-app/views/taskDetailed/list.gsp	(revision 410)
+++ 	(revision )
@@ -1,69 +1,0 @@
-<html>
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-        <meta name="layout" content="main" />
-        <title>Task List</title>
-        <nav:resources override="true"/>
-    </head>
-    <body>
-        <div class="nav">
-            <nav:renderSubItems group="nav"/>
-        </div>
-        <div class="body">
-            <g:if test="${flash.message}">
-                <div class="message">${flash.message}</div>
-            </g:if>
-            <div class="list">
-                <table>
-                    <thead>
-                        <tr>
-
-                            <g:sortableColumn defaultOrder="desc" property="id" title="Id"  />
-
-                            <g:sortableColumn property="targetStartDate" title="Target Start Date" />
-
-                            <g:sortableColumn property="description" title="Description" />
-
-                            <g:sortableColumn  property="leadPerson" title="Lead Person" />
-
-                            <g:sortableColumn  property="taskPriority" title="Task Priority" />
-
-                            <g:sortableColumn  property="taskStatus" title="Task Status" />
-
-                            <th></th>
-
-                        </tr>
-                    </thead>
-                    <tbody>
-                    <g:each in="${taskInstanceList}" status="i" var="taskInstance">
-                    <tr class="${(i % 2) == 0 ? 'clickableOdd' : 'clickableEven'}" onclick='window.location = "${request.getContextPath()}/taskDetailed/show/${taskInstance.id}"'/>
-
-                            <td>${fieldValue(bean:taskInstance, field:'id')}</td>
-
-                            <td><g:formatDate date="${taskInstance.targetStartDate}" format="EEE, dd-MMM-yyyy"/></td>
-
-                            <td>${fieldValue(bean:taskInstance, field:'description')}</td>
-
-                            <td>${fieldValue(bean:taskInstance, field:'leadPerson')}</td>
-
-                            <td>${fieldValue(bean:taskInstance, field:'taskPriority')}</td>
-
-                            <td>${fieldValue(bean:taskInstance, field:'taskStatus')}</td>
-
-                            <td>
-                                <g:link action="show" id="${taskInstance.id}">
-                                    <img  src="${resource(dir:'images/skin',file:'database_go.png')}" alt="Show" />
-                                </g:link>
-                            </td>
-
-                        </tr>
-                    </g:each>
-                    </tbody>
-                </table>
-            </div>
-            <div class="paginateButtons">
-                <g:paginate total="${taskInstanceTotal}" />
-            </div>
-        </div>
-    </body>
-</html>
Index: trunk/grails-app/views/taskDetailed/search.gsp
===================================================================
--- trunk/grails-app/views/taskDetailed/search.gsp	(revision 410)
+++ trunk/grails-app/views/taskDetailed/search.gsp	(revision 418)
@@ -14,7 +14,5 @@
 
         <div class="body">
-            <g:if test="${flash.message}">
-                <div class="message">${flash.message}</div>
-            </g:if>
+            <g:render template="/shared/messages" />
             <g:if test="${params.message}">
                 <div class="message">${params.message}</div>
@@ -91,4 +89,8 @@
                         <tr>
 
+                            <custom:sortableColumnWithImg property="attentionFlag"
+                                                                                            imgSrc="${resource(dir:'images/skin',file:'flag_red.png')}"
+                                                                                            imgAlt="Flag" params="${filterParams}" />
+
                             <g:sortableColumn property="id" title="Id" params="${filterParams}" />
 
@@ -96,6 +98,4 @@
 
                             <g:sortableColumn property="description" title="Description" params="${filterParams}" />
-
-                            <g:sortableColumn  property="leadPerson" title="Lead Person" params="${filterParams}" />
 
                             <g:sortableColumn  property="taskPriority" title="Task Priority" params="${filterParams}" />
@@ -111,11 +111,15 @@
                     <tr class="${(i % 2) == 0 ? 'clickableOdd' : 'clickableEven'}" onclick='window.location = "${request.getContextPath()}/taskDetailed/show/${taskInstance.id}"'/>
 
-                            <td>${fieldValue(bean:taskInstance, field:'id')}</td>
+                            <td class="idColumn">
+                                <g:if test="${taskInstance.attentionFlag}">
+                                    <img  src="${resource(dir:'images/skin',file:'flag_red.png')}" alt="Flag" />
+                                </g:if>
+                            </td>
+
+                            <td class="idColumn">${fieldValue(bean:taskInstance, field:'id')}</td>
 
                             <td><g:formatDate date="${taskInstance.targetStartDate}" format="EEE, dd-MMM-yyyy"/></td>
 
                             <td>${fieldValue(bean:taskInstance, field:'description')}</td>
-
-                            <td>${fieldValue(bean:taskInstance, field:'leadPerson')}</td>
 
                             <td>${fieldValue(bean:taskInstance, field:'taskPriority')}</td>
Index: trunk/grails-app/views/taskDetailed/show.gsp
===================================================================
--- trunk/grails-app/views/taskDetailed/show.gsp	(revision 410)
+++ trunk/grails-app/views/taskDetailed/show.gsp	(revision 418)
@@ -12,10 +12,8 @@
         </div>
         <div class="body">
-            <g:if test="${flash.message}">
-            <div class="message">${flash.message}</div>
-            </g:if>
+            <g:render template="/shared/messages" />
             <g:if test="${taskInstance.trash}" >
                 <div class="errors">
-                        This task is in the trash bin, but can be restored if required.
+                        <ul><li>This task is in the trash bin, but can be restored if required.<li><ul>
                 </div>
             </g:if>
@@ -26,8 +24,23 @@
             </g:hasErrors>
 
+            <div class="tabHeader">
+                <h1 class="taskHeader">
+                    Task #${taskInstance.id}
+                    <g:if test="${taskInstance.attentionFlag}" >
+                        <img  src="${resource(dir:'images/skin',file:'flag_red.png')}" alt="Flag" />
+                    </g:if>
+                    <g:if test="${taskInstance.taskStatus.id == 3}" >
+                        <img  src="${resource(dir:'images/skin',file:'tick.png')}" alt="Flag" />
+                    </g:if>
+                </h1>
+                ${fieldValue(bean:taskInstance, field:'description')}
+            </div>
+
+            <br/>
+
             <richui:tabView id="tabView">
 
                 <richui:tabLabels>
-                    <richui:tabLabel selected="${showTab.task}" title="Task #${taskInstance.id}" />
+                    <richui:tabLabel selected="${showTab.task}" title="Details" />
                     <richui:tabLabel selected="${showTab.procedure}" title="Procedure" />
                     <richui:tabLabel selected="${showTab.recurrence}" title="Recurrence" />
@@ -53,11 +66,4 @@
                                         </tr>
                                     </g:if>
-
-                                    <tr class="prop">
-                                        <td valign="top" class="name">Description:</td>
-
-                                        <td valign="top" class="value">${fieldValue(bean:taskInstance, field:'description')}</td>
-
-                                    </tr>
 
                                     <tr class="prop">
@@ -224,5 +230,13 @@
 
                                     <g:if test="${taskInstance.taskStatus.id != 3}" >
-                                        <span class="button"><g:actionSubmit class="complete" value="Complete" /></span>
+
+                                        <g:if test="${taskInstance.attentionFlag}" >
+                                            <span class="button"><g:actionSubmit class="flag" value="Clear" action="clearAttentionFlag"/></span>
+                                        </g:if>
+                                        <g:else>
+                                            <span class="button"><g:actionSubmit class="flag" value="Unresolved" action="setAttentionFlag"/></span>
+                                        </g:else>
+
+                                        <span class="button"><g:actionSubmit class="complete" value="Resolved" action="complete"/></span>
 
                                         <g:if test="${taskInstance.approved}" >
@@ -259,5 +273,5 @@
                                             <th>Comment</th>
                                             <th>Date Done</th>
-                                            <th>Duration</th>
+                                            <th>Down Time</th>
                                             <th>Entered By</th>
                                             <th></th>
@@ -292,4 +306,53 @@
                                 <span class="button">
                                     <g:actionSubmit value="Add Fault" action="create"  class="add"/>
+                                </span>
+                            </g:form>
+                        </div>
+
+                        <br />
+
+                        <g:if test="${entryCauseList.isEmpty()}">
+                            <h1>No Causes</h1>
+                            <br />
+                        </g:if>
+                        <g:else>
+                            <div class="list">
+                                <h1>Causes</h1>
+                                <table>
+                                    <thead>
+                                        <tr>
+                                            <th>Comment</th>
+                                            <th>Date Done</th>
+                                            <th>Entered By</th>
+                                            <th></th>
+                                        </tr>
+                                    </thead>
+                                    <tbody>
+                                        <g:each in="${entryCauseList}" status="i" var="entry">
+                                                <tr class="${(i % 2) == 0 ? 'clickableOdd' : 'clickableEven'}" onclick='window.location = "${request.getContextPath()}/entryDetailed/edit/${entry.id}"'/>
+
+                                                    <td style="width:65%">${entry.comment}</td>
+                                                    <td><g:formatDate date="${entry.dateDone}" format="EEE, dd-MMM-yyyy"/></td>
+                                                    <td>${entry.enteredBy}</td>
+
+                                                    <td>
+                                                        <g:link controller="entryDetailed" action="edit" id="${entry.id}">
+                                                            <img  src="${resource(dir:'images/skin',file:'database_edit.png')}" alt="Edit" />
+                                                        </g:link>
+                                                    </td>
+
+                                                </tr>
+                                        </g:each>
+                                    </tbody>
+                                </table>
+                            </div>
+                        </g:else>
+
+                        <div class="buttons">
+                            <g:form controller="entryDetailed">
+                                <g:hiddenField name="taskInstance.id" value="${taskInstance?.id}" />
+                                <g:hiddenField name="entryType.id" value="2" />
+                                <span class="button">
+                                    <g:actionSubmit value="Add Cause" action="create"  class="add"/>
                                 </span>
                             </g:form>
@@ -340,5 +403,5 @@
                             <g:form controller="entryDetailed">
                                 <g:hiddenField name="taskInstance.id" value="${taskInstance?.id}" />
-                                <g:hiddenField name="entryType.id" value="2" />
+                                <g:hiddenField name="entryType.id" value="3" />
                                 <span class="button">
                                     <g:actionSubmit value="Add Work Done" action="create"  class="add"/>
@@ -687,5 +750,5 @@
             </richui:tabView>
 
-        </div>
+        </div> <!--body-->
     </body>
 </html>
