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. --- .../App_Data/MySQL4/time-tracker-mysql.sql | 1 + demos/time-tracker/protected/application.xml | 5 +- .../protected/pages/TimeTracker/MainLayout.tpl | 5 + .../protected/pages/TimeTracker/ReportProject.page | 46 +++--- .../pages/TimeTracker/ReportResource.page | 119 ++++++++++------ demos/time-tracker/themes/TimeTracker/clock.gif | Bin 0 -> 2500 bytes demos/time-tracker/themes/TimeTracker/project.css | 2 +- demos/time-tracker/themes/TimeTracker/report.css | 156 +++++++++++++++++++++ demos/time-tracker/themes/TimeTracker/site.css | 17 ++- demos/time-tracker/themes/TimeTracker/sync.gif | Bin 2721 -> 0 bytes demos/time-tracker/themes/clock.png | Bin 0 -> 128984 bytes 11 files changed, 281 insertions(+), 70 deletions(-) create mode 100644 demos/time-tracker/themes/TimeTracker/clock.gif create mode 100644 demos/time-tracker/themes/TimeTracker/report.css delete mode 100644 demos/time-tracker/themes/TimeTracker/sync.gif create mode 100644 demos/time-tracker/themes/clock.png (limited to 'demos') diff --git a/demos/time-tracker/protected/App_Data/MySQL4/time-tracker-mysql.sql b/demos/time-tracker/protected/App_Data/MySQL4/time-tracker-mysql.sql index 89de378a..bb120fc4 100644 --- a/demos/time-tracker/protected/App_Data/MySQL4/time-tracker-mysql.sql +++ b/demos/time-tracker/protected/App_Data/MySQL4/time-tracker-mysql.sql @@ -65,6 +65,7 @@ CREATE TABLE project ( `Name` varchar(255) NOT NULL, Description varchar(255) default NULL, CreationDate datetime NOT NULL, + CompletionDate datetime NOT NULL, Disabled tinyint(1) NOT NULL default '0', EstimateDuration float(10,2) NOT NULL default '0.00', CreatorID varchar(50) NOT NULL, diff --git a/demos/time-tracker/protected/application.xml b/demos/time-tracker/protected/application.xml index 2bf705ef..80ad5ded 100644 --- a/demos/time-tracker/protected/application.xml +++ b/demos/time-tracker/protected/application.xml @@ -13,11 +13,10 @@ - - +--> 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) %> + + + +
diff --git a/demos/time-tracker/themes/TimeTracker/clock.gif b/demos/time-tracker/themes/TimeTracker/clock.gif new file mode 100644 index 00000000..6fa3d9ae Binary files /dev/null and b/demos/time-tracker/themes/TimeTracker/clock.gif differ diff --git a/demos/time-tracker/themes/TimeTracker/project.css b/demos/time-tracker/themes/TimeTracker/project.css index 809948cd..1f514b79 100644 --- a/demos/time-tracker/themes/TimeTracker/project.css +++ b/demos/time-tracker/themes/TimeTracker/project.css @@ -66,7 +66,7 @@ fieldset.project h2 .actions { - float: left; + margin-top: 1em; clear: both; width: 100%; diff --git a/demos/time-tracker/themes/TimeTracker/report.css b/demos/time-tracker/themes/TimeTracker/report.css new file mode 100644 index 00000000..b5b69117 --- /dev/null +++ b/demos/time-tracker/themes/TimeTracker/report.css @@ -0,0 +1,156 @@ +.project-report label, .resource-report label +{ + font-size: 0.9em; +} + +.project-report .projects +{ + width: 20em; + height: 15em; +} + +.project-report .buttons +{ + margin: 2em; +} + +.project-report table, .resource-report table +{ + border-collapse: collapse; + empty-cells: hide; +} + +.project-report table th, .resource-report table th +{ + padding: 0.25em; + font-size: 0.9em; + white-space: nowrap; +} + +.project-report td, .resource-report td +{ + border: 1px solid #ccc; + padding: 0.25em; +} + +.project-report .est-hour, .project-report .hours, .resource-report .hours +{ + text-align: right; +} + +.project-report .hours +{ + width: 6em; +} + +.project-report td.sub-table +{ + padding: 0; + border-right: 0 none; + border-left: 0 none; +} + +.project-report td.left-filler +{ + border-right: 0 none; +} + +.project-report td.right-filler +{ + border-left: 0 none; +} + +.project-report .username +{ + text-align: center; +} + + +.project-report table.project +{ + margin-bottom: 3em; +} + +.project-report td.sub-table table +{ + margin: 1em 0; +} + +.project-report .completion, .resource-report .date +{ + text-align: center; +} + +.resource-report h2 +{ + background-color: #D2E8E8; + font-size: 0.8em; + color: #4169E1; + padding: 0.65em; + text-align: center; + background-image: url(bar.png); + background-repeat: repeat-x; + background-position: center; +} + +.resource-report select.resource, .resource-report select.projects +{ + width: 15em; + height: 17em; +} + +.resource-report .step1, .resource-report .step2, .resource-report .step3 +{ + float: left; + width: 32%; + margin-right: 0.25em; +} + +.resource-report .buttons +{ + background-color: #D2E8E8; + background-image: url(bar.png); + background-repeat: repeat-x; + background-position: center; + padding: 0.65em; + margin-top: 2em; +} + +.resource-report .date-to +{ + margin-top: 0.5em; +} + +.resource-report .summary +{ + text-align: left; + padding-left: 5em; +} + +.resource-report .date-from, .resource-report .date-to +{ + padding-left: 1em; +} + +.resource-report .resource strong.hours +{ + margin-left: 1em; +} + +.resource-report .resource +{ + + margin-bottom: 2em; + padding: 0.5em; +} + + +.resource-report .date-range h3, .resource-report .date-range h4 +{ + display: inline; +} + +.resource-report .date-range h3.end +{ + margin-left: 2em; +} \ No newline at end of file diff --git a/demos/time-tracker/themes/TimeTracker/site.css b/demos/time-tracker/themes/TimeTracker/site.css index bfe59f9e..8d9c6f99 100644 --- a/demos/time-tracker/themes/TimeTracker/site.css +++ b/demos/time-tracker/themes/TimeTracker/site.css @@ -1,12 +1,13 @@ html { + background: url(background.png) repeat-x top; background-color: #eef; } body { - background: url(background.png) repeat-x top; - margin: 0; + margin: 0 auto; padding: 2em; + max-width: 60em; font-family: Tahoma, Arial, Helvetica, sans-serif; } @@ -40,10 +41,10 @@ h1.heading, h1 a:hover h1.heading { - background-image: url(sync.gif); + background-image: url(clock.gif); background-repeat: no-repeat; background-position: center left; - padding: 0px 0px 5px 75px; + padding: 0px 0px 5px 70px; } @@ -251,4 +252,12 @@ fieldset.signup .wizardNav { border: 2px solid red; background-color: #FFE4E1 +} + +.copyrights +{ + font-size: 0.8em; + text-align: center; + color: #708090; + margin-top: 2em; } \ No newline at end of file diff --git a/demos/time-tracker/themes/TimeTracker/sync.gif b/demos/time-tracker/themes/TimeTracker/sync.gif deleted file mode 100644 index 3ed6630f..00000000 Binary files a/demos/time-tracker/themes/TimeTracker/sync.gif and /dev/null differ diff --git a/demos/time-tracker/themes/clock.png b/demos/time-tracker/themes/clock.png new file mode 100644 index 00000000..8be70a41 Binary files /dev/null and b/demos/time-tracker/themes/clock.png differ -- cgit v1.2.3