Index: trunk/grails-app/views/taskDetailed/show.gsp
===================================================================
--- trunk/grails-app/views/taskDetailed/show.gsp	(revision 806)
+++ trunk/grails-app/views/taskDetailed/show.gsp	(revision 809)
@@ -524,136 +524,6 @@
                         </g:if>
                         <g:else>
-                            <div class="dialog">
-                                <table>
-                                    <tbody>
-
-                                        <tr class="prop">
-                                            <td valign="top" class="name">Procedure Id:</td>
-                                            <td valign="top" class="value">
-                                                ${fieldValue(bean:taskProcedureInstance, field:'id')}
-                                            </td>
-                                        </tr>
-
-                                        <tr class="prop">
-                                            <td valign="top" class="name">Linked Task:</td>
-                                            <td valign="top" class="value">
-                                                <g:link controller="taskDetailed"
-                                                                action="show"
-                                                                id="${taskProcedureInstance.linkedTask.id}">
-                                                    ${taskProcedureInstance.linkedTask.encodeAsHTML()}
-                                                </g:link>
-                                            </td>
-                                        </tr>
-
-                                        <tr class="prop">
-                                            <td valign="top" class="name">Linked Asset:</td>
-                                            <td valign="top" class="value">
-                                                <g:render template="/shared/assetTreeCompact" model="['assetInstance': taskProcedureInstance.linkedTask.primaryAsset]" />
-                                            </td>
-                                        </tr>
-
-                                        <tr class="prop">
-                                            <td valign="top" class="name">Version:</td>
-                                            <td valign="top" class="value">
-                                                    ${fieldValue(bean:taskProcedureInstance, field:'version')}
-                                            </td>
-                                        </tr>
-
-                                        <tr class="prop">
-                                            <td valign="top" class="name">Last Updated:</td>
-                                            <td valign="top" class="value">
-                                                <g:formatDate date="${taskProcedureInstance.lastUpdated}"
-                                                                            format="EEE, dd-MMM-yyyy"/>
-                                            </td>
-                                        </tr>
-
-                                    </tbody>
-                                </table>
-                            </div>
-                            <div class="buttons">
-                                <g:form controller="taskProcedureDetailed">
-                                    <input type="hidden" name="id" value="${taskProcedureInstance?.id}" />
-                                    <span class="button"><g:actionSubmit class="edit" value="Edit" /></span>
-                                </g:form>
-                            </div>
-
-                            <br />
-
-                            <g:if test="${taskProcedureInstance.documentReferences}">
-                                <div class="list">
-                                    <table>
-                                        <thead>
-                                            <tr>
-                                                <th>Document Reference</th>
-                                                <th>Location</th>
-                                            </tr>
-                                        </thead>
-                                        <tbody>
-                                            <g:each in="${taskProcedureInstance.documentReferences}" status="i" var="docRef">
-                                                <tr class="${(i % 2) == 0 ? 'odd' : 'even'}">
-
-                                                    <td valign="top" class="name">
-                                                        ${fieldValue(bean:docRef, field:'name')}
-                                                    </td>
-
-                                                    <td  valign="top" style="text-align:left;" class="value">
-                                                        <custom:easyUrl url="${docRef.location}" />
-                                                    </td>
-
-                                                </tr>
-                                            </g:each>
-
-                                        </tbody>
-                                    </table>
-                                </div>
-                            </g:if>
-
-                            <br />
-
-                            <div class="list">
-                                <table>
-                                    <thead>
-                                        <tr>
-                                            <th>Step</th>
-                                            <th>Assembly</th>
-                                            <th>Description</th>
-                                            <th>Page Ref</th>
-                                            <th>Condition</th>
-                                        </tr>
-                                    </thead>
-                                    <tbody>
-                                        <g:each in="${maintenanceActionList}" status="i" var="maintenanceAction">
-                                            <tr class="${(i % 2) == 0 ? 'odd' : 'even'}">
-
-                                                <td valign="top" class="name">
-                                                    ${fieldValue(bean:maintenanceAction, field:'procedureStepNumber')}
-                                                </td>
-
-                                                <td  valign="top" style="text-align:left;" class="value">
-                                                    <g:if test="${maintenanceAction.assetSubItem}">
-                                                        ${maintenanceAction.assetSubItem.parentItem?.encodeAsHTML()}
-                                                        --
-                                                        ${maintenanceAction.assetSubItem.encodeAsHTML()}
-                                                    </g:if>
-                                                </td>
-
-                                                <td  valign="top" style="text-align:left;" class="value">
-                                                    ${fieldValue(bean:maintenanceAction, field:'description')}
-                                                </td>
-
-                                                <td  valign="top" style="text-align:left;" class="value">
-                                                    ${fieldValue(bean:maintenanceAction, field:'pageRef')}
-                                                </td>
-
-                                                <td  valign="top" style="text-align:left;" class="value">
-                                                </td>
-
-                                            </tr>
-                                        </g:each>
-
-                                    </tbody>
-                                </table>
-                            </div>
-
+                            <g:render template="/taskProcedureDetailed/taskProcedureRevision"
+                                                model="['taskProcedureRevision':taskProcedureRevision]" />
                         </g:else>
 
