From 4d45bc9da185c4c8f558b07f8020dce8171fb957 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 20 Jul 2015 21:01:11 +0200 Subject: Fixes regarding the new default profile photo size. The default profile photos are just renamed. People which provided the originals are invited to reproduce them in the new 300 by 300 px format. --- images/default_profile_photos/alpha/175.png | Bin 3817 -> 0 bytes images/default_profile_photos/alpha/300.png | Bin 0 -> 3817 bytes images/default_profile_photos/black_avatar_1/175.png | Bin 6420 -> 0 bytes images/default_profile_photos/black_avatar_1/300.png | Bin 0 -> 6420 bytes images/default_profile_photos/black_avatar_2/175.png | Bin 5802 -> 0 bytes images/default_profile_photos/black_avatar_2/300.png | Bin 0 -> 5802 bytes images/default_profile_photos/blank/175.jpg | Bin 910 -> 0 bytes images/default_profile_photos/blank/175.png | Bin 3817 -> 0 bytes images/default_profile_photos/blank/300.jpg | Bin 0 -> 910 bytes images/default_profile_photos/blank/300.png | Bin 0 -> 3817 bytes images/default_profile_photos/rainbow_man/175.jpg | Bin 8510 -> 0 bytes images/default_profile_photos/rainbow_man/175.png | Bin 57998 -> 0 bytes images/default_profile_photos/rainbow_man/300.jpg | Bin 0 -> 8510 bytes images/default_profile_photos/rainbow_man/300.png | Bin 0 -> 57998 bytes images/default_profile_photos/rainbow_man_trans/175.png | Bin 71198 -> 0 bytes images/default_profile_photos/rainbow_man_trans/300.png | Bin 0 -> 71198 bytes images/default_profile_photos/red_avatar/175.png | Bin 4621 -> 0 bytes images/default_profile_photos/red_avatar/300.png | Bin 0 -> 4621 bytes images/default_profile_photos/red_koala/175.jpg | Bin 22969 -> 0 bytes images/default_profile_photos/red_koala/175.png | Bin 20722 -> 0 bytes images/default_profile_photos/red_koala/300.jpg | Bin 0 -> 22969 bytes images/default_profile_photos/red_koala/300.png | Bin 0 -> 20722 bytes images/default_profile_photos/red_koala_trans/175.png | Bin 25546 -> 0 bytes images/default_profile_photos/red_koala_trans/300.png | Bin 0 -> 25546 bytes .../redmatrix_logo_smiley/175.png | Bin 3834 -> 0 bytes .../redmatrix_logo_smiley/300.png | Bin 0 -> 3834 bytes include/identity.php | 4 ++-- include/network.php | 4 ++-- include/photo/photo_driver.php | 8 ++++---- view/tpl/profile_vcard.tpl | 2 +- 30 files changed, 9 insertions(+), 9 deletions(-) delete mode 100644 images/default_profile_photos/alpha/175.png create mode 100644 images/default_profile_photos/alpha/300.png delete mode 100644 images/default_profile_photos/black_avatar_1/175.png create mode 100644 images/default_profile_photos/black_avatar_1/300.png delete mode 100644 images/default_profile_photos/black_avatar_2/175.png create mode 100644 images/default_profile_photos/black_avatar_2/300.png delete mode 100644 images/default_profile_photos/blank/175.jpg delete mode 100644 images/default_profile_photos/blank/175.png create mode 100644 images/default_profile_photos/blank/300.jpg create mode 100644 images/default_profile_photos/blank/300.png delete mode 100644 images/default_profile_photos/rainbow_man/175.jpg delete mode 100644 images/default_profile_photos/rainbow_man/175.png create mode 100644 images/default_profile_photos/rainbow_man/300.jpg create mode 100644 images/default_profile_photos/rainbow_man/300.png delete mode 100644 images/default_profile_photos/rainbow_man_trans/175.png create mode 100644 images/default_profile_photos/rainbow_man_trans/300.png delete mode 100644 images/default_profile_photos/red_avatar/175.png create mode 100644 images/default_profile_photos/red_avatar/300.png delete mode 100644 images/default_profile_photos/red_koala/175.jpg delete mode 100644 images/default_profile_photos/red_koala/175.png create mode 100644 images/default_profile_photos/red_koala/300.jpg create mode 100644 images/default_profile_photos/red_koala/300.png delete mode 100644 images/default_profile_photos/red_koala_trans/175.png create mode 100644 images/default_profile_photos/red_koala_trans/300.png delete mode 100644 images/default_profile_photos/redmatrix_logo_smiley/175.png create mode 100644 images/default_profile_photos/redmatrix_logo_smiley/300.png diff --git a/images/default_profile_photos/alpha/175.png b/images/default_profile_photos/alpha/175.png deleted file mode 100644 index 17211ee27..000000000 Binary files a/images/default_profile_photos/alpha/175.png and /dev/null differ diff --git a/images/default_profile_photos/alpha/300.png b/images/default_profile_photos/alpha/300.png new file mode 100644 index 000000000..17211ee27 Binary files /dev/null and b/images/default_profile_photos/alpha/300.png differ diff --git a/images/default_profile_photos/black_avatar_1/175.png b/images/default_profile_photos/black_avatar_1/175.png deleted file mode 100644 index bc5b19793..000000000 Binary files a/images/default_profile_photos/black_avatar_1/175.png and /dev/null differ diff --git a/images/default_profile_photos/black_avatar_1/300.png b/images/default_profile_photos/black_avatar_1/300.png new file mode 100644 index 000000000..bc5b19793 Binary files /dev/null and b/images/default_profile_photos/black_avatar_1/300.png differ diff --git a/images/default_profile_photos/black_avatar_2/175.png b/images/default_profile_photos/black_avatar_2/175.png deleted file mode 100644 index 8ff3cbd4c..000000000 Binary files a/images/default_profile_photos/black_avatar_2/175.png and /dev/null differ diff --git a/images/default_profile_photos/black_avatar_2/300.png b/images/default_profile_photos/black_avatar_2/300.png new file mode 100644 index 000000000..8ff3cbd4c Binary files /dev/null and b/images/default_profile_photos/black_avatar_2/300.png differ diff --git a/images/default_profile_photos/blank/175.jpg b/images/default_profile_photos/blank/175.jpg deleted file mode 100644 index 4024d6e88..000000000 Binary files a/images/default_profile_photos/blank/175.jpg and /dev/null differ diff --git a/images/default_profile_photos/blank/175.png b/images/default_profile_photos/blank/175.png deleted file mode 100644 index 1edb25b76..000000000 Binary files a/images/default_profile_photos/blank/175.png and /dev/null differ diff --git a/images/default_profile_photos/blank/300.jpg b/images/default_profile_photos/blank/300.jpg new file mode 100644 index 000000000..4024d6e88 Binary files /dev/null and b/images/default_profile_photos/blank/300.jpg differ diff --git a/images/default_profile_photos/blank/300.png b/images/default_profile_photos/blank/300.png new file mode 100644 index 000000000..1edb25b76 Binary files /dev/null and b/images/default_profile_photos/blank/300.png differ diff --git a/images/default_profile_photos/rainbow_man/175.jpg b/images/default_profile_photos/rainbow_man/175.jpg deleted file mode 100644 index fc0ec3d77..000000000 Binary files a/images/default_profile_photos/rainbow_man/175.jpg and /dev/null differ diff --git a/images/default_profile_photos/rainbow_man/175.png b/images/default_profile_photos/rainbow_man/175.png deleted file mode 100644 index 30a7e0ffb..000000000 Binary files a/images/default_profile_photos/rainbow_man/175.png and /dev/null differ diff --git a/images/default_profile_photos/rainbow_man/300.jpg b/images/default_profile_photos/rainbow_man/300.jpg new file mode 100644 index 000000000..fc0ec3d77 Binary files /dev/null and b/images/default_profile_photos/rainbow_man/300.jpg differ diff --git a/images/default_profile_photos/rainbow_man/300.png b/images/default_profile_photos/rainbow_man/300.png new file mode 100644 index 000000000..30a7e0ffb Binary files /dev/null and b/images/default_profile_photos/rainbow_man/300.png differ diff --git a/images/default_profile_photos/rainbow_man_trans/175.png b/images/default_profile_photos/rainbow_man_trans/175.png deleted file mode 100644 index a0a236841..000000000 Binary files a/images/default_profile_photos/rainbow_man_trans/175.png and /dev/null differ diff --git a/images/default_profile_photos/rainbow_man_trans/300.png b/images/default_profile_photos/rainbow_man_trans/300.png new file mode 100644 index 000000000..a0a236841 Binary files /dev/null and b/images/default_profile_photos/rainbow_man_trans/300.png differ diff --git a/images/default_profile_photos/red_avatar/175.png b/images/default_profile_photos/red_avatar/175.png deleted file mode 100644 index 31d39a41a..000000000 Binary files a/images/default_profile_photos/red_avatar/175.png and /dev/null differ diff --git a/images/default_profile_photos/red_avatar/300.png b/images/default_profile_photos/red_avatar/300.png new file mode 100644 index 000000000..31d39a41a Binary files /dev/null and b/images/default_profile_photos/red_avatar/300.png differ diff --git a/images/default_profile_photos/red_koala/175.jpg b/images/default_profile_photos/red_koala/175.jpg deleted file mode 100644 index e49343b1d..000000000 Binary files a/images/default_profile_photos/red_koala/175.jpg and /dev/null differ diff --git a/images/default_profile_photos/red_koala/175.png b/images/default_profile_photos/red_koala/175.png deleted file mode 100644 index ee4a701d9..000000000 Binary files a/images/default_profile_photos/red_koala/175.png and /dev/null differ diff --git a/images/default_profile_photos/red_koala/300.jpg b/images/default_profile_photos/red_koala/300.jpg new file mode 100644 index 000000000..e49343b1d Binary files /dev/null and b/images/default_profile_photos/red_koala/300.jpg differ diff --git a/images/default_profile_photos/red_koala/300.png b/images/default_profile_photos/red_koala/300.png new file mode 100644 index 000000000..ee4a701d9 Binary files /dev/null and b/images/default_profile_photos/red_koala/300.png differ diff --git a/images/default_profile_photos/red_koala_trans/175.png b/images/default_profile_photos/red_koala_trans/175.png deleted file mode 100644 index 4e51c80e2..000000000 Binary files a/images/default_profile_photos/red_koala_trans/175.png and /dev/null differ diff --git a/images/default_profile_photos/red_koala_trans/300.png b/images/default_profile_photos/red_koala_trans/300.png new file mode 100644 index 000000000..4e51c80e2 Binary files /dev/null and b/images/default_profile_photos/red_koala_trans/300.png differ diff --git a/images/default_profile_photos/redmatrix_logo_smiley/175.png b/images/default_profile_photos/redmatrix_logo_smiley/175.png deleted file mode 100644 index 7299c4494..000000000 Binary files a/images/default_profile_photos/redmatrix_logo_smiley/175.png and /dev/null differ diff --git a/images/default_profile_photos/redmatrix_logo_smiley/300.png b/images/default_profile_photos/redmatrix_logo_smiley/300.png new file mode 100644 index 000000000..7299c4494 Binary files /dev/null and b/images/default_profile_photos/redmatrix_logo_smiley/300.png differ diff --git a/include/identity.php b/include/identity.php index 3925c3537..5a3861b31 100644 --- a/include/identity.php +++ b/include/identity.php @@ -1393,10 +1393,10 @@ function get_theme_uid() { * with the specified size. * * @param int $size -* one of (175, 80, 48) +* one of (300, 80, 48) * @returns string */ -function get_default_profile_photo($size = 175) { +function get_default_profile_photo($size = 300) { $scheme = get_config('system','default_profile_photo'); if(! $scheme) $scheme = 'rainbow_man'; diff --git a/include/network.php b/include/network.php index 3abb1b40e..d9546a074 100644 --- a/include/network.php +++ b/include/network.php @@ -531,7 +531,7 @@ function avatar_img($email) { $avatar = array(); $a = get_app(); - $avatar['size'] = 175; + $avatar['size'] = 300; $avatar['email'] = $email; $avatar['url'] = ''; $avatar['success'] = false; @@ -1658,4 +1658,4 @@ function format_and_send_email($sender,$xchan,$item) { -} \ No newline at end of file +} diff --git a/include/photo/photo_driver.php b/include/photo/photo_driver.php index 6f508bf72..5d61556ab 100644 --- a/include/photo/photo_driver.php +++ b/include/photo/photo_driver.php @@ -606,16 +606,16 @@ function import_profile_photo($photo,$xchan,$thing = false) { if(($width / $height) > 1.2) { // crop out the sides $margin = $width - $height; - $img->cropImage(175,($margin / 2),0,$height,$height); + $img->cropImage(300,($margin / 2),0,$height,$height); } elseif(($height / $width) > 1.2) { // crop out the bottom $margin = $height - $width; - $img->cropImage(175,0,0,$width,$width); + $img->cropImage(300,0,0,$width,$width); } else { - $img->scaleImageSquare(175); + $img->scaleImageSquare(300); } } @@ -682,7 +682,7 @@ function import_channel_photo($photo,$type,$aid,$uid) { $img = photo_factory($photo, $type); if($img->is_valid()) { - $img->scaleImageSquare(175); + $img->scaleImageSquare(300); $p = array('aid' => $aid, 'uid' => $uid, 'resource_id' => $hash, 'filename' => $filename, 'album' => t('Profile Photos'), 'photo_flags' => PHOTO_PROFILE, 'scale' => 4); diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl index 9eac48c6d..bea0d894f 100755 --- a/view/tpl/profile_vcard.tpl +++ b/view/tpl/profile_vcard.tpl @@ -1,5 +1,5 @@
-
{{$profile.name}}
+
{{$profile.name}}
{{if $profile.edit}}
-- cgit v1.2.3