Commit 62d3db14fd1761f03be464ebfebd8ee7ebb9af2b
1 parent
7f7c6b10
Exists in
master
Show warnings below, and errors up top.
Showing
1 changed file
with
16 additions
and
15 deletions
Show diff stats
flaskr/templates/estimation.html
... | ... | @@ -43,20 +43,10 @@ |
43 | 43 | <h2> |
44 | 44 | {{ estimation.public_id }} ({{ estimation.status.name }}) |
45 | 45 | </h2> |
46 | -{% if estimation.errors or estimation.warnings %} | |
47 | -<div class="row"> | |
48 | -{% if estimation.warnings %} | |
49 | - <div class="col-md-6 alert-warning card"> | |
50 | - <div class="card-body"> | |
51 | - <h3 class="card-title">Warnings</h3> | |
52 | - <pre> | |
53 | -{{ estimation.warnings }} | |
54 | - </pre> | |
55 | - </div> | |
56 | - </div> | |
57 | -{% endif %} | |
46 | + | |
58 | 47 | {% if estimation.errors %} |
59 | - <div class="col-md-6 alert-danger card"> | |
48 | +<div class="row"> | |
49 | + <div class="col-md-12 alert-danger card"> | |
60 | 50 | <div class="card-body"> |
61 | 51 | <h3 class="card-title">Errors</h3> |
62 | 52 | <pre> |
... | ... | @@ -64,11 +54,9 @@ |
64 | 54 | </pre> |
65 | 55 | </div> |
66 | 56 | </div> |
67 | -{% endif %} | |
68 | 57 | </div> |
69 | 58 | {% endif %} |
70 | 59 | |
71 | - | |
72 | 60 | <div class="row"> |
73 | 61 | <h4>Total CO<sub>2</sub> footprint (in grams-equivalent) of each city</h4> |
74 | 62 | <div id="cities_footprints_d3viz" class="plot-container"></div> |
... | ... | @@ -129,6 +117,19 @@ |
129 | 117 | |
130 | 118 | <hr> |
131 | 119 | |
120 | +{% if estimation.warnings %} | |
121 | +<div class="row"> | |
122 | + <div class="col-md-12 alert-warning card"> | |
123 | + <div class="card-body"> | |
124 | + <h3 class="card-title">Warnings</h3> | |
125 | + <pre> | |
126 | +{{ estimation.warnings }} | |
127 | + </pre> | |
128 | + </div> | |
129 | + </div> | |
130 | +</div> | |
131 | +{% endif %} | |
132 | + | |
132 | 133 | {#<div class="row">#} |
133 | 134 | {# <div class="col-md-6">#} |
134 | 135 | {# <h3>Raw Output <small>(YAML)</small></h3>#} | ... | ... |