Index: trunk/grails-app/views/taskProcedureDetailed/_taskProcedure.gsp
===================================================================
--- trunk/grails-app/views/taskProcedureDetailed/_taskProcedure.gsp	(revision 806)
+++ trunk/grails-app/views/taskProcedureDetailed/_taskProcedure.gsp	(revision 809)
@@ -31,27 +31,17 @@
             </tr>
 
-            <g:if test="${taskProcedureInstance.version}">
+            <g:if test="${taskProcedureInstance.id}">
                 <tr class="prop">
-                    <td valign="top" class="name">Version:</td>
+                    <td valign="top" class="name">Revisions:</td>
                     <td valign="top" class="value">
-                            ${fieldValue(bean:taskProcedureInstance, field:'version')}
-                    </td>
-                </tr>
-
-                <tr class="prop">
-                    <td valign="top" class="name">Created By:</td>
-                    <td valign="top" class="value">
-                            ${fieldValue(bean:taskProcedureInstance, field:'createdBy')}
-                            on
-                            <g:formatDate date="${taskProcedureInstance.dateCreated}" format="EEE, dd-MMM-yyyy @ HH:mm"/>
-                    </td>
-                </tr>
-
-                <tr class="prop">
-                    <td valign="top" class="name">Last Updated By:</td>
-                    <td valign="top" class="value">
-                            ${fieldValue(bean:taskProcedureInstance, field:'lastUpdatedBy')}
-                            on
-                            <g:formatDate date="${taskProcedureInstance.lastUpdated}" format="EEE, dd-MMM-yyyy @ HH:mm"/>
+                        <ul>
+                        <g:each var="r" in="${taskProcedureInstance.revisions}">
+                            <li>
+                                <g:link action="show" id="${taskProcedureInstance.id}" params="['revision':r.revision]">
+                                    ${r.fullRevisionString.encodeAsHTML()}
+                                </g:link>
+                            </li>
+                        </g:each>
+                        </ul>
                     </td>
                 </tr>
