concordia
/
LiDa_Search
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Modifiche grafiche, attivate tutte le funzioni sui vari bottoni

This commit is contained in:
Luca Trupiano 2023-01-13 16:49:40 +01:00
parent ad98ff617d
commit 28921c2ae1
3 changed files with 103 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
css/custom.css
View File

@ -58,8 +58,8 @@ table {
opacity: 0.6 !important;
}
#selectable0 .ui-selecting { background: #DEE2E6; }
#selectable0 .ui-selected { background: #DEE2E6; color: #DEE2E6; }
#selectable0 .ui-selecting { background: #4abd8c; }
#selectable0 .ui-selected { background: #DEE2E6; color: #4abd8c !important; }
#selectable0 { list-style-type: none; margin: 0; padding: 0; }
#selectable1 .ui-selecting { background: #3d6ca9; }
@ -626,7 +626,7 @@ a.text-lida5:hover, a.text-lida5:focus {
.badge-lida7 {
color: #fff;
background-color: 13383e;
background-color: #13383e;
}
.badge-lida7[href]:hover, .badge-lida7[href]:focus {
@ -635,7 +635,7 @@ a.text-lida5:hover, a.text-lida5:focus {
}
.bg-lida7 {
background-color: 13383e !important;
background-color: #13383e !important;
}
a.bg-lida7:hover, a.bg-lida7:focus,
@ -645,13 +645,13 @@ button.bg-lida7:focus {
}
.border-lida7 {
border-color: 13383e !important;
border-color: #13383e !important;
}
.btn-lida7 {
color: #fff;
background-color: 13383e;
border-color: 13383e;
background-color: #13383e;
border-color: #13383e;
}
.btn-lida7:hover {
@ -666,8 +666,8 @@ button.bg-lida7:focus {
.btn-lida7.disabled, .btn-lida7:disabled {
color: #fff;
background-color: 13383e;
border-color: 13383e;
background-color: #13383e;
border-color: #13383e;
}
.btn-lida7:not(:disabled):not(.disabled):active, .btn-lida7:not(:disabled):not(.disabled).active, .show > .btn-lida7.dropdown-toggle {
@ -681,15 +681,15 @@ button.bg-lida7:focus {
}
.btn-outline-lida7 {
color: 13383e;
color: #13383e;
background-color: transparent;
border-color: 13383e;
border-color: #13383e;
}
.btn-outline-lida7:hover {
color: #fff;
background-color: 13383e;
border-color: 13383e;
border-color: #13383e;
}
.btn-outline-lida7:focus, .btn-outline-lida7.focus {
@ -697,7 +697,7 @@ button.bg-lida7:focus {
}
.btn-outline-lida7.disabled, .btn-outline-lida7:disabled {
color: 13383e;
color: #13383e;
background-color: transparent;
}
@ -1203,6 +1203,10 @@ a.text-lidaBG1:hover, a.text-lidaBG1:focus {
background-color: #dbf2e8 !important;
}
.bg-lida10g {
background-color: #b6daca !important;
}
.bg-lida11 {
background-color: #fef0e5 !important;
}

52
index_3.3.html
View File

@ -70,16 +70,19 @@
<li class="nav-item pt-1"><a class="nav-link" href="#">Altro</a>
</li>
</ul>
<ul class="navbar-nav ml-md-auto mr-2">
<li class="nav-item dropleft"><a
class="nav-link dropdown-toggle text-muted bg-light" href="#"
id="navbarDropdownMenuLink" data-toggle="dropdown"
aria-haspopup="true" aria-expanded="false"> Vista </a>
<div class="dropdown-menu text-muted bg-light" aria-labelledby="navbarDropdownMenuLink">
<a class="dropdown-item" href="#"><span class="text-muted">Forma</span></a>
<a class="dropdown-item" href="#"><span class="text-muted">Frase</span></a>
<a class="dropdown-item" href="#"><span class="text-muted">Dialogo</span></a>
<a class="dropdown-item" href="#"><span class="text-muted">Metafora</span></a>
<ul class="navbar-nav ml-md-auto">
<li class="nav-item pt-1">
<div class="input-group input-group-sm">
<div class="input-group-prepend">
<label class="input-group-text border-right-0 pr-0"><ion-icon name="glasses"></ion-icon></label>
<label class="input-group-text text-muted border-left-0 " for="valoreVista">Vista:</label>
</div>
<select class="custom-select text-muted bg-light border" id="valoreVista">
<option value="forme">Forme</option>
<option value="frasi">Frasi</option>
<option value="dialoghi">Dialoghi</option>
<option value="metafore">Metafore</option>
</select>
</div>
</li>
</ul>
@ -348,20 +351,22 @@
class="row bg-lida10 border mx-0 p-2 d-flex justify-content-end">
<div class="col-3 d-flex justify-content-between px-0" style="display: flex">
<div>
<span class="small text-muted pr-2" id="tipoRicerca">Ricerca</span>
<input id="searchToggle" type="checkbox" data-toggle="toggle0" data-on="Avanzata" data-off="Semplice" data-size="small" data-style="font-size: 80%!important;" data-onstyle="lida4" data-offstyle="outline-lida4">
<div class="input-group input-group-sm">
<div class="input-group-prepend">
<label class="input-group-text border-right-0 border-lida4 pr-0"><ion-icon name="search-circle"></ion-icon></label>
<label class="input-group-text text-muted border-left-0 border-lida4" for="tipoRicerca">Ricerca:</label>
</div>
<input id="searchToggle" type="checkbox" data-toggle="toggle0" data-on="Avanzata" data-off="Semplice"
data-size="small" data-style="font-size: 80%!important;" data-onstyle="lida4" data-offstyle="secondary">
</div>
</div>
<div class="col-9 d-flex justify-content-end px-0"
id="simpleSearchDiv" style="display: flex">
<div class="btn-group" role="group" aria-label="Bottoni Ricerca Semplice">
<div class="pr-0 align-self-end">
<input class="form-control-sm pr-0 border border-lida4 monMe" type="text" id="queryText"
placeholder=' inserisci un termine' style="width: 150px; border-width: 2px !important;">
</div>
<button class="btn btn-sm btn-lida4 mr-2" type="submit"
id='searchcomm'>Cerca</button>
<input class="form-control-sm pr-0 border border-lida4 monMe" type="text" id="queryText"
placeholder='inserisci un termine' style="width: 150px;">
<button class="btn btn-sm btn-lida4 mr-2" type="button"
id='searchcomm'><ion-icon name="search"></ion-icon></button>
<button class="btn btn-sm btn-outline-lida4 bg-light mr-2" type="button"
id='cleanresult' aria-expanded="false"
aria-controls="collapseExample"><span class="text-muted">Reset</span></button>
@ -375,8 +380,8 @@
<div class="col-9 justify-content-end px-0"
id="advancedSearchDiv" style="display: none">
<div class="btn-group" role="group" aria-label="Bottoni Ricerca Avanzata">
<button class="btn btn-sm btn-lida4 mr-2" type="submit"
id='searchcomm2'>Cerca</button>
<button class="btn btn-sm btn-lida4 mr-2" type="button"
id='searchcomm2'><ion-icon name="search"></ion-icon></button>
<button class="btn btn-sm btn-outline-lida4 bg-light mr-2" type="button"
id='cleanresult2' aria-expanded="false"
aria-controls="collapseExample"><span class="text-muted">Reset</span></button>
@ -737,7 +742,8 @@
<div class="btn-group btn-group-sm p-1" role="group">
<button id="btnAddCla1" type="button" class="addCCbtn btn btn-sm btn-outline-lida4 bg-light"><span class="text-muted">Morfologia</span></button>
<button id="btnAddCla2" type="button" class="addCCbtn btn btn-sm btn-outline-lida4 bg-light"><span class="text-muted">Sintassi</span></button>
<button id="btnAddCla3" type="button" class="addCCbtn btn btn-sm btn-outline-lida4 bg-light mr-2"><span class="text-muted">Metafore</span></button>
<button id="btnAddCla3" type="button" class="addCCbtn btn btn-sm btn-outline-lida4 bg-light"><span class="text-muted">Metafore</span></button>
<label class="input-group-text border-top border-bottom border-lida4" style="border-radius: 0;"><ion-icon name="extension-puzzle"></ion-icon></label>
<button id="btnAddCond" type="button" class="addCCbtn btn btn-sm btn-outline-lida4 bg-light"><span class="text-muted">AND/OR</span></button>
</div>
</div>
@ -1930,7 +1936,7 @@
<option>OR</option>
</select>
</div>
<div class="p-0 mr-3 mt-1 text-right text-lida4">
<div class="p-0 mr-3 mt-0 text-right text-lida4">
<span class="iconClClass removeCond"><ion-icon name="close-circle"></ion-icon></span>
</div>
</div>

82
js/script_3.3.js
View File

@ -129,6 +129,12 @@ $(document).ready(function() {
// Evento: modifica di un campo clausole
$("form #lemma_forma,#queryText,#opzioni_testo").on('change', function() {
if ($(this)[0].id == "queryText"){
var orgSelection = $('#lemma_forma option:selected')[0].value
var qText = $(this)[0].value;
if (qText !== null && qText !== '') {qText = ' "' + qText + '"';}
setLemmaForma(qText,orgSelection);
};
refreshClaList();
});
@ -200,13 +206,13 @@ $(document).ready(function() {
var condId = $(this).attr('id').substring(12);
if (condtype == "AND") {
$("#cond" + condId).removeClass( "condLI-OR bg-lida11" )
$("#cond" + condId).addClass( "condLI-AND bg-light" )
$("#cond" + condId).addClass( "condLI-AND bg-lida10g" )
$(this).removeClass( "bg-lida11" )
$(this).addClass( "bg-light" )
$(this).addClass( "bg-lida10g" )
} else {
$("#cond" + condId).removeClass( "condLI-AND bg-light" )
$("#cond" + condId).removeClass( "condLI-AND bg-lida10g" )
$("#cond" + condId).addClass( "condLI-OR bg-lida11" )
$(this).removeClass( "bg-light" )
$(this).removeClass( "bg-lida10g" )
$(this).addClass( "bg-lida11" )
};
refreshClaList();
@ -239,17 +245,7 @@ $(document).ready(function() {
// Evento: click sull'icona di trash del contesto
$('.trashClaCont').on('click', function() {
var claIdNum = $(this)[0].id.substring(12);
$('#selectable' + claIdNum + " .ui-selectee").each(function() {
$(this).attr('style', "line-height: 1.2em");
});
$('#selectable' + claIdNum + " .ui-selected").removeClass( "ui-selected" )
$('#selectable' + claIdNum + ' .sel-canti-intro').each(function() {
$(this).text("Seleziona i canti:")
});;
$("#contextText" + claIdNum).html("Tutta l'opera");
window["context" + claIdNum] = [[],[],[]];
eval("queryJson.Clausola" + claIdNum + ".contesto = jsonContext0");
$('#selectable' + claIdNum + " .show").removeClass("show");
resetContext(claIdNum);
});
// Evento: click sull'icona di add del contesto
@ -353,15 +349,21 @@ $(document).ready(function() {
}
});
// Evento: click sul bottone di reset azanzata
$('#cleanresult2').on('click', function() {
resetAdvGui();
// Evento: click sul bottone di reset semplice
$('#cleanresult').on('click', function() {
resetResult();
resetSimpleGui();
refreshClaList();
});
// Evento: click sul bottone di reset azanzata
$('#cleanresult2').on('click', function() {
resetResult();
resetAdvGui();
refreshClaList();
});
// Variabili JSON per i filtri
var verboJson = {
"filtriverbo": {
"Diatesi": ["Attivo", "Passivo"],
@ -511,7 +513,7 @@ $(document).ready(function() {
// Variabili testuali per compattezza
var iconReset = '<div class="text-right text-lida4 radioReset"><ion-icon name="refresh-circle"></ion-icon></div>';
var iconCloseCond = '<div class="p-0 mr-3 mt-1 text-right text-lida4"><span class="iconClClass removeCond"><ion-icon name="close-circle"></ion-icon></span></div>';
var iconCloseCond = '<div class="p-0 mr-3 mt-0 text-right text-lida4"><span class="iconClClass removeCond"><ion-icon name="close-circle"></ion-icon></span></div>';
var emptyClaList = '<li id="li-cla0" class="list-group-item align-items-center my-1 ui-state-default ui-state-disabled border text-muted bg-white ui-state-disabled-opacity-06 small">Nessuna clausola aggiunta.</li>';
var defaultCond = '<div id="cla-defaultCond" class="col-12 px-0 pb-1 small font-weight-bold text-muted">Clausole e condizioni in AND di default</div>';
@ -654,7 +656,7 @@ $(document).ready(function() {
switch (vals.length) {
case 2:
var element = $('<div />');
element.attr('class', ' d-flex flex-sm-nowrap pr-2 py-1 mb-1 form-group form-control justify-content-between');
element.attr('class', ' d-flex flex-sm-nowrap pr-2 py-1 mb-1 form-group form-control justify-content-between bg-light');
var rbfieldset = $('<fieldset />');
var flexdiv1 = $('<div />');
var flexdiv2 = $('<div />');
@ -698,7 +700,7 @@ $(document).ready(function() {
break;
case 1:
var element = $('<div />');
element.attr('class', ' d-flex flex-sm-nowrap pr-2 py-1 mb-1 form-group form-control');
element.attr('class', ' d-flex flex-sm-nowrap pr-2 py-1 mb-1 form-group form-control bg-light');
var rbfieldset = $('<fieldset />');
flexdiv1 = $('<div />');
input1 = $('<input />');
@ -791,7 +793,7 @@ $(document).ready(function() {
cloneLI = cloneLI.outerHTML.replace(/xX4Xx/g, condListLen)
cloneLI = cloneLI.replace(/xX5Xx/g, condtype)
if (condtype == "AND") {
cloneLI = cloneLI.replace(/xX6Xx/g, "light")
cloneLI = cloneLI.replace(/xX6Xx/g, "lida10g")
} else {
cloneLI = cloneLI.replace(/xX6Xx/g, "lida11")
}
@ -982,7 +984,7 @@ $(document).ready(function() {
};
if (inactiveLI == 0){
$(iconSpan).attr("class","iconClClass removeCond");
$(iconDiv).attr("class","p-0 mr-3 mt-1 text-right text-lida4");
$(iconDiv).attr("class","p-0 mr-3 mt-0 text-right text-lida4");
};
break;
case 1:
@ -1203,6 +1205,36 @@ $(document).ready(function() {
});
};
function resetSimpleGui() {
$('#queryText').val("")
setLemmaForma("","forma");
$('#opzioni_testo').val("parola");
resetContext(0);
};
function setLemmaForma(qText,newSelection) {
var newOptions = {['La forma' + qText]: 'forma', ['Il lemma' + qText]: 'lemma', ['Il testo' + qText]: 'testo'};
$("#lemma_forma").empty();
$.each(newOptions, function(key,value) {
$("#lemma_forma").append($("<option></option>").attr("value", value).text(key));
});
$("#lemma_forma").val(newSelection);
};
function resetContext(claIdNum) {
$('#selectable' + claIdNum + " .ui-selectee").each(function() {
$(this).attr('style', "line-height: 1.2em");
});
$('#selectable' + claIdNum + " .ui-selected").removeClass( "ui-selected" )
$('#selectable' + claIdNum + ' .sel-canti-intro').each(function() {
$(this).text("Seleziona i canti:")
});;
$("#contextText" + claIdNum).html("Tutta l'opera");
window["context" + claIdNum] = [[],[],[]];
eval("queryJson.Clausola" + claIdNum + ".contesto = jsonContext0");
$('#selectable' + claIdNum + " .show").removeClass("show");
};
function resetAdvGui() {
var tabsContent=$("#cla-TabContent").find(".tab-pane:not(:first)");
if ($(tabsContent).length) {