Skip to content

Commit 551b186

Browse files
author
Kristan Kenney
committed
Merge branch 'bugfix-ui'
2 parents 9211e0c + 693ccd3 commit 551b186

File tree

8 files changed

+60
-37
lines changed

8 files changed

+60
-37
lines changed

‎install/deb/themes/dark.css‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -784,7 +784,7 @@ a {
784784
z-index: 900;
785785
height: 38px;
786786
text-shadow: 1px 1px rgba(0,0,0,0.5);
787-
box-shadow: 0px 8px 20px rgba(0,0,0,0.35);
787+
box-shadow: 0px 8px 15px rgba(0,0,0,0.25);
788788
}
789789

790790
.l-header a {
@@ -2647,10 +2647,9 @@ a.vst-text:active b{
26472647

26482648
.advanced-options {
26492649
background: #454545 !important;
2650-
border: 1px solid #707070 !important;
2651-
text-shadow: 0px 1px rgba(0,0,0,0.35);
2650+
border: 1px solid #505050 !important;
2651+
text-shadow: 0px 1px rgba(0,0,0,0.4);
26522652
box-shadow: 0px 2px 6px rgba(0,0,0,0.4) !important;
2653-
box-shadow: none !important;
26542653
color: #fff !important;
26552654
padding: 4px 0px 0px 18px;
26562655
overflow: hidden;
@@ -3104,6 +3103,7 @@ a.button.cancel {
31043103
vertical-align: top;
31053104
width: 500px;
31063105
border-radius: 6px;
3106+
cursor: default;
31073107
}
31083108

31093109
.login-welcome {
@@ -3294,8 +3294,8 @@ form#vstobjects.suspended {
32943294
padding-right: 8px;
32953295
margin-right: 10px;
32963296
line-height: 0.75rem;
3297-
box-shadow: inset 0px 0px 1px rgba(0,0,0,0.25), 0px 1px 1px rgba(0,0,0,0.25);
3298-
background-color: rgba(15,15,15,0.45);
3297+
box-shadow: inset 0px 1px 1px rgba(0,0,0,0.85), 0px 1px 1px rgba(0,0,0,0.2);
3298+
background-color: rgba(15,15,15,0.5);
32993299
font-weight: 500;
33003300
border: 1px solid rgba(120,120,120,0.95);
33013301
text-shadow: 0px 1px 1px rgba(0,0,0,0.5);
@@ -3529,6 +3529,8 @@ form#vstobjects.suspended {
35293529
border-top-left-radius: 6px;
35303530
border-top-right-radius: 6px;
35313531
box-shadow: 0px 3px 40px rgba(0,0,0,0.6);
3532+
line-height: 1rem;
3533+
cursor: default;
35323534
}
35333535

35343536
.shortcuts .header {
@@ -3538,7 +3540,7 @@ form#vstobjects.suspended {
35383540

35393541
.shortcuts .title {
35403542
text-transform: uppercase;
3541-
color: #ffcc00;
3543+
color: #ff3478;
35423544
padding: 7px 0 7px 14px;
35433545
display: inline-block;
35443546
float: left;
@@ -3555,13 +3557,15 @@ form#vstobjects.suspended {
35553557
width: 46px;
35563558
}
35573559
.shortcuts .close:hover {
3558-
background-color: #000;
3560+
35593561
}
35603562
.shortcuts .close:active {
3561-
background-color: #3b9de8;
3563+
35623564
}
3565+
35633566
.shortcuts .close .fas {
3564-
font-size: 1.3rem;
3567+
font-size: 0.8rem;
3568+
line-height: 1.4rem;
35653569
}
35663570
.shortcuts ul {
35673571
list-style-type: none;
@@ -3577,7 +3581,7 @@ form#vstobjects.suspended {
35773581
padding-top: 30px;
35783582
}
35793583
.shortcuts ul li span {
3580-
color: #48F4EF;
3584+
color: #ff3478;
35813585
display: inline-block;
35823586
font-weight: 600;
35833587
padding: 0 20px 0 0;

‎install/deb/themes/flat.css‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ b, strong {
1414

1515
.table-header {
1616
box-shadow: none !important;
17+
background: #fafafa !important;
18+
}
19+
.advanced-options {
20+
background: #fafafa !important;
1721
}
1822

1923
.l-header {

‎web/css/styles.min.css‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3071,6 +3071,7 @@ a.button.cancel {
30713071
vertical-align: top;
30723072
width: 500px;
30733073
border-radius: 6px;
3074+
cursor: default;
30743075
}
30753076

30763077
.login-welcome {
@@ -3188,7 +3189,7 @@ form#vstobjects {
31883189
}
31893190

31903191
form#vstobjects.suspended {
3191-
background-color: #EAEAEA;
3192+
background-color: #fff;
31923193
padding-bottom: 30px;
31933194
}
31943195

@@ -3500,15 +3501,18 @@ form#vstobjects.suspended {
35003501
border-top-left-radius: 6px;
35013502
border-top-right-radius: 6px;
35023503
box-shadow: 0px 3px 40px rgba(0,0,0,0.6);
3504+
line-height: 1rem;
3505+
cursor: default;
35033506
}
3507+
35043508
.shortcuts .header {
35053509
border-bottom: 1px solid #333;
35063510
height: 43px;
35073511
}
35083512

35093513
.shortcuts .title {
35103514
text-transform: uppercase;
3511-
color: #ffcc00;
3515+
color: #ff3478;
35123516
padding: 7px 0 7px 14px;
35133517
display: inline-block;
35143518
float: left;
@@ -3525,13 +3529,14 @@ form#vstobjects.suspended {
35253529
width: 46px;
35263530
}
35273531
.shortcuts .close:hover {
3528-
background-color: #000;
3532+
color: #db0000;
35293533
}
35303534
.shortcuts .close:active {
3531-
background-color: #3b9de8;
3535+
color: #a60000;
35323536
}
35333537
.shortcuts .close .fas {
3534-
font-size: 1.3rem;
3538+
font-size: 0.8rem;
3539+
line-height: 1.4rem;
35353540
}
35363541
.shortcuts ul {
35373542
list-style-type: none;
@@ -3547,13 +3552,14 @@ form#vstobjects.suspended {
35473552
padding-top: 30px;
35483553
}
35493554
.shortcuts ul li span {
3550-
color: #48F4EF;
3555+
color: #ff3478;
35513556
display: inline-block;
35523557
font-weight: 600;
35533558
padding: 0 20px 0 0;
35543559
text-align: right;
35553560
/* width: 140px;*/
35563561
}
3562+
35573563
.shortcuts ul li span.bigger {
35583564
font-size: 18px;
35593565
}

‎web/inc/i18n/en.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@
132132
'Adding IP address' => 'Add IP Address',
133133
'Editing IP Address' => 'Edit IP Address',
134134
'Editing Backup Exclusions' => 'Edit Backup Exclusions',
135-
'Generating CSR' => 'Generate New Self-Signed SSL Certificate',
135+
'Generating CSR' => 'New Self-Signed SSL Certificate',
136136
'Listing' => 'Listing',
137137
'Search Results' => 'Search Results',
138138
'Adding Firewall Rule' => 'Add Firewall Rule',

‎web/templates/admin/generate_ssl.html‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<div class="l-center">
22
<div class="l-sort clearfix">
33
<div class="l-sort-toolbar clearfix float-left">
4-
<span class="title"><b><?=__('Generating CSR')?></b></span>
54
<?php
65
if (!empty($_SESSION['error_msg'])) {
76
echo "<span class=\"vst-error\"> → ".htmlentities($_SESSION['error_msg'])."</span>";
@@ -40,12 +39,12 @@
4039
</table>
4140
</td>
4241
<td class="data-dotted">
43-
<table>
42+
<table class="data-col2">
4443
<tr>
45-
<td></td>
44+
<td class="step-top">
45+
<span class="page-title"><?=__('Generating CSR')?></span>
46+
</td>
4647
</tr>
47-
</table>
48-
<table class="data-col2">
4948
<tr>
5049
<td class="vst-text" style="padding: 24px 0 0 0;">
5150
<?php print __('Domain');?>

‎web/templates/admin/list_packages.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<table>
1313
<tr>
1414
<td class="sort-by">
15-
<?=__('sort by');?>: <span><b><?=__('Package Name')?> <i class="fas fa-sort-amount-down"></i></b></span>
15+
<?=__('sort by');?>: <span><b><?=__('Date')?> <i class="fas fa-sort-amount-down"></i></b></span>
1616
</td>
1717
<td>
1818
<form action="/bulk/package/" method="post" id="objects">

‎web/templates/admin/list_ssl.html‎

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,7 @@
11
<div class="l-center">
22
<div class="l-sort clearfix noselect">
33
<div class="l-sort-toolbar clearfix float-left">
4-
<span class="title"><b><?=__('Generating CSR')?></b></span>
5-
<?php
6-
if (!empty($_SESSION['error_msg'])) {
7-
echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
8-
} else {
9-
if (!empty($_SESSION['ok_msg'])) {
10-
echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
11-
}
12-
}
13-
?>
4+
145
</div>
156
</div>
167
</div>
@@ -41,6 +32,25 @@
4132
</td>
4233
<td class="data-dotted">
4334
<table class="data-col2">
35+
<tr>
36+
<td class="step-top">
37+
<span class="page-title"><?=__('Generating CSR')?></span>
38+
</td>
39+
<tr>
40+
<td>
41+
<?php
42+
if (!empty($_SESSION['error_msg'])) {
43+
echo "<span class=\"vst-error\"><i class=\"fas fa-exclamation-circle status-icon red\"></i> ".$_SESSION['error_msg']."</span>";
44+
} else {
45+
if (!empty($_SESSION['ok_msg'])) {
46+
echo "<span class=\"vst-ok\"><i class=\"fas fa-check-circle status-icon green\"></i> ".$_SESSION['ok_msg']."</span>";
47+
}
48+
}
49+
?>
50+
</td>
51+
52+
</tr>
53+
</tr>
4454
<tr>
4555
<td class="vst-text" style="padding: 12px 0 0 0;"><?php print __('SSL Certificate');?>
4656
</td>

‎web/templates/admin/list_user.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
<div class="l-unit-toolbar__buttonstrip">
44
<?php
55
if ($user == 'admin') {
6-
echo '<a href="/add/user/" id="btn-create" class="ui-button cancel" title="'.__('Add User').'"><i class="fas fa-plus-circle status-icon green"></i>'.__('Add User').'</a>&nbsp;';
7-
echo '<a href="/list/package/" class="ui-button cancel" title="'.__('Packages').'"><i class="fas fa-box-open status-icon orange"></i>'.__('Packages').'</a>&nbsp;';
6+
echo '<a href="/add/user/" id="btn-create" class="ui-button cancel" title="'.__('Add User').'"><i class="fas fa-plus-circle status-icon green"></i> '.__('Add User').'</a>&nbsp;';
7+
echo '<a href="/list/package/" class="ui-button cancel" title="'.__('Packages').'"><i class="fas fa-box-open status-icon orange"></i> '.__('Packages').'</a>&nbsp;';
88
} else {
9-
echo '<a href="/add/web/" id="btn-create" class="ui-button cancel" title="'.__('Add Web Domain').'"><i class="fas fa-plus-circle status-icon green"></i>'.__('Add Web Domain').'</a>';
9+
echo '<a href="/add/web/" id="btn-create" class="ui-button cancel" title="'.__('Add Web Domain').'"><i class="fas fa-plus-circle status-icon green"></i> '.__('Add Web Domain').'</a>';
1010
}
1111
?>
1212
</div>

0 commit comments

Comments
 (0)