Skip to content
This repository was archived by the owner on Feb 12, 2025. It is now read-only.

Commit 7e7511d

Browse files
RubenWillemsRubenWillems
committed
place admin buttons first in the dashboard
1 parent 6e1d019 commit 7e7511d

File tree

2 files changed

+48
-45
lines changed

2 files changed

+48
-45
lines changed

‎project/WebDashboard/templates/CategorizedFarmReport.vm‎

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@
7575
<thead>
7676
<tr class="ProjectGridHeader">
7777
<th class="left">$translations.Translate("Server")</th>
78+
<th class="{sorter:false}">$translations.Translate("Admin")</th>
7879
<th class="left">$translations.Translate("Project Name")</th>
7980
<th>$translations.Translate("Last Build Status")</th>
8081
<th>$translations.Translate("Last Build Time")</th>
@@ -83,32 +84,12 @@
8384
<th>$translations.Translate("CCNet Status")</th>
8485
<th>$translations.Translate("Activity")</th>
8586
<th class="{sorter:false}">$translations.Translate("Messages")</th>
86-
<th class="{sorter:false}">$translations.Translate("Admin")</th>
87+
8788
</tr>
8889
</thead>
8990
#foreach ($row in $category.Rows)
9091
<tr>
9192
<td>$row.ServerName</td>
92-
<td><a href="$row.Url" title="$row.Description">$row.Name</a></td>
93-
<td class="$row.BuildStatusHtmlColor">$translations.Translate($row.BuildStatus)</td>
94-
<td>$translations.Translate($row.LastBuildDate)</td>
95-
<td>$translations.Translate($row.NextBuildTime)</td>
96-
<td>$row.LastBuildLabel</td>
97-
<td class="status$row.Status">$translations.Translate($row.Status)</td>
98-
<td class="activity$row.Activity">$translations.Translate($row.Activity.ToString())</td>
99-
<td>
100-
<ul>
101-
#if ($row.Breakers.Length > 0)
102-
<li>$translations.Translate("Breakers : {0}", $row.Breakers)</li>
103-
#end
104-
#if ($row.Fixer.Length > 0)
105-
<li>$row.Fixer</li>
106-
#end
107-
#if ($row.FailingTasks.Length > 0)
108-
<li>$translations.Translate("Failing Tasks : {0}", $row.FailingTasks)</li>
109-
#end
110-
</ul>
111-
</td>
11293
<td>
11394
<form method="post" style="margin-bottom:0px;">
11495
<input type="hidden" name="projectName" value="$row.Name" />
@@ -133,7 +114,28 @@
133114
#end
134115
</font>
135116
</form>
117+
</td>
118+
<td><a href="$row.Url" title="$row.Description">$row.Name</a></td>
119+
<td class="$row.BuildStatusHtmlColor">$translations.Translate($row.BuildStatus)</td>
120+
<td>$translations.Translate($row.LastBuildDate)</td>
121+
<td>$translations.Translate($row.NextBuildTime)</td>
122+
<td>$row.LastBuildLabel</td>
123+
<td class="status$row.Status">$translations.Translate($row.Status)</td>
124+
<td class="activity$row.Activity">$translations.Translate($row.Activity.ToString())</td>
125+
<td>
126+
<ul>
127+
#if ($row.Breakers.Length > 0)
128+
<li>$translations.Translate("Breakers : {0}", $row.Breakers)</li>
129+
#end
130+
#if ($row.Fixer.Length > 0)
131+
<li>$row.Fixer</li>
132+
#end
133+
#if ($row.FailingTasks.Length > 0)
134+
<li>$translations.Translate("Failing Tasks : {0}", $row.FailingTasks)</li>
135+
#end
136+
</ul>
136137
</td>
138+
137139
</tr>
138140
#end
139141
</table>

