From 20d653ecdaf86bf44a130be9db323a2c4bab6da1 Mon Sep 17 00:00:00 2001
From: Nozomi Anzai <anzai@sraoss.co.jp>
Date: Fri, 20 Jul 2012 11:23:17 +0900
Subject: [PATCH] Sort each options in the same order.

---
 templates/config.tpl | 26 +++++++++++++++-----------
 templates/status.tpl |  4 ++--
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/templates/config.tpl b/templates/config.tpl
index ea58efd..4606726 100644
--- a/templates/config.tpl
+++ b/templates/config.tpl
@@ -92,6 +92,8 @@
           <br />{$errors.pgpool_command|escape}
           {/if}
           </td></tr>
+
+        {if hasMemqCache() == false}
         <tr>
           <th colspan="2"><label>{$message.strPgpoolCommandOption|escape}</label>
             (string)</th></tr>
@@ -106,6 +108,8 @@
           <br />{$errors.c|escape}
           {/if}
           </td></tr>
+        {/if}
+
         <tr><td>{$message.strCmdLargeD|escape}(-D)</td>
           <td>
           {if $params.D == 1}
@@ -128,6 +132,17 @@
           <br />{$errors.n|escape}
           {/if}
           </td></tr>
+        <tr><td>{$message.strCmdLargeC|escape}(-C)</td>
+          <td>
+          {if $params.C == 1}
+          <input type="checkbox" name="C" checked="checked" />
+          {else}
+          <input type="checkbox" name="C" />
+          {/if}
+          {if isset($errors.C)}
+          <br />{$errors.n|escape}
+          {/if}
+          </td></tr>
         <tr><td>{$message.strCmdD|escape}(-d)</td>
           <td>
           {if $params.d == 1}
@@ -139,17 +154,6 @@
           <br />{$errors.d|escape}
           {/if}
           </td></tr>
-        <tr><td>{$message.strCmdLargeC|escape}(-C)</td>
-          <td>
-          {if $params.C == 1}
-          <input type="checkbox" name="C" checked="checked" />
-          {else}
-          <input type="checkbox" name="C" />
-          {/if}
-          {if isset($errors.n)}
-          <br />{$errors.n|escape}
-          {/if}
-          </td></tr>
         <tr><td>{$message.strCmdM|escape}(-m)</td><td><select name="m">
           {if $params.m == 's'}
                <option value="s" selected="selected">smart</option>
diff --git a/templates/status.tpl b/templates/status.tpl
index d9d4c5b..1cd7bbe 100644
--- a/templates/status.tpl
+++ b/templates/status.tpl
@@ -258,7 +258,7 @@ function changeView(chView){
         {/if}
 
         <tr><td>{$message.strCmdLargeD|escape} (-D)</td>
-          {if $n == 1}
+          {if $D == 1}
           <td><input type="checkbox" name="D" checked="checked" /></td>
           {else}
           <td><input type="checkbox" name="D" /></td>
@@ -378,7 +378,7 @@ function changeView(chView){
         {/if}
 
         <tr><td>{$message.strCmdLargeD|escape}(-D)</td>
-          {if $n == 1}
+          {if $D == 1}
           <td><input type="checkbox" name="D" checked="checked" /></td>
           {else}
           <td><input type="checkbox" name="D" /></td>
-- 
2.39.5