composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-24 02:58:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Advanced search: Fixes on enum criteria.

Browse Source 
SVN:trunk[5618]
This commit is contained in:
Guillaume Lajarige
2018-04-05 10:18:18 +00:00
parent 9d5156e0e0
commit 991c87530f
3 changed files with 49 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
css/light-grey.css
View File

@@ -920,20 +920,19 @@ input.dp-applied {
margin-left: 0px;
margin-right: 8px;
}
.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator .sfc_opc_multichoices .sfc_opc_mc_items {
.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator .sfc_opc_multichoices .sfc_opc_mc_items_wrapper {
max-height: 445px;
/* Must be less than .sfc_form_group:max-height - .sfc_opc_mc_toggler:height - .sfc_opc_mc_filter:height */
overflow-x: hidden;
overflow-y: auto;
margin: 0px -8px;
/* Compensate .sfc_opc_multichoices side padding so the hover style can take the full with */
}
.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator .sfc_opc_multichoices .sfc_opc_mc_items .sfc_opc_mc_items_list.sfc_opc_mc_items_selected {
.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator .sfc_opc_multichoices .sfc_opc_mc_items_wrapper .sfc_opc_mc_items .sfc_opc_mc_items_list.sfc_opc_mc_items_selected {
position: relative;
padding-top: 5px;
margin-top: 5px;
}
.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator .sfc_opc_multichoices .sfc_opc_mc_items .sfc_opc_mc_items_list.sfc_opc_mc_items_selected::before {
.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator .sfc_opc_multichoices .sfc_opc_mc_items_wrapper .sfc_opc_mc_items .sfc_opc_mc_items_list.sfc_opc_mc_items_selected::before {
content: "";
position: absolute;
border-top: 1px solid #ddd;
@@ -942,19 +941,19 @@ input.dp-applied {
margin-left: 6px;
top: 0px;
}
.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator .sfc_opc_multichoices .sfc_opc_mc_items .sfc_opc_mc_items_list .sfc_opc_mc_placeholder {
.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator .sfc_opc_multichoices .sfc_opc_mc_items_wrapper .sfc_opc_mc_items .sfc_opc_mc_items_list .sfc_opc_mc_placeholder {
padding: 15px 8px;
font-style: italic;
text-align: center;
}
.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator .sfc_opc_multichoices .sfc_opc_mc_items .sfc_opc_mc_items_list .sfc_opc_mc_item {
.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator .sfc_opc_multichoices .sfc_opc_mc_items_wrapper .sfc_opc_mc_items .sfc_opc_mc_items_list .sfc_opc_mc_item {
padding: 4px 8px;
/* Putting back the padding remove by .sfc_opc_mc_items */
}
.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator .sfc_opc_multichoices .sfc_opc_mc_items .sfc_opc_mc_items_list .sfc_opc_mc_item:hover {
.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator .sfc_opc_multichoices .sfc_opc_mc_items_wrapper .sfc_opc_mc_items .sfc_opc_mc_items_list .sfc_opc_mc_item:hover {
background-color: #fff;
}
.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator .sfc_opc_multichoices .sfc_opc_mc_items .sfc_opc_mc_items_list .sfc_opc_mc_item label {
.search_form_handler .sf_criterion_area .search_form_criteria .sfc_form_group .sfc_fg_operators .sfc_fg_operator .sfc_opc_multichoices .sfc_opc_mc_items_wrapper .sfc_opc_mc_items .sfc_opc_mc_items_list .sfc_opc_mc_item label {
display: inline-block;
width: 100%;
}
@@ -1159,7 +1158,7 @@ input.dp-applied {
border: 1px solid #ababab;
}
.search_form_handler .sf_filter input {
width: 100%;
width: 100% !important;
}
.search_form_handler .sf_filter button {
width: 23px;

63
css/light-grey.scss
View File

@@ -1035,43 +1035,44 @@ input.dp-applied {
.sfc_opc_mc_toggler{
}
.sfc_opc_mc_items{
.sfc_opc_mc_items_wrapper{
max-height: 445px; /* Must be less than .sfc_form_group:max-height - .sfc_opc_mc_toggler:height - .sfc_opc_mc_filter:height */
overflow-x: hidden;
overflow-y: auto;
margin: 0px -8px; /* Compensate .sfc_opc_multichoices side padding so the hover style can take the full with */
.sfc_opc_mc_items_list{
&.sfc_opc_mc_items_selected{
position: relative;
padding-top: 5px;
margin-top: 5px;
.sfc_opc_mc_items{
.sfc_opc_mc_items_list{
&.sfc_opc_mc_items_selected{
position: relative;
padding-top: 5px;
margin-top: 5px;
&::before{
content: "";
position: absolute;
border-top: 1px solid $gray-lighter;
width: calc(100% - 12px); /* minus margin-left x2 */
margin-left: 6px;
top: 0px;
}
}
.sfc_opc_mc_placeholder{
padding: 15px 8px;
font-style: italic;
text-align: center;
}
.sfc_opc_mc_item{
padding: 4px 8px; /* Putting back the padding remove by .sfc_opc_mc_items */
&:hover{
background-color: $search-criteria-box-hover-color;
&::before{
content: "";
position: absolute;
border-top: 1px solid $gray-lighter;
width: calc(100% - 12px); /* minus margin-left x2 */
margin-left: 6px;
top: 0px;
}
}
label{
display: inline-block;
width: 100%;
.sfc_opc_mc_placeholder{
padding: 15px 8px;
font-style: italic;
text-align: center;
}
.sfc_opc_mc_item{
padding: 4px 8px; /* Putting back the padding remove by .sfc_opc_mc_items */
&:hover{
background-color: $search-criteria-box-hover-color;
}
label{
display: inline-block;
width: 100%;
}
}
}
}
@@ -1363,7 +1364,7 @@ input.dp-applied {
border: 1px solid #ABABAB;
}
input{
width: 100%;
width: 100% !important;
}
button{
width: 23px; /* Must be equals to .sf_filter > *:height */

13
js/search/search_form_criteria_enum.js
View File

@@ -129,10 +129,14 @@ $(function()
.append('<span class="sff_input_wrapper"><input type="text" id="' + sFilterId + '" placeholder="' + sFilterPlaceholder + '" autocomplete="off" /><span class="sff_picto sff_reset fa fa-times"></span></span>')
.appendTo(oOpContentElem);
// - Values wrapper
var oValuesWrapperElem = $('<div></div>')
.addClass('sfc_opc_mc_items_wrapper')
.appendTo(oOpContentElem);
// - Allowed values
var oAllowedValuesElem = $('<div></div>')
.addClass('sfc_opc_mc_items')
.appendTo(oOpContentElem);
.appendTo(oValuesWrapperElem);
// - Static values: Always there no matter the field constraints
var oStaticListElem = $('<div></div>')
.addClass('sfc_opc_mc_items_list')
@@ -273,7 +277,8 @@ $(function()
var oOpContentElem = oOpElem.find('.sfc_opc_multichoices');
var oTogglerElem = oOpContentElem.find('.sfc_opc_mc_toggler');
var oFilterElem = oOpContentElem.find('.sf_filter');
var oAllowedValuesElem = oOpContentElem.find('.sfc_opc_mc_items');
var oValuesWrapperElem = oOpContentElem.find('.sfc_opc_mc_items_wrapper');
var oAllowedValuesElem = oValuesWrapperElem.find('.sfc_opc_mc_items');
// DOM
// - Hide toggler for now
@@ -291,7 +296,7 @@ $(function()
var oSelectedValuesElem = $('<div></div>')
.addClass('sfc_opc_mc_items')
.append('<div class="sfc_opc_mc_items_list sfc_opc_mc_items_selected"></div>')
.appendTo(oOpContentElem);
.appendTo(oValuesWrapperElem);
this._refreshSelectedValues();
// - External classes
@@ -320,7 +325,7 @@ $(function()
}
var sQuery = $(this).val();
if( (sQuery === '') || (sQuery.length < me.options.autocomplete.min_autocomplete_chars) )
if( (sQuery === '') ) // TODO: Put this back after tests|| (sQuery.length < me.options.autocomplete.min_autocomplete_chars) )
{
me._setACTypingHint();
oFilterElem.find('.sff_reset').hide();