Commit 18a6d550 authored by Francois Marier's avatar Francois Marier
Browse files

Change more 'profile icons' to 'profile pictures'

This is a follow-up to 8266a369



Bug #694957
Signed-off-by: default avatarFrancois Marier <francois@catalyst.net.nz>
parent c6df19ce
......@@ -34,8 +34,8 @@ $string['aboutme'] = 'About Me';
$string['fieldstoshow'] = 'Fields to show';
$string['introtext'] = 'Introduction Text';
$string['useintroductioninstead'] = 'You can use your introduction profile field instead by enabling that and leaving this field blank';
$string['dontshowprofileicon'] = "Don't show a profile icon";
$string['dontshowprofileicon'] = "Don't show a profile picture";
$string['dontshowemail'] = "Don't show email address";
$string['uploadaprofileicon'] = "You have no profile icons. <a href=\"%sartefact/file/profileicons.php\" target=\"_blank\">Upload one</a>";
$string['uploadaprofileicon'] = "You have no profile pictures. <a href=\"%sartefact/file/profileicons.php\" target=\"_blank\">Upload one</a>";
?>
......@@ -102,7 +102,7 @@ class HtmlExportInternal extends HtmlExportArtefactPlugin {
$iconid = $this->exporter->get('user')->get('profileicon');
if ($iconid) {
$icon = artefact_instance_from_id($iconid);
$smarty->assign('icon', '<img src="../../static/profileicons/200px-' . PluginExportHtml::sanitise_path($icon->get('title')) . '" alt="Profile Icon">');
$smarty->assign('icon', '<img src="../../static/profileicons/200px-' . PluginExportHtml::sanitise_path($icon->get('title')) . '" alt="Profile Picture">');
}
$content = $smarty->fetch('export:html/internal:index.tpl');
......@@ -119,7 +119,7 @@ class HtmlExportInternal extends HtmlExportArtefactPlugin {
$iconid = $this->exporter->get('user')->get('profileicon');
if ($iconid) {
$icon = artefact_instance_from_id($iconid);
$smarty->assign('icon', '<img src="static/profileicons/200px-' . PluginExportHtml::sanitise_path($icon->get('title')) . '" alt="Profile Icon">');
$smarty->assign('icon', '<img src="static/profileicons/200px-' . PluginExportHtml::sanitise_path($icon->get('title')) . '" alt="Profile Picture">');
}
return array(
'description' => $smarty->fetch('export:html/internal:summary.tpl'),
......
......@@ -8,7 +8,7 @@
{if $wallpost->deletable}
<a href="{$WWWROOT}blocktype/wall/deletepost.php?postid={$wallpost->postid}&return={if $wholewall}wall{else}profile{/if}" class="wallpostdelete">{str tag='delete' section='blocktype.wall'}</a>
{/if}
<div class="userinfo"><img src="{$WWWROOT}thumb.php?type=profileicon&amp;maxwidth=25&amp;maxheight=25&amp;id={$wallpost->from}" alt="Profile Icon"><a href="{$WWWROOT}user/view.php?id={$wallpost->userid}">{$wallpost->displayname}</a><span class="postedon"> - {$wallpost->postdate|format_date}</span></div>
<div class="userinfo"><img src="{$WWWROOT}thumb.php?type=profileicon&amp;maxwidth=25&amp;maxheight=25&amp;id={$wallpost->from}" alt="Profile Picture"><a href="{$WWWROOT}user/view.php?id={$wallpost->userid}">{$wallpost->displayname}</a><span class="postedon"> - {$wallpost->postdate|format_date}</span></div>
<div class="text">{$wallpost->text|parse_bbcode|safe}</div>
<div class="controls">
{* {if $ownwall}
......
......@@ -240,7 +240,7 @@ $string['registertermsdescription'] = "Force users to agree to the Terms and Con
$string['allowmobileuploads'] = 'Allow Mobile Uploads';
$string['allowmobileuploadsdescription'] = 'If enabled users will have the option of setting an authentication token - content uploaded with this token will be saved as artefacts.';
$string['remoteavatars'] = 'Display remote avatars';
$string['remoteavatarsdescription'] = 'If checked, the <a href="http://www.gravatar.com">Gravatar</a> service will be used for users\' default profile icons.';
$string['remoteavatarsdescription'] = 'If checked, the <a href="http://www.gravatar.com">Gravatar</a> service will be used for users\' default profile pictures.';
$string['searchplugin'] = 'Search plugin';
$string['searchplugindescription'] = 'Search plugin to use';
$string['searchusernames'] = 'Search Usernames';
......
......@@ -2,11 +2,11 @@
<p>If this option is enabled,
the <a href="http://www.gravatar.com">Gravatar</a> online service will be
used to display profile icons for users who don't have one set in
Mahara. This allows users to set their profile icon once on the Gravatar
used to display profile pictures for users who don't have one set in
Mahara. This allows users to set their profile picture once on the Gravatar
site instead of having to do it on every Mahara and online service
individually. (If Gravatar doesn't have an icon for that user, then the
default Mahara icon will be shown.)</p>
individually. (If Gravatar doesn't have a picture for that user, then the
default Mahara picture will be shown.)</p>
<h4>Reasons to turn it off</h4>
......@@ -15,7 +15,7 @@ intranets) where <b>users don't have access to the wider Internet</b>. Using
Gravatar in such an environment would simply add extra delays.</p>
<p>Also, for <b>sites delivered over https</b>, enabling Gravatar profile
icons might trigger security warnings on some browsers. This is due to the
pictures might trigger security warnings on some browsers. This is due to the
fact that Gravatar images are served via normal unencrypted http.</p>
<h4>Custom avatar server</h4>
......
......@@ -342,7 +342,7 @@ $string['fullname'] = 'Full name';
$string['registerwelcome'] = 'Welcome! To use this site you must first register.';
$string['registeragreeterms'] = 'You must also agree to the <a href="terms.php">terms and conditions</a>.';
$string['registerprivacy'] = 'The data we collect here will be stored according to our <a href="privacy.php">privacy statement</a>.';
$string['registerstep3fieldsoptional'] = '<h3>Choose an Optional Profile Image</h3><p>You have now successfully registered with %s! You may now choose an optional profile icon to be displayed as your avatar.</p>';
$string['registerstep3fieldsoptional'] = '<h3>Choose an Optional Profile Image</h3><p>You have now successfully registered with %s! You may now choose an optional profile picture to be displayed as your avatar.</p>';
$string['registerstep3fieldsmandatory'] = '<h3>Fill Out Mandatory Profile Fields</h3><p>The following fields are required. You must fill them out before your registration is complete.</p>';
$string['registeringdisallowed'] = 'Sorry, you cannot register for this system at this time';
$string['membershipexpiry'] = 'Membership expires';
......
......@@ -136,7 +136,7 @@ $string['watchlistupdated'] = 'Your watchlist has been updated';
$string['viewvisitcount'] = '%d page visit(s) from %s to %s';
$string['friend'] = 'Friend';
$string['profileicon'] = 'Profile Icon';
$string['profileicon'] = 'Profile Picture';
// general views stuff
$string['Added'] = 'Added';
......
......@@ -14,7 +14,7 @@
<tbody>
{foreach from=$users item='user' key='userid'}
<tr class="{cycle values="r0,r1"}">
<td class='center'><img src="{$WWWROOT}thumb.php?type=profileicon&maxwidth=40&maxheight=40&id={$userid}" alt="profile icon"/></td>
<td class='center'><img src="{$WWWROOT}thumb.php?type=profileicon&maxwidth=40&maxheight=40&id={$userid}" alt="profile picture"/></td>
<td>{$user.user|display_name|escape}</td>
<td>
{foreach from=$user.user->institutions item=i}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment