radarsys Commit - r96:77a52f31fce2 · Jicamarca Repository

Update main templates...

Juan C. Espinoza -

r96:77a52f31fce2

parent child

Context file:

r96:77a52f31fce2

Collapse all files

apps/main/templates/experiment_mix.html created 644 +14 0

@@ -0,0 +1,14
	1	{% extends "base_edit.html" %}
	2	{% load bootstrap3 %}
	3	{% load static %}
	4	{% load main_tags %}
	5	{% block extra-head %}
	6	<link href="{% static 'css/bootstrap-datetimepicker.min.css' %}" media="screen" rel="stylesheet">
	7	{% endblock %}
	8
	9	{% block extra-js%}
	10	<script src="{% static 'js/moment.min.js' %}"></script>
	11	<script src="{% static 'js/bootstrap-datetimepicker.min.js' %}"></script>
	12	<script src="{% static 'js/cr.js' %}"></script>
	13
	14	{% endblock %} No newline at end of file

apps/main/templates/base_edit.html +1 -1

             {% extends "base.html" %}
             {% load bootstrap3 %}
             {% load static %}
             {% load main_tags %}
             {% block content-title %}{{title}}{% endblock %}
             {% block content-suptitle %}{{suptitle}}{% endblock %}
             {% block content %}
               {% if form.is_multipart %}
               <form class="form" enctype="multipart/form-data" method="post" action="{{action}}">
               {% else %}
               <form class="form" method="post" action="{{action}}">
               {% endif %}
               {% csrf_token %}
               {% bootstrap_form form layout='horizontal' size='medium' %}
               <div style="clear: both;"></div>
               <br>
               {% if extra_button %}
               <div class="pull-left">
               <button type="button" class="btn btn-primary" id="bt_{{extra_button}}">{{extra_button}}</button>
               </div>
               {% endif %}
               {% if button %}
               <div class="pull-right">
-              <button type="button" class="btn btn-primary" onclick="{% if previous %}window.location.replace('{{ previous }}');{% else %}history.go(-1);{% endif %}">Cancel</button>
+              <button type="button" class="btn btn-primary" onclick="{% if previous %}window.location.replace('{{ previous }}');{% else %}history.go(-1);{% endif %}">{% if cancel %}{{cancel}}{% else %}Cancel{% endif %}</button>
               <button type="submit" class="btn btn-primary">{{button}}</button>
               </div>
               {% endif %}
             </form>
             {% endblock %}
             {% block sidebar%}
                {% include "sidebar_devices.html" %}
             {% endblock %}

apps/main/templates/campaign.html +6 0

             {% extends "base.html" %}
             {% load bootstrap3 %}
             {% load static %}
             {% load main_tags %}
             {% block extra-head %}
             <link href="{% static 'css/bootstrap-datetimepicker.min.css' %}" media="screen" rel="stylesheet">
             {% endblock %}
             {% block camp-active %}active{% endblock %}
             {% block content-title %}{{title}}{% endblock %}
             {% block content-suptitle %}{{suptitle}}{% endblock %}
             {% block content %}
             	<table class="table table-bordered">
             	{% for key in campaign_keys %}
             		<tr><th>{{key|title}}</th><td>{{campaign|attr:key}}</td></tr>
             	{% endfor %}
             	</table>
             	<button class="btn btn-primary pull-right" style="margin-left: 10px" id="bt_export">Export</button>
             	<button class="btn btn-primary pull-right" style="margin-left: 10px" id="bt_edit">Edit</button>
             	<br></br>
             	<br></br>
             	<div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">
             	  <div class="panel panel-default">
             	    <div class="panel-heading" role="tab" id="headingTwo">
             	      <h4 class="panel-title">
             	        <a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseTwo" aria-expanded="false" aria-controls="collapseTwo">
             	          Experiment List
             	        </a>
             	      </h4>
             	    </div>
             	    <div id="collapseTwo" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="headingTwo">
             	      <div class="panel-body">
             	      <table class="table table-hover">
             			<tr>
             			  <th>#</th>
             			  {% for header in experiment_keys %}
             			  <th>{{ header|title }}</th>
             			  {% endfor%}
             			</tr>
             			{% for item in experiments %}
             			<tr class="clickable-row" data-href="{% url 'url_experiment' item.id %}">
             			  <td>{{ forloop.counter }}</td>
             			  {% for key in experiment_keys %}
             			  <td>{{ item|attr:key }}</td>
             			  {% endfor %}
             			</tr>
             			{% endfor %}
             		  </table>
             	      </div>
             	    </div>
             	  </div>
             	</div>
+            	<br>
+            	<button class="btn btn-primary pull-right" style="margin-left: 10px" id="bt_mix">Mix Experiments</button>
             {% endblock %}
             {% block sidebar%}
                {% include "sidebar_devices.html" %}
             {% endblock %}
             {% block extra-js%}
             <script type="text/javascript">
               $(".clickable-row").click(function() {
             	    document.location = $(this).data("href");
             	  });
               $("#bt_edit").click(function() {
             	    document.location = "{% url 'url_edit_campaign' campaign.id %}";
             	  });
