loviuz/openstamanager
loviuz/openstamanager
1
0
Fork 0
mirror of https://github.com/devcode-it/openstamanager.git synced 2025-03-12 09:10:19 +01:00
Code Issues Releases Activity

Fix stili AdminLTE3

Browse Source
This commit is contained in:
FabioL 2024-05-20 13:17:14 +02:00
parent df2e6ba3c3
commit 2a1c6c83b4
8 changed files with 37 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
assets/src/css/style.css
View File

@ -165,7 +165,7 @@ a:focus {
}
.no-padding {
padding: 0 0px;
padding: 0 !important;
}
.no-padding-left {
@ -516,16 +516,8 @@ input.small-width {
z-index: 2000;
}
.after.input-group-addon .select2-selection,
.after.input-group-addon {
border-radius: 0px 4px 4px 0px;
border-left: none;
}
.before.input-group-addon .select2-selection,
.before.input-group-addon {
border-radius: 4px 0px 0px 4px;
border-right: none;
.input-group-text > .btn{
line-height: 1px;
}
.hide-it-off-screen {
@ -1022,6 +1014,12 @@ table.dataTable {
color: #000000;
}
.select2-container--bootstrap4{
display: block;
flex: 1 1 auto;
width: 1% !important
}
.select2-container--bootstrap .select2-selection--multiple .select2-search--inline .select2-search__field {
height: 23px;
padding: 3px 12px;

4
assets/src/js/functions/select.js
View File

@ -238,7 +238,7 @@ function initStaticSelectInput(input) {
let $input = $(input);
$input.select2({
theme: "bootstrap",
theme: "bootstrap4",
language: "it",
width: '100%',
maximumSelectionLength: $input.data('maximum') ? $input.data('maximum') : -1,
@ -261,7 +261,7 @@ function initDynamicSelectInput(input) {
let $input = $(input);
$input.select2({
theme: "bootstrap",
theme: "bootstrap4",
language: "it",
maximumSelectionLength: $input.data('maximum') ? $input.data('maximum') : -1,
minimumInputLength: $input.data('heavy') ? 3 : 0,

1
gulpfile.js
View File

@ -185,6 +185,7 @@ const CSS = gulp.parallel(() => {
'smartwizard/dist/css/smart_wizard_theme_arrows.min.css',
'leaflet-gesture-handling/dist/leaflet-gesture-handling.min.css',
'leaflet/dist/leaflet.css',
'@ttskch/select2-bootstrap4-theme/dist/select2-bootstrap4.min.css'
];
for (const i in vendor) {

2
include/init/configuration.php
View File

@ -354,7 +354,7 @@ if (empty($creation) && (!file_exists('config.inc.php') || !$valid_config)) {
$("#language").removeClass("hide");
$("#language").select2({
theme: "bootstrap",
theme: "bootstrap4",
templateResult: function(item) {
if (!item.id || !flag) {
return item.text;

2
modules/articoli/plugins/articoli.lotti.php
View File

@ -420,7 +420,7 @@ $(document).ready(function() {
$("#serials").select2().select2("destroy");
$("#serials").select2({
theme: "bootstrap",
theme: "bootstrap4",
language: "it",
allowClear: true,
tags: true,

1
package.json
View File

@ -3,6 +3,7 @@
"main": "gulpfile.js",
"dependencies": {
"@fullcalendar/moment": "^6.1.5",
"@ttskch/select2-bootstrap4-theme": "^1.5.2",
"admin-lte": "^3.2.0",
"autocompleter": "^6.1.1",
"autonumeric": "^4.6.0",

5
src/HTMLBuilder/Handler/DefaultHandler.php
View File

@ -198,10 +198,7 @@ class DefaultHandler implements HandlerInterface
}
// Delega al metodo "text", per la generazione del codice HTML
$values['icon-after'] = '
<div class="input-group-text">
<span class="fa fa-eye-slash clickable" id="'.$values['id'].'_toggle" onclick="togglePassword_'.$values['id'].'();"></span>
</div>';
$values['icon-after'] = '<span class="fa fa-eye-slash clickable" id="'.$values['id'].'_toggle" onclick="togglePassword_'.$values['id'].'();"></span>';
$result .= $this->text($values, $extras);
return $result;

24
src/HTMLBuilder/Wrapper/HTMLWrapper.php
View File

@ -44,20 +44,29 @@ class HTMLWrapper implements WrapperInterface
<div class="'.$extra_class.'">';
}
$result .= '
<div class="form-group">';
// Generazione dell'etichetta
if (!empty($values['label'])) {
$result .= '
<label for="'.prepareToField($values['id']).'">'.(empty($values['help']) ? $values['label'] : '<span class="tip" title="'.prepareToField($values['help']).'">'.$values['label'].' <i class="fa fa-question-circle-o"></i></span>').'</label>';
}
$result .= '
<div class="input-group">';
if (!empty($values['icon-before']) || !empty($values['icon-after']) || !empty($values['validation'])) {
$result .= '
<div class="input-group has-feedback">';
<div class="input-group-prepend">';
if (!empty($values['icon-before'])) {
$result .= '
<span class="input-group-addon before'.(!empty($values['icon-custom']) ? ' '.$values['icon-custom'] : '').'">'.$values['icon-before'].'</span>';
<span class="input-group-text before'.(!empty($values['icon-custom']) ? ' '.$values['icon-custom'] : '').'">'.$values['icon-before'].'</span>';
}
$result .= '
</div>';
}
return $result;
@ -73,19 +82,20 @@ class HTMLWrapper implements WrapperInterface
if (!empty($values['icon-before']) || !empty($values['icon-after']) || !empty($values['validation'])) {
if (!empty($values['icon-after'])) {
$result .= '
<span class="input-group-append after'.(!empty($values['icon-custom']) ? ' '.$values['icon-custom'] : '').'">'.$values['icon-after'].'</span>';
<div class="input-group-append">
<span class="input-group-text after'.(!empty($values['icon-custom']) ? ' '.$values['icon-custom'] : '').'">'.$values['icon-after'].'</span>
</div>';
}
if (!empty($values['validation'])) {
$result .= '
<div class="input-group-append after" id="'.$pseudo_id.'_validation">
<div class="input-group-text">
<span class="tip" title="'.tr('Validazione').'"><i class="fa fa-question-circle "></i></span>
</div>
</div>';
}
$result .= '
</div>';
unset($values['icon-before']);
unset($values['icon-after']);
unset($values['icon-custom']);
@ -102,6 +112,8 @@ class HTMLWrapper implements WrapperInterface
$values['data-parsley-errors-container'] = '#'.$pseudo_id.'-errors';
$result .= '
</div>
</div>
<div id="'.$values['id'].$rand.'-errors"></div>';
if ($values['type'] == 'checkbox') {