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

Advanced search: WIP POC, UI/UX.

Browse Source 
SVN:b1162[5441]
This commit is contained in:
Guillaume Lajarige
2018-03-16 09:44:34 +00:00
parent f60d0b10e0
commit d734cdaf48
4 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
css/light-grey.css
View File

@@ -768,7 +768,12 @@ input.dp-applied {
.search_form_handler .sf_title > span {
margin-right: 10px;
}
.search_form_handler .sf_title .sft_refresh {
font-size: 10pt;
line-height: 13pt;
}
.search_form_handler .sf_title .sft_toggler {
margin-left: 0.7em;
transition: all 0.4s ease-in-out;
}
.search_form_handler .sf_criterion_area {

5
css/light-grey.scss
View File

@@ -858,7 +858,12 @@ input.dp-applied {
margin-right: 10px;
}
.sft_refresh{
font-size: 10pt;
line-height: 13pt;
}
.sft_toggler{
margin-left: 0.7em;
transition: all 0.4s ease-in-out;
}
}

21
js/search/search_form_handler.js
View File

@@ -217,6 +217,10 @@ $(function()
{
var me = this;
this.element.find('.sft_refresh').on('click', function(oEvent){
oEvent.preventDefault();
me._submit();
});
// TODO: UX Improvment
// Note: Would be better to toggle by clicking on the whole title, but we have an issue with <select> on abstract classes.
this.element.find('.sft_toggler').on('click', function(oEvent){
@@ -347,8 +351,15 @@ $(function()
}
else
{
// TODO: Change this so it appears after the search drawer.
oResultAreaElem = $('<div></div>').appendTo(this.element);
// Reusing previously created DOM element
if(this.element.closest('.display_block').next('.sf_results_area').length > 0)
{
oResultAreaElem = this.element.closest('.display_block').next('.sf_results_area');
}
else
{
oResultAreaElem = $('<div></div>').insertAfter(this.element.closest('.display_block'));
}
}
oResultAreaElem.addClass('sf_results_area');
@@ -551,14 +562,12 @@ $(function()
// - Show loader
_showLoader: function()
{
// TODO: Show loader
this._trace('Show loader');
this.elements.results_area.block();
},
// - Hide loader
_hideLoader: function()
{
// TODO: Hide loader
this._trace('Hide loader');
this.elements.results_area.unblock();
},
// - Converts a snake_case string to CamelCase
_toCamelCase: function(sString)

2
sources/application/search/searchform.class.inc.php
View File

@@ -117,7 +117,7 @@ class SearchForm
$sAction = (isset($aExtraParams['action'])) ? $aExtraParams['action'] : utils::GetAbsoluteUrlAppRoot().'pages/UI.php';
$sStyle = (isset($aExtraParams['open']) && ($aExtraParams['open'] == 'true')) ? 'opened' : '';
$sHtml .= "<form id=\"fs_{$sSearchFormId}\" action=\"{$sAction}\" class=\"{$sStyle}\">\n"; // Don't use $_SERVER['SCRIPT_NAME'] since the form may be called asynchronously (from ajax.php)
$sHtml .= "<h2 class=\"sf_title\"><span class=\"sft_picto fa fa-search\"></span>" . Dict::Format('UI:SearchFor_Class_Objects', $sClassesCombo) . "<a class=\"sft_toggler fa fa-caret-down pull-right\" href=\"#\" title=\"" . Dict::S('UI:Search:Toggle') . "\"></a></h2>\n";
$sHtml .= "<h2 class=\"sf_title\"><span class=\"sft_picto fa fa-search\"></span>" . Dict::Format('UI:SearchFor_Class_Objects', $sClassesCombo) . "<a class=\"sft_toggler fa fa-caret-down pull-right\" href=\"#\" title=\"" . Dict::S('UI:Search:Toggle') . "\"></a><a class=\"sft_refresh fa fa-refresh pull-right\" href=\"#\" title=\"" . Dict::S('UI:Button:Refresh') . "\"></a></h2>\n";
$sHtml .= "<div id=\"fs_{$sSearchFormId}_criterion_outer\">\n";
$sHtml .= "</div>\n";