Index: trunk/grails-app/views/taskDetailed/show.gsp
===================================================================
--- trunk/grails-app/views/taskDetailed/show.gsp	(revision 196)
+++ trunk/grails-app/views/taskDetailed/show.gsp	(revision 199)
@@ -462,14 +462,28 @@
 
                                             <td valign="top" class="value">${taskRecurringScheduleInstance.encodeAsHTML()}</td>
-
-                                        </tr>
-
-                                        <tr class="prop">
-                                            <td valign="top" class="name">Start Date:</td>
+                                        </tr>
+
+                                        <tr class="prop">
+                                            <td valign="top" class="name">Next Generation Date:</td>
 
                                             <td valign="top" class="value">
-                                                <g:formatDate date="${taskRecurringScheduleInstance.startDate}" format="EEE, dd-MMM-yyyy"/>
+                                                <g:formatDate date="${taskRecurringScheduleInstance.nextGenerationDate}" format="EEE, dd-MMM-yyyy"/>
                                             </td>
-
+                                        </tr>
+
+                                        <tr class="prop">
+                                            <td valign="top" class="name">Generate Ahead:</td>
+
+                                            <td valign="top" class="value">
+                                                ${taskRecurringScheduleInstance?.generateAhead} ${Period.get(1).encodeAsHTML()}
+                                            </td>
+                                        </tr>
+
+                                        <tr class="prop">
+                                            <td valign="top" class="name">Next Target Start Date:</td>
+
+                                            <td valign="top" class="value">
+                                                <g:formatDate date="${taskRecurringScheduleInstance.nextTargetStartDate}" format="EEE, dd-MMM-yyyy"/>
+                                            </td>
                                         </tr>
 
@@ -483,71 +497,17 @@
 
                                         <tr class="prop">
-                                            <td valign="top" class="name">Generate Ahead:</td>
-
-                                            <td valign="top" class="value">
-                                                ${taskRecurringScheduleInstance?.generateAhead} ${taskRecurringScheduleInstance?.generateAheadPeriod}
-                                            </td>
-
-                                        </tr>
-
-                                        </tr>
-
-                                        <tr class="prop">
-                                            <td valign="top" class="name">Is Enabled:</td>
-
-                                            <td valign="top" class="value">${fieldValue(bean:taskRecurringScheduleInstance, field:'isEnabled')}</td>
-
-                                        </tr>
-
-                                    </tbody>
-                                </table>
-
-                                <table>
-                                    <tbody>
-
-                                        <tr class="prop">
-                                            <td valign="top" class="name">Next Target Start Date:</td>   
-
-                                            <td valign="top" class="value">
-                                                <g:formatDate date="${taskRecurringScheduleInstance.nextTargetStartDate}" format="EEE, dd-MMM-yyyy"/>
-                                            </td>
-
-                                        </tr>
-
-                                        <tr class="prop">
-                                            <td valign="top" class="name">Next Target Completion Date:</td>   
+                                            <td valign="top" class="name">Next Target Completion Date:</td>
 
                                             <td valign="top" class="value">
                                                 <g:formatDate date="${taskRecurringScheduleInstance.nextTargetCompletionDate}" format="EEE, dd-MMM-yyyy"/>
                                             </td>
-
-                                        </tr>
-
-                                        <tr class="prop">
-                                            <td valign="top" class="name">Next Generation Date:</td>
-
-                                            <td valign="top" class="value">
-                                                <g:formatDate date="${taskRecurringScheduleInstance.nextGenerationDate}" format="EEE, dd-MMM-yyyy"/>
-                                            </td>
-                                        </tr>
-
-                                        <tr class="prop">
-                                            <td valign="top" class="name">Last Generated Date:</td>
-
-                                            <td valign="top" class="value">
-                                                <g:formatDate date="${taskRecurringScheduleInstance.lastGeneratedDate}" format="EEE, dd-MMM-yyyy"/>
-                                            </td>
-
-                                        </tr>
-
-                                        <tr class="prop">
-                                            <td valign="top" class="name">Last Generated Sub Task:</td>
-
-                                            <td valign="top" class="value">
-                                                <g:link controller="taskDetailed" action="show" id="${taskRecurringScheduleInstance?.lastGeneratedSubTask?.id}">
-                                                    ${taskRecurringScheduleInstance?.lastGeneratedSubTask?.encodeAsHTML()}
-                                                </g:link>
-                                            </td>
-                                        </tr>
+                                        </tr>
+
+                                        <tr class="prop">
+                                            <td valign="top" class="name">Enabled:</td>
+
+                                            <td valign="top" class="value">${fieldValue(bean:taskRecurringScheduleInstance, field:'enabled')}</td>
+                                        </tr>
+
                                     </tbody>
                                 </table>
@@ -557,4 +517,5 @@
                                     <input type="hidden" name="id" value="${taskRecurringScheduleInstance?.id}" />
                                     <span class="button"><g:actionSubmit class="edit" value="Edit" /></span>
+                                    <span class="button"><g:actionSubmit class="go" value="Show" /></span>
                                 </g:form>
                             </div>