iger
/
engelsystem
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

More .editorconfig improvements

This commit is contained in:
Igor Scheller 2020-06-01 15:13:21 +02:00 committed by msquare
parent 85d9e01489
commit d79d2c87bc
9 changed files with 93 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
.editorconfig
View File

@ -8,17 +8,34 @@ root = true
charset = utf-8 charset = utf-8
end_of_line = lf end_of_line = lf
indent_style = space indent_style = space
indent_size = 4
insert_final_newline = true insert_final_newline = true
trim_trailing_whitespace = true trim_trailing_whitespace = true
max_line_length = 120 max_line_length = 120
[{.babelrc,package.json}]
indent_size = 2
[docker/**.conf]
indent_size = 2
[*.{htm,html,twig}]
indent_size = 4
[*.{js,css,less,sass,scss}]
indent_size = 2
[{LICENSE,db/*.sql}]
indent_size = unset
[*.md] [*.md]
trim_trailing_whitespace = false trim_trailing_whitespace = false
indent_size = 2
[*.php] [*.php]
indent_size = 4 indent_size = 4
[*.{js,css,less,sass,scss}] [*.sh]
indent_size = 2 indent_size = 2
[*.{yml,yaml}] [*.{yml,yaml}]

3
phpunit.xml
View File

@ -1,4 +1,5 @@
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <phpunit
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/9.1/phpunit.xsd" xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/9.1/phpunit.xsd"
bootstrap="./includes/autoload.php" bootstrap="./includes/autoload.php"
colors="true" colors="true"

6
resources/views/macros/form.twig
View File

@ -3,7 +3,8 @@
{% if label -%} {% if label -%}
<label for="{{ name }}"{% if opt.hide_label|default(false) %} class="sr-only"{% endif %}>{{ label }}</label> <label for="{{ name }}"{% if opt.hide_label|default(false) %} class="sr-only"{% endif %}>{{ label }}</label>
{%- endif %} {%- endif %}
<input type="{{ type|default('text') }}" class="form-control" <input
type="{{ type|default('text') }}" class="form-control"
id="{{ name }}" name="{{ name }}" id="{{ name }}" name="{{ name }}"
value="{{ opt.value|default('')|escape('html_attr') }}" value="{{ opt.value|default('')|escape('html_attr') }}"
{%- if opt.required|default(false) %} {%- if opt.required|default(false) %}
@ -52,7 +53,8 @@
<div class="checkbox"> <div class="checkbox">
<label> <label>
<input type="checkbox" id="{{ name }}" name="{{ name }}" value="{{ value|default('1') }}" <input type="checkbox" id="{{ name }}" name="{{ name }}" value="{{ value|default('1') }}"
{%- if checked|default(false) %} checked{% endif %}> {%- if checked|default(false) %} checked{% endif %}
>
{{ label }} {{ label }}
</label> </label>
</div> </div>

6
resources/views/pages/login.twig
View File

@ -53,8 +53,10 @@
<div class="form-group"> <div class="form-group">
<div class="input-group"> <div class="input-group">
<span class="input-group-addon input-lg">{{ m.glyphicon('lock') }}</span> <span class="input-group-addon input-lg">{{ m.glyphicon('lock') }}</span>
<input class="form-control input-lg" id="form_password" <input
type="password" name="password" value="" placeholder="{{ __('Password') }}"> class="form-control input-lg" id="form_password"
type="password" name="password" value="" placeholder="{{ __('Password') }}"
>
</div> </div>
</div> </div>

12
resources/views/pages/user-shifts.html
View File

@ -6,8 +6,10 @@
<div class="form-group">%start_select%</div> <div class="form-group">%start_select%</div>
<div class="form-group"> <div class="form-group">
<div class="input-group time"> <div class="input-group time">
<input type="time" class="form-control" id="start_time" name="start_time" size="5" <input
pattern="^\d{1,2}:\d{2}$" placeholder="HH:MM" maxlength="5" value="%start_time%"> type="time" class="form-control" id="start_time" name="start_time" size="5"
pattern="^\d{1,2}:\d{2}$" placeholder="HH:MM" maxlength="5" value="%start_time%"
>
<div class="input-group-btn"> <div class="input-group-btn">
<button class="btn btn-default" title="Now" type="button"> <button class="btn btn-default" title="Now" type="button">
<span class="glyphicon glyphicon-time"></span> <span class="glyphicon glyphicon-time"></span>
@ -19,8 +21,10 @@
<div class="form-group">%end_select%</div> <div class="form-group">%end_select%</div>
<div class="form-group"> <div class="form-group">
<div class="input-group time"> <div class="input-group time">
<input type="time" class="form-control" id="end_time" name="end_time" size="5" <input
pattern="^\d{1,2}:\d{2}$" placeholder="HH:MM" maxlength="5" value="%end_time%"> type="time" class="form-control" id="end_time" name="end_time" size="5"
pattern="^\d{1,2}:\d{2}$" placeholder="HH:MM" maxlength="5" value="%end_time%"
>
<div class="input-group-btn"> <div class="input-group-btn">
<button class="btn btn-default" title="Now" type="button"> <button class="btn btn-default" title="Now" type="button">
<span class="glyphicon glyphicon-time"></span> <span class="glyphicon glyphicon-time"></span>