Skip to content

Commit 80100d7

Browse files
AlecRustjaapmarcus
AlecRust
and
jaapmarcus
authored
UI tidy (hestiacp#2949)
* Remove unnecessary self-closing * Consistent <br> * Remove dead Add Web form JS * Fix up Edit Web form and FTP JS * Update text inputs in login forms * Fix jQuery being loaded twice on login pages * Remove unnecessary self-closing * Refactor away <center> usage Which is invalid in HTML5. * Namespace text alignment utility classes * .clearfix -> .u-cf * .hidden -> .u-hidden * .u-inputWidth -> u-input-width * Consistent utility class casing * Consistent error pages * Simplify error pages * Fix open/close of notifications panel Now that `.u-hidden` uses `!important` this is overriding jQuery's `.show()`. * Migrate type="email' fields to use .form-control * Reshuffle error page views - Move `/install/deb/templates/web/skel/*` to `/install/commin/templates/web/skel/` - Delete `install/rpm/templates/web/skel/*` * Do the same for unassigned and suspended * Revert some utility renames for now To cut down on diff and merge issues. * Update installers + v-update-web-templates Changes of path caused thing to get broken Co-authored-by: Jaap Marcus <9754650+jaapmarcus@users.noreply.github.com>
1 parent 5e23f31 commit 80100d7

File tree

121 files changed

+1962
-2974
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

121 files changed

+1962
-2974
lines changed

‎bin/v-update-web-templates‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,10 @@ fi
4545
for webtpl_folder in $(ls $HESTIA_INSTALL_DIR/templates/web/* -d 2>/dev/null | egrep -v '/(nginx)$' ); do
4646
cp -rf "${webtpl_folder}" "${WEBTPL}/"
4747
done
48+
# Skeleton, Unassinged and Suspended
49+
for webtpl_folder in $(ls $HESTIA_COMMON_DIR/templates/web/* -d 2>/dev/null ); do
50+
cp -rf "${webtpl_folder}" "${WEBTPL}/"
51+
done
4852

4953
versions_list=$(ls -d /etc/php/*)
5054
for php_ver in $versions_list; do

‎install/common/templates/web/skel/document_errors/403.html‎

Lines changed: 123 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,123 @@
1+
<!doctype html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="utf-8">
5+
<meta name="viewport" content="width=device-width, initial-scale=1.0">
6+
<title>Access Denied</title>
7+
<style>
8+
body {
9+
background-color: #f5f5f5;
10+
margin-top: 8%;
11+
color: #5d5d5d;
12+
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto,
13+
"Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji",
14+
"Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
15+
text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.75);
16+
text-align: center;
17+
}
18+
19+
h1 {
20+
font-size: 2.45em;
21+
font-weight: 700;
22+
color: #5d5d5d;
23+
letter-spacing: -0.02em;
24+
margin-bottom: 30px;
25+
margin-top: 30px;
26+
}
27+
28+
.container {
29+
width: 100%;
30+
margin-right: auto;
31+
margin-left: auto;
32+
}
33+
34+
.animated {
35+
-webkit-animation-duration: 1s;
36+
animation-duration: 1s;
37+
-webkit-animation-fill-mode: both;
38+
animation-fill-mode: both;
39+
}
40+
41+
.fadeIn {
42+
-webkit-animation-name: fadeIn;
43+
animation-name: fadeIn;
44+
}
45+
46+
.info {
47+
color: #5594cf;
48+
fill: #5594cf;
49+
}
50+
51+
.error {
52+
color: #c92127;
53+
fill: #c92127;
54+
}
55+
56+
.warning {
57+
color: #ffcc33;
58+
fill: #ffcc33;
59+
}
60+
61+
.success {
62+
color: #5aba47;
63+
fill: #5aba47;
64+
}
65+
66+
.icon-large {
67+
height: 132px;
68+
width: 132px;
69+
}
70+
71+
.description-text {
72+
color: #707070;
73+
letter-spacing: -0.01em;
74+
font-size: 1.25em;
75+
line-height: 20px;
76+
}
77+
78+
.footer {
79+
margin-top: 40px;
80+
font-size: 0.7em;
81+
}
82+
83+
.delay-1s {
84+
-webkit-animation-delay: 1s;
85+
animation-delay: 1s;
86+
}
87+
88+
@keyframes fadeIn {
89+
from {
90+
opacity: 0;
91+
}
92+
to {
93+
opacity: 1;
94+
}
95+
}
96+
</style>
97+
</head>
98+
<body>
99+
<div class="container">
100+
<div class="row">
101+
<div class="col">
102+
<div class="animated fadeIn">
103+
<svg
104+
class="error icon-large fa-times-circle"
105+
xmlns="http://www.w3.org/2000/svg"
106+
viewBox="0 0 512 512"
107+
>
108+
<path
109+
d="M256 8C119 8 8 119 8 256s111 248 248 248 248-111 248-248S393 8 256 8zm121.6 313.1c4.7 4.7 4.7 12.3 0 17L338 377.6c-4.7 4.7-12.3 4.7-17 0L256 312l-65.1 65.6c-4.7 4.7-12.3 4.7-17 0L134.4 338c-4.7-4.7-4.7-12.3 0-17l65.6-65-65.6-65.1c-4.7-4.7-4.7-12.3 0-17l39.6-39.6c4.7-4.7 12.3-4.7 17 0l65 65.7 65.1-65.6c4.7-4.7 12.3-4.7 17 0l39.6 39.6c4.7 4.7 4.7 12.3 0 17L312 256l65.6 65.1z"
110+
></path>
111+
</svg>
112+
</div>
113+
<h1 class="animated fadeIn">Access Denied</h1>
114+
<div class="description-text animated fadeIn delay-1s">
115+
<p>You do not have permission to view this page.</p>
116+
<p>Please check your credentials and try again.</p>
117+
<section class="footer"><strong>Error Code:</strong> 403</section>
118+
</div>
119+
</div>
120+
</div>
121+
</div>
122+
</body>
123+
</html>

‎install/common/templates/web/skel/document_errors/404.html‎

Lines changed: 123 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,123 @@
1+
<!doctype html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="utf-8">
5+
<meta name="viewport" content="width=device-width, initial-scale=1.0">
6+
<title>Page Not Found</title>
7+
<style>
8+
body {
9+
background-color: #f5f5f5;
10+
margin-top: 8%;
11+
color: #5d5d5d;
12+
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto,
13+
"Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji",
14+
"Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
15+
text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.75);
16+
text-align: center;
17+
}
18+
19+
h1 {
20+
font-size: 2.45em;
21+
font-weight: 700;
22+
color: #5d5d5d;
23+
letter-spacing: -0.02em;
24+
margin-bottom: 30px;
25+
margin-top: 30px;
26+
}
27+
28+
.container {
29+
width: 100%;
30+
margin-right: auto;
31+
margin-left: auto;
32+
}
33+
34+
.animated {
35+
-webkit-animation-duration: 1s;
36+
animation-duration: 1s;
37+
-webkit-animation-fill-mode: both;
38+
animation-fill-mode: both;
39+
}
40+
41+
.fadeIn {
42+
-webkit-animation-name: fadeIn;
43+
animation-name: fadeIn;
44+
}
45+
46+
.info {
47+
color: #5594cf;
48+
fill: #5594cf;
49+
}
50+
51+
.error {
52+
color: #c92127;
53+
fill: #c92127;
54+
}
55+
56+
.warning {
57+
color: #ffcc33;
58+
fill: #ffcc33;
59+
}
60+
61+
.success {
62+
color: #5aba47;
63+
fill: #5aba47;
64+
}
65+
66+
.icon-large {
67+
height: 132px;
68+
width: 132px;
69+
}
70+
71+
.description-text {
72+
color: #707070;
73+
letter-spacing: -0.01em;
74+
font-size: 1.25em;
75+
line-height: 20px;
76+
}
77+
78+
.footer {
79+
margin-top: 40px;
80+
font-size: 0.7em;
81+
}
82+
83+
.delay-1s {
84+
-webkit-animation-delay: 1s;
85+
animation-delay: 1s;
86+
}
87+
88+
@keyframes fadeIn {
89+
from {
90+
opacity: 0;
91+
}
92+
to {
93+
opacity: 1;
94+
}
95+
}
96+
</style>
97+
</head>
98+
<body>
99+
<div class="container">
100+
<div class="row">
101+
<div class="col">
102+
<div class="animated fadeIn">
103+
<svg
104+
class="info icon-large fa-question-circle"
105+
xmlns="http://www.w3.org/2000/svg"
106+
viewBox="0 0 512 512"
107+
>
108+
<path
109+
d="M504 256c0 136.997-111.043 248-248 248S8 392.997 8 256C8 119.083 119.043 8 256 8s248 111.083 248 248zM262.655 90c-54.497 0-89.255 22.957-116.549 63.758-3.536 5.286-2.353 12.415 2.715 16.258l34.699 26.31c5.205 3.947 12.621 3.008 16.665-2.122 17.864-22.658 30.113-35.797 57.303-35.797 20.429 0 45.698 13.148 45.698 32.958 0 14.976-12.363 22.667-32.534 33.976C247.128 238.528 216 254.941 216 296v4c0 6.627 5.373 12 12 12h56c6.627 0 12-5.373 12-12v-1.333c0-28.462 83.186-29.647 83.186-106.667 0-58.002-60.165-102-116.531-102zM256 338c-25.365 0-46 20.635-46 46 0 25.364 20.635 46 46 46s46-20.636 46-46c0-25.365-20.635-46-46-46z"
110+
></path>
111+
</svg>
112+
</div>
113+
<h1 class="animated fadeIn">Page Not Found</h1>
114+
<div class="description-text animated fadeIn delay-1s">
115+
<p>Oops! We couldn't find the page that you're looking for.</p>
116+
<p>Please check the address and try again.</p>
117+
<section class="footer"><strong>Error Code:</strong> 404</section>
118+
</div>
119+
</div>
120+
</div>
121+
</div>
122+
</body>
123+
</html>

‎install/common/templates/web/skel/document_errors/410.html‎

Lines changed: 123 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,123 @@
1+
<!doctype html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="utf-8">
5+
<meta name="viewport" content="width=device-width, initial-scale=1.0">
6+
<title>Resource is Gone</title>
7+
<style>
8+
body {
9+
background-color: #f5f5f5;
10+
margin-top: 8%;
11+
color: #5d5d5d;
12+
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto,
13+
"Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji",
14+
"Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
15+
text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.75);
16+
text-align: center;
17+
}
18+
19+
h1 {
20+
font-size: 2.45em;
21+
font-weight: 700;
22+
color: #5d5d5d;
23+
letter-spacing: -0.02em;
24+
margin-bottom: 30px;
25+
margin-top: 30px;
26+
}
27+
28+
.container {
29+
width: 100%;
30+
margin-right: auto;
31+
margin-left: auto;
32+
}
33+
34+
.animated {
35+
-webkit-animation-duration: 1s;
36+
animation-duration: 1s;
37+
-webkit-animation-fill-mode: both;
38+
animation-fill-mode: both;
39+
}
40+
41+
.fadeIn {
42+
-webkit-animation-name: fadeIn;
43+
animation-name: fadeIn;
44+
}
45+
46+
.info {
47+
color: #5594cf;
48+
fill: #5594cf;
49+
}
50+
51+
.error {
52+
color: #c92127;
53+
fill: #c92127;
54+
}
55+
56+
.warning {
57+
color: #ffcc33;
58+
fill: #ffcc33;
59+
}
60+
61+
.success {
62+
color: #5aba47;
63+
fill: #5aba47;
64+
}
65+
66+
.icon-large {
67+
height: 132px;
68+
width: 132px;
69+
}
70+
71+
.description-text {
72+
color: #707070;
73+
letter-spacing: -0.01em;
74+
font-size: 1.25em;
75+
line-height: 20px;
76+
}
77+
78+
.footer {
79+
margin-top: 40px;
80+
font-size: 0.7em;
81+
}
82+
83+
.delay-1s {
84+
-webkit-animation-delay: 1s;
85+
animation-delay: 1s;
86+
}
87+
88+
@keyframes fadeIn {
89+
from {
90+
opacity: 0;
91+
}
92+
to {
93+
opacity: 1;
94+
}
95+
}
96+
</style>
97+
</head>
98+
<body>
99+
<div class="container">
100+
<div class="row">
101+
<div class="col">
102+
<div class="animated fadeIn">
103+
<svg
104+
class="info icon-large fa-sign-out-alt"
105+
xmlns="http://www.w3.org/2000/svg"
106+
viewBox="0 0 512 512"
107+
>
108+
<path
109+
d="M272 112v51.6h-96c-26.5 0-48 21.5-48 48v88.6c0 26.5 21.5 48 48 48h96v51.6c0 42.6 51.7 64.2 81.9 33.9l144-143.9c18.7-18.7 18.7-49.1 0-67.9l-144-144C323.8 48 272 69.3 272 112zm192 144L320 400v-99.7H176v-88.6h144V112l144 144zM96 64h84c6.6 0 12 5.4 12 12v24c0 6.6-5.4 12-12 12H96c-26.5 0-48 21.5-48 48v192c0 26.5 21.5 48 48 48h84c6.6 0 12 5.4 12 12v24c0 6.6-5.4 12-12 12H96c-53 0-96-43-96-96V160c0-53 43-96 96-96z"
110+
></path>
111+
</svg>
112+
</div>
113+
<h1 class="animated fadeIn">Resource is Gone</h1>
114+
<div class="description-text animated fadeIn delay-1s">
115+
<p>Oops! The requested resource is no longer available.</p>
116+
<p>Please check the address and try again.</p>
117+
<section class="footer"><strong>Error Code:</strong> 410</section>
118+
</div>
119+
</div>
120+
</div>
121+
</div>
122+
</body>
123+
</html>

0 commit comments

Comments
 (0)