diff --git a/webapp/src/main/webapp/themes/iph/css/iph.css b/webapp/src/main/webapp/themes/iph/css/iph.css index f7170c99..981ce15a 100644 --- a/webapp/src/main/webapp/themes/iph/css/iph.css +++ b/webapp/src/main/webapp/themes/iph/css/iph.css @@ -764,7 +764,7 @@ p.external-auth a.blue:hover { /* HOME SEARCH ------> */ #search-home { float: left; - /* width: 533px; */ + width: 100%; margin: 30px 0 0 0; } #search-home h3 { diff --git a/webapp/src/main/webapp/themes/iph/js/query-builder-config.js b/webapp/src/main/webapp/themes/iph/js/query-builder-config.js index f723d7e8..0cf8b218 100644 --- a/webapp/src/main/webapp/themes/iph/js/query-builder-config.js +++ b/webapp/src/main/webapp/themes/iph/js/query-builder-config.js @@ -2,12 +2,12 @@ var rules_basic = { condition: 'AND', rules: [{ - id: 'category', - operator: 'equal', + id: 'text', + operator: 'contains', value: 2 }, { - id: 'category', - operator: 'equal', + id: 'keywords', + operator: 'contains', value: 1 }] @@ -15,51 +15,50 @@ var rules_basic = { $('#builder').queryBuilder({ filters: [{ - id: 'name', - label: 'Name', - type: 'string' + id: 'text', + label: 'Текст', + type: 'string', + operators: ['contains', 'not_contains'] }, { - id: 'category', - label: 'Category', + id: 'keywords', + label: 'Ключевые слова', + type: 'string', + operators: ['contains', 'not_contains'] + }, { + id: 'title', + label: 'Название', + type: 'string', + operators: ['contains', 'not_contains'] + }, { + id: 'bibliography', + label: 'Библиография', + type: 'string', + operators: ['contains', 'not_contains'] + }, { + id: 'classgroup', + label: 'Тип документа', type: 'integer', input: 'select', values: { - 1: 'Books', - 2: 'Movies', - 3: 'Music', - 4: 'Tools', - 5: 'Goodies', - 6: 'Clothes' + 1: 'Статья', + 2: 'Отрывок' }, - operators: ['equal', 'not_equal'] + operators: ['contains'] }, { - id: 'in_stock', - label: 'In stock', + id: 'rubrics', + label: 'Рубрикация', type: 'integer', - input: 'radio', + input: 'select', values: { - 1: 'Yes', - 0: 'No' + 1: 'История философии', + 2: 'Логика', + 3: 'Философия языка', + 4: 'Этика', + 5: 'Эстетика', + 6: 'Философия техники' }, - operators: ['equal'] - }, { - id: 'price', - label: 'Price', - type: 'double', - validation: { - min: 0, - step: 0.01 - } - }, { - id: 'id', - label: 'Identifier', - type: 'string', - placeholder: '____-____-____', - operators: ['equal', 'not_equal'], - validation: { - format: /^.{4}-.{4}-.{4}$/ - } - }], + operators: ['contains', 'not_contains'] + } ], lang_code: 'ru', rules: rules_basic }); diff --git a/webapp/src/main/webapp/themes/iph/js/query-builder.ru.js b/webapp/src/main/webapp/themes/iph/js/query-builder.ru.js index e09665cd..c53708b7 100644 --- a/webapp/src/main/webapp/themes/iph/js/query-builder.ru.js +++ b/webapp/src/main/webapp/themes/iph/js/query-builder.ru.js @@ -18,7 +18,7 @@ var QueryBuilder = $.fn.queryBuilder; QueryBuilder.regional['ru'] = { "__locale": "Russian (ru)", - "add_rule": "Добавить", + "add_rule": "Добавить условие", "add_group": "Добавить группу", "delete_rule": "Удалить", "delete_group": "Удалить", @@ -74,4 +74,4 @@ QueryBuilder.regional['ru'] = { }; QueryBuilder.defaults({ lang_code: 'ru' }); -})); \ No newline at end of file +})); diff --git a/webapp/src/main/webapp/themes/iph/templates/.page-home.ftl.swp b/webapp/src/main/webapp/themes/iph/templates/.page-home.ftl.swp deleted file mode 100644 index d098ceb7..00000000 Binary files a/webapp/src/main/webapp/themes/iph/templates/.page-home.ftl.swp and /dev/null differ