‎project/WebDashboard/templates/ProjectGrid.vm‎

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -99,15 +99,15 @@
9999
#if ($wholeFarm)
100100
<th class="left">$translations.Translate("Server")</th>
101101
#end
102+
<th class="{sorter:false}">$translations.Translate("Admin")</th>
102103
<th class="left">$translations.Translate("Project Name")</th>
103104
<th>$translations.Translate("Last Build Status")</th>
104105
<th>$translations.Translate("Last Build Time")</th>
105106
<th>$translations.Translate("Next Build Time")</th>
106107
<th>$translations.Translate("Last Build Label")</th>
107108
<th>$translations.Translate("CCNet Status")</th>
108109
<th>$translations.Translate("Activity")</th>
109-
<th class="{sorter:false}">$translations.Translate("Messages")</th>
110-
<th class="{sorter:false}">$translations.Translate("Admin")</th>
110+
<th class="{sorter:false}">$translations.Translate("Messages")</th>
111111
</tr>
112112
</thead>
113113
<tbody>
@@ -120,28 +120,6 @@
120120
#if ($wholeFarm)
121121
<td class="Black left">$projectGridRow.ServerName</td>
122122
#end
123-
<td class="left">
124-
<a href="$projectGridRow.Url" title="$projectGridRow.Description">$projectGridRow.Name</a>
125-
</td>
126-
<td class="$projectGridRow.BuildStatusHtmlColor">$translations.Translate($projectGridRow.BuildStatus)</td>
127-
<td><a href="server/$projectGridRow.ServerName/project/$projectGridRow.Name/ViewLatestBuildReport.aspx">$projectGridRow.LastBuildDate</a></td>
128-
<td>$translations.Translate($projectGridRow.NextBuildTime)</td>
129-
<td>$translations.Translate($projectGridRow.LastBuildLabel)</td>
130-
<td class="status$projectGridRow.Status">$translations.Translate($projectGridRow.Status)</td>
131-
<td class="activity$projectGridRow.Activity">$translations.Translate($projectGridRow.Activity.ToString())</td>
132-
<td class="left">
133-
<ul>
134-
#if ($projectGridRow.Breakers.Length > 0)
135-
<li>$translations.Translate("Breakers : {0}", $projectGridRow.Breakers)</li>
136-
#end
137-
#if ($projectGridRow.Fixer.Length > 0)
138-
<li>$projectGridRow.Fixer</li>
139-
#end
140-
#if ($projectGridRow.FailingTasks.Length > 0)
141-
<li>$translations.Translate("Failing Tasks : {0}", $projectGridRow.FailingTasks)</li>
142-
#end
143-
</ul>
144-
</td>
145123
<td>
146124
<form method="post"
147125
style="margin-bottom:0px;">
@@ -171,7 +149,30 @@
171149
#end
172150
</font>
173151
</form>
152+
</td>
153+
<td class="left">
154+
<a href="$projectGridRow.Url" title="$projectGridRow.Description">$projectGridRow.Name</a>
155+
</td>
156+
<td class="$projectGridRow.BuildStatusHtmlColor">$translations.Translate($projectGridRow.BuildStatus)</td>
157+
<td><a href="server/$projectGridRow.ServerName/project/$projectGridRow.Name/ViewLatestBuildReport.aspx">$projectGridRow.LastBuildDate</a></td>
158+
<td>$translations.Translate($projectGridRow.NextBuildTime)</td>
159+
<td>$translations.Translate($projectGridRow.LastBuildLabel)</td>
160+
<td class="status$projectGridRow.Status">$translations.Translate($projectGridRow.Status)</td>
161+
<td class="activity$projectGridRow.Activity">$translations.Translate($projectGridRow.Activity.ToString())</td>
162+
<td class="left">
163+
<ul>
164+
#if ($projectGridRow.Breakers.Length > 0)
165+
<li>$translations.Translate("Breakers : {0}", $projectGridRow.Breakers)</li>
166+
#end
167+
#if ($projectGridRow.Fixer.Length > 0)
168+
<li>$projectGridRow.Fixer</li>
169+
#end
170+
#if ($projectGridRow.FailingTasks.Length > 0)
171+
<li>$translations.Translate("Failing Tasks : {0}", $projectGridRow.FailingTasks)</li>
172+
#end
173+
</ul>
174174
</td>
175+
175176
</tr>
176177
#if ($projectGridRow.BuildStage.Length > 0)
177178
<tr id="link$RowId" class="buildStatus">

0 commit comments

Comments
 (0)