radarsys Commit - r15:78ae9462c516 · Jicamarca Repository

Export and Send buttons added to templates...

Miguel Urco -

r15:78ae9462c516

parent child

Context file:

r15:78ae9462c516

Collapse all files

apps/main/templates/campaign.html +47 -44

@@ -12,49 +12,52
12	{% block content-suptitle %}{{suptitle}}{% endblock %}	12	{% block content-suptitle %}{{suptitle}}{% endblock %}
13		13
14	{% block content %}	14	{% block content %}
15	<table class="table table-bordered">	15	<table class="table table-bordered">
16	{% for key in campaign_keys %}	16	{% for key in campaign_keys %}
17	<tr><th>{{key\|title}}</th><td>{{campaign\|attr:key}}</td></tr>	17	<tr><th>{{key\|title}}</th><td>{{campaign\|attr:key}}</td></tr>
18	{% endfor %}	18	{% endfor %}
19	</table>	19	</table>
20	<button class="btn btn-primary pull-right" id="bt_edit_campaign">Edit Campaign</button>	20
21	<br></br>	21	<button class="btn btn-primary pull-right" style="margin-left: 10px" id="bt_export">Export</button>
22	<br></br>	22	<button class="btn btn-primary pull-right" style="margin-left: 10px" id="bt_edit">Edit</button>
		23
		24	<br></br>
		25	<br></br>
23		26
24	<div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">	27	<div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">
25		28
26	<div class="panel panel-default">	29	<div class="panel panel-default">
27	<div class="panel-heading" role="tab" id="headingTwo">	30	<div class="panel-heading" role="tab" id="headingTwo">
28	<h4 class="panel-title">	31	<h4 class="panel-title">
29	<a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseTwo" aria-expanded="false" aria-controls="collapseTwo">	32	<a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseTwo" aria-expanded="false" aria-controls="collapseTwo">
30	Experiment List	33	Experiment List
31	</a>	34	</a>
32	</h4>	35	</h4>
33	</div>	36	</div>
34		37
35	<div id="collapseTwo" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="headingTwo">	38	<div id="collapseTwo" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="headingTwo">
36	<div class="panel-body">	39	<div class="panel-body">
37	<table class="table table-hover">	40	<table class="table table-hover">
38	<tr>	41	<tr>
39	<th>#</th>	42	<th>#</th>
40	{% for header in experiment_keys %}	43	{% for header in experiment_keys %}
41	<th>{{ header\|title }}</th>	44	<th>{{ header\|title }}</th>
42	{% endfor%}	45	{% endfor%}
43	</tr>	46	</tr>
44	{% for item in experiments %}	47	{% for item in experiments %}
45	<tr class="clickable-row" data-href="{% url 'url_experiment' item.id %}">	48	<tr class="clickable-row" data-href="{% url 'url_experiment' item.id %}">
46	<td>{{ forloop.counter }}</td>	49	<td>{{ forloop.counter }}</td>
47	{% for key in experiment_keys %}	50	{% for key in experiment_keys %}
48	<td>{{ item\|attr:key }}</td>	51	<td>{{ item\|attr:key }}</td>
49	{% endfor %}	52	{% endfor %}
50	</tr>	53	</tr>
51	{% endfor %}	54	{% endfor %}
52	</table>	55	</table>
53	<button class="btn btn-primary pull-right" id="bt_add">{{button}}</button>	56	<button class="btn btn-primary pull-right" id="bt_add">{{button}}</button>
54	</div>	57	</div>
55	</div>	58	</div>
56	</div>	59	</div>
57	</div>	60	</div>
58	{% endblock %}	61	{% endblock %}
59		62
60	{% block sidebar%}	63	{% block sidebar%}
@@ -70,8 +73,8
70	$(".clickable-row").click(function() {	73	$(".clickable-row").click(function() {
71	document.location = $(this).data("href");	74	document.location = $(this).data("href");
72	});	75	});
73		76
74	$("#bt_edit~~_campaign~~").click(function() {	77	$("#bt_edit").click(function() {
75	document.location = "{% url 'url_edit_campaign' campaign.id%}";	78	document.location = "{% url 'url_edit_campaign' campaign.id%}";
76	});	79	});
77		80

apps/main/templates/dev_conf.html +4 -2

             <tr><th>{{key|title}}</th><td>{{dev_conf|attr:key}}</td></tr>
             {% endfor %}
             </table>
-            <button class="btn btn-primary pull-right" id="bt_edit_device">Edit Device Conf</button>
+            <button class="btn btn-primary pull-right" style="margin-left: 10px" id="bt_send">Send</button>
+            <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>
             {% endblock %}
             {% block extra-js%}
             <script type="text/javascript">
-              $("#bt_edit_device").click(function() {
+              $("#bt_edit").click(function() {
                 document.location = "{% url 'url_edit_dev_conf' dev_conf.id%}";
               });

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

             <tr><th>{{key|title}}</th><td>{{device|attr:key}}</td></tr>
             {% endfor %}
             </table>
-            <button class="btn btn-primary pull-right" id="bt_edit_device">Edit Device</button>
+            <button class="btn btn-primary pull-right" style="margin-left: 10px" id="bt_edit_device">Edit</button>
             <br></br>
             <br></br>
             {% endblock %}

apps/main/templates/experiment.html +3 -3

             <tr><th>{{key|title}}</th><td>{{experiment|attr:key}}</td></tr>
             {% endfor %}
             </table>
-            <button class="btn btn-primary pull-right" id="bt_edit_experiment">Edit Experiment</button>
+            <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>
             <script src="{% static 'js/moment.min.js' %}"></script>
             <script src="{% static 'js/bootstrap-datetimepicker.min.js' %}"></script>
             <script type="text/javascript">
-              $('.input-group.date').datetimepicker({"format": "YYYY-MM-DD HH:mm"});
               $(".clickable-row").click(function() {
                 document.location = $(this).data("href");
               });
-              $("#bt_edit_experiment").click(function() {
+              $("#bt_edit").click(function() {
             	    document.location = "{% url 'url_edit_experiment' experiment.id%}";
             	  });

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