Merge https://github.com/redmatrix/redmatrix into pending_merge

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';

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) {
 
 
 
-}
+}

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);
 

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}}

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>