+              $("#bt_mix").click(function() {
+                    document.location = "{% url 'url_mix_campaign' campaign.id %}";
+                  });
             </script>
             {% endblock %}

apps/main/templates/dev_conf_edit.html +23 -33

@@ -1,48 +1,38
1	{% extends "base.html" %}	1	{% extends "base_edit.html" %}
2	{% load bootstrap3 %}	2	{% load bootstrap3 %}
3	{% load static %}	3	{% load static %}
4	{% load main_tags %}	4	{% load main_tags %}
5		5
6	{% block conf-active %}active{% endblock %}
7		6
8	{% block content-title %}{{title}}{% endblock %}	7	{% block extra-js%}
9	{% block content-suptitle %}{{suptitle}}{% endblock %}
10		8
11	{% block content %}	9	{% if id_exp %}
12		10
13	{% if form.is_multipart %}	11	<script type="text/javascript">
14	<form class="form" enctype="multipart/form-data" method="post" action="{{action}}">
15	{% else %}
16	<form class="form" method="post" action="{{action}}">
17	{% endif %}
18		12
19	{% csrf_token %}	13	$("#id_device").change(function() {
20	{% bootstrap_form form layout='horizontal' size='medium' %}	14	var url = "{% url 'url_add_dev_conf' id_exp %}";
21	<div style="clear: both;"></div>	15	document.location = url+ $(this).val() + "/?name=" + $("#id_name").val();
22	<br>	16	});
23	{% if extra_button %}
24	<div class="pull-left">
25	<button type="button" class="btn btn-primary" id="bt_{{extra_button}}">{{extra_button}}</button>
26	</div>
27	{% endif %}
28	<div class="pull-right">
29	<button type="button" class="btn btn-primary" onclick="{% if previous %}window.location.replace('{{ previous }}');{% else %}history.go(-1);{% endif %}">Cancel</button>
30	<button type="submit" class="btn btn-primary">{{button}}</button>
31	</div>
32	</form>
33	{% endblock %}
34		17
35	{% block sidebar%}	18	$('#id_create_from').change(function() {
36	{% include "sidebar_devices.html" %}	19	var url = "{% url 'url_add_dev_conf' id_exp %}";
37	{% endblock %}	20	if ($(this).val()=="2"){
		21	document.location = url+"?template=0";
		22	}else if ($(this).val()=="1"){
		23	document.location = url+"?blank=0";
		24	}else{
		25	document.location = url;
		26	}
		27	});
38		28
39	{% block extra-js%}	29	$('#id_choose_template').change(function() {
40	{% if id_exp %}
41	<script type="text/javascript">
42	$("#id_device").change(function() {
43	var url = "{% url 'url_add_dev_conf' id_exp %}";	30	var url = "{% url 'url_add_dev_conf' id_exp %}";
44	document.location = url+ $(this).val() + ~~"/"~~;	31	document.location = url+"?template="+$(this).val();
45	});	32	});
		33
46	</script>	34	</script>
		35
47	{% endif %}	36	{% endif %}
		37
48	{% endblock %} No newline at end of file	38	{% endblock %}

apps/main/templates/sidebar_devices.html +1 -1

             	{% if campaign %}
                 	<div class="panel panel-default">
                 	  <div class="panel-heading">
                 	    <h4>Campaign</h4>
                 	  </div>
                 	  <div class="list-group">
                 	  	<a href="{% url 'url_campaign' campaign.id %}" class="list-group-item active" >{{ campaign.name }}</a>
                 	  </div>
                 	</div>
             	{% endif %}
             	{% if experiment %}
             		<div class="panel panel-default">
             		  <div class="panel-heading">
             		    <h4>Experiments</h4>
             		  </div>
             		  <div class="list-group">
             		  {% for item in side_experiments %}
             		    <a href="{% url 'url_experiment' item.id %}" class="list-group-item {%if item.id == experiment.id%}active{%endif%}">{{item.name}}</a>
             		  {% endfor %}
             		  </div>
             		</div>
             	{% endif %}
             	{% if dev_conf %}
             		<div class="panel panel-default">
             		  <div class="panel-heading">
             		    <h4>Device Configurations</h4>
             		  </div>
             		  <div class="list-group">
             		  {% for item in side_configurations %}
-            		    <a href="{{item.get_absolute_url}}" class="list-group-item {%if item.id == dev_conf.id%}active{%endif%}">{{item.device.name}}</a>
+            		    <a href="{{item.get_absolute_url}}" class="list-group-item {%if item.id == dev_conf.id%}active{%endif%}">{{item}}</a>
             		  {% endfor %}
             		  </div>
             		</div>
             	{% endif %}

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