diff options
author | Belen Barros Pena <belen.barros.pena@linux.intel.com> | 2016-04-12 15:56:43 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-06-15 08:35:03 +0100 |
commit | 443f7b39158c891015a791814b9b1fe2324edc41 (patch) | |
tree | 3f570a138594273bc7498225e066b7f9a99bf0c5 /bitbake/lib/toaster/toastergui/templates/mrb_section.html | |
parent | 79e0eb9e52e9b954aa3b6bc6dee15a75b5eb990c (diff) | |
download | poky-443f7b39158c891015a791814b9b1fe2324edc41.tar.gz |
bitbake: toaster: Migrate project configuration from bootstrap 2 to bootstrap 3
Convert all the HTML templates, JS and CSS in the project parts of
toaster to use bootstrap 3.
(Bitbake rev: 69527a731eada699d3f604ff8f3ae9410981ba9b)
Signed-off-by: Belen Barros Pena <belen.barros.pena@linux.intel.com>
Signed-off-by: Michael Wood <michael.g.wood@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/toaster/toastergui/templates/mrb_section.html')
-rw-r--r-- | bitbake/lib/toaster/toastergui/templates/mrb_section.html | 121 |
1 files changed, 61 insertions, 60 deletions
diff --git a/bitbake/lib/toaster/toastergui/templates/mrb_section.html b/bitbake/lib/toaster/toastergui/templates/mrb_section.html index 2780ac591e..4b4e3e691b 100644 --- a/bitbake/lib/toaster/toastergui/templates/mrb_section.html +++ b/bitbake/lib/toaster/toastergui/templates/mrb_section.html | |||
@@ -21,15 +21,15 @@ | |||
21 | {%if mru %} | 21 | {%if mru %} |
22 | 22 | ||
23 | {%if mrb_type == 'project' %} | 23 | {%if mrb_type == 'project' %} |
24 | <h2 class="page-header"> | 24 | <h2> |
25 | Latest project builds | 25 | Latest project builds |
26 | 26 | ||
27 | {% if project.is_default %} | 27 | {% if project.is_default %} |
28 | <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> | 28 | <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> |
29 | {% endif %} | 29 | {% endif %} |
30 | </h2> | 30 | </h2> |
31 | {% else %} | 31 | {% else %} |
32 | <div class="page-header top-air"> | 32 | <div class="page-header"> |
33 | <h1> | 33 | <h1> |
34 | Latest builds | 34 | Latest builds |
35 | </h1> | 35 | </h1> |
@@ -37,18 +37,20 @@ | |||
37 | {% endif %} | 37 | {% endif %} |
38 | <div id="latest-builds"> | 38 | <div id="latest-builds"> |
39 | {% for build in mru %} | 39 | {% for build in mru %} |
40 | <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 %}"> | 40 | <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%}"> |
41 | {% if mrb_type != 'project' %} | 41 | {% if mrb_type != 'project' %} |
42 | <span class="label {%if build.outcome == build.SUCCEEDED%}label-success{%elif build.outcome == build.FAILED%}label-important{%else%}label-info{%endif%}"> | 42 | <div class="row project-name"> |
43 | <a href={% project_url build.project %}> | 43 | <div class="col-md-12"> |
44 | {{build.project.name}} | 44 | <small> |
45 | </a> | 45 | <a class="alert-link text-uppercase" href={% project_url build.project %}>{{build.project.name}}</a> |
46 | </span> | 46 | </small> |
47 | {% endif %} | 47 | </div> |
48 | <div class="row-fluid"> | 48 | </div> |
49 | <div class="span3 lead"> | 49 | {% endif %} |
50 | <div class="row"> | ||
51 | <div class="col-md-3"> | ||
50 | {%if build.outcome == build.SUCCEEDED or build.outcome == build.FAILED %} | 52 | {%if build.outcome == build.SUCCEEDED or build.outcome == build.FAILED %} |
51 | <a href="{%url 'builddashboard' build.pk%}" class="{%if build.outcome == build.SUCCEEDED %}success{%else%}error{%endif%}"> | 53 | <a href="{%url 'builddashboard' build.pk%}" class="alert-link"> |
52 | {% endif %} | 54 | {% endif %} |
53 | {% if build.target_set.all.count > 0 %} | 55 | {% if build.target_set.all.count > 0 %} |
54 | <span data-toggle="tooltip" | 56 | <span data-toggle="tooltip" |
@@ -79,7 +81,7 @@ | |||
79 | {% endif %} | 81 | {% endif %} |
80 | </div> | 82 | </div> |
81 | {% if build.outcome == build.SUCCEEDED or build.outcome == build.FAILED %} | 83 | {% if build.outcome == build.SUCCEEDED or build.outcome == build.FAILED %} |
82 | <div class="span2 lead"> | 84 | <div class="col-md-2"> |
83 | {% if build.completed_on|format_build_date %} | 85 | {% if build.completed_on|format_build_date %} |
84 | {{ build.completed_on|date:'d/m/y H:i' }} | 86 | {{ build.completed_on|date:'d/m/y H:i' }} |
85 | {% else %} | 87 | {% else %} |
@@ -88,22 +90,23 @@ | |||
88 | </div> | 90 | </div> |
89 | {% endif %} | 91 | {% endif %} |
90 | {%if build.outcome == build.SUCCEEDED or build.outcome == build.FAILED %} | 92 | {%if build.outcome == build.SUCCEEDED or build.outcome == build.FAILED %} |
91 | <div class="span2 lead"> | 93 | <div class="col-md-2"> |
92 | {% if build.errors.count %} | 94 | {% if build.errors.count %} |
93 | <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> | 95 | <span class="glyphicon glyphicon-minus-sign"></span> |
96 | <a href="{%url 'builddashboard' build.pk%}#errors" class="alert-link">{{build.errors.count}} error{{build.errors.count|pluralize}}</a> | ||
94 | {% endif %} | 97 | {% endif %} |
95 | </div> | 98 | </div> |
96 | <div class="span2 lead"> | 99 | <div class="col-md-2"> |
97 | {% if build.warnings.count %} | 100 | {% if build.warnings.count %} |
98 | <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> | 101 | <span class="glyphicon glyphicon-warning-sign build-warnings"></span> |
102 | <a href="{%url 'builddashboard' build.pk%}#warnings" class="alert-link build-warnings">{{build.warnings.count}} warning{{build.warnings.count|pluralize}}</a> | ||
99 | {% endif %} | 103 | {% endif %} |
100 | </div> | 104 | </div> |
101 | <div class="lead "> | 105 | <div class="col-md-3"> |
102 | <span class="lead"> | 106 | Build time: <a class="alert-link" href="{% url 'buildtime' build.pk %}">{{ build.timespent_seconds|sectohms }} |
103 | Build time: <a href="{% url 'buildtime' build.pk %}">{{ build.timespent_seconds|sectohms }}</a> | 107 | </a> |
104 | </span> | ||
105 | {% if build.project.is_default %} | 108 | {% if build.project.is_default %} |
106 | <i class="pull-right icon-question-sign get-help | 109 | <span class="pull-right glyphicon glyphicon-question-sign get-help |
107 | {% if build.outcome == build.SUCCEEDED %} | 110 | {% if build.outcome == build.SUCCEEDED %} |
108 | get-help-green | 111 | get-help-green |
109 | {% elif build.outcome == build.FAILED %} | 112 | {% elif build.outcome == build.FAILED %} |
@@ -112,68 +115,66 @@ | |||
112 | get-help-blue | 115 | get-help-blue |
113 | {% endif %} | 116 | {% endif %} |
114 | " title="Builds in this project cannot be started from Toaster: they are started from the command line"> | 117 | " title="Builds in this project cannot be started from Toaster: they are started from the command line"> |
115 | </i> | 118 | </span> |
116 | {% else %} | 119 | {% else %} |
117 | <button class="run-again-btn btn | 120 | <a href="#" class="run-again-btn alert-link |
118 | {% if build.outcome == build.SUCCEEDED %} | 121 | {% if build.outcome == build.SUCCEEDED %} |
119 | btn-success | 122 | success |
120 | {% elif build.outcome == build.FAILED %} | 123 | {% elif build.outcome == build.FAILED %} |
121 | btn-danger | 124 | danger |
122 | {% else %} | 125 | {% else %} |
123 | btn-info | 126 | info |
124 | {%endif%} | 127 | {%endif%} |
125 | pull-right" | 128 | pull-right" |
126 | data-request-url="{% url 'xhr_buildrequest' build.project.pk %}" | 129 | data-request-url="{% url 'xhr_buildrequest' build.project.pk %}" |
127 | data-target='{{build.target_set.all|get_tasks|json}}'> | 130 | data-target='{{build.target_set.all|get_tasks|json}}'> |
128 | Rebuild | 131 | <span class="glyphicon glyphicon-repeat"></span> |
129 | </button> | 132 | Rebuild |
133 | </a> | ||
130 | {% endif %} | 134 | {% endif %} |
131 | </div> | 135 | </div> |
132 | {%endif%} | 136 | {%endif%} |
137 | |||
133 | {%if build.outcome == build.IN_PROGRESS %} | 138 | {%if build.outcome == build.IN_PROGRESS %} |
134 | <div class="span4" style="display:none" id="cancelling-msg-{{build.buildrequest.pk}}"> | 139 | <div class="col-md-4" style="display:none" id="cancelling-msg-{{build.buildrequest.pk}}"> |
135 | <p class="lead">Cancelling the build ...</p> | 140 | Cancelling the build ... |
136 | </div> | 141 | </div> |
137 | <div class="span4 offset1 progress-info"> | 142 | <div class="col-md-4 col-md-offset-1 progress-info"> |
138 | <div class="progress" id="build-pc-done-title-{{build.pk}}" style="margin-top:5px;" data-toggle="tooltip" title="{{build.completeper}}% of tasks complete"> | 143 | <div class="progress" id="build-pc-done-title-{{build.pk}}"> |
139 | <div id="build-pc-done-bar-{{build.pk}}" style="width: {{build.completeper}}%;" class="bar"></div> | 144 | <div id="build-pc-done-bar-{{build.pk}}" style="width: {{build.completeper}}%;" class="progress-bar"></div> |
140 | </div> | 145 | </div> |
141 | </div> | 146 | </div> |
142 | <div class="lead span3 progress-info"><span id="build-pc-done-{{build.pk}}">{{build.completeper}}</span>% of tasks complete</div> | 147 | <div class="col-md-4 progress-info"><span id="build-pc-done-{{build.pk}}">{{build.completeper}}</span>% of tasks complete |
143 | {# No build cancel for command line builds project #} | 148 | {# No build cancel for command line builds project #} |
144 | {% if build.project.is_default %} | 149 | {% if build.project.is_default %} |
145 | <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> | 150 | <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> |
146 | {% else %} | 151 | {% else %} |
147 | <div class="lead pull-right progress-info"> | 152 | <a href="#" class="cancel-build-btn pull-right alert-link" |
148 | <button class="cancel-build-btn btn btn-info pull-right" | ||
149 | data-buildrequest-id={{build.buildrequest.pk}} | 153 | data-buildrequest-id={{build.buildrequest.pk}} |
150 | data-request-url="{% url 'xhr_buildrequest' build.project.pk %}" > | 154 | data-request-url="{% url 'xhr_buildrequest' build.project.pk %}" > |
155 | <span class="glyphicon glyphicon-remove-circle"></span> | ||
151 | Cancel | 156 | Cancel |
152 | </button> | 157 | </a> |
153 | </div> | 158 | </div> |
154 | {% endif %} | 159 | {% endif %} |
155 | 160 | ||
156 | {%endif%} {# end if in progress #} | 161 | {%endif%} {# end if in progress #} |
157 | 162 | ||
158 | {% if build.outcome == build.CANCELLED %} | 163 | {% if build.outcome == build.CANCELLED %} |
159 | <div class="span4"> | 164 | <div class="col-md-6"> |
160 | <p class="lead">Build cancelled</p> | 165 | Build cancelled |
161 | </div> | 166 | </div> |
162 | 167 | <div class="col-md-3"> | |
163 | {% if build.project.is_default %} | 168 | <a href="#" class="info pull-right run-again-btn alert-link" |
164 | <i class="icon-question-sign get-help get-help-blue pull-right" title="" | 169 | data-request-url="{% url 'xhr_buildrequest' build.project.pk %}" |
165 | data-original-title="Builds in this project cannot be rebuilt from Toaster: they can only be rebuilt from the command line"></i> | 170 | data-target='{{build.target_set.all|get_tasks|json}}'> |
166 | {% else %} | 171 | <span class="glyphicon glyphicon-repeat"></span> |
167 | <button class="btn btn-info pull-right run-again-btn" | 172 | Rebuild |
168 | data-request-url="{% url 'xhr_buildrequest' build.project.pk %}" | 173 | </a> |
169 | data-target='{{build.target_set.all|get_tasks|json}}'> | 174 | </div> |
170 | Rebuild | ||
171 | </button> | ||
172 | {% endif %} | ||
173 | {% endif %} | 175 | {% endif %} |
174 | </div> | 176 | </div> |
175 | </div> | 177 | </div> |
176 | |||
177 | {% endfor %} | 178 | {% endfor %} |
178 | </div> | 179 | </div> |
179 | 180 | ||