From 7b50e98b876196ce5404150d3a0c8cf0e2382f7e Mon Sep 17 00:00:00 2001
From: Leonidas Poulopoulos <leopoul@noc.grnet.gr>
Date: Tue, 20 Dec 2011 18:20:02 +0200
Subject: [PATCH] Changed application UI. Added ports section as accordion for
 advanced settings

---
 templates/apply.html |   27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/templates/apply.html b/templates/apply.html
index 6186b2a..9a67c5f 100644
--- a/templates/apply.html
+++ b/templates/apply.html
@@ -126,6 +126,15 @@
 				$('#port_diag').dialog('open');
 				return false;
 			});
+			
+		$("#portsacc").accordion({
+			collapsible: true,
+			active: false,
+
+		});
+		
+		$("#applybutton").button();
+
 		});
 		
 </script>
@@ -138,6 +147,10 @@ th {
 	vertical-align: top;
 }
 
+.accord_wrapper{
+	height: 100% !important;
+} 
+
 .help {
 	font-style: italic;
 
@@ -170,15 +183,23 @@ th {
 <input type="hidden" id="id_applier" name="applier" value="{{applier}}"/>
 <tr><th>{{ form.source.label_tag }}</th><td>{{ form.source }}<span class="error">{{ form.source.errors|join:", " }}</span></td></tr>
 <tr class="help"><td></td><td>{{ form.source.help_text }}</td></tr>
-<tr><th>{{ form.sourceport.label_tag }}</th><td>{{ form.sourceport }}&nbsp;&nbsp;<button class="new_port">Port</button><span class="error">{{ form.sourceport.errors|join:", " }}</span></td></tr>
-<tr class="help"><td></td><td>{{ form.sourceport.help_text }}</td></tr>
 <tr><th>{{ form.destination.label_tag }}</th><td>{{ form.destination }}<span class="error">{{ form.destination.errors|join:", " }}</span></td></tr>
 <tr class="help"><td></td><td>{{ form.destination.help_text }}</td></tr>
+</table>
+<div id='portsacc' style="width: 500px;">
+	<h3 style="padding: 0.5em 0.5em 0.5em 0.7em;">Advanced Settings (Ports)</h3>
+	<div class='accord_wrapper' style="height: 100% !important;">
+	Select source/destination port(s), or select common port(s) for both source/destination
+<table>
+<tr><th>{{ form.sourceport.label_tag }}</th><td>{{ form.sourceport }}&nbsp;&nbsp;<button class="new_port">Port</button><span class="error">{{ form.sourceport.errors|join:", " }}</span></td></tr>
+<tr class="help"><td></td><td>{{ form.sourceport.help_text }}</td></tr>
 <tr><th>{{ form.destinationport.label_tag }}</th><td>{{ form.destinationport }}&nbsp;&nbsp;<button class="new_port">Port</button><span class="error">{{ form.destinationport.errors|join:", " }}</span></td></tr>
 <tr class="help"><td></td><td>{{ form.destinationport.help_text }}</td></tr>
 <tr><th>{{ form.port.label_tag }}</th><td>{{ form.port }}&nbsp;&nbsp;<button class="new_port">Port</button><span class="error">{{ form.port.errors|join:", " }}</span></td></tr>
 <tr class="help"><td></td><td>{{ form.port.help_text }}</td></tr>
+</div>
 </table>
+</div>
 </fieldset>
 <fieldset>
 <legend>{% trans "Rule Actions" %}</legend>
@@ -202,7 +223,7 @@ th {
 </p>
 </fieldset>
 
-<p><input type="submit" value="{% trans "Apply" %}" /></p>
+<p><input type="submit" id="applybutton" value="{% trans "Apply" %}" /></p>
 </form>
 </div>
 
-- 
1.7.10.4