radarsys Commit - r197:c114230a5397 · Jicamarca Repository

no sidebar for plotting abs patterns...

Fiorella Quino -

r197:c114230a5397

parent child

Context file:

r197:c114230a5397

Collapse all files

apps/main/templates/base.html +9 -7

             <!DOCTYPE html>
             {% load static %}
             <html lang="en">
             <head>
                 <meta charset="utf-8">
                 <title>{% block title %}Jicamarca Integrated Radar System:::::{% endblock %}</title>
                 <meta name="description" content="">
                 <meta name="author" content="">
                 <meta name="viewport" content="width=device-width, initial-scale=1">
                 {# bootstrap_css #}
                 <link href="{% static 'css/bootstrap-spacelab.min.css' %}" media="all" rel="stylesheet">
                 <style type="text/css">
                   body {padding-top: 60px}
                   .logo {padding-top: 5px; height: 50px}
                   .clickable-row {cursor: pointer;}
                   .col-no-padding { padding-left:0;}
                   .gi-2x{font-size: 2em;}
                   .gi-3x{font-size: 3em;}
                   .gi-4x{font-size: 4em;}
                   .gi-5x{font-size: 5em;}
                 </style>
                 <!--[if lt IE 9]>
             	<script src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
             	<![endif]-->
                 <script src="{% static 'js/jquery.min.js' %}"></script>
                 {% block extra-head %}
                 {% endblock %}
             </head>
             <body>
             {% block main_menu %}
             <nav class="navbar navbar-default navbar-fixed-top" role="banner">
                 <div class="container-fluid">
                   <div class="navbar-header">
                     <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navigationbar">
                       <span class="sr-only">Toggle navigation</span>
                       <span class="icon-bar"></span>
                       <span class="icon-bar"></span>
                       <span class="icon-bar"></span>
                     </button>
                     <a class="navbar-brand" href="{% url 'index' %}" style="padding-top:1px"><img class="logo" alt="JRO" src="{% static "images/logo-jro-color-trans.png" %}"></a>
                   </div>
                   <div class="collapse navbar-collapse" id="navigationbar">
                     <ul class="nav navbar-nav">
                       <li class=" dropdown {% block operation-active %}{% endblock %}"><a href="{% url 'url_operation'%}">Operation</a>
                       </li>
                       <li class=" dropdown {% block new-active %}{% endblock %}">
                         <a href="#" class="dropdown-toggle" data-toggle="dropdown">New<span class="caret"></span></a>
                         <ul class="dropdown-menu" role="menu">
                           <li><a href="{% url 'url_add_campaign' %}">Campaign</a></li>
                           <li><a href="{% url 'url_add_experiment' %}">Experiment</a></li>
                           <li><a href="{% url 'url_add_dev_conf' 0%}">Device Configuration</a></li>
                           <li><a href="{% url 'url_add_device'%}">Device</a></li>
                           <li><a href="{% url 'url_add_location'%}">Radar System</a></li>
                         </ul>
                       </li>
                       <li class=" dropdown {% block search-active %}{% endblock %}">
                         <a href="#" class="dropdown-toggle" data-toggle="dropdown">Search<span class="caret"></span></a>
                         <ul class="dropdown-menu" role="menu">
                           <li><a href="{% url 'url_campaigns' %}">Campaigns</a></li>
                           <li><a href="{% url 'url_experiments' %}">Experiments</a></li>
                           <li><a href="{% url 'url_dev_confs' %}">Configurations</a></li>
                           <li><a href="{% url 'url_devices' %}">Devices</a></li>
                           <li><a href="{% url 'url_locations' %}">Radar Systems</a></li>
                         </ul>
                       </li>
                     </ul>
                     <ul class="nav navbar-nav navbar-right">
                       <li class="nav-divider"></li>
                       {% if user.is_authenticated %}
                       <li class="dropdown">
                         <a href="#" class="dropdown-toggle" data-toggle="dropdown">Hi {{ user.username }}<span class="caret"></span></a>
                          <ul class="dropdown-menu" role="menu">
                             <li><a href="/admin">Control Panel</a></li>
                             <li><a href="{% url 'url_logout' %}">Logout</a></li>
                          </ul>
                       </li>
                       {% else %}
                       <li><a href="{% url 'url_login' %}?next={{request.get_full_path}}">Login</a></li>
                       {% endif %}
                     </ul>
                   </div>
                 </div>
             </nav>
             <div style="clear: both;"></div>
             {% endblock %}
             <div class="container">
                 <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">
                 {% else %}
                  <div class="col-md-9 col-xs-12" role="main">
                 {% endif %}
             	   <div class="page-header">
                     <h1>{% block content-title %}{% endblock %} <small>{% block content-suptitle %}{% endblock %}</small></h1>
                    </div>
                    {% block messages %}
             	       {% if messages %}
             	         {% for message in messages %}
             	         <div class="alert alert-{% if message.tags %}{% if 'error' in message.tags %}danger{% else %}{{ message.tags }}{% endif %}{% else %}info{% endif %} alert-dismissible" role="alert">
             	           <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
             	           <strong>{{message.tags|title}}!</strong> {{ message }}
             	         </div>
             	         {% endfor %}
             	       {% endif %}
                    {% endblock %}
             	   {% block content %}
             	   {% endblock %}
             	   </div>
             	</div><!--/row-->
             </div> <!-- container -->
             <div id="debug">{{debug}}</div>
             {% block footer %}
             <footer class="footer">
               <div class="container">
               <p><hr></p>
               <p>
               &copy; <a href="http://jro.igp.gob.pe">Jicamarca Radio Observatory</a> - {% now "Y" %}
               </p>
               </div>
             </footer>
             {% endblock %}
             {# bootstrap_javascript jquery=True #}
             <script src="{% static 'js/bootstrap.min.js' %}"></script>
             {% block extra-js %}
             {% endblock%}
             </body>
             </html>

apps/main/templates/dev_conf.html +9 -11

             {% extends "base.html" %}
             {% load bootstrap3 %}
             {% load static %}
             {% load main_tags %}
             {% block search-active %}active{% endblock %}
             {% block content-title %}{{title}}{% endblock %}
             {% block content-suptitle %}{{suptitle}}{% endblock %}
             {% block content %}
             {% block menu-actions %}
             <span class=" dropdown pull-right">
               <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-menu-hamburger gi-2x" aria-hidden="true"></span></a>
               <ul class="dropdown-menu" role="menu">
                 <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>
                 {% block extra-menu-actions %}
                 {% endblock %}
                 <li><a>----------------</a></li>
                 <li><a href="{{ dev_conf.get_absolute_url_status }}"><span class="glyphicon glyphicon-refresh" aria-hidden="true"></span> Status</a></li>
                 {% if not no_play %}
                     {% if not only_stop %}
                         <li><a href="{{ dev_conf.get_absolute_url_start}}"><span class="glyphicon glyphicon-play" aria-hidden="true"></span> Start</a></li>
                     {% endif %}
                 <li><a href="{{ dev_conf.get_absolute_url_stop }}"><span class="glyphicon glyphicon-stop" aria-hidden="true"></span> Stop</a></li>
                 {% 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>
             </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>
             		<td>{{dev_conf|attr:key}}</td>
             	</tr>
             	{% endfor %}
             </table>
             {% block extra-content %}
             {% endblock %}
             {% 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 }}";
               });
               $("#bt_write").click(function() {
                 document.location = "{{ dev_conf.get_absolute_url_write }}";
               });
               $("#bt_import").click(function() {
                 document.location = "{{ dev_conf.get_absolute_url_import }}";
               });
               $("#bt_export").click(function() {
                 document.location = "{{ dev_conf.get_absolute_url_export }}";
               });
             </script>
-            {% endblock %}
  No newline at end of file
+            {% endblock %}

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages