diff options
| -rw-r--r-- | images/default_profile_photos/alpha/300.png (renamed from images/default_profile_photos/alpha/175.png) | bin | 3817 -> 3817 bytes | |||
| -rw-r--r-- | images/default_profile_photos/black_avatar_1/300.png (renamed from images/default_profile_photos/black_avatar_1/175.png) | bin | 6420 -> 6420 bytes | |||
| -rw-r--r-- | images/default_profile_photos/black_avatar_2/300.png (renamed from images/default_profile_photos/black_avatar_2/175.png) | bin | 5802 -> 5802 bytes | |||
| -rw-r--r-- | images/default_profile_photos/blank/300.jpg (renamed from images/default_profile_photos/blank/175.jpg) | bin | 910 -> 910 bytes | |||
| -rw-r--r-- | images/default_profile_photos/blank/300.png (renamed from images/default_profile_photos/blank/175.png) | bin | 3817 -> 3817 bytes | |||
| -rw-r--r-- | images/default_profile_photos/rainbow_man/300.jpg (renamed from images/default_profile_photos/rainbow_man/175.jpg) | bin | 8510 -> 8510 bytes | |||
| -rw-r--r-- | images/default_profile_photos/rainbow_man/300.png (renamed from images/default_profile_photos/rainbow_man/175.png) | bin | 57998 -> 57998 bytes | |||
| -rw-r--r-- | images/default_profile_photos/rainbow_man_trans/300.png (renamed from images/default_profile_photos/rainbow_man_trans/175.png) | bin | 71198 -> 71198 bytes | |||
| -rw-r--r-- | images/default_profile_photos/red_avatar/300.png (renamed from images/default_profile_photos/red_avatar/175.png) | bin | 4621 -> 4621 bytes | |||
| -rw-r--r-- | images/default_profile_photos/red_koala/300.jpg (renamed from images/default_profile_photos/red_koala/175.jpg) | bin | 22969 -> 22969 bytes | |||
| -rw-r--r-- | images/default_profile_photos/red_koala/300.png (renamed from images/default_profile_photos/red_koala/175.png) | bin | 20722 -> 20722 bytes | |||
| -rw-r--r-- | images/default_profile_photos/red_koala_trans/300.png (renamed from images/default_profile_photos/red_koala_trans/175.png) | bin | 25546 -> 25546 bytes | |||
| -rw-r--r-- | images/default_profile_photos/redmatrix_logo_smiley/300.png (renamed from images/default_profile_photos/redmatrix_logo_smiley/175.png) | bin | 3834 -> 3834 bytes | |||
| -rw-r--r-- | include/identity.php | 4 | ||||
| -rw-r--r-- | include/network.php | 4 | ||||
| -rw-r--r-- | include/photo/photo_driver.php | 8 | ||||
| -rwxr-xr-x | view/tpl/field_acheckbox.tpl | 9 | ||||
| -rwxr-xr-x | view/tpl/profile_vcard.tpl | 2 |
18 files changed, 16 insertions, 11 deletions
diff --git a/images/default_profile_photos/alpha/175.png b/images/default_profile_photos/alpha/300.png Binary files differindex 17211ee27..17211ee27 100644 --- a/images/default_profile_photos/alpha/175.png +++ b/images/default_profile_photos/alpha/300.png diff --git a/images/default_profile_photos/black_avatar_1/175.png b/images/default_profile_photos/black_avatar_1/300.png Binary files differindex bc5b19793..bc5b19793 100644 --- a/images/default_profile_photos/black_avatar_1/175.png +++ b/images/default_profile_photos/black_avatar_1/300.png diff --git a/images/default_profile_photos/black_avatar_2/175.png b/images/default_profile_photos/black_avatar_2/300.png Binary files differindex 8ff3cbd4c..8ff3cbd4c 100644 --- a/images/default_profile_photos/black_avatar_2/175.png +++ b/images/default_profile_photos/black_avatar_2/300.png diff --git a/images/default_profile_photos/blank/175.jpg b/images/default_profile_photos/blank/300.jpg Binary files differindex 4024d6e88..4024d6e88 100644 --- a/images/default_profile_photos/blank/175.jpg +++ b/images/default_profile_photos/blank/300.jpg diff --git a/images/default_profile_photos/blank/175.png b/images/default_profile_photos/blank/300.png Binary files differindex 1edb25b76..1edb25b76 100644 --- a/images/default_profile_photos/blank/175.png +++ b/images/default_profile_photos/blank/300.png diff --git a/images/default_profile_photos/rainbow_man/175.jpg b/images/default_profile_photos/rainbow_man/300.jpg Binary files differindex fc0ec3d77..fc0ec3d77 100644 --- a/images/default_profile_photos/rainbow_man/175.jpg +++ b/images/default_profile_photos/rainbow_man/300.jpg diff --git a/images/default_profile_photos/rainbow_man/175.png b/images/default_profile_photos/rainbow_man/300.png Binary files differindex 30a7e0ffb..30a7e0ffb 100644 --- a/images/default_profile_photos/rainbow_man/175.png +++ b/images/default_profile_photos/rainbow_man/300.png diff --git a/images/default_profile_photos/rainbow_man_trans/175.png b/images/default_profile_photos/rainbow_man_trans/300.png Binary files differindex a0a236841..a0a236841 100644 --- a/images/default_profile_photos/rainbow_man_trans/175.png +++ b/images/default_profile_photos/rainbow_man_trans/300.png diff --git a/images/default_profile_photos/red_avatar/175.png b/images/default_profile_photos/red_avatar/300.png Binary files differindex 31d39a41a..31d39a41a 100644 --- a/images/default_profile_photos/red_avatar/175.png +++ b/images/default_profile_photos/red_avatar/300.png diff --git a/images/default_profile_photos/red_koala/175.jpg b/images/default_profile_photos/red_koala/300.jpg Binary files differindex e49343b1d..e49343b1d 100644 --- a/images/default_profile_photos/red_koala/175.jpg +++ b/images/default_profile_photos/red_koala/300.jpg diff --git a/images/default_profile_photos/red_koala/175.png b/images/default_profile_photos/red_koala/300.png Binary files differindex ee4a701d9..ee4a701d9 100644 --- a/images/default_profile_photos/red_koala/175.png +++ b/images/default_profile_photos/red_koala/300.png diff --git a/images/default_profile_photos/red_koala_trans/175.png b/images/default_profile_photos/red_koala_trans/300.png Binary files differindex 4e51c80e2..4e51c80e2 100644 --- a/images/default_profile_photos/red_koala_trans/175.png +++ b/images/default_profile_photos/red_koala_trans/300.png diff --git a/images/default_profile_photos/redmatrix_logo_smiley/175.png b/images/default_profile_photos/redmatrix_logo_smiley/300.png Binary files differindex 7299c4494..7299c4494 100644 --- a/images/default_profile_photos/redmatrix_logo_smiley/175.png +++ b/images/default_profile_photos/redmatrix_logo_smiley/300.png 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/field_acheckbox.tpl b/view/tpl/field_acheckbox.tpl index f96fd5fd6..e99128bbb 100755 --- a/view/tpl/field_acheckbox.tpl +++ b/view/tpl/field_acheckbox.tpl @@ -5,11 +5,16 @@ </td> {{if $notself}} <td class="abook-them"> - <input type="checkbox" name='them_{{$field.0}}' id='them_id_{{$field.0}}' value="1" disabled="disabled" {{if $field.2}}checked="checked"{{/if}} /> + {{if $field.2}}<i class="icon-check"></i>{{else}}<i class="icon-check-empty"></i>{{/if}} </td> {{/if}} <td class="abook-me"> - <input type="checkbox" name='{{$field.0}}' class='abook-edit-me' id='me_id_{{$field.0}}' value="{{$field.4}}" {{if $field.3}}checked="checked"{{/if}}{{if $notself && $field.5}} disabled="disabled"{{/if}}/> + {{if $self || !$field.5}} + <input type="checkbox" name='{{$field.0}}' class='abook-edit-me' id='me_id_{{$field.0}}' value="{{$field.4}}" {{if $field.3}}checked="checked"{{/if}} /> + {{/if}} + {{if $notself && $field.5}} + {{if $field.3}}<i class="icon-check"></i>{{else}}<i class="icon-check-empty"></i>{{/if}} + {{/if}} </td> <td> {{if $field.5}}<span class="permission-inherited">{{$inherited}}{{if $self}}{{if $field.7}} <i class="icon-check"></i>{{else}} <i class="icon-check-empty"></i>{{/if}}{{/if}}</span>{{/if}} 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 @@ <div class="vcard"> - <div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div> + <div id="profile-photo-wrapper"><img class="photo" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div> {{if $profile.edit}} <div class="dropdown"> <a class="profile-edit-side-link dropdown-toggle" data-toggle="dropdown" title="{{$profile.edit.3}}" href="#" ><i class="icon-pencil" title="{{$profile.edit.1}}" ></i></a> |
