maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

set minimum php version to 7.4 and fix templates

Browse Source
This commit is contained in:
envoyr
2022-02-18 18:50:45 +01:00
parent e1b09e49fd
commit 36dbb3bdcc
24 changed files with 91 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
templates/Froxlor/assets/css/dark.css
View File

@@ -20527,3 +20527,7 @@ readers do not read off random characters that represent icons */
.max-h-before-header {
max-height: calc(100vh - 4.375rem);
}
.rounded-tl-bl {
border-radius: 0.5rem 0 0.5rem 0;
}

5
templates/Froxlor/assets/css/main.css
View File

@@ -20528,6 +20528,10 @@ readers do not read off random characters that represent icons */
max-height: calc(100vh - 4.375rem);
}
.rounded-tl-bl {
border-radius: 0.5rem 0 0.5rem 0;
}
.navbar {
background: #f7f7f7;
}
@@ -20580,4 +20584,5 @@ readers do not read off random characters that represent icons */
}
.card .card-header {
border-bottom: #e5e5e5 solid 1px;
font-weight: bold;
}

4
templates/Froxlor/base.html.twig
View File

@@ -9,7 +9,7 @@
<!-- CSS -->
{% if theme_css is empty %}
<link href="templates/Froxlor/assets/css/main.css" rel="stylesheet" type="text/css" />
<link href="{{ basehref|default('') }}templates/Froxlor/assets/css/main.css" rel="stylesheet" type="text/css" />
{% else %}
{{ theme_css|raw }}
{% endif %}
@@ -17,7 +17,7 @@
<!-- Scripts -->
{% if theme_js is empty %}
<script type="text/javascript" src="templates/Froxlor/assets/js/main.js"></script>
<script type="text/javascript" src="{{ basehref|default('') }}templates/Froxlor/assets/js/main.js"></script>
{% else %}
{{ theme_js|raw }}
{% endif %}

75
templates/Froxlor/form/form.html.twig
View File

@@ -3,48 +3,43 @@
{% import "Froxlor/form/formfields.html.twig" as formfields %}
<form action="{{ action|default("") }}" method="post" enctype="application/x-www-form-urlencoded" class="form">
<div class="card mb-2">
{% if title is not empty %}
<div class="card-header">
{% if form_data.image is not empty %}
<i class="{{ form_data.image }}"></i>
{% endif %}
{{ title }}
</div>
{% endif %}
<div class="card-body">
{% for section in form_data.sections %}
<div class="card mb-3">
{% if section.title is not empty %}
<div class="card-header">
{% if section.image is not empty %}
<i class="{{ section.image }}"></i>
{% endif %}
{{ section.title }}
</div>
{% if title is not empty %}
<h3 class="page-header">
{% if form_data.image is not empty %}
<i class="{{ form_data.image }}"></i>
{% endif %}
{{ title }}
</h3>
{% endif %}
{% for section in form_data.sections %}
<div class="card mb-3">
{% if section.title is not empty %}
<div class="card-header">
{% if section.image is not empty %}
<i class="{{ section.image }}"></i>
{% endif %}
<div class="card-body">
{% for id,field in section.fields %}
{% if field.type == 'text' or field.type == 'password' %}
{{ formfields.input(id, field) }}
{% elseif field.type == 'textul' %}
{{ formfields.input_ul(id, field) }}
{% elseif field.type == 'checkbox' %}
{{ formfields.bool(id, field) }}
{% elseif field.type == 'select' %}
{{ formfields.select(id, field) }}
{% elseif field.type == 'textarea' %}
{{ formfields.textarea(id, field) }}
{% elseif field.type == 'label' %}
{{ formfields.plain(id, field) }}
{% endif %}
{% endfor %}
</div>
{{ section.title }}
</div>
{% endfor %}
{% endif %}
<div class="card-body">
{% for id,field in section.fields %}
{% if field.type == 'text' or field.type == 'password' %}
{{ formfields.input(id, field) }}
{% elseif field.type == 'textul' %}
{{ formfields.input_ul(id, field) }}
{% elseif field.type == 'checkbox' %}
{{ formfields.bool(id, field) }}
{% elseif field.type == 'select' %}
{{ formfields.select(id, field) }}
{% elseif field.type == 'textarea' %}
{{ formfields.textarea(id, field) }}
{% elseif field.type == 'label' %}
{{ formfields.plain(id, field) }}
{% endif %}
{% endfor %}
</div>
</div>
<!-- /card-body -->
</div>
<!-- /card -->
{% endfor %}
</form>
{% endmacro %}

2
templates/Froxlor/misc/configurehint.html.twig
View File

@@ -14,7 +14,7 @@
</div>
<div class="col text-white position-relative">
<img class="h-75 position-absolute bottom-0 end-0 rounded-corner-tl-bl" src="{{ basehref }}templates/Froxlor/assets/img/preview.jpg">
<img class="h-75 position-absolute bottom-0 end-0 rounded-tl-bl" src="{{ basehref }}templates/Froxlor/assets/img/preview.jpg">
</div>
</div>
<div class="mt-5 text-end">

4
templates/Froxlor/src/scss/_global.scss
View File

@@ -50,6 +50,10 @@
max-height: calc(100vh - ($spacer * 3.5));
}
.rounded-tl-bl {
border-radius: $border-radius 0 $border-radius 0;
}
footer {
@extend .text-muted;
}

1
templates/Froxlor/src/scss/components/_card.scss
View File

@@ -3,6 +3,7 @@
.card-header {
border-bottom: #e5e5e5 solid 1px;
font-weight: bold;
}
.card-body {
p {

1
templates/Froxlor/src/scss/components/_form.scss Normal file
View File

@@ -0,0 +1 @@
// wip

1
templates/Froxlor/src/scss/main.scss
View File

@@ -9,3 +9,4 @@
@import "components/navbar";
@import "components/sidebar";
@import "components/card";
@import "components/form";

3
templates/Froxlor/user/change_theme.html.twig
View File

@@ -24,7 +24,8 @@
<input type="hidden" name="send" value="send"/>
<button class="btn btn-primary rounded-top-0" type="submit" name="dosave">
<i class="fa-regular fa-floppy-disk"></i>
{{ lng('menue.main.changetheme') }}</button>
{{ lng('menue.main.changetheme') }}
</button>
</div>
</div>
</form>

2
templates/Froxlor/user/index.html.twig
View File

@@ -1,7 +1,7 @@
{% extends "Froxlor/userarea.html.twig" %}
{% block content %}
<h2 class="page-header">Dashboard</h2>
<h3 class="page-header">Dashboard</h3>
{% if get_setting('panel.is_configured') == 0 and userinfo.adminsession == 1 and userinfo.change_serversettings == 1 %}
<div class="alert alert-info position-relative p-5">