separeted addrule from show

vycontrol/firewall/templates/firewall/addrule.html

@@ -0,0 +1,59 @@
+{% extends "base.html" %}
+
+{% block header_title %}Firewall {{firewall_name}}{% endblock %}
+{% block section_title %}<a href="{% url 'firewall:show' firewall_name %}">Firewall {{firewall_name}}</a>{% endblock %}
+
+{% block debug %}
+{{ firewall }}
+{{ firewall_name }}
+{% endblock %}
+
+{% block content %}
+
+
+
+<h2>Create new rule</h2>
+
+<form action="{% url 'firewall:addrule' firewall_name %}" method="post">
+    {% csrf_token %}
+    
+    <p>
+        <label for="alias">rule number</label><br>
+        <input type="text" name="rulenumber" id="rulenumber" value="{{ rulenumber }}" size="5">
+    </p>
+    
+    <p>
+        <label for="hostname">action</label><br>
+        <input type="radio" name="action" id="action" value="accept"> accept
+        <input type="radio" name="action" id="action" value="drop"> drop
+        <input type="radio" name="action" id="action" value="reject"> reject        
+    </p>
+
+    <p>
+        <label for="hostname">protocol</label><br>
+        <input type="radio" name="protocol" id="protocol" value="tcp"> tcp
+        <input type="radio" name="protocol" id="protocol" value="udp"> udp
+    </p>   
+    
+    <p>
+        <label for="alias">destination port</label><br>
+        <input type="text" name="destinationport" id="destinationport" value="{{ destinationport }}" size="5">
+    </p>
+    
+    <p>
+        <label for="alias">source port</label><br>
+        <input type="text" name="sourceport" id="sourceport" value="{{ sourceport }}" size="5">
+    </p>    
+    
+    
+    <input type="submit" value="Add Rule">
+    </form>
+
+    
+    
+
+
+{% endblock %}
+
+
+

vycontrol/firewall/templates/firewall/show.html

@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 
 {% block header_title %}Firewall {{firewall_name}}{% endblock %}
-{% block section_title %}Firewall {{firewall_name}}{% endblock %}
+{% block section_title %}<a href="{% url 'firewall:show' firewall_name %}">Firewall {{firewall_name}}</a>{% endblock %}
 
 {% block debug %}
 {{ firewall }}
@@ -11,6 +11,11 @@
 {% block content %}
 
 
+<p class="margin-topbottom">
+    <a href="{% url 'firewall:addrule' firewall_name %}">Add new rule</a>
+</p>
+
+
 
 {% if firewall.rule %}
     <table border="1" width="100%">
@@ -37,44 +42,6 @@
 {% endif %}
 
 
-
-<h2>Create new rule</h2>
-
-<form action="{% url 'firewall:addrule' firewall_name %}" method="post">
-    {% csrf_token %}
-    
-    <p>
-        <label for="alias">rule number</label><br>
-        <input type="text" name="rulenumber" id="rulenumber" value="{{ rulenumber }}" size="5">
-    </p>
-    
-    <p>
-        <label for="hostname">action</label><br>
-        <input type="radio" name="action" id="action" value="accept"> accept
-        <input type="radio" name="action" id="action" value="drop"> drop
-        <input type="radio" name="action" id="action" value="reject"> reject        
-    </p>
-
-    <p>
-        <label for="hostname">protocol</label><br>
-        <input type="radio" name="protocol" id="protocol" value="tcp"> tcp
-        <input type="radio" name="protocol" id="protocol" value="udp"> udp
-    </p>   
-    
-    <p>
-        <label for="alias">destination port</label><br>
-        <input type="text" name="destinationport" id="destinationport" value="{{ destinationport }}" size="5">
-    </p>
-    
-    <p>
-        <label for="alias">source port</label><br>
-        <input type="text" name="sourceport" id="sourceport" value="{{ sourceport }}" size="5">
-    </p>    
-    
-    
-    <input type="submit" value="Add Rule">
-    </form>
-
     
 
 

vycontrol/firewall/views.py

@@ -113,7 +113,7 @@ def addrule(request, firewall_name):
         return redirect('firewall:show', firewall_name)
         
 
-    template = loader.get_template('firewall/show.html')
+    template = loader.get_template('firewall/addrule.html')
     context = { 
         #'interfaces': interfaces,
         'instances': all_instances,
@@ -226,6 +226,8 @@ def show(request, firewall_name):
 
 
 
+
+
 def firewall_remove(request, firewall_name):
     if not request.user.is_authenticated:
         return redirect('%s?next=%s' % (reverse('registration-login'), request.path))