mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-07 15:05:43 +02:00
Code Issues Releases Wiki Activity

Merge pull request #1391 from nickvergessen/ticket/11442

Browse Source 
[ticket/11442] Use button name as indicator instead of css classes
This commit is contained in:
Nils Adermann 2013-05-07 15:23:53 -07:00
commit d84617bb79
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/adm/style/confirm_body.html
View File

@ -4,7 +4,7 @@
<p>{MESSAGE_TEXT}</p> <p>{MESSAGE_TEXT}</p>
<fieldset class="submit-buttons"> <fieldset class="submit-buttons">
<input type="button" name="confirm" value="{L_YES}" class="button1" />&nbsp; <input type="button" name="confirm" value="{L_YES}" class="button2" />&nbsp;
<input type="button" name="cancel" value="{L_NO}" class="button2" /> <input type="button" name="cancel" value="{L_NO}" class="button2" />
</fieldset> </fieldset>

6
phpBB/assets/javascript/core.js
View File

@ -136,7 +136,7 @@ phpbb.confirm = function(msg, callback, fadedark) {
}); });
var clickHandler = function(e) { var clickHandler = function(e) {
var res = this.className === 'button1'; var res = this.name === 'confirm';
var fade = (typeof fadedark !== 'undefined' && !fadedark && res) ? div : dark; var fade = (typeof fadedark !== 'undefined' && !fadedark && res) ? div : dark;
fade.fadeOut(phpbb.alertTime, function() { fade.fadeOut(phpbb.alertTime, function() {
div.hide(); div.hide();
@ -164,11 +164,11 @@ phpbb.confirm = function(msg, callback, fadedark) {
$(document).bind('keydown', function(e) { $(document).bind('keydown', function(e) {
if (e.keyCode === keymap.ENTER) { if (e.keyCode === keymap.ENTER) {
$('input[type="button"].button1').trigger('click'); $('input[name="confirm"]').trigger('click');
e.preventDefault(); e.preventDefault();
e.stopPropagation(); e.stopPropagation();
} else if (e.keyCode === keymap.ESC) { } else if (e.keyCode === keymap.ESC) {
$('input[type="button"].button2').trigger('click'); $('input[name="cancel"]').trigger('click');
e.preventDefault(); e.preventDefault();
e.stopPropagation(); e.stopPropagation();
} }

2
phpBB/styles/prosilver/template/confirm_body.html
View File

@ -4,7 +4,7 @@
<p>{MESSAGE_TEXT}</p> <p>{MESSAGE_TEXT}</p>
<fieldset class="submit-buttons"> <fieldset class="submit-buttons">
<input type="button" name="confirm" value="{L_YES}" class="button1" />&nbsp; <input type="button" name="confirm" value="{L_YES}" class="button2" />&nbsp;
<input type="button" name="cancel" value="{L_NO}" class="button2" /> <input type="button" name="cancel" value="{L_NO}" class="button2" />
</fieldset> </fieldset>

2
phpBB/styles/subsilver2/template/confirm_body.html
View File

@ -9,7 +9,7 @@
<th>{MESSAGE_TITLE}</th> <th>{MESSAGE_TITLE}</th>
</tr> </tr>
<tr> <tr>
<td class="row1" align="center"><br /><p class="gen">{MESSAGE_TEXT}</p><br />{S_HIDDEN_FIELDS}<input type="submit" name="confirm" value="{YES_VALUE}" class="btnmain" />&nbsp;&nbsp;<input type="submit" name="cancel" value="{L_NO}" class="btnlite" /></td> <td class="row1" align="center"><br /><p class="gen">{MESSAGE_TEXT}</p><br />{S_HIDDEN_FIELDS}<input type="submit" name="confirm" value="{YES_VALUE}" class="btnlite" />&nbsp;&nbsp;<input type="submit" name="cancel" value="{L_NO}" class="btnlite" /></td>
</tr> </tr>
</table> </table>