Skip to content
Snippets Groups Projects
Commit 5e60f140 authored by Jan Mach's avatar Jan Mach
Browse files

Tweaked event severity and classification display in event search and show views. 

(Redmine issue: #3734)
parent d03273a2
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
lib/hawat/blueprints/design/templates/_macros_site.html
+ 24
− 8
View file @ 5e60f140
......@@ -643,15 +643,15 @@
{%- macro render_event_label_severity(event, with_label = False) %}
{%- set tmpval = event.get_severity() %}
{%- if not tmpval or tmpval == 'unknown' %}
<span class="label label-default" title="{{ gettext('Unknown event severity') }}" data-toggle="tooltip">{{ get_fa_icon('r-s-unknown') }}{% if with_label %} {{ gettext('UNKNOWN') }}{% endif %}</span>
<span class="label label-default" title="{{ gettext('Unknown event severity') }}" data-toggle="tooltip">{{ get_fa_icon('r-s-unknown') }}{% if with_label %} {{ gettext(tmpval) | upper }}{% endif %}</span>
{%- elif tmpval == 'low' %}
<span class="label label-info" title="{{ gettext('Low event severity') }}" data-toggle="tooltip">{{ get_fa_icon('r-s-low') }}{% if with_label %} {{ gettext('LOW') }}{% endif %}</span>
<span class="label label-info" title="{{ gettext('Low event severity') }}" data-toggle="tooltip">{{ get_fa_icon('r-s-low') }}{% if with_label %} {{ gettext(tmpval) | upper }}{% endif %}</span>
{%- elif tmpval == 'medium' %}
<span class="label label-primary" title="{{ gettext('Medium event severity') }}" data-toggle="tooltip">{{ get_fa_icon('r-s-medium') }}{% if with_label %} {{ gettext('MEDIUM') }}{% endif %}</span>
<span class="label label-primary" title="{{ gettext('Medium event severity') }}" data-toggle="tooltip">{{ get_fa_icon('r-s-medium') }}{% if with_label %} {{ gettext(tmpval) | upper }}{% endif %}</span>
{%- elif tmpval == 'high' %}
<span class="label label-warning" title="{{ gettext('High event severity') }}" data-toggle="tooltip">{{ get_fa_icon('r-s-high') }}{% if with_label %} {{ gettext('HIGH') }}{% endif %}</span>
<span class="label label-warning" title="{{ gettext('High event severity') }}" data-toggle="tooltip">{{ get_fa_icon('r-s-high') }}{% if with_label %} {{ gettext(tmpval) | upper }}{% endif %}</span>
{%- elif tmpval == 'critical' %}
<span class="label label-danger" title="{{ gettext('Critical event severity') }}" data-toggle="tooltip">{{ get_fa_icon('r-s-critical') }}{% if with_label %} {{ gettext('CRITICAL') }}{% endif %}</span>
<span class="label label-danger" title="{{ gettext('Critical event severity') }}" data-toggle="tooltip">{{ get_fa_icon('r-s-critical') }}{% if with_label %} {{ gettext(tmpval) | upper }}{% endif %}</span>
{%- endif %}
{%- endmacro %}
......@@ -695,18 +695,34 @@
{% if marklist and subitem in marklist %}<mark>{{ subitem }}</mark>{%- else %}{{ subitem }}{%- endif %}
{%- endif %}
<div class="btn-group">
<button class="btn btn-default btn-xs dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
{%- if subitem == 'low' %}
{%- set tmpcolor = 'btn-info' %}
{%- set tmpicon = 'r-s-low' %}
{%- elif subitem == 'medium' %}
{%- set tmpcolor = 'btn-primary' %}
{%- set tmpicon = 'r-s-medium' %}
{%- elif subitem == 'high' %}
{%- set tmpcolor = 'btn-warning' %}
{%- set tmpicon = 'r-s-high' %}
{%- elif subitem == 'critical' %}
{%- set tmpcolor = 'btn-danger' %}
{%- set tmpicon = 'r-s-critical' %}
{%- else %}
{%- set tmpcolor = 'btn-default' %}
{%- set tmpicon = 'r-s-unknown' %}
{%- endif %}
<button class="btn {{ tmpcolor }} btn-xs dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
{%- if separate_dropdown and not without_label %}
<span class="caret"></span>
{%- elif not without_label %}
{% if marklist and subitem in marklist %}<mark>{{ subitem }}</mark>{%- else %}{{ subitem }}{%- endif %} <span class="caret"></span>
{{ get_fa_icon(tmpicon) }} {% if marklist and subitem in marklist %}<mark>{{ gettext(subitem) | upper }}</mark>{%- else %}{{ gettext(subitem) | upper }}{%- endif %} <span class="caret"></span>
{%- else %}
<span class="caret"></span>
{%- endif %}
</button>
<ul class="dropdown-menu{% if align_right %} dropdown-menu-right{% endif %}">
<li class="dropdown-header">
{{ gettext('Event severity &quot;%(name)s&quot;', name = subitem) | safe }}
{{ gettext('Event severity &quot;%(name)s&quot;', name = gettext(subitem)) | safe }}
</li>
{%- if check_endpoint_exists('events.search') %}
<li>
......
lib/hawat/blueprints/events/templates/events/search.html
+ 31
− 2
View file @ 5e60f140
......@@ -325,6 +325,11 @@
{{ get_endpoint_icon('events.search') }} {{ gettext('Search for events without any classification in event database') | safe }}
</a>
</li>
<li>
<a href="{{ url_for('events.search', severities = ['__EMPTY__'], submit = gettext('Search')) }}">
{{ get_endpoint_icon('events.search') }} {{ gettext('Search for events without assigned severity in event database') | safe }}
</a>
</li>
</ul>
</div>
{%- endif %}
......@@ -374,9 +379,17 @@
<th data-toggle="tooltip" title="{{ gettext('Problem sources') }}">
{{ gettext('Sources') }}
</th>
<th data-toggle="tooltip" title="{{ gettext('Targets or victims') }}" class="hidden-xs hidden-sm">
<!--
<th data-toggle="tooltip" title="{{ gettext('Targets or victims') }}" class="hidden-xs hidden-sm hidden-md">
{{ gettext('Targets') }}
</th>
-->
<th data-toggle="tooltip" title="{{ gettext('Event severity') }}">
{{ gettext('Severity') }}
</th>
<th data-toggle="tooltip" title="{{ gettext('Event classification') }}">
{{ gettext('Classification') }}
</th>
<th data-toggle="tooltip" title="{{ gettext('Event categorization') }}">
{{ gettext('Categorization') }}
</th>
......@@ -412,9 +425,25 @@
<td>
{{ macros_site.render_event_search_widget_hostaddr(item.get_addresses('Source'), [form_data['source_addrs'], form_data['target_addrs'], form_data['host_addrs']]) }}
</td>
<td class="hidden-xs hidden-sm">
<!--
<td class="hidden-xs hidden-sm hidden-md">
{{ macros_site.render_event_search_widget_hostaddr(item.get_addresses('Target'), [form_data['source_addrs'], form_data['target_addrs'], form_data['host_addrs']]) }}
</td>
-->
<td>
{%- if item.get_severity() %}
{{ macros_site.render_event_search_widget_severity([item.get_severity()], align_right = True) }}
{%- else %}
{{ gettext('-- unassigned --') }}
{%- endif %}
</td>
<td>
{%- if item.get_class() %}
{{ macros_site.render_event_search_widget_class([item.get_class()], form_data['classes'], True) }}
{%- else %}
{{ gettext('-- unclassified --') }}
{%- endif %}
</td>
<td>
{{ macros_site.render_event_search_widget_category(item.get_categories(), form_data['categories'], True) }}
</td>
......
lib/hawat/blueprints/events/templates/events/show.html
+ 7
− 4
View file @ 5e60f140
......@@ -132,8 +132,11 @@
{{ gettext('Event severity:') }}
</th>
<td>
{{ macros_site.render_event_label_severity(item, True) }}
{{ macros_site.render_event_search_widget_severity([item.get_severity()], align_right = True, separate_dropdown = True, without_label = True) }}
{%- if item.get_severity() %}
{{ macros_site.render_event_search_widget_severity([item.get_severity()], align_right = True) }}
{%- else %}
{{ gettext('-- unassigned --') }}
{%- endif %}
</td>
</tr>
<tr>
......@@ -142,10 +145,10 @@
</th>
<td>
{%- if item.get_class() %}
<a href="#">{{ item.get_class() }}</a>
{{ item.get_class() }}
{{ macros_site.render_event_search_widget_class([item.get_class()], align_right = True, separate_dropdown = True, without_label = True) }}
{%- else %}
{{ gettext('-- undisclosed --') }}
{{ gettext('-- unclassified --') }}
{%- endif %}
</td>
</tr>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment