aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorOleg Pudeyev <oleg@bsdpower.com>2011-11-19 22:34:01 -0500
committerOleg Pudeyev <oleg@bsdpower.com>2011-11-19 22:34:01 -0500
commitce797b107b625c50ee1ac11717e0a59c895493cd (patch)
treeed3d0de7fc39c4f6353b91992016dd6bd84149e2 /phpBB
parentf33dcacabef1ceb461a7bc2783a3300dc066b4f4 (diff)
parent2359d1e2686930e4fd375a9b7cfe68be4666943b (diff)
downloadforums-ce797b107b625c50ee1ac11717e0a59c895493cd.tar
forums-ce797b107b625c50ee1ac11717e0a59c895493cd.tar.gz
forums-ce797b107b625c50ee1ac11717e0a59c895493cd.tar.bz2
forums-ce797b107b625c50ee1ac11717e0a59c895493cd.tar.xz
forums-ce797b107b625c50ee1ac11717e0a59c895493cd.zip
Merge branch 'develop-olympus' into develop
* develop-olympus: [ticket/8599] Added ability to select all to add multiple smilies screen.
Diffstat (limited to 'phpBB')
-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 9ec7111848..85b5343666 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>