OLD | NEW |
1 {% extends "swarming/base.html" %} | 1 {% extends "swarming/base.html" %} |
2 | 2 |
3 | 3 |
4 {% block headers %} | 4 {% block headers %} |
5 <style> | 5 <style> |
6 h1 { | 6 h1 { |
7 margin-top: 10px; | 7 margin-top: 10px; |
8 margin-bottom: 10px; | 8 margin-bottom: 10px; |
9 } | 9 } |
10 | 10 |
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
66 } | 66 } |
67 | 67 |
68 .spaced { | 68 .spaced { |
69 margin-top: 10px; | 69 margin-top: 10px; |
70 margin-bottom: 5px; | 70 margin-bottom: 5px; |
71 } | 71 } |
72 | 72 |
73 .package-list { | 73 .package-list { |
74 margin-left: 1em; | 74 margin-left: 1em; |
75 } | 75 } |
| 76 |
| 77 .package-pin-name { |
| 78 font-weight: bold; |
| 79 } |
| 80 |
| 81 .package-pin-version { |
| 82 color: blue; |
| 83 } |
76 </style> | 84 </style> |
77 {% endblock %} | 85 {% endblock %} |
78 | 86 |
79 | 87 |
80 {% block body %} | 88 {% block body %} |
81 {% import 'swarming/bot_view.html' as bot_view %} | 89 {% import 'swarming/bot_view.html' as bot_view %} |
82 | 90 |
83 | 91 |
84 {% macro summarize_array(values) %} | 92 {% macro summarize_array(values) %} |
85 {% if not values %} | 93 {% if not values %} |
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
228 <td>CIPD server</td> | 236 <td>CIPD server</td> |
229 <td>{{request.properties.cipd_input.server}}</td> | 237 <td>{{request.properties.cipd_input.server}}</td> |
230 </tr> | 238 </tr> |
231 <tr title="CIPD client"> | 239 <tr title="CIPD client"> |
232 <td>CIPD client</td> | 240 <td>CIPD client</td> |
233 <td>{{request.properties.cipd_input.client_package}}</td> | 241 <td>{{request.properties.cipd_input.client_package}}</td> |
234 </tr> | 242 </tr> |
235 <tr title="CIPD pacakges"> | 243 <tr title="CIPD pacakges"> |
236 <td>CIPD packages</td> | 244 <td>CIPD packages</td> |
237 <td> | 245 <td> |
238 {% for path, packages in request.properties.cipd_input.packages_gr
ouped_by_path() %} | 246 {% for path, pininfos in request.properties.cipd_input.packages_gr
ouped_by_path(result.cipd_pins) %} |
239 <div>{{ path or '.'}}/</div> | 247 <div>{{ path or '.'}}/</div> |
240 <div class="package-list"> | 248 <div class="package-list"> |
241 {{packages|join('<br>'|safe)}} | 249 {% for pi in pininfos %} |
| 250 {% if pi.pin %} |
| 251 {{pi.pkg}} |
| 252 (pinned |
| 253 {% if pi.pin.package_name %} |
| 254 <span class="package-pin-name">{{pi.pin.package_name}}
</span> |
| 255 {% endif %} |
| 256 {% if pi.pin.version %} |
| 257 @<span class="package-pin-version">{{pi.pin.version}}<
/span> |
| 258 {% endif%} |
| 259 ) |
| 260 {% else %} |
| 261 {{pi.pkg}} |
| 262 {% endif %} |
| 263 {% if not loop.last %}<br>{% endif %} |
| 264 {% endfor %} |
242 </div> | 265 </div> |
243 {% endfor %} | 266 {% endfor %} |
244 </td> | 267 </td> |
245 </tr> | 268 </tr> |
246 {% endif %} | 269 {% endif %} |
247 {% if request.properties.inputs_ref and request.properties.inputs_ref.is
olated %} | 270 {% if request.properties.inputs_ref and request.properties.inputs_ref.is
olated %} |
248 <tr title="Inputs files"> | 271 <tr title="Inputs files"> |
249 <td>Isolated inputs</td> | 272 <td>Isolated inputs</td> |
250 <td> | 273 <td> |
251 <a | 274 <a |
(...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
539 | 562 |
540 {% set output = task.get_output() %} | 563 {% set output = task.get_output() %} |
541 {% if output is not none %} | 564 {% if output is not none %} |
542 <h3>Output:</h3> | 565 <h3>Output:</h3> |
543 <pre> | 566 <pre> |
544 {{task.get_output().decode('utf-8', 'replace')}}{% if is_running %}<p class="con
sole"><span class="blink">|</span>{% endif %} | 567 {{task.get_output().decode('utf-8', 'replace')}}{% if is_running %}<p class="con
sole"><span class="blink">|</span>{% endif %} |
545 </pre> | 568 </pre> |
546 {% endif %} | 569 {% endif %} |
547 | 570 |
548 {% endblock %} | 571 {% endblock %} |
OLD | NEW |