Fixed query builder configuration
This commit is contained in:
parent
38d7801a3d
commit
e45db04fcc
9 changed files with 6881 additions and 161 deletions
|
|
@ -578,7 +578,7 @@ ul#main-nav {
|
||||||
/* INTRO-BLURB ------> */
|
/* INTRO-BLURB ------> */
|
||||||
#intro {
|
#intro {
|
||||||
float: left;
|
float: left;
|
||||||
width: 570px;
|
/* width: 570px; */
|
||||||
padding-bottom: 50px;
|
padding-bottom: 50px;
|
||||||
}
|
}
|
||||||
body.loggedIn #intro {
|
body.loggedIn #intro {
|
||||||
|
|
@ -764,7 +764,7 @@ p.external-auth a.blue:hover {
|
||||||
/* HOME SEARCH ------> */
|
/* HOME SEARCH ------> */
|
||||||
#search-home {
|
#search-home {
|
||||||
float: left;
|
float: left;
|
||||||
width: 533px;
|
/* width: 533px; */
|
||||||
margin: 30px 0 0 0;
|
margin: 30px 0 0 0;
|
||||||
}
|
}
|
||||||
#search-home h3 {
|
#search-home h3 {
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,6 @@
|
||||||
icons: {
|
icons: {
|
||||||
add_group: 'fas fa-plus-square',
|
add_group: 'fas fa-plus-square', add_rule: 'fas fa-plus-circle',
|
||||||
add_rule: 'fas fa-plus-circle',
|
remove_group: 'fas fa-minus-square', remove_rule: 'fas fa-minus-circle',
|
||||||
remove_group: 'fas fa-minus-square',
|
|
||||||
remove_rule: 'fas fa-minus-circle',
|
|
||||||
error: 'fas fa-exclamation-triangle'
|
error: 'fas fa-exclamation-triangle'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -43,7 +41,8 @@ icons: {
|
||||||
border-radius: 4px;
|
border-radius: 4px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.query-builder .btn.focus, .query-builder .btn:focus, .query-builder .btn:hover {
|
.query-builder .btn.focus, .query-builder .btn:focus, .query-builder .btn:hover
|
||||||
|
{
|
||||||
color: #333;
|
color: #333;
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
}
|
}
|
||||||
|
|
@ -122,7 +121,8 @@ icons: {
|
||||||
}
|
}
|
||||||
|
|
||||||
.query-builder .btn-group .btn+.btn, .query-builder .btn-group .btn+.btn-group,
|
.query-builder .btn-group .btn+.btn, .query-builder .btn-group .btn+.btn-group,
|
||||||
.query-builder .btn-group .btn-group + .btn, .query-builder .btn-group .btn-group + .btn-group {
|
.query-builder .btn-group .btn-group+.btn, .query-builder .btn-group .btn-group+.btn-group
|
||||||
|
{
|
||||||
margin-left: -1px;
|
margin-left: -1px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
176
webapp/src/main/webapp/themes/iph/css/query-builder.css
Normal file
176
webapp/src/main/webapp/themes/iph/css/query-builder.css
Normal file
|
|
@ -0,0 +1,176 @@
|
||||||
|
/*!
|
||||||
|
* jQuery QueryBuilder 2.5.2
|
||||||
|
* Copyright 2014-2018 Damien "Mistic" Sorel (http://www.strangeplanet.fr)
|
||||||
|
* Licensed under MIT (https://opensource.org/licenses/MIT)
|
||||||
|
*/
|
||||||
|
.query-builder .rules-group-container, .query-builder .rule-container,
|
||||||
|
.query-builder .rule-placeholder {
|
||||||
|
position: relative;
|
||||||
|
margin: 4px 0;
|
||||||
|
border-radius: 5px;
|
||||||
|
padding: 5px;
|
||||||
|
border: 1px solid #EEE;
|
||||||
|
background: rgba(255, 255, 255, 0.9);
|
||||||
|
}
|
||||||
|
|
||||||
|
.query-builder .rule-container .rule-filter-container, .query-builder .rule-container .rule-operator-container,
|
||||||
|
.query-builder .rule-container .rule-value-container, .query-builder .error-container,
|
||||||
|
.query-builder .drag-handle {
|
||||||
|
display: inline-block;
|
||||||
|
margin: 0 5px 0 0;
|
||||||
|
vertical-align: middle;
|
||||||
|
}
|
||||||
|
|
||||||
|
.query-builder .rules-group-container {
|
||||||
|
padding: 10px;
|
||||||
|
padding-bottom: 6px;
|
||||||
|
border: 1px solid #DCC896;
|
||||||
|
background: rgba(250, 240, 210, 0.5);
|
||||||
|
}
|
||||||
|
|
||||||
|
.query-builder .rules-group-header {
|
||||||
|
margin-bottom: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.query-builder .rules-group-header .group-conditions .btn.readonly:not(.active),
|
||||||
|
.query-builder .rules-group-header .group-conditions input[name$='_cond']
|
||||||
|
{
|
||||||
|
border: 0;
|
||||||
|
clip: rect(0, 0, 0, 0);
|
||||||
|
height: 1px;
|
||||||
|
margin: -1px;
|
||||||
|
overflow: hidden;
|
||||||
|
padding: 0;
|
||||||
|
position: absolute;
|
||||||
|
width: 1px;
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
|
||||||
|
.query-builder .rules-group-header .group-conditions .btn.readonly {
|
||||||
|
border-radius: 3px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.query-builder .rules-list {
|
||||||
|
list-style: none;
|
||||||
|
padding: 0 0 0 15px;
|
||||||
|
margin: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.query-builder .rule-value-container {
|
||||||
|
border-left: 1px solid #DDD;
|
||||||
|
padding-left: 5px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.query-builder .rule-value-container label {
|
||||||
|
margin-bottom: 0;
|
||||||
|
font-weight: normal;
|
||||||
|
}
|
||||||
|
|
||||||
|
.query-builder .rule-value-container label.block {
|
||||||
|
display: block;
|
||||||
|
}
|
||||||
|
|
||||||
|
.query-builder .rule-value-container select, .query-builder .rule-value-container input[type='text'],
|
||||||
|
.query-builder .rule-value-container input[type='number'] {
|
||||||
|
padding: 1px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.query-builder .error-container {
|
||||||
|
display: none;
|
||||||
|
cursor: help;
|
||||||
|
color: #F00;
|
||||||
|
}
|
||||||
|
|
||||||
|
.query-builder .has-error {
|
||||||
|
background-color: #FDD;
|
||||||
|
border-color: #F99;
|
||||||
|
}
|
||||||
|
|
||||||
|
.query-builder .has-error .error-container {
|
||||||
|
display: inline-block !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.query-builder .rules-list>*::before, .query-builder .rules-list>*::after
|
||||||
|
{
|
||||||
|
content: '';
|
||||||
|
position: absolute;
|
||||||
|
left: -10px;
|
||||||
|
width: 10px;
|
||||||
|
height: calc(50% + 4px);
|
||||||
|
border-color: #CCC;
|
||||||
|
border-style: solid;
|
||||||
|
}
|
||||||
|
|
||||||
|
.query-builder .rules-list>*::before {
|
||||||
|
top: -4px;
|
||||||
|
border-width: 0 0 2px 2px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.query-builder .rules-list>*::after {
|
||||||
|
top: 50%;
|
||||||
|
border-width: 0 0 0 2px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.query-builder .rules-list>*:first-child::before {
|
||||||
|
top: -12px;
|
||||||
|
height: calc(50% + 14px);
|
||||||
|
}
|
||||||
|
|
||||||
|
.query-builder .rules-list>*:last-child::before {
|
||||||
|
border-radius: 0 0 0 4px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.query-builder .rules-list>*:last-child::after {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.query-builder.bt-checkbox-glyphicons .checkbox input[type='checkbox']:checked+label::after
|
||||||
|
{
|
||||||
|
font-family: 'Glyphicons Halflings';
|
||||||
|
content: '\e013';
|
||||||
|
}
|
||||||
|
|
||||||
|
.query-builder.bt-checkbox-glyphicons .checkbox label::after {
|
||||||
|
padding-left: 4px;
|
||||||
|
padding-top: 2px;
|
||||||
|
font-size: 9px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.query-builder .error-container+.tooltip .tooltip-inner {
|
||||||
|
color: #F99 !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.query-builder p.filter-description {
|
||||||
|
margin: 5px 0 0 0;
|
||||||
|
background: #D9EDF7;
|
||||||
|
border: 1px solid #BCE8F1;
|
||||||
|
color: #31708F;
|
||||||
|
border-radius: 5px;
|
||||||
|
padding: 2.5px 5px;
|
||||||
|
font-size: .8em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.query-builder .rules-group-header [data-invert] {
|
||||||
|
margin-left: 5px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.query-builder .drag-handle {
|
||||||
|
cursor: move;
|
||||||
|
vertical-align: middle;
|
||||||
|
margin-left: 5px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.query-builder .dragging {
|
||||||
|
position: fixed;
|
||||||
|
opacity: .5;
|
||||||
|
z-index: 100;
|
||||||
|
}
|
||||||
|
|
||||||
|
.query-builder .dragging::before, .query-builder .dragging::after {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.query-builder .rule-placeholder {
|
||||||
|
border: 1px dashed #BBB;
|
||||||
|
opacity: .7;
|
||||||
|
}
|
||||||
|
|
@ -1,6 +0,0 @@
|
||||||
/*!
|
|
||||||
* jQuery QueryBuilder 2.5.2
|
|
||||||
* Copyright 2014-2018 Damien "Mistic" Sorel (http://www.strangeplanet.fr)
|
|
||||||
* Licensed under MIT (https://opensource.org/licenses/MIT)
|
|
||||||
*/
|
|
||||||
.query-builder .rule-container,.query-builder .rule-placeholder,.query-builder .rules-group-container{position:relative;margin:4px 0;border-radius:5px;padding:5px;border:1px solid #eee;background:rgba(255,255,255,.9)}.query-builder .drag-handle,.query-builder .error-container,.query-builder .rule-container .rule-filter-container,.query-builder .rule-container .rule-operator-container,.query-builder .rule-container .rule-value-container{display:inline-block;margin:0 5px 0 0;vertical-align:middle}.query-builder .rules-group-container{padding:10px;padding-bottom:6px;border:1px solid #dcc896;background:rgba(250,240,210,.5)}.query-builder .rules-group-header{margin-bottom:10px}.query-builder .rules-group-header .group-conditions .btn.readonly:not(.active),.query-builder .rules-group-header .group-conditions input[name$='_cond']{border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px;white-space:nowrap}.query-builder .rules-group-header .group-conditions .btn.readonly{border-radius:3px}.query-builder .rules-list{list-style:none;padding:0 0 0 15px;margin:0}.query-builder .rule-value-container{border-left:1px solid #ddd;padding-left:5px}.query-builder .rule-value-container label{margin-bottom:0;font-weight:400}.query-builder .rule-value-container label.block{display:block}.query-builder .rule-value-container input[type=number],.query-builder .rule-value-container input[type=text],.query-builder .rule-value-container select{padding:1px}.query-builder .error-container{display:none;cursor:help;color:red}.query-builder .has-error{background-color:#fdd;border-color:#f99}.query-builder .has-error .error-container{display:inline-block!important}.query-builder .rules-list>::after,.query-builder .rules-list>::before{content:'';position:absolute;left:-10px;width:10px;height:calc(50% + 4px);border-color:#ccc;border-style:solid}.query-builder .rules-list>::before{top:-4px;border-width:0 0 2px 2px}.query-builder .rules-list>::after{top:50%;border-width:0 0 0 2px}.query-builder .rules-list>:first-child::before{top:-12px;height:calc(50% + 14px)}.query-builder .rules-list>:last-child::before{border-radius:0 0 0 4px}.query-builder .rules-list>:last-child::after{display:none}.query-builder.bt-checkbox-glyphicons .checkbox input[type=checkbox]:checked+label::after{font-family:'Glyphicons Halflings';content:'\e013'}.query-builder.bt-checkbox-glyphicons .checkbox label::after{padding-left:4px;padding-top:2px;font-size:9px}.query-builder .error-container+.tooltip .tooltip-inner{color:#f99!important}.query-builder p.filter-description{margin:5px 0 0 0;background:#d9edf7;border:1px solid #bce8f1;color:#31708f;border-radius:5px;padding:2.5px 5px;font-size:.8em}.query-builder .rules-group-header [data-invert]{margin-left:5px}.query-builder .drag-handle{cursor:move;vertical-align:middle;margin-left:5px}.query-builder .dragging{position:fixed;opacity:.5;z-index:100}.query-builder .dragging::after,.query-builder .dragging::before{display:none}.query-builder .rule-placeholder{border:1px dashed #bbb;opacity:.7}
|
|
||||||
|
|
@ -24,7 +24,7 @@ VIVO wilma theme: screen styles
|
||||||
|
|
||||||
@import url("reset.css");
|
@import url("reset.css");
|
||||||
@import url("iph.css");
|
@import url("iph.css");
|
||||||
@import url("query-builder.default.min.css");
|
@import url("query-builder-theme.css");
|
||||||
@import url("query-builder.css");
|
@import url("query-builder.css");
|
||||||
@import url("page-createAndLink.css");
|
@import url("page-createAndLink.css");
|
||||||
@import url("../../../local/css/local.css");
|
@import url("../../../local/css/local.css");
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,6 @@
|
||||||
var rules_basic = {
|
var rules_basic = {
|
||||||
condition: 'AND',
|
condition: 'AND',
|
||||||
rules: [{
|
|
||||||
id: 'price',
|
|
||||||
operator: 'less',
|
|
||||||
value: 10.25
|
|
||||||
}, {
|
|
||||||
condition: 'OR',
|
|
||||||
rules: [{
|
rules: [{
|
||||||
id: 'category',
|
id: 'category',
|
||||||
operator: 'equal',
|
operator: 'equal',
|
||||||
|
|
@ -15,7 +10,7 @@ var rules_basic = {
|
||||||
operator: 'equal',
|
operator: 'equal',
|
||||||
value: 1
|
value: 1
|
||||||
}]
|
}]
|
||||||
}]
|
|
||||||
};
|
};
|
||||||
|
|
||||||
$('#builder').queryBuilder({
|
$('#builder').queryBuilder({
|
||||||
|
|
@ -36,7 +31,7 @@ $('#builder').queryBuilder({
|
||||||
5: 'Goodies',
|
5: 'Goodies',
|
||||||
6: 'Clothes'
|
6: 'Clothes'
|
||||||
},
|
},
|
||||||
operators: ['equal', 'not_equal', 'in', 'not_in', 'is_null', 'is_not_null']
|
operators: ['equal', 'not_equal']
|
||||||
}, {
|
}, {
|
||||||
id: 'in_stock',
|
id: 'in_stock',
|
||||||
label: 'In stock',
|
label: 'In stock',
|
||||||
|
|
@ -65,7 +60,7 @@ $('#builder').queryBuilder({
|
||||||
format: /^.{4}-.{4}-.{4}$/
|
format: /^.{4}-.{4}-.{4}$/
|
||||||
}
|
}
|
||||||
}],
|
}],
|
||||||
|
lang_code: 'ru',
|
||||||
rules: rules_basic
|
rules: rules_basic
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
||||||
77
webapp/src/main/webapp/themes/iph/js/query-builder.ru.js
Normal file
77
webapp/src/main/webapp/themes/iph/js/query-builder.ru.js
Normal file
|
|
@ -0,0 +1,77 @@
|
||||||
|
/*!
|
||||||
|
* jQuery QueryBuilder 2.5.2
|
||||||
|
* Locale: Russian (ru)
|
||||||
|
* Licensed under MIT (https://opensource.org/licenses/MIT)
|
||||||
|
*/
|
||||||
|
|
||||||
|
(function(root, factory) {
|
||||||
|
if (typeof define == 'function' && define.amd) {
|
||||||
|
define(['jquery', 'query-builder'], factory);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
factory(root.jQuery);
|
||||||
|
}
|
||||||
|
}(this, function($) {
|
||||||
|
"use strict";
|
||||||
|
|
||||||
|
var QueryBuilder = $.fn.queryBuilder;
|
||||||
|
|
||||||
|
QueryBuilder.regional['ru'] = {
|
||||||
|
"__locale": "Russian (ru)",
|
||||||
|
"add_rule": "Добавить",
|
||||||
|
"add_group": "Добавить группу",
|
||||||
|
"delete_rule": "Удалить",
|
||||||
|
"delete_group": "Удалить",
|
||||||
|
"conditions": {
|
||||||
|
"AND": "И",
|
||||||
|
"OR": "ИЛИ"
|
||||||
|
},
|
||||||
|
"operators": {
|
||||||
|
"equal": "равно",
|
||||||
|
"not_equal": "не равно",
|
||||||
|
"in": "из указанных",
|
||||||
|
"not_in": "не из указанных",
|
||||||
|
"less": "меньше",
|
||||||
|
"less_or_equal": "меньше или равно",
|
||||||
|
"greater": "больше",
|
||||||
|
"greater_or_equal": "больше или равно",
|
||||||
|
"between": "между",
|
||||||
|
"begins_with": "начинается с",
|
||||||
|
"not_begins_with": "не начинается с",
|
||||||
|
"contains": "содержит",
|
||||||
|
"not_contains": "не содержит",
|
||||||
|
"ends_with": "оканчивается на",
|
||||||
|
"not_ends_with": "не оканчивается на",
|
||||||
|
"is_empty": "пустая строка",
|
||||||
|
"is_not_empty": "не пустая строка",
|
||||||
|
"is_null": "пусто",
|
||||||
|
"is_not_null": "не пусто"
|
||||||
|
},
|
||||||
|
"errors": {
|
||||||
|
"no_filter": "Фильтр не выбран",
|
||||||
|
"empty_group": "Группа пуста",
|
||||||
|
"radio_empty": "Не выбранно значение",
|
||||||
|
"checkbox_empty": "Не выбранно значение",
|
||||||
|
"select_empty": "Не выбранно значение",
|
||||||
|
"string_empty": "Не заполненно",
|
||||||
|
"string_exceed_min_length": "Должен содержать больше {0} символов",
|
||||||
|
"string_exceed_max_length": "Должен содержать меньше {0} символов",
|
||||||
|
"string_invalid_format": "Неверный формат ({0})",
|
||||||
|
"number_nan": "Не число",
|
||||||
|
"number_not_integer": "Не число",
|
||||||
|
"number_not_double": "Не число",
|
||||||
|
"number_exceed_min": "Должно быть больше {0}",
|
||||||
|
"number_exceed_max": "Должно быть меньше, чем {0}",
|
||||||
|
"number_wrong_step": "Должно быть кратно {0}",
|
||||||
|
"datetime_empty": "Не заполненно",
|
||||||
|
"datetime_invalid": "Неверный формат даты ({0})",
|
||||||
|
"datetime_exceed_min": "Должно быть, после {0}",
|
||||||
|
"datetime_exceed_max": "Должно быть, до {0}",
|
||||||
|
"boolean_not_valid": "Не логическое",
|
||||||
|
"operator_not_multiple": "Оператор \"{1}\" не поддерживает много значений"
|
||||||
|
},
|
||||||
|
"invert": "Инвертировать"
|
||||||
|
};
|
||||||
|
|
||||||
|
QueryBuilder.defaults({ lang_code: 'ru' });
|
||||||
|
}));
|
||||||
6477
webapp/src/main/webapp/themes/iph/js/query-builder.standalone.js
Normal file
6477
webapp/src/main/webapp/themes/iph/js/query-builder.standalone.js
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -61,6 +61,7 @@
|
||||||
</fieldset>
|
</fieldset>
|
||||||
<div id="builder"></div>
|
<div id="builder"></div>
|
||||||
<script src="themes/iph/js/query-builder.standalone.min.js"></script>
|
<script src="themes/iph/js/query-builder.standalone.min.js"></script>
|
||||||
|
<script src="themes/iph/js/query-builder.ru.js"></script>
|
||||||
<script src="themes/iph/js/query-builder-config.js"></script>
|
<script src="themes/iph/js/query-builder-config.js"></script>
|
||||||
|
|
||||||
</section> <!-- #search-home -->
|
</section> <!-- #search-home -->
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue