diff options
author | Elliot Smith <elliot.smith@intel.com> | 2016-07-12 16:38:06 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-08-11 00:09:26 +0100 |
commit | 9ed45f79745207f96dbd3cb6d9ef40ea8fcde42a (patch) | |
tree | 5c17cdc1dcf115fbd47a34d45bf5b28e7a046cb3 /bitbake/lib/toaster/toastergui/static/js | |
parent | 82d998d6c6378e4eb70b5712b339b6095ed7540a (diff) | |
download | poky-9ed45f79745207f96dbd3cb6d9ef40ea8fcde42a.tar.gz |
bitbake: toaster: tweak styling and typos in recent builds area
Help icons need to have the Bootstrap tooltip() method called on
them so that the popups are correctly styled.
Ensure that the colour of the help/error/warning icons is correct,
depending on the build state.
Fix pluralisation of errors and warnings shown.
Add a div around the build state area so it's easy to pick up
where the state is going to display (e.g. in tests).
[YOCTO #9631]
(Bitbake rev: 98a923ff14188832ac44e0dbafc73bcba10e25da)
Signed-off-by: Elliot Smith <elliot.smith@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/toaster/toastergui/static/js')
-rw-r--r-- | bitbake/lib/toaster/toastergui/static/js/mrbsection.js | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/bitbake/lib/toaster/toastergui/static/js/mrbsection.js b/bitbake/lib/toaster/toastergui/static/js/mrbsection.js index e7fbf01731..73d0935fa5 100644 --- a/bitbake/lib/toaster/toastergui/static/js/mrbsection.js +++ b/bitbake/lib/toaster/toastergui/static/js/mrbsection.js | |||
@@ -84,14 +84,20 @@ function mrbSectionInit(ctx){ | |||
84 | } | 84 | } |
85 | else if (stateChanged(build)) { | 85 | else if (stateChanged(build)) { |
86 | // update the whole template | 86 | // update the whole template |
87 | build.warnings_pluralise = (build.warnings !== 1 ? 's' : ''); | ||
88 | build.errors_pluralise = (build.errors !== 1 ? 's' : ''); | ||
89 | |||
87 | tmpl = $.templates("#build-template"); | 90 | tmpl = $.templates("#build-template"); |
88 | 91 | ||
89 | html = tmpl.render(build); | 92 | html = $(tmpl.render(build)); |
90 | 93 | ||
91 | selector = '[data-latest-build-result="' + build.id + '"] ' + | 94 | selector = '[data-latest-build-result="' + build.id + '"] ' + |
92 | '[data-role="build-status-container"]'; | 95 | '[data-role="build-status-container"]'; |
93 | container = $(selector); | 96 | container = $(selector); |
94 | 97 | ||
98 | // initialize bootstrap tooltips in the new HTML | ||
99 | html.find('span.glyphicon-question-sign').tooltip(); | ||
100 | |||
95 | container.html(html); | 101 | container.html(html); |
96 | } | 102 | } |
97 | else if (tasksProgressChanged(build)) { | 103 | else if (tasksProgressChanged(build)) { |