diff options
Diffstat (limited to 'src/manager/templates')
| -rw-r--r-- | src/manager/templates/config/list.cs | 52 | ||||
| -rw-r--r-- | src/manager/templates/control/result.cs | 14 | ||||
| -rw-r--r-- | src/manager/templates/header.cs | 4 | ||||
| -rw-r--r-- | src/manager/templates/ikesa/list.cs (renamed from src/manager/templates/status/ikesalist.cs) | 0 | ||||
| -rw-r--r-- | src/manager/templates/static/script.js | 5 | ||||
| -rw-r--r-- | src/manager/templates/static/style.css | 1 |
6 files changed, 47 insertions, 29 deletions
diff --git a/src/manager/templates/config/list.cs b/src/manager/templates/config/list.cs index 1a5af0d7b..79fda64f6 100644 --- a/src/manager/templates/config/list.cs +++ b/src/manager/templates/config/list.cs @@ -1,39 +1,43 @@ <?cs include:"templates/header.cs" ?> <?cs each:peercfg = peercfgs ?> <div class="expand" id="peercfg-<?cs name:peercfg ?>"> - <h1><?cs name:peercfg ?></h1> + <h1><?cs name:peercfg ?>: + <span><?cs var:peercfg.local ?></span> <-> + <span><?cs var:peercfg.remote ?></span> + </h1> <div class="controls"> - <a title="initiate SA" href="<?cs var:base ?>/control/initiate/<?cs name:peercfg ?>"> + <a title="initiate SA" href="<?cs var:base ?>/control/initiateike/<?cs name:peercfg ?>"> <img src="<?cs var:base ?>/static/initiate.png"/> </a> </div> <div class="expander"> <hr/> - <?cs var:peercfg.local ?> - <?cs var:peercfg.remote ?> - <hr/> <?cs each:childcfg = peercfg.childcfgs ?> - helo + <div class="expand"> + <h1><?cs name:childcfg ?>:</h1> + <div class="controls"> + <a title="initiate SA" href="<?cs var:base ?>/control/initiatechild/<?cs name:childcfg ?>"> + <img src="<?cs var:base ?>/static/initiate.png"/> + </a> + </div> + <div class="expander"> <table> - <tr> - <td colspan="2"><?cs name:childcfg ?></td> - </tr> - <tr> - <td>Local</td> - <td>Remote</td> + <tr class="images"> + <td> + <?cs each:net = childcfg.local.networks ?> + <p><?cs var:net ?></p> + <?cs /each ?> + </td> + <td><-></td> + <td class="right"> + <?cs each:net = childcfg.remote.networks ?> + <p><?cs var:net ?></p> + <?cs /each ?> + </td> </tr> - <tr> - <td> - <?cs each:net = childcfg.local.networks ?> - <p><?cs var:net ?></p> - <?cs /each ?> - </td> - <td> - <?cs each:net = childcfg.remote.networks ?> - <p><?cs var:net ?></p> - <?cs /each ?> - </td> - </tr> - </table> + </table> + </div> + </div> <?cs /each ?> </div> </div> diff --git a/src/manager/templates/control/result.cs b/src/manager/templates/control/result.cs new file mode 100644 index 000000000..1d59df65f --- /dev/null +++ b/src/manager/templates/control/result.cs @@ -0,0 +1,14 @@ +<?cs include:"templates/header.cs" ?> +<div class="expand"> + <h1><?cs var:result ?></h1> + <div class="controls"> </div> + <div class="expander"> + <hr/> + <ul> + <?cs each:item = log ?> + <li><?cs var:item ?></li> + <?cs /each ?> + </ul> + </div> +</div> +<?cs include:"templates/footer.cs" ?> diff --git a/src/manager/templates/header.cs b/src/manager/templates/header.cs index 095b9f454..bacd833e0 100644 --- a/src/manager/templates/header.cs +++ b/src/manager/templates/header.cs @@ -9,14 +9,14 @@ </head> <body> <div class="fleft"> - <a href="<?cs var:base ?>/status/ikesalist"> + <a href="<?cs var:base ?>/ikesa/list"> <img class="fleft" src="<?cs var:base ?>/static/strongswan.png"/> </a> <h1>strongSwan Manager</h1> <h2><?cs var:title ?></h2> </div> <div class="menu"> - | <a href="<?cs var:base ?>/status/ikesalist">IKE SAs</a> + | <a href="<?cs var:base ?>/ikesa/list">IKE SAs</a> | <a href="<?cs var:base ?>/config/list">Config</a> | <a href="<?cs var:base ?>/gateway/list">Select Gateway</a> | <a href="<?cs var:base ?>/auth/logout">Logout</a> diff --git a/src/manager/templates/status/ikesalist.cs b/src/manager/templates/ikesa/list.cs index 15fe4070e..15fe4070e 100644 --- a/src/manager/templates/status/ikesalist.cs +++ b/src/manager/templates/ikesa/list.cs diff --git a/src/manager/templates/static/script.js b/src/manager/templates/static/script.js index ba6f62215..c9105c372 100644 --- a/src/manager/templates/static/script.js +++ b/src/manager/templates/static/script.js @@ -1,8 +1,7 @@ $(function(){ - $(".expander").hide(); $(".expand > h1").toggle( - function(){$(this).parent(".expand").find(".expander").slideDown('fast');}, - function(){$(this).parent(".expand").find(".expander").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 22c0805fa..9550b8291 100644 --- a/src/manager/templates/static/style.css +++ b/src/manager/templates/static/style.css @@ -58,6 +58,7 @@ a img { cursor: pointer; margin: 0; float: left; + padding-top: 3px; } .expand h1 span { |