mirror/Part-DB.Part-DB-server
1
0
Fork 1
mirror of https://github.com/Part-DB/Part-DB-server.git synced 2025-06-20 17:15:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Started to upgrade from bootstrap 4 to 5.

Browse source
This commit is contained in:
Jan Böhmer 2022-07-24 18:08:21 +02:00
parent a40fed29e0
commit 365c7c60e4
27 changed files with 164 additions and 157 deletions
Download patch file Download diff file Expand all files Collapse all files

5
assets/css/app.css
View file

@ -243,6 +243,11 @@ showing the sidebar (on devices with md or higher)
* Bootstrap extensions
*****************************************/
/* Dont underline links */
a {
text-decoration: none;
}
.w-fit {
width: -moz-fit-content;
width: fit-content;

22
assets/js/datatables.js
View file

@ -1,19 +1,19 @@
"use strict";
//Styles
import 'datatables.net-bs4/css/dataTables.bootstrap4.css'
import 'datatables.net-buttons-bs4/css/buttons.bootstrap4.css'
import 'datatables.net-fixedheader-bs4/css/fixedHeader.bootstrap4.css'
import 'datatables.net-select-bs4/css/select.bootstrap4.css'
import 'datatables.net-responsive-bs4/css/responsive.bootstrap4.css';
import 'datatables.net-bs5/css/dataTables.bootstrap5.css'
import 'datatables.net-buttons-bs5/css/buttons.bootstrap5.css'
import 'datatables.net-fixedheader-bs5/css/fixedHeader.bootstrap5.css'
import 'datatables.net-select-bs5/css/select.bootstrap5.css'
import 'datatables.net-responsive-bs5/css/responsive.bootstrap5.css';
//JS
import 'datatables.net-bs4';
import 'datatables.net-buttons-bs4';
import 'datatables.net-bs5';
import 'datatables.net-buttons-bs5';
import 'datatables.net-buttons/js/buttons.colVis.js';
import 'datatables.net-fixedheader-bs4';
import 'datatables.net-select-bs4';
import 'datatables.net-colreorder-bs4';
import 'datatables.net-responsive-bs4';
import 'datatables.net-fixedheader-bs5';
import 'datatables.net-select-bs5';
import 'datatables.net-colreorder-bs5';
import 'datatables.net-responsive-bs5';
import './lib/datatables';

18
package.json
View file

@ -10,7 +10,7 @@
"@hotwired/turbo": "^7.0.1",
"@popperjs/core": "^2.10.2",
"@symfony/ux-turbo": "file:vendor/symfony/ux-turbo/Resources/assets",
"bootstrap": "^4.4.1",
"bootstrap": "^5.1.3",
"jquery": "^3.5.1",
"popper.js": "^1.14.7",
"webpack-bundle-analyzer": "^4.3.0"
@ -24,26 +24,24 @@
"build": "encore production --progress"
},
"dependencies": {
"@types/bootbox": "^5.2.0",
"@types/bootstrap": "^4.3.0",
"@types/typeahead": "^0.11.32",
"@zxing/library": "^0.19.1",
"bootbox": "^5.4.0",
"bootstrap-fileinput": "^5.0.1",
"bootstrap-select": "^1.13.8",
"bootswatch": "^4.3.1",
"bootswatch": "^5.1.3",
"bs-custom-file-input": "^1.3.4",
"clipboard": "^2.0.4",
"compression-webpack-plugin": "^10.0.0",
"copy-webpack-plugin": "^11.0.0",
"corejs-typeahead": "^1.2.1",
"darkmode-js": "^1.5.0",
"datatables.net-bs4": "^2.0.1",
"datatables.net-buttons-bs4": "^2.2.2",
"datatables.net-colreorder-bs4": "^1.5.1",
"datatables.net-fixedheader-bs4": "^3.1.5",
"datatables.net-responsive-bs4": "^2.2.3",
"datatables.net-select-bs4": "^1.2.7",
"datatables.net-bs5": "^1.10.20",
"datatables.net-buttons-bs5": "^2.2.2",
"datatables.net-colreorder-bs5": "^1.5.1",
"datatables.net-fixedheader-bs5": "^3.1.5",
"datatables.net-responsive-bs5": "^2.2.3",
"datatables.net-select-bs5": "^1.2.7",
"dompurify": "^2.0.6",
"exports-loader": "^3.0.0",
"jszip": "^3.2.0",

4
templates/AdminPages/EntityAdminBase.html.twig
View file

@ -54,7 +54,7 @@
{% if timeTravel is defined and timeTravel is not null %}
({{ timeTravel|format_datetime('short') }})
{% endif %}
<span class="float-right">{% block quick_links %}{% endblock %}</span>
<span class="float-end">{% block quick_links %}{% endblock %}</span>
{% else %}
<strong>{% block new_title %}{% trans %}new.caption{% endtrans %}{% endblock %}</strong>
{% endif %}
@ -139,7 +139,7 @@
<div class="col-sm-9 offset-sm-3">
<div class="btn-group">
{{ form_widget(form.save) }}
<button type="button" class="btn {% if entity.id is not null %}btn-primary{% else %}btn-success{% endif %} dropdown-toggle dropdown-toggle-split" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<button type="button" class="btn {% if entity.id is not null %}btn-primary{% else %}btn-success{% endif %} dropdown-toggle dropdown-toggle-split" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<span class="sr-only">Toggle Dropdown</span>
</button>
<div class="dropdown-menu p-2">

2
templates/AdminPages/_attachments.html.twig
View file

@ -15,7 +15,7 @@
<div class="col-9">
{{ form_widget(attachment) }}
</div>
<div class="pl-0 col-3">
<div class="ps-0 col-3">
{{ delete_btn }}
{% set attach = attachment.vars.value %}

6
templates/AdminPages/_delete_form.html.twig
View file

@ -5,11 +5,11 @@
<input type="hidden" name="_token" value="{{ csrf_token('delete' ~ entity.id) }}">
<div class="form-group">
<div class=""></div>
<div class="col-sm offset-sm-3 pl-2">
<div class="col-sm offset-sm-3 ps-2">
{% set delete_disabled = (not is_granted("delete", entity)) or (entity.group is defined and entity.id == 1) %}
<div class="btn-group">
<button class="btn btn-danger" {% if delete_disabled %}disabled{% endif %}>{% trans %}entity.delete{% endtrans %}</button>
<button type="button" class="btn btn-danger dropdown-toggle dropdown-toggle-split" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<button type="button" class="btn btn-danger dropdown-toggle dropdown-toggle-split" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<span class="sr-only">Toggle Dropdown</span>
</button>
<div class="dropdown-menu p-2">
@ -19,7 +19,7 @@
</div>
</div>
{% if entity.parent is defined %}
<div class="ml-2 custom-control custom-checkbox custom-control-inline">
<div class="ms-2 custom-control custom-checkbox custom-control-inline">
<input type="checkbox" class="custom-control-input" id="recursive" name="delete_recursive">
<label class="custom-control-label" for="recursive">{% trans %}entity.delete.recursive{% endtrans %}</label>
</div>

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

@ -71,7 +71,7 @@
<div class="dropdown">
<button class="btn btn-info dropdown-toggle" type="button" id="loadProfilesButton"
{% if not is_granted("@labels.create_labels") %}disabled{% endif %}
data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
{% trans %}label_generator.load_profile{% endtrans %}
</button>
<div class="dropdown-menu" aria-labelledby="loadProfilesButton">

2
templates/LabelSystem/dropdown_macro.html.twig
View file

@ -1,7 +1,7 @@
{% macro profile_dropdown(type, id = null, include_text = true, btn_type = 'btn-secondary') %}
<div class="dropdown">
<button type="button" class="btn {{ btn_type }} dropdown-toggle" title="{% trans %}label_generator.label_btn{% endtrans %}"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" {% if not is_granted("@labels.create_labels") %}disabled{% endif %}>
data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" {% if not is_granted("@labels.create_labels") %}disabled{% endif %}>
<i class="fas fa-fw fa-qrcode"></i> {% if include_text %}{% trans %}label_generator.label_btn{% endtrans %}{% endif %}
</button>
<div class="dropdown-menu">

4
templates/Parts/edit/edit_part_info.html.twig
View file

@ -8,7 +8,7 @@
<i class="fas fa-edit fa-fw" aria-hidden="true"></i>
{% trans with {'%name%': part.name} %}part.edit.card_title{% endtrans %}
<b><a href="{{ part|entityURL('info') }}" class="text-white">{{ part.name }}</a></b>
<div class="float-right">
<div class="float-end">
{% trans %}id.label{% endtrans %}: {{ part.id }}
</div>
{% endblock %}
@ -99,7 +99,7 @@
<div class="col-sm-9 offset-sm-3">
<div class="btn-group">
{{ form_widget(form.save) }}
<button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<span class="sr-only">Toggle Dropdown</span>
</button>
<div class="dropdown-menu">

2
templates/Parts/info/_attachments_info.html.twig
View file

@ -69,7 +69,7 @@
</a>
<div class="btn-group" role="group">
<button id="btnGroupDrop1" type="button" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" data-boundary="window">
<button id="btnGroupDrop1" type="button" class="btn btn-secondary dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" data-boundary="window">
</button>
<div class="dropdown-menu" aria-labelledby="btnGroupDrop1">
<span class="text-muted dropdown-item-text" ><i class="fas fa-lightbulb fa-fw"></i> <b>ID:</b> {{ attachment.iD }}</span>

2
templates/Parts/info/_order_infos.html.twig
View file

@ -64,7 +64,7 @@
</td>
<td> {# Action for order information #}
<div class="btn-group">
<button type="button" class="btn btn-info btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" data-boundary="window">
<button type="button" class="btn btn-info btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" data-boundary="window">
Action
</button>
<div class="dropdown-menu">

4
templates/Parts/info/_tools.html.twig
View file

@ -15,7 +15,7 @@
<i class="fas fa-clone"></i>
{% trans %}part.clone.btn{% endtrans %}
</a>
<button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
<button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown">
<span class="caret"></span>
</button>
<div class="dropdown-menu" role="menu">
@ -38,7 +38,7 @@
<i class="fa fa-trash fa-fw"></i>
{% trans %}part.delete{% endtrans %}
</button>
<button type="button" class="btn btn-danger dropdown-toggle dropdown-toggle-split" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<button type="button" class="btn btn-danger dropdown-toggle dropdown-toggle-split" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<span class="sr-only">Toggle Dropdown</span>
</button>
<div class="dropdown-menu p-2">

2
templates/Parts/info/show_part_info.html.twig
View file

@ -20,7 +20,7 @@
{% if timeTravel != null %}
<i>({{ timeTravel | format_datetime('short') }})</i>
{% endif %}
<div class="float-right">
<div class="float-end">
{% trans %}id.label{% endtrans %}: {{ part.id }}
</div>
{% endblock %}

2
templates/Parts/lists/_action_bar.html.twig
View file

@ -1,6 +1,6 @@
<div class="row mb-3">
<div class="col">
<a href="{{ url('part_new', url_options) }}" class="btn btn-success float-left {% if not is_granted("@parts.create") or (entity is defined and entity.notSelectable) %}disabled{% endif %}"><i class="fas fa-plus-square fa-fw"></i>
<a href="{{ url('part_new', url_options) }}" class="btn btn-success float-start {% if not is_granted("@parts.create") or (entity is defined and entity.notSelectable) %}disabled{% endif %}"><i class="fas fa-plus-square fa-fw"></i>
{% trans%}part.create.btn{% endtrans %}</a>
</div>
</div>

2
templates/Parts/lists/_info_card.html.twig
View file

@ -7,7 +7,7 @@
<div class="card-header">
<a class="card-link" data-toggle="collapse" href="#entityInfo">
{% if entity.masterPictureAttachment is not null and attachment_manager.isFileExisting(entity.masterPictureAttachment) %}
<img class="hoverpic ml-0 mr-0 d-inline" data-thumbnail="{{ entity.masterPictureAttachment | entityURL('file_view') }}" src="{{ attachment_thumbnail(entity.masterPictureAttachment, 'thumbnail_sm') }}">
<img class="hoverpic ms-0 me-0 d-inline" data-thumbnail="{{ entity.masterPictureAttachment | entityURL('file_view') }}" src="{{ attachment_thumbnail(entity.masterPictureAttachment, 'thumbnail_sm') }}">
{% endif %}
{{ header_label | trans }}: <b>{{ entity.name }}</b>
</a>

2
templates/Statistics/statistics.html.twig
View file

@ -8,7 +8,7 @@
{% trans %}statistics.title{% endtrans %}{% endblock %}
{% block card_body %}
<ul class="nav nav-tabs ml-3 mr-3 mt-2" id="statistics_tabs" role="tablist">
<ul class="nav nav-tabs ms-3 me-3 mt-2" id="statistics_tabs" role="tablist">
<li class="nav-item">
<a class="nav-link active" id="parts-tab" data-toggle="tab" href="#parts" role="tab" aria-controls="home" aria-selected="true">
{% trans %}statistics.parts{% endtrans %}

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

@ -19,7 +19,7 @@
<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="input-group-prepend">
<button class="btn btn-outline-secondary dropdown-toggle" type="button" data-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">
<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>
@ -45,7 +45,7 @@
<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="input-group-prepend">
<button class="btn btn-outline-secondary dropdown-toggle" type="button" data-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">
<h6 class="dropdown-header">{% trans %}tools.reel_calc.load_preset{% endtrans %}</h6>
<button class="dropdown-item" data-target="reel_tape_thick" data-value="0.8" onclick="loadPreset(this);">8 mm Paper Tape 0603 (0.8 mm)</button>
@ -67,7 +67,7 @@
<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="input-group-prepend">
<button class="btn btn-outline-secondary dropdown-toggle" type="button" data-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">
<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>

2
templates/Users/backup_codes.html.twig
View file

@ -20,7 +20,7 @@
<div class="card-body">
<ul class="row list-unstyled" id="backup_codes_list">
{% for code in user.backupCodes %}
<h4 class="col-6"><li><i class="far fa-square fa-fw"></i><span class="text-monospace text-dark ml-1">{{ code }}</span></li></h4>
<h4 class="col-6"><li><i class="far fa-square fa-fw"></i><span class="text-monospace text-dark ms-1">{{ code }}</span></li></h4>
{% endfor %}
</ul>
</div>

125
templates/_navbar.html.twig
View file

@ -1,66 +1,83 @@
<nav class="navbar navbar-expand-md navbar-light bg-light border-bottom shadow-sm fixed-top py-0" id="navbar">
<div class="container-fluid">
<button type="button" class="navbar-toggler" data-toggle="collapse" data-target="#sidebar-container">
<span class="sr-only">{% trans %}sidebar.toggle{% endtrans %}</span>
<!-- <span class="navbar-toggler-icon"></span> -->
<i class="fas fa-folder-open fa-lg fa-fw"></i>
</button>
<button type="button" class="navbar-toggler" data-toggle="collapse" data-target="#sidebar-container">
<span class="sr-only">{% trans %}sidebar.toggle{% endtrans %}</span>
<!-- <span class="navbar-toggler-icon"></span> -->
<i class="fas fa-folder-open fa-lg fa-fw"></i>
</button>
<a class="navbar-brand" href="{{ path('homepage') }}"><i class="fa fa-microchip"
aria-hidden="true"></i> {{ partdb_title }}</a>
<a class="navbar-brand" href="{{ path('homepage') }}"><i class="fa fa-microchip" aria-hidden="true"></i> {{ partdb_title }}</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarContent" aria-controls="navbarContent" aria-expanded="false" aria-label="Toggle navigation">
<!-- <span class="navbar-toggler-icon"></span> -->
<i class="fas fa-bars fa-lg"></i>
</button>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarContent"
aria-controls="navbarContent" aria-expanded="false" aria-label="Toggle navigation">
<!-- <span class="navbar-toggler-icon"></span> -->
<i class="fas fa-bars fa-lg"></i>
</button>
<div class="collapse navbar-collapse" id="navbarContent">
<ul class="navbar-nav me-auto">
{% if is_granted("@tools.label_scanner") %}
<li class="nav-item">
<a class="nav-link"
href="{{ url("scan_dialog") }}">{% trans %}navbar.scanner.link{% endtrans %}</a>
</li>
{% endif %}
</ul>
<div class="collapse navbar-collapse" id="navbarContent">
<ul class="navbar-nav mr-auto">
{% if is_granted("@tools.label_scanner") %}
<li class="nav-item">
<a class="nav-link" href="{{ url("scan_dialog") }}">{% trans %}navbar.scanner.link{% endtrans %}</a>
</li>
{% endif %}
</ul>
<div class="form-inline my-2 my-lg-0 ml-auto" id="searchbar">
<!-- Searchbar -->
{% include "_navbar_search.html.twig" %}
</div>
<ul class="navbar-nav ml-3" id="login-content">
<li class="nav-item dropdown">
<a href="#" class="dropdown-toggle link-anchor nav-link" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
{% if app.user %}<i class="fa fa-user" aria-hidden="true"></i>{% else %}<i class="far fa-user" aria-hidden="true"></i>{% endif %} <span class="caret"></span></a>
<ul class="dropdown-menu dropdown-menu-right" id="login-menu">
{% if app.user %}
<a class="dropdown-item disabled" href="#" >{% trans %}user.loggedin.label{% endtrans %} <b>{{ app.user.firstName }} {{app.user.lastName}}</b> (@{{app.user.name}})</a>
<a class="dropdown-item" href="{{ path("user_settings") }}"><i class="fa fa-cogs fa-fw" aria-hidden="true"></i> {% trans %}user.settings.label{% endtrans %}</a>
<a class="dropdown-item" href="{{ path("user_info_self") }}"><i class="fa fa-info-circle fa-fw" aria-hidden="true"></i> {% trans %}user.info.label{% endtrans %}</a>
<li role="separator" class="dropdown-divider"></li>
<a class="dropdown-item" href="{{ path('logout') }}" data-turbo="false"><i class="fa fa-sign-out-alt fa-fw" aria-hidden="true"></i> {% trans %}user.logout{% endtrans %}</a>
{% else %}
<a class="dropdown-item" href="{{ path('login', {'_target_path': app.request.pathinfo | loginPath}) }}" id="login-link"><i class="fa fa-sign-in-alt fa-fw" aria-hidden="true"></i> {% trans %}user.login{% endtrans %}</a>
{% endif %}
<li role="separator" class="dropdown-divider" id="toggleDarkmodeSeparator" hidden></li>
<div class="px-4 px-3" id="toggleDarkmodeContainer" hidden>
<div class="custom-control custom-switch">
<input type="checkbox" class="custom-control-input" id="toggleDarkmode">
<label class="custom-control-label" for="toggleDarkmode">{% trans %}ui.toggle_darkmode{% endtrans %}</label>
<ul class="navbar-nav ms-3" id="login-content">
<li class="nav-item dropdown">
<a href="#" class="dropdown-toggle link-anchor nav-link" data-bs-toggle="dropdown" role="button"
aria-haspopup="true" aria-expanded="false" id="navbar-user-dropdown-btn" data-bs-reference="window">
{% if app.user %}<i class="fa fa-user" aria-hidden="true"></i>{% else %}<i class="far fa-user"
aria-hidden="true"></i>{% endif %}
<span class="caret"></span></a>
<ul class="dropdown-menu dropdown-menu-end" id="login-menu" aria-labelledby="navbar-user-dropdown-btn">
{% if app.user %}
<a class="dropdown-item disabled" href="#">{% trans %}user.loggedin.label{% endtrans %}
<b>{{ app.user.firstName }} {{ app.user.lastName }}</b> (@{{ app.user.name }})</a>
<a class="dropdown-item" href="{{ path("user_settings") }}"><i class="fa fa-cogs fa-fw"
aria-hidden="true"></i> {% trans %}user.settings.label{% endtrans %}
</a>
<a class="dropdown-item" href="{{ path("user_info_self") }}"><i
class="fa fa-info-circle fa-fw"
aria-hidden="true"></i> {% trans %}user.info.label{% endtrans %}</a>
<li role="separator" class="dropdown-divider"></li>
<a class="dropdown-item" href="{{ path('logout') }}" data-turbo="false"><i
class="fa fa-sign-out-alt fa-fw"
aria-hidden="true"></i> {% trans %}user.logout{% endtrans %}</a>
{% else %}
<a class="dropdown-item"
href="{{ path('login', {'_target_path': app.request.pathinfo | loginPath}) }}"
id="login-link"><i class="fa fa-sign-in-alt fa-fw"
aria-hidden="true"></i> {% trans %}user.login{% endtrans %}</a>
{% endif %}
<li role="separator" class="dropdown-divider" id="toggleDarkmodeSeparator" hidden></li>
<div class="px-4 px-3" id="toggleDarkmodeContainer" hidden>
<div class="custom-control custom-switch">
<input type="checkbox" class="custom-control-input" id="toggleDarkmode">
<label class="custom-control-label"
for="toggleDarkmode">{% trans %}ui.toggle_darkmode{% endtrans %}</label>
</div>
</div>
</div>
<li role="separator" class="dropdown-divider"></li>
<h6 class="dropdown-header">{% trans %}user.language_select{% endtrans %}</h6>
<div id="locale-select-menu">
{% for locale in locale_menu %}
<a class="dropdown-item" data-turbo="false" href="{{ path(app.request.attributes.get('_route'),
app.request.attributes.get('_route_params')|merge({'_locale': locale})) }}">
{{ locale|language_name }} ({{ locale|upper }})</a>
{% endfor %}
</div>
</ul>
</li>
</ul>
<li role="separator" class="dropdown-divider"></li>
<h6 class="dropdown-header">{% trans %}user.language_select{% endtrans %}</h6>
<div id="locale-select-menu">
{% for locale in locale_menu %}
<a class="dropdown-item" data-turbo="false"
href="{{ path(app.request.attributes.get('_route'),
app.request.attributes.get('_route_params')|merge({'_locale': locale})) }}">
{{ locale|language_name }} ({{ locale|upper }})</a>
{% endfor %}
</div>
</ul>
</li>
</ul>
</div>
</div>
</nav>

