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

N°3712 - Activity panel: Improve history entries to have a different icon depending the origin (interactive, webservices, csv, ...)

Browse Source
This commit is contained in:
Molkobain
2021-08-02 19:39:53 +02:00
parent 39bcd3e4cd
commit 1da1e0b1bd
10 changed files with 101 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
templates/base/layouts/activity-panel/activity-entry/edits-entry.html.twig
View File

@@ -19,4 +19,13 @@
{% endfor %}
</ul>
{% endif %}
{% endblock %}
{% block iboActivityEntrySubInformation %}
{% if oUIBlock.GetOrigin() is not null and oUIBlock.GetOrigin != constant('Combodo\\iTop\\Core\\CMDBChange\\CMDBChangeOrigin::INTERACTIVE') %}
<span class="ibo-activity-entry--origin" data-role="ibo-activity-entry--origin" data-tooltip-content="{{ ('Class:CMDBChange/Attribute:origin/Value:' ~ oUIBlock.GetOrigin())|dict_s }}">
<span class="{{ oUIBlock.GetOriginDecorationClasses() }}"></span>
</span>
{% endif %}
{{ parent() }}
{% endblock %}

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

@@ -1,8 +1,10 @@
{% spaceless %}
<div class="ibo-activity-entry {% if oUIBlock.IsFromCurrentUser() %}ibo-is-current-user{% endif %} {% block iboActivityEntryExtraClasses %}{% endblock %}"
data-role="ibo-activity-entry"
data-entry-type="{% block iboActivityEntryType %}{{ oUIBlock.GetType() }}{% endblock %}"
data-entry-datetime-raw="{{ oUIBlock.GetRawDateTime() }}"
data-entry-author-login="{{ oUIBlock.GetAuthorLogin() }}"
data-entry-origin="{{ oUIBlock.GetOrigin() }}"
{% block iboActivityEntryExtraDataAttributes %}{% endblock %}>
<div class="ibo-activity-entry--medallion {% if oUIBlock.GetAuthorPictureAbsUrl() is not empty %}ibo-has-image{% endif %}" data-role="ibo-activity-entry--medallion" data-tooltip-content="{{ oUIBlock.GetAuthorFriendlyname() }}">
{% block iboActivityEntryMedallion %}
@@ -33,9 +35,7 @@
<div class="ibo-activity-entry--sub-information" data-role="ibo-activity-entry--sub-information">
{% block iboActivityEntrySubInformation %}
{% if get_config_parameter('activity_panel.show_author_name_below_entries') %}
<span class="ibo-activity-entry--author-name ibo-is-hidden" data-role="ibo-activity-entry--author-name">
{{ oUIBlock.GetAuthorFriendlyname() }}
</span>
<span class="ibo-activity-entry--author-name ibo-is-hidden" data-role="ibo-activity-entry--author-name">{{ oUIBlock.GetAuthorFriendlyname() }}</span>
{% endif %}
<span class="ibo-activity-entry--datetime" data-role="ibo-activity-entry--datetime"
data-tooltip-content="{{ oUIBlock.GetFormattedDateTime() }}"
@@ -45,4 +45,5 @@
</div>
{% endblock %}
</div>
</div>
</div>
{% endspaceless %}

3
templates/base/layouts/activity-panel/entry-group.html.twig
View File

@@ -3,8 +3,7 @@
{# Otherwise when the page is loaded, all the entry groups are displayed for a brief moment, then they are filtered on the options of the currently displayed tab #}
<div class="ibo-activity-panel--entry-group {% if oFirstEntry.IsFromCurrentUser() %}ibo-is-current-user{% endif %} ibo-is-hidden"
data-role="ibo-activity-panel--entry-group"
data-entry-group-author-login="{{ oFirstEntry.GetAuthorLogin() }}"
data-entry-group-origin="{{ oFirstEntry.GetOrigin() }}">
data-entry-group-author-login="{{ oFirstEntry.GetAuthorLogin() }}">
{% for oEntry in aEntryGroup.entries %}
{{ render_block(oEntry) }}
{% endfor %}