From cf45de06a5ace8c4c9b464fb7c520fb0639045e9 Mon Sep 17 00:00:00 2001 From: Luca Trupiano Date: Tue, 18 Apr 2023 17:07:53 +0200 Subject: [PATCH] Rivista grafica parte ricerca, bug minori corretti --- css/custom1_4.3.css | 29 +++++++++--- css/custom2_4.3.css | 34 +++++++++++--- index_4.3.html | 79 +++++++++++++++++--------------- js/script_4.3.js | 107 +++++++++++++++++++++++++++----------------- 4 files changed, 163 insertions(+), 86 deletions(-) diff --git a/css/custom1_4.3.css b/css/custom1_4.3.css index 5b9cd2d..f081f14 100644 --- a/css/custom1_4.3.css +++ b/css/custom1_4.3.css @@ -363,6 +363,11 @@ li::marker { color: #759F9A !important; } +.form-control:focus, input[type=text]:focus { + border-color: rgba(117, 159, 154) !important; + box-shadow: 0 0 0 0.2rem rgba(117, 159, 154,.5); +} + /* ------- $warning #eace87 -------- */ @@ -402,6 +407,9 @@ li::marker { background-color: #c8d9d7 !important; } +.bg-lida10-mix { + background-color: #f3f5f2 !important; +} /* clausola */ .bg-lida11 { background-color: #e3eceb !important; @@ -419,18 +427,27 @@ li::marker { /* visualizza e minimap */ -.bg-lida-vis, #displayminimap, .claCollBtn { +.bg-lida-vis, #displayminimap, .claCollBtn, .nav-tabs .nav-item.show .nav-link,.nav-tabs .nav-link.active { background-color: #fefeff! important; } -/* body */ +/* body #dae0e5 */ .body-vis { background-color: #fcfaf7! important; padding-top: 0px; } -.custom-select-sm.bg-light:hover, .custom-select-sm.bg-lida12:hover, .custom-select-sm.bg-lida13:hover { - background-color: #dae0e5!important; +.custom-select-sm.bg-light:hover, .custom-select-sm.bg-lida12:hover, .custom-select-sm.bg-lida13:hover, .custom-select.bg-light:hover, .custom-select.bg-lida12:hover, .custom-select.bg-lida13:hover { + background-color: #e9ecef!important; + cursor: pointer; +} + +.iconClClass.removeCond:hover, .removeCla:hover { + background-color: rgba(0,0,0,.125)!important; + cursor: pointer; +} + +.curPoint:hover { cursor: pointer; } @@ -438,4 +455,6 @@ li::marker { cursor: move; } - +.removeCond, .NOremoveCond { + border-color: rgba(0,0,0,.125)! important; +} diff --git a/css/custom2_4.3.css b/css/custom2_4.3.css index 2c50b32..0564c45 100644 --- a/css/custom2_4.3.css +++ b/css/custom2_4.3.css @@ -360,8 +360,15 @@ li::marker { color: #054a29 !important; } +.form-control:focus, input[type=text]:focus { + border-color: rgba(65, 93, 67) !important; + box-shadow: 0 0 0 0.2rem rgba(65,93,67,.5); +} -/* ------- #eace87 -------- */ +input2[type=text]:-internal-autofill-selected { + background-color: #d4cbd0! important; +} +/* ------- mark #a996a0 -------- */ .mark { background-color: #a996a0 !important; @@ -399,6 +406,10 @@ li::marker { background-color: #8dac91 !important; } +.bg-lida10-mix { + background-color: #e0e2d9 !important; +} + /* clausola */ .bg-lida11 { background-color: #c6d5c8 !important; @@ -416,11 +427,12 @@ li::marker { /* visualizza e minimap */ -.bg-lida-vis, #displayminimap, .claCollBtn { +.bg-lida-vis, #displayminimap, .claCollBtn, .nav-tabs .nav-item.show .nav-link,.nav-tabs .nav-link.active { background-color: #f8f9fa! important; } -/* body */ +/* body #dae0e5 */ + .body-vis { background-color: #f1ede7! important; padding-top: 0px; @@ -430,8 +442,17 @@ li::marker { border-color: #cbcbc0 !important; } -.custom-select-sm.bg-light:hover, .custom-select-sm.bg-lida12:hover, .custom-select-sm.bg-lida13:hover { - background-color: #dae0e5!important; +.custom-select-sm.bg-light:hover, .custom-select-sm.bg-lida12:hover, .custom-select-sm.bg-lida13:hover, .custom-select.bg-light:hover, .custom-select.bg-lida12:hover, .custom-select.bg-lida13:hover { + background-color: #e9ecef!important; + cursor: pointer; +} + +.iconClClass.removeCond:hover, .removeCla:hover { + background-color: rgba(0,0,0,.125)!important; + cursor: pointer; +} + +.curPoint:hover { cursor: pointer; } @@ -439,5 +460,8 @@ li::marker { cursor: move; } +.removeCond, .NOremoveCond { + border-color: rgba(0,0,0,.125)! important; +} diff --git a/index_4.3.html b/index_4.3.html index cce1d45..f4fab2c 100644 --- a/index_4.3.html +++ b/index_4.3.html @@ -477,12 +477,12 @@ -
-
+
+
Visualizza annotazioni
-
+
Visualizza info periodo
@@ -527,7 +527,7 @@ Reset
- @@ -546,8 +546,8 @@
@@ -584,13 +584,13 @@
@@ -1093,7 +1093,7 @@ @@ -1170,7 +1170,7 @@ name="document-text">
-
- +
+
@@ -1872,7 +1873,7 @@
  • li", - handle: ".handle" + handle: ".handle", + opacity: 0.6, + cursor: 'move' }); // Inizializza selectable-xX0 e definisce le funzioni @@ -240,23 +242,34 @@ $(document).ready(function() { var claListItemId = $(this).closest('li').attr('id'); var claIdNum = claListItemId.substr(6); claListLen--; - $("#" + claListItemId)[0].remove(); - delete queryJson["Clausola" + claIdNum]; - delete window["context" + claIdNum]; - refreshClaList(); - refreshSortables(); + //$("#" + claListItemId)[0].remove(); + $("#" + claListItemId).fadeOut('fast', + function(){ + $("#" + claListItemId)[0].remove(); + + delete queryJson["Clausola" + claIdNum]; + delete window["context" + claIdNum]; + refreshClaList(); + refreshSortables(); + }); }); // Evento: click sull'icona rimuovi condizione $('#sortable0').on('click', '.removeCond', function() { - $(this).closest('ul').parent().remove(); - condListLen--; - refreshClaList(); - refreshSortables(); - refreshConnectWith(); - if (claListLen == 0 && condListLen == 0) { - $('#sortable0').html(emptyClaList); - } + //$(this).closest('ul').parent().remove(); + var here = this; + $(this).closest('ul').parent().fadeOut('fast', + function(here){ + $(here).closest('ul').parent().remove(); + + condListLen--; + refreshClaList(); + refreshSortables(); + refreshConnectWith(); + if (claListLen == 0 && condListLen == 0) { + $('#sortable0').html(emptyClaList); + } + }); }); // Evento: click sulla lista di clausole nel dropbox "Aggiungi clausola di tipo:" o "aggiungi condizione logica:" @@ -301,13 +314,13 @@ $(document).ready(function() { if (condtype == "AND") { $("#cond" + condId).removeClass( "condLI-OR bg-lida13" ) $("#cond" + condId).addClass( "condLI-AND bg-lida12" ) - $(this).removeClass( "bg-lida13" ) - $(this).addClass( "bg-lida12" ) + //$(this).removeClass( "bg-lida13" ) + //$(this).addClass( "bg-lida12" ) } else { $("#cond" + condId).removeClass( "condLI-AND bg-lida12" ) $("#cond" + condId).addClass( "condLI-OR bg-lida13" ) - $(this).removeClass( "bg-lida12" ) - $(this).addClass( "bg-lida13" ) + //$(this).removeClass( "bg-lida12" ) + //$(this).addClass( "bg-lida13" ) }; refreshClaList(); }); @@ -328,7 +341,7 @@ $(document).ready(function() { // Evento: click sull'icona di refresh dei radio button $('#cla-TabContent').on('click', '.radioReset', function() { - fSet = $(this).siblings('fieldset'); + fSet = $(this).parent().siblings('fieldset'); if (fSet.find(":checked").length) { radioChecked = fSet.find(":checked")[0]; radioChecked.checked = false; @@ -562,7 +575,10 @@ $(document).ready(function() { // Variabili testuali per compattezza - const iconReset = '
    '; + const iconReset2 = '
    '; + const iconReset = '
    \ +
    '; const iconCloseCond = '
    '; const emptyClaList = '
  • Nessuna clausola aggiunta.
    • '; const defaultCond = '
    Clausole e condizioni in AND di default
    '; @@ -639,7 +655,7 @@ $(document).ready(function() { switch (vals.length) { case 2: var element = $('
    '); - element.attr('class', ' d-flex flex-sm-nowrap pr-2 py-1 mb-1 form-group form-control justify-content-between bg-light'); + element.attr('class', 'd-flex flex-sm-nowrap pr-0 py-0 mb-1 form-group form-control-sm border justify-content-between bg-light'); var rbfieldset = $('
    '); var flexdiv1 = $('
    '); var flexdiv2 = $('
    '); @@ -650,8 +666,10 @@ $(document).ready(function() { rbfieldset.attr('id', tabPaneId + keys[key].replace(/\s/g, '')); rbfieldset.attr('class', 'custom-control-inline monMe'); - flexdiv1.attr('class', 'custom-control custom-radio custom-control-inline m-0 pb-0'); + flexdiv1.attr('class', 'custom-control custom-radio custom-control-inline m-0 mr-2 pb-0'); + flexdiv1.attr('style', 'padding-top: 2px!important;'); flexdiv2.attr('class', 'custom-control custom-radio custom-control-inline m-0 pb-0'); + flexdiv2.attr('style', 'padding-top: 2px!important;'); input1.attr('class', 'custom-control-input'); input2.attr('class', 'custom-control-input'); input1.attr('type', 'radio'); @@ -662,8 +680,10 @@ $(document).ready(function() { input2.attr('value', vals[1]); input1.attr('name', tabPaneId + keys[key]); input2.attr('name', tabPaneId + keys[key]); - label1.attr('class', 'custom-control-label form-control-sm custom-control-inline m-0 pl-1 text-muted'); - label2.attr('class', 'custom-control-label form-control-sm custom-control-inline m-0 pl-1 text-muted'); + label1.attr('class', 'custom-control-label form-control-sm custom-control-inline m-0 pl-0 text-muted curPoint'); + label1.attr('style', 'padding-top: 2px!important;'); + label2.attr('class', 'custom-control-label form-control-sm custom-control-inline m-0 pl-0 text-muted curPoint'); + label2.attr('style', 'padding-top: 2px!important;'); label1.attr('for', tabPaneId + vals[0].replace(/\s/g, '')); label2.attr('for', tabPaneId + vals[1].replace(/\s/g, '')); label1.append(vals[0]); @@ -682,20 +702,23 @@ $(document).ready(function() { break; case 1: var element = $('
    '); - element.attr('class', ' d-flex flex-sm-nowrap pr-2 py-1 mb-1 form-group form-control bg-light'); + //element.attr('class', ' d-flex flex-sm-nowrap pr-2 py-1 mb-1 form-group form-control bg-light'); + element.attr('class', 'd-flex flex-sm-nowrap form-group form-control-sm border px-2 mb-1 pt-1 pb-0 bg-light'); var rbfieldset = $('
    '); flexdiv1 = $('
    '); input1 = $(''); label1 = $('