From db7c4f938ec7440e40c2607fa18983f3a3a24146 Mon Sep 17 00:00:00 2001
From: Callum Macrae <callum@lynxphp.com>
Date: Sun, 25 Sep 2011 16:49:43 +0100
Subject: [ticket/10270] Added close buttons to phpbb.alert and phpbb.confirm.

PHPBB3-10270
---
 phpBB/styles/prosilver/template/overall_footer.html |   6 +++++-
 phpBB/styles/prosilver/theme/common.css             |   6 ++++++
 phpBB/styles/prosilver/theme/images/alert_close.png | Bin 0 -> 669 bytes
 3 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 phpBB/styles/prosilver/theme/images/alert_close.png

(limited to 'phpBB/styles/prosilver')

diff --git a/phpBB/styles/prosilver/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html
index 362f8bc1cc..b7697afbb4 100644
--- a/phpBB/styles/prosilver/template/overall_footer.html
+++ b/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" />
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index a3d2c5660e..0190ec7e85 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/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;
diff --git a/phpBB/styles/prosilver/theme/images/alert_close.png b/phpBB/styles/prosilver/theme/images/alert_close.png
new file mode 100644
index 0000000000..123ac4ac90
Binary files /dev/null and b/phpBB/styles/prosilver/theme/images/alert_close.png differ
-- 
cgit v1.2.1