[ticket/10270] Added close buttons to phpbb.alert and phpbb.confirm.

PHPBB3-10270

phpBB/assets/javascript/core.js

@@ -68,6 +68,10 @@ phpbb.alert = function(title, msg, fadedark) {
 		}
 		return true;
 	});
+	
+	div.find('.alert_close').one('click', function() {
+		dark.trigger('click');
+	});
 
 	if (loading_alert.is(':visible'))
 	{
@@ -115,6 +119,15 @@ phpbb.confirm = function(msg, callback, fadedark) {
 		callback(res);
 		return false;
 	});
+
+	dark.one('click', function(e) {
+		var fade = (typeof fadedark !== 'undefined' && !fadedark && res) ? div : dark;
+		fade.fadeOut(100, function() {
+			div.hide();
+		});
+		callback(false);
+		return false;
+	});
 	
 	$(document).bind('keydown', function(e) {
 		if (e.keyCode === 13) {
@@ -127,6 +140,10 @@ phpbb.confirm = function(msg, callback, fadedark) {
 		return true;
 	});
 	
+	div.find('.alert_close').one('click', function() {
+		dark.trigger('click');
+	});
+	
 	if (loading_alert.is(':visible'))
 	{
 		loading_alert.fadeOut(100, function() {

phpBB/styles/prosilver/template/overall_footer.html

@@ -30,8 +30,12 @@
 		<div class="jalert" id="loadingalert"><h3>{L_LOADING}</h3><p>{L_PLEASE_WAIT}</p></div>
 	</div>
 
-	<div id="jalert_alert" class="jalert"><h3></h3><p></p></div>
+	<div id="jalert_alert" class="jalert">
+		<a href="#"><img src="{T_THEME_PATH}/images/alert_close.png" class="alert_close" /></a>
+		<h3></h3><p></p>
+	</div>
 	<div id="jalert_confirm" class="jalert">
+		<a href="#"><img src="{T_THEME_PATH}/images/alert_close.png" class="alert_close" /></a>
 		<p></p>
 		<input type="button" class="jalertbut button1" value="Yes" />&nbsp;
 		<input type="button" class="jalertbut button2" value="No" />

phpBB/styles/prosilver/theme/common.css

@@ -603,6 +603,12 @@ li.pagination {
 	padding: 0 25px 20px 25px;
 }
 
+.jalert img.alert_close {
+	float: right;
+	margin-top: -7px;
+	margin-right: -30px;
+}
+
 .jalert p {
 	margin: 8px 0;
 	padding-bottom: 8px;