Index: trunk/grails-app/views/taskDetailed/create.gsp
===================================================================
--- trunk/grails-app/views/taskDetailed/create.gsp	(revision 133)
+++ trunk/grails-app/views/taskDetailed/create.gsp	(revision 134)
@@ -32,5 +32,5 @@
                                 </td>
                                 <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'description','errors')}">
-                                    <input type="text"  style="width:450px" maxlength="75" id="description" name="description" value="${fieldValue(bean:taskInstance,field:'description')}"/>
+                                    <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>
@@ -42,5 +42,5 @@
                                 </td>
                                 <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'comment','errors')}">
-                                    <textarea  style="width:450px" rows="5" cols="40" name="comment">${fieldValue(bean:taskInstance, field:'comment')}</textarea>
+                                    <textarea  rows="5" cols="40" name="comment">${fieldValue(bean:taskInstance, field:'comment')}</textarea>
                                     <g:helpBalloon class="helpballoon" code="task.comment" />
                                 </td>
Index: trunk/grails-app/views/taskDetailed/edit.gsp
===================================================================
--- trunk/grails-app/views/taskDetailed/edit.gsp	(revision 133)
+++ trunk/grails-app/views/taskDetailed/edit.gsp	(revision 134)
@@ -159,10 +159,10 @@
                                 <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'assignedPersons','errors')}">
                                     
-<ul>
-<g:each var="a" in="${taskInstance?.assignedPersons?}">
-    <li><g:link controller="assignedPersonDetailed" action="show" id="${a.id}">${a?.encodeAsHTML()}</g:link></li>
-</g:each>
-</ul>
-<g:link controller="assignedPersonDetailed" params="['task.id':taskInstance?.id]" action="create">Add AssignedPerson</g:link>
+								<ul>
+								<g:each var="a" in="${taskInstance?.assignedPersons?}">
+									<li><g:link controller="assignedPersonDetailed" action="edit" id="${a.id}">${a?.encodeAsHTML()}</g:link></li>
+								</g:each>
+								</ul>
+								<g:link controller="assignedPersonDetailed" params="['task.id':taskInstance?.id]" action="create">Add AssignedPerson</g:link>
 
                                 </td>
Index: trunk/grails-app/views/taskDetailed/list.gsp
===================================================================
--- trunk/grails-app/views/taskDetailed/list.gsp	(revision 133)
+++ trunk/grails-app/views/taskDetailed/list.gsp	(revision 134)
@@ -26,9 +26,9 @@
                    	        <g:sortableColumn property="description" title="Description" />
                         
-                   	        <th>Lead Person</th>
-                   	    
-                   	        <th>Task Priority</th>
-                   	    
-                   	        <th>Task Status</th>
+                   	        <g:sortableColumn  property="leadPerson" title="Lead Person" />
+                        
+                            <g:sortableColumn  property="taskPriority" title="Task Priority" />
+                        
+                            <g:sortableColumn  property="taskStatus" title="Task Status" />
 
                             <th></th>
@@ -54,5 +54,5 @@
                             <td>
                                 <g:link action="show" id="${taskInstance.id}">
-                                    <img  src="${createLinkTo(dir:'images/skin',file:'database_table.png')}" alt="Show" />
+                                    <img  src="${createLinkTo(dir:'images/skin',file:'database_go.png')}" alt="Show" />
                                 </g:link>
                             </td>
Index: trunk/grails-app/views/taskDetailed/listSubTasks.gsp
===================================================================
--- trunk/grails-app/views/taskDetailed/listSubTasks.gsp	(revision 134)
+++ trunk/grails-app/views/taskDetailed/listSubTasks.gsp	(revision 134)
@@ -0,0 +1,71 @@
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+        <meta name="layout" content="main" />
+        <title>Task List</title>
+    </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 Task</g:link></span>
+        </div>
+        <div class="body">
+            <h1>Task #${parentTaskInstance.id} sub tasks</h1>
+            <g:if test="${flash.message}">
+                <div class="message">${flash.message}</div>
+            </g:if>
+            <div class="list">
+                <input type="hidden" name="parentTaskId" value="${parentTaskInstance?.id}" />
+                <table>
+                    <thead>
+                        <tr>
+                        
+                   	        <g:sortableColumn action="listSubTasks" property="id" title="Id" />
+                        
+                   	        <g:sortableColumn action="listSubTasks"  property="targetStartDate" title="Target Start Date" />
+                        
+                            <g:sortableColumn action="listSubTasks"  property="description" title="Description" />
+                        
+                   	        <g:sortableColumn action="listSubTasks"  property="leadPerson" title="Lead Person" />
+                        
+                            <g:sortableColumn action="listSubTasks"  property="taskPriority" title="Task Priority" />
+                        
+                            <g:sortableColumn action="listSubTasks"  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="${createLinkTo(dir:'images/skin',file:'database_go.png')}" alt="Show" />
+                                </g:link>
+                            </td>
+                        
+                        </tr>
+                    </g:each>
+                    </tbody>
+                </table>
+            </div>
+            <div class="paginateButtons">
+                <g:paginate action="listSubTasks" id="${parentTaskInstance?.id}" total="${taskInstanceTotal}" />
+            </div>
+        </div>
+    </body>
+</html>
Index: trunk/grails-app/views/taskDetailed/show.gsp
===================================================================
--- trunk/grails-app/views/taskDetailed/show.gsp	(revision 133)
+++ trunk/grails-app/views/taskDetailed/show.gsp	(revision 134)
@@ -149,4 +149,5 @@
                                             </g:each>
                                             </ul>
+                                            <g:link controller="assignedPersonDetailed" params="['task.id':taskInstance?.id]" action="create">Add AssignedPerson</g:link>
                                         </td>
                                         
@@ -264,49 +265,25 @@
                     <richui:tabContent>
                         <g:if test="${!taskProcedureExits}">
-
-                            <g:form controller="taskDetailed" >
+                        	<br />
+                        	No Procedure linked.
+                        	<br />
+							<br />
+                            <g:form controller="taskProcedureDetailed" >
                                 <input type="hidden" name="taskInstance.id" value="${taskInstance?.id}" />
 
-                                <div class="dialog">
-                                    <table>
-                                        <tbody>
-                                        
-                                            <tr class="prop">
-                                                <td valign="top" class="name">
-                                                    <label for="name">Name:</label>
-                                                </td>
-                                                <td valign="top" class="value ${hasErrors(bean:taskProcedureInstance,field:'name','errors')}">
-                                                    <input type="text" maxlength="75" id="name" name="name" value="${fieldValue(bean:taskProcedureInstance,field:'name')}"/>
-                                                </td>
-                                            </tr> 
-                        
-                                            <tr class="prop">
-                                                <td valign="top" class="name">
-                                                    <label for="description">Description:</label>
-                                                </td>
-                                                <td valign="top" class="value ${hasErrors(bean:taskProcedureInstance,field:'description','errors')}">
-                                                    <input type="text" maxlength="100" id="description" name="description" value="${fieldValue(bean:taskProcedureInstance,field:'description')}"/>
-                                                </td>
-                                            </tr>
-                                        </tbody>
-                                    </table>
-                                </div>
                                 <div class="buttons">
                                     <span class="button">
-                                        <g:actionSubmit value="New" action="generateProcedure"  class="save"/>
+                                        <g:actionSubmit value="New" action="create"  class="add"/>
                                     </span>
                                     <span class="button">
-                                        <g:actionSubmit value="Find" action="findProcedure"  class="save"/>
+                                        <g:actionSubmit value="Search" action="search"  class="search"/>
                                     </span>
                                 </div>
-<!--                                <div class="buttons">
-                                    <span class="button"><input class="save" type="submit" value="Create Procedure" /></span>
-                                    <span class="button"><input class="save" type="submit" value="Find Procedure" /></span>
-                                </div>-->
+
                             </g:form>
 
                         </g:if>
                         <g:else>
-                        <div class="dialog">
+                        	<div class="dialog">
                                 <table>
                                     <tbody>
@@ -348,35 +325,33 @@
                                     <input type="hidden" name="id" value="${taskProcedureInstance?.id}" />
                                     <span class="button"><g:actionSubmit class="edit" value="Edit" /></span>
-<!--                                     <span class="button"><g:actionSubmit class="delete" onclick="return confirm('Are you sure?');" value="Delete" /></span> -->
-                                </g:form>
+								</g:form>
                             </div>
