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

Fix compose popup menu when there's extra actions

Browse Source
This commit is contained in:
Stephen Abello
2026-08-28 09:34:00 +02:00
parent e2c70fc4d7
commit 3b87f9f69b
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
css/backoffice/layout/activity-panel/_activity-action.scss
View File

@@ -31,10 +31,9 @@ $ibo-activity-panel--activity-action-separator--background-color: $ibo-color-gre
&.ibo-is-hidden{
display: none;
}
}
.ibo-activity-panel--add-caselog-entry-button ~ .ibo-activity-panel--activity-actions {
top: calc(#{$ibo-activity-panel--activity-actions--top} + #{$ibo-activity-panel--add-caselog-entry-button--diameter} + #{$ibo-activity-panel--activity-actions--gap});
&:has(+ .ibo-activity-panel--add-caselog-entry-button) {
top: calc(#{$ibo-activity-panel--activity-actions--top} + #{$ibo-activity-panel--activity-action--diameter} + #{$ibo-activity-panel--activity-actions--gap});
}
}
.ibo-activity-panel--activity-action {

14
templates/base/layouts/activity-panel/layout.html.twig
View File

@@ -71,6 +71,13 @@
</div>
</div>
</div>
{% if oUIBlock.HasActivityActions() %}
<div class="ibo-activity-panel--activity-actions" data-role="ibo-activity-panel--activity-actions">
{% for oActivityAction in oUIBlock.GetActivityActions() %}
{{ render_block(oActivityAction) }}
{% endfor %}
</div>
{% endif %}
{% if oUIBlock.IsComposeButtonEnabled() %}
<a href="#"
id="ibo-activity-panel--add-caselog-entry-button"
@@ -84,13 +91,6 @@
{{ render_block(oUIBlock.GetComposeMenu()) }}
{% endif %}
{% endif %}
{% if oUIBlock.HasActivityActions() %}
<div class="ibo-activity-panel--activity-actions" data-role="ibo-activity-panel--activity-actions">
{% for oActivityAction in oUIBlock.GetActivityActions() %}
{{ render_block(oActivityAction) }}
{% endfor %}
</div>
{% endif %}
<div class="ibo-activity-panel--body" data-role="ibo-activity-panel--body">
{% if oUIBlock.GetGroupedEntries()|length > 0 %}
{% for aEntryGroup in oUIBlock.GetGroupedEntries() %}