diff options
| author | Callum Macrae <callum@lynxphp.com> | 2011-09-25 18:12:34 +0100 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2012-03-31 02:09:17 +0200 |
| commit | ba817086f86bc923e38ef6c44bb1a6058de90f04 (patch) | |
| tree | 944011a92bc3eea411cab113a0c33332b147fb10 /phpBB | |
| parent | db7c4f938ec7440e40c2607fa18983f3a3a24146 (diff) | |
| download | forums-ba817086f86bc923e38ef6c44bb1a6058de90f04.tar forums-ba817086f86bc923e38ef6c44bb1a6058de90f04.tar.gz forums-ba817086f86bc923e38ef6c44bb1a6058de90f04.tar.bz2 forums-ba817086f86bc923e38ef6c44bb1a6058de90f04.tar.xz forums-ba817086f86bc923e38ef6c44bb1a6058de90f04.zip | |
[ticket/10270] Renamed the CSS class "jalert" to "phpbb_alert".
PHPBB3-10270
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/assets/javascript/core.js | 19 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/overall_footer.html | 8 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/common.css | 6 |
3 files changed, 19 insertions, 14 deletions
diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js index 667e3fc561..7184cb2b93 100644 --- a/phpBB/assets/javascript/core.js +++ b/phpBB/assets/javascript/core.js @@ -45,7 +45,7 @@ phpbb.loading_alert = function() { * @returns object Returns the div created. */ phpbb.alert = function(title, msg, fadedark) { - var div = $('#jalert_alert'); + var div = $('#phpbb_alert'); div.find('h3').html(title); div.find('p').html(msg); @@ -107,15 +107,20 @@ phpbb.alert = function(title, msg, fadedark) { * @returns object Returns the div created. */ phpbb.confirm = function(msg, callback, fadedark) { - var div = $('#jalert_confirm'); + var div = $('#phpbb_confirm'); div.find('p').html(msg); - - div.find('.jalertbut').bind('click', function() { - var res = this.value === 'Yes'; + + div.bind('click', function(e) { + e.stopPropagation(); + return true; + }); + div.find('input[type="button"]').one('click', function() { + var res = this.className === 'button1'; var fade = (typeof fadedark !== 'undefined' && !fadedark && res) ? div : dark; fade.fadeOut(100, function() { div.hide(); }); + div.find('input[type="button"]').unbind('click'); callback(res); return false; }); @@ -131,10 +136,10 @@ phpbb.confirm = function(msg, callback, fadedark) { $(document).bind('keydown', function(e) { if (e.keyCode === 13) { - $('.jalertbut.button1').trigger('click'); + $('input[type="button"].button1').trigger('click'); return false; } else if (e.keyCode === 27) { - $('.jalertbut.button2').trigger('click'); + $('input[type="button"].button2').trigger('click'); return false; } return true; diff --git a/phpBB/styles/prosilver/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html index b7697afbb4..981740510d 100644 --- a/phpBB/styles/prosilver/template/overall_footer.html +++ b/phpBB/styles/prosilver/template/overall_footer.html @@ -30,15 +30,15 @@ <div class="jalert" id="loadingalert"><h3>{L_LOADING}</h3><p>{L_PLEASE_WAIT}</p></div> </div> - <div id="jalert_alert" class="jalert"> + <div id="phpbb_alert" class="phpbb_alert"> <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"> + <div id="phpbb_confirm" class="phpbb_alert"> <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" /> - <input type="button" class="jalertbut button2" value="No" /> + <input type="button" class="button1" value="{L_YES}" /> + <input type="button" class="button2" value="{L_NO}" /> </div> </div> diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index 0190ec7e85..d1fc1fa3e3 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -590,7 +590,7 @@ li.pagination { /* jQuery popups ---------------------------------------- */ -.jalert { +.phpbb_alert { background-color: #FFFFFF; border: 1px solid #999999; position: fixed; @@ -603,13 +603,13 @@ li.pagination { padding: 0 25px 20px 25px; } -.jalert img.alert_close { +.phpbb_alert img.alert_close { float: right; margin-top: -7px; margin-right: -30px; } -.jalert p { +.phpbb_alert p { margin: 8px 0; padding-bottom: 8px; } |