4 files changed, 26 insertions, 6 deletions
diff --git a/src/manager/templates/static/close.png b/src/manager/templates/static/close.png
new file mode 100644
index 000000000..7cb058d69
--- /dev/null
+++ b/src/manager/templates/static/close.png
diff --git a/src/manager/templates/static/script.js b/src/manager/templates/static/script.js
index 7b2a5823c..ba6f62215 100644
--- a/src/manager/templates/static/script.js
+++ b/src/manager/templates/static/script.js
@@ -1,8 +1,8 @@
 
 $(function(){
-  $(".expand > div").hide();
+  $(".expander").hide();
   $(".expand > h1").toggle(
-    function(){$(this).parent(".expand").find("div").slideDown('fast');},
-    function(){$(this).parent(".expand").find("div").slideUp('fast');}
+    function(){$(this).parent(".expand").find(".expander").slideDown('fast');},
+    function(){$(this).parent(".expand").find(".expander").slideUp('fast');}
   );
 });
diff --git a/src/manager/templates/static/style.css b/src/manager/templates/static/style.css
index 8a7f4960d..22c0805fa 100644
--- a/src/manager/templates/static/style.css
+++ b/src/manager/templates/static/style.css
@@ -57,6 +57,7 @@ a img {
     font-size: 1em;
     cursor: pointer;
     margin: 0;
+    float: left;
 }
 
 .expand h1 span {
@@ -64,6 +65,15 @@ a img {
 	margin-right: 2em;
 }
 
+.expander {
+	clear:left;
+}
+
+.controls {
+	margin-top: 3px;
+	text-align: right;
+}
+
 .center {
 	text-align: center;
 }
diff --git a/src/manager/templates/status/ikesalist.cs b/src/manager/templates/status/ikesalist.cs
index 2238aafd3..15fe4070e 100644
--- a/src/manager/templates/status/ikesalist.cs
+++ b/src/manager/templates/status/ikesalist.cs
@@ -5,8 +5,13 @@
   	IKE #<?cs name:ikesa ?> [<?cs var:ikesa.peerconfig ?>]:
   	<span><?cs var:ikesa.local.identification ?></span> &lt;-&gt; 
   	<span><?cs var:ikesa.remote.identification ?></span>
-  </h1> 
-  <div>
+  </h1>
+  <div class="controls">
+    <a title="close IKE_SA" href="<?cs var:base ?>/control/terminateike/<?cs name:ikesa ?>">
+      <img src="<?cs var:base ?>/static/close.png"/>
+    </a>
+  </div>
+  <div class="expander">
     <hr/>
     <table class="drawing">
       <tr>
@@ -66,9 +71,14 @@
       </tr>
       <?cs each:childsa = ikesa.childsas ?>
       <tr>
-      	<td colspan="7" class="expand">
+      	<td colspan="6" class="expand">
       	  <h1>IPsec #<?cs name:childsa ?> [<?cs var:childsa.childconfig ?>]:</h1>
         </td>
+      	<td class="controls">
+  		  <a title="close CHILD_SA" href="<?cs var:base ?>/control/terminatechild/<?cs name:childsa ?>">  
+            <img src="<?cs var:base ?>/static/close.png"/>
+          </a>
+        </td>
       </tr>
       <tr>
         <td colspan="7"><hr/></td>