From 4a4c983c01cbb97cb9d86dfce5fd7d410df6686e Mon Sep 17 00:00:00 2001
From: jakedahn <jake@ansolabs.com>
Date: Wed, 14 Dec 2011 13:11:51 -0800
Subject: [PATCH] Fixing the edit security group rules form

bug 898862

Change-Id: I8273dee3d49d655073a7a0818150b1ba960bcca4
---
 .../security_groups/_edit_rules.html          | 94 ++++++++++---------
 .../dashboard/static/dashboard/css/style.css  | 12 +--
 2 files changed, 54 insertions(+), 52 deletions(-)

diff --git a/horizon/horizon/dashboards/nova/templates/nova/access_and_security/security_groups/_edit_rules.html b/horizon/horizon/dashboards/nova/templates/nova/access_and_security/security_groups/_edit_rules.html
index 7b16ed9896..1dda0049eb 100644
--- a/horizon/horizon/dashboards/nova/templates/nova/access_and_security/security_groups/_edit_rules.html
+++ b/horizon/horizon/dashboards/nova/templates/nova/access_and_security/security_groups/_edit_rules.html
@@ -1,53 +1,55 @@
-{% extends "horizon/common/_modal_form.html" %}
 {% load i18n %}
 
-{% block form_id %}security_group_rule_form{% endblock %}
-{% block form_action %}{% url horizon:nova:access_and_security:security_groups:edit_rules security_group.id %}{% endblock %}
 
-{% block modal_id %}security_group_rule_modal{% endblock %}
-{% block modal-header %}Edit Security Group Rules{% endblock %}
-
-{% block modal-body %}
-<div class="left">
-    <fieldset>
-    <h3>{% trans "Add a rule"%}</h3>
-    {% include "horizon/common/_form_fields.html" %}
-    </fieldset>
+<div id="security_group_rule_modal" class="{% block modal_class %}modal{% if hide %} hide {% else %} static_page{% endif %}{% endblock %}">
+    <div class="modal-header">
+      {% if hide %}<a href="#" class="close">&times;</a>{% endif %}
+      <h3>Edit Security Group Rules</h3>
+    </div>
+    <div class="modal-body clearfix">
+      <div class="right">
+          <h3> {% trans "Rules for Security Group" %} '{{security_group.name}}'</h3>
+          <table id="security_groups" class="zebra-striped">
+            <tr>
+              <th>{% trans "IP Protocol" %}</th>
+              <th>{% trans "From Port" %}</th>
+              <th>{% trans "To Port" %}</th>
+              <th>{% trans "CIDR" %}</th>
+              <th>{% trans "Actions" %}</th>
+            </tr>
+            {% for rule in security_group.rules %}
+              <tr class="{% cycle 'odd' 'even' %}">
+                <td>{{ rule.ip_protocol }}</td>
+                <td>{{ rule.from_port }}</td>
+                <td>{{ rule.to_port }}</td>
+                <td>{{ rule.ip_range.cidr }}</td>
+                <td id="actions">
+                  <ul>
+                    <li class="form">{% include "nova/access_and_security/security_groups/_delete_rule.html" with form=delete_form %}</li>
+                  </ul>
+                </td>
+              </tr>
+            {% empty %}
+            <tr>
+              <td colspan="100%">
+                {% trans "No rules for this security group" %}
+              </td>
+            </tr>
+            {% endfor %}
+          </table>
+      </div>
+      <form id="edit_security_group_rule_form" action="{% url horizon:nova:access_and_security:security_groups:edit_rules security_group.id %}" method="post">
+        {% csrf_token %}
+        <fieldset>
+        {% include "horizon/common/_form_fields.html" %}
+        </fieldset>
+    </div>
+    <div class="modal-footer">
+      <input class="btn primary pull-right" type="submit" value="{% trans "Add Rule" %}" />
+      <a href="{% url horizon:nova:access_and_security:index %}" class="btn secondary cancel close">Cancel</a>
+    </div>
+  </form>
 </div>
-<div class="right">
-    <h3> {% trans "Rules for Security Group"%} '{{security_group.name}}'</h3>
-    <table id="security_groups" class="zebra-striped">
-      <tr>
-        <th>{% trans "IP Protocol"%}</th>
-        <th>{% trans "From Port"%}</th>
-        <th>{% trans "To Port"%}</th>
-        <th>{% trans "CIDR"%}</th>
-        <th>{% trans "Actions"%}</th>
-      </tr>
-      {% for rule in security_group.rules %}
-        <tr class="{% cycle 'odd' 'even' %}">
-          <td>{{ rule.ip_protocol }}</td>
-          <td>{{ rule.from_port }}</td>
-          <td>{{ rule.to_port }}</td>
-          <td>{{rule.ip_range.cidr}}</td>
-          <td id="actions">
-            <ul>
-              <li class="form">{% include "nova/access_and_security/security_groups/_delete_rule.html" with form=delete_form %}</li>
-            </ul>
-          </td>
-        </tr>
-      {% empty %}
-      <tr>
-        <td colspan="100%">
-          {% trans "No rules for this security group"%}
-        </td>
-      </tr>
-      {% endfor %}
-    </table>
-</div>
-{% endblock %}
 
 {% block modal-footer %}
-    <input class="btn primary pull-right" type="submit" value="{%trans "Add Rule"%}" />
-    <a href="{% url horizon:nova:access_and_security:index %}" class="btn secondary cancel close">Cancel</a>
 {% endblock %}
diff --git a/openstack-dashboard/dashboard/static/dashboard/css/style.css b/openstack-dashboard/dashboard/static/dashboard/css/style.css
index bfa5f96cdc..5fdd2e2921 100644
--- a/openstack-dashboard/dashboard/static/dashboard/css/style.css
+++ b/openstack-dashboard/dashboard/static/dashboard/css/style.css
@@ -643,12 +643,11 @@ table form {
   margin-bottom: 115px;
 }
 
-
-#security_group_rule_modal .left input, #security_group_rule_modal .left select, #security_group_rule_modal .left {
-  width: 150px;
+#edit_security_group_rule_form {
+    float: right;
+    width: 163px;
 }
-
-#security_group_rule_modal .left fieldset {
+#edit_security_group_rule_form fieldset {
     width: 163px;
 }
 
@@ -658,12 +657,13 @@ table form {
 
 #security_group_rule_modal .right {
     width: 475px;
+    float: right;
+    margin-left: 25px;
 }
 
 #security_group_rule_modal .right table {
     margin-top: 31px;
 }
-
 table tr.odd.good td { border: 1px solid #92fd75; }
 table tr.even.good td { border: 1px solid #88f06d; }
 table tr.odd.bad td { border: 1px solid #ffb7b8; }