aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/adm
diff options
context:
space:
mode:
authorOleg Pudeyev <oleg@bsdpower.com>2011-11-19 22:27:07 -0500
committerOleg Pudeyev <oleg@bsdpower.com>2011-11-19 22:27:07 -0500
commit2359d1e2686930e4fd375a9b7cfe68be4666943b (patch)
tree9886c84bf96c01dc9a0a7cab44e15db3d868b271 /phpBB/adm
parentfb430299356a027686a3216ba4974b955f3701ae (diff)
parent81f682a81252fa9199fe140b2b0e1a6caf575f72 (diff)
downloadforums-2359d1e2686930e4fd375a9b7cfe68be4666943b.tar
forums-2359d1e2686930e4fd375a9b7cfe68be4666943b.tar.gz
forums-2359d1e2686930e4fd375a9b7cfe68be4666943b.tar.bz2
forums-2359d1e2686930e4fd375a9b7cfe68be4666943b.tar.xz
forums-2359d1e2686930e4fd375a9b7cfe68be4666943b.zip
Merge remote-tracking branch 'callumacrae/ticket/8599' into develop-olympus
* callumacrae/ticket/8599: [ticket/8599] Added ability to select all to add multiple smilies screen.
Diffstat (limited to 'phpBB/adm')
-rw-r--r--phpBB/adm/style/acp_icons.html4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/adm/style/acp_icons.html b/phpBB/adm/style/acp_icons.html
index eedf39b440..a34a91043c 100644
--- a/phpBB/adm/style/acp_icons.html
+++ b/phpBB/adm/style/acp_icons.html
@@ -74,7 +74,7 @@
<fieldset class="tabulated">
<legend>{L_TITLE}</legend>
- <table cellspacing="1">
+ <table cellspacing="1" id="smilies">
<thead>
<tr>
<th colspan="{COLSPAN}">{L_CONFIG}</th>
@@ -94,7 +94,7 @@
<td>{L_ORDER}</td>
<!-- ENDIF -->
<!-- IF S_ADD -->
- <td>{L_ADD}</td>
+ <td>{L_ADD} <a href="#" onclick="marklist('smilies', 'add_img', true); return false;">({L_MARK_ALL})</a></td>
<!-- ENDIF -->
</tr>
</thead>