Merge branch 'bugfix-ui' into develop

web/css/styles.min.css

@@ -1857,6 +1857,14 @@ div.l-content > div.l-separator:nth-of-type(4) {
 
 .l-unit__stats {
   margin-bottom: 10px;
+  margin-left: 12%;
+}
+
+.l-unit__stats:hover {
+  border-left: 1px solid transparent !important;
+  border-right: 1px solid transparent !important;
+  box-shadow: none !important;
+  background: none !important;
 }
 
 .l-unit__stats table {

web/templates/admin/add_package.html

@@ -298,6 +298,7 @@
                                     <img name="unlim-bandwidth" class="unlim-trigger" src="/images/unlim.png" />
                                 </td>
                             </tr>
+                            <?php if ((isset($_SESSION['DNS_SYSTEM'])) && (!empty($_SESSION['DNS_SYSTEM']))) {?>
                             <tr>
                                 <td class="vst-text input-label">
                                     <?php print __('Name servers');?>
@@ -368,6 +369,7 @@
                                       <span class="add-ns-button additional-control add"><?=__('Add one more Name Server')?></span>
                                     </td>
                                 </tr>
+                            <?php } ?>
                         </table>
                         <table class="data-col2">
                         </table>

web/templates/admin/edit_package.html

@@ -295,6 +295,7 @@
                                     <img name="unlim-bandwidth" class="unlim-trigger" src="/images/unlim.png" />
                                 </td>
                             </tr>
+                        <?php if ((isset($_SESSION['DNS_SYSTEM'])) && (!empty($_SESSION['DNS_SYSTEM']))) {?>
                             <tr>
                                 <td class="vst-text input-label">
                                     <?php print __('Name Servers');?>
@@ -367,7 +368,7 @@
                                       <span class="add-ns-button additional-control add"><?=__('Add one more Name Server')?></span>
                                     </td>
                                 </tr>
-
+                            <?php } ?>
                         </table>
                         <table class="data-col2">
                         </table>

web/templates/admin/edit_user.html

@@ -178,6 +178,7 @@
                                     </select>
                                 </td>
                             </tr>
+                        <?php if ((isset($_SESSION['DNS_SYSTEM'])) && (!empty($_SESSION['DNS_SYSTEM']))) {?>
                             <tr>
                                 <td class="vst-text input-label">
                                     <?php print __('Default Name Servers');?>
@@ -249,8 +250,7 @@
                                       <span class="add-ns-button additional-control add"><?=__('Add one more Name Server')?></span>
                                     </td>
                                 </tr>
-
-
+                            <?php } ?>
                         </table>
                         <table class="data-col2">
                         </table>

web/templates/admin/list_rrd.html

@@ -48,24 +48,15 @@
         foreach ($data as $key => $value) {
       ?>
 
-      <div class="l-unit">
-        <div class="l-unit-toolbar clearfix">
-         <div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
-            <div class="actions-panel clearfix">
-              <div class="actions-panel__col actions-panel__edit  actions-panel__download">
-                <a href="/list/rrd/image.php?/rrd/<?php echo $data[$key]['TYPE']."/".$period."-".$data[$key]['RRD'].".png"?>" target="_blank"><?=__('download')?> <i></i></a>
-              </div>
-            </div>
-          </div>
-        </div>
+      <div class="l-unit l-unit__stats">
 
         <div class="l-unit__col l-unit__col--right">
           <div class="l-unit__name separate">
             <?= __($data[$key]['TITLE'])?>
           </div>
 
-         <div class="l-unit__stats">
-            <img src="/list/rrd/image.php?/rrd/<?=$data[$key]['TYPE']."/".$period."-".$data[$key]['RRD'].".png"?>">
+         <div>
+          <a href="/list/rrd/image.php?/rrd/<?php echo $data[$key]['TYPE']."/".$period."-".$data[$key]['RRD'].".png"?>" target="_blank"><img src="/list/rrd/image.php?/rrd/<?=$data[$key]['TYPE']."/".$period."-".$data[$key]['RRD'].".png"?>"></a>
          </div>
 
         </div>

web/templates/admin/list_server_info.html

@@ -28,10 +28,10 @@
         <div class="l-menu__item <?php if(isset($_GET['mem'])) echo 'l-menu__item--active' ?>"><a href="/list/server/?mem"><i class="fas fa-memory"></i>&nbsp;&nbsp;&nbsp;<?=__('RAM')?></a></div>
         <div class="l-menu__item <?php if(isset($_GET['disk'])) echo 'l-menu__item--active' ?>"><a href="/list/server/?disk"><i class="fas fa-hdd"></i>&nbsp;&nbsp;&nbsp;<?=__('Disk')?></a></div>
         <div class="l-menu__item <?php if(isset($_GET['net'])) echo 'l-menu__item--active' ?>"><a href="/list/server/?net"><i class="fas fa-ethernet"></i>&nbsp;&nbsp;&nbsp;<?=__('Network')?></a></div>
-        <div class="l-menu__item <?php if(isset($_GET['web'])) echo 'l-menu__item--active' ?>"><a href="/list/server/?web"><i class="fas fa-globe-europe"></i>&nbsp;&nbsp;&nbsp;<?=__('Web')?></a></div>
-        <div class="l-menu__item <?php if(isset($_GET['dns'])) echo 'l-menu__item--active' ?>"><a href="/list/server/?dns"><i class="fas fa-at"></i>&nbsp;&nbsp;&nbsp;<?=__('DNS')?></a></div>
-        <div class="l-menu__item <?php if(isset($_GET['mail'])) echo 'l-menu__item--active' ?>"><a href="/list/server/?mail"><i class="fas fa-mail-bulk"></i>&nbsp;&nbsp;&nbsp;<?=__('Mail')?></a></div>
-        <div class="l-menu__item <?php if(isset($_GET['db'])) echo 'l-menu__item--active' ?>"><a href="/list/server/?db"><i class="fas fa-database"></i>&nbsp;&nbsp;&nbsp;<?=__('DB')?></a></div>
+        <?php if ((isset($_SESSION['WEB_SYSTEM'])) && (!empty($_SESSION['WEB_SYSTEM']))) {?><div class="l-menu__item <?php if(isset($_GET['web'])) echo 'l-menu__item--active' ?>"><a href="/list/server/?web"><i class="fas fa-globe-europe"></i>&nbsp;&nbsp;&nbsp;<?=__('Web')?></a></div><?php }?>
+        <?php if ((isset($_SESSION['DNS_SYSTEM'])) && (!empty($_SESSION['DNS_SYSTEM']))) {?><div class="l-menu__item <?php if(isset($_GET['dns'])) echo 'l-menu__item--active' ?>"><a href="/list/server/?dns"><i class="fas fa-at"></i>&nbsp;&nbsp;&nbsp;<?=__('DNS')?></a></div><?php }?>
+        <?php if ((isset($_SESSION['MAIL_SYSTEM'])) && (!empty($_SESSION['MAIL_SYSTEM']))) {?><div class="l-menu__item <?php if(isset($_GET['mail'])) echo 'l-menu__item--active' ?>"><a href="/list/server/?mail"><i class="fas fa-mail-bulk"></i>&nbsp;&nbsp;&nbsp;<?=__('Mail')?></a></div><?php }?>
+        <?php if ((isset($_SESSION['DB_SYSTEM'])) && (!empty($_SESSION['DB_SYSTEM']))) {?><div class="l-menu__item <?php if(isset($_GET['db'])) echo 'l-menu__item--active' ?>"><a href="/list/server/?db"><i class="fas fa-database"></i>&nbsp;&nbsp;&nbsp;<?=__('DB')?></a></div><?php }?>
         
       </div>
       <!-- /.l-menu -->