radarsys_met Commit - r140:517881d35474

Task #99: Filters (new filter)...

Fiorella Quino -

r140:517881d35474

parent child

Context file:

r140:517881d35474

Collapse all files

apps/jars/templates/jars_new_filter.html created 644 +8 0

@@ -0,0 +1,8
	1	{% extends "dev_conf_edit.html" %}
	2	{% load bootstrap3 %}
	3	{% load static %}
	4	{% load main_tags %}
	5
	6	{% block extra-js%}
	7	<script src="{% static 'js/filters.js' %}"></script>
	8	{% endblock %} No newline at end of file

apps/jars/templates/jars_conf_edit.html +6 -1

             {% extends "dev_conf_edit.html" %}
             {% load bootstrap3 %}
             {% load static %}
             {% load main_tags %}
             {% block content %}
             <form class="form" method="post">
               {% csrf_token %}
               {% bootstrap_form form layout='horizontal' size='medium' %}
               <div style="clear: both;"></div>
               <br>
               <div class="pull-right">
               <button type="button" class="btn btn-primary" id="bt_view_filter">View Filter</button>
-              <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 %}">Cancel</button>  -->
+              <button type="button" class="btn btn-primary" id="bt_cancel">Cancel</button>
               <button type="submit" class="btn btn-primary">{{button}}</button>
               </div>
             </form>
             {% endblock %}
             {% block extra-js%}
             <script src="{% static 'js/jars.js' %}"></script>
             <script type="text/javascript">
             $("#bt_view_filter").click(function() {
                 document.location = "{% url 'url_jars_filter' id_dev filter_id%}";
               });
+            $("#bt_cancel").click(function() {
+                document.location = "{% url 'url_jars_conf' id_dev %}";
+              });
             </script>
             {% endblock %}

apps/jars/templates/jars_filter.html +5 -1

             {% 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 %}
             {% endblock %}
             <table class="table table-bordered">
             	{% 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>
             {% if button %}
               <div class="pull-right">
               <button type="button" class="btn btn-primary" id="back_button">{% if cancel %}{{cancel}}{% else %}Back{% endif %}</button>
               <button type="button" id="edit_button" class="btn btn-primary">{{edit_button}}</button>
-              <button type="button" id="add_button" class="btn btn-primary">{{add_button}}</button>
+              <button type="button" id="new_button" class="btn btn-primary">{{add_button}}</button>
               </div>
             {% endif %}
             {% block extra-content %}
             {% endblock %}
             {% endblock %}
             {% block sidebar%}
             {% include "sidebar_devices.html" %}
             {% endblock %}
             {% block extra-js%}
             <script type="text/javascript">
               $("#edit_button").click(function() {
                 document.location = "{% url 'url_edit_jars_filter' conf.id filter.id%}";
               });
               $("#back_button").click(function() {
             	    document.location = "{% url 'url_edit_jars_conf' conf.id%}";
               });
+              $("#new_button").click(function() {
+            	    document.location = "{% url 'url_new_jars_filter' conf.id%}";
+              });
             </script>
             {% endblock %}

apps/jars/templates/jars_filter_edit.html +4 0

             {% extends "dev_conf_edit.html" %}
             {% load bootstrap3 %}
             {% load static %}
             {% load main_tags %}
             {% block content %}
             <form class="form" method="post">
               {% csrf_token %}
               {% bootstrap_form form layout='horizontal' size='medium' %}
               <div style="clear: both;"></div>
               <br>
               <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="submit" class="btn btn-primary">{{button}}</button>
               </div>
             </form>
+            {% endblock %}
+            {% block extra-js%}
+            <script src="{% static 'js/filters.js' %}"></script>
             {% 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