| @@ -90,17 +90,19 | |||
|
|
90 | 90 | <div id="page" class="row" style="min-height:600px"> |
|
|
91 | 91 | |
|
|
92 | 92 | {% if no_sidebar %} |
|
|
93 | <div class="col-md-0 hidden-xs hidden-sm" role="complementary"> | |
|
|
93 | <div class="col-md-0 hidden-xs hidden-sm" role="complementary"></div> | |
|
|
94 | 94 | |
|
|
95 | 95 | {% else %} |
|
|
96 | 96 | <div class="col-md-3 hidden-xs hidden-sm" role="complementary"> |
|
|
97 | {% endif %} | |
|
|
98 | 97 |
|
|
|
99 | 98 | <div id="sidebar"> |
|
|
100 | 99 | {% block sidebar%} |
|
|
100 | {% include "sidebar_devices.html" %} | |
|
|
101 | 101 |
|
|
|
102 | 102 | </div> |
|
|
103 | 103 | </div> |
|
|
104 | {% endif %} | |
|
|
105 | ||
|
|
104 | 106 | |
|
|
105 | 107 | {% if no_sidebar %} |
|
|
106 | 108 | <div class="col-md-12 col-xs-12" role="main"> |
| @@ -37,7 +37,7 | |||
|
|
37 | 37 | <table class="table table-bordered"> |
|
|
38 | 38 | <tr> |
|
|
39 | 39 | <th>Status</th> |
|
|
40 | <td class="text-{{dev_conf.device.status_color}}"> {{dev_conf.device.get_status_display}} </td> | |
|
|
40 | <td class="text-{{dev_conf.device.status_color}}"> {% if dev_conf.device.device_type.name == 'abs' %} {{connected_modules}} {% else %} {{dev_conf.device.get_status_display}}{% endif %} </td> | |
|
|
41 | 41 | </tr> |
|
|
42 | 42 | |
|
|
43 | 43 | {% for key in dev_conf_keys %} |
| @@ -53,9 +53,7 | |||
|
|
53 | 53 | |
|
|
54 | 54 | {% endblock %} |
|
|
55 | 55 | |
|
|
56 | {% block sidebar%} | |
|
|
57 | {% include "sidebar_devices.html" %} | |
|
|
58 | {% endblock %} | |
|
|
56 | ||
|
|
59 | 57 | |
|
|
60 | 58 | {% block extra-js%} |
|
|
61 | 59 | <script type="text/javascript"> |
General Comments 0
You need to be logged in to leave comments.
Login now