diff options
Diffstat (limited to 'bitbake/lib/toaster/toastergui/templates')
6 files changed, 49 insertions, 17 deletions
diff --git a/bitbake/lib/toaster/toastergui/templates/basebuildpage.html b/bitbake/lib/toaster/toastergui/templates/basebuildpage.html index 7d2a1f388e..c85faf9f6a 100644 --- a/bitbake/lib/toaster/toastergui/templates/basebuildpage.html +++ b/bitbake/lib/toaster/toastergui/templates/basebuildpage.html | |||
@@ -8,7 +8,7 @@ | |||
8 | <div class="section"> | 8 | <div class="section"> |
9 | <ul class="breadcrumb" id="breadcrumb"> | 9 | <ul class="breadcrumb" id="breadcrumb"> |
10 | <li><a href="{% url 'all-builds' %}">All builds</a></li> | 10 | <li><a href="{% url 'all-builds' %}">All builds</a></li> |
11 | <li><a href="{%url 'builddashboard' build.pk%}">{{build.target_set.all.0.target}} {%if build.target_set.all.count > 1%}(+ {{build.target_set.all.count|add:"-1"}}){%endif%} {{build.machine}} ({{build.completed_on|naturaltime}})</a></li> | 11 | <li><a href="{%url 'builddashboard' build.pk%}">{{build.target_set.all.0.target}} {%if build.target_set.all.count > 1%}(+ {{build.target_set.all.count|add:"-1"}}){%endif%} {{build.machine}} ({{build.completed_on|date:"d/m/y H:i"}})</a></li> |
12 | {% block localbreadcrumb %}{% endblock %} | 12 | {% block localbreadcrumb %}{% endblock %} |
13 | </ul> | 13 | </ul> |
14 | <script> | 14 | <script> |
diff --git a/bitbake/lib/toaster/toastergui/templates/basetable_bottom.html b/bitbake/lib/toaster/toastergui/templates/basetable_bottom.html index 3e4b0cc5a4..8f81472723 100644 --- a/bitbake/lib/toaster/toastergui/templates/basetable_bottom.html +++ b/bitbake/lib/toaster/toastergui/templates/basetable_bottom.html | |||
@@ -38,6 +38,21 @@ | |||
38 | <script> | 38 | <script> |
39 | $(document).ready(function() { | 39 | $(document).ready(function() { |
40 | 40 | ||
41 | // we load cookies for the column display | ||
42 | save = $.cookie('_displaycols_{{objectname}}'); | ||
43 | setting = save.split(';'); | ||
44 | for ( i = 0; i < setting.length; i++) { | ||
45 | if (setting[i].length > 0) { | ||
46 | [id, v] = setting[i].split(':'); | ||
47 | if (v == 'true') { | ||
48 | $('.chbxtoggle#'+id).prop('checked', true); | ||
49 | } | ||
50 | else { | ||
51 | $('.chbxtoggle#'+id).prop('checked', false); | ||
52 | } | ||
53 | } | ||
54 | } | ||
55 | |||
41 | $('.chbxtoggle').each(function () { | 56 | $('.chbxtoggle').each(function () { |
42 | showhideTableColumn($(this).attr('id'), $(this).is(':checked')) | 57 | showhideTableColumn($(this).attr('id'), $(this).is(':checked')) |
43 | }); | 58 | }); |
diff --git a/bitbake/lib/toaster/toastergui/templates/basetable_top.html b/bitbake/lib/toaster/toastergui/templates/basetable_top.html index 34e0cd7210..b8d5c382c7 100644 --- a/bitbake/lib/toaster/toastergui/templates/basetable_top.html +++ b/bitbake/lib/toaster/toastergui/templates/basetable_top.html | |||
@@ -1,8 +1,15 @@ | |||
1 | {% load projecttags %} | ||
1 | <!-- component to display a generic table --> | 2 | <!-- component to display a generic table --> |
2 | <script> | 3 | <script> |
3 | function showhideTableColumn(clname, sh) { | 4 | function showhideTableColumn(clname, sh) { |
4 | if (sh) $('.' + clname).show(); | 5 | if (sh) $('.' + clname).show(100); |
5 | else $('.' + clname).hide(); | 6 | else $('.' + clname).hide(100); |
7 | |||
8 | // save cookie for all checkboxes | ||
9 | save = ''; | ||
10 | $('.chbxtoggle').each(function() { if ($(this).attr('id') != undefined) { save += ';' + $(this).attr('id') +':'+ $(this).is(':checked')} }) | ||
11 | $.cookie('_displaycols_{{objectname}}', save); | ||
12 | save = ''; | ||
6 | } | 13 | } |
7 | 14 | ||
8 | 15 | ||
@@ -22,8 +29,11 @@ | |||
22 | <!-- control header --> | 29 | <!-- control header --> |
23 | <div class="navbar"> | 30 | <div class="navbar"> |
24 | <div class="navbar-inner"> | 31 | <div class="navbar-inner"> |
25 | <form class="navbar-search input-append pull-left" > | 32 | <form class="navbar-search input-append pull-left" id="searchform"> |
26 | <input class="input-xxlarge" name="search" type="text" placeholder="Search {{objectname}}" value="{{request.GET.search}}"/> | 33 | <div class="input-append" style="padding-right:1em"> |
34 | <input class="input-xxlarge" id="search" name="search" type="text" placeholder="Search {{objectname}}" value="{{request.GET.search}}"/><a href="javascript:$('#search').val('');searchform.submit()" class="add-on"><i class="icon-remove"></i></a> | ||
35 | </div> | ||
36 | <input type="hidden" name="orderby" value="{{request.GET.orderby}}"> | ||
27 | <input class="btn" type="submit" value="Search"/> | 37 | <input class="btn" type="submit" value="Search"/> |
28 | </form> | 38 | </form> |
29 | <div class="pull-right"> | 39 | <div class="pull-right"> |
@@ -32,7 +42,10 @@ | |||
32 | <button class="btn dropdown-toggle" data-toggle="dropdown">Edit columns | 42 | <button class="btn dropdown-toggle" data-toggle="dropdown">Edit columns |
33 | <span class="caret"></span> | 43 | <span class="caret"></span> |
34 | </button> | 44 | </button> |
35 | <ul class="dropdown-menu">{% for i in tablecols %} | 45 | <!-- |
46 | {{tablecols|sortcols}} | ||
47 | --> | ||
48 | <ul class="dropdown-menu">{% for i in tablecols|sortcols %} | ||
36 | <li> | 49 | <li> |
37 | <label class="checkbox"> | 50 | <label class="checkbox"> |
38 | <input type="checkbox" class="chbxtoggle" {% if i.clclass %}id="{{i.clclass}}" value="ct{{i.name}}" {% if not i.hidden %}checked="checked"{%endif%} onchange="showhideTableColumn($(this).attr('id'), $(this).is(':checked'))" {%else%} checked disabled{% endif %}/> {{i.name}} | 51 | <input type="checkbox" class="chbxtoggle" {% if i.clclass %}id="{{i.clclass}}" value="ct{{i.name}}" {% if not i.hidden %}checked="checked"{%endif%} onchange="showhideTableColumn($(this).attr('id'), $(this).is(':checked'))" {%else%} checked disabled{% endif %}/> {{i.name}} |
diff --git a/bitbake/lib/toaster/toastergui/templates/build.html b/bitbake/lib/toaster/toastergui/templates/build.html index eb7e03c951..a15702463b 100644 --- a/bitbake/lib/toaster/toastergui/templates/build.html +++ b/bitbake/lib/toaster/toastergui/templates/build.html | |||
@@ -18,9 +18,13 @@ | |||
18 | <div class="row-fluid"> | 18 | <div class="row-fluid"> |
19 | <div class="lead span5"> | 19 | <div class="lead span5"> |
20 | {%if build.outcome == build.SUCCEEDED%}<i class="icon-ok-sign success"></i>{%elif build.outcome == build.FAILED%}<i class="icon-minus-sign error"></i>{%else%}{%endif%} | 20 | {%if build.outcome == build.SUCCEEDED%}<i class="icon-ok-sign success"></i>{%elif build.outcome == build.FAILED%}<i class="icon-minus-sign error"></i>{%else%}{%endif%} |
21 | {%if build.outcome == build.SUCCEEDED or build.outcome == build.FAILED %} | ||
21 | <a href="{%url 'builddashboard' build.pk%}"> | 22 | <a href="{%url 'builddashboard' build.pk%}"> |
23 | {% endif %} | ||
22 | <span data-toggle="tooltip" {%if build.target_set.all.count > 1%}title="Targets: {%for target in build.target_set.all%}{{target.target}} {%endfor%}"{%endif%}>{{build.target_set.all.0.target}} {%if build.target_set.all.count > 1%}(+ {{build.target_set.all.count|add:"-1"}}){%endif%} {{build.machine}} ({{build.completed_on|naturaltime}})</span> | 24 | <span data-toggle="tooltip" {%if build.target_set.all.count > 1%}title="Targets: {%for target in build.target_set.all%}{{target.target}} {%endfor%}"{%endif%}>{{build.target_set.all.0.target}} {%if build.target_set.all.count > 1%}(+ {{build.target_set.all.count|add:"-1"}}){%endif%} {{build.machine}} ({{build.completed_on|naturaltime}})</span> |
25 | {%if build.outcome == build.SUCCEEDED or build.outcome == build.FAILED %} | ||
23 | </a> | 26 | </a> |
27 | {% endif %} | ||
24 | </div> | 28 | </div> |
25 | {%if build.outcome == build.SUCCEEDED or build.outcome == build.FAILED %} | 29 | {%if build.outcome == build.SUCCEEDED or build.outcome == build.FAILED %} |
26 | <div class="span2 lead"> | 30 | <div class="span2 lead"> |
@@ -34,7 +38,7 @@ | |||
34 | {% endif %} | 38 | {% endif %} |
35 | </div> | 39 | </div> |
36 | <div class="lead pull-right"> | 40 | <div class="lead pull-right"> |
37 | Build time: <a href="build-time.html">{{ build|timespent }}</a> | 41 | Build time: <a href="build-time.html">{{ build.timespent|sectohms }}</a> |
38 | </div> | 42 | </div> |
39 | {%endif%}{%if build.outcome == build.IN_PROGRESS %} | 43 | {%endif%}{%if build.outcome == build.IN_PROGRESS %} |
40 | <div class="span4"> | 44 | <div class="span4"> |
@@ -81,14 +85,14 @@ | |||
81 | {% for build in objects %} | 85 | {% for build in objects %} |
82 | <tr class="data"> | 86 | <tr class="data"> |
83 | <td class="outcome"><a href="{% url "builddashboard" build.id %}">{%if build.outcome == build.SUCCEEDED%}<i class="icon-ok-sign success"></i>{%elif build.outcome == build.FAILED%}<i class="icon-minus-sign error"></i>{%else%}{%endif%}</a></td> | 87 | <td class="outcome"><a href="{% url "builddashboard" build.id %}">{%if build.outcome == build.SUCCEEDED%}<i class="icon-ok-sign success"></i>{%elif build.outcome == build.FAILED%}<i class="icon-minus-sign error"></i>{%else%}{%endif%}</a></td> |
84 | <td class="target">{% for t in build.target_set.all %}{%if t.is_image %}<a href="{% url "target" build.id t.id %}">{% endif %}{{t.target}}{% if t.is_image %}</a>{% endif %}<br/>{% endfor %}</td> | 88 | <td class="target">{% for t in build.target_set.all %}{%if t.is_image %}<a href="{% url "builddashboard" build.id %}">{% endif %}{{t.target}}{% if t.is_image %}</a>{% endif %}<br/>{% endfor %}</td> |
85 | <td class="machine"><a href="{% url "builddashboard" build.id %}">{{build.machine}}</a></td> | 89 | <td class="machine"><a href="{% url "builddashboard" build.id %}">{{build.machine}}</a></td> |
86 | <td class="started_on"><a href="{% url "builddashboard" build.id %}">{{build.started_on}}</a></td> | 90 | <td class="started_on"><a href="{% url "builddashboard" build.id %}">{{build.started_on|date:"d/m/y H:i"}}</a></td> |
87 | <td class="completed_on"><a href="{% url "builddashboard" build.id %}">{{build.completed_on}}</a></td> | 91 | <td class="completed_on"><a href="{% url "builddashboard" build.id %}">{{build.completed_on|date:"d/m/y H:i"}}</a></td> |
88 | <td class="failed_tasks">{% query build.task_build outcome=4 order__gt=0 as exectask%}{% if exectask.count == 1 %}{{exectask.0.recipe.name}}.{{exectask.0.task_name}}{% elif exectask.count > 1%}{{exectask.count}}{%endif%}</td> | 92 | <td class="failed_tasks error">{% query build.task_build outcome=4 order__gt=0 as exectask%}{% if exectask.count == 1 %}{{exectask.0.recipe.name}}.{{exectask.0.task_name}}{% elif exectask.count > 1%}{{exectask.count}}{%endif%}</td> |
89 | <td class="errors_no">{% if build.errors_no %}<a class="errors_no" href="{% url "builddashboard" build.id %}#errors">{{build.errors_no}} error{{build.errors_no|pluralize}}</a>{%endif%}</td> | 93 | <td class="errors_no">{% if build.errors_no %}<a class="errors_no error" href="{% url "builddashboard" build.id %}#errors">{{build.errors_no}} error{{build.errors_no|pluralize}}</a>{%endif%}</td> |
90 | <td class="warnings_no">{% if build.warnings_no %}<a class="warnings_no" href="{% url "builddashboard" build.id %}#warnings">{{build.warnings_no}} warning{{build.warnings_no|pluralize}}</a>{%endif%}</td> | 94 | <td class="warnings_no">{% if build.warnings_no %}<a class="warnings_no warning" href="{% url "builddashboard" build.id %}#warnings">{{build.warnings_no}} warning{{build.warnings_no|pluralize}}</a>{%endif%}</td> |
91 | <td class="time"><a href="{% url "buildtime" build.id %}">{{build|timespent}}</a></td> | 95 | <td class="time"><a href="{% url "buildtime" build.id %}">{{build.timespent|sectohms}}</a></td> |
92 | <td class="log">{{build.cooker_log_path}}</td> | 96 | <td class="log">{{build.cooker_log_path}}</td> |
93 | <td class="output">{% if build.outcome == 0 %}{% for t in build.target_set.all %}{% if t.is_image %}<a href="{%url "builddashboard" build.id%}#images">{{build.image_fstypes}}</a>{% endif %}{% endfor %}{% endif %}</td> | 97 | <td class="output">{% if build.outcome == 0 %}{% for t in build.target_set.all %}{% if t.is_image %}<a href="{%url "builddashboard" build.id%}#images">{{build.image_fstypes}}</a>{% endif %}{% endfor %}{% endif %}</td> |
94 | </tr> | 98 | </tr> |
diff --git a/bitbake/lib/toaster/toastergui/templates/builddashboard.html b/bitbake/lib/toaster/toastergui/templates/builddashboard.html index 3b184372bf..b6506c73d0 100644 --- a/bitbake/lib/toaster/toastergui/templates/builddashboard.html +++ b/bitbake/lib/toaster/toastergui/templates/builddashboard.html | |||
@@ -17,13 +17,13 @@ | |||
17 | <div class="row-fluid span10 pull-right"> | 17 | <div class="row-fluid span10 pull-right"> |
18 | <div class="alert {%if build.outcome == build.SUCCEEDED%}alert-success{%elif build.outcome == build.FAILED%}alert-error{%else%}alert-info{%endif%}"> | 18 | <div class="alert {%if build.outcome == build.SUCCEEDED%}alert-success{%elif build.outcome == build.FAILED%}alert-error{%else%}alert-info{%endif%}"> |
19 | <div class="row-fluid lead"> | 19 | <div class="row-fluid lead"> |
20 | <span class="pull-left"><strong>{%if build.outcome == build.SUCCEEDED%}Completed{%elif build.outcome == build.FAILED%}Failed{%else%}{%endif%}</strong> {{build.completed_on|naturaltime}} with </span>{%if build.outcome == build.SUCCEEDED or build.outcome == build.FAILED %}{% if build.errors_no %} | 20 | <span class="pull-left"><strong>{%if build.outcome == build.SUCCEEDED%}Completed{%elif build.outcome == build.FAILED%}Failed{%else%}{%endif%}</strong> {{build.completed_on|date:"d/m/y H:i"}} with </span>{%if build.outcome == build.SUCCEEDED or build.outcome == build.FAILED %}{% if build.errors_no %} |
21 | <span class="span2"><i class="icon-minus-sign red"></i><strong><a href="{%url 'builddashboard' build.pk%}" class="error"> {{build.errors_no}} error{{build.errors_no|pluralize}}</a></strong></span> | 21 | <span class="span2"><i class="icon-minus-sign red"></i><strong><a href="{%url 'builddashboard' build.pk%}" class="error"> {{build.errors_no}} error{{build.errors_no|pluralize}}</a></strong></span> |
22 | {% endif %} | 22 | {% endif %} |
23 | {% if build.warnings_no %} | 23 | {% if build.warnings_no %} |
24 | <span class="span2"><i class="icon-warning-sign yellow"></i><strong><a href="{%url 'builddashboard' build.pk%}" class="warning"> {{build.warnings_no}} warning{{build.warnings_no|pluralize}}</a></strong></span> | 24 | <span class="span2"><i class="icon-warning-sign yellow"></i><strong><a href="{%url 'builddashboard' build.pk%}" class="warning"> {{build.warnings_no}} warning{{build.warnings_no|pluralize}}</a></strong></span> |
25 | {% endif %} | 25 | {% endif %} |
26 | <span class="pull-right">Build time: <a href="build-time.html">{{ build|timespent }}</a></span> | 26 | <span class="pull-right">Build time: <a href="build-time.html">{{ build.timespent|sectohms }}</a></span> |
27 | {%endif%} | 27 | {%endif%} |
28 | </div> | 28 | </div> |
29 | </div> | 29 | </div> |
diff --git a/bitbake/lib/toaster/toastergui/templates/configvars.html b/bitbake/lib/toaster/toastergui/templates/configvars.html index 8ce04b883d..ae45119f39 100644 --- a/bitbake/lib/toaster/toastergui/templates/configvars.html +++ b/bitbake/lib/toaster/toastergui/templates/configvars.html | |||
@@ -27,7 +27,7 @@ | |||
27 | <tr class="data"> | 27 | <tr class="data"> |
28 | <td class="variable">{{variable.variable_name}}</td> | 28 | <td class="variable">{{variable.variable_name}}</td> |
29 | <td class="variable_value">{{variable.variable_value}}</td> | 29 | <td class="variable_value">{{variable.variable_value}}</td> |
30 | <td class="file">{% for vh in variable.variablehistory_set.all %}{{vh.operation}} in {{vh.file_name}}:{{vh.line_number}}<br/>{%endfor%}</td> | 30 | <td class="file">{% for vh in variable.vhistory_set.all %}{{vh.operation}} in {{vh.file_name}}:{{vh.line_number}}<br/>{%endfor%}</td> |
31 | <td class="description">{% if variable.description %}{{variable.description}}{% endif %}</td> | 31 | <td class="description">{% if variable.description %}{{variable.description}}{% endif %}</td> |
32 | </tr> | 32 | </tr> |
33 | {% endfor %} | 33 | {% endfor %} |