Index: trunk/grails-app/views/taskProcedureDetailed/_taskProcedureRevision.gsp
===================================================================
--- trunk/grails-app/views/taskProcedureDetailed/_taskProcedureRevision.gsp	(revision 809)
+++ trunk/grails-app/views/taskProcedureDetailed/_taskProcedureRevision.gsp	(revision 809)
@@ -0,0 +1,133 @@
+
+        <div class="dialog">
+            <table>
+                <tbody>
+
+                    <tr class="prop">
+                        <td valign="top" class="name">Procedure Id:</td>
+                        <td valign="top" class="value">
+                            ${fieldValue(bean:taskProcedureRevision, field:'taskProcedureId')}
+                        </td>
+                    </tr>
+
+                    <tr class="prop">
+                        <td valign="top" class="name">Linked Task:</td>
+                        <td valign="top" class="value">
+                            <g:link controller="taskDetailed"
+                                            action="show"
+                                            id="${taskProcedureRevision.linkedTask.id}">
+                                ${taskProcedureRevision.linkedTask.encodeAsHTML()}
+                            </g:link>
+                        </td>
+                    </tr>
+
+                    <tr class="prop">
+                        <td valign="top" class="name">Linked Asset:</td>
+                        <td valign="top" class="value">
+                            <g:render template="/shared/assetTreeCompact" model="['assetInstance': taskProcedureRevision.linkedTask.primaryAsset]" />
+                        </td>
+                    </tr>
+
+                    <tr class="prop">
+                        <td valign="top" class="name">Revision:</td>
+                        <td valign="top" class="value">
+                            ${fieldValue(bean:taskProcedureRevision, field:'revisionDateString')}
+                        </td>
+                    </tr>
+
+                </tbody>
+            </table>
+        </div>
+        <div class="buttons">
+            <g:form controller="taskProcedureDetailed">
+                <input type="hidden" name="id" value="${taskProcedureRevision.taskProcedureId}" />
+                Latest Revision: ${taskProcedureRevision?.taskProcedure.revision}
+                <span class="button">
+                    <g:actionSubmit class="edit" value="Edit" />
+                </span>
+                <span class="button">
+                    <g:actionSubmit class="go" value="Show" />
+                </span>
+            </g:form>
+        </div>
+
+        <br />
+
+        <g:if test="${taskProcedureRevision.documentReferences}">
+            <div class="list">
+                <table>
+                    <thead>
+                        <tr>
+                            <th>Document Reference</th>
+                            <th>Location</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <g:each in="${taskProcedureRevision.documentReferences}" status="i" var="docRef">
+                            <tr class="${(i % 2) == 0 ? 'odd' : 'even'}">
+
+                                <td valign="top" class="name">
+                                    ${fieldValue(bean:docRef, field:'name')}
+                                </td>
+
+                                <td  valign="top" style="text-align:left;" class="value">
+                                    <custom:easyUrl url="${docRef.location}" />
+                                </td>
+
+                            </tr>
+                        </g:each>
+
+                    </tbody>
+                </table>
+            </div>
+        </g:if>
+
+        <br />
+
+        <g:if test="${taskProcedureRevision.maintenanceActions}">
+            <div class="list">
+                <table>
+                    <thead>
+                        <tr>
+                            <th>Step</th>
+                            <th>Assembly</th>
+                            <th>Description</th>
+                            <th>Page Ref</th>
+                            <th>Condition</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <g:each in="${taskProcedureRevision.maintenanceActions}" status="i" var="maintenanceAction">
+                            <tr class="${(i % 2) == 0 ? 'odd' : 'even'}">
+
+                                <td valign="top" class="name">
+                                    ${fieldValue(bean:maintenanceAction, field:'procedureStepNumber')}
+                                </td>
+
+                                <td  valign="top" style="text-align:left;" class="value">
+                                    <g:if test="${maintenanceAction.assetSubItem}">
+                                        ${maintenanceAction.assetSubItem.parentItem?.encodeAsHTML()}
+                                        --
+                                        ${maintenanceAction.assetSubItem.encodeAsHTML()}
+                                    </g:if>
+                                </td>
+
+                                <td  valign="top" style="text-align:left;" class="value">
+                                    ${fieldValue(bean:maintenanceAction, field:'description')}
+                                </td>
+
+                                <td  valign="top" style="text-align:left;" class="value">
+                                    ${maintenanceAction.pageRef.encodeAsHTML() ?: '-'}
+                                </td>
+
+                                <td  valign="top" style="text-align:left;" class="value">
+                                    ${'A | B | C | D'}
+                                </td>
+
+                            </tr>
+                        </g:each>
+
+                    </tbody>
+                </table>
+            </div>
+        </g:if>
Index: trunk/grails-app/views/taskProcedureDetailed/edit.gsp
===================================================================
--- trunk/grails-app/views/taskProcedureDetailed/edit.gsp	(revision 806)
+++ trunk/grails-app/views/taskProcedureDetailed/edit.gsp	(revision 809)
@@ -31,5 +31,4 @@
                     <span class="button"><g:actionSubmit class="save" value="Update" /></span>
                     <span class="button"><g:actionSubmit class="cancel" value="Cancel" action="Show"/></span>
-                    <span class="button"><g:actionSubmit class="delete" onclick="return confirm('Are you sure?');" value="Delete" /></span>
                 </div>
             </g:form>
Index: trunk/grails-app/views/taskProcedureDetailed/list.gsp
===================================================================
--- trunk/grails-app/views/taskProcedureDetailed/list.gsp	(revision 806)
+++ trunk/grails-app/views/taskProcedureDetailed/list.gsp	(revision 809)
@@ -14,7 +14,5 @@
         </div>
         <div class="body">
-            <g:if test="${flash.message}">
-            <div class="message">${flash.message}</div>
-            </g:if>
+            <g:render template="/shared/messages" />
             <filterpane:currentCriteria domainBean="TaskProcedure"
                                     action="list"
Index: trunk/grails-app/views/taskProcedureDetailed/show.gsp
===================================================================
--- trunk/grails-app/views/taskProcedureDetailed/show.gsp	(revision 809)
+++ trunk/grails-app/views/taskProcedureDetailed/show.gsp	(revision 809)
@@ -0,0 +1,23 @@
+
+
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+        <meta name="layout" content="main" />
+        <title>Show TaskProcedure</title>
+        <nav:resources override="true"/>
+    </head>
+    <body>
+        <div class="nav">
+            <nav:renderSubItems group="navAlt"/>
+        </div>
+        <div class="body">
+            <g:if test="${flash.message}">
+            <div class="message">${flash.message}</div>
+            </g:if>
+
+
+            <g:render template="/taskProcedureDetailed/taskProcedureRevision" />
+        </div>
+    </body>
+</html>