Index: trunk/grails-app/views/appCore/manager.gsp
===================================================================
--- trunk/grails-app/views/appCore/manager.gsp	(revision 474)
+++ trunk/grails-app/views/appCore/manager.gsp	(revision 476)
@@ -33,5 +33,5 @@
                             <td valign="top" class="value">
                                 <g:link controller="taskDetailed"
-                                                action="budget"
+                                                action="search"
                                                 params="[quickSearch: 'budgetPlanned']">
                                                 Planned Tasks
@@ -39,5 +39,5 @@
                                 <br />
                                 <g:link controller="taskDetailed" 
-                                                action="budget"
+                                                action="search"
                                                 params="[quickSearch: 'budgetUnplanned']">
                                                 Unplanned Tasks
Index: trunk/grails-app/views/appCore/start.gsp
===================================================================
--- trunk/grails-app/views/appCore/start.gsp	(revision 474)
+++ trunk/grails-app/views/appCore/start.gsp	(revision 476)
@@ -47,12 +47,6 @@
                                             <g:link controller="taskDetailed"
                                                             action="search"
-                                                            params="[quickSearch: 'searchMyTodays']">
-                                                            Today's
-                                            </g:link>
-                                            <br />
-                                            <g:link controller="taskDetailed" 
-                                                            action="search"
-                                                            params="[quickSearch: 'searchMyInTheLastWeek']">
-                                                            In the last week
+                                                            params="[quickSearch: 'myTodays']">
+                                                            Today
                                             </g:link>
                                         </td>
@@ -61,10 +55,16 @@
                                     <tr class="prop">
                                         <td valign="top" class="name">
-                                            <label>Tasks:</label>
+                                            <label>All Tasks:</label>
                                         </td>
                                         <td valign="top" class="value">
                                             <g:link controller="taskDetailed" 
+                                                            action="search"
+                                                            params="[quickSearch: 'pastWeek']">
+                                                            Past Week
+                                            </g:link>
+                                            <br />
+                                            <g:link controller="taskDetailed" 
                                                             action="searchCalendar"
-                                                            params="[quickSearch: 'searchInTheLastWeek']">
+                                                            params="[quickSearch: 'searchPlannersRange']">
                                                             Calendar
                                             </g:link>
