mirror/Part-DB.Part-DB-server
1
0
Fork 1
mirror of https://github.com/Part-DB/Part-DB-server.git synced 2025-08-17 16:21:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed input-group-prepend / -append classes, as they are not needed anymore.

Browse source
This commit is contained in:
Jan Böhmer 2022-07-24 21:26:01 +02:00
parent 9ed487c629
commit 103969a283
6 changed files with 59 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

11
templates/AdminPages/LabelProfileAdmin.html.twig
View file

@ -25,15 +25,16 @@
{% block additional_controls %} {% block additional_controls %}
{{ form_row(form.show_in_dropdown) }} {{ form_row(form.show_in_dropdown) }}
{{ form_row(form.options.supported_element) }} {{ form_row(form.options.supported_element) }}
<div class="form-group row"> <div class="mb-2 row">
{{ form_label(form.options.width) }} {{ form_label(form.options.width) }}
<div class="input-group col-9"> <div class="col-sm-9">
<div class="input-group">
{{ form_widget(form.options.width) }} {{ form_widget(form.options.width) }}
<div class="input-group-append input-group-prepend">
<span class="input-group-text">x</span> <span class="input-group-text">x</span>
</div>
{{ form_widget(form.options.height) }} {{ form_widget(form.options.height) }}
<div class="input-group-append">
<span class="input-group-text">mm</span> <span class="input-group-text">mm</span>
</div> </div>
</div> </div>

2
templates/Form/extendedBootstrap4_layout.html.twig
View file

@ -40,7 +40,6 @@
{% block si_unit_widget %} {% block si_unit_widget %}
<div class="input-group {% if sm %}input-group-sm{% endif %}"> <div class="input-group {% if sm %}input-group-sm{% endif %}">
{{ form_widget(form.value) }} {{ form_widget(form.value) }}
<div class="input-group-append {% if sm %}input-group-sm{% endif %}">
{% if form.prefix is defined %} {% if form.prefix is defined %}
{{ form_widget(form.prefix, {'attr': {'class': 'form-select'}}) }} {{ form_widget(form.prefix, {'attr': {'class': 'form-select'}}) }}
{% endif %} {% endif %}
@ -48,7 +47,6 @@
<label class="input-group-text">{{ unit }}</label> <label class="input-group-text">{{ unit }}</label>
{% endif %} {% endif %}
</div> </div>
</div>
{{ form_errors(form.value) }} {{ form_errors(form.value) }}
{% endblock %} {% endblock %}

11
templates/LabelSystem/dialog.html.twig
View file

@ -31,15 +31,16 @@
{{ form_row(form.target_id) }} {{ form_row(form.target_id) }}
{{ form_row(form.options.supported_element) }} {{ form_row(form.options.supported_element) }}
<div class="form-group row"> <div class="mb-2 row">
{{ form_label(form.options.width) }} {{ form_label(form.options.width) }}
<div class="input-group col-9"> <div class="col-sm-9">
<div class="input-group">
{{ form_widget(form.options.width) }} {{ form_widget(form.options.width) }}
<div class="input-group-append input-group-prepend">
<span class="input-group-text">x</span> <span class="input-group-text">x</span>
</div>
{{ form_widget(form.options.height) }} {{ form_widget(form.options.height) }}
<div class="input-group-append">
<span class="input-group-text">mm</span> <span class="input-group-text">mm</span>
</div> </div>
</div> </div>

2
templates/Parts/edit/edit_form_styles.html.twig
View file

@ -6,10 +6,8 @@
<td> <td>
<div class="input-group input-group-sm"> <div class="input-group input-group-sm">
{{ form_widget(form.price) }} {{ form_widget(form.price) }}
<div class="input-group-append">
{{ form_widget(form.currency, {'attr': {'class': 'selectpicker form-control-sm', 'data-controller': 'elements--selectpicker'}}) }} {{ form_widget(form.currency, {'attr': {'class': 'selectpicker form-control-sm', 'data-controller': 'elements--selectpicker'}}) }}
</div> </div>
</div>
{{ form_errors(form.price) }} {{ form_errors(form.price) }}
{{ form_errors(form.currency) }} {{ form_errors(form.currency) }}
</td> </td>

15
templates/Tools/ReelCalculator/main.html.twig
View file