10
templates/_navbar_search.html.twig
View file

@ -1,10 +1,10 @@
<form action="{{ url('parts_search') }}" method="get">
<div class="dropdown d-inline">
<button class="btn btn-light dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
<form action="{{ url('parts_search') }}" class="d-flex my-lg-0 ms-auto" method="get">
<div class="dropdown">
<button class="btn btn-light dropdown-toggle my-2" type="button" id="navbar-search-options" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" data-bs-auto-close="inside">
{% trans %}search.options.label{% endtrans %}
<span class="caret"></span>
</button>
<div class="dropdown-menu" aria-labelledby="SearchOptions">
<div class="dropdown-menu" aria-labelledby="navbar-search-options">
<div class="px-1 py-2">
<div class="custom-control custom-checkbox">
<input type="checkbox" class="custom-control-input" id="search_name" name="name" value="1" checked>
@ -64,6 +64,6 @@
</div>
</div>
<input type="search" class="form-control mr-sm-2" placeholder="{% trans %}search.placeholder{% endtrans %}" name="keyword">
<input type="search" class="form-control me-sm-2 my-2" placeholder="{% trans %}search.placeholder{% endtrans %}" name="keyword">
<button type="submit" class="form btn btn-outline-secondary my-2">{% trans %}search.submit{% endtrans %}</button>
</form>