Index: trunk/grails-app/views/taskDetailed/_quickSearchPane.gsp
===================================================================
--- trunk/grails-app/views/taskDetailed/_quickSearchPane.gsp	(revision 476)
+++ trunk/grails-app/views/taskDetailed/_quickSearchPane.gsp	(revision 476)
@@ -0,0 +1,103 @@
+<!-- Start Search Pane -->
+<div class="overlayPane" id="searchPane" style="display:none;">
+    <h2>Quick Search</h2>
+    <g:form method="post" id="searchForm" name="searchForm" >
+        <table>
+            <tbody>
+
+                <tr class="prop">
+                    <td valign="top" class="name">
+                        <label>My Tasks:</label>
+                    </td>
+                    <td valign="top" class="value">
+                        <g:link controller="taskDetailed"
+                                        action="${actionName}"
+                                        params="[quickSearch: 'myTodays']">
+                                        Today
+                        </g:link>
+                        <br />
+                        <g:link controller="taskDetailed"
+                                        action="${actionName}"
+                                        params="[quickSearch: 'myYesterdays']">
+                                        Yesterday
+                        </g:link>
+                        <br />
+                        <g:link controller="taskDetailed"
+                                        action="${actionName}"
+                                        params="[quickSearch: 'myTomorrows']">
+                                        Tomorrow
+                        </g:link>
+                        <br />
+                        <g:link controller="taskDetailed"
+                                        action="${actionName}"
+                                        params="[quickSearch: 'myPastWeek']">
+                                        Past Week
+                        </g:link>
+                    </td>
+                </tr>
+
+                <tr class="prop">
+                    <td valign="top" class="name">
+                        <label>All Tasks:</label>
+                    </td>
+                    <td valign="top" class="value">
+                        <g:link controller="taskDetailed"
+                                        action="${actionName}"
+                                        params="[quickSearch: 'todays']">
+                                        Today
+                        </g:link>
+                        <br />
+                        <g:link controller="taskDetailed"
+                                        action="${actionName}"
+                                        params="[quickSearch: 'yesterdays']">
+                                        Yesterday
+                        </g:link>
+                        <br />
+                        <g:link controller="taskDetailed"
+                                        action="${actionName}"
+                                        params="[quickSearch: 'tomorrows']">
+                                        Tomorrow
+                        </g:link>
+                        <br />
+                        <g:link controller="taskDetailed"
+                                        action="${actionName}"
+                                        params="[quickSearch: 'pastWeek']">
+                                        Past Week
+                        </g:link>
+                        <br />
+                        <g:link controller="taskDetailed"
+                                        action="${actionName}"
+                                        params="[quickSearch: 'plannersRange']">
+                                        Planners Range
+                        </g:link>
+                    </td>
+                </tr>
+
+                <tr class="prop">
+                    <td valign="top" class="name">
+                        <label>Budget:</label>
+                    </td>
+                    <td valign="top" class="value">
+                        <g:link controller="taskDetailed"
+                                        action="${actionName}"
+                                        params="[quickSearch: 'budgetPlanned']">
+                                        Planned Tasks
+                        </g:link>
+                        <br />
+                        <g:link controller="taskDetailed"
+                                        action="${actionName}"
+                                        params="[quickSearch: 'budgetUnplanned']">
+                                        Unplanned Tasks
+                        </g:link>
+                    </td>
+                </tr>
+
+            </tbody>
+        </table>
+        <div class="buttons">
+            <span class="button">
+                <input type="button" value="${g.message(code:'fp.tag.filterPane.button.cancel.text', default:'Cancel')}" onclick="return hideElement('searchPane');" />
+            </span>
+        </div>
+    </g:form>
+</div> <!-- end search pane -->
Index: trunk/grails-app/views/taskDetailed/budget.gsp
===================================================================
--- trunk/grails-app/views/taskDetailed/budget.gsp	(revision 474)
+++ 	(revision )
@@ -1,131 +1,0 @@
-<html>
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-        <meta name="layout" content="main" />
-        <title>Task Search</title>
-        <nav:resources override="true"/>
-        <export:resource />
-    </head>
-    <body>
-        <div class="nav">
-            <nav:renderSubItems group="nav"/>
-        </div>
-
-        <div class="body">
-            <g:if test="${flash.message}">
-                <div class="message">${flash.message}</div>
-            </g:if>
-            <g:if test="${params.message}">
-                <div class="message">${params.message}</div>
-            </g:if>
-            <g:hasErrors bean="${appCore}">
-                <div class="errors">
-                    <g:renderErrors bean="${appCore}" as="list" />
-                </div>
-            </g:hasErrors>
-
-            <div class="paginateButtons">
-                <a href='' onclick="showElement('searchPane'); return false;">Quick</a>
-                Results: ${taskInstanceList.size()} / ${taskInstanceTotal}
-            </div>
-
-            <g:if test="${taskInstanceList.size() > 0}">
-                <div class="list">
-                    <table>
-                        <thead>
-                            <tr>
-
-                                <g:sortableColumn property="id" title="Id" params="${filterParams}" />
-
-                                <g:sortableColumn property="targetStartDate" title="Target Start Date" params="${filterParams}" />
-
-                                <g:sortableColumn property="description" title="Description" params="${filterParams}" />
-
-                                <g:sortableColumn  property="leadPerson" title="Lead Person" params="${filterParams}" />
-
-                                <g:sortableColumn  property="taskPriority" title="Task Priority" params="${filterParams}" />
-
-                                <g:sortableColumn  property="taskStatus" title="Task Status" params="${filterParams}" />
-
-                                <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="${resource(dir:'images/skin',file:'database_go.png')}" alt="Show" />
-                                    </g:link>
-                                </td>
-
-                            </tr>
-                        </g:each>
-                        </tbody>
-                    </table>
-                </div>
-            </g:if>
-            <div class="paginateButtons">
-                <g:paginate total="${taskInstanceTotal}" params="${filterParams}" />
-            </div>
-            <export:formats  params="${filterParams}" formats="['csv', 'excel', 'pdf', 'rtf']"/>
-        </div> <!-- end body  -->
-
-        <!-- Start Search Pane -->
-        <div class="overlayPane" id="searchPane" style="display:none;">
-            <h2>Quick Search</h2>
-            <g:form method="post" id="searchForm" name="searchForm" >
-                <table>
-                    <tbody>
-
-                        <tr class="prop">
-                            <td valign="top" class="name">
-                                <label>Budget:</label>
-                            </td>
-                            <td valign="top" class="value">
-                                <g:link controller="taskDetailed"
-                                                action="budget"
-                                                params="[quickSearch: 'budgetPlanned']">
-                                                Planned Tasks
-                                </g:link>
-                                <br />
-                                <g:link controller="taskDetailed" 
-                                                action="budget"
-                                                params="[quickSearch: 'budgetUnplanned']">
-                                                Unplanned Tasks
-                                </g:link>
-                            </td>
-                        </tr>
-
-                    </tbody>
-                </table>
-                <div class="buttons">
-                    <span class="button">
-                        <input type="button" value="${g.message(code:'fp.tag.filterPane.button.cancel.text', default:'Cancel')}" onclick="return hideElement('searchPane');" />
-                    </span>
-<!--                    <span class="button">
-                        <input type="button" value="${g.message(code:'fp.tag.filterPane.button.clear.text', default:'Clear')}" onclick="return clearFilterPane('searchForm');" />
-                    </span>
-                    <span class="button">
-                        <g:actionSubmit class="search" value="Search" />
-                    </span>-->
-                </div>
-            </g:form>
-        </div> <!-- end search pane -->
-
-    </body>
-</html>
Index: trunk/grails-app/views/taskDetailed/search.gsp
===================================================================
--- trunk/grails-app/views/taskDetailed/search.gsp	(revision 474)
+++ trunk/grails-app/views/taskDetailed/search.gsp	(revision 476)
@@ -15,7 +15,4 @@
         <div class="body">
             <g:render template="/shared/messages" />
