diff options
| author | Nils Adermann <naderman@naderman.de> | 2013-05-07 15:23:53 -0700 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2013-05-07 15:23:53 -0700 |
| commit | d84617bb794229b2a93602aae99a6fd1963c3dbb (patch) | |
| tree | e5c77996b2d2171bb8a20c284b338823e1ab99d7 | |
| parent | 7a881183d820392578adf405bdede98a65fa5725 (diff) | |
| parent | 1834ceb614a1bf82aa0369a2b731475a82abfade (diff) | |
| download | forums-d84617bb794229b2a93602aae99a6fd1963c3dbb.tar forums-d84617bb794229b2a93602aae99a6fd1963c3dbb.tar.gz forums-d84617bb794229b2a93602aae99a6fd1963c3dbb.tar.bz2 forums-d84617bb794229b2a93602aae99a6fd1963c3dbb.tar.xz forums-d84617bb794229b2a93602aae99a6fd1963c3dbb.zip | |
Merge pull request #1391 from nickvergessen/ticket/11442
[ticket/11442] Use button name as indicator instead of css classes
| -rw-r--r-- | phpBB/adm/style/confirm_body.html | 2 | ||||
| -rw-r--r-- | phpBB/assets/javascript/core.js | 6 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/confirm_body.html | 2 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/template/confirm_body.html | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/phpBB/adm/style/confirm_body.html b/phpBB/adm/style/confirm_body.html index fa3f1e6c64..d0360d1b3a 100644 --- a/phpBB/adm/style/confirm_body.html +++ b/phpBB/adm/style/confirm_body.html @@ -4,7 +4,7 @@ <p>{MESSAGE_TEXT}</p> <fieldset class="submit-buttons"> - <input type="button" name="confirm" value="{L_YES}" class="button1" /> + <input type="button" name="confirm" value="{L_YES}" class="button2" /> <input type="button" name="cancel" value="{L_NO}" class="button2" /> </fieldset> diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js index 8bbea8b8c9..642d513cb6 100644 --- a/phpBB/assets/javascript/core.js +++ b/phpBB/assets/javascript/core.js @@ -136,7 +136,7 @@ phpbb.confirm = function(msg, callback, fadedark) { }); var clickHandler = function(e) { - var res = this.className === 'button1'; + var res = this.name === 'confirm'; var fade = (typeof fadedark !== 'undefined' && !fadedark && res) ? div : dark; fade.fadeOut(phpbb.alertTime, function() { div.hide(); @@ -164,11 +164,11 @@ phpbb.confirm = function(msg, callback, fadedark) { $(document).bind('keydown', function(e) { if (e.keyCode === keymap.ENTER) { - $('input[type="button"].button1').trigger('click'); + $('input[name="confirm"]').trigger('click'); e.preventDefault(); e.stopPropagation(); } else if (e.keyCode === keymap.ESC) { - $('input[type="button"].button2').trigger('click'); + $('input[name="cancel"]').trigger('click'); e.preventDefault(); e.stopPropagation(); } diff --git a/phpBB/styles/prosilver/template/confirm_body.html b/phpBB/styles/prosilver/template/confirm_body.html index eb0cad2597..bf575c20fa 100644 --- a/phpBB/styles/prosilver/template/confirm_body.html +++ b/phpBB/styles/prosilver/template/confirm_body.html @@ -4,7 +4,7 @@ <p>{MESSAGE_TEXT}</p> <fieldset class="submit-buttons"> - <input type="button" name="confirm" value="{L_YES}" class="button1" /> + <input type="button" name="confirm" value="{L_YES}" class="button2" /> <input type="button" name="cancel" value="{L_NO}" class="button2" /> </fieldset> diff --git a/phpBB/styles/subsilver2/template/confirm_body.html b/phpBB/styles/subsilver2/template/confirm_body.html index 7516196b3c..1712017c38 100644 --- a/phpBB/styles/subsilver2/template/confirm_body.html +++ b/phpBB/styles/subsilver2/template/confirm_body.html @@ -9,7 +9,7 @@ <th>{MESSAGE_TITLE}</th> </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" /> <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" /> <input type="submit" name="cancel" value="{L_NO}" class="btnlite" /></td> </tr> </table> |