diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2011-07-30 19:33:41 -0400 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2011-07-30 19:33:41 -0400 |
| commit | edb745e9516b236c370b9d1213598dfac69860c4 (patch) | |
| tree | b8a5541a5d864ca119aa8105cda07dfc081a2d89 /phpBB/adm/style | |
| parent | 5653be8e1604022d0e912162686ede5c8d5c68d1 (diff) | |
| parent | 9c6339fb57d44caf86af43624d3308f6413b2c7d (diff) | |
| download | forums-edb745e9516b236c370b9d1213598dfac69860c4.tar forums-edb745e9516b236c370b9d1213598dfac69860c4.tar.gz forums-edb745e9516b236c370b9d1213598dfac69860c4.tar.bz2 forums-edb745e9516b236c370b9d1213598dfac69860c4.tar.xz forums-edb745e9516b236c370b9d1213598dfac69860c4.zip | |
Merge remote-tracking branch 'callumacrae/ticket/8173' into develop-olympus
* callumacrae/ticket/8173:
[ticket/8173] Removed some redundant code in the BBCode JavaScript.
Conflicts:
phpBB/adm/style/acp_users_signature.html
Diffstat (limited to 'phpBB/adm/style')
| -rw-r--r-- | phpBB/adm/style/acp_users_signature.html | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/phpBB/adm/style/acp_users_signature.html b/phpBB/adm/style/acp_users_signature.html index c91d199eb3..0fd6c04fa5 100644 --- a/phpBB/adm/style/acp_users_signature.html +++ b/phpBB/adm/style/acp_users_signature.html @@ -22,9 +22,8 @@ w: '{LA_BBCODE_W_HELP}', s: '{LA_BBCODE_S_HELP}', f: '{LA_BBCODE_F_HELP}', - e: '{LA_BBCODE_E_HELP}', + y: '{LA_BBCODE_Y_HELP}', d: '{LA_BBCODE_D_HELP}', - t: '{LA_BBCODE_T_HELP}', tip: '{L_STYLES_TIP}' <!-- BEGIN custom_tags --> ,cb_{custom_tags.BBCODE_ID}: '{custom_tags.A_BBCODE_HELPLINE}' @@ -56,7 +55,7 @@ <input type="button" class="button2" accesskey="c" name="addbbcode8" value="Code" style="width: 40px" onclick="bbstyle(8)" onmouseover="helpline('c')" onmouseout="helpline('tip')" /> <input type="button" class="button2" accesskey="l" name="addbbcode10" value="List" style="width: 40px" onclick="bbstyle(10)" onmouseover="helpline('l')" onmouseout="helpline('tip')" /> <input type="button" class="button2" accesskey="o" name="addbbcode12" value="List=" style="width: 40px" onclick="bbstyle(12)" onmouseover="helpline('o')" onmouseout="helpline('tip')" /> - <input type="button" class="button2" accesskey="y" name="addlistitem" value="[*]" style="width: 40px" onclick="bbstyle(-1)" onmouseover="helpline('e')" onmouseout="helpline('tip')" /> + <input type="button" class="button2" accesskey="y" name="addlistitem" value="[*]" style="width: 40px" onclick="bbstyle(-1)" onmouseover="helpline('y')" onmouseout="helpline('tip')" /> <!-- IF S_BBCODE_IMG --> <input type="button" class="button2" accesskey="p" name="addbbcode14" value="Img" style="width: 40px" onclick="bbstyle(14)" onmouseover="helpline('p')" onmouseout="helpline('tip')" /> <!-- ENDIF --> |