More .editorconfig improvements
This commit is contained in:
Igor Scheller
msquare
parent
85d9e01489
commit
d79d2c87bc
|
|
@ -8,17 +8,34 @@ root = true
|
|||
charset = utf-8
|
||||
end_of_line = lf
|
||||
indent_style = space
|
||||
indent_size = 4
|
||||
insert_final_newline = true
|
||||
trim_trailing_whitespace = true
|
||||
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]
|
||||
trim_trailing_whitespace = false
|
||||
indent_size = 2
|
||||
|
||||
[*.php]
|
||||
indent_size = 4
|
||||
|
||||
[*.{js,css,less,sass,scss}]
|
||||
[*.sh]
|
||||
indent_size = 2
|
||||
|
||||
[*.{yml,yaml}]
|
||||
|
|
|
|||
|
|
@ -11,9 +11,9 @@ Please also read the [CONTRIBUTING.md](CONTRIBUTING.md).
|
|||
## Local build
|
||||
The following instructions explain how to get, build and run the latest Engelsystem version directly from the git master branch (may be unstable!).
|
||||
|
||||
* Clone the master branch: `git clone https://github.com/engelsystem/engelsystem.git`
|
||||
* Install [Composer](https://getcomposer.org/download/) and [Yarn](https://yarnpkg.com/en/docs/install) (which requires [Node.js](https://nodejs.org/en/download/package-manager/))
|
||||
* Install project dependencies:
|
||||
* Clone the master branch: `git clone https://github.com/engelsystem/engelsystem.git`
|
||||
* Install [Composer](https://getcomposer.org/download/) and [Yarn](https://yarnpkg.com/en/docs/install) (which requires [Node.js](https://nodejs.org/en/download/package-manager/))
|
||||
* Install project dependencies:
|
||||
```bash
|
||||
composer install
|
||||
yarn
|
||||
|
|
@ -24,12 +24,12 @@ The following instructions explain how to get, build and run the latest Engelsys
|
|||
composer dump-autoload --optimize
|
||||
```
|
||||
to install the Engelsystem
|
||||
* Build the frontend assets
|
||||
```bash
|
||||
yarn build
|
||||
```
|
||||
* Optionally (for better performance)
|
||||
* Generate translation files
|
||||
* Build the frontend assets
|
||||
```bash
|
||||
yarn build
|
||||
```
|
||||
* Optionally (for better performance)
|
||||
* Generate translation files
|
||||
```bash
|
||||
find resources/lang/ -type f -name '*.po' -exec sh -c 'file="{}"; msgfmt "${file%.*}.po" -o "${file%.*}.mo"' \;
|
||||
```
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
bootstrap="./includes/autoload.php"
|
||||
colors="true"
|
||||
|
|
|
|||
|
|
@ -3,7 +3,8 @@
|
|||
{% if label -%}
|
||||
<label for="{{ name }}"{% if opt.hide_label|default(false) %} class="sr-only"{% endif %}>{{ label }}</label>
|
||||
{%- endif %}
|
||||
<input type="{{ type|default('text') }}" class="form-control"
|
||||
<input
|
||||
type="{{ type|default('text') }}" class="form-control"
|
||||
id="{{ name }}" name="{{ name }}"
|
||||
value="{{ opt.value|default('')|escape('html_attr') }}"
|
||||
{%- if opt.required|default(false) %}
|
||||
|
|
@ -52,7 +53,8 @@
|
|||
<div class="checkbox">
|
||||
<label>
|
||||
<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>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -53,8 +53,10 @@
|
|||
<div class="form-group">
|
||||
<div class="input-group">
|
||||
<span class="input-group-addon input-lg">{{ m.glyphicon('lock') }}</span>
|
||||
<input class="form-control input-lg" id="form_password"
|
||||
type="password" name="password" value="" placeholder="{{ __('Password') }}">
|
||||
<input
|
||||
class="form-control input-lg" id="form_password"
|
||||
type="password" name="password" value="" placeholder="{{ __('Password') }}"
|
||||
>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -6,8 +6,10 @@
|
|||
<div class="form-group">%start_select%</div>
|
||||
<div class="form-group">
|
||||
<div class="input-group time">
|
||||
<input 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%">
|
||||
<input
|
||||
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">
|
||||
<button class="btn btn-default" title="Now" type="button">
|
||||
<span class="glyphicon glyphicon-time"></span>
|
||||
|
|
@ -19,8 +21,10 @@
|
|||
<div class="form-group">%end_select%</div>
|
||||
<div class="form-group">
|
||||
<div class="input-group time">
|
||||
<input 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%">
|
||||
<input
|
||||
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">
|
||||
<button class="btn btn-default" title="Now" type="button">
|
||||
<span class="glyphicon glyphicon-time"></span>
|
||||
|
|
|
|||
Loading…
Reference in New Issue