From be7f894b8008b512ee0559b4bb552919fd93ea53 Mon Sep 17 00:00:00 2001
From: Serghey Rodin <serghey.rodin@gmail.com>
Date: Mon, 13 Oct 2014 16:16:37 +0300
Subject: [PATCH] added status string and aligned formating

---
 web/templates/admin/list_firewall.html | 138 ++++++++++++-------------
 1 file changed, 69 insertions(+), 69 deletions(-)

diff --git a/web/templates/admin/list_firewall.html b/web/templates/admin/list_firewall.html
index 90b20cabd..958ca62f6 100644
--- a/web/templates/admin/list_firewall.html
+++ b/web/templates/admin/list_firewall.html
@@ -31,76 +31,76 @@
         </div>
 
         <div id="vstobjects">
-                <table class="data">
-                    <?php
-                        foreach ($data as $key => $value) {
-                            ++$i;
-                            if ($data[$key]['SUSPENDED'] == 'yes') {
-                                $status = 'suspended';
-                                $spnd_action = 'unsuspend' ;
-                                $spnd_confirmation = 'UNSUSPEND_RULE_CONFIRMATION' ;
-                            } else {
-                                $status = 'active';
-                                $spnd_action = 'suspend' ;
-                                $spnd_confirmation = 'SUSPEND_RULE_CONFIRMATION' ;
-                            }
-                    ?> 
-                    <tr class="data-row <? if($status == 'suspended') echo 'suspended';?>">
-                        <td class="data-dotted">
-                            <table class="data-col1">
-                                <tr><td><input type="checkbox" class="ch-toggle" name="rule[]" value="<?php echo $data[$key]['RULE']?>" > </td></tr>
-                                <tr><td></td></tr>
-                            </table>
-                        </td>
-                        <td class="data-dotted">
-                            <a id="delete_link_<?php echo $i ?>" class="data-controls do_delete">
-                                <span class="do_delete">
-                                    <img src="/images/delete.png" width="7px" height="7px">
-                                    <?php print __('delete');?>
-                                    <input type="hidden" name="delete_url" value="/delete/firewall/?rule=<?php echo $data[$key]['RULE'] ?>"/>
-                                    <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print __('Confirmation');?>">
-                                        <p class="confirmation"><?php print __('DELETE_RULE_CONFIRMATION',$data[$key]['RULE']);?></p>
-                                    </div>
-                                </span>
-                            </a>
-                            <a id="<?php echo $spnd_action ?>_link_<?php echo $i ?>" class="data-controls do_<?php echo $spnd_action ?>">
-                                <span class="do_<?php echo $spnd_action ?>">
-                                    <img src="/images/suspend.png" width="7px" height="8px">
-                                    <?php echo __($spnd_action); ?> 
-                                    <input type="hidden" name="<?php echo $spnd_action ?>_url" value="/<?php echo $spnd_action ?>/firewall/?rule=<?php echo $data[$key]['RULE'] ?>" />
-                                    <div id="<?php echo $spnd_action ?>_dialog_<?php echo $i ?>" class="confirmation-text-suspention hidden" title="<?php print __('Confirmation');?>">
-                                        <p class="confirmation"><?php print __($spnd_confirmation,$key);?></p>
-                                    </div>
-                                </span>
-                            </a>
-                            <a href="/edit/firewall/?rule=<?php echo $key ?>" class="data-controls">
-                                <span>
-                                    <img src="/images/edit.png" width="8px" height="8px">
-                                    <?php print __('edit');?> 
-                                </span>
-                            </a>
-                            <table class="data-col5">
-                                <tr>
-                                    <td class="log" width="119px"><b><?php echo $data[$key]['ACTION'] ?></b></td>
-                                    <td class="log" width="119px"><?php echo $data[$key]['PROTOCOL']?> <?php if (!empty($data[$key]['COMMENT'])) echo '/ ' . $data[$key]['COMMENT'] ?></td>
-                                    <td class="log" width="232px"><?php echo $data[$key]['PORT'] ?></td>
-                                    <td class="log" ><?php echo $data[$key]['IP'] ?></td>
-                                </tr>
-                            </table>
-                        </td>
-                    </tr>
-                    <?php
-                        }
-                    ?> 
-                </table>
-            </form>
-            <div class="data-count">
+            <table class="data">
+                <?php
+                    foreach ($data as $key => $value) {
+                        ++$i;
+                        if ($data[$key]['SUSPENDED'] == 'yes') {
+                            $status = 'suspended';
+                            $spnd_action = 'unsuspend' ;
+                            $spnd_confirmation = 'UNSUSPEND_RULE_CONFIRMATION' ;
+                        } else {
+                            $status = 'active';
+                            $spnd_action = 'suspend' ;
+                            $spnd_confirmation = 'SUSPEND_RULE_CONFIRMATION' ;
+                        }
+                ?> 
+                <tr class="data-row <? if($status == 'suspended') echo 'suspended';?>">
+                    <td class="data-dotted">
+                        <table class="data-col1">
+                            <tr><td><input type="checkbox" class="ch-toggle" name="rule[]" value="<?php echo $key ?>" ></td></tr>
+                            <tr><td class="data-<?php echo $status ?>"><b><?php echo __($status) ?></b></td></tr>
+                        </table>
+                    </td>
+                    <td class="data-dotted">
+                        <a id="delete_link_<?php echo $i ?>" class="data-controls do_delete">
+                            <span class="do_delete">
+                                <img src="/images/delete.png" width="7px" height="7px">
+                                <?php print __('delete');?>
+                                <input type="hidden" name="delete_url" value="/delete/firewall/?rule=<?php echo $data[$key]['RULE'] ?>"/>
+                                <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print __('Confirmation');?>">
+                                    <p class="confirmation"><?php print __('DELETE_RULE_CONFIRMATION',$data[$key]['RULE']);?></p>
+                                </div>
+                            </span>
+                        </a>
+                        <a id="<?php echo $spnd_action ?>_link_<?php echo $i ?>" class="data-controls do_<?php echo $spnd_action ?>">
+                            <span class="do_<?php echo $spnd_action ?>">
+                                <img src="/images/suspend.png" width="7px" height="8px">
+                                <?php echo __($spnd_action); ?> 
+                                <input type="hidden" name="<?php echo $spnd_action ?>_url" value="/<?php echo $spnd_action ?>/firewall/?rule=<?php echo $data[$key]['RULE'] ?>" />
+                                <div id="<?php echo $spnd_action ?>_dialog_<?php echo $i ?>" class="confirmation-text-suspention hidden" title="<?php print __('Confirmation');?>">
+                                    <p class="confirmation"><?php print __($spnd_confirmation,$key);?></p>
+                                </div>
+                            </span>
+                        </a>
+                        <a href="/edit/firewall/?rule=<?php echo $key ?>" class="data-controls">
+                            <span>
+                                <img src="/images/edit.png" width="8px" height="8px">
+                                <?php print __('edit');?> 
+                            </span>
+                        </a>
+                        <table class="data-col2">
+                            <tr>
+                                <td class="log" style="padding: 16px 0 0 0 ;" width="119px"><b><?php echo $data[$key]['ACTION'] ?></b></td>
+                                <td class="log" style="padding: 16px 0 0 0 ;" width="119px"><?php echo $data[$key]['PROTOCOL']?> <?php if (!empty($data[$key]['COMMENT'])) echo '/ ' . $data[$key]['COMMENT'] ?></td>
+                                <td class="log" style="padding: 16px 0 0 0 ;" width="232px"><?php echo $data[$key]['PORT'] ?></td>
+                                <td class="log" style="padding: 16px 0 0 0 ;" ><?php echo $data[$key]['IP'] ?></td>
+                            </tr>
+                        </table>
+                    </td>
+                </tr>
                 <?php
-                    if ( $i == 1) {
-                        echo __('1 rule');
-                    } else {
-                        echo __('%s rules',$i);
                     }
                 ?> 
-            </div>
+            </table>
+        </form>
+        <div class="data-count">
+            <?php
+                if ( $i == 1) {
+                    echo __('1 rule');
+                } else {
+                    echo __('%s rules',$i);
+                }
+            ?> 
         </div>
+    </div>