clarify smartblock OR vs AND

This commit is contained in:
r 2019-02-03 16:16:47 -06:00
parent eb2d463672
commit b532fe564e
5 changed files with 44 additions and 18 deletions

View file

@ -216,7 +216,10 @@ tr.lib-selected > td > div.library_actions_btn:hover {
.search-criteria .criteria-element > div {
margin-bottom: 5px;
display: flex;
position: relative;
}
.search-criteria .criteria-element > div.search-row-and { margin-bottom: 36px; }
.search-criteria .criteria-element > div input[type="text"],
.search-criteria .criteria-element > div select {
-webkit-box-sizing: border-box;

View file

@ -533,6 +533,7 @@
#sp_criteria-element {
clear: both;
width: 100%;
}
/*

View file

@ -703,15 +703,29 @@ table.library-get-file-md.table-small{
/***** SMART BLOCK SPECIFIC STYLES BEGIN *****/
.db-logic-label{
font-size:11px;
.modifier_add_link {
font-size: 12px;
display: block;
margin: 0 0 10px 33%;
text-decoration: underline;
cursor: pointer;
position: absolute;
top: 30px;
}
.db-logic-label {
font-size:14px;
position: absolute;
top: 36px;
}
.db-logic-label-and {
top: 42px;
}
.sp-invisible{
visibility: hidden;
}
.sp_input_select{
width: 140px;
flex: 0 0 33%;
}
.sp_input_text_limit{

View file

@ -25,9 +25,13 @@ function setSmartBlockEvents() {
} else {
div.find('.db-logic-label').text('and').show();
div.removeClass('search-row-or').addClass('search-row-and');
div = div.next().show();
div.children().removeAttr('disabled');
div.find(".modifier_add_link").show();
div = div.next();
if (div.length === 0) {
$(this).hide();
@ -36,7 +40,7 @@ function setSmartBlockEvents() {
appendAddButton();
appendModAddButton();
removeButtonCheck();
disableAndHideDateTimeDropdown(newRowVal);
// disableAndHideDateTimeDropdown(newRowVal);
}
});
@ -76,8 +80,12 @@ function setSmartBlockEvents() {
//remove the 'criteria add' button from new modifier row
newRow.find('#criteria_add').remove();
$(this).parent().after(newRow);
newRow.prev().removeClass('search-row-and').addClass('search-row-or');
newRow.prev().find(".db-logic-label").removeClass('db-logic-label-and').addClass('db-logic-label-or');
reindexElements();
appendAddButton();
appendModAddButton();