]> gitweb.fluxo.info Git - lorea/elgg.git/commitdiff
projects / lorea / elgg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1c27358)
Fixes #3272 added button to revert avatar
authorCash Costello <cash.costello@gmail.com>
Sat, 24 Dec 2011 12:45:22 +0000 (07:45 -0500)
committerCash Costello <cash.costello@gmail.com>
Sat, 24 Dec 2011 12:45:22 +0000 (07:45 -0500)
actions/avatar/revert.php [new file with mode: 0644] patch | blob
engine/lib/users.php patch | blob | history
languages/en.php patch | blob | history
views/default/core/avatar/upload.php patch | blob | history

diff --git a/actions/avatar/revert.php b/actions/avatar/revert.php
new file mode 100644 (file)
index 0000000..8cff40a
--- /dev/null
+++ b/actions/avatar/revert.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Avatar revert action
+ */
+
+$guid = get_input('guid');
+$user = get_entity($guid);
+if ($user) {
+       unset($user->icontime);
+       system_message(elgg_echo('avatar:revert:success'));
+} else {
+       register_error(elgg_echo('avatar:revert:fail'));
+}
+
+forward(REFERER);
diff --git a/engine/lib/users.php b/engine/lib/users.php
index 4404f42e0b9cba10d0b79b4e5b3b314aa146f267..3a3756923d04bee7758ca38c70a522d066d07220 100644 (file)
--- a/engine/lib/users.php
+++ b/engine/lib/users.php
@@ -1550,6 +1550,7 @@ function users_init() {
        elgg_register_action('friends/remove');
        elgg_register_action('avatar/upload');
        elgg_register_action('avatar/crop');
+       elgg_register_action('avatar/revert');
        elgg_register_action('profile/edit');
 
        elgg_register_action('friends/collections/add');
diff --git a/languages/en.php b/languages/en.php
index 93099c98f8be6fe78d8cfb6ac75f3f0208878fc7..2f8ab41c97d08cc76fb308cffbeff22d9d3ce041 100644 (file)
--- a/languages/en.php
+++ b/languages/en.php
@@ -363,6 +363,7 @@ $english = array(
        'avatar:preview' => 'Preview',
        'avatar:upload' => 'Upload a new avatar',
        'avatar:current' => 'Current avatar',
+       'avatar:revert' => 'Revert your avatar to the default icon',
        'avatar:crop:title' => 'Avatar cropping tool',
        'avatar:upload:instructions' => "Your avatar is displayed throughout the site. You can change it as often as you'd like. (File formats accepted: GIF, JPG or PNG)",
        'avatar:create:instructions' => 'Click and drag a square below to match how you want your avatar cropped. A preview will appear in the box on the right. When you are happy with the preview, click \'Create your avatar\'. This cropped version will be used throughout the site as your avatar.',
@@ -371,6 +372,8 @@ $english = array(
        'avatar:resize:fail' => 'Resize of the avatar failed',
        'avatar:crop:success' => 'Cropping the avatar succeeded',
        'avatar:crop:fail' => 'Avatar cropping failed',
+       'avatar:revert:success' => 'Reverting the avatar succeeded',
+       'avatar:revert:fail' => 'Avatar revert failed',
 
        'profile:edit' => 'Edit profile',
        'profile:aboutme' => "About me",
@@ -840,6 +843,7 @@ $english = array(
        'new' => 'New',
        'add' => 'Add',
        'create' => 'Create',
+       'revert' => 'Revert',
 
        'site' => 'Site',
        'activity' => 'Activity',
diff --git a/views/default/core/avatar/upload.php b/views/default/core/avatar/upload.php
index 4aa86373a33ed53928caefd8554dd023492fb95f..29aa59c9caff3f1eac35cd24535924c109273244 100644 (file)
--- a/views/default/core/avatar/upload.php
+++ b/views/default/core/avatar/upload.php
@@ -12,6 +12,17 @@ $user_avatar = elgg_view('output/img', array(
 
 $current_label = elgg_echo('avatar:current');
 
+$revert_button = '';
+if ($vars['entity']->icontime) {
+       $revert_button = elgg_view('output/url', array(
+               'text' => elgg_echo('revert'),
+               'title' => elgg_echo('avatar:revert'),
+               'href' => 'action/avatar/revert?guid=' . elgg_get_page_owner_guid(),
+               'is_action' => true,
+               'class' => 'elgg-button elgg-button-cancel mll',
+       ));
+}
+
 $form_params = array('enctype' => 'multipart/form-data');
 $upload_form = elgg_view_form('avatar/upload', $form_params, $vars);
 
@@ -28,6 +39,7 @@ $image = <<<HTML
        <label>$current_label</label><br />
        $user_avatar
 </div>
+$revert_button
 HTML;
 
 $body = <<<HTML
Social Networking Engine