Merge branch 'webui-winterfell-users' into webui-refresh-winterfell

web/css/styles.min.css

@@ -1860,7 +1860,6 @@ div.l-content > div.l-separator:nth-of-type(4) {
   width: 110px;
 }
 
-
 .l-unit__stat-col--left.border {
   border-left: 1px solid #ebebeb;
 }
@@ -3043,6 +3042,95 @@ form#vstobjects.suspended {
   background-color: #54a6e5;
 }
 
+.pill {
+  border-radius: 18px;
+  display: inline-block;
+  text-shadow: 0px 1px 2px rgba(0,0,0,0.4);
+}
+
+.badge {
+  display: inline-block;
+  min-width: 24px;
+  min-height: 24px;
+  line-height: 24px;
+  border-radius: 50%;
+  font-weight: 600;
+  box-shadow: 0px 1px 3px rgba(120,120,120,0.6);
+  text-shadow: 0px 1px 2px rgba(0,0,0,0.5);
+}
+
+.badge.large {
+  min-width: 48px;
+  min-height: 48px;
+  line-height: 48px;
+}
+
+.badge.raised {
+  background: radial-gradient(ellipse at center, rgba(255,255,255,0.2) 0%,rgba(255,255,255,0.05) 100%);
+}
+
+.l-unit--suspended .badge {
+  background: #eaeaea !important;
+  color: #c0c0c0 !important;
+  text-shadow: 0px -1px #fafafa !important;
+  box-shadow: 0px 1px 2px rgba(120,120,120,0.3) !important;
+}
+
+.pill.gray, .badge.gray {
+  border: 1px solid #ddd;
+  background-color: #eaeaea;
+  color: #6c6c6c;
+  text-shadow: 0px 1px #fafafa !important;
+}
+
+.pill.blue, .badge.blue {
+  border: 1px solid #fff;
+  background-color: #316198;
+  color: #fff;
+}
+
+.pill.purple, .badge.purple {
+  border: 1px solid #fff;
+  background-color: #8e2fca;
+  color: #fff;
+}
+
+.pill.teal, .badge.teal {
+  border: 1px solid #fff;
+  background-color: #33cccc;
+  color: #fff;
+}
+
+.pill.maroon, .badge.maroon {
+  border: 1px solid #fff;
+  background-color: #cc3366;
+  color: #fff;
+}
+
+.pill.red, .badge.red {
+  border: 1px solid #fff;
+  background-color: #ff3333;
+  color: #fff;
+}
+
+.pill.orange, .badge.orange {
+  border: 1px solid #fff;
+  background-color: #f6a800;
+  color: #fff;
+}
+
+.pill.green, .badge.green {
+  border: 1px solid #fff;
+  background-color: #53ba55;
+  color: #fff;
+}
+
+.pill.lightblue, .badge.lightblue {
+  border: 1px solid #fff;
+  background-color: #6eb6f0;
+  color: #fff;
+}
+
 .status-icon-yellow, .status-icon-maroon:hover {
   color: #f3e72c;
 }

web/templates/admin/list_user.html

@@ -99,7 +99,10 @@ sort-bandwidth="<?=$data[$key]['U_BANDWIDTH']?>" sort-disk="<?=$data[$key]['U_DI
           <div class="clearfix l-unit__stat-col--left super-compact">
             <input id="check<?=$i?>" class="ch-toggle" type="checkbox" name="user[]" value="<?=$key?>">
           </div>
-              <div class="clearfix l-unit__stat-col--left wide-3"><b><a href="/edit/user/?user=<?=$key?>&token=<?=$_SESSION['token']?>"><?=$data[$key]['FNAME']?> <?=$data[$key]['LNAME']?> <span style="font-weight: normal !important;">(<?=$key?>)</span></b></a><br /><span style="font-size: 0.75rem;"><?=str_replace(',', '<br />',$data[$key]['NS'])?></span></div>
+              <div class="clearfix l-unit__stat-col--left wide-3"><b><a href="/edit/user/?user=<?=$key?>&token=<?=$_SESSION['token']?>"><?=$data[$key]['FNAME']?> <?=$data[$key]['LNAME']?> <span style="font-weight: normal !important;">(<?=$key?>)</span></b></a>
+                <br />
+                <span style="font-size: 0.8rem;"><b><?=__('Email')?>:</b> <?=$data[$key]['CONTACT']?></span>
+              </div>
               <div class="clearfix l-unit__stat-col--left text-right"><b>
                   <!-- START QUICK ACTION TOOLBAR AREA -->
 
@@ -145,12 +148,12 @@ sort-bandwidth="<?=$data[$key]['U_BANDWIDTH']?>" sort-disk="<?=$data[$key]['U_DI
               <div class="clearfix l-unit__stat-col--left text-center compact"><?=$data[$key]['IP_OWNED']?></div>
               <div class="clearfix l-unit__stat-col--left text-center compact"><b><?=humanize_usage_size($data[$key]['U_DISK'])?></b> <span class="text-small"><?=humanize_usage_measure($data[$key]['U_DISK'])?></span></div>
               <div class="clearfix l-unit__stat-col--left text-center compact"><b><?=humanize_usage_size($data[$key]['U_BANDWIDTH'])?></b> <span class="text-small"><?=humanize_usage_measure($data[$key]['U_BANDWIDTH'])?></span></div>
-              <div class="clearfix l-unit__stat-col--left text-center compact"><?=$data[$key]['U_WEB_DOMAINS']?></div>
-              <div class="clearfix l-unit__stat-col--left text-center compact"><?=$data[$key]['U_MAIL_DOMAINS']?></div>
-              <div class="clearfix l-unit__stat-col--left text-center compact"><?=$data[$key]['U_DNS_DOMAINS']?></div>
-              <div class="clearfix l-unit__stat-col--left text-center compact"><?=$data[$key]['U_DATABASES']?></div>
-              <div class="clearfix l-unit__stat-col--left text-center compact"><?=$data[$key]['U_CRON_JOBS']?></div>
-              <div class="clearfix l-unit__stat-col--left text-center compact"><?=$data[$key]['U_BACKUPS']?></div>
+              <div class="clearfix l-unit__stat-col--left text-center compact"><span class="jump-top badge gray raised"><?=$data[$key]['U_WEB_DOMAINS']?></span></div>
+              <div class="clearfix l-unit__stat-col--left text-center compact"><span class="jump-top badge gray raised"><?=$data[$key]['U_MAIL_DOMAINS']?></span></div>
+              <div class="clearfix l-unit__stat-col--left text-center compact"><span class="jump-top badge gray raised"><?=$data[$key]['U_DNS_DOMAINS']?></span></div>
+              <div class="clearfix l-unit__stat-col--left text-center compact"><span class="jump-top badge gray raised"><?=$data[$key]['U_DATABASES']?></span></div>
+              <div class="clearfix l-unit__stat-col--left text-center compact"><span class="jump-top badge gray raised"><?=$data[$key]['U_CRON_JOBS']?></span></div>
+              <div class="clearfix l-unit__stat-col--left text-center compact"><span class="jump-top badge gray raised"><?=$data[$key]['U_BACKUPS']?></span></div>
           </div>
          </div>
        <!-- /.l-unit__col -->