Merge branch 'bugfix-ui' into develop

unknown · unknown · commit a82cb4e51e89 · 2019-05-16T00:06:27.000-06:00
diff --git a/web/css/styles.min.css b/web/css/styles.min.css
@@ -1811,6 +1811,14 @@ div.l-content > div.l-separator:nth-of-type(4) {
   letter-spacing: -0.02em;
 }
 
+.l-unit__servername {
+  color: #414141;
+  font-size: 28px;
+  margin-bottom: 10px;
+  font-weight: 300;
+  letter-spacing: -0.02em;
+}
+
 .l-unit__stats.separate,
 .l-unit__name.separate {
   padding-bottom: 15px;
@@ -2174,15 +2182,32 @@ body.mobile .l-icon-shortcuts {
 .to-top {
   display: inline-block;
   position: fixed;
-  top: 92%;
-  right: 1%;
+  top: 90%;
+  right: 4%;
+  border: 1px solid #ddd;
+  padding: 8px;
+  border-radius: 50%;
+  background-color: #eee;
+  text-shadow: 1px 1px #fff;
+  box-shadow: 0px 2px 4px rgba(120,120,120,0.25),
+              inset 0px 0px 1px rgba(255,255,255,0.9);
+  z-index: 200;
+
 }
 
 .to-shortcuts {
   display: inline-block;
   position: fixed;
-  top: 92%;
-  right: 4%;
+  top: 90%;
+  right: 8%;
+  border: 1px solid #ddd;
+  padding: 8px;
+  border-radius: 50%;
+  background-color: #eee;
+  text-shadow: 1px 1px #fff;
+  box-shadow: 0px 2px 4px rgba(120,120,120,0.25),
+              inset 0px 0px 1px rgba(255,255,255,0.9);
+  z-index: 200;
 }
 
 
@@ -3627,7 +3652,8 @@ form#vstobjects.suspended {
   margin-top: -20px;
 }
 .server-info-name {
-  margin-top: 10px;
+  margin-top: 5px;
+  margin-bottom: 30px;
 }
 .icon-server-info {
   font-size: 5.2em;
diff --git a/web/templates/admin/add_web.html b/web/templates/admin/add_web.html
@@ -107,7 +107,7 @@
                         </tr>
                         <tr>
                             <td>
-                                <textarea size="20" class="vst-textinput" name="v_aliases" id="v_aliases" ><?=htmlentities(trim($v_aliases, "'"))?></textarea>
+                                <textarea size="20" class="vst-textinput short" name="v_aliases" id="v_aliases" ><?=htmlentities(trim($v_aliases, "'"))?></textarea>
                             </td>
                         </tr>
                         <?php if (!empty($_SESSION['PROXY_SYSTEM'])) { echo ""; ?>
@@ -126,7 +126,7 @@
                                     </tr>
                                     <tr>
                                         <td class="step-left">
-                                            <textarea size="20" class="vst-textinput" name="v_proxy_ext"><?php if (!empty($v_proxy_ext)) { echo htmlentities(trim($v_proxy_ext, "'"));} else { echo 'jpeg, jpg, png, gif, bmp, ico, svg, tif, tiff, css, js, htm, html, ttf, otf, webp, woff, txt, csv, rtf, doc, docx, xls, xlsx, ppt, pptx, odf, odp, ods, odt, pdf, psd, ai, eot, eps, ps, zip, tar, tgz, gz, rar, bz2, 7z, aac, m4a, mp3, mp4, ogg, wav, wma, 3gp, avi, flv, m4v, mkv, mov, mp4, mpeg, mpg, wmv, exe, iso, dmg, swf'; }  ?></textarea>
+                                            <textarea size="20" class="vst-textinput short" name="v_proxy_ext"><?php if (!empty($v_proxy_ext)) { echo htmlentities(trim($v_proxy_ext, "'"));} else { echo 'jpeg, jpg, png, gif, bmp, ico, svg, tif, tiff, css, js, htm, html, ttf, otf, webp, woff, txt, csv, rtf, doc, docx, xls, xlsx, ppt, pptx, odf, odp, ods, odt, pdf, psd, ai, eot, eps, ps, zip, tar, tgz, gz, rar, bz2, 7z, aac, m4a, mp3, mp4, ogg, wav, wma, 3gp, avi, flv, m4v, mkv, mov, mp4, mpeg, mpg, wmv, exe, iso, dmg, swf'; }  ?></textarea>
                                         </td>
                                     </tr>
                                 </table>
@@ -231,7 +231,7 @@
                                     </tr>
                                     <tr>
                                         <td class="step-left">
-                                            <textarea size="20" class="vst-textinput" name="v_ssl_crt"><?=htmlentities(trim($v_ssl_crt, "'"))?></textarea>
+                                            <textarea size="20" class="vst-textinput short" name="v_ssl_crt"><?=htmlentities(trim($v_ssl_crt, "'"))?></textarea>
                                         </td>
                                     </tr>
                                     <tr>
@@ -241,7 +241,7 @@
                                     </tr>
                                     <tr>
                                         <td class="step-left">
-                                            <textarea size="20" class="vst-textinput" name="v_ssl_key"><?=htmlentities(trim($v_ssl_key, "'"))?></textarea>
+                                            <textarea size="20" class="vst-textinput short" name="v_ssl_key"><?=htmlentities(trim($v_ssl_key, "'"))?></textarea>
                                         </td>
                                     </tr>
                                     <tr>
@@ -251,7 +251,7 @@
                                     </tr>
                                     <tr>
                                         <td class="step-left">
-                                            <textarea size="20" class="vst-textinput" name="v_ssl_ca"><?=htmlentities(trim($v_ssl_ca, "'"))?></textarea>
+                                            <textarea size="20" class="vst-textinput short" name="v_ssl_ca"><?=htmlentities(trim($v_ssl_ca, "'"))?></textarea>
                                         </td>
                                     </tr>
                                 </table>
diff --git a/web/templates/admin/list_backup_detail.html b/web/templates/admin/list_backup_detail.html
@@ -64,7 +64,7 @@
 
         <div class="l-unit__col l-unit__col--left clearfix"></div>
         <div class="l-unit__col l-unit__col--right">
-          <div class="l-unit__stats">
+          <div>
             <table>
                <tr>
                 <td>
@@ -100,7 +100,7 @@
 
         <div class="l-unit__col l-unit__col--left clearfix"></div>
         <div class="l-unit__col l-unit__col--right">
-          <div class="l-unit__stats">
+          <div>
             <table>
                <tr>
                 <td>
@@ -136,7 +136,7 @@
 
         <div class="l-unit__col l-unit__col--left clearfix"></div>
         <div class="l-unit__col l-unit__col--right">
-          <div class="l-unit__stats">
+          <div>
             <table>
                <tr>
                 <td>
@@ -171,7 +171,7 @@
         </div>
         <div class="l-unit__col l-unit__col--left clearfix"></div>
         <div class="l-unit__col l-unit__col--right">
-          <div class="l-unit__stats">
+          <div>
             <table>
                <tr>
                 <td>
@@ -207,7 +207,7 @@
 
         <div class="l-unit__col l-unit__col--left clearfix"></div>
         <div class="l-unit__col l-unit__col--right">
-          <div class="l-unit__stats">
+          <div>
             <table>
                <tr>
                 <td>
@@ -242,7 +242,7 @@
 
         <div class="l-unit__col l-unit__col--left clearfix"></div>
         <div class="l-unit__col l-unit__col--right">
-          <div class="l-unit__stats">
+          <div>
             <table>
                <tr>
                 <td>
@@ -271,7 +271,7 @@
 
         <div class="l-unit__col l-unit__col--left clearfix"></div>
         <div class="l-unit__col l-unit__col--right">
-          <div class="l-unit__stats">
+          <div>
             <table>
                <tr>
                 <td>
diff --git a/web/templates/admin/list_backup_exclusions.html b/web/templates/admin/list_backup_exclusions.html
@@ -37,7 +37,7 @@
 
         <div class="l-unit__col l-unit__col--left clearfix"></div>
         <div class="l-unit__col l-unit__col--right">
-          <div class="l-unit__stats">
+          <div>
             <table>
               <tr>
                 <td>
diff --git a/web/templates/admin/list_dns_rec.html b/web/templates/admin/list_dns_rec.html
@@ -67,7 +67,6 @@
       <div class="l-unit<? if($status == 'suspended') echo ' l-unit--suspended'; if($_SESSION['favourites']['DNS_REC'][$key] == 1) echo ' l-unit--starred';?>"
 v_unit_id="<?=$key?>" v_section="dns_rec">
         <div class="l-unit__col l-unit__col--right">
-          <div class="l-unit__stats">
             <div class="clearfix l-unit__stat-col--left super-compact">
               <input id="check<?=$data[$key]['ID']?>" class="ch-toggle" type="checkbox" name="record[]" value="<?=$data[$key]['ID']?>">
             </div>
@@ -95,7 +94,6 @@
             <div class="clearfix l-unit__stat-col--left wide-4" style="font-family: 'Inconsolata', monospace;"><?=htmlspecialchars($data[$key]['VALUE'], ENT_QUOTES, 'UTF-8')?></div>
           </div>
         </div>
-      </div>
       <?}?>
 
     </div>
diff --git a/web/templates/admin/list_firewall.html b/web/templates/admin/list_firewall.html
@@ -75,7 +75,7 @@
 sort-action="<?=$data[$key]['ACTION']?>" sort-protocol="<?=$data[$key]['PROTOCOL']?>" sort-port="<?=$data[$key]['PORT']?>"
 sort-ip="<?=str_replace('.', '', $data[$key]['IP'])?>" sort-comment="<?=$data[$key]['COMMENT']?>" sort-star="<? if($_SESSION['favourites']['FIREWALL'][$key] == 1) echo '1'; else echo '2'; ?>">
         <div class="l-unit__col l-unit__col--right">
-          <div class="l-unit__stats">
+          <div>
               <div class="clearfix l-unit__stat-col--left super-compact">
                 <input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="rule[]" value="<?php echo $key ?>">
               </div>
diff --git a/web/templates/admin/list_firewall_banlist.html b/web/templates/admin/list_firewall_banlist.html
@@ -49,7 +49,6 @@
 
       <div class="l-unit<? if($status == 'suspended') echo ' l-unit--suspended';?>">
         <div class="l-unit__col l-unit__col--right">
-          <div class="l-unit__stats">
               <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>
@@ -75,7 +74,6 @@
                 <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>
-        </div>
       </div>
       <?}?>
     </div>
diff --git a/web/templates/admin/list_services.html b/web/templates/admin/list_services.html
@@ -34,16 +34,16 @@
   
     <div class="l-center units animated fadeIn">
 
-      <div class="l-unit <? if($status == 'suspended') echo 'l-unit--suspended';?>">
+      <div class="">
         <div class="l-unit__col l-unit__col--right server-info">
           <div class="icon-server-info"><i class="fas fa-server"></i></div>
-          <div class="l-unit__name separate server-info-name"><?=$sys['sysinfo']['HOSTNAME']?></div>
-          <div class="l-unit__stats server-info-data">
-            <table>
+          <div class="l-unit__servername separate server-info-name"><?=$sys['sysinfo']['HOSTNAME']?></div>
+          <div class="server-info-data">
+            <table class="text-small">
                <tr>
                 <td>
                   <div class="l-unit__stat-cols clearfix">
-                    <div class="l-unit__stat-col l-unit__stat-col--left">
+                    <div class="l-unit__stat-col l-unit__stat-col--left wide">
                       <b><?=$sys['sysinfo']['OS']?>
                       <?=$sys['sysinfo']['VERSION']?></b>
                     </div>
@@ -52,13 +52,13 @@
                 </td>
                 <td>
                   <div class="l-unit__stat-cols clearfix">
-                    <div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Load Average')?>:</div>
+                    <div class="l-unit__stat-col l-unit__stat-col--left wide"><?=__('Load Average')?>:</div>
                     <div class="l-unit__stat-col l-unit__stat-col--right"><b><?=$sys['sysinfo']['LOADAVERAGE']?></b></div>
                   </div>
                 </td>
                 <td>
                   <div class="l-unit__stat-cols clearfix last">
-                    <div class="l-unit__stat-col l-unit__stat-col--left compact"><?=__('Uptime')?>:</div>
+                    <div class="l-unit__stat-col l-unit__stat-col--left wide"><?=__('Uptime')?>:</div>
                     <div class="l-unit__stat-col l-unit__stat-col--right"><b><?=humanize_time($sys['sysinfo']['UPTIME'])?></b></div>
                   </div>
                 </td>
diff --git a/web/templates/user/list_dns_rec.html b/web/templates/user/list_dns_rec.html
@@ -67,7 +67,6 @@
       <div class="l-unit<? if($status == 'suspended') echo ' l-unit--suspended'; if($_SESSION['favourites']['DNS_REC'][$key] == 1) echo ' l-unit--starred';?>"
 v_unit_id="<?=$key?>" v_section="dns_rec">
         <div class="l-unit__col l-unit__col--right">
-          <div class="l-unit__stats">
             <div class="clearfix l-unit__stat-col--left super-compact">
               <input id="check<?=$data[$key]['ID']?>" class="ch-toggle" type="checkbox" name="record[]" value="<?=$data[$key]['ID']?>">
             </div>
@@ -95,7 +94,6 @@
             <div class="clearfix l-unit__stat-col--left wide-4" style="font-family: 'Inconsolata', monospace;"><?=htmlspecialchars($data[$key]['VALUE'], ENT_QUOTES, 'UTF-8')?></div>
           </div>
         </div>
-      </div>
       <?}?>
 
     </div>