-    
-                            <div class="list">
-                                <table>
-                                    <thead>
-                                        <tr>
-                                            <th>Step</th>
-                                            <th>Description</th>
-                                            <th></th>
-                                        </tr>
-                                    </thead>
-                                    <tbody>
-                                        <g:each in="${taskProcedureInstance?.maintenanceActions}" status="i" var="maintenanceAction">
-                                            <tr class="${(i % 2) == 0 ? 'clickableOdd' : 'clickableEven'}" onclick='window.location = "${request.getContextPath()}/maintenanceActionDetailed/edit/${maintenanceAction.id}"'/>
-                                            
-                                            <td valign="top" class="name">
-                                                ${maintenanceAction?.procedureStepNumber}
-                                            </td>
-                                            
-                                            <td  valign="top" style="text-align:left;" class="value">
-                                                ${maintenanceAction?.description}
-                                            </td>
-                                            
-                                        </tr>
-                                        </g:each>
-    
-                                    </tbody>
-                                </table>
-                            </div>
+                            
+							<div class="list">
+								<table>
+									<thead>
+										<tr>
+											<th>Step</th>
+											<th>Description</th>
+										</tr>
+									</thead>
+									<tbody>
+										<g:each in="${maintenanceActionList}" status="i" var="maintenanceAction">
+											<tr class="${(i % 2) == 0 ? 'odd' : 'even'}">
+												
+												<td valign="top" class="name">
+													${maintenanceAction?.procedureStepNumber}
+												</td>
+												
+												<td  valign="top" style="text-align:left;" class="value">
+													${maintenanceAction?.description}
+												</td>
+												
+											</tr>
+										</g:each>
+	
+									</tbody>
+								</table>
+							</div>
 
                         </g:else>
@@ -387,44 +362,72 @@
 <!-- Start Task Recurrence tab -->
                     <richui:tabContent>
-                    <div class="dialog">
-                            <table>
-                                <tbody>
-                                    <tr class="prop">
-                                        <td valign="top" class="name">Recurring Schedule:</td>
-                                        
-                                        <td valign="top" class="value">${taskInstance.taskRecurringSchedule?.encodeAsHTML()}</td>
-                                        
-                                    </tr>
-            
-                                    <tr class="prop">
-                                        <td valign="top" class="name">Start Date:</td>
-                                        
-                                        <td valign="top" class="value">${taskInstance.taskRecurringSchedule?.startDate}</td>
-                                        
-                                    </tr>
-            
-                                    <tr class="prop">
-                                        <td valign="top" class="name">Next Due Date:</td>
-                                        
-                                        <td valign="top" class="value">${taskInstance.taskRecurringSchedule?.nextDueDate}</td>
-                                        
-                                    </tr>
-            
-                                    <tr class="prop">
-                                        <td valign="top" class="name">Last Generated Date:</td>
-                                        
-                                        <td valign="top" class="value">${taskInstance.taskRecurringSchedule?.lastGeneratedDate}</td>
-                                        
-                                    </tr>
-            
-                                    <tr class="prop">
-                                        <td valign="top" class="name">Last Generated Sub Task:</td>
-                                        
-                                        <td valign="top" class="value">${taskInstance.taskRecurringSchedule?.lastGeneratedSubTask}</td>
-                                        
-                                    </tr>
-                                </tbody>
-                            </table>
-                        </div>
+
+                        <g:if test="${!taskRecurringScheduleExits}">
+                        	<br />
+                        	No Recurring Schedule.
+                        	<br />
+							<br />
+                            <g:form controller="taskRecurringScheduleDetailed" >
+                                <input type="hidden" name="taskInstance.id" value="${taskInstance?.id}" />
+
+                                <div class="buttons">
+                                    <span class="button">
+                                        <g:actionSubmit value="Create" action="create"  class="add"/>
+                                    </span>
+                                </div>
+
+                            </g:form>
+
+                        </g:if>
+                        <g:else>
+							
+						<div class="dialog">
+								<table>
+									<tbody>
+										<tr class="prop">
+											<td valign="top" class="name">Recurring Schedule:</td>
+											
+											<td valign="top" class="value">${taskRecurringScheduleInstance.encodeAsHTML()}</td>
+											
+										</tr>
+				
+										<tr class="prop">
+											<td valign="top" class="name">Start Date:</td>
+											
+											<td valign="top" class="value">${taskRecurringScheduleInstance.startDate}</td>
+											
+										</tr>
+				
+										<tr class="prop">
+											<td valign="top" class="name">Next Due Date:</td>
+											
+											<td valign="top" class="value">${taskRecurringScheduleInstance.nextDueDate}</td>
+											
+										</tr>
+				
+										<tr class="prop">
+											<td valign="top" class="name">Last Generated Date:</td>
+											
+											<td valign="top" class="value">${taskRecurringScheduleInstance.lastGeneratedDate}</td>
+											
+										</tr>
+				
+										<tr class="prop">
+											<td valign="top" class="name">Last Generated Sub Task:</td>
+											
+											<td valign="top" class="value">${taskRecurringScheduleInstance.lastGeneratedSubTask}</td>
+											
+										</tr>
+									</tbody>
+								</table>
+							</div>
+                            <div class="buttons">
+                                <g:form controller="taskRecurringScheduleDetailed">
+                                    <input type="hidden" name="id" value="${taskInstance?.id}" />
+                                    <span class="button"><g:actionSubmit class="edit" value="Edit" /></span>
+								</g:form>
+                            </div>
+                            
+						</g:else>
                     </richui:tabContent>
 <!-- End Task Recurrence tab -->
