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 431)
@@ -13,23 +13,22 @@
         <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>
+                <div class="errors">
+                    <ul>
+                        <g:eachError bean="${taskInstance}">
+                            <li><g:message error="${it}" /></li>
+                        </g:eachError>
+                        <g:eachError bean="${entryFaultInstance}">
+                            <li><g:message error="${it}" /></li>
+                        </g:eachError>
+                        <g:eachError bean="${entryCauseInstance}">
+                            <li><g:message error="${it}" /></li>
+                        </g:eachError>
+                        <g:eachError bean="${entryWorkDoneInstance}">
+                            <li><g:message error="${it}" /></li>
+                        </g:eachError>
+                    </ul>
+                </div>
             </g:hasErrors>
 
@@ -45,5 +44,40 @@
                                 <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" />
+                                    <g:helpBalloon class="helpballoon" code="task.description.immediateCallout" />
+                                </td>
+                            </tr>
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="targetStartDate">Date:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'targetStartDate','errors')}">
+                                    <richui:dateChooser name="targetStartDate" format="dd-MM-yyyy" value="${taskInstance.targetStartDate}" />
+                                    <g:helpBalloon class="helpballoon" code="task.targetStartDate.immediateCallout" />
+                                </td>
+                            </tr>
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="primaryAsset">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="productionReference">Production:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:entryFaultInstance,field:'productionReference','errors')}">
+                                    <g:select optionKey="id"
+                                                        from="${ProductionReference.findAllByIsActive(true)}"
+                                                        name="entryFault.productionReference.id"
+                                                        value="${entryFaultInstance?.productionReference?.id}"
+                                                        noSelection="['null':'--None--']">
+                                    </g:select>
+                                    <g:helpBalloon code="entry.productionReference.fault" />
                                 </td>
                             </tr>
@@ -62,5 +96,5 @@
                                         type="text" id="entryFault.durationMinute" name="entryFault.durationMinute" 
                                         value="${fieldValue(bean:entryFaultInstance,field:'durationMinute')}" />
-                                    <g:helpBalloon code="entry.duration" />
+                                    <g:helpBalloon code="entry.duration.fault" />
                                 </td> 
                             </tr>
@@ -113,27 +147,4 @@
                             </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>
Index: trunk/grails-app/views/taskDetailed/show.gsp
===================================================================
--- trunk/grails-app/views/taskDetailed/show.gsp	(revision 418)
+++ trunk/grails-app/views/taskDetailed/show.gsp	(revision 431)
@@ -62,5 +62,9 @@
                                             <td valign="top" class="name">Parent Task:</td>
 
-                                            <td valign="top" class="value"><g:link controller="taskDetailed" action="show" id="${taskInstance.parentTask.id}">${taskInstance.parentTask.encodeAsHTML()}</g:link></td>
+                                            <td valign="top" class="value">
+                                                <g:link controller="taskDetailed" action="show" id="${taskInstance.parentTask.id}">
+                                                    ${taskInstance.parentTask.encodeAsHTML()}
+                                                </g:link>
+                                            </td>
 
                                         </tr>
@@ -77,5 +81,7 @@
                                         <td valign="top" class="name">Target Start:</td>
 
-                                        <td valign="top" class="value"><g:formatDate date="${taskInstance.targetStartDate}" format="EEE, dd-MMM-yyyy"/></td>
+                                        <td valign="top" class="value">
+                                            <g:formatDate date="${taskInstance.targetStartDate}" format="EEE, dd-MMM-yyyy"/>
+                                        </td>
 
                                     </tr>
@@ -84,5 +90,7 @@
                                         <td valign="top" class="name">Target Completion:</td>
 
-                                        <td valign="top" class="value"><g:formatDate date="${taskInstance.targetCompletionDate}" format="EEE, dd-MMM-yyyy"/></td>
+                                        <td valign="top" class="value">
+                                            <g:formatDate date="${taskInstance.targetCompletionDate}" format="EEE, dd-MMM-yyyy"/>
+                                        </td>
 
                                     </tr>
@@ -236,7 +244,9 @@
                                         <g:else>
                                             <span class="button"><g:actionSubmit class="flag" value="Unresolved" action="setAttentionFlag"/></span>
+                                            <g:helpBalloon class="helpballoon" code="task.status.unresolved" />
                                         </g:else>
 
                                         <span class="button"><g:actionSubmit class="complete" value="Resolved" action="complete"/></span>
+                                        <g:helpBalloon class="helpballoon" code="task.status.resolved" />
 
                                         <g:if test="${taskInstance.approved}" >
@@ -272,5 +282,6 @@
                                         <tr>
                                             <th>Comment</th>
-                                            <th>Date Done</th>
+                                            <th>Date</th>
+                                            <th>Production</th>
                                             <th>Down Time</th>
                                             <th>Entered By</th>
@@ -282,8 +293,16 @@
                                                 <tr class="${(i % 2) == 0 ? 'clickableOdd' : 'clickableEven'}" onclick='window.location = "${request.getContextPath()}/entryDetailed/edit/${entry.id}"'/>
 
-                                                    <td style="width:65%">${entry.comment}</td>
+                                                    <td style="width:65%">${entry.comment.encodeAsHTML()}</td>
                                                     <td><g:formatDate date="${entry.dateDone}" format="EEE, dd-MMM-yyyy"/></td>
+                                                    <td>
+                                                        <g:if test="${entry.productionReference}">
+                                                            ${entry.productionReference.encodeAsHTML()}
+                                                        </g:if>
+                                                        <g:else>
+                                                            <g:message code="default.none.text" />
+                                                        </g:else>
+                                                    </td>
                                                     <td>${entry.durationHour}:${entry.durationMinute}</td>
-                                                    <td>${entry.enteredBy}</td>
+                                                    <td>${entry.enteredBy.encodeAsHTML()}</td>
 
                                                     <td>
@@ -332,7 +351,7 @@
                                                 <tr class="${(i % 2) == 0 ? 'clickableOdd' : 'clickableEven'}" onclick='window.location = "${request.getContextPath()}/entryDetailed/edit/${entry.id}"'/>
 
-                                                    <td style="width:65%">${entry.comment}</td>
+                                                    <td style="width:65%">${entry.comment.encodeAsHTML()}</td>
                                                     <td><g:formatDate date="${entry.dateDone}" format="EEE, dd-MMM-yyyy"/></td>
-                                                    <td>${entry.enteredBy}</td>
+                                                    <td>${entry.enteredBy.encodeAsHTML()}</td>
 
                                                     <td>
@@ -382,8 +401,8 @@
                                                 <tr class="${(i % 2) == 0 ? 'clickableOdd' : 'clickableEven'}" onclick='window.location = "${request.getContextPath()}/entryDetailed/edit/${entry.id}"'/>
 
-                                                    <td width="65%">${entry.comment}</td>
+                                                    <td width="65%">${entry.comment.encodeAsHTML()}</td>
                                                     <td><g:formatDate date="${entry.dateDone}" format="EEE, dd-MMM-yyyy"/></td>
                                                     <td>${entry.durationHour}:${entry.durationMinute}</td>
-                                                    <td>${entry.enteredBy}</td>
+                                                    <td>${entry.enteredBy.encodeAsHTML()}</td>
 
                                                     <td>