more beautification b/c of bootstrap 5.3

Signed-off-by: Michael Kaufmann <[email protected]>
froxlor · Oct 17, 2023 · 7556685 · 7556685
1 parent 965e2df
commit 7556685
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 12 deletions.
diff --git a/lib/Froxlor/UI/Callbacks/Domain.php b/lib/Froxlor/UI/Callbacks/Domain.php
@@ -33,6 +33,11 @@
 
 class Domain
 {
+	public static function domainLink(array $attributes)
+	{
+		return '<a href="https://' . $attributes['data'] . '" target="_blank">' . $attributes['data'] . '</a>';
+	}
+
 	public static function domainWithCustomerLink(array $attributes)
 	{
 		$linker = UI::getLinker();

diff --git a/lib/tablelisting/admin/tablelisting.domains.php b/lib/tablelisting/admin/tablelisting.domains.php
@@ -50,6 +50,7 @@
 				'label' => lng('domains.domainname'),
 				'field' => 'domain_ace',
 				'isdefaultsearchfield' => true,
+				'callback' => [Domain::class, 'domainLink'],
 			],
 			'ipsandports' => [
 				'label' => lng('admin.ipsandports.ipsandports'),

diff --git a/templates/Froxlor/assets/scss/components/_form.scss b/templates/Froxlor/assets/scss/components/_form.scss
@@ -1,4 +1,11 @@
-// wip
+.form-control-plaintext {
+	outline: none;
+}
+
+.form-control[readonly] {
+	background: $body-tertiary-bg;
+}
+
 @include color-mode(dark) {
 	.formfield {
 		border-bottom: $border-color-dark solid 1px;

diff --git a/templates/Froxlor/assets/scss/components/_generic.scss b/templates/Froxlor/assets/scss/components/_generic.scss
@@ -7,14 +7,6 @@
 	height: 24px;
 }
 
-.form-control-plaintext {
-	outline: none;
-}
-
-.form-control[readonly] {
-	background: rgba(0, 0, 0, .15);
-}
-
 .page-header {
 	margin-bottom: 2rem;
 

diff --git a/templates/Froxlor/form/form.html.twig b/templates/Froxlor/form/form.html.twig
@@ -37,7 +37,7 @@
 				<div class="col-12 text-center mb-2 d-grid gap-2 d-md-block">
 					{% if form_data.buttons is defined and form_data.buttons is iterable %}
 						{% for btn in form_data.buttons %}
-							<button type="{{ btn.type|default("submit") }}" class="btn btn-lg {{ btn.class|default(" btn-primary") }}">{{ btn.label }}</button>
+							<button type="{{ btn.type|default("submit") }}" class="btn btn-lg {{ btn.class|default(" btn-primary") }}{% if not loop.last %} me-md-3{% endif %}">{{ btn.label }}</button>
 						{% endfor %}
 					{% else %}
 						<button type="reset" class="btn btn-lg btn-outline-secondary me-md-3">{{ lng('panel.reset') }}</button>

diff --git a/templates/Froxlor/settings/configuration.html.twig b/templates/Froxlor/settings/configuration.html.twig
@@ -112,8 +112,8 @@
 				{{ lng('admin.configfiles.recommendednote') }}
 			</div>
 			<div class="col-12 col-md-6 text-end">
-				<button type="button" class="btn btn-outline-secondary" id="selectRecommendedConfig">{{ lng('admin.configfiles.selectrecommended') }}</button>
-				<button type="button" class="btn btn-outline-secondary" id="downloadSelectionAsJson">
+				<button type="button" class="btn btn-outline-secondary me-1" id="selectRecommendedConfig">{{ lng('admin.configfiles.selectrecommended') }}</button>
+				<button type="button" class="btn btn-outline-secondary me-1" id="downloadSelectionAsJson">
 					<i class="fa-solid fa-download"></i>
 					{{ lng('admin.configfiles.downloadselected') }}</button>
 				<button type="submit" class="btn btn-primary">{{ lng('update.proceed') }}</button>