-            <g:if test="${params.message}">
-                <div class="message">${params.message}</div>
-            </g:if>
             <g:hasErrors bean="${appCore}">
                 <div class="errors">
@@ -142,5 +139,5 @@
             </g:if>
             <div class="paginateButtons">
-                <g:paginate total="${taskInstanceTotal}" params="${filterParams}" />
+                <g:paginate  action="search" total="${taskInstanceTotal}" params="${filterParams}" />
             </div>
 
@@ -169,61 +166,8 @@
                                                                                 targetStartDate:[years:2020..2000,precision:'day']
                                                                                 ]}"/>
+
+            <g:render template="quickSearchPane" />
+
         </div> <!-- end body  -->
-
-        <!-- Start Search Pane -->
-        <div class="overlayPane" id="searchPane" style="display:none;">
-            <h2>Quick Search</h2>
-            <g:form method="post" id="searchForm" name="searchForm" >
-                <table>
-                    <tbody>
-
-                        <tr class="prop">
-                            <td valign="top" class="name">
-                                <label>My Tasks:</label>
-                            </td>
-                            <td valign="top" class="value">
-                                <g:link controller="taskDetailed"
-                                                action="search"
-                                                params="[quickSearch: 'searchMyTodays']">
-                                                Today's
-                                </g:link>
-                                <br />
-                                <g:link controller="taskDetailed" 
-                                                action="search"
-                                                params="[quickSearch: 'searchMyInTheLastWeek']">
-                                                In the last week
-                                </g:link>
-                            </td>
-                        </tr>
-
-                        <tr class="prop">
-                            <td valign="top" class="name">
-                                <label>Tasks:</label>
-                            </td>
-                            <td valign="top" class="value">
-                                <g:link controller="taskDetailed"
-                                                action="search"
-                                                params="[quickSearch: 'searchTodays']">
-                                                Today's
-                                </g:link>
-                                <br />
-                                <g:link controller="taskDetailed" 
-                                                action="search"
-                                                params="[quickSearch: 'searchInTheLastWeek']">
-                                                In the last week
-                                </g:link>
-                            </td>
-                        </tr>
-
-                    </tbody>
-                </table>
-                <div class="buttons">
-                    <span class="button">
-                        <input type="button" value="${g.message(code:'fp.tag.filterPane.button.cancel.text', default:'Cancel')}" onclick="return hideElement('searchPane');" />
-                    </span>
-                </div>
-            </g:form>
-        </div> <!-- end search pane -->
-
     </body>
 </html>
