Skip to content

Commit 36b750e

Browse files
author
Kristan Kenney
committed
Merge branch 'webui-winterfell-users' into webui-refresh-winterfell
2 parents dbb4c9e + fa8caf5 commit 36b750e

File tree

2 files changed

+99
-8
lines changed

2 files changed

+99
-8
lines changed

‎web/css/styles.min.css‎

Lines changed: 89 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1860,7 +1860,6 @@ div.l-content > div.l-separator:nth-of-type(4) {
18601860
width: 110px;
18611861
}
18621862

1863-
18641863
.l-unit__stat-col--left.border {
18651864
border-left: 1px solid #ebebeb;
18661865
}
@@ -3043,6 +3042,95 @@ form#vstobjects.suspended {
30433042
background-color: #54a6e5;
30443043
}
30453044

3045+
.pill {
3046+
border-radius: 18px;
3047+
display: inline-block;
3048+
text-shadow: 0px 1px 2px rgba(0,0,0,0.4);
3049+
}
3050+
3051+
.badge {
3052+
display: inline-block;
3053+
min-width: 24px;
3054+
min-height: 24px;
3055+
line-height: 24px;
3056+
border-radius: 50%;
3057+
font-weight: 600;
3058+
box-shadow: 0px 1px 3px rgba(120,120,120,0.6);
3059+
text-shadow: 0px 1px 2px rgba(0,0,0,0.5);
3060+
}
3061+
3062+
.badge.large {
3063+
min-width: 48px;
3064+
min-height: 48px;
3065+
line-height: 48px;
3066+
}
3067+
3068+
.badge.raised {
3069+
background: radial-gradient(ellipse at center, rgba(255,255,255,0.2) 0%,rgba(255,255,255,0.05) 100%);
3070+
}
3071+
3072+
.l-unit--suspended .badge {
3073+
background: #eaeaea !important;
3074+
color: #c0c0c0 !important;
3075+
text-shadow: 0px -1px #fafafa !important;
3076+
box-shadow: 0px 1px 2px rgba(120,120,120,0.3) !important;
3077+
}
3078+
3079+
.pill.gray, .badge.gray {
3080+
border: 1px solid #ddd;
3081+
background-color: #eaeaea;
3082+
color: #6c6c6c;
3083+
text-shadow: 0px 1px #fafafa !important;
3084+
}
3085+
3086+
.pill.blue, .badge.blue {
3087+
border: 1px solid #fff;
3088+
background-color: #316198;
3089+
color: #fff;
3090+
}
3091+
3092+
.pill.purple, .badge.purple {
3093+
border: 1px solid #fff;
3094+
background-color: #8e2fca;
3095+
color: #fff;
3096+
}
3097+
3098+
.pill.teal, .badge.teal {
3099+
border: 1px solid #fff;
3100+
background-color: #33cccc;
3101+
color: #fff;
3102+
}
3103+
3104+
.pill.maroon, .badge.maroon {
3105+
border: 1px solid #fff;
3106+
background-color: #cc3366;
3107+
color: #fff;
3108+
}
3109+
3110+
.pill.red, .badge.red {
3111+
border: 1px solid #fff;
3112+
background-color: #ff3333;
3113+
color: #fff;
3114+
}
3115+
3116+
.pill.orange, .badge.orange {
3117+
border: 1px solid #fff;
3118+
background-color: #f6a800;
3119+
color: #fff;
3120+
}
3121+
3122+
.pill.green, .badge.green {
3123+
border: 1px solid #fff;
3124+
background-color: #53ba55;
3125+
color: #fff;
3126+
}
3127+
3128+
.pill.lightblue, .badge.lightblue {
3129+
border: 1px solid #fff;
3130+
background-color: #6eb6f0;
3131+
color: #fff;
3132+
}
3133+
30463134
.status-icon-yellow, .status-icon-maroon:hover {
30473135
color: #f3e72c;
30483136
}

‎web/templates/admin/list_user.html‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,10 @@
9999
<div class="clearfix l-unit__stat-col--left super-compact">
100100
<input id="check<?=$i?>" class="ch-toggle" type="checkbox" name="user[]" value="<?=$key?>">
101101
</div>
102-
<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>
102+
<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>
103+
<br />
104+
<span style="font-size: 0.8rem;"><b><?=__('Email')?>:</b> <?=$data[$key]['CONTACT']?></span>
105+
</div>
103106
<div class="clearfix l-unit__stat-col--left text-right"><b>
104107
<!-- START QUICK ACTION TOOLBAR AREA -->
105108

@@ -145,12 +148,12 @@
145148
<div class="clearfix l-unit__stat-col--left text-center compact"><?=$data[$key]['IP_OWNED']?></div>
146149
<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>
147150
<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>
148-
<div class="clearfix l-unit__stat-col--left text-center compact"><?=$data[$key]['U_WEB_DOMAINS']?></div>
149-
<div class="clearfix l-unit__stat-col--left text-center compact"><?=$data[$key]['U_MAIL_DOMAINS']?></div>
150-
<div class="clearfix l-unit__stat-col--left text-center compact"><?=$data[$key]['U_DNS_DOMAINS']?></div>
151-
<div class="clearfix l-unit__stat-col--left text-center compact"><?=$data[$key]['U_DATABASES']?></div>
152-
<div class="clearfix l-unit__stat-col--left text-center compact"><?=$data[$key]['U_CRON_JOBS']?></div>
153-
<div class="clearfix l-unit__stat-col--left text-center compact"><?=$data[$key]['U_BACKUPS']?></div>
151+
<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>
152+
<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>
153+
<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>
154+
<div class="clearfix l-unit__stat-col--left text-center compact"><span class="jump-top badge gray raised"><?=$data[$key]['U_DATABASES']?></span></div>
155+
<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>
156+
<div class="clearfix l-unit__stat-col--left text-center compact"><span class="jump-top badge gray raised"><?=$data[$key]['U_BACKUPS']?></span></div>
154157
</div>
155158
</div>
156159
<!-- /.l-unit__col -->

0 commit comments

Comments
 (0)