Index: /branches/TaskRewrite/src/grails-app/conf/NoCacheFilters.groovy
===================================================================
--- /branches/TaskRewrite/src/grails-app/conf/NoCacheFilters.groovy	(revision 69)
+++ /branches/TaskRewrite/src/grails-app/conf/NoCacheFilters.groovy	(revision 70)
@@ -5,15 +5,11 @@
             before = {
                 
-                //From the Acegi login controller
-                response.setHeader('Cache-Control', 'no-cache') // HTTP 1.1
+                //Turn off as much caching as we can.
+                response.setHeader("Cache-Control", "no-cache,no-store,must-revalidate")// HTTP 1.1
                 response.addDateHeader('Expires', 0)
                 response.setDateHeader('max-age', 0)
                 response.setIntHeader ('Expires', -1) //prevents caching at the proxy server
                 response.addHeader('cache-Control', 'private') //IE5.x only 
-
-                //Additional from the net
-                response.addHeader('Pragma', 'no-cache')
-                response.addHeader('Cache-Control', 'no-store')
-                response.addHeader('Cache-Control', 'must-revalidate')
+                response.addHeader('Pragma', 'no-cache') //HTTP 1.0
 
             }
Index: /branches/TaskRewrite/src/grails-app/views/layouts/main.gsp
===================================================================
--- /branches/TaskRewrite/src/grails-app/views/layouts/main.gsp	(revision 69)
+++ /branches/TaskRewrite/src/grails-app/views/layouts/main.gsp	(revision 70)
@@ -13,5 +13,5 @@
     <div id="content" align="center">
         <div id="spinner" class="spinner" style="display:none;">
-            <img src="${createLinkTo(dir:'images',file:'spinner.png')}" alt="Spinner" />
+            <img src="${createLinkTo(dir:'images',file:'spinner.gif')}" alt="Spinner" />
         </div>	
         <!-- <div class="logo" style="text-align: center; width: 980px; height: 220px">
Index: /branches/TaskRewrite/src/grails-app/views/task/create.gsp
===================================================================
--- /branches/TaskRewrite/src/grails-app/views/task/create.gsp	(revision 69)
+++ /branches/TaskRewrite/src/grails-app/views/task/create.gsp	(revision 70)
@@ -51,4 +51,13 @@
                                 <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'leadPerson','errors')}">
                                     <g:select optionKey="id" from="${Person.list()}" name="leadPerson.id" value="${taskInstance?.leadPerson?.id}" ></g:select>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="taskPriority">Task Priority:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'taskPriority','errors')}">
+                                    <g:select optionKey="id" from="${TaskPriority.list()}" name="taskPriority.id" value="${taskInstance?.taskPriority?.id}" ></g:select>
                                 </td>
                             </tr> 
@@ -126,4 +135,13 @@
                             </tr> 
                         
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="taskType">Task Type:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'taskType','errors')}">
+                                    <g:select optionKey="id" from="${TaskType.list()}" name="taskType.id" value="${taskInstance?.taskType?.id}" ></g:select>
+                                </td>
+                            </tr> 
+                        
                         </tbody>
                     </table>
Index: /branches/TaskRewrite/src/grails-app/views/task/edit.gsp
===================================================================
--- /branches/TaskRewrite/src/grails-app/views/task/edit.gsp	(revision 69)
+++ /branches/TaskRewrite/src/grails-app/views/task/edit.gsp	(revision 70)
@@ -58,4 +58,13 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
+                                    <label for="taskPriority">Task Priority:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'taskPriority','errors')}">
+                                    <g:select optionKey="id" from="${TaskPriority.list()}" name="taskPriority.id" value="${taskInstance?.taskPriority?.id}" ></g:select>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
                                     <label for="taskStatus">Task Status:</label>
                                 </td>
@@ -189,4 +198,13 @@
                                 <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'taskGroup','errors')}">
                                     <g:select optionKey="id" from="${TaskGroup.list()}" name="taskGroup.id" value="${taskInstance?.taskGroup?.id}" ></g:select>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="taskType">Task Type:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'taskType','errors')}">
+                                    <g:select optionKey="id" from="${TaskType.list()}" name="taskType.id" value="${taskInstance?.taskType?.id}" ></g:select>
                                 </td>
                             </tr> 
Index: /branches/TaskRewrite/src/grails-app/views/task/list.gsp
===================================================================
--- /branches/TaskRewrite/src/grails-app/views/task/list.gsp	(revision 69)
+++ /branches/TaskRewrite/src/grails-app/views/task/list.gsp	(revision 70)
@@ -30,7 +30,7 @@
                    	        <th>Lead Person</th>
                    	    
+                   	        <th>Task Priority</th>
+                   	    
                    	        <th>Task Status</th>
-                   	    
-                   	        <th>Parent Task</th>
                    	    
                         </tr>
@@ -48,7 +48,7 @@
                             <td>${fieldValue(bean:taskInstance, field:'leadPerson')}</td>
                         
+                            <td>${fieldValue(bean:taskInstance, field:'taskPriority')}</td>
+                        
                             <td>${fieldValue(bean:taskInstance, field:'taskStatus')}</td>
-                        
-                            <td>${fieldValue(bean:taskInstance, field:'parentTask')}</td>
                         
                         </tr>
Index: /branches/TaskRewrite/src/grails-app/views/task/show.gsp
===================================================================
--- /branches/TaskRewrite/src/grails-app/views/task/show.gsp	(revision 69)
+++ /branches/TaskRewrite/src/grails-app/views/task/show.gsp	(revision 70)
@@ -48,4 +48,11 @@
                             
                             <td valign="top" class="value"><g:link controller="person" action="show" id="${taskInstance?.leadPerson?.id}">${taskInstance?.leadPerson?.encodeAsHTML()}</g:link></td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Task Priority:</td>
+                            
+                            <td valign="top" class="value"><g:link controller="taskPriority" action="show" id="${taskInstance?.taskPriority?.id}">${taskInstance?.taskPriority?.encodeAsHTML()}</g:link></td>
                             
                         </tr>
@@ -153,4 +160,11 @@
                         </tr>
                     
+                        <tr class="prop">
+                            <td valign="top" class="name">Task Type:</td>
+                            
+                            <td valign="top" class="value"><g:link controller="taskType" action="show" id="${taskInstance?.taskType?.id}">${taskInstance?.taskType?.encodeAsHTML()}</g:link></td>
+                            
+                        </tr>
+                    
                     </tbody>
                 </table>