@ -18,33 +18,27 @@
<div class="form-group row"> <div class="form-group row">
<label for="reel_dia_inner" class="col-sm-4 col-form-label">{% trans %}tools.reel_calc.inner_dia{% endtrans %} <var>d<sub>0</sub></var>:</label> <label for="reel_dia_inner" class="col-sm-4 col-form-label">{% trans %}tools.reel_calc.inner_dia{% endtrans %} <var>d<sub>0</sub></var>:</label>
<div class="col-sm-8 input-group"> <div class="col-sm-8 input-group">
<div class="input-group-prepend">
<button class="btn btn-outline-secondary dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"></button> <button class="btn btn-outline-secondary dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"></button>
<div class="dropdown-menu"> <div class="dropdown-menu">
<h6 class="dropdown-header">{% trans %}tools.reel_calc.load_preset{% endtrans %}</h6> <h6 class="dropdown-header">{% trans %}tools.reel_calc.load_preset{% endtrans %}</h6>
<button class="dropdown-item" data-target="reel_dia_inner" data-value="60" onclick="loadPreset(this);">60 mm Reel</button> <button class="dropdown-item" data-target="reel_dia_inner" data-value="60" onclick="loadPreset(this);">60 mm Reel</button>
<button class="dropdown-item" data-target="reel_dia_inner" data-value="62" onclick="loadPreset(this);">62 mm Reel</button> <button class="dropdown-item" data-target="reel_dia_inner" data-value="62" onclick="loadPreset(this);">62 mm Reel</button>
</div> </div>
</div>
<input class="form-control" id="reel_dia_inner" type="number" min="0"> <input class="form-control" id="reel_dia_inner" type="number" min="0">
<div class="input-group-append">
<span class="input-group-text">mm</span> <span class="input-group-text">mm</span>
</div> </div>
</div> </div>
</div>
<div class="form-group row"> <div class="form-group row">
<label for="reel_dia_outer" class="col-sm-4 col-form-label">{% trans %}tools.reel_calc.outer_dia{% endtrans %} <var>d<sub>1</sub></var>:</label> <label for="reel_dia_outer" class="col-sm-4 col-form-label">{% trans %}tools.reel_calc.outer_dia{% endtrans %} <var>d<sub>1</sub></var>:</label>
<div class="col-sm-8 input-group"> <div class="col-sm-8 input-group">
<input class="form-control" id="reel_dia_outer" type="number" min="0"> <input class="form-control" id="reel_dia_outer" type="number" min="0">
<div class="input-group-append">
<span class="input-group-text">mm</span> <span class="input-group-text">mm</span>
</div> </div>
</div> </div>
</div>
<div class="form-group row"> <div class="form-group row">
<label for="reel_tape_thick" class="col-sm-4 col-form-label">{% trans %}tools.reel_calc.tape_thick{% endtrans %} <var>a</var>:</label> <label for="reel_tape_thick" class="col-sm-4 col-form-label">{% trans %}tools.reel_calc.tape_thick{% endtrans %} <var>a</var>:</label>
<div class="col-sm-8 input-group"> <div class="col-sm-8 input-group">
<div class="input-group-prepend">
<button class="btn btn-outline-secondary dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"></button> <button class="btn btn-outline-secondary dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"></button>
<div class="dropdown-menu"> <div class="dropdown-menu">
<h6 class="dropdown-header">{% trans %}tools.reel_calc.load_preset{% endtrans %}</h6> <h6 class="dropdown-header">{% trans %}tools.reel_calc.load_preset{% endtrans %}</h6>
@ -56,30 +50,23 @@
<button class="dropdown-item" data-target="reel_tape_thick" data-value="0.95" onclick="loadPreset(this);">8 mm Blister 0805 (0.95 mm)</button> <button class="dropdown-item" data-target="reel_tape_thick" data-value="0.95" onclick="loadPreset(this);">8 mm Blister 0805 (0.95 mm)</button>
<button class="dropdown-item" data-target="reel_tape_thick" data-value="1.1" onclick="loadPreset(this);">8 mm Blister 1206 (1.1 mm)</button> <button class="dropdown-item" data-target="reel_tape_thick" data-value="1.1" onclick="loadPreset(this);">8 mm Blister 1206 (1.1 mm)</button>
</div> </div>
</div>
<input class="form-control" id="reel_tape_thick" type="number" min="0"> <input class="form-control" id="reel_tape_thick" type="number" min="0">
<div class="input-group-append">
<span class="input-group-text">mm</span> <span class="input-group-text">mm</span>
</div> </div>
</div> </div>
</div>
<div class="form-group row"> <div class="form-group row">
<label for="reel_part_distance" class="col-sm-4 col-form-label">{% trans %}tools.reel_calc.part_distance{% endtrans %} <var>b</var>:</label> <label for="reel_part_distance" class="col-sm-4 col-form-label">{% trans %}tools.reel_calc.part_distance{% endtrans %} <var>b</var>:</label>
<div class="col-sm-8 input-group"> <div class="col-sm-8 input-group">
<div class="input-group-prepend">
<button class="btn btn-outline-secondary dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"></button> <button class="btn btn-outline-secondary dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"></button>
<div class="dropdown-menu"> <div class="dropdown-menu">
<h6 class="dropdown-header">{% trans %}tools.reel_calc.load_preset{% endtrans %}</h6> <h6 class="dropdown-header">{% trans %}tools.reel_calc.load_preset{% endtrans %}</h6>
<button class="dropdown-item" data-target="reel_part_distance" data-value="4" onclick="loadPreset(this);">8 mm Paper Tape 0603/0805/1206 (4 mm)</button> <button class="dropdown-item" data-target="reel_part_distance" data-value="4" onclick="loadPreset(this);">8 mm Paper Tape 0603/0805/1206 (4 mm)</button>
</div> </div>
</div>
<input class="form-control" id="reel_part_distance" type="number" min="0"> <input class="form-control" id="reel_part_distance" type="number" min="0">
<div class="input-group-append">
<span class="input-group-text">mm</span> <span class="input-group-text">mm</span>
</div> </div>
</div> </div>
</div>
<div class="form-group row"> <div class="form-group row">
<div class="col-sm-8 offset-sm-4 input-group"> <div class="col-sm-8 offset-sm-4 input-group">
<button type="button" onclick="updateReelCalc()" class="btn btn-primary">{% trans %}tools.reel_calc.update{% endtrans %}</button> <button type="button" onclick="updateReelCalc()" class="btn btn-primary">{% trans %}tools.reel_calc.update{% endtrans %}</button>

