From 78ae9462c516dc74b480a8f8d2ef32e0e85673e8 2015-12-31 16:50:07
From: Miguel Urco <miguel.urco@jro.igp.gob.pe>
Date: 2015-12-31 16:50:07
Subject: [PATCH] Export and Send buttons added to templates

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

---

diff --git a/apps/main/templates/campaign.html b/apps/main/templates/campaign.html
index c793044..48a0cbf 100644
--- a/apps/main/templates/campaign.html
+++ b/apps/main/templates/campaign.html
@@ -12,49 +12,52 @@
 {% 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" id="bt_edit_campaign">Edit Campaign</button>
-<br></br>
-<br></br>
+	<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>  
-	  <button class="btn btn-primary pull-right" id="bt_add">{{button}}</button>
-      </div>
-    </div>
-  </div>
-</div>
+	<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>  
+		  <button class="btn btn-primary pull-right" id="bt_add">{{button}}</button>
+	      </div>
+	    </div>
+	  </div>
+	</div>
 {% endblock %}
 
 {% block sidebar%}
@@ -70,8 +73,8 @@
   $(".clickable-row").click(function() {
 	    document.location = $(this).data("href");
 	  });
-
-  $("#bt_edit_campaign").click(function() {
+  
+  $("#bt_edit").click(function() {
 	    document.location = "{% url 'url_edit_campaign' campaign.id%}";
 	  });
   
diff --git a/apps/main/templates/dev_conf.html b/apps/main/templates/dev_conf.html
index 60d2d0b..23f4ac1 100644
--- a/apps/main/templates/dev_conf.html
+++ b/apps/main/templates/dev_conf.html
@@ -14,7 +14,9 @@
 <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 %}
@@ -26,7 +28,7 @@
 {% 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%}";
   });
   
diff --git a/apps/main/templates/device.html b/apps/main/templates/device.html
index 79e6cc2..93c3dae 100644
--- a/apps/main/templates/device.html
+++ b/apps/main/templates/device.html
@@ -14,7 +14,7 @@
 <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 %}
diff --git a/apps/main/templates/experiment.html b/apps/main/templates/experiment.html
index d85f595..bc0d815 100644
--- a/apps/main/templates/experiment.html
+++ b/apps/main/templates/experiment.html
@@ -17,7 +17,8 @@
 <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>
 
@@ -65,13 +66,12 @@
 <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%}";
 	  });