Merge branch 'ja2015' of https://github.com/ja2015/vesta

web/css/styles.min.css

@@ -916,16 +916,18 @@ input[type="checkbox"] {
 
 .l-stat {
   margin: 0 auto;
-  display: table;
   margin: 34px auto;
   position: fixed;
   background-color: #fff;
   z-index: 100;
   padding-top: 30px;
+  width: 100%;
+  overflow: hidden;
 }
 .l-stat__col {
-  display: table-cell;
+  display: block;
   vertical-align: top;
+  float: left;
 }
 .l-stat__col a {
   display: inline-block;
@@ -2512,7 +2514,7 @@ label:hover {
 }
 
 .vst-list.flat {
-  border: 1px solid #fff; 
+  border: 1px solid #fff;
   color: #2c9491;
   text-transform: uppercase;
   font-weight: bold;

web/templates/admin/add_web.html

@@ -71,16 +71,16 @@
                                 </select>
                             </td>
                         </tr>
-                        <tr>
+                        <?php if($panel[$user]['DNS_DOMAINS'] != "0") { ?><tr>
                             <td class="vst-text input-label">
-                                <label><input type="checkbox" size="20" class="vst-checkbox" name="v_dns" <?php if (empty($v_dns)) echo "checked=yes"; ?>> <?php print __('DNS Support');?></label>
+                                <label><input type="checkbox" size="20" class="vst-checkbox" name="v_dns" <?php if (empty($v_dns)&&$panel[$user]['DNS_DOMAINS'] != "0") echo "checked=yes"; ?>> <?php print __('DNS Support');?></label>
                             </td>
-                        </tr>
-                        <tr>
+                        </tr><?php } ?>
+                        <?php if($panel[$user]['MAIL_DOMAINS'] != "0") { ?><tr>
                             <td class="vst-text input-label">
-                                <label><input type="checkbox" size="20" class="vst-checkbox" name="v_mail" <?php if (empty($v_mail)) echo "checked=yes"; ?>> <?php print __('Mail Support');?></label>
+                                <label><input type="checkbox" size="20" class="vst-checkbox" name="v_mail" <?php if (empty($v_mail)&&$panel[$user]['MAIL_DOMAINS'] != "0") echo "checked=yes"; ?>> <?php print __('Mail Support');?></label>
                             </td>
-                        </tr>
+                        </tr><?php } ?>
                         <tr>
                             <td class="step-top vst-text" style="/*padding: 32px 0 20px 0;*/">
                                 <a href="javascript:elementHideShow('advtable');" class="vst-advanced"><?php print __('Advanced options');?></a>
@@ -214,7 +214,7 @@
                         </tr>
                         <tr  class="stats-auth" style="<? if (trim($v_stats, "'") == 'none') { ?>display:none<? } ?>">
                             <td class="step-left vst-text input-label">
-                                <label><input type="checkbox" size="20" class="vst-checkbox" name="v_stats_auth" <?php if (!empty($v_stats_user)) echo "checked=yes" ?> 
+                                <label><input type="checkbox" size="20" class="vst-checkbox" name="v_stats_auth" <?php if (!empty($v_stats_user)) echo "checked=yes" ?>
                                     onclick="javascript:elementHideShow('statstable');"> <?=__('Statistics Authorization')?></label>
                             </td>
                         </tr>

web/templates/admin/panel.html

@@ -48,62 +48,74 @@
             </ul>
           </a>
         </div>
-        <div class="l-stat__col <?php if($TAB == 'WEB' ) echo 'l-stat__col--active' ?>">
-          <a href="/list/web/">
-            <div class="l-stat__col-title"><?=__('WEB')?></div>
-            <ul>
-              <li><?=__('domains')?>: <span><?=$panel[$user]['U_WEB_DOMAINS']?></span></li>
-              <li><?=__('aliases')?>: <span><?=$panel[$user]['U_WEB_ALIASES']?></span></li>
-              <li><?=__('spnd')?>: <span><?=$panel[$user]['SUSPENDED_WEB']?></span></li>
-            </ul>
-          </a>
-        </div>
-        <div class="l-stat__col <?php if($TAB == 'DNS' ) echo 'l-stat__col--active' ?>">
-          <a href="/list/dns/">
-            <div class="l-stat__col-title"><?=__('DNS')?></div>
-            <ul>
-              <li><?=__('domains')?>: <span><?=$panel[$user]['U_DNS_DOMAINS']?></span></li>
-              <li><?=__('records')?>: <span><?=$panel[$user]['U_DNS_RECORDS']?></span></li>
-              <li><?=__('spnd')?>: <span><?=$panel[$user]['SUSPENDED_DNS']?></span></li>
-            </ul>
-          </a>
-        </div>
-        <div class="l-stat__col <?php if($TAB == 'MAIL' ) echo 'l-stat__col--active' ?>">
-          <a href="/list/mail/">
-            <div class="l-stat__col-title"><?=__('MAIL')?></div>
-            <ul>
-              <li><?=__('domains')?>: <span><?=$panel[$user]['U_MAIL_DOMAINS']?></span></li>
-              <li><?=__('accounts')?>: <span><?=$panel[$user]['U_MAIL_ACCOUNTS']?></span></li>
-              <li><?=__('spnd')?>: <span><?=$panel[$user]['SUSPENDED_MAIL']?></span></li>
-            </ul>
-          </a>
-        </div>
-        <div class="l-stat__col <?php if($TAB == 'DB' ) echo 'l-stat__col--active' ?>">
-          <a href="/list/db/">
-            <div class="l-stat__col-title"><?=__('DB')?></div>
-            <ul>
-              <li><?=__('databases')?>: <span><?=$panel[$user]['U_DATABASES']?></span></li>
-              <li><?=__('spnd')?>: <span><?=$panel[$user]['SUSPENDED_DB']?></span></li>
-            </ul>
-          </a>
-        </div>
-        <div class="l-stat__col <?php if($TAB == 'CRON' ) echo 'l-stat__col--active' ?>">
-          <a href="/list/cron/">
-            <div class="l-stat__col-title"><?=__('CRON')?></div>
-            <ul>
-              <li><?=__('jobs')?>: <span><?=$panel[$user]['U_CRON_JOBS']?></span></li>
-              <li><?=__('spnd')?>: <span><?=$panel[$user]['SUSPENDED_CRON']?></span></li>
-            </ul>
-          </a>
-        </div>
-        <div class="l-stat__col <?php if($TAB == 'BACKUP' ) echo 'l-stat__col--active' ?>">
-          <a href="/list/backup/">
-            <div class="l-stat__col-title"><?=__('BACKUP')?></div>
-            <ul>
-              <li><?=__('backups')?>: <span><?=$panel[$user]['U_BACKUPS']?></span></li>
-            </ul>
-          </a>
-        </div>
+		<?php if($panel[$user]['WEB_DOMAINS'] != "0") { ?>
+	        <div class="l-stat__col <?php if($TAB == 'WEB' ) echo 'l-stat__col--active' ?>">
+	          <a href="/list/web/">
+	            <div class="l-stat__col-title"><?=__('WEB')?></div>
+	            <ul>
+	              <li><?=__('domains')?>: <span><?=$panel[$user]['U_WEB_DOMAINS']?></span></li>
+	              <li><?=__('aliases')?>: <span><?=$panel[$user]['U_WEB_ALIASES']?></span></li>
+	              <li><?=__('spnd')?>: <span><?=$panel[$user]['SUSPENDED_WEB']?></span></li>
+	            </ul>
+	          </a>
+	        </div>
+		<?php } ?>
+		<?php if($panel[$user]['DNS_DOMAINS'] != "0") { ?>
+	        <div class="l-stat__col <?php if($TAB == 'DNS' ) echo 'l-stat__col--active' ?>">
+	          <a href="/list/dns/">
+	            <div class="l-stat__col-title"><?=__('DNS')?></div>
+	            <ul>
+	              <li><?=__('domains')?>: <span><?=$panel[$user]['U_DNS_DOMAINS']?></span></li>
+	              <li><?=__('records')?>: <span><?=$panel[$user]['U_DNS_RECORDS']?></span></li>
+	              <li><?=__('spnd')?>: <span><?=$panel[$user]['SUSPENDED_DNS']?></span></li>
+	            </ul>
+	          </a>
+	        </div>
+		<?php } ?>
+		<?php if($panel[$user]['MAIL_DOMAINS'] != "0") { ?>
+	        <div class="l-stat__col <?php if($TAB == 'MAIL' ) echo 'l-stat__col--active' ?>">
+	          <a href="/list/mail/">
+	            <div class="l-stat__col-title"><?=__('MAIL')?></div>
+	            <ul>
+	              <li><?=__('domains')?>: <span><?=$panel[$user]['U_MAIL_DOMAINS']?></span></li>
+	              <li><?=__('accounts')?>: <span><?=$panel[$user]['U_MAIL_ACCOUNTS']?></span></li>
+	              <li><?=__('spnd')?>: <span><?=$panel[$user]['SUSPENDED_MAIL']?></span></li>
+	            </ul>
+	          </a>
+	        </div>
+		<?php } ?>
+		<?php if($panel[$user]['DATABASES'] != "0") { ?>
+	        <div class="l-stat__col <?php if($TAB == 'DB' ) echo 'l-stat__col--active' ?>">
+	          <a href="/list/db/">
+	            <div class="l-stat__col-title"><?=__('DB')?></div>
+	            <ul>
+	              <li><?=__('databases')?>: <span><?=$panel[$user]['U_DATABASES']?></span></li>
+	              <li><?=__('spnd')?>: <span><?=$panel[$user]['SUSPENDED_DB']?></span></li>
+	            </ul>
+	          </a>
+	        </div>
+		<?php } ?>
+		<?php if($panel[$user]['CRON_JOBS'] != "0") { ?>
+	        <div class="l-stat__col <?php if($TAB == 'CRON' ) echo 'l-stat__col--active' ?>">
+	          <a href="/list/cron/">
+	            <div class="l-stat__col-title"><?=__('CRON')?></div>
+	            <ul>
+	              <li><?=__('jobs')?>: <span><?=$panel[$user]['U_CRON_JOBS']?></span></li>
+	              <li><?=__('spnd')?>: <span><?=$panel[$user]['SUSPENDED_CRON']?></span></li>
+	            </ul>
+	          </a>
+	        </div>
+		<?php } ?>
+		<?php if($panel[$user]['BACKUPS'] != "0") { ?>
+	        <div class="l-stat__col <?php if($TAB == 'BACKUP' ) echo 'l-stat__col--active' ?>">
+	          <a href="/list/backup/">
+	            <div class="l-stat__col-title"><?=__('BACKUP')?></div>
+	            <ul>
+	              <li><?=__('backups')?>: <span><?=$panel[$user]['U_BACKUPS']?></span></li>
+	            </ul>
+	          </a>
+	        </div>
+		<?php } ?>
       </div>
       <!-- /.l-stats -->
     </div>

web/templates/user/panel.html

@@ -41,62 +41,74 @@
             </ul>
           </a>
         </div>
-        <div class="l-stat__col <?php if($TAB == 'WEB' ) echo 'l-stat__col--active' ?>">
-          <a href="/list/web/">
-            <div class="l-stat__col-title"><?=__('WEB')?></div>
-            <ul>
-              <li><?=__('domains')?>: <span><?=$panel[$user]['U_WEB_DOMAINS']?></span></li>
-              <li><?=__('aliases')?>: <span><?=$panel[$user]['U_WEB_ALIASES']?></span></li>
-              <li><?=__('spnd')?>: <span><?=$panel[$user]['SUSPENDED_WEB']?></span></li>
-            </ul>
-          </a>
-        </div>
-        <div class="l-stat__col <?php if($TAB == 'DNS' ) echo 'l-stat__col--active' ?>">
-          <a href="/list/dns/">
-            <div class="l-stat__col-title"><?=__('DNS')?></div>
-            <ul>
-              <li><?=__('domains')?>: <span><?=$panel[$user]['U_DNS_DOMAINS']?></span></li>
-              <li><?=__('records')?>: <span><?=$panel[$user]['U_DNS_RECORDS']?></span></li>
-              <li><?=__('spnd')?>: <span><?=$panel[$user]['SUSPENDED_DNS']?></span></li>
-            </ul>
-          </a>
-        </div>
-        <div class="l-stat__col <?php if($TAB == 'MAIL' ) echo 'l-stat__col--active' ?>">
-          <a href="/list/mail/">
-            <div class="l-stat__col-title"><?=__('MAIL')?></div>
-            <ul>
-              <li><?=__('domains')?>: <span><?=$panel[$user]['U_MAIL_DOMAINS']?></span></li>
-              <li><?=__('accounts')?>: <span><?=$panel[$user]['U_MAIL_ACCOUNTS']?></span></li>
-              <li><?=__('spnd')?>: <span><?=$panel[$user]['SUSPENDED_MAIL']?></span></li>
-            </ul>
-          </a>
-        </div>
-        <div class="l-stat__col <?php if($TAB == 'DB' ) echo 'l-stat__col--active' ?>">
-          <a href="/list/db/">
-            <div class="l-stat__col-title"><?=__('DB')?></div>
-            <ul>
-              <li><?=__('databases')?>: <span><?=$panel[$user]['U_DATABASES']?></span></li>
-              <li><?=__('spnd')?>: <span><?=$panel[$user]['SUSPENDED_DB']?></span></li>
-            </ul>
-          </a>
-        </div>
-        <div class="l-stat__col <?php if($TAB == 'CRON' ) echo 'l-stat__col--active' ?>">
-          <a href="/list/cron/">
-            <div class="l-stat__col-title"><?=__('CRON')?></div>
-            <ul>
-              <li><?=__('jobs')?>: <span><?=$panel[$user]['U_CRON_JOBS']?></span></li>
-              <li><?=__('spnd')?>: <span><?=$panel[$user]['SUSPENDED_CRON']?></span></li>
-            </ul>
-          </a>
-        </div>
-        <div class="l-stat__col <?php if($TAB == 'BACKUP' ) echo 'l-stat__col--active' ?>">
-          <a href="/list/backup/">
-            <div class="l-stat__col-title"><?=__('BACKUP')?></div>
-            <ul>
-              <li><?=__('backups')?>: <span><?=$panel[$user]['U_BACKUPS']?></span></li>
-            </ul>
-          </a>
-        </div>
+		<?php if($panel[$user]['WEB_DOMAINS'] != "0") { ?>
+	        <div class="l-stat__col <?php if($TAB == 'WEB' ) echo 'l-stat__col--active' ?>">
+	          <a href="/list/web/">
+	            <div class="l-stat__col-title"><?=__('WEB')?></div>
+	            <ul>
+	              <li><?=__('domains')?>: <span><?=$panel[$user]['U_WEB_DOMAINS']?></span></li>
+	              <li><?=__('aliases')?>: <span><?=$panel[$user]['U_WEB_ALIASES']?></span></li>
+	              <li><?=__('spnd')?>: <span><?=$panel[$user]['SUSPENDED_WEB']?></span></li>
+	            </ul>
+	          </a>
+	        </div>
+		<?php } ?>
+		<?php if($panel[$user]['DNS_DOMAINS'] != "0") { ?>
+	        <div class="l-stat__col <?php if($TAB == 'DNS' ) echo 'l-stat__col--active' ?>">
+	          <a href="/list/dns/">
+	            <div class="l-stat__col-title"><?=__('DNS')?></div>
+	            <ul>
+	              <li><?=__('domains')?>: <span><?=$panel[$user]['U_DNS_DOMAINS']?></span></li>
+	              <li><?=__('records')?>: <span><?=$panel[$user]['U_DNS_RECORDS']?></span></li>
+	              <li><?=__('spnd')?>: <span><?=$panel[$user]['SUSPENDED_DNS']?></span></li>
+	            </ul>
+	          </a>
+	        </div>
+		<?php } ?>
+		<?php if($panel[$user]['MAIL_DOMAINS'] != "0") { ?>
+	        <div class="l-stat__col <?php if($TAB == 'MAIL' ) echo 'l-stat__col--active' ?>">
+	          <a href="/list/mail/">
+	            <div class="l-stat__col-title"><?=__('MAIL')?></div>
+	            <ul>
+	              <li><?=__('domains')?>: <span><?=$panel[$user]['U_MAIL_DOMAINS']?></span></li>
+	              <li><?=__('accounts')?>: <span><?=$panel[$user]['U_MAIL_ACCOUNTS']?></span></li>
+	              <li><?=__('spnd')?>: <span><?=$panel[$user]['SUSPENDED_MAIL']?></span></li>
+	            </ul>
+	          </a>
+	        </div>
+		<?php } ?>
+		<?php if($panel[$user]['DATABASES'] != "0") { ?>
+	        <div class="l-stat__col <?php if($TAB == 'DB' ) echo 'l-stat__col--active' ?>">
+	          <a href="/list/db/">
+	            <div class="l-stat__col-title"><?=__('DB')?></div>
+	            <ul>
+	              <li><?=__('databases')?>: <span><?=$panel[$user]['U_DATABASES']?></span></li>
+	              <li><?=__('spnd')?>: <span><?=$panel[$user]['SUSPENDED_DB']?></span></li>
+	            </ul>
+	          </a>
+	        </div>
+		<?php } ?>
+		<?php if($panel[$user]['CRON_JOBS'] != "0") { ?>
+	        <div class="l-stat__col <?php if($TAB == 'CRON' ) echo 'l-stat__col--active' ?>">
+	          <a href="/list/cron/">
+	            <div class="l-stat__col-title"><?=__('CRON')?></div>
+	            <ul>
+	              <li><?=__('jobs')?>: <span><?=$panel[$user]['U_CRON_JOBS']?></span></li>
+	              <li><?=__('spnd')?>: <span><?=$panel[$user]['SUSPENDED_CRON']?></span></li>
+	            </ul>
+	          </a>
+	        </div>
+		<?php } ?>
+		<?php if($panel[$user]['BACKUPS'] != "0") { ?>
+	        <div class="l-stat__col <?php if($TAB == 'BACKUP' ) echo 'l-stat__col--active' ?>">
+	          <a href="/list/backup/">
+	            <div class="l-stat__col-title"><?=__('BACKUP')?></div>
+	            <ul>
+	              <li><?=__('backups')?>: <span><?=$panel[$user]['U_BACKUPS']?></span></li>
+	            </ul>
+	          </a>
+	        </div>
+		<?php } ?>
       </div>
       <!-- /.l-stats -->
     </div>