From c114230a53972ea09478a766ce69a062843de831 2016-10-06 16:29:16
From: Fiorella Quino <fiorella.quino@jro.igp.gob.pe>
Date: 2016-10-06 16:29:16
Subject: [PATCH] no sidebar for plotting abs patterns

git-svn-id: http://jro-dev.igp.gob.pe/svn/jro_hard/radarsys/trunk/webapp@220 aa17d016-51d5-4e8b-934c-7b2bbb1bbe71

---

diff --git a/apps/main/templates/base.html b/apps/main/templates/base.html
index f538deb..394bb47 100644
--- a/apps/main/templates/base.html
+++ b/apps/main/templates/base.html
@@ -90,17 +90,19 @@
     <div id="page" class="row" style="min-height:600px">
 
     {% if no_sidebar %}
-    <div class="col-md-0 hidden-xs hidden-sm" role="complementary">
+    <div class="col-md-0 hidden-xs hidden-sm" role="complementary"></div>
 
     {% else %}
      <div class="col-md-3 hidden-xs hidden-sm" role="complementary">
+       <br><br>
+  	       <div id="sidebar">
+  	       {% block sidebar%}
+               {% include "sidebar_devices.html" %}
+          {% endblock %}
+  	       </div>
+  	   </div>
     {% endif %}
-	   <br><br>
-	       <div id="sidebar">
-	       {% block sidebar%}
-           {% endblock %}
-	       </div>
-	   </div>
+
 
     {% if no_sidebar %}
 	   <div class="col-md-12 col-xs-12" role="main">
diff --git a/apps/main/templates/dev_conf.html b/apps/main/templates/dev_conf.html
index 8cb22c5..a8e31c4 100644
--- a/apps/main/templates/dev_conf.html
+++ b/apps/main/templates/dev_conf.html
@@ -17,7 +17,7 @@
     <li><a href="{{ dev_conf.get_absolute_url_edit }}"><span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Edit</a></li>
     <li><a href="{% url 'url_delete_dev_conf' dev_conf.id %}"><span class="glyphicon glyphicon-remove" aria-hidden="true"></span> Delete</a></li>
     <li><a href="{{ dev_conf.get_absolute_url_import }}"><span class="glyphicon glyphicon-import" aria-hidden="true"></span> Import </a></li>
-    <li><a href="{{ dev_conf.get_absolute_url_export }}"><span class="glyphicon glyphicon-export" aria-hidden="true"></span> Export </a></li>    
+    <li><a href="{{ dev_conf.get_absolute_url_export }}"><span class="glyphicon glyphicon-export" aria-hidden="true"></span> Export </a></li>
     {% block extra-menu-actions %}
     {% endblock %}
     <li><a>----------------</a></li>
@@ -30,16 +30,16 @@
     {% endif %}
     <li><a href="{{ dev_conf.get_absolute_url_write }}"><span class="glyphicon glyphicon-download" aria-hidden="true"></span> Write</a></li>
     <li><a href="{{ dev_conf.get_absolute_url_read }}"><span class="glyphicon glyphicon-upload" aria-hidden="true"></span> Read</a></li>
-  </ul>          
+  </ul>
 </span>
 {% endblock %}
 
 <table class="table table-bordered">
 	<tr>
 		<th>Status</th>
-		<td class="text-{{dev_conf.device.status_color}}"> {{dev_conf.device.get_status_display}} </td>
+		<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>
 	</tr>
-	
+
 	{% for key in dev_conf_keys %}
 	<tr>
 		<th>{% get_verbose_field_name dev_conf key %}</th>
@@ -53,17 +53,15 @@
 
 {% endblock %}
 
-{% block sidebar%}
-{% include "sidebar_devices.html" %}
-{% endblock %}
+
 
 {% block extra-js%}
 <script type="text/javascript">
-  
+
   $("#bt_edit").click(function() {
     document.location = "{{ dev_conf.get_absolute_url_edit }}";
   });
- 
+
   $("#bt_read").click(function() {
     document.location = "{{ dev_conf.get_absolute_url_read }}";
   });
@@ -79,6 +77,6 @@
   $("#bt_export").click(function() {
     document.location = "{{ dev_conf.get_absolute_url_export }}";
   });
-  
+
 </script>
-{% endblock %}
\ No newline at end of file
+{% endblock %}