Browse Source

Front end page fixes

Kristan Kenney 6 years ago
parent
commit
c85737cfed

+ 2 - 1
web/css/styles.min.css

@@ -3450,8 +3450,9 @@ form#vstobjects.suspended {
 }
 
 .server-info {
-  padding-left: 110px;
+
 }
+
 .server-info-data {
   margin-left: 100px; 
   margin-top: -20px;

+ 38 - 46
web/templates/admin/list_firewall_banlist.html

@@ -28,21 +28,19 @@
     <div class="l-separator"></div>
     <!-- /.l-separator -->
 
-
     <div class="l-center units animated fadeIn">
-            <div class="l-unit__col l-unit__col--right step-top">
-              <div>
-                  <div class="clearfix l-unit__stat-col--left super-compact">
-                      <input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
-                  </div>
-                  <div class="clearfix l-unit__stat-col--left wide"><b><?php print __('IP address');?></b></div>
-                  <div class="clearfix l-unit__stat-col--left compact text-right"><b>&nbsp;</b></div>
-                  <div class="clearfix l-unit__stat-col--left compact-4 text-center"><b><?php print __('Comment');?></b></div>
-                  <div class="clearfix l-unit__stat-col--left"><b><?php print __('Date');?></b></div>
-                  <div class="clearfix l-unit__stat-col--left"><b><?php print __('Time');?></b></div>
-              </div>
+          <div class="l-unit header table-header">
+              <div class="l-unit__col l-unit__col--right step-top">
+                    <div class="clearfix l-unit__stat-col--left super-compact">
+                        <input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
+                    </div>
+                    <div class="clearfix l-unit__stat-col--left wide-5"><b><?php print __('IP address');?></b></div>
+                    <div class="clearfix l-unit__stat-col--left compact-4"><b>&nbsp;</b></div>  
+                    <div class="clearfix l-unit__stat-col--left text-center compact-5"><b><?php print __('Date');?></b></div>
+                    <div class="clearfix l-unit__stat-col--left text-center compact-5"><b><?php print __('Time');?></b></div>
+                    <div class="clearfix l-unit__stat-col--left wide text-center"><b><?php print __('Comment');?></b></div> 
+               </div>
             </div>
-          </div>
 
       <?php
         foreach ($data as $key => $value) {
@@ -52,44 +50,38 @@
       ?>
 
       <div class="l-unit<? if($status == 'suspended') echo ' l-unit--suspended';?>">
-        <div class="l-unit-toolbar clearfix">
-          <div class="l-unit-toolbar__col l-unit-toolbar__col--left super-compact">
-            <input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="ipchain[]" value="<?php echo $ip . ':' . $value['CHAIN'] ?>">
-            
-          </div>
-        </div>
-        <!-- /.l-unit-toolbar -->
-
-        <div class="l-unit__col l-unit__col--left clearfix"></div>
         <!-- /.l-unit__col -->
         <div class="l-unit__col l-unit__col--right">
           <div class="l-unit__stats">
-              <div class="clearfix l-unit__stat-col--left compact-4 text-center"><?=$ip?></div>
-               <div class="clearfix l-unit__stat-col--left compact text-right"><b>
-                <!-- START QUICK ACTION TOOLBAR AREA -->
-  
-                  <!-- l-unit-toolbar__col -->
-                  <div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
-                      <div class="actions-panel clearfix">
-                        <div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js">
-                          <a id="delete_link_<?=$i?>" class="data-controls do_delete">
-                            <i class="fas fa-trash status-icon-red status-icon-dim do_delete"></i>
-                            <input type="hidden" name="delete_url" value="/delete/firewall/banlist/?ip=<?=$ip?>&chain=<?=$value['CHAIN']?>&token=<?=$_SESSION['token']?>" />
-                            <div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=__('Confirmation')?>">
-                              <p class="confirmation"><?=__('DELETE_IP_CONFIRMATION',$key)?></p>
-                            </div>
-                          </a>
+              <div class="clearfix l-unit__stat-col--left super-compact">
+                  <input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="ipchain[]" value="<?php echo $ip . ':' . $value['CHAIN'] ?>">
+                </div>
+              <div class="clearfix l-unit__stat-col--left wide-5"><b><?=$ip?></b></div>
+              <div class="clearfix l-unit__stat-col--left compact-4"><b>
+                  <!-- START QUICK ACTION TOOLBAR AREA -->
+    
+                    <!-- l-unit-toolbar__col -->
+                    <div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
+                        <div class="actions-panel clearfix">
+                          <div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js">
+                            <a id="delete_link_<?=$i?>" class="data-controls do_delete">
+                              <i class="fas fa-trash status-icon-red status-icon-dim do_delete"></i>
+                              <input type="hidden" name="delete_url" value="/delete/firewall/banlist/?ip=<?=$ip?>&chain=<?=$value['CHAIN']?>&token=<?=$_SESSION['token']?>" />
+                              <div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=__('Confirmation')?>">
+                                <p class="confirmation"><?=__('DELETE_IP_CONFIRMATION',$key)?></p>
+                              </div>
+                            </a>
+                          </div>
+            
                         </div>
-          
+                        <!-- /.actiona-panel -->
                       </div>
-                      <!-- /.actiona-panel -->
-                    </div>
-  
-                  <!-- END QUICK ACTION TOOLBAR AREA -->
-              </b></div>
-              <div class="clearfix l-unit__stat-col--left wide text-center"><b><?=__($value['CHAIN'])?></b></div>
-              <div class="clearfix l-unit__stat-col--left"><b><?=__($data[$key]['DATE'])?></b></div>
-              <div class="clearfix l-unit__stat-col--left"><b><?=$data[$key]['TIME']?></b></div>
+    
+                    <!-- END QUICK ACTION TOOLBAR AREA -->
+                </b></div>
+              <div class="clearfix l-unit__stat-col--left text-center compact-5"><?=__($data[$key]['DATE'])?></div>
+              <div class="clearfix l-unit__stat-col--left text-center compact-5"><?=$data[$key]['TIME']?></div>
+              <div class="clearfix l-unit__stat-col--left text-center wide"><b><?=__($value['CHAIN'])?></b></div>
           </div>
           <!-- /.l-unit__stats -->
         </div>

+ 8 - 8
web/templates/admin/list_services.html

@@ -88,13 +88,13 @@
       <!-- /.l-unit -->
           <div class="l-unit table-header">
               <div class="l-unit__col l-unit__col--right">
-                    <div class="clearfix l-unit__stat-col--left">
+                    <div class="clearfix l-unit__stat-col--left super-compact">
                         <input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
                       </div>
                     
-                      <div class="clearfix l-unit__stat-col--left wide"><b><?php print __('Service');?></b></div>
-                      <div class="clearfix l-unit__stat-col--left text-right compact">&nbsp;</div>
-                      <div class="clearfix l-unit__stat-col--left wide-3"><b><?php print __('Description');?></b></div>
+                      <div class="clearfix l-unit__stat-col--left wide-2"><b><?php print __('Service');?></b></div>
+                      <div class="clearfix l-unit__stat-col--left text-right compact-2">&nbsp;</div>
+                      <div class="clearfix l-unit__stat-col--left wide-5"><b><?php print __('Description');?></b></div>
                       <div class="clearfix l-unit__stat-col--left text-center"><b><?php print __('Uptime');?></b></div>
                       <div class="clearfix l-unit__stat-col--left text-center"><b><?php print __('CPU');?></b></div>
                       <div class="clearfix l-unit__stat-col--left text-center"><b><?php print __('Memory');?></b></div>
@@ -121,19 +121,19 @@
       <div class="l-unit <? if($status == 'suspended') echo 'l-unit--suspended';?>">
 
         <div class="l-unit__col l-unit__col--right">
-        <div class="clearfix l-unit__stat-col--left">
+        <div class="clearfix l-unit__stat-col--left super-compact">
           <input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="service[]" value="<?php echo $key ?>">
         </div>
 
-        <div class="clearfix l-unit__stat-col--left wide"><b><a href="/edit/server/<? echo $key ?>/"><?=$key?></a></b></div>
-        <div class="clearfix l-unit__stat-col--left text-center compact">
+        <div class="clearfix l-unit__stat-col--left wide-2"><b><a href="/edit/server/<? echo $key ?>/"><?=$key?></a></b></div>
+        <div class="clearfix l-unit__stat-col--left text-center compact-2">
             <b>
                 <a href="/edit/server/<? echo $key ?>/"><i class="fas fa-pencil-alt status-icon-orange status-icon-dim icon-large"></i></a>
                 <a href="/restart/service/?srv=<?=$key?>&token=<?=$_SESSION['token']?>"><i class="data-controls fas fa-undo status-icon-highlight status-icon-dim icon-large"></i></a>
                 <a href="/<?php echo $action ?>/service/?srv=<?=$key?>&token=<?=$_SESSION['token']?>"><i class="fas fa-pause status-icon-red status-icon-dim icon-large"></i></a>
             </b>
           </div>
-        <div class="clearfix l-unit__stat-col--left wide-3"><?=__($data[$key]['SYSTEM'])?></div>
+        <div class="clearfix l-unit__stat-col--left wide-5"><?=__($data[$key]['SYSTEM'])?></div>
         <div class="clearfix l-unit__stat-col--left text-center"><b><?=humanize_time($data[$key]['RTIME'])?></b></div>
         <div class="clearfix l-unit__stat-col--left text-center"><b><?=$cpu?></b></div>
         <div class="clearfix l-unit__stat-col--left text-center"><b><?=$data[$key]['MEM']?> <?=__('mb')?></b></div>

+ 2 - 2
web/templates/admin/list_updates.html

@@ -45,7 +45,7 @@
                       <input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
                     </div>
                   <div class="clearfix l-unit__stat-col--left wide"><b><?php print __('Package');?></b></div>
-                  <div class="clearfix l-unit__stat-col--left wide-5"><b><?php print __('Description');?></b></div>
+                  <div class="clearfix l-unit__stat-col--left wide-6"><b><?php print __('Description');?></b></div>
                   <div class="clearfix l-unit__stat-col--left text-center"><b><?php print __('Version');?></b></div>
                   <div class="clearfix l-unit__stat-col--left text-center"><b><?php print __('Release');?></b></div>
                   <div class="clearfix l-unit__stat-col--left text-center"><b><?php print __('Status');?></b></div>
@@ -88,7 +88,7 @@
                   
                 </div>
               <div class="clearfix l-unit__stat-col--left wide"><b><?=$key?></b></div>
-              <div class="clearfix l-unit__stat-col--left wide-5"><b><?=__($data[$key]['DESCR'])?></b></div>
+              <div class="clearfix l-unit__stat-col--left wide-6"><b><?=__($data[$key]['DESCR'])?></b></div>
               <div class="clearfix l-unit__stat-col--left text-center"><?=$data[$key]['VERSION'] ?> (<?=$data[$key]['ARCH']?>)</div>
               <div class="clearfix l-unit__stat-col--left text-center"><?=$data[$key]['RELEASE']?></div>
               <div class="clearfix l-unit__stat-col--left text-center"><b>