From 9e322be6166ce34a93c8d5ba4854093c95fc036b Mon Sep 17 00:00:00 2001 From: wei <> Date: Sun, 30 Jul 2006 23:42:06 +0000 Subject: Update time-tracker graphics. --- .../protected/pages/TimeTracker/MainLayout.tpl | 5 + .../protected/pages/TimeTracker/ReportProject.page | 46 ++++---- .../pages/TimeTracker/ReportResource.page | 119 +++++++++++++-------- 3 files changed, 108 insertions(+), 62 deletions(-) (limited to 'demos/time-tracker/protected/pages') diff --git a/demos/time-tracker/protected/pages/TimeTracker/MainLayout.tpl b/demos/time-tracker/protected/pages/TimeTracker/MainLayout.tpl index 915b2fb3..ad33217b 100644 --- a/demos/time-tracker/protected/pages/TimeTracker/MainLayout.tpl +++ b/demos/time-tracker/protected/pages/TimeTracker/MainLayout.tpl @@ -36,5 +36,10 @@ +
+Copyright © 2005-2006 PradoSoft. +Silk icons by Mark James. +
+ \ No newline at end of file diff --git a/demos/time-tracker/protected/pages/TimeTracker/ReportProject.page b/demos/time-tracker/protected/pages/TimeTracker/ReportProject.page index 5f961da4..fcf6101b 100644 --- a/demos/time-tracker/protected/pages/TimeTracker/ReportProject.page +++ b/demos/time-tracker/protected/pages/TimeTracker/ReportProject.page @@ -7,8 +7,16 @@ + *
- + +
+ +
@@ -16,16 +24,16 @@ - - - - + + + + - - - - + + + +
Project NameEst. HoursActual HoursEst. CompletionProject NameEst. HoursActual HoursEst. Completion
<%# h($this->DataItem->ProjectName) %><%# h($this->DataItem->EstimateHours) %><%# h($this->DataItem->ActualHours) %> + <%# h($this->DataItem->ProjectName) %><%# h($this->DataItem->EstimateHours) %><%# h($this->DataItem->ActualHours) %> DataItem->EstimateCompletion %> /> @@ -34,24 +42,24 @@ -
+
  -
 
- - - + + + - - - + + + @@ -59,10 +67,10 @@ - - diff --git a/demos/time-tracker/protected/pages/TimeTracker/ReportResource.page b/demos/time-tracker/protected/pages/TimeTracker/ReportResource.page index e72fd0f2..b9404f4a 100644 --- a/demos/time-tracker/protected/pages/TimeTracker/ReportResource.page +++ b/demos/time-tracker/protected/pages/TimeTracker/ReportResource.page @@ -5,76 +5,109 @@ Resource Report +

STEP 1 - Select project(s)

+ *
+ +
+

STEP 2 - Select resource(s)

+ *
+ +
+

STEP 3 - Select a date range

+ *
InputMode="DropDownList" />
- - + + *
+ + +
+
+
  +
+
+
-

Beginning Date

-

<%= h($this->dateFrom->Date) %>

-

Ending Date

-

<%= h($this->dateTo->Date) %>

- +
+

Beginning Date:

+

<%= h($this->dateFrom->Date) %>

+

Ending Date:

+

<%= h($this->dateTo->Date) %>

+
-
CategoryEst. HoursActual HoursCategoryEst. HoursActual Hours
<%# h($this->DataItem->CategoryName) %><%# h($this->DataItem->EstimateHours) %><%# h($this->DataItem->ActualHours) %><%# h($this->DataItem->CategoryName) %><%# h($this->DataItem->EstimateHours) %><%# h($this->DataItem->ActualHours) %>
+ <%# h($this->DataItem['username']) %> + <%# h($this->DataItem['hours']) %>
- - - - - - - - -
ConsultantTotal Hours
<%# h($this->DataItem->Username) %><%# h($this->DataItem->TotalHours) %>
+
+ Consultant: + <%# h($this->DataItem->Username) %> + Total Hours: + <%# h($this->DataItem->TotalHours) %> - - - - - - - - - - - -
Reported DateProject NameCategory NameDurationDescription
- - - - DataItem->ReportDate %> /> - - <%# h($this->DataItem->ProjectName) %> - <%# h($this->DataItem->CategoryName) %> - <%# h($this->DataItem->Duration) %> - <%# h($this->DataItem->Description) %> - - -
+ + + + + + + + + + + +
Reported DateProject NameCategory NameDurationDescription
+ + + + DataItem->ReportDate %> /> + + <%# h($this->DataItem->ProjectName) %> + <%# h($this->DataItem->CategoryName) %> + <%# h($this->DataItem->Duration) %> + <%# h($this->DataItem->Description) %> + + + +
-- cgit v1.2.3