diff options
Diffstat (limited to 'lib/toaster/toastergui/templates/mrb_section.html')
| -rw-r--r-- | lib/toaster/toastergui/templates/mrb_section.html | 121 |
1 files changed, 61 insertions, 60 deletions
diff --git a/lib/toaster/toastergui/templates/mrb_section.html b/lib/toaster/toastergui/templates/mrb_section.html index 2780ac59..4b4e3e69 100644 --- a/lib/toaster/toastergui/templates/mrb_section.html +++ b/lib/toaster/toastergui/templates/mrb_section.html @@ -21,15 +21,15 @@ {%if mru %} {%if mrb_type == 'project' %} - <h2 class="page-header"> - Latest project builds + <h2> + Latest project builds - {% if project.is_default %} - <i class="icon-question-sign get-help heading-help" title="" data-original-title="Builds in this project cannot be started from Toaster: they are started from the command line"></i> - {% endif %} - </h2> + {% if project.is_default %} + <span class="glyphicon glyphicon-question-sign get-help heading-help" title="" data-original-title="Builds in this project cannot be started from Toaster: they are started from the command line"></span> + {% endif %} + </h2> {% else %} - <div class="page-header top-air"> + <div class="page-header"> <h1> Latest builds </h1> @@ -37,18 +37,20 @@ {% endif %} <div id="latest-builds"> {% for build in mru %} - <div data-latest-build-result="{{ build.id }}" class="alert build-result {%if build.outcome == build.SUCCEEDED%}alert-success{%elif build.outcome == build.FAILED%}alert-error{%else%}alert-info{%endif%}{% if mrb_type != 'project' %} project-name{% endif %}"> - {% if mrb_type != 'project' %} - <span class="label {%if build.outcome == build.SUCCEEDED%}label-success{%elif build.outcome == build.FAILED%}label-important{%else%}label-info{%endif%}"> - <a href={% project_url build.project %}> - {{build.project.name}} - </a> - </span> - {% endif %} - <div class="row-fluid"> - <div class="span3 lead"> + <div data-latest-build-result="{{ build.id }}" class="alert build-result {%if build.outcome == build.SUCCEEDED%}alert-success{%elif build.outcome == build.FAILED%}alert-danger{%else%}alert-info{%endif%}"> + {% if mrb_type != 'project' %} + <div class="row project-name"> + <div class="col-md-12"> + <small> + <a class="alert-link text-uppercase" href={% project_url build.project %}>{{build.project.name}}</a> + </small> + </div> + </div> + {% endif %} + <div class="row"> + <div class="col-md-3"> {%if build.outcome == build.SUCCEEDED or build.outcome == build.FAILED %} - <a href="{%url 'builddashboard' build.pk%}" class="{%if build.outcome == build.SUCCEEDED %}success{%else%}error{%endif%}"> + <a href="{%url 'builddashboard' build.pk%}" class="alert-link"> {% endif %} {% if build.target_set.all.count > 0 %} <span data-toggle="tooltip" @@ -79,7 +81,7 @@ {% endif %} </div> {% if build.outcome == build.SUCCEEDED or build.outcome == build.FAILED %} - <div class="span2 lead"> + <div class="col-md-2"> {% if build.completed_on|format_build_date %} {{ build.completed_on|date:'d/m/y H:i' }} {% else %} @@ -88,22 +90,23 @@ </div> {% endif %} {%if build.outcome == build.SUCCEEDED or build.outcome == build.FAILED %} - <div class="span2 lead"> + <div class="col-md-2"> {% if build.errors.count %} - <i class="icon-minus-sign red"></i> <a href="{%url 'builddashboard' build.pk%}#errors" class="error">{{build.errors.count}} error{{build.errors.count|pluralize}}</a> + <span class="glyphicon glyphicon-minus-sign"></span> + <a href="{%url 'builddashboard' build.pk%}#errors" class="alert-link">{{build.errors.count}} error{{build.errors.count|pluralize}}</a> {% endif %} </div> - <div class="span2 lead"> + <div class="col-md-2"> {% if build.warnings.count %} - <i class="icon-warning-sign yellow"></i> <a href="{%url 'builddashboard' build.pk%}#warnings" class="warning">{{build.warnings.count}} warning{{build.warnings.count|pluralize}}</a> + <span class="glyphicon glyphicon-warning-sign build-warnings"></span> + <a href="{%url 'builddashboard' build.pk%}#warnings" class="alert-link build-warnings">{{build.warnings.count}} warning{{build.warnings.count|pluralize}}</a> {% endif %} </div> - <div class="lead "> - <span class="lead"> - Build time: <a href="{% url 'buildtime' build.pk %}">{{ build.timespent_seconds|sectohms }}</a> - </span> + <div class="col-md-3"> + Build time: <a class="alert-link" href="{% url 'buildtime' build.pk %}">{{ build.timespent_seconds|sectohms }} + </a> {% if build.project.is_default %} - <i class="pull-right icon-question-sign get-help + <span class="pull-right glyphicon glyphicon-question-sign get-help {% if build.outcome == build.SUCCEEDED %} get-help-green {% elif build.outcome == build.FAILED %} @@ -112,68 +115,66 @@ get-help-blue {% endif %} " title="Builds in this project cannot be started from Toaster: they are started from the command line"> - </i> + </span> {% else %} - <button class="run-again-btn btn + <a href="#" class="run-again-btn alert-link {% if build.outcome == build.SUCCEEDED %} - btn-success + success {% elif build.outcome == build.FAILED %} - btn-danger + danger {% else %} - btn-info + info {%endif%} pull-right" data-request-url="{% url 'xhr_buildrequest' build.project.pk %}" data-target='{{build.target_set.all|get_tasks|json}}'> - Rebuild - </button> + <span class="glyphicon glyphicon-repeat"></span> + Rebuild + </a> {% endif %} </div> {%endif%} + {%if build.outcome == build.IN_PROGRESS %} - <div class="span4" style="display:none" id="cancelling-msg-{{build.buildrequest.pk}}"> - <p class="lead">Cancelling the build ...</p> + <div class="col-md-4" style="display:none" id="cancelling-msg-{{build.buildrequest.pk}}"> + Cancelling the build ... </div> - <div class="span4 offset1 progress-info"> - <div class="progress" id="build-pc-done-title-{{build.pk}}" style="margin-top:5px;" data-toggle="tooltip" title="{{build.completeper}}% of tasks complete"> - <div id="build-pc-done-bar-{{build.pk}}" style="width: {{build.completeper}}%;" class="bar"></div> + <div class="col-md-4 col-md-offset-1 progress-info"> + <div class="progress" id="build-pc-done-title-{{build.pk}}"> + <div id="build-pc-done-bar-{{build.pk}}" style="width: {{build.completeper}}%;" class="progress-bar"></div> </div> </div> - <div class="lead span3 progress-info"><span id="build-pc-done-{{build.pk}}">{{build.completeper}}</span>% of tasks complete</div> + <div class="col-md-4 progress-info"><span id="build-pc-done-{{build.pk}}">{{build.completeper}}</span>% of tasks complete {# No build cancel for command line builds project #} {% if build.project.is_default %} - <i class="icon-question-sign get-help get-help-blue pull-right" title="" data-original-title="Builds in this project cannot be cancelled from Toaster: they can only be cancelled from the command line"></i> + <span class="glyphicon glyphicon-question-sign get-help get-help-blue pull-right" title="Builds in this project cannot be cancelled from Toaster: they can only be cancelled from the command line"></span> {% else %} - <div class="lead pull-right progress-info"> - <button class="cancel-build-btn btn btn-info pull-right" + <a href="#" class="cancel-build-btn pull-right alert-link" data-buildrequest-id={{build.buildrequest.pk}} data-request-url="{% url 'xhr_buildrequest' build.project.pk %}" > + <span class="glyphicon glyphicon-remove-circle"></span> Cancel - </button> + </a> </div> {% endif %} {%endif%} {# end if in progress #} {% if build.outcome == build.CANCELLED %} - <div class="span4"> - <p class="lead">Build cancelled</p> - </div> - - {% if build.project.is_default %} - <i class="icon-question-sign get-help get-help-blue pull-right" title="" - data-original-title="Builds in this project cannot be rebuilt from Toaster: they can only be rebuilt from the command line"></i> - {% else %} - <button class="btn btn-info pull-right run-again-btn" - data-request-url="{% url 'xhr_buildrequest' build.project.pk %}" - data-target='{{build.target_set.all|get_tasks|json}}'> - Rebuild - </button> - {% endif %} + <div class="col-md-6"> + Build cancelled + </div> + <div class="col-md-3"> + <a href="#" class="info pull-right run-again-btn alert-link" + data-request-url="{% url 'xhr_buildrequest' build.project.pk %}" + data-target='{{build.target_set.all|get_tasks|json}}'> + <span class="glyphicon glyphicon-repeat"></span> + Rebuild + </a> + </div> {% endif %} </div> </div> - {% endfor %} </div> |