diff --git a/Documentation/images-ext/Parameters View.png b/Documentation/images-ext/Parameters View.png new file mode 100644 index 0000000..b362fce Binary files /dev/null and b/Documentation/images-ext/Parameters View.png differ diff --git a/Documentation/images-ext/Project View.png b/Documentation/images-ext/Project View.png new file mode 100644 index 0000000..44fc80a Binary files /dev/null and b/Documentation/images-ext/Project View.png differ diff --git a/Source/Kaizen/css/ext.styles.css b/Source/Kaizen/css/ext.styles.css index 14456c7..5c0e363 100644 --- a/Source/Kaizen/css/ext.styles.css +++ b/Source/Kaizen/css/ext.styles.css @@ -142,6 +142,33 @@ div.section a.msbuildMessagesOff { background-position: 0px -32px; } margin-right: 4px; } +/* Project report view */ +td.data a.report, +td.data a.externalLink { + display: block; + background-repeat: no-repeat; + padding: 0 5px 0 36px; + height:32px; + float: left; + text-decoration: none; + font-size: 150%; + line-height: 32px; + color: #9D9999; +} + +td.data a.report:hover, +td.data a.externalLink:hover { + color: #000000; +} + +td.data a.report { + background-image: url('../images/ext/report.ReportLink32.png'); +} + +td.data a.externalLink { + background-image: url('../images/ext/report.ExternalLink32.png'); +} + /* Tree ----------------------------------------*/ .indent-tree { padding-left: 15px; } diff --git a/Source/Kaizen/images/ext/fplogo.gif b/Source/Kaizen/images/ext/fplogo.gif new file mode 100644 index 0000000..d22f0b6 Binary files /dev/null and b/Source/Kaizen/images/ext/fplogo.gif differ diff --git a/Source/Kaizen/images/ext/report.ExternalLink32.png b/Source/Kaizen/images/ext/report.ExternalLink32.png new file mode 100644 index 0000000..be4e0b4 Binary files /dev/null and b/Source/Kaizen/images/ext/report.ExternalLink32.png differ diff --git a/Source/Kaizen/images/ext/report.ReportLink128.png b/Source/Kaizen/images/ext/report.ReportLink128.png new file mode 100644 index 0000000..98b7f76 Binary files /dev/null and b/Source/Kaizen/images/ext/report.ReportLink128.png differ diff --git a/Source/Kaizen/images/ext/report.ReportLink32.png b/Source/Kaizen/images/ext/report.ReportLink32.png new file mode 100644 index 0000000..5d41212 Binary files /dev/null and b/Source/Kaizen/images/ext/report.ReportLink32.png differ diff --git a/Source/Kaizen/images/ext/report.ReportLink64.png b/Source/Kaizen/images/ext/report.ReportLink64.png new file mode 100644 index 0000000..b197ef9 Binary files /dev/null and b/Source/Kaizen/images/ext/report.ReportLink64.png differ diff --git a/Source/Kaizen/templates/AdministerDashboard.vm b/Source/Kaizen/templates/AdministerDashboard.vm index 05997b2..10c38dd 100644 --- a/Source/Kaizen/templates/AdministerDashboard.vm +++ b/Source/Kaizen/templates/AdministerDashboard.vm @@ -1,365 +1,251 @@ - - - -
-
- - - - - - - - -
- - - -
- -
-
-
-
-
    - #foreach ($Event in $Events) -
  1. $Event.Message
    2. - #end -
-
-
-
- - - - - - - - - - -
Are you sure you want to delete the server 'Name'?
 
- - - - -
-
-
-
-
- - - - - - - - - - - - -
- - - Name -
- - - Description -
- - - - -
-
-
-
-
- - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - -
 
- - -
- - -
- - - - -
-
-
- -#if ($Result.Length > 0) -
- $Result - #if ($Events) - - #end - #if ($InstallPackage.Length > 0) -
- - -
- #end -
-#end -#if ($Error != "") -
- $Error - #if ($Events) - (View Log) - #end -
-#end - -
-

- Administration Dashboard - -
- - -
-
- - -
- -

-
- -
-

- Remote Servers -

-
- - - - - - #foreach ($Server in $Servers) - - - - - #end - - - -
NameLink
- - $Server.Name - - - #if ($Server.AllowForceBuild) - - #else - - #end - - #if ($Server.AllowStartStopBuild) - - #else - - #end - - - $Server.Url - -
-
- -
-
-
-
-
-

- Packages -

-
- - - - - - - - - - - #foreach ($Package in $DashboardPackages) - - - - - - #end - - - - - - - - - - #foreach ($Package in $ServerPackages) - - - - - - #end - - - - - - - - - - - #foreach ($Package in $ProjectPackages) - - - - - - #end - - - - - - - - - - - - #foreach ($Package in $BuildPackages) - - - - - - #end - - - - -
-

- Dashboard Packages -

-
NameDescriptionStatus
- - $Package.Name - - - $Package.Description - #if ($Package.IsInstalled) - [Installed] - #else - [Not installed] - #end -
-

- - Server Packages -

-
NameDescriptionStatus
- - $Package.Name - - - - $Package.Description - - #if ($Package.IsInstalled) - [Installed] - #else - [Not installed] - #end -
-

- - Project Packages -

-
NameDescriptionStatus
- - $Package.Name - - - - $Package.Description - - #if ($Package.IsInstalled) - [Installed] - #else - [Not installed] - #end -
-

- - Build Packages -

-
NameDescriptionStatus
- - $Package.Name - - - - $Package.Description - - #if ($Package.IsInstalled) - [Installed] - #else - [Not installed] - #end -
-
- -
-
-
-
+ + + +
+
+ + + + + + + + +
+ + + +
+ +
+
+
+
+
    + #foreach ($Event in $Events) +
  1. $Event.Message
    2. + #end +
+
+
+
+ + + + + + + + + + +
Are you sure you want to delete the server 'Name'?
 
+ + + + +
+
+
+
+
+ + + + + + + + + + + + +
+ + + Name +
+ + + Description +
+ + + + +
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + +
+ + + + +
+ + + +
 
+ + +
+ + +
+ + + + +
+
+
+ +#if ($Result.Length > 0) +
+ $Result + #if ($Events) + + #end + #if ($InstallPackage.Length > 0) +
+ + +
+ #end +
+#end +#if ($Error != "") +
+ $Error + #if ($Events) + (View Log) + #end +
+#end + +
+

+ Administration Dashboard + +
+ + +
+
+ + +
+ +

+
+ +
+

+ Remote Servers +

+
+ + + + + + #foreach ($Server in $Servers) + + + + + #end + + + +
NameLink
+ + $Server.Name + + + #if ($Server.AllowForceBuild) + + #else + + #end + + #if ($Server.AllowStartStopBuild) + + #else + + #end + + + $Server.Url + +
+
+ +
+
+
+
+
+

+ Packages +

+
+ + + + + + + #foreach ($Package in $Packages) + + + + + + #end + + + +
NameDescriptionStatus
+ + $Package.Name + + + $Package.Description + #if ($Package.IsInstalled) + [Installed] + #else + [Not installed] + #end +
+
+ +
+
+
+
\ No newline at end of file diff --git a/Source/Kaizen/templates/ProjectReport.vm b/Source/Kaizen/templates/ProjectReport.vm index 8b2b7c6..4b37d44 100644 --- a/Source/Kaizen/templates/ProjectReport.vm +++ b/Source/Kaizen/templates/ProjectReport.vm @@ -1,180 +1,186 @@ - - -
-
$translations.Translate("Loading parameters, please wait...")
-
- - -#if ($StatusMessage.Length > 0) -
- $StatusMessage -
-#end - -
- #if ($status.BuildStatus == "Failure") -

- #elseif ($status.BuildStatus == "Success") -

- #elseif ($status.BuildStatus == "Exception") -

- #elseif ($status.BuildStatus == "Unknown") -

- #else -

- #end - $projectName - #if ($rssDataPresent) - - - RSS - - - #end -

- #if ($externalLinks.Length > 0) -
- - #foreach ($externalLink in $externalLinks) - - - - #end -
- $externalLink.Name -
-
- #end -
-
-

- Status -

-
- - - - - - - - - - - - - - - - - - - - -
Last Build Status$status.BuildStatus
Last Build Label$status.LastBuildLabel
CCNet Status$status.Status
Activity$status.Activity
-
- #if ($server.AllowForceBuild) - - #end - #if ($server.AllowStartStopBuild) - - #end -
-
-
-
-
-

- Build -

-
- - #if ($noLogsAvailable) - - - - #else - #if ($pluginInfo) - - - - - - - #end - - - - #end -
- There are currently no build logs available for this project - make sure your Build Server configuration is correct and that this Project's build is not throwing any exceptions -
Most Recent Build Results
$pluginInfo
Click here for the full build report.
-
-
-#if ($highestAmountPerDay > 0) - #set($highestViewPerDay= $highestAmountPerDay / $dateMultiPlier) -
-

- Build Overview -

-
- - - - - - - - - - - -
$OKPercent%
- - #foreach ($dayBuildCounter in [1..$highestViewPerDay]) - - #foreach ($currentDayInfo in $graphDayInfo) - #foreach ($multi in [1..$dateMultiPlier]) - #set ($cellIndex = (($highestViewPerDay - $dayBuildCounter) * $dateMultiPlier) + $multi) - #if ( $cellIndex <= $currentDayInfo.AmountOfBuilds) - #set ($buildIndex = $cellIndex - 1 ) - #if ($currentDayInfo.Build($buildIndex).IsSuccesFull) - #set($color = "success") - #else - #set($color ="failed") - #end - - #else - - #end - #end - #end - - #end - - #foreach ($currentDayInfo in $graphDayInfo) - - #end - -
- $cellIndex -
$currentDayInfo.BuildDateFormatted
-
-
-
-#end + + +
+
$translations.Translate("Loading parameters, please wait...")
+
+ + +#if ($StatusMessage.Length > 0) +
+ $StatusMessage +
+#end + +
+ #if ($status.BuildStatus == "Failure") +

+ #elseif ($status.BuildStatus == "Success") +

+ #elseif ($status.BuildStatus == "Exception") +

+ #elseif ($status.BuildStatus == "Unknown") +

+ #else +

+ #end + $projectName + #if ($rssDataPresent) + + + RSS + + + #end +

+ +
+ + #if ($noLogsAvailable) + + + + #else + #if ($pluginInfo) + + + + + + + #end + + + + #end +
+ There are currently no build logs available for this project - make sure your Build Server configuration is correct and that this Project's build is not throwing any exceptions +
Most Recent Build Results
$pluginInfo
+ Full build report +
+
+ + + +
+
+

+ Status +

+
+ + + + + + + + + + + + + + + + + + + + +
Last Build Status$status.BuildStatus
Last Build Label$status.LastBuildLabel
CCNet Status$status.Status
Activity$status.Activity
+
+ #if ($server.AllowForceBuild) + + #end + #if ($server.AllowStartStopBuild) + + #end +
+
+
+
+
+

+ Related links +

+
+ + + + +
+ #if ($externalLinks.Length > 0) + #foreach ($externalLink in $externalLinks) + $externalLink.Name + #end + #end +
+
+
+#if ($highestAmountPerDay > 0) + #set($highestViewPerDay= $highestAmountPerDay / $dateMultiPlier) +
+

+ Build Overview +

+
+ + + + + + + + + + + +
$OKPercent%
+ + #foreach ($dayBuildCounter in [1..$highestViewPerDay]) + + #foreach ($currentDayInfo in $graphDayInfo) + #foreach ($multi in [1..$dateMultiPlier]) + #set ($cellIndex = (($highestViewPerDay - $dayBuildCounter) * $dateMultiPlier) + $multi) + #if ( $cellIndex <= $currentDayInfo.AmountOfBuilds) + #set ($buildIndex = $cellIndex - 1 ) + #if ($currentDayInfo.Build($buildIndex).IsSuccesFull) + #set($color = "success") + #else + #set($color ="failed") + #end + + #else + + #end + #end + #end + + #end + + #foreach ($currentDayInfo in $graphDayInfo) + + #end + +
+ $cellIndex +
$currentDayInfo.BuildDateFormatted
+
+
+
+#end \ No newline at end of file diff --git a/Source/Kaizen/templates/SiteTemplate.vm b/Source/Kaizen/templates/SiteTemplate.vm index 7218484..4276de5 100644 --- a/Source/Kaizen/templates/SiteTemplate.vm +++ b/Source/Kaizen/templates/SiteTemplate.vm @@ -32,7 +32,7 @@