6
templates/_sidebar.html.twig
View file

@ -19,7 +19,7 @@
<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"
data-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>
<ul class="dropdown-menu" aria-labelledby="dropdownCat">
{{ _self.sidebar_dropdown('tree-categories') }}
@ -34,7 +34,7 @@
<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"
data-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>
<ul class="dropdown-menu" aria-labelledby="dropdownDev">
@ -51,7 +51,7 @@
<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"
data-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>
<ul class="dropdown-menu" aria-labelledby="dropdownTools">

8
templates/_toast.html.twig
View file

@ -9,11 +9,11 @@
<div class="toast shadow" role="alert" aria-live="assertive" aria-atomic="true" data-delay="5000" {{ stimulus_controller('common/toast') }}>
<div class="toast-header {{ flash_bg }}">
{# <img src="..." class="rounded mr-2" alt="...">#}
<i class="fas fa-fw {{ flash_symbol }} mr-2"></i>
<strong class="mr-auto">{{ flash_title|trans }}</strong>
{# <img src="..." class="rounded me-2" alt="...">#}
<i class="fas fa-fw {{ flash_symbol }} me-2"></i>
<strong class="me-auto">{{ flash_title|trans }}</strong>
<small class="{% if "text-white" in flash_bg %}text-white{% else %}text-muted{% endif %}">{{ "now" | format_datetime("short", "short") }}</small>
<button type="button" class="ml-2 mb-1 close" data-dismiss="toast" aria-label="Close">
<button type="button" class="ms-2 mb-1 close" data-dismiss="toast" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>

4
templates/base.html.twig
View file

@ -75,11 +75,11 @@
</nav>
</div>
<div class="col-md-9 col-lg-10 offset-md-3 offset-lg-2 pl-0" id="main">
<div class="col-md-9 col-lg-10 offset-md-3 offset-lg-2 ps-0" id="main">
<button class="btn btn-outline-dark btn-sm p-0" type="button" id="sidebar-toggle-button" title="{% trans %}sidebar.big.toggle{% endtrans %}">
<i class="fas fa-angle-left"></i>
</button>
<div class="container-fluid mr-0 pr-0" id="content-container">
<div class="container-fluid me-0 pe-0" id="content-container">
<turbo-frame id="content" data-turbo-action="advance">
{# Here will be the real content be injected#}

2
templates/homepage.html.twig
View file

@ -1,7 +1,7 @@
{% extends "base.html.twig" %}
{% block content %}
<div class="jumbotron">
<div class="bg-light rounded p-3">
<h1 class="display-3">{{ partdb_title }}</h1>
<h4>
{% trans %}version.caption{% endtrans %}: {{ shivas_app_version }}

4
templates/security/2fa_base_form.html.twig
View file

@ -34,7 +34,7 @@
{% if displayTrustedOption %}
<div class="form-group row mt-3">
<div class="offset-3">
<div class="custom-checkbox custom-control ml-2">
<div class="custom-checkbox custom-control ms-2">
<input id="_trusted" class="custom-control-input" type="checkbox" name="{{ trustedParameterName }}" />
<label class="custom-control-label" for="_trusted">{% trans %}tfa.code.trusted_pc{% endtrans %}</label>
</div>
@ -50,7 +50,7 @@
<div class="form-group-row">
<div class="offset-3">
<button type="submit" class="btn btn-primary" value="{{ "login"|trans({}, 'SchebTwoFactorBundle') }}">{% trans %}login.btn{% endtrans %}</button>
<a class="ml-2" href="{{ logoutPath }}">{% trans %}user.logout{% endtrans %}</a>
<a class="ms-2" href="{{ logoutPath }}">{% trans %}user.logout{% endtrans %}</a>
</div>
</div>
{% endblock %}

2
templates/security/U2F/u2f_login.html.twig
View file

@ -10,7 +10,7 @@
<div id="u2fpressbutton" style="display: none;" class="h4 text-center">{{ 'r_u2f_two_factor.pressbutton'|trans }}</div>
<div id="u2fError"></div>
<p class="widget"><input id="_auth_code" type="hidden" autocomplete="off" name="_auth_code" /></p>
<a class="ml-2" href="{{ logoutPath }}">{% trans %}user.logout{% endtrans %}</a>
<a class="ms-2" href="{{ logoutPath }}">{% trans %}user.logout{% endtrans %}</a>
{% endblock %}
{% block submit_btn %}

71
yarn.lock
View file

@ -1760,7 +1760,7 @@ bootstrap-select@^1.13.8:
resolved "https://registry.yarnpkg.com/bootstrap-select/-/bootstrap-select-1.13.18.tgz#4557119d58dc1159189977161c803962220e4dda"
integrity sha512-V1IzK4rxBq5FrJtkzSH6RmFLFBsjx50byFbfAf8jYyXROWs7ZpprGjdHeoyq2HSsHyjJhMMwjsQhRoYAfxCGow==
"bootstrap@>= 3.4.1":
"bootstrap@>= 3.4.1", bootstrap@^5.1.3:
version "5.2.0"
resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.2.0.tgz#838727fb60f1630db370fe57c63cbcf2962bb3d3"
integrity sha512-qlnS9GL6YZE6Wnef46GxGv1UpGGzAwO0aPL1yOjzDIJpeApeMvqV24iL+pjr2kU4dduoBA9fINKWKgMToobx9A==
@ -1770,15 +1770,10 @@ bootstrap@^3.4.1:
resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-3.4.1.tgz#c3a347d419e289ad11f4033e3c4132b87c081d72"
integrity sha512-yN5oZVmRCwe5aKwzRj6736nSmKDX7pLYwsXiCj/EYmo16hODaBiT4En5btW/jhBF/seV+XMx3aYwukYC3A49DA==
bootstrap@^4.4.1:
version "4.6.2"
resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.6.2.tgz#8e0cd61611728a5bf65a3a2b8d6ff6c77d5d7479"
integrity sha512-51Bbp/Uxr9aTuy6ca/8FbFloBUJZLHwnhTcnjIeRn2suQWsWzcuJhGjKDB5eppVte/8oCdOL3VuwxvZDUggwGQ==
bootswatch@^4.3.1:
version "4.6.1"
resolved "https://registry.yarnpkg.com/bootswatch/-/bootswatch-4.6.1.tgz#e58101a891998487d396c2a97d1bc5278d168ac9"
integrity sha512-5vRhlIIvgZ2rH3QLHcVVa+Z+jNpn1/zEvGlJYkp4/g1LmsGY42S6IOpYyBu40RGjqqiYIjoeX/uWDdAAIYVG7A==
bootswatch@^5.1.3:
version "5.1.3"
resolved "https://registry.yarnpkg.com/bootswatch/-/bootswatch-5.1.3.tgz#aa6bd96acbaff9d5f7b1215a8ae00b68d918a26f"
integrity sha512-NmZFN6rOCoXWQ/PkzmD8FFWDe24kocX9OXWHNVaLxVVnpqpAzEbMFsf8bAfKwVtpNXibasZCzv09B5fLieAh2g==
brace-expansion@^1.1.7:
version "1.1.11"
@ -2279,28 +2274,20 @@ dash-ast@^2.0.1:
resolved "https://registry.yarnpkg.com/dash-ast/-/dash-ast-2.0.1.tgz#8d0fd2e601c59bf874cc22877ee7dd889f54dee8"
integrity sha512-5TXltWJGc+RdnabUGzhRae1TRq6m4gr+3K2wQX0is5/F2yS6MJXJvLyI3ErAnsAXuJoGqvfVD5icRgim07DrxQ==
datatables.net-bs4@>=1.11.3:
datatables.net-bs5@>=1.11.3, datatables.net-bs5@^1.10.20:
version "1.12.1"
resolved "https://registry.yarnpkg.com/datatables.net-bs4/-/datatables.net-bs4-1.12.1.tgz#652e0701788109bf7c24170e643fe6f128cc8eca"
integrity sha512-LBeC8zUNVYyQT7ytC2lYqyXDn+k2kYpqvijC83oOjlcnEtb/8Tduzgquox5FrNKUJPcUrj9r+h5B0TDBbob/Gg==
resolved "https://registry.yarnpkg.com/datatables.net-bs5/-/datatables.net-bs5-1.12.1.tgz#b05d4bcaed77f6b77df0b50eaf1d5ec8e5d476bd"
integrity sha512-CcQCImfmH4YZk7I0aC0kTiNPyfHJ2ueGgOh/kFB9KqsZD8bNJy2A88gC6hn9A7TbmmenOL+K3Q1ti7G8yqi8SQ==
dependencies:
datatables.net ">=1.11.3"
jquery ">=1.7"
datatables.net-bs4@^2.0.1:
version "2.1.1"
resolved "https://registry.yarnpkg.com/datatables.net-bs4/-/datatables.net-bs4-2.1.1.tgz#cbcd4d60a1f5ca09c39c3a2171cc36331291673b"
integrity sha512-oPDSHWOWaecZtL6xSVV7y9C7YZ8JQeGxX/QX/VeH0Hxq0iypM7hQYSvMLOQJwHZrZ26b/G18bmgqBvEDj8Wl8g==
dependencies:
datatables.net ">=1.10.13"
jquery ">=1.7"
datatables.net-buttons-bs4@^2.2.2:
datatables.net-buttons-bs5@^2.2.2:
version "2.2.3"
resolved "https://registry.yarnpkg.com/datatables.net-buttons-bs4/-/datatables.net-buttons-bs4-2.2.3.tgz#0869cf8e278a58299b83607a9881e7a142e1409e"
integrity sha512-rh9o/EAmz3eOvaf/lb40dXPM8ZzTsPN34IKQCXYr1nBEHPLdnGE5LBFSHv/Da80gAM/pDnrCGbf8zP1++DioBg==
resolved "https://registry.yarnpkg.com/datatables.net-buttons-bs5/-/datatables.net-buttons-bs5-2.2.3.tgz#816ad321142a6cc343d0a805fcbff2891387c6f1"
integrity sha512-pQVBLBkG+G85eldTxEyU7SqqIn009pirbylmRAA+Ll9KYwsbyflQOZrTqKVKH6N4ycLjyR6gwtHeLgGnK23tBQ==
dependencies:
datatables.net-bs4 ">=1.11.3"
datatables.net-bs5 ">=1.11.3"
datatables.net-buttons ">=2.0.1"
jquery ">=1.7"
@ -2312,12 +2299,12 @@ datatables.net-buttons@>=2.0.1:
datatables.net ">=1.11.3"
jquery ">=1.7"
datatables.net-colreorder-bs4@^1.5.1:
datatables.net-colreorder-bs5@^1.5.1:
version "1.5.6"
resolved "https://registry.yarnpkg.com/datatables.net-colreorder-bs4/-/datatables.net-colreorder-bs4-1.5.6.tgz#b92f773698724e7e177c83dfa8847e39f232fb97"
integrity sha512-D4BPo/7EcHXPq+eA0NHYemnV2G1lf1VJklgYmWmSap6O1xgU9YhPARj5PgyeB9Sm3bCERoQugwzH2YDddgDe4g==
resolved "https://registry.yarnpkg.com/datatables.net-colreorder-bs5/-/datatables.net-colreorder-bs5-1.5.6.tgz#84f11597563bd78381f8d18bf702acbfe8023d91"
integrity sha512-Eu6N9ycH8Q8QHTBIJkZYHLJfNdk7WSR2A0ObGDTtoIMFnZc1wmtvU6lpHkDP+4lqUnkzLGs9bCIwk0m0eCBxAA==
dependencies:
datatables.net-bs4 ">=1.11.3"
datatables.net-bs5 ">=1.11.3"
datatables.net-colreorder ">=1.5.4"
jquery ">=1.7"
@ -2329,12 +2316,12 @@ datatables.net-colreorder@>=1.5.4:
datatables.net ">=1.11.3"
jquery ">=1.7"
datatables.net-fixedheader-bs4@^3.1.5:
datatables.net-fixedheader-bs5@^3.1.5:
version "3.2.4"
resolved "https://registry.yarnpkg.com/datatables.net-fixedheader-bs4/-/datatables.net-fixedheader-bs4-3.2.4.tgz#90f9d3dfe86b350562909c7c2d157f607eff93d8"
integrity sha512-rbJiu/SuC2631F6IIYKZZfA/7B831Bq+ycmTGQWplTfIZSEF7ztiuRix+JWDadu6yZS20kvDmNOPJVSmZL8nEg==
resolved "https://registry.yarnpkg.com/datatables.net-fixedheader-bs5/-/datatables.net-fixedheader-bs5-3.2.4.tgz#f9c44ece7f4e0cdbef9e0d4ae84f0720af3e4534"
integrity sha512-xA3nyfQ78to0Sdz8NLrCn+iA8/yZSyLs8bSoefVTP5JUjEzJ7CFkejblFcO8LW/d1dBQhwW+boaj0zqlRCmguA==
dependencies:
datatables.net-bs4 ">=1.11.3"
datatables.net-bs5 ">=1.11.3"
datatables.net-fixedheader ">=3.2.0"
jquery ">=1.7"
@ -2346,12 +2333,12 @@ datatables.net-fixedheader@>=3.2.0:
datatables.net ">=1.11.3"
jquery ">=1.7"
datatables.net-responsive-bs4@^2.2.3:
datatables.net-responsive-bs5@^2.2.3:
version "2.3.0"
resolved "https://registry.yarnpkg.com/datatables.net-responsive-bs4/-/datatables.net-responsive-bs4-2.3.0.tgz#eafa015d38c2f5be23de0a873468597d96dc4030"
integrity sha512-6ZeFeM6PHh3A5BodxUvHU1ipIrMYMbBcOgB3BfXMHxr4maS96RIQdTmXK3owJ5sy88dF68V8fjkquvybS7kwvw==
resolved "https://registry.yarnpkg.com/datatables.net-responsive-bs5/-/datatables.net-responsive-bs5-2.3.0.tgz#f92b79b7d5995c8c6cdc31ab0a725c240bcec448"
integrity sha512-OVe2y+WGbZNqwu0clpzjPGg85Y+8KW8pVXVZJEKKyHW0GYAU3Ewhk0f3ZdS0B6Al9Q4v3Gt6OzupVwuY5Ck1pA==
dependencies:
datatables.net-bs4 ">=1.11.3"
datatables.net-bs5 ">=1.11.3"
datatables.net-responsive ">=2.2.9"
jquery ">=1.7"
@ -2363,12 +2350,12 @@ datatables.net-responsive@>=2.2.9:
datatables.net ">=1.11.3"
jquery ">=1.7"
datatables.net-select-bs4@^1.2.7:
datatables.net-select-bs5@^1.2.7:
version "1.4.0"
resolved "https://registry.yarnpkg.com/datatables.net-select-bs4/-/datatables.net-select-bs4-1.4.0.tgz#33fec99560f35e849fb62984b9f7d4e51a761d7e"
integrity sha512-5DWRyKo+YwX+J8CHbvexbipam/7tqZXp0R/1Ayrk7e1YP3jPE0X0XybguxBspifgjD49uu3fDLYyjKFVwpif9Q==
resolved "https://registry.yarnpkg.com/datatables.net-select-bs5/-/datatables.net-select-bs5-1.4.0.tgz#b62411b5a7e1dae32dfe6c2737f28338e1590eeb"
integrity sha512-CaQTMO8W3G6I/GdOp8GChASJIA/byS41sYdo6RTld79MNV/3HfdQFH6uaqcYnCcaij2NtSvKbl6frOGoj6bDVg==
dependencies:
datatables.net-bs4 ">=1.11.3"
datatables.net-bs5 ">=1.11.3"
datatables.net-select ">=1.3.3"
jquery ">=1.7"
@ -2380,7 +2367,7 @@ datatables.net-select@>=1.3.3:
datatables.net ">=1.11.3"
jquery ">=1.7"
datatables.net@>=1.10.13, datatables.net@>=1.11.3:
datatables.net@>=1.11.3:
version "1.12.1"
resolved "https://registry.yarnpkg.com/datatables.net/-/datatables.net-1.12.1.tgz#3e625e49a3341f605b0efb519fae94e37b278f24"
integrity sha512-e6XAMUoV41JdQPS/r9YRfRcmTPcCVvyZbWI+xog1Zg+kjVliMQbEkvWK5XFItmi64Cvwg+IqsZbTUJ1KSY3umA==