diff --git a/project/WebDashboard/templates/ProjectGrid.vm b/project/WebDashboard/templates/ProjectGrid.vm index 4bc32b3a0..033ef2859 100644 --- a/project/WebDashboard/templates/ProjectGrid.vm +++ b/project/WebDashboard/templates/ProjectGrid.vm @@ -1,265 +1,358 @@ - - - -
- - - - -
- -
-
+ + -#if ($forceBuildMessage.Length > 0) -

- - - $translations.Translate($forceBuildMessage) - - -

-#end + +
+ + + + +
+ +
+
+ + + #if ($forceBuildMessage.Length > 0) +

+ + + $translations.Translate($forceBuildMessage) + + +

+ #end -#set ($ProjectOKCounter = 0) -#set ($ProjectNOKCounter = 0) -#foreach ($projectGridRow in $projectGrid) - #if ($projectGridRow.BuildStatus == "Success") - #set ($ProjectOKCounter = $ProjectOKCounter + 1) - #else - #set ($ProjectNOKCounter = $ProjectNOKCounter + 1) - #end -#end -#set ($ProjectCounter = $ProjectOKCounter + $ProjectNOKCounter) -#if ($ProjectCounter == 0) - #set ($OKPercent = 50) - #set ($NOKPercent = 0) -#else - #set ($OKPercent = 50 * $ProjectOKCounter / $ProjectCounter) - #set ($NOKPercent = 50 - $OKPercent) -#end -#set ($OKPercentToolTip = $OKPercent * 2) + #set ($ProjectOKCounter = 0) + #set ($ProjectNOKCounter = 0) + #foreach ($projectGridRow in $projectGrid) + #if ($projectGridRow.BuildStatus == "Success") + #set ($ProjectOKCounter = $ProjectOKCounter + 1) + #else + #set ($ProjectNOKCounter = $ProjectNOKCounter + 1) + #end + #end + #set ($ProjectCounter = $ProjectOKCounter + $ProjectNOKCounter) + #if ($ProjectCounter == 0) + #set ($OKPercent = 50) + #set ($NOKPercent = 0) + #else + #set ($OKPercent = 50 * $ProjectOKCounter / $ProjectCounter) + #set ($NOKPercent = 50 - $OKPercent) + #end + #set ($OKPercentToolTip = $OKPercent * 2) -#if ($projectGrid.Length > 0) - - - #if ($barAtTop) - - - - #end - - #if ($wholeFarm) - - #end - - - - - - - - - - - - + #if ($projectGrid.Length > 0) +
- - - #if ($OKPercent == 50) - - #else - - - - - #end - -
-
$translations.Translate("Server")$translations.Translate("Admin")$translations.Translate("Project Name")$translations.Translate("Last Build Status")$translations.Translate("Last Build Time")$translations.Translate("Next Build Time")$translations.Translate("Last Build Label")$translations.Translate("CCNet Status")$translations.Translate("Activity")$translations.Translate("Messages")
+ + #if ($barAtTop) + + + + #end + + + + + + + + + + + + + + + + - #set ($RowId = 0) - #foreach ($projectGridRow in $projectGrid) - #set ($RowId = $RowId + 1) + #set ($RowId = 0) + #foreach ($projectGridRow in $projectGrid) + #set ($RowId = $RowId + 1) + #set($cont=0) + + + #set($add=$lastsFive.add("red")) + #set($add=$lastsFive.add("blue")) - - #if ($wholeFarm) - - #end - - - - - - - - - + + + + + #if ($projectGridRow.Breakers.Length == 0) + + - - #if ($projectGridRow.BuildStage.Length > 0) - - #if ($wholeFarm) - - #else - - #end - - #end - #end - - #if ($barAtBottom) - - - - - - #end -
+ + + #if ($OKPercent == 50) + + #else + + + + + #end + +
+
$translations.Translate("Project Name")$translations.Translate("Last 5 Builds")$translations.Translate("Statistics")$translations.Translate("Messages")$translations.Translate("Last Build Time")$translations.Translate("Running Time")$translations.Translate("Status")$translations.Translate("Queue Position(Priority)")$translations.Translate("Activity")$translations.Translate("Admin")
$projectGridRow.ServerName -
- - - - #if ($projectGridRow.allowForceBuild) - #if($projectGridRow.ForceAbortBuildButtonValue == "Force") - - #else - - #end - #end - #if ($projectGridRow.AllowStartStopBuild) - - #end - -
- 		- $projectGridRow.Name - $translations.Translate($projectGridRow.BuildStatus)$projectGridRow.LastBuildDate$translations.Translate($projectGridRow.NextBuildTime)$translations.Translate($projectGridRow.LastBuildLabel)$translations.Translate($projectGridRow.Status)$translations.Translate($projectGridRow.Activity.ToString()) -
    - #if ($projectGridRow.Breakers.Length > 0) -
  • $translations.Translate("Breakers : {0}", $projectGridRow.Breakers)
    • - #end - #if ($projectGridRow.Fixer.Length > 0) -
  • $projectGridRow.Fixer
    • - #end - #if ($projectGridRow.FailingTasks.Length > 0) -
  • $translations.Translate("Failing Tasks : {0}", $projectGridRow.FailingTasks)
    • - #end -
