@@ -90,17 +90,19 | |||||
90 | <div id="page" class="row" style="min-height:600px"> |
|
90 | <div id="page" class="row" style="min-height:600px"> | |
91 |
|
91 | |||
92 | {% if no_sidebar %} |
|
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 | {% else %} |
|
95 | {% else %} | |
96 | <div class="col-md-3 hidden-xs hidden-sm" role="complementary"> |
|
96 | <div class="col-md-3 hidden-xs hidden-sm" role="complementary"> | |
|
97 | <br><br> | |||
|
98 | <div id="sidebar"> | |||
|
99 | {% block sidebar%} | |||
|
100 | {% include "sidebar_devices.html" %} | |||
|
101 | {% endblock %} | |||
|
102 | </div> | |||
|
103 | </div> | |||
97 | {% endif %} |
|
104 | {% endif %} | |
98 | <br><br> |
|
105 | ||
99 | <div id="sidebar"> |
|
|||
100 | {% block sidebar%} |
|
|||
101 | {% endblock %} |
|
|||
102 | </div> |
|
|||
103 | </div> |
|
|||
104 |
|
106 | |||
105 | {% if no_sidebar %} |
|
107 | {% if no_sidebar %} | |
106 | <div class="col-md-12 col-xs-12" role="main"> |
|
108 | <div class="col-md-12 col-xs-12" role="main"> |
@@ -17,7 +17,7 | |||||
17 | <li><a href="{{ dev_conf.get_absolute_url_edit }}"><span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Edit</a></li> |
|
17 | <li><a href="{{ dev_conf.get_absolute_url_edit }}"><span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Edit</a></li> | |
18 | <li><a href="{% url 'url_delete_dev_conf' dev_conf.id %}"><span class="glyphicon glyphicon-remove" aria-hidden="true"></span> Delete</a></li> |
|
18 | <li><a href="{% url 'url_delete_dev_conf' dev_conf.id %}"><span class="glyphicon glyphicon-remove" aria-hidden="true"></span> Delete</a></li> | |
19 | <li><a href="{{ dev_conf.get_absolute_url_import }}"><span class="glyphicon glyphicon-import" aria-hidden="true"></span> Import </a></li> |
|
19 | <li><a href="{{ dev_conf.get_absolute_url_import }}"><span class="glyphicon glyphicon-import" aria-hidden="true"></span> Import </a></li> | |
20 |
<li><a href="{{ dev_conf.get_absolute_url_export }}"><span class="glyphicon glyphicon-export" aria-hidden="true"></span> Export </a></li> |
|
20 | <li><a href="{{ dev_conf.get_absolute_url_export }}"><span class="glyphicon glyphicon-export" aria-hidden="true"></span> Export </a></li> | |
21 | {% block extra-menu-actions %} |
|
21 | {% block extra-menu-actions %} | |
22 | {% endblock %} |
|
22 | {% endblock %} | |
23 | <li><a>----------------</a></li> |
|
23 | <li><a>----------------</a></li> | |
@@ -30,16 +30,16 | |||||
30 | {% endif %} |
|
30 | {% endif %} | |
31 | <li><a href="{{ dev_conf.get_absolute_url_write }}"><span class="glyphicon glyphicon-download" aria-hidden="true"></span> Write</a></li> |
|
31 | <li><a href="{{ dev_conf.get_absolute_url_write }}"><span class="glyphicon glyphicon-download" aria-hidden="true"></span> Write</a></li> | |
32 | <li><a href="{{ dev_conf.get_absolute_url_read }}"><span class="glyphicon glyphicon-upload" aria-hidden="true"></span> Read</a></li> |
|
32 | <li><a href="{{ dev_conf.get_absolute_url_read }}"><span class="glyphicon glyphicon-upload" aria-hidden="true"></span> Read</a></li> | |
33 | </ul> |
|
33 | </ul> | |
34 | </span> |
|
34 | </span> | |
35 | {% endblock %} |
|
35 | {% endblock %} | |
36 |
|
36 | |||
37 | <table class="table table-bordered"> |
|
37 | <table class="table table-bordered"> | |
38 | <tr> |
|
38 | <tr> | |
39 | <th>Status</th> |
|
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 | </tr> |
|
41 | </tr> | |
42 |
|
42 | |||
43 | {% for key in dev_conf_keys %} |
|
43 | {% for key in dev_conf_keys %} | |
44 | <tr> |
|
44 | <tr> | |
45 | <th>{% get_verbose_field_name dev_conf key %}</th> |
|
45 | <th>{% get_verbose_field_name dev_conf key %}</th> | |
@@ -53,17 +53,15 | |||||
53 |
|
53 | |||
54 | {% endblock %} |
|
54 | {% endblock %} | |
55 |
|
55 | |||
56 | {% block sidebar%} |
|
56 | ||
57 | {% include "sidebar_devices.html" %} |
|
|||
58 | {% endblock %} |
|
|||
59 |
|
57 | |||
60 | {% block extra-js%} |
|
58 | {% block extra-js%} | |
61 | <script type="text/javascript"> |
|
59 | <script type="text/javascript"> | |
62 |
|
60 | |||
63 | $("#bt_edit").click(function() { |
|
61 | $("#bt_edit").click(function() { | |
64 | document.location = "{{ dev_conf.get_absolute_url_edit }}"; |
|
62 | document.location = "{{ dev_conf.get_absolute_url_edit }}"; | |
65 | }); |
|
63 | }); | |
66 |
|
64 | |||
67 | $("#bt_read").click(function() { |
|
65 | $("#bt_read").click(function() { | |
68 | document.location = "{{ dev_conf.get_absolute_url_read }}"; |
|
66 | document.location = "{{ dev_conf.get_absolute_url_read }}"; | |
69 | }); |
|
67 | }); | |
@@ -79,6 +77,6 | |||||
79 | $("#bt_export").click(function() { |
|
77 | $("#bt_export").click(function() { | |
80 | document.location = "{{ dev_conf.get_absolute_url_export }}"; |
|
78 | document.location = "{{ dev_conf.get_absolute_url_export }}"; | |
81 | }); |
|
79 | }); | |
82 |
|
80 | |||
83 | </script> |
|
81 | </script> | |
84 | {% endblock %} No newline at end of file |
|
82 | {% endblock %} |
General Comments 0
You need to be logged in to leave comments.
Login now