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

N°1479 : Fixed a regression where on impact analysis display, every tabs would be resized to 15px. Added css for advanced search for impact analysis & normal search

Browse Source 
SVN:trunk[5840]
This commit is contained in:
Stephen Abello
2018-06-08 10:17:58 +00:00
parent e00f9c2a83
commit 885cabd6ef
4 changed files with 1805 additions and 1619 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
core/displayablegraph.class.inc.php
View File

@@ -1438,22 +1438,22 @@ class DisplayableGraph extends SimpleGraph
}
$aExcludedByClass[get_class($oObj)][] = $oObj->GetKey();
}
$sSftShort = Dict::S('UI:ElementsDisplayed');
$sSearchToggle = Dict::S('UI:Search:Toggle');
$oP->add("<div class=\"not-printable\">\n");
$oP->add("<div id=\"ds_flash\" class=\"search_box\" style=\"display:none;\">\n");
if (!$oP->IsPrintableVersion())
{
$oP->add_ready_script(
$oP->add(
<<<EOF
$( "#tabbedContent_0" ).tabs({ heightStyle: "fill" });
<div id="ds_flash" class="search_box">
<form id="dh_flash" class="search_form_handler closed">
<h2 class="sf_title"><span class="sft_long">$sSftShort</span><span class="sft_short">$sSftShort</span><span class="sft_toggler fa fa-caret-down pull-right" title="$sSearchToggle"></span></h2>
<div id="dh_flash_criterion_outer" class="sf_criterion_area"><div class="sf_criterion_row">
EOF
);
}
);
$oP->add_ready_script(
<<<EOF
$("#dh_flash").click( function() {
$("#ds_flash").slideToggle('normal', function() { $("#ds_flash").parent().resize(); $("#dh_flash").trigger('toggle_complete'); } );
$("#dh_flash").toggleClass('open');
$("#dh_flash > .sf_title").click( function() {
$("#dh_flash").toggleClass('closed');
});
$('#ReloadMovieBtn').button().button('disable');
EOF
@@ -1476,9 +1476,8 @@ EOF
$idx++;
}
$oP->add("<p style=\"text-align:right\"><button type=\"button\" id=\"ReloadMovieBtn\" onClick=\"DoReload()\">".Dict::S('UI:Button:Refresh')."</button></p>");
$oP->add("</div></div></form>");
$oP->add("</div>\n");
$oP->add("<div class=\"HRDrawer\"></div>\n");
$oP->add("<div id=\"dh_flash\" class=\"DrawerHandle\">".Dict::S('UI:ElementsDisplayed')."</div>\n");
$oP->add("</div>\n"); // class="not-printable"
$aAdditionalContexts = array();

3389
css/light-grey.css
View File

File diff suppressed because it is too large Load Diff

10
css/light-grey.scss
View File

@@ -839,11 +839,11 @@ input.dp-applied {
}
}
&.closed{
margin-top: -0.25em; /* To remove top padding from the parent .display_block */
margin-bottom: 0.5em;
width: 150px;
overflow: hidden;
border-radius: 0 0 4px 4px;
border-radius: 4px;
background-color: $complement-color;
.sf_criterion_area{
height: 0;
@@ -3226,4 +3226,8 @@ table.listResults .originColor{
#dataModelSplitPane .ui-layout-center{
margin-left :30px !important;
}
///////////////////
///////////////////
//Impact analysis filter
#ds_flash{
margin-bottom: 5px;
}

2
js/simple_graph.js
View File

@@ -801,7 +801,7 @@ $(function()
}
var aContexts = [];
$('#'+sId+'_contexts').multiselect('getChecked').each(function() { aContexts[$(this).val()] = me.options.additional_contexts[$(this).val()].oql; });
this.element.closest('.ui-tabs').tabs({ heightStyle: "fill" });
//this.element.closest('.ui-tabs').tabs({ heightStyle: "fill" });
this.adjust_height();
this._close_all_tooltips();
this.oPaper.rect(this.xPan, this.yPan, this.element.width(), this.element.height()).attr({fill: '#000', opacity: 0.4, 'stroke-width': 0});