- 		+ $projectGridRow.Name + + #set($cont = 0) + #foreach($dataGridRow in $projectGridRow.LastFiveData) + #if ($dataGridRow.BuildStatus == "Failure" ) + #set($color = "red") + #set($span = "Failure: ") + #elseif ($dataGridRow.BuildStatus == "Exception" ) + #set($color = "orange") + #set($span = "Exception: ") + #elseif ($dataGridRow.BuildStatus == "Unknown" ) + #set($color = "blue") + #set($span = "Unknown: ") + #else + #set($color = "green") + #set($span = "Success: ") + #end + #set($date = $dataGridRow.Date) + #set($link = $dataGridRow.Link) + #set($runningTime = $dataGridRow.RunningTime) + + + + + + #set($cont = $cont + 1) + #end + $projectGridRow.Statistics + #else + + #end +
    + #if ($projectGridRow.Fixer.Length > 0) +
  • $projectGridRow.Fixer
    • + #end + #if (($projectGridRow.Breakers.Length > 0) && ($translations.Translate($projectGridRow.BuildStatus) == "Failure")) +
  • + $translations.Translate("Breakers :
    {0}",$projectGridRow.Breakers) +
    • + #end +
+ 		+ $projectGridRow.LastBuildDate +
$translations.FormatBuildStage($projectGridRow.BuildStage)$translations.FormatBuildStage($projectGridRow.BuildStage)
- - - #if ($OKPercent == 50) - - #else - - - - - #end - -
-
-#end + + $runningTime + + + $translations.Translate($projectGridRow.Status) + $projectGridRow.QueuePriority + + $translations.Translate($projectGridRow.Activity.ToString())($projectGridRow.QueuePriority) + #if($projectGridRow.Activity.ToString() == "Pending") + ($projectGridRow.QueuePosition) + #end + + +
+ + + + + #if ($projectGridRow.allowForceBuild) + #if($projectGridRow.ForceAbortBuildButtonValue == "Force") + + + + #else + + + + #end + #end + #if ($projectGridRow.AllowStartStopBuild) + #if ($projectGridRow.Status == "Running") + + + + #else + + + + #end + #if ($projectGridRow.Activity.ToString() == "Pending") + + + + + #end + #end + #if ($projectGridRow.BuildStatus != "Success") + + #end + +
+ + + #if ($projectGridRow.BuildStage.Length > 0) + + #if ($wholeFarm) + $translations.FormatBuildStage($projectGridRow.BuildStage) + #else + $translations.FormatBuildStage($projectGridRow.BuildStage) + #end + + #end + #end + + #if ($barAtBottom) + + + + + + #if ($OKPercent == 50) + + #else + + + + + #end + +
+ + + + #end + + #end -#if ($exceptions.Length > 0) -

- - $translations.Translate("There were exceptions connecting to the following servers"): - -

- - - - - - - #foreach ($exception in $exceptions) - - - - - - #end -
- - $translations.Translate("Server") - - - - $translations.Translate("Url") - - - - $translations.Translate("Message") - -
- $exception.ServerName - - $exception.Url - - $exception.Message -
-#end - + #if ($exceptions.Length > 0) +

+ + $translations.Translate("There were exceptions connecting to the following servers"): + +

+ + + + + + + #foreach ($exception in $exceptions) + + + + + + #end +
+ + $translations.Translate("Server") + + + + $translations.Translate("Url") + + + + $translations.Translate("Message") + +
+ $exception.ServerName + + $exception.Url + + $exception.Message +
+ #end +