mirror of https://github.com/MISP/MISP
chg: Some UI love
- back button fixed on tag selection popup - esc now closes popup forms / field editspull/1857/head
parent
e2094cf171
commit
fa5db123a3
|
@ -17,7 +17,7 @@
|
||||||
<div class="popover_choice_main" id ="popover_choice_main">
|
<div class="popover_choice_main" id ="popover_choice_main">
|
||||||
<table style="width:100%;">
|
<table style="width:100%;">
|
||||||
<?php foreach ($options as $k => &$option): ?>
|
<?php foreach ($options as $k => &$option): ?>
|
||||||
<tr style="border-bottom:1px solid black;" class="templateChoiceButton" id="field_<?php echo h($k); ?>">
|
<tr style="border-top:1px solid black;" class="templateChoiceButton" id="field_<?php echo h($k); ?>">
|
||||||
<?php if (isset($attributeTag)): ?>
|
<?php if (isset($attributeTag)): ?>
|
||||||
<td style="padding-left:10px;padding-right:10px; text-align:center;width:100%;" onClick="quickSubmitAttributeTagForm('<?php echo h($object_id);?>', '<?php echo h($k); ?>');" title="<?php echo h($expanded[$k]);?>"><?php echo h($option); ?></td>
|
<td style="padding-left:10px;padding-right:10px; text-align:center;width:100%;" onClick="quickSubmitAttributeTagForm('<?php echo h($object_id);?>', '<?php echo h($k); ?>');" title="<?php echo h($expanded[$k]);?>"><?php echo h($option); ?></td>
|
||||||
<?php else: ?>
|
<?php else: ?>
|
||||||
|
@ -25,11 +25,9 @@
|
||||||
<?php endif; ?>
|
<?php endif; ?>
|
||||||
</tr>
|
</tr>
|
||||||
<?php endforeach; ?>
|
<?php endforeach; ?>
|
||||||
<tr style="border-bottom:1px solid black;" class="templateChoiceButton">
|
|
||||||
<td style="padding-left:10px;padding-right:10px; text-align:center;width:100%;" onClick="getPopup('<?php echo h($object_id); if (isset($attributeTag)) echo '/true'; ?>', 'tags', 'selectTaxonomy');" title="Select Taxonomy">Back to Taxonomy Selection</td>
|
|
||||||
</tr>
|
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="popover-back useCursorPointer" onClick="getPopup('<?php echo h($object_id); if (isset($attributeTag)) echo '/true'; ?>', 'tags', 'selectTaxonomy');" title="Select Taxonomy">Back to Taxonomy Selection</div>
|
||||||
<div class="templateChoiceButton templateChoiceButtonLast" onClick="cancelPopoverForm();">Cancel</div>
|
<div class="templateChoiceButton templateChoiceButtonLast" onClick="cancelPopoverForm();">Cancel</div>
|
||||||
</div>
|
</div>
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
|
@ -49,7 +47,6 @@
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
$(window).resize(function() {
|
$(window).resize(function() {
|
||||||
resizePopoverBody();
|
resizePopoverBody();
|
||||||
});
|
});
|
||||||
|
|
|
@ -1627,6 +1627,15 @@ table.table.table-striped tr.deleted_row td {
|
||||||
width: 0;
|
width: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.popover-back {
|
||||||
|
border-top:1px solid black;
|
||||||
|
line-height: 30px;
|
||||||
|
padding-top: 1px;
|
||||||
|
padding-bottom: 1px;
|
||||||
|
text-align:center;
|
||||||
|
width:100%;
|
||||||
|
}
|
||||||
|
|
||||||
@-webkit-keyframes rotation {
|
@-webkit-keyframes rotation {
|
||||||
from {-webkit-transform: rotate(0deg);}
|
from {-webkit-transform: rotate(0deg);}
|
||||||
to {-webkit-transform: rotate(359deg);}
|
to {-webkit-transform: rotate(359deg);}
|
||||||
|
|
|
@ -2795,3 +2795,12 @@ function checkAndSetPublishedInfo() {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$(document).keyup(function(e){
|
||||||
|
if(e.keyCode === 27)
|
||||||
|
$("#gray_out").fadeOut();
|
||||||
|
$("#popover_form").fadeOut();
|
||||||
|
$("#confirmation_box").fadeOut();
|
||||||
|
$(".loading").hide();
|
||||||
|
resetForms();
|
||||||
|
});
|
Loading…
Reference in New Issue