Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use consistent delete icon similar to case comments/events; open new … #416

Merged
merged 3 commits into from
Apr 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions html/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -1344,17 +1344,17 @@ <h3 class="text--primary">{{ i18n.commentAddDetection }}</h3>
<!-- custom filter -->
<v-text-field id="new-override-custom-filter-edit" v-model="newOverride.customFilter" :rules="[rules.required]" persistent-hint :hint="i18n.customFilter" data-aid="detection_new_override_filter_input"></v-text-field>
</div>
<div v-if="newOverride" class="d-flex justify-end text-body-2 mt-2">
<div class="d-inline-flex">
<a :href="$root.parameters.docsUrl" target="_blank" data-aid="detection_override_help">
<v-icon :title="i18n.overrideDocumentationHelp" class="override-help">fa-regular fa-circle-question</v-icon>
</a>
<div v-if="newOverride" class="d-flex align-center align-self-end text-body-2 mt-2">
<div class="d-inline-flex justify-end">
<v-btn id="detection-create-cancel" text small color="primary" class="align-self-end" @click="newOverride = null" data-aid="detection_new_override_cancel">
{{ i18n.cancel }}
</v-btn>
<v-btn v-if="newOverride.type" id="detection-create-create" text small color="primary" class="align-self-end" @click="addNewOverride()" data-aid="detection_new_override_save">
{{ i18n.create }}
</v-btn>
<v-btn icon :target="$root.target('so-help')" :href="$root.parameters.docsUrl + 'detections.html'" :title="i18n.overrideDocumentationHelp" data-aid="detection_override_help_new">
<v-icon>fa-regular fa-circle-question</v-icon>
</v-btn>
</div>
</div>
</v-form>
Expand Down Expand Up @@ -1479,11 +1479,11 @@ <h3 class="text--primary">{{ i18n.commentAddDetection }}</h3>
</div>
<div class="d-flex justify-end text-body-2 mt-4">
<div class="d-inline-flex">
<a :href="$root.parameters.docsUrl" target="_blank">
<v-icon :title="i18n.overrideDocumentationHelp" class="override-help" data-aid="detection_override_help">fa-regular fa-circle-question</v-icon>
</a>
<v-btn id="override-edit-delete" text small color="red" @click="deleteOverride(item)" data-aid="detection_override_delete">
{{ i18n.delete }}
<v-btn icon :target="$root.target('so-help')" :href="$root.parameters.docsUrl + 'detections.html'" :title="i18n.overrideDocumentationHelp" data-aid="detection_override_help_suricata">
<v-icon>fa-regular fa-circle-question</v-icon>
</v-btn>
<v-btn color="red" @click="deleteOverride(item)" icon :title="i18n.overrideDeleteHelp" data-aid="override_edit_delete_suricata">
<v-icon>fa-circle-xmark</v-icon>
</v-btn>
</div>
</div>
Expand Down Expand Up @@ -1513,11 +1513,11 @@ <h3 class="text--primary">{{ i18n.commentAddDetection }}</h3>
</div>
<div class="d-flex justify-end text-body-2 mt-2">
<div class="d-inline-flex">
<a :href="$root.parameters.docsUrl" target="_blank">
<v-icon :title="i18n.overrideDocumentationHelp" class="override-help" data-aid="detection_override_help">fa-regular fa-circle-question</v-icon>
</a>
<v-btn id="override-edit-delete" text small color="red" @click="deleteOverride(item)" data-aid="detection_override_delete">
{{ i18n.delete }}
<v-btn icon :target="$root.target('so-help')" :href="$root.parameters.docsUrl + 'detections.html'" :title="i18n.overrideDocumentationHelp" data-aid="detection_override_help_elastalert">
<v-icon>fa-regular fa-circle-question</v-icon>
</v-btn>
<v-btn color="red" @click="deleteOverride(item)" icon :title="i18n.overrideDeleteHelp" data-aid="override_edit_delete_elastalert">
<v-icon>fa-circle-xmark</v-icon>
</v-btn>
</div>
</div>
Expand Down
1 change: 1 addition & 0 deletions html/js/i18n.js
Original file line number Diff line number Diff line change
Expand Up @@ -591,6 +591,7 @@ const i18n = {
order: 'Order',
osUptime: 'OS Uptime',
other: 'Other',
overrideDeleteHelp: 'Delete this rule override',
overrideDocumentationHelp: 'Click for more information',
overrideExpand: 'Show all override fields',
overview: 'Overview',
Expand Down
Loading