add new graphics/logos; theme dependent logos; layout fixes in forgot-password/reset-password sites;

Signed-off-by: Michael Kaufmann <d00p@froxlor.org>

lib/init.php

@@ -187,8 +187,8 @@ if (is_array($_themeoptions) && (!array_key_exists('variants', $_themeoptions) |
 $hl_path = 'templates/' . $theme . '/assets/img';
 
 // default is theme-image
-$header_logo = $hl_path . '/logo_white.png';
-$header_logo_login = $hl_path . '/logo.png';
+$header_logo = $hl_path . '/' . ($_themeoptions['variants'][$themevariant]['img']['ui'] ?? 'logo_white.png');
+$header_logo_login = $hl_path . '/' . ($_themeoptions['variants'][$themevariant]['img']['login'] ?? 'logo_white.png');
 
 if (Settings::Get('panel.logo_overridetheme') == 1 || Settings::Get('panel.logo_overridecustom') == 1) {
 	// logo settings shall overwrite theme logo and possible custom logo

ssl_certificates.php

@@ -56,15 +56,13 @@ if ($action == 'delete') {
 		'page' => $page
 	]);
 } elseif (isset($_POST['send']) && $_POST['send'] == 'send' && $action == 'deletesure' && $id > 0) {
-	if ($id > 0) {
-		try {
-			$json_result = Certificates::getLocal($userinfo, [
-				'id' => $id
-			])->delete();
-			$success_message = lng('domains.ssl_certificate_removed', [$id]);
-		} catch (Exception $e) {
-			Response::dynamicError($e->getMessage());
-		}
+	try {
+		$json_result = Certificates::getLocal($userinfo, [
+			'id' => $id
+		])->delete();
+		$success_message = lng('domains.ssl_certificate_removed', [$id]);
+	} catch (Exception $e) {
+		Response::dynamicError($e->getMessage());
 	}
 }
 
@@ -73,7 +71,8 @@ $log->logAction(FroxlorLogger::USR_ACTION, LOG_NOTICE, "viewed domains::ssl_cert
 try {
 	$certificates_list_data = include_once dirname(__FILE__) . '/lib/tablelisting/tablelisting.sslcertificates.php';
 	$collection = (new Collection(Certificates::class, $userinfo))
-		->withPagination($certificates_list_data['sslcertificates_list']['columns'], $certificates_list_data['sslcertificates_list']['default_sorting']);
+		->withPagination($certificates_list_data['sslcertificates_list']['columns'],
+			$certificates_list_data['sslcertificates_list']['default_sorting']);
 	if ($userinfo['adminsession'] == 1) {
 		$collection->has('domains', Domains::class, 'domainid', 'id');
 	} else {

templates/Froxlor/config.json

@@ -1,6 +1,10 @@
 {
 	"variants": {
 		"default": {
+			"img": {
+				"login": "logo.png",
+				"ui": "logo_white.png"
+			},
 			"css": [
 				"main.css",
 				"custom.css"
@@ -12,6 +16,10 @@
 			"description": "Default"
 		},
 		"dark": {
+			"img": {
+				"login": "logo_white.png",
+				"ui": "logo_white.png"
+			},
 			"css": [
 				"dark.css",
 				"custom.css"

templates/Froxlor/footer.html.twig

@@ -8,23 +8,16 @@
 				{{ call_static('\\Froxlor\\Froxlor', 'getFullVersion') }}
 			{% endif %}
 		{% endif %}
-		&copy; 2009-{{ "now"|date("Y") }} by <a href="https://www.froxlor.org/" rel="external">the Froxlor Team</a><br>
+		&copy; 2009-{{ "now"|date("Y") }} by <a href="https://www.froxlor.org/" rel="external" target="_blank">the Froxlor Team</a><br>
 		{% if install_mode is not defined %}
-			{% if (get_setting('panel.imprint_url') != '') %}
-				<a href="{{ get_setting('panel.imprint_url') }}" target="_blank" class="footer-link">{{ lng('imprint') }}</a>
-			{% endif %}
-			{% if (get_setting('panel.terms_url') != '') %}
-				<a href="{{ get_setting('panel.terms_url') }}" target="_blank" class="footer-link">{{ lng('terms') }}</a>
-			{% endif %}
-			{% if (get_setting('panel.privacy_url') != '') %}
-				<a href="{{ get_setting('panel.privacy_url') }}" target="_blank" class="footer-link">{{ lng('privacy') }}</a>
-			{% endif %}
+			{% if (get_setting('panel.imprint_url') != '') %}<a href="{{ get_setting('panel.imprint_url') }}" target="_blank" class="footer-link">{{ lng('imprint') }}</a>{% endif %}
+			{% if (get_setting('panel.terms_url') != '') %}<a href="{{ get_setting('panel.terms_url') }}" target="_blank" class="footer-link">{{ lng('terms') }}</a>{% endif %}
+			{% if (get_setting('panel.privacy_url') != '') %}<a href="{{ get_setting('panel.privacy_url') }}" target="_blank" class="footer-link">{{ lng('privacy') }}</a>{% endif %}
 		{% endif %}
 	</span>
 
     {% if lng('translator') %}
-        <span class="mt-3">
-			{{ lng('panel.translator') }}: {{ lng('translator') }}
-		</span>
+		<br/>
+        <small class="mt-3">{{ lng('panel.translator') }}: {{ lng('translator') }}</small>
     {% endif %}
 </footer>

templates/Froxlor/login/fpwd.html.twig

@@ -1,10 +1,10 @@
 {% extends "Froxlor/base.html.twig" %}
 
-{% block body %}
+{% block content %}
 	<div class="container">
 		<div class="row justify-content-center">
 			<form class="col-12 max-w-420 d-flex flex-column" method="post" enctype="application/x-www-form-urlencoded">
-				<img class="align-self-center mb-5" src="{{ header_logo_login }}" alt="Froxlor Server Management Panel"/>
+				<img class="align-self-center my-5" src="{{ header_logo_login }}" alt="Froxlor Server Management Panel"/>
 
 				<div class="card shadow">
 					<div class="card-body">

templates/Froxlor/login/rpwd.html.twig

@@ -1,10 +1,10 @@
 {% extends "Froxlor/base.html.twig" %}
 
-{% block body %}
+{% block content %}
 	<div class="container">
 		<div class="row justify-content-center">
 			<form action="{{ formaction }}" class="col-12 max-w-420 d-flex flex-column" method="post" enctype="application/x-www-form-urlencoded">
-				<img class="align-self-center mb-5" src="{{ header_logo_login }}" alt="Froxlor Server Management Panel"/>
+				<img class="align-self-center my-5" src="{{ header_logo_login }}" alt="Froxlor Server Management Panel"/>
 
 				<div class="card shadow">
 					<div class="card-body">

templates/Froxlor/src/scss/components/_footer.scss

@@ -5,4 +5,9 @@ footer {
 		@extend .text-muted;
 		@extend .text-decoration-none;
 	}
+
+	.footer-link:not(:last-child):after {
+		content: ' •';
+		padding: 0 0.25rem;
+	}
 }