Merge branch 'master' of https://gitea-s2i2s.isti.cnr.it/concordia/LiDa_Search.git
This commit is contained in:
commit
6c64754bd7
|
@ -689,6 +689,7 @@
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
<span class="px-2" id="spanContenenti">Contenenti:</span>
|
<span class="px-2" id="spanContenenti">Contenenti:</span>
|
||||||
|
|
||||||
<div id="grammaticaEsintassi" style="display: none;">
|
<div id="grammaticaEsintassi" style="display: none;">
|
||||||
<div class="px-1 pb-0" id="cercaFrasiPeriodiDiscorsi">
|
<div class="px-1 pb-0" id="cercaFrasiPeriodiDiscorsi">
|
||||||
<div
|
<div
|
||||||
|
@ -1994,6 +1995,10 @@
|
||||||
class="addCCbtn btn btn-md bg-secondary text-white">
|
class="addCCbtn btn btn-md bg-secondary text-white">
|
||||||
<span class="text-white">OR</span>
|
<span class="text-white">OR</span>
|
||||||
</button>
|
</button>
|
||||||
|
<button id="btnParentesi" type="button"
|
||||||
|
class="addCCbtn btn btn-md bg-secondary text-white">
|
||||||
|
<span class="text-white">( )</span>
|
||||||
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -2017,22 +2022,29 @@
|
||||||
|
|
||||||
|
|
||||||
<div style="display: none;">
|
<div style="display: none;">
|
||||||
|
|
||||||
<ul>
|
<ul>
|
||||||
<!-- LI CLAUSOLA -->
|
<!-- LI CLAUSOLA -->
|
||||||
<li id="li-claxX1Xx" style="display: none;"
|
<li id="li-claxX1Xx" style="display: none;"
|
||||||
class="claLI card mx-0 my-1 py-1 px-0 list-group-item align-items-center border text-muted bg-lida-vis">
|
class="claLI card mx-0 my-1 py-1 px-0 list-group-item align-items-center border text-muted bg-lida-vis">
|
||||||
|
|
||||||
<div class="handle container p-0 pl-1">
|
<div class="handle container p-0 pl-1">
|
||||||
|
|
||||||
<div
|
<div
|
||||||
class="row no-gutters flex-nowrap align-items-start justify-content-between">
|
class="row no-gutters flex-nowrap align-items-start justify-content-between">
|
||||||
|
|
||||||
<div class="col-md-auto pl-0 pr-1 align-self-start">
|
<div class="col-md-auto pl-0 pr-1 align-self-start">
|
||||||
|
|
||||||
<span class="ui-icon ui-icon-arrowthick-2-n-s"></span>
|
<span class="ui-icon ui-icon-arrowthick-2-n-s"></span>
|
||||||
</div>
|
</div>
|
||||||
<div style="min-height: 64px;"
|
<div style="min-height: 64px;"
|
||||||
class="col-md-auto pl-0 pr-2 pb-2 flex-fill align-self-start">
|
class="col-md-auto pl-0 pr-2 pb-2 flex-fill align-self-start">
|
||||||
<span class="small clatext">xX2Xx<br> <br></span>
|
<span class="small clatext">xX2Xx<br> <br></span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div
|
<div
|
||||||
class="col-md-auto px-1 align-self-start justify-content-end">
|
class="col-md-auto px-1 align-self-start justify-content-end">
|
||||||
|
|
||||||
<div class="row no-gutters flex-nowrap justify-content-end">
|
<div class="row no-gutters flex-nowrap justify-content-end">
|
||||||
<div
|
<div
|
||||||
class="col-auto pb-0 pl-2 pr-1 pt-1 align-top flex-grow-1 align-self-start justify-content-end text-right bd-highlight text-success editCla"
|
class="col-auto pb-0 pl-2 pr-1 pt-1 align-top flex-grow-1 align-self-start justify-content-end text-right bd-highlight text-success editCla"
|
||||||
|
@ -2054,7 +2066,9 @@
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div
|
<div
|
||||||
class="row no-gutters flex-nowrap align-items-start justify-content-end">
|
class="row no-gutters flex-nowrap align-items-start justify-content-end">
|
||||||
|
@ -2067,6 +2081,7 @@
|
||||||
aria-expanded="false" aria-controls="collapseClaxX1Xx">
|
aria-expanded="false" aria-controls="collapseClaxX1Xx">
|
||||||
<ion-icon name="pencil"></ion-icon>
|
<ion-icon name="pencil"></ion-icon>
|
||||||
</button>
|
</button>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -67,7 +67,11 @@ $(document).ready(function() {
|
||||||
var newStyle = $(this)[0].id;
|
var newStyle = $(this)[0].id;
|
||||||
setStyle(newStyle);
|
setStyle(newStyle);
|
||||||
});
|
});
|
||||||
|
$('#btnParentesi').on('click', function() {
|
||||||
|
var fava = $("#parentesiAperta1");
|
||||||
|
$("#parentesiAperta1").attr('style', "display: d-flex;");
|
||||||
|
$("#parentesiChiusa2").attr('style', "display: d-flex;");
|
||||||
|
});
|
||||||
|
|
||||||
// Evento: click sulla voce about del menu info
|
// Evento: click sulla voce about del menu info
|
||||||
$("#visAbout").PopupLayer({
|
$("#visAbout").PopupLayer({
|
||||||
|
@ -162,6 +166,8 @@ $(document).ready(function() {
|
||||||
});
|
});
|
||||||
if (tabID == 0) {
|
if (tabID == 0) {
|
||||||
tabID++;
|
tabID++;
|
||||||
|
$('#sortable0').append('<h3 class="text-primary " id="parentesiAperta1" style="display: none;">(<br></h3>');
|
||||||
|
|
||||||
addGramCla("#sortable0", 1, tabID, 1);
|
addGramCla("#sortable0", 1, tabID, 1);
|
||||||
}else{
|
}else{
|
||||||
refreshClaList(tabID);
|
refreshClaList(tabID);
|
||||||
|
@ -953,6 +959,7 @@ $(document).ready(function() {
|
||||||
claClone.attr("data-claActive", active);
|
claClone.attr("data-claActive", active);
|
||||||
claClone.attr("aria-labelledby", "cla" + tabID + "-tab");
|
claClone.attr("aria-labelledby", "cla" + tabID + "-tab");
|
||||||
claClone.attr("style", "");
|
claClone.attr("style", "");
|
||||||
|
|
||||||
$('#claBody' + tabID).append(claClone);
|
$('#claBody' + tabID).append(claClone);
|
||||||
$('#cla' + tabID + " #grammtypesN").attr("id", "grammtypes_" + tabID);
|
$('#cla' + tabID + " #grammtypesN").attr("id", "grammtypes_" + tabID);
|
||||||
$('#cla' + tabID + " #lemma_formaINIT").attr("id", "lemmaforma_" + tabID);
|
$('#cla' + tabID + " #lemma_formaINIT").attr("id", "lemmaforma_" + tabID);
|
||||||
|
@ -1151,10 +1158,14 @@ $(document).ready(function() {
|
||||||
}
|
}
|
||||||
$(sortableId).append(boolCond)
|
$(sortableId).append(boolCond)
|
||||||
$(sortableId).append($(cloneLI)[0]);
|
$(sortableId).append($(cloneLI)[0]);
|
||||||
|
if (tabID == 2){
|
||||||
|
$(sortableId).append('<h3 class="text-primary " id="parentesiChiusa2" style="display: none;">)<br></h3>');
|
||||||
|
}
|
||||||
if (toExpand == 1) {
|
if (toExpand == 1) {
|
||||||
$("#claCollapse" + tabID).focus();
|
$("#claCollapse" + tabID).focus();
|
||||||
$("#claCollapse" + tabID).trigger("click");
|
$("#claCollapse" + tabID).trigger("click");
|
||||||
}
|
}
|
||||||
|
|
||||||
$("#li-cla" + tabID).fadeTo(1000, 1);
|
$("#li-cla" + tabID).fadeTo(1000, 1);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue