From d06c66626f1d5e5eaaa1a833a44b1fe49b7f1f72 Mon Sep 17 00:00:00 2001
From: Andreas Granig <agranig@sipwise.com>
Date: Wed, 27 Feb 2013 16:24:13 +0100
Subject: [PATCH] Add close button to modal form.

---
 lib/NGCP/Panel/Controller/Reseller.pm | 2 +-
 lib/NGCP/Panel/Form/Reseller.pm       | 2 +-
 share/templates/reseller.tt           | 9 ++++++++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/lib/NGCP/Panel/Controller/Reseller.pm b/lib/NGCP/Panel/Controller/Reseller.pm
index 75270d8f6b..088644e34c 100644
--- a/lib/NGCP/Panel/Controller/Reseller.pm
+++ b/lib/NGCP/Panel/Controller/Reseller.pm
@@ -69,7 +69,7 @@ sub save : Path('/reseller/save') :Args(1) {
     );
     if($form->validated) {
         $c->log->debug(">>>>>> reseller data validated");
-        $c->response->redirect($c->uri_for('/reseller/base'));
+        $c->response->redirect($c->uri_for('/reseller'));
         # TODO: success message
     } else {
         $c->log->debug(">>>>>> reseller data NOT validated");
diff --git a/lib/NGCP/Panel/Form/Reseller.pm b/lib/NGCP/Panel/Form/Reseller.pm
index a85581b14f..736836b35d 100644
--- a/lib/NGCP/Panel/Form/Reseller.pm
+++ b/lib/NGCP/Panel/Form/Reseller.pm
@@ -28,7 +28,7 @@ has_field 'status' => (
 has_field 'save' => (
     type => 'Submit',
     value => 'Save',
-    element_class => [qw/btn btn-primary pull-right/],
+    element_class => [qw/btn btn-primary/],
     label => '',
 );
 
diff --git a/share/templates/reseller.tt b/share/templates/reseller.tt
index 8cd046c9b4..02696f8568 100644
--- a/share/templates/reseller.tt
+++ b/share/templates/reseller.tt
@@ -35,12 +35,19 @@
 
 [% IF edit.defined -%]
 <div id="mod_edit" class="modal hide" style="display:block">
-    <div class="modal-header"><h3>Edit Reseller</h3></div>
+    <div class="modal-header">
+        <button id="mod_close" type="button" class="close">×</button>
+        <h3>Edit Reseller</h3>
+    </div>
     [% form.render %]
 </div>
 <script>
     $(function () {
         $('#mod_edit').modal({keyboard: false, backdrop: 'static'});
+        $('#mod_close').click(function(event) {
+            window.location.href="[% c.uri_for('/reseller') %]";
+        });
+
     });
 </script>
 [% END -%]