diff options
| -rw-r--r-- | templates/elements/status_js.tpl | 9 | ||||
| -rw-r--r-- | templates/elements/status_nodeinfo.tpl | 12 | ||||
| -rw-r--r-- | templates/elements/status_options.tpl | 13 | ||||
| -rw-r--r-- | templates/status.tpl | 12 |
4 files changed, 26 insertions, 20 deletions
diff --git a/templates/elements/status_js.tpl b/templates/elements/status_js.tpl index f53be72..1bfbfb6 100644 --- a/templates/elements/status_js.tpl +++ b/templates/elements/status_js.tpl @@ -5,6 +5,7 @@ var refreshTimeLog = "{$refreshTimeLog|escape}"; var view = "{$viewPHP|escape}"; var msgStartPgpool = "{$message.msgStartPgpool|escape}"; var msgStopPgpool = "{$message.msgStopPgpool|escape}"; +var msgReloadPgpool = "{$message.msgReloadPgpool|escape}"; var msgRestartPgpool = "{$message.msgRestartPgpool|escape}"; var msgAddBackend = "{$message.msgAddBackend|escape}"; var msgAddBackendNg = "{$message.msgAddBackendNg|escape}"; @@ -184,7 +185,13 @@ function execRemoveBackend(node_num) function execute(action, confirm_text, node_num) { elements = document.getElementsByName(action + 'Form'); - if (elements.length != 1) { alert('Unknown error.'); return; } + if (elements.length != 1) { + elements = document.getElementsByName('commandForm'); + if (elements.length != 1) { + alerr('Unknown error'); + return; + } + } target_form = elements[0]; if (confirm_text == null || window.confirm(confirm_text)) { diff --git a/templates/elements/status_nodeinfo.tpl b/templates/elements/status_nodeinfo.tpl index 2161343..1d89169 100644 --- a/templates/elements/status_nodeinfo.tpl +++ b/templates/elements/status_nodeinfo.tpl @@ -160,15 +160,3 @@ every {$params.health_check_period} seconds / retry upto {$params.health_check_max_retries} counts </p> - - -{* ---------------------------------------------------------------------- *} -{* Command form to execute a command without any option *} -{* ---------------------------------------------------------------------- *} - -<div id="commandDiv"> -<form action="status.php" name="commandForm" method="post" /> - <input type="hidden" name="action" /> - <input type="hidden" name="nodeNumber" /> -</form> -</div> diff --git a/templates/elements/status_options.tpl b/templates/elements/status_options.tpl index 79e8446..3eade1d 100644 --- a/templates/elements/status_options.tpl +++ b/templates/elements/status_options.tpl @@ -6,9 +6,6 @@ <h3>{$message.strStartOption|escape}</h3> <form action="status.php" name="startPgpoolForm" method="post"> - <input type="hidden" name="action" value="startPgpool" /> - <input type="hidden" name="nodeNumber" value="" /> - <table> <thead><tr><th colspan="2">{$message.strStartOption|escape}</th></tr></thead> <tbody> @@ -21,6 +18,8 @@ </td> </tr></tfoot> </table> + <input type="hidden" name="action" value="startPgpool" /> + <input type="hidden" name="nodeNumber" value="" /> </form> {else} @@ -44,8 +43,6 @@ <h3>{$message.strStopOption|escape}</h3> <form action="status.php" name="stopPgpoolForm" method="post"> - <input type="hidden" name="action" value="stopPgpool" /> - <input type="hidden" name="nodeNumber" value="" /> <table> <thead><tr><th colspan="2">{$message.strStopOption|escape}</th></tr></thead> <tfoot><tr> @@ -60,6 +57,8 @@ {include file="elements/status_stop_option.tpl"} </tbody> </table> + <input type="hidden" name="action" value="stopPgpool" /> + <input type="hidden" name="nodeNumber" value="" /> </form> </div> @@ -70,8 +69,6 @@ <h3>{$message.strRestartOption|escape}</h3> <form action="status.php" name="restartPgpoolForm" method="post"> - <input type="hidden" name="action" value="restartPgpool" /> - <input type="hidden" name="nodeNumber" value="" /> <table> <thead><tr><th colspan="2">{$message.strRestartOption|escape}</th></tr></thead> <tfoot><tr> @@ -87,6 +84,8 @@ {include file="elements/status_start_option.tpl"} </tbody> </table> + <input type="hidden" name="action" value="restartPgpool" /> + <input type="hidden" name="nodeNumber" value="" /> </form> </div> diff --git a/templates/status.tpl b/templates/status.tpl index f4f4ebc..7c6c6ad 100644 --- a/templates/status.tpl +++ b/templates/status.tpl @@ -181,6 +181,18 @@ </h2> {include file="elements/status_options.tpl"} + {* ---------------------------------------------------------------------- *} + {* Command form to execute a command without any option *} + {* ---------------------------------------------------------------------- *} + + <div id="commandDiv"> + <form action="status.php" name="commandForm" method="post" /> + <input type="hidden" name="action" /> + <input type="hidden" name="nodeNumber" /> + </form> + </div> + + </div>{* end div#content *} <div id="footer"> |