MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

chg: [eventView] added quickEdit button for Category, Type and IDS 

fields + Changed IDS representation (from YES/NO to checkbox)
pull/3969/head
Sami Mokaddem 2018-12-21 14:41:43 +01:00
parent 925c752172
commit 8e964d4a9a
3 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/View/Attributes/ajax/attributeViewFieldForm.ctp
View File

@ -1,2 +1,8 @@
<?php
if ($value === 'No') {
echo '<input type="checkbox" disabled></input>';
} else if ($value === 'Yes') {
echo '<input type="checkbox" checked disabled></input>';
} else {
echo nl2br(h($value)) . '&nbsp;';
}

18
app/View/Elements/Events/View/row_attribute.ctp
View File

@ -79,13 +79,13 @@
?>
&nbsp;
</td>
<td class="short">
<td class="short" onmouseenter="quickEditHover(this, '<?php echo $editScope; ?>', '<?php echo $object['id']; ?>', 'category', <?php echo $event['Event']['id'];?>);">
<div id = "Attribute_<?php echo $object['id']; ?>_category_placeholder" class = "inline-field-placeholder"></div>
<div id = "Attribute_<?php echo $object['id']; ?>_category_solid" class="inline-field-solid" ondblclick="activateField('<?php echo $editScope; ?>', '<?php echo $object['id']; ?>', 'category', <?php echo $event['Event']['id'];?>);">
<div id = "Attribute_<?php echo $object['id']; ?>_category_solid" class="inline-field-solid">
<?php echo h($object['category']); ?>
</div>
</td>
<td class="short">
<td class="short" onmouseenter="quickEditHover(this, '<?php echo $editScope; ?>', '<?php echo $object['id']; ?>', 'type', <?php echo $event['Event']['id'];?>);">
<?php
if (!empty($object['object_relation'])):
?>
@ -95,7 +95,7 @@
?>
<div></div>
<div id = "Attribute_<?php echo $object['id']; ?>_type_placeholder" class = "inline-field-placeholder"></div>
<div id = "Attribute_<?php echo $object['id']; ?>_type_solid" class="inline-field-solid" ondblclick="activateField('<?php echo $editScope; ?>', '<?php echo $object['id']; ?>', 'type', <?php echo $event['Event']['id'];?>);">
<div id = "Attribute_<?php echo $object['id']; ?>_type_solid" class="inline-field-solid">
<?php echo h($object['type']); ?>
</div>
</td>
@ -258,19 +258,19 @@
?>
</ul>
</td>
<td class="short">
<td class="short" onmouseenter="quickEditHover(this, '<?php echo $editScope; ?>', '<?php echo $object['id']; ?>', 'to_ids', <?php echo $event['Event']['id'];?>);">
<div id = "Attribute_<?php echo $object['id']; ?>_to_ids_placeholder" class = "inline-field-placeholder"></div>
<div id = "Attribute_<?php echo $object['id']; ?>_to_ids_solid" class="inline-field-solid" ondblclick="activateField('<?php echo $editScope; ?>', '<?php echo $object['id']; ?>', 'to_ids', <?php echo $event['Event']['id'];?>);">
<?php echo $object['to_ids'] ? 'Yes' : 'No'; ?>
<div id = "Attribute_<?php echo $object['id']; ?>_to_ids_solid" class="inline-field-solid">
<input type="checkbox" <?php echo $object['to_ids'] ? 'checked' : ''; ?> disabled></input>
</div>
</td>
<td class="shortish">
<td class="short" onmouseenter="quickEditHover(this, '<?php echo $editScope; ?>', '<?php echo $object['id']; ?>', 'distribution', <?php echo $event['Event']['id'];?>);">
<?php
$turnRed = '';
if ($object['distribution'] == 0) $turnRed = 'style="color:red"';
?>
<div id = "Attribute_<?php echo $object['id']; ?>_distribution_placeholder" class = "inline-field-placeholder"></div>
<div id = "Attribute_<?php echo $object['id']; ?>_distribution_solid" <?php echo $turnRed; ?> class="inline-field-solid" ondblclick="activateField('<?php echo $editScope; ?>', '<?php echo $object['id']; ?>', 'distribution', <?php echo $event['Event']['id'];?>);">
<div id = "Attribute_<?php echo $object['id']; ?>_distribution_solid" <?php echo $turnRed; ?> class="inline-field-solid">
<?php
if ($object['distribution'] == 4):
?>

3
app/webroot/css/main.css
View File

@ -2087,8 +2087,6 @@ table tr:hover .down-expand-button {
font-size: 20px;
padding-left: 2px;
padding-top: 2px;
width: 18px;
height: 20px;
cursor: pointer;
background-image: unset;
text-shadow: -1px 0 white, 0 1px white, 1px 0 white, 0 -1px white;
@ -2103,6 +2101,7 @@ table tr:hover .down-expand-button {
}
.quick-edit-row-div {
line-height: normal;
display: inline-block;
position: relative;
}