Index: trunk/grails-app/views/taskDetailed/searchCalendar.gsp
===================================================================
--- trunk/grails-app/views/taskDetailed/searchCalendar.gsp	(revision 474)
+++ trunk/grails-app/views/taskDetailed/searchCalendar.gsp	(revision 476)
@@ -3,8 +3,9 @@
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
         <meta name="layout" content="main" />
-        <title>Task Search</title>
+        <title>Task Search Calendar</title>
         <filterpane:includes />
         <nav:resources override="true"/>
-        <resource:calendarMonthView />
+        <resource:calendarMonthView  skin="calendarmonthviewCustom"/>
+        <export:resource />
     </head>
     <body>
@@ -14,13 +15,6 @@
 
         <div class="body">
-            <g:if test="${params.message}">
-                <div class="message">${params.message}</div>
-            </g:if>
             <g:render template="/shared/messages" />
-            <g:hasErrors bean="${appCore}">
-                <div class="errors">
-                    <g:renderErrors bean="${appCore}" as="list" />
-                </div>
-            </g:hasErrors>
+
             <filterpane:currentCriteria domainBean="Task"
                                     action="searchCalendar"
@@ -41,22 +35,74 @@
             </div>
 
-            <br />
-            <g:link action="searchCalendar" params="[previousMonth:'true']">
-                < Previous
-            </g:link>
-            <span style="font-size: 17px; font-weight: bold;">
-                <g:formatDate date="${showMonth}" format="MMMM"/>
-            </span>
-            <g:link action="searchCalendar" params="[nextMonth:'true']">
-                Next >
-            </g:link>
-            <br />
+            <jsUtil:toggleControl toggleId="options"
+                                                    imageId="optionsImg"
+                                                    closedImgUrl="${resource(dir:'images/skin',file:'bullet_arrow_right.png')}"
+                                                    openImgUrl="${resource(dir:'images/skin',file:'bullet_arrow_down.png')}"
+                                                    text="${g.message(code: 'default.options.text')}"
+                                                    />
+
+            <div id="options" style="display:none;">
+                <g:form method="post" >
+                    <g:hiddenField name="params" value="${filterParams}" />
+                    <div class="dialog">
+                        <table>
+                            <tbody>
+
+                                <tr class="prop">
+                                    <td valign="top" class="name">
+                                        <label for="max">Results per page:</label>
+                                    </td>
+                                    <td valign="top" class="value">
+                                        <input type="text" maxlength="4" id="description" name="newMax" value="${params.max}"/>
+
+                                        <span class="buttons">
+                                            <g:actionSubmit action="setSearchCalendarParamsMax" class="go" value="Update" />
+                                        </span>
+                                    </td>
+                                </tr>
+
+                            </tbody>
+                        </table>
+                    </div>
+                <export:formats  params="${filterParams}" formats="['csv', 'excel', 'pdf', 'rtf']"/>
+                </g:form>
+            </div>
+
             <br />
 
             <g:if test="${taskInstanceList.size() > 0}">
