From 008c864751b6cd5461acac39868eb135b79f0403 Mon Sep 17 00:00:00 2001
From: IgorA100 <igora100@gmail.com>
Date: Wed, 6 Mar 2024 19:56:10 +0300
Subject: [PATCH] Fix style

---
 web/skins/classic/views/options.php | 100 ++++++++++++++++------------
 1 file changed, 59 insertions(+), 41 deletions(-)

diff --git a/web/skins/classic/views/options.php b/web/skins/classic/views/options.php
index 12c126797..4c472982b 100644
--- a/web/skins/classic/views/options.php
+++ b/web/skins/classic/views/options.php
@@ -72,13 +72,20 @@ foreach ($tabs as $name=>$value) {
 ?>
         </ul>
       </nav>
-      <div id="optionsContainer" class="container-fluid col-sm-offset-2">
+      <div id="optionsContainer" class="col">
 <?php 
 if ($tab == 'skins') {
 ?>
           <form name="optionsForm" method="get" action="?">
             <input type="hidden" name="view" value="<?php echo $view ?>"/>
             <input type="hidden" name="tab" value="<?php echo $tab ?>"/>
+            <div class="row">
+              <div class="col">
+                <div id="contentButtons">
+                  <button value="Save" type="submit"><?php echo translate('Save') ?></button>
+                </div>
+              </div>
+            </div>
             <div class="form-group row">
               <label for="skin" class="col-sm-3 col-form-label"><?php echo translate('Skin')?></label>
               <div class="col-sm-6">
@@ -107,9 +114,6 @@ foreach (array_map('basename', glob('skins/'.$skin.'/css/*', GLOB_ONLYDIR)) as $
                 <span class="form-text"><?php echo translate('CSSDescription'); ?></span>
               </div>
             </div>
-            <div id="contentButtons">
-              <button value="Save" type="submit"><?php echo translate('Save') ?></button>
-            </div>
           </form>
 <?php
 } else if ($tab == 'control') {
@@ -145,21 +149,24 @@ foreach (array_map('basename', glob('skins/'.$skin.'/css/*', GLOB_ONLYDIR)) as $
             <input type="hidden" name="tab" value="<?php echo $tab ?>"/>
             <input type="hidden" name="action" value="delete"/>
             <input type="hidden" name="object" value="storage"/>
-            <table id="contentTable" class="table table-striped">
-              <thead class="thead-highlight">
-                <tr>
-                  <th class="colId"><?php echo translate('Id') ?></th>
-                  <th class="colName"><?php echo translate('Name') ?></th>
-                  <th class="colPath"><?php echo translate('Path') ?></th>
-                  <th class="colType"><?php echo translate('Type') ?></th>
-                  <th class="colScheme"><?php echo translate('StorageScheme') ?></th>
-                  <th class="colServer"><?php echo translate('Server') ?></th>
-                  <th class="colDiskSpace"><?php echo translate('DiskSpace') ?></th>
-                  <th class="colEvents"><?php echo translate('Events') ?></th>
-                  <th class="colMark"><?php echo translate('Mark') ?></th>
-                </tr>
-              </thead>
-              <tbody>
+            <div class="col px-0">
+              <div class="row">
+                <div class="col overflow-auto">
+                  <table id="contentTable" class="table table-striped">
+                    <thead class="thead-highlight">
+                      <tr>
+                        <th class="colId"><?php echo translate('Id') ?></th>
+                        <th class="colName"><?php echo translate('Name') ?></th>
+                        <th class="colPath"><?php echo translate('Path') ?></th>
+                        <th class="colType"><?php echo translate('Type') ?></th>
+                        <th class="colScheme"><?php echo translate('StorageScheme') ?></th>
+                        <th class="colServer"><?php echo translate('Server') ?></th>
+                        <th class="colDiskSpace"><?php echo translate('DiskSpace') ?></th>
+                       <th class="colEvents"><?php echo translate('Events') ?></th>
+                        <th class="colMark"><?php echo translate('Mark') ?></th>
+                      </tr>
+                    </thead>
+                    <tbody>
 <?php
   foreach (ZM\Storage::find(null, array('order'=>'lower(Name)')) as $Storage) { 
     $filter = new ZM\Filter();
@@ -170,35 +177,42 @@ foreach (array_map('basename', glob('skins/'.$skin.'/css/*', GLOB_ONLYDIR)) as $
 
     $str_opt = 'class="storageCol" data-sid="'.$Storage->Id().'"';
   ?>
-                <tr>
-                  <td class="colId"><?php echo makeLink('#', validHtmlStr($Storage->Id()), $canEdit, $str_opt) ?></td>
-                  <td class="colName"><?php echo makeLink('#', validHtmlStr($Storage->Name()), $canEdit, $str_opt) ?></td>
-                  <td class="colPath"><?php echo makeLink('#', validHtmlStr($Storage->Path()), $canEdit, $str_opt) ?></td>
-                  <td class="colType"><?php echo makeLink('#', validHtmlStr($Storage->Type()), $canEdit, $str_opt) ?></td>
-                  <td class="colScheme"><?php echo makeLink('#', validHtmlStr($Storage->Scheme()), $canEdit, $str_opt) ?></td>
-                  <td class="colServer"><?php echo makeLink('#', validHtmlStr($Storage->Server()->Name()), $canEdit, $str_opt) ?></td>
-                  <td class="colDiskSpace"><?php
+                      <tr>
+                        <td class="colId"><?php echo makeLink('#', validHtmlStr($Storage->Id()), $canEdit, $str_opt) ?></td>
+                        <td class="colName"><?php echo makeLink('#', validHtmlStr($Storage->Name()), $canEdit, $str_opt) ?></td>
+                        <td class="colPath"><?php echo makeLink('#', validHtmlStr($Storage->Path()), $canEdit, $str_opt) ?></td>
+                        <td class="colType"><?php echo makeLink('#', validHtmlStr($Storage->Type()), $canEdit, $str_opt) ?></td>
+                        <td class="colScheme"><?php echo makeLink('#', validHtmlStr($Storage->Scheme()), $canEdit, $str_opt) ?></td>
+                        <td class="colServer"><?php echo makeLink('#', validHtmlStr($Storage->Server()->Name()), $canEdit, $str_opt) ?></td>
+                        <td class="colDiskSpace"><?php
     if ($Storage->disk_total_space()) {
       echo intval(100*$Storage->disk_used_space()/$Storage->disk_total_space()).'% ';
     }
     echo human_filesize($Storage->disk_used_space()) . ' of ' . human_filesize($Storage->disk_total_space()) ?></td>
-                  <td class="ColEvents"><?php echo makeLink('?view=events'.$filter->querystring(), $Storage->EventCount().' using '.human_filesize($Storage->event_disk_space() ? $Storage->event_disk_space() : 0) ); ?></td>
-                  <td class="colMark"><input type="checkbox" name="markIds[]" value="<?php echo $Storage->Id() ?>" data-on-click-this="configureDeleteButton"
+                        <td class="ColEvents"><?php echo makeLink('?view=events'.$filter->querystring(), $Storage->EventCount().' using '.human_filesize($Storage->event_disk_space() ? $Storage->event_disk_space() : 0) ); ?></td>
+                        <td class="colMark"><input type="checkbox" name="markIds[]" value="<?php echo $Storage->Id() ?>" data-on-click-this="configureDeleteButton"
 <?php
     echo ($Storage->EventCount() or !$canEdit) ? ' disabled="disabled"' : '';
     echo $Storage->EventCount() ? ' title="Can\'t delete as long as there are events stored here."' : '';
 ?>
-                  /></td>
-                </tr>
+                        /></td>
+                      </tr>
 <?php
   } #end foreach Server
 ?>
-              </tbody>
-            </table>
-            <div id="contentButtons">
-              <button type="button" id="NewStorageBtn" value="<?php echo translate('AddNewStorage') ?>" disabled="disabled"><?php echo translate('AddNewStorage') ?></button>
-              <button type="submit" class="btn-danger" name="deleteBtn" value="Delete" disabled="disabled"><?php echo translate('Delete') ?></button>
-            </div>
+                    </tbody>
+                  </table>
+                </div><!-- .col -->
+              </div> <!-- .row -->
+              <div class="row">
+                <div class="col">
+                  <div id="contentButtons">
+                    <button type="button" id="NewStorageBtn" value="<?php echo translate('AddNewStorage') ?>" disabled="disabled"><?php echo translate('AddNewStorage') ?></button>
+                    <button type="submit" class="btn-danger" name="deleteBtn" value="Delete" disabled="disabled"><?php echo translate('Delete') ?></button>
+                  </div>
+                </div>
+              </div> <!-- .row -->
+            </div> <!-- .col px-0 -->
           </form>
 <?php
 } else if ($tab == 'dnsmasq' and file_exists('skins/classic/views/_options_dnsmasq.php')) {
@@ -296,9 +310,13 @@ foreach (array_map('basename', glob('skins/'.$skin.'/css/*', GLOB_ONLYDIR)) as $
         <input type="hidden" name="view" value="<?php echo $view ?>"/>
         <input type="hidden" name="tab" value="<?php echo $tab ?>"/>
         <input type="hidden" name="action" value="options"/>
-        <div id="contentButtons">
-          <button type="submit" <?php echo $canEdit?'':' disabled="disabled"' ?>><?php echo translate('Save') ?></button>
-        </div>
+          <div class="row">
+            <div class="col">
+              <div id="contentButtons">
+                <button type="submit" <?php echo $canEdit?'':' disabled="disabled"' ?>><?php echo translate('Save') ?></button>
+              </div>
+            </div>
+          </div>
         <div id="options">
 <?php
         if (!isset($configCats[$tab])) {
@@ -381,7 +399,7 @@ foreach (array_map('basename', glob('skins/'.$skin.'/css/*', GLOB_ONLYDIR)) as $
 <?php
 }
 ?>
-      </div><!-- end #options -->
+      </div><!-- end #optionsContainer -->
   </div> <!-- end row -->
 </div>
 <?php xhtmlFooter() ?>