feat(ux): improve 'Server Status' page

centreon · Nov 3, 2017 · c665bfc · c665bfc
1 parent 301124d
commit c665bfc
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 59 deletions.
diff --git a/www/include/options/db/viewDBInfos.ihtml b/www/include/options/db/viewDBInfos.ihtml
@@ -1,66 +1,64 @@
 <table width='100%'>
     <tr>
-        <td id='database_partitioning' width='60%' style='vertical-align:top;'>
-            <h2>{t}Database partitioning{/t}</h2>
-            <hr>
+        <td id='partitioning_properties' width='60%' style='vertical-align:top; padding-right:8px;'>
+            <table class="ListTable">
+                <tr class="ListHeader">
+                    <td class="FormHeader">{t}Partitioning Properties{/t}</td>
+                </tr>
+                <td>
+                    <div class="headerTabContainer">
+                        <ul id="mainnav">
+                            {assign var=val value=1}
+                            {foreach from=$partitioning key=table item=item}
+                            {if $val == 1}
+                            <li class="a" id='c{$val}'>
+                            {else}
+                            <li class="b" id='c{$val}'>
+                            {/if}
+                                <a href="#"  style='cursor:pointer' onclick="javascript:montre('{$val}');">{$table}</a>
+                            </li>
+                            {assign var=val value=$val+1}
+                            {/foreach}
+                        </ul>
+                    </div>
 
-            <div  class="headerTabContainer">
-                <ul id="mainnav">
                     {assign var=val value=1}
                     {foreach from=$partitioning key=table item=item}
-                    {if $val == 1}
-                    <li class="a" id='c{$val}'>
-                    {else}
-                    <li class="b" id='c{$val}'>
-                    {/if}
-                        <a href="#"  style='cursor:pointer' onclick="javascript:montre('{$val}');">{$table}</a>
-                    </li>
+                    <div id='tab{$val}' class='tab'>
+                        {if $item|@count gt 1}
+                        <table class="table">
+                            <tr class="list_lvl_1">
+                                <td class="ListColLvl1_name">{t}Partition name{/t}</td>
+                                <td class="ListColLvl1_name">{t}Creation time{/t}</td>
+                                <td class="ListColLvl1_name">{t}Number of entries{/t}</td>
+                                <td class="ListColLvl1_name">{t}Data size{/t}</td>
+                                <td class="ListColLvl1_name">{t}Index size{/t}</td>
+                                <td class="ListColLvl1_name">{t}Total size{/t}</td>
+                            </tr>
+                            {foreach from=$item item=partition}
+                                <tr class={cycle values="list_one, list_two"}>
+                                    <td class="FormRowField">{$partition.PARTITION_NAME}</td>
+                                    <td class="FormRowValue">{$partition.CREATE_TIME}</td>
+                                    <td class="FormRowValue">{$partition.TABLE_ROWS}</td>
+                                    <td class="FormRowValue">{$partition.DATA_LENGTH} {t}MB{/t}</td>
+                                    <td class="FormRowValue">{$partition.INDEX_LENGTH} {t}MB{/t}</td>
+                                    <td class="FormRowValue">{$partition.TOTAL_LENGTH} {t}MB{/t}</td>
+                                </tr>
+                            {/foreach}
+                        </table>
+                        {else}
+                        <H3>{t} Table is not partitioned {/t}</H3>
+                        {/if}
+                    </div>
                     {assign var=val value=$val+1}
                     {/foreach}
-                </ul>
-            </div>
-
-            {assign var=val value=1}
-            {foreach from=$partitioning key=table item=item}
-            <div id='tab{$val}' class='tab'>
-                {if $item|@count gt 1}
-                <table class="ListTable">
-                   <tr class="ListHeader">
-                       <td class="FormHeader" colspan="6">{t}Partitioning Properties{/t}</td>
-                   </tr>
-                   <tr class="list_lvl_1">
-                       <td class="ListColLvl1_name">{t}Partition name{/t}</td>
-                       <td class="ListColLvl1_name">{t}Creation time{/t}</td>
-                       <td class="ListColLvl1_name">{t}Number of entries{/t}</td>
-                       <td class="ListColLvl1_name">{t}Data size{/t}</td>
-                       <td class="ListColLvl1_name">{t}Index size{/t}</td>
-                       <td class="ListColLvl1_name">{t}Total size{/t}</td>
-                   </tr>
-                   {foreach from=$item item=partition}
-                   <tr class="list_one">
-                       <td class="FormRowField">{$partition.PARTITION_NAME}</td>
-                       <td class="FormRowValue">{$partition.CREATE_TIME}</td>
-                       <td class="FormRowValue">{$partition.TABLE_ROWS}</td>
-                       <td class="FormRowValue">{$partition.DATA_LENGTH} {t}MB{/t}</td>
-                       <td class="FormRowValue">{$partition.INDEX_LENGTH} {t}MB{/t}</td>
-                       <td class="FormRowValue">{$partition.TOTAL_LENGTH} {t}MB{/t}</td>
-                   </tr>
-                   {/foreach}
-                </table>
-                {else}
-                <H3>{t} Table is not partitioned {/t}</H3>
-                {/if}
-            </div>
-            {assign var=val value=$val+1}
-            {/foreach}
-
-        <td width='2%' style='vertical-align:top;'>&nbsp;</td>
-        <td id='database_informations' width='38%' style='vertical-align:top;'>
-            <h2>{t}Database Informations{/t}</h2>
-            <hr>
-            <table class="ListTable">
+                </td>
+            </table>
+        </td>
+        <td id='database_informations' width='40%' style='vertical-align:top;'>
+           <table class="ListTable">
                 <tr class="ListHeader">
-                    <td class="FormHeader" colspan="3">{t}Database Engine{/t}</td>
+                    <td class="FormHeader" colspan="2">{t}Database Engine{/t}</td>
                 </tr>
                 <tr class="list_one">
                     <td class="FormRowField">{t}Engine Name{/t}</td>
@@ -74,7 +72,7 @@
            <br>
            <table class="ListTable">
                <tr class="ListHeader">
-                   <td class="FormHeader" colspan="3">{t}Centreon DataBase Statistics{/t}</td>
+                   <td class="FormHeader" colspan="3">{t}Centreon Databases Statistics{/t}</td>
                </tr>
                <tr class="list_lvl_1">
                    <td class="ListColLvl1_name">&nbsp;</td>

diff --git a/www/include/options/db/viewDBInfos.php b/www/include/options/db/viewDBInfos.php
@@ -58,9 +58,7 @@
     'data_bin',
     'logs',
     'log_archive_host',
-    'log_archive_service',
-    'comments',
-    'downtimes'
+    'log_archive_service'
 );
 
 $partitioningInfos = array();