From fa5db123a39291a0d7797339cedf29fb471d1034 Mon Sep 17 00:00:00 2001
From: Iglocska <andras.iklody@gmail.com>
Date: Tue, 17 Jan 2017 09:03:30 +0100
Subject: [PATCH] chg: Some UI love

- back button fixed on tag selection popup
- esc now closes popup forms / field edits
---
 app/View/Tags/ajax/select_tag.ctp | 7 ++-----
 app/webroot/css/main.css          | 9 +++++++++
 app/webroot/js/misp2.4.58.js      | 9 +++++++++
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/app/View/Tags/ajax/select_tag.ctp b/app/View/Tags/ajax/select_tag.ctp
index 0f961cab6..844db1c5d 100644
--- a/app/View/Tags/ajax/select_tag.ctp
+++ b/app/View/Tags/ajax/select_tag.ctp
@@ -17,7 +17,7 @@
 	<div class="popover_choice_main" id ="popover_choice_main">
 		<table style="width:100%;">
 		<?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)): ?>
 				<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: ?>
@@ -25,11 +25,9 @@
 				<?php endif; ?>
 			</tr>
 		<?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>
 	</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>
 <script type="text/javascript">
@@ -49,7 +47,6 @@
 			}
 		});
 	});
-
 	$(window).resize(function() {
 		resizePopoverBody();
 	});
diff --git a/app/webroot/css/main.css b/app/webroot/css/main.css
index 481b2b65f..7ad7365db 100644
--- a/app/webroot/css/main.css
+++ b/app/webroot/css/main.css
@@ -1627,6 +1627,15 @@ table.table.table-striped tr.deleted_row td {
 	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 {
    from {-webkit-transform: rotate(0deg);}
    to {-webkit-transform: rotate(359deg);}
diff --git a/app/webroot/js/misp2.4.58.js b/app/webroot/js/misp2.4.58.js
index 034b22fde..b6280d700 100644
--- a/app/webroot/js/misp2.4.58.js
+++ b/app/webroot/js/misp2.4.58.js
@@ -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();
+});
\ No newline at end of file