[svn-upgrade] Integrating new upstream version, strongswan (4.1.10)

7 files changed, 13 insertions, 3 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/initiate.png b/src/manager/templates/static/initiate.png
new file mode 100644
index 000000000..4463e3b7a
--- /dev/null
+++ b/src/manager/templates/static/initiate.png
diff --git a/src/manager/templates/static/pipe-thin-green.png b/src/manager/templates/static/pipe-thin-green.png
new file mode 100644
index 000000000..df3026ec5
--- /dev/null
+++ b/src/manager/templates/static/pipe-thin-green.png
diff --git a/src/manager/templates/static/pipe-thin-left-green.png b/src/manager/templates/static/pipe-thin-left-green.png
new file mode 100644
index 000000000..b76432a94
--- /dev/null
+++ b/src/manager/templates/static/pipe-thin-left-green.png
diff --git a/src/manager/templates/static/pipe-thin-right-green.png b/src/manager/templates/static/pipe-thin-right-green.png
new file mode 100644
index 000000000..f193af9cc
--- /dev/null
+++ b/src/manager/templates/static/pipe-thin-right-green.png
diff --git a/src/manager/templates/static/script.js b/src/manager/templates/static/script.js
index 7b2a5823c..c9105c372 100644
--- a/src/manager/templates/static/script.js
+++ b/src/manager/templates/static/script.js
@@ -1,8 +1,7 @@
 
 $(function(){
-  $(".expand > div").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").slideUp('fast');},
+    function(){$(this).parent(".expand").find(".expander").slideDown('fast');}
   );
 });
diff --git a/src/manager/templates/static/style.css b/src/manager/templates/static/style.css
index 8a7f4960d..9550b8291 100644
--- a/src/manager/templates/static/style.css
+++ b/src/manager/templates/static/style.css
@@ -57,6 +57,8 @@ a img {
     font-size: 1em;
     cursor: pointer;
     margin: 0;
+    float: left;
+    padding-top: 3px;
 }
 
 .expand h1 span {
@@ -64,6 +66,15 @@ a img {
 	margin-right: 2em;
 }
 
+.expander {
+	clear:left;
+}
+
+.controls {
+	margin-top: 3px;
+	text-align: right;
+}
+
 .center {
 	text-align: center;
 }