@@ -438,22 +441,78 @@
 <!-- Start Sub Task tab -->  
                     <richui:tabContent>
-                        <div class="dialog">
-                            <table>
-                                <tbody>
-                                    <tr class="prop">
-                                        <td valign="top" class="name">Sub Tasks:</td>
-                                        
-                                        <td  valign="top" style="text-align:left;" class="value">
-                                            <ul>
-                                            <g:each var="s" in="${taskInstance.subTasks}">
-                                                <li><g:link controller="taskDetailed" action="show" id="${s.id}">${s?.encodeAsHTML()}</g:link></li>
-                                            </g:each>
-                                            </ul>
-                                        </td>
-                                        
-                                    </tr>
-                                </tbody>
-                            </table>
-                        </div>
+                    	<g:if test="${subTaskInstanceTotal >= 1}">
+							<div class="list">
+								<table>
+									<thead>
+										<tr>
+										
+											<th>Id</th>
+											
+											<th>Target Start Date</th>
+											
+											<th>Description</th>
+											
+											<th>Lead Person</th>
+											
+											<th>Task Priority</th>
+										
+											<th>Task Status</th>
+											
+											<th></th>
+										
+										</tr>
+									</thead>
+									<tbody>
+									<g:each in="${subTaskInstanceList}" status="i" var="subTaskInstance">
+									<tr class="${(i % 2) == 0 ? 'clickableOdd' : 'clickableEven'}" onclick='window.location = "${request.getContextPath()}/taskDetailed/show/${subTaskInstance.id}"'/>
+	
+											<td>${fieldValue(bean:subTaskInstance, field:'id')}</td>
+											
+											<td><g:formatDate date="${subTaskInstance.targetStartDate}" format="EEE, dd MMM yyyy"/></td>
+											
+											<td>${subTaskInstance.description}</td>
+										
+	
+											<td>${subTaskInstance.leadPerson}</td>
+											
+											<td>${subTaskInstance.taskPriority}</td>
+											
+											<td>${subTaskInstance.taskStatus}</td>
+											
+											<td>
+												<g:link action="show" id="${subTaskInstance.id}">
+													<img  src="${createLinkTo(dir:'images/skin',file:'database_go.png')}" alt="Show" />
+												</g:link>
+											</td>
+	
+										
+										</tr>
+									</g:each>
+									</tbody>
+								</table>
+							</div>
+							
+							
+							<div class="buttons">
+								<g:form>
+									<input type="hidden" name="id" value="${taskInstance?.id}" />
+									<g:if test="${subTaskInstanceTotal > subTaskInstanceMax}">
+										Showing ${subTaskInstanceMax} of ${subTaskInstanceTotal}
+										<br />
+									</g:if>
+									<g:else>
+										Total ${subTaskInstanceTotal}
+										<br />
+									</g:else>
+									<span class="button"><g:actionSubmit action="listSubTasks" class="table" value="Sortable List" /></span>
+								</g:form>
+							</div>
+							
+						</g:if>
+						<g:else>
+							<br />
+							No Sub Tasks.
+						</g:else>
+
                     </richui:tabContent>
 <!-- End Sub Task tab -->
