diff --git a/bitbake/lib/toaster/toastergui/static/css/default.css b/bitbake/lib/toaster/toastergui/static/css/default.css index 277888bc0c..0cf0f1991c 100644 --- a/bitbake/lib/toaster/toastergui/static/css/default.css +++ b/bitbake/lib/toaster/toastergui/static/css/default.css @@ -145,6 +145,7 @@ select { width: auto; } /* styles for showing the project name in build mode */ .project-name { padding-top: 0; } .project-name .label { font-weight: normal; margin-bottom: 5px; margin-left: -15px; padding: 5px; } +.project-name .label > a { color: #fff; font-weight: normal; } /* Remove bottom margin for forms inside modal dialogs */ #dependencies_modal_form { margin-bottom: 0px; } diff --git a/bitbake/lib/toaster/toastergui/templates/managed_mrb_section.html b/bitbake/lib/toaster/toastergui/templates/managed_mrb_section.html index b8d087ab6c..08bb05d97b 100644 --- a/bitbake/lib/toaster/toastergui/templates/managed_mrb_section.html +++ b/bitbake/lib/toaster/toastergui/templates/managed_mrb_section.html @@ -15,7 +15,9 @@
{% if MANAGED and build.project %} - {{build.project.name}} + + {{build.project.name}} + {% endif %}
@@ -29,6 +31,7 @@ {% endif %}
+ {%if build.outcome == build.SUCCEEDED or build.outcome == build.FAILED %}
{% if build.completed_on|format_build_date %} {{ build.completed_on|date:'d/m/y H:i' }} @@ -36,7 +39,6 @@ {{ build.completed_on|date:'H:i' }} {% endif %}
- {%if build.outcome == build.SUCCEEDED or build.outcome == build.FAILED %}
{% if build.errors_no %} {{build.errors_no}} error{{build.errors_no|pluralize}} @@ -52,12 +54,13 @@ Build time: {{ build.timespent|sectohms }} {% if build.project %} - + {% endif %}
{%endif%} {%if build.outcome == build.IN_PROGRESS %} -
+
@@ -73,7 +76,9 @@
- {{buildrequest.project.name}} + + {{buildrequest.project.name}} +
{% if buildrequest.state == buildrequest.REQ_FAILED %} @@ -100,7 +105,7 @@ Build time: {{ buildrequest.get_duration|sectohms }} - +
@@ -111,7 +116,7 @@ 1%}title="Targets: {%for target in buildrequest.brtarget_set.all%}{{target.target}} {%endfor%}"{%endif%}>{{buildrequest.brtarget_set.all.0.target}} {%if buildrequest.brtarget_set.all.count > 1%}(+ {{buildrequest.brtarget_set.all.count|add:"-1"}}){%endif%}
-
Build queued +
Build queued
@@ -172,13 +177,13 @@ function _makeXHRBuildCall(url, data, onsuccess, onfail) { } -function scheduleBuild(url, projectName, buildlist) { +function scheduleBuild(url, projectName, projectUrl, buildlist) { console.log("scheduleBuild"); _makeXHRBuildCall(url, {targets: buildlist.join(" ")}, function (_data) { - $('#latest-builds').prepend('
' + ''+projectName+'
' + - '
' + buildlist.join(" ") + - '
Build queued. Your build will start shortly.
'); + $('#latest-builds').prepend("
"+projectName+"
" + + "
" + buildlist.join(" ") + + "
Build queued
"); }); } diff --git a/bitbake/lib/toaster/toastergui/templates/project.html b/bitbake/lib/toaster/toastergui/templates/project.html index a1cce33222..a8cb917c6d 100644 --- a/bitbake/lib/toaster/toastergui/templates/project.html +++ b/bitbake/lib/toaster/toastergui/templates/project.html @@ -165,17 +165,17 @@ vim: expandtab tabstop=2 -
-
+
+
Creating build
-
-
- Build deleted +
+
+ Build cancelled