+                    <div class="paginateButtons">
+                        <g:link action="searchCalendar"
+                                        params="[showMonth: previousYear.month, showYear: previousYear.year]">
+                            &lt;&lt;
+                        </g:link>
+                        <g:link action="searchCalendar"
+                                        params="[showMonth: previousMonth.month, showYear: previousMonth.year]">
+                            &lt;
+                        </g:link>
+                        <span class="calendarMonthControlTitle">
+                            <g:formatDate date="${showDate}" format="MMMM, yyyy"/>
+                        </span>
+                        <g:link action="searchCalendar"
+                                        params="[showMonth: nextMonth.month, showYear: nextMonth.year]">
+                            &gt;
+                        </g:link>
+                        <g:link action="searchCalendar"
+                                        params="[showMonth: nextYear.month, showYear: nextYear.year]">
+                            &gt;&gt;
+                        </g:link>
+                    </div>
+                    <div>
+                        <g:link action="searchCalendar"
+                                        params="[showMonth: today.month, showYear: today.year]">
+                            Today: <g:formatDate date="${today.date}" format="MMMM, yyyy"/>
+                        </g:link>
+                    </div>
+                    <br />
+
                 <richui:calendarMonthView items="${taskInstanceList}"
                                                                         createLink="true"
                                                                         constraintDateFields="['targetStartDate']"
-                                                                        month="${showMonth}"
+                                                                        month="${showDate}"
                                                                         controller="taskDetailed"
                                                                         action="show"
@@ -70,66 +116,13 @@
                                     additionalProperties="id"
                                     excludeProperties="trash, comment, targetCompletionDate"
-                                    associatedProperties="leadPerson.lastName, taskPriority.name"
+                                    associatedProperties="leadPerson.lastName, leadPerson.firstName, taskPriority.name"
                                     filterPropertyValues="${['taskPriority.name':[values:TaskPriority.list()],
                                                                                 'leadPerson.lastName':[values:Person.executeQuery('select t.lastName from Person t')],
+                                                                                'leadPerson.firstName':[values:Person.executeQuery('select distinct t.firstName from Person t')],
                                                                                 targetStartDate:[years:2020..2000,precision:'day']]}"/>
 
+            <g:render template="quickSearchPane" />
+
         </div> <!-- end body div -->
-
-        <!-- Start Search Pane -->
-        <div class="overlayPane" id="searchPane" style="display:none;">
-            <h2>Quick Search</h2>
-            <g:form method="post" id="searchForm" name="searchForm" >
-                <table>
-                    <tbody>
-
-                        <tr class="prop">
-                            <td valign="top" class="name">
-                                <label>My Tasks:</label>
-                            </td>
-                            <td valign="top" class="value">
-                                <g:link controller="taskDetailed"
-                                                action="searchCalendar"
-                                                params="[quickSearch: 'searchMyTodays']">
-                                                Today's
-                                </g:link>
-                                <br />
-                                <g:link controller="taskDetailed" 
-                                                action="searchCalendar"
-                                                params="[quickSearch: 'searchMyInTheLastWeek']">
-                                                In the last week
-                                </g:link>
-                            </td>
-                        </tr>
-
-                        <tr class="prop">
-                            <td valign="top" class="name">
-                                <label>Tasks:</label>
-                            </td>
-                            <td valign="top" class="value">
-                                <g:link controller="taskDetailed"
-                                                action="searchCalendar"
-                                                params="[quickSearch: 'searchTodays']">
-                                                Today's
-                                </g:link>
-                                <br />
-                                <g:link controller="taskDetailed" 
-                                                action="searchCalendar"
-                                                params="[quickSearch: 'searchInTheLastWeek']">
-                                                In the last week
-                                </g:link>
-                            </td>
-                        </tr>
-
-                    </tbody>
-                </table>
-                <div class="buttons">
-                    <span class="button">
-                        <input type="button" value="${g.message(code:'fp.tag.filterPane.button.cancel.text', default:'Cancel')}" onclick="return hideElement('searchPane');" />
-                    </span>
-                </div>
-            </g:form>
-        </div> <!-- end search pane -->
-
     </body>
 </html>