mirror of
https://gitlab.com/crafty-controller/crafty-4.git
synced 2024-08-30 18:23:09 +00:00
Merge branch 'enhancement/config-json' of gitlab.com:crafty-controller/crafty-4 into enhancement/config-json
This commit is contained in:
commit
07220f68bf
@ -46,9 +46,17 @@
|
|||||||
<small class="text-muted ml-1">
|
<small class="text-muted ml-1">
|
||||||
</small> </label>
|
</small> </label>
|
||||||
{% if isinstance(item[1], list) %}
|
{% if isinstance(item[1], list) %}
|
||||||
<br>
|
<<<<<<< HEAD <br>
|
||||||
<textarea value="{{','.join(item[1])}}" type="text" name="{{item[0]}}"
|
<textarea value="{{','.join(item[1])}}" type="text" name="{{item[0]}}"
|
||||||
class="list">{{','.join(item[1])}}</textarea>
|
class="list">{{','.join(item[1])}}</textarea>
|
||||||
|
=======
|
||||||
|
<ul id="list-{{item[0]}}" class="list">
|
||||||
|
{% for li in item[1] %}
|
||||||
|
<li data-name="list-{{item[0]}}" style="color: white; margin-left: 20px;" selected readonly>{{li}}</li>
|
||||||
|
<br />
|
||||||
|
{% end %}
|
||||||
|
</ul>
|
||||||
|
>>>>>>> 99ccfb222840ed1c7d871763887d7108e178710d
|
||||||
{% elif isinstance(item[1], bool) %}
|
{% elif isinstance(item[1], bool) %}
|
||||||
|
|
||||||
{% if item[1] == True %}
|
{% if item[1] == True %}
|
||||||
@ -70,8 +78,8 @@
|
|||||||
<input type="number" class="form-control" name="{{item[0]}}" id="{{item[0]}}" value="{{ item[1] }}"
|
<input type="number" class="form-control" name="{{item[0]}}" id="{{item[0]}}" value="{{ item[1] }}"
|
||||||
step="1" min="0" required>
|
step="1" min="0" required>
|
||||||
{% else %}
|
{% else %}
|
||||||
<input type="text" class="form-control" name="{{item[0]}}" id="{{item[0]}}" value="{{ item[1] }}" step="2"
|
<input type="text" class="form-control" name="{{item[0]}}" id="{{item[0]}}" value="{{ item[1] }}"
|
||||||
min="0" required>
|
step="2" min="0" required>
|
||||||
{% end %}
|
{% end %}
|
||||||
{% end %}
|
{% end %}
|
||||||
<button type="submit">Submit</button>
|
<button type="submit">Submit</button>
|
||||||
|
Loading…
Reference in New Issue
Block a user