diff options
3 files changed, 17 insertions, 16 deletions
diff --git a/bitbake/lib/toaster/toastergui/static/css/default.css b/bitbake/lib/toaster/toastergui/static/css/default.css index baf70fb234..e33f177e95 100644 --- a/bitbake/lib/toaster/toastergui/static/css/default.css +++ b/bitbake/lib/toaster/toastergui/static/css/default.css | |||
@@ -108,6 +108,7 @@ select { width: auto; } | |||
108 | .hero-unit { margin: 20px 0 30px; } | 108 | .hero-unit { margin: 20px 0 30px; } |
109 | .hero-unit > .close { font-size:40px; } | 109 | .hero-unit > .close { font-size:40px; } |
110 | .hero-actions { margin-top: 30px; } | 110 | .hero-actions { margin-top: 30px; } |
111 | .dashboard-section { background-color: transparent; } | ||
111 | 112 | ||
112 | /* make tables Chrome-happy (me, not so much) */ | 113 | /* make tables Chrome-happy (me, not so much) */ |
113 | #otable { table-layout: fixed; word-wrap: break-word; } | 114 | #otable { table-layout: fixed; word-wrap: break-word; } |
diff --git a/bitbake/lib/toaster/toastergui/templates/basebuildpage.html b/bitbake/lib/toaster/toastergui/templates/basebuildpage.html index 778c4d4af1..46110519e9 100644 --- a/bitbake/lib/toaster/toastergui/templates/basebuildpage.html +++ b/bitbake/lib/toaster/toastergui/templates/basebuildpage.html | |||
@@ -32,7 +32,7 @@ | |||
32 | <!-- begin left sidebar container --> | 32 | <!-- begin left sidebar container --> |
33 | <div id="nav" class="span2"> | 33 | <div id="nav" class="span2"> |
34 | <ul class="nav nav-list well"> | 34 | <ul class="nav nav-list well"> |
35 | {% if build.target_set.all.0.is_image %} | 35 | {% if build.target_set.all.0.is_image and build.outcome == 0 %} |
36 | <li class="nav-header">Images</li> | 36 | <li class="nav-header">Images</li> |
37 | {% block nav-target %} | 37 | {% block nav-target %} |
38 | {% for t in build.get_sorted_target_list %} | 38 | {% for t in build.get_sorted_target_list %} |
diff --git a/bitbake/lib/toaster/toastergui/templates/builddashboard.html b/bitbake/lib/toaster/toastergui/templates/builddashboard.html index cc92af5c5a..891d86078b 100644 --- a/bitbake/lib/toaster/toastergui/templates/builddashboard.html +++ b/bitbake/lib/toaster/toastergui/templates/builddashboard.html | |||
@@ -10,7 +10,7 @@ | |||
10 | <!-- page title --> | 10 | <!-- page title --> |
11 | <div class="row-fluid span10"> | 11 | <div class="row-fluid span10"> |
12 | <div class="page-header"> | 12 | <div class="page-header"> |
13 | <h1>{{build.target_set.all|join:", "}} {{build.machine}}</h1> | 13 | <h1>{{build.target_set.all|dictsort:"target"|join:", "}} {{build.machine}}</h1> |
14 | </div> | 14 | </div> |
15 | </div> | 15 | </div> |
16 | 16 | ||
@@ -20,7 +20,7 @@ | |||
20 | <div class="row-fluid lead"> | 20 | <div class="row-fluid lead"> |
21 | <span class="pull-left"><strong> | 21 | <span class="pull-left"><strong> |
22 | {%if build.outcome == build.SUCCEEDED%}Completed{%elif build.outcome == build.FAILED%}Failed{%else%}{%endif%} | 22 | {%if build.outcome == build.SUCCEEDED%}Completed{%elif build.outcome == build.FAILED%}Failed{%else%}{%endif%} |
23 | </strong> | 23 | </strong> on |
24 | {{build.completed_on|date:"d/m/y H:i"}} | 24 | {{build.completed_on|date:"d/m/y H:i"}} |
25 | </span> | 25 | </span> |
26 | {% if build.warnings_no or build.errors_no %} | 26 | {% if build.warnings_no or build.errors_no %} |
@@ -28,13 +28,13 @@ | |||
28 | {% endif %} | 28 | {% endif %} |
29 | {%if build.outcome == build.SUCCEEDED or build.outcome == build.FAILED %} | 29 | {%if build.outcome == build.SUCCEEDED or build.outcome == build.FAILED %} |
30 | {% if build.errors_no %} | 30 | {% if build.errors_no %} |
31 | <span > <i class="icon-minus-sign red"></i><strong><a href="#errors" class="error"> {{build.errors_no}} error{{build.errors_no|pluralize}}</a></strong></span> | 31 | <span > <i class="icon-minus-sign red"></i><strong><a href="#errors" class="error show-errors"> {{build.errors_no}} error{{build.errors_no|pluralize}}</a></strong></span> |
32 | {% endif %} | 32 | {% endif %} |
33 | {% if build.warnings_no %} | 33 | {% if build.warnings_no %} |
34 | {% if build.errors_no %} | 34 | {% if build.errors_no %} |
35 | and | 35 | and |
36 | {% endif %} | 36 | {% endif %} |
37 | <span > <i class="icon-warning-sign yellow"></i><strong><a href="#warnings" class="warning"> {{build.warnings_no}} warning{{build.warnings_no|pluralize}}</a></strong></span> | 37 | <span > <i class="icon-warning-sign yellow"></i><strong><a href="#warnings" class="warning show-warnings"> {{build.warnings_no}} warning{{build.warnings_no|pluralize}}</a></strong></span> |
38 | {% endif %} | 38 | {% endif %} |
39 | <span class="pull-right">Build time: <a href="{% url 'buildtime' build.pk %}">{{ build.timespent|sectohms }}</a></span> | 39 | <span class="pull-right">Build time: <a href="{% url 'buildtime' build.pk %}">{{ build.timespent|sectohms }}</a></span> |
40 | {%endif%} | 40 | {%endif%} |
@@ -75,27 +75,27 @@ | |||
75 | <h2>Images</h2> | 75 | <h2>Images</h2> |
76 | {% for target in targets %} | 76 | {% for target in targets %} |
77 | {% if target.target.is_image %} | 77 | {% if target.target.is_image %} |
78 | <div class="well" style="background-color:transparent;"> | 78 | <div class="well dashboard-section"> |
79 | <h3><a href="{% url 'target' build.pk target.target.pk %}">{{target.target}}</a> | 79 | <h3><a href="{% url 'target' build.pk target.target.pk %}">{{target.target}}</a> |
80 | </h3> | 80 | </h3> |
81 | <dl class="dl-horizontal"> | 81 | <dl class="dl-horizontal"> |
82 | <dt>Packages included</dt> | 82 | <dt>Packages included</dt> |
83 | <dd><a href="{% url 'packages' build.pk %}">{{target.npkg}}</a></dd> | 83 | <dd><a href="{% url 'target' build.pk target.target.pk %}">{{target.npkg}}</a></dd> |
84 | <dt>Total package size</dt> | 84 | <dt>Total package size</dt> |
85 | <dd>{{target.pkgsz|filtered_filesizeformat}}</dd> | 85 | <dd>{{target.pkgsz|filtered_filesizeformat}}</dd> |
86 | <dt> | 86 | <dt> |
87 | <i class="icon-question-sign get-help" title="Path to the license manifest, which is a document listing all packages installed in your image and their licenses"></i> | 87 | <i class="icon-question-sign get-help" title="The location in disk of the license manifest, a document listing all packages installed in your image and their licenses"></i> |
88 | License manifest | 88 | <a href="{% url 'target' build.pk target.target.pk %}">License manifest</a> |
89 | </dt> | 89 | </dt> |
90 | <dd><a href="{% url 'targetpackages' build.pk target.target.pk %}"><code>{{target.target.license_manifest_path}}</code></a></dd> | 90 | <dd><code>{{target.target.license_manifest_path}}</code></dd> |
91 | <dt> | 91 | <dt> |
92 | <i class="icon-question-sign get-help" title="Image files are stored in <code style='background-color:transparent;color:#FFFFFF;font-weight:normal;border:none;'>/build/tmp/deploy/images/</code>"></i> | 92 | <i class="icon-question-sign get-help" title="Image files are stored in <code>/build/tmp/deploy/images/</code>"></i> |
93 | Image files | 93 | Image files |
94 | </dt> | 94 | </dt> |
95 | <dd> | 95 | <dd> |
96 | <ul> | 96 | <ul> |
97 | {% for i in target.imageFiles %} | 97 | {% for i in target.imageFiles %} |
98 | <li><strong>{{i.path}}</strong> | 98 | <li>{{i.path}} |
99 | ({{i.size|filtered_filesizeformat}})</li> | 99 | ({{i.size|filtered_filesizeformat}})</li> |
100 | {% endfor %} | 100 | {% endfor %} |
101 | </ul> | 101 | </ul> |
@@ -114,7 +114,7 @@ | |||
114 | <!-- build summary --> | 114 | <!-- build summary --> |
115 | <div class="row-fluid span10 pull-right"> | 115 | <div class="row-fluid span10 pull-right"> |
116 | <h2>Build summary</h2> | 116 | <h2>Build summary</h2> |
117 | <div class="well span4" style="margin-left:0px; background-color:transparent;"> | 117 | <div class="well span4 dashboard-section" style="margin-left:0px;"> |
118 | <h4><a href="{%url 'configuration' build.pk%}">Configuration</a></h4> | 118 | <h4><a href="{%url 'configuration' build.pk%}">Configuration</a></h4> |
119 | <dl> | 119 | <dl> |
120 | <dt>Machine</dt><dd>{{build.machine}}</dd> | 120 | <dt>Machine</dt><dd>{{build.machine}}</dd> |
@@ -122,7 +122,7 @@ | |||
122 | <dt>Layers</dt>{% for i in build.layer_version_build.all|dictsort:"layer.name" %}<dd>{{i.layer.name}}</dd>{%endfor%} | 122 | <dt>Layers</dt>{% for i in build.layer_version_build.all|dictsort:"layer.name" %}<dd>{{i.layer.name}}</dd>{%endfor%} |
123 | </dl> | 123 | </dl> |
124 | </div> | 124 | </div> |
125 | <div class="well span4" style="background-color:transparent;"> | 125 | <div class="well span4 dashboard-section"> |
126 | <h4><a href="{%url 'tasks' build.pk%}">Tasks</a></h4> | 126 | <h4><a href="{%url 'tasks' build.pk%}">Tasks</a></h4> |
127 | <dl> | 127 | <dl> |
128 | <dt>Total number of tasks</dt><dd><a href="{% url 'tasks' build.pk %}">{{build.task_build.all.count}}</a></dd> | 128 | <dt>Total number of tasks</dt><dd><a href="{% url 'tasks' build.pk %}">{{build.task_build.all.count}}</a></dd> |
@@ -151,7 +151,7 @@ | |||
151 | </dd> | 151 | </dd> |
152 | </dl> | 152 | </dl> |
153 | </div> | 153 | </div> |
154 | <div class="well span4" style="background-color:transparent;"> | 154 | <div class="well span4 dashboard-section"> |
155 | <h4><a href="{% url 'recipes' build.pk %}">Recipes</a> & <a href="{% url 'packages' build.pk %}">Packages</a></h4> | 155 | <h4><a href="{% url 'recipes' build.pk %}">Recipes</a> & <a href="{% url 'packages' build.pk %}">Packages</a></h4> |
156 | <dl> | 156 | <dl> |
157 | <dt>Recipes built</dt><dd><a href="{% url 'recipes' build.pk %}">{{recipecount}}</a></dd> | 157 | <dt>Recipes built</dt><dd><a href="{% url 'recipes' build.pk %}">{{recipecount}}</a></dd> |