8
templates/_sidebar.html.twig
View file

@ -17,14 +17,12 @@
<ul class="nav flex-column"> <ul class="nav flex-column">
<li id="treeBox-categories"> <li id="treeBox-categories">
<div class="input-group input-group-sm mb-2 mt-1"> <div class="input-group input-group-sm mb-2 mt-1">
<div class="input-group-prepend">
<button class="btn btn-light dropdown-toggle" type="button" <button class="btn btn-light dropdown-toggle" type="button"
data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"
><span class="sidebar-title" id="tree-categories-title">{% trans %}category.labelp{% endtrans %}</span></button> ><span class="sidebar-title" id="tree-categories-title">{% trans %}category.labelp{% endtrans %}</span></button>
<ul class="dropdown-menu" aria-labelledby="dropdownCat"> <ul class="dropdown-menu" aria-labelledby="dropdownCat">
{{ _self.sidebar_dropdown('tree-categories') }} {{ _self.sidebar_dropdown('tree-categories') }}
</ul> </ul>
</div>
<input type="search" class="form-control bg-light border-0" id="tree-category-search" placeholder="{% trans %}search.placeholder{% endtrans %}"> <input type="search" class="form-control bg-light border-0" id="tree-category-search" placeholder="{% trans %}search.placeholder{% endtrans %}">
</div> </div>
@ -32,7 +30,6 @@
</li> </li>
<li id="treeBox-devices" class="d-sm-none d-md-block"> <li id="treeBox-devices" class="d-sm-none d-md-block">
<div class="input-group input-group-sm mb-2 mt-2"> <div class="input-group input-group-sm mb-2 mt-2">
<div class="input-group-prepend">
<button class="btn btn-light dropdown-toggle" type="button" <button class="btn btn-light dropdown-toggle" type="button"
data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"
><span class="sidebar-title" id="tree-devices-title">{% trans %}device.labelp{% endtrans %}</span></button> ><span class="sidebar-title" id="tree-devices-title">{% trans %}device.labelp{% endtrans %}</span></button>
@ -40,7 +37,6 @@
<ul class="dropdown-menu" aria-labelledby="dropdownDev"> <ul class="dropdown-menu" aria-labelledby="dropdownDev">
{{ _self.sidebar_dropdown('tree-devices') }} {{ _self.sidebar_dropdown('tree-devices') }}
</ul> </ul>
</div>
<input type="search" class="form-control bg-light border-0" id="tree-devices-search" placeholder="{% trans %}search.placeholder{% endtrans %}"> <input type="search" class="form-control bg-light border-0" id="tree-devices-search" placeholder="{% trans %}search.placeholder{% endtrans %}">
</div> </div>
@ -49,7 +45,6 @@
<li id="treeBox-tools"> <li id="treeBox-tools">
<div class="input-group input-group-sm mb-2 mt-2"> <div class="input-group input-group-sm mb-2 mt-2">
<div class="input-group-prepend">
<button class="btn btn-light dropdown-toggle" type="button" <button class="btn btn-light dropdown-toggle" type="button"
data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"
><span class="sidebar-title" id="tree-tools-title">{% trans %}tools.label{% endtrans %}</span></button> ><span class="sidebar-title" id="tree-tools-title">{% trans %}tools.label{% endtrans %}</span></button>
@ -57,9 +52,6 @@
<ul class="dropdown-menu" aria-labelledby="dropdownTools"> <ul class="dropdown-menu" aria-labelledby="dropdownTools">
{{ _self.sidebar_dropdown('tree-tools') }} {{ _self.sidebar_dropdown('tree-tools') }}
</ul> </ul>
</div>
<input type="search" class="form-control bg-light border-0" id="tree-tools-search" placeholder="{% trans %}search.placeholder{% endtrans %}"> <input type="search" class="form-control bg-light border-0" id="tree-tools-search" placeholder="{% trans %}search.placeholder{% endtrans %}">