aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2013-01-04 10:25:08 +0100
committerMarc Alexander <admin@m-a-styles.de>2013-01-04 10:25:08 +0100
commit4a8b1a6e050bba7f8f73f689bbca4185ab27cf8c (patch)
tree5a6e13f1a6aa0fafa5a22c1dd391806054443d9c
parent8e756ad89005865b42e87ffc225f6d3bca475035 (diff)
downloadforums-4a8b1a6e050bba7f8f73f689bbca4185ab27cf8c.tar
forums-4a8b1a6e050bba7f8f73f689bbca4185ab27cf8c.tar.gz
forums-4a8b1a6e050bba7f8f73f689bbca4185ab27cf8c.tar.bz2
forums-4a8b1a6e050bba7f8f73f689bbca4185ab27cf8c.tar.xz
forums-4a8b1a6e050bba7f8f73f689bbca4185ab27cf8c.zip
[feature/avatars] Inform user of no available local avatars
Rather than showing the user an empty drop-down list for the local avatar categories, inform him/her that there are currently no (local) avatars available. PHPBB3-10018
-rw-r--r--phpBB/language/en/common.php1
-rw-r--r--phpBB/styles/prosilver/template/ucp_avatar_options_local.html4
-rw-r--r--phpBB/styles/subsilver2/template/ucp_avatar_options_local.html6
3 files changed, 11 insertions, 0 deletions
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 6277457af7..02b4443a56 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -396,6 +396,7 @@ $lang = array_merge($lang, array(
'NO_AUTH_ADMIN' => 'Access to the Administration Control Panel is not allowed as you do not have administrative permissions.',
'NO_AUTH_ADMIN_USER_DIFFER' => 'You are not able to re-authenticate as a different user.',
'NO_AUTH_OPERATION' => 'You do not have the necessary permissions to complete this operation.',
+ 'NO_AVATARS' => 'No avatars currently available',
'NO_CONNECT_TO_SMTP_HOST' => 'Could not connect to smtp host : %1$s : %2$s',
'NO_BIRTHDAYS' => 'No birthdays today',
'NO_EMAIL_MESSAGE' => 'Email message was blank.',
diff --git a/phpBB/styles/prosilver/template/ucp_avatar_options_local.html b/phpBB/styles/prosilver/template/ucp_avatar_options_local.html
index d885abcd5b..3946b9d269 100644
--- a/phpBB/styles/prosilver/template/ucp_avatar_options_local.html
+++ b/phpBB/styles/prosilver/template/ucp_avatar_options_local.html
@@ -1,3 +1,4 @@
+<!-- IF .avatar_local_cats -->
<label for="category">{L_AVATAR_CATEGORY}{L_COLON} <select name="avatar_local_cat" id="category">
<option value="">{L_NO_AVATAR_CATEGORY}</option>
<!-- BEGIN avatar_local_cats -->
@@ -14,3 +15,6 @@
<!-- END avatar_local_col -->
<!-- END avatar_local_row -->
</div>
+<!-- ELSE -->
+<p><strong>{L_NO_AVATARS}</strong></p>
+<!-- ENDIF -->
diff --git a/phpBB/styles/subsilver2/template/ucp_avatar_options_local.html b/phpBB/styles/subsilver2/template/ucp_avatar_options_local.html
index f4273192ad..87e5608fec 100644
--- a/phpBB/styles/subsilver2/template/ucp_avatar_options_local.html
+++ b/phpBB/styles/subsilver2/template/ucp_avatar_options_local.html
@@ -1,4 +1,5 @@
<table class="tablebg" width="100%" cellspacing="1">
+ <!-- IF .avatar_local_cats -->
<tr>
<td class="cat" colspan="2" align="center" valign="middle"><span class="genmed">{L_AVATAR_CATEGORY}{L_COLON} </span><select name="avatar_local_cat" id="category">
<option value="">{L_NO_AVATAR_CATEGORY}</option>
@@ -30,4 +31,9 @@
</table>
</td>
</tr>
+ <!-- ELSE -->
+ <tr>
+ <td class="row1" colspan="2"><strong>{L_NO_AVATARS}</strong></td>
+ </tr>
+ <!-- ENDIF -->
</table>