(js) Improve sgAvatarImage

UI/Templates/ContactsUI/UIxContactFoldersView.wox

@@ -463,22 +463,10 @@
                      label:aria-label="Toggle item"
                      ng-class="{ 'sg-avatar-selected': currentCard.selected }"
                      ng-click="addressbook.toggleCardSelection($event, currentCard)">
-                  <!-- <div class="md-avatar sg-avatar-selected" -->
-                  <!--      ng-if="currentCard.selected"> -->
-                    <!-- selected avatar -->
-                  <!-- </div> -->
                   <sg-avatar-image
-                      aria-disabled="true"
-                      ng-if="currentCard.$isCard()"
                       sg-email="currentCard.$preferredEmail(addressbook.selectedFolder.constructor.$query.value)"
                       sg-src="currentCard.photoURL"
-                      size="40">
-                    <!-- contact avatar -->
-                  </sg-avatar-image>
-                  <div class="md-avatar sg-avatar-list"
-                       ng-show="currentCard.$isList()">
-                    <!-- list avatar -->
-                  </div>
+                      size="40">{{ currentCard.$avatarIcon }}</sg-avatar-image>
                 </div>
                 <div class="sg-progress-linear-bottom"
                      ng-show="currentCard.$isLoading()">

UI/Templates/ContactsUI/UIxContactViewTemplate.wox

@@ -57,15 +57,10 @@
         </md-card-actions>
         <md-card-content>
           <header class="msg-header">
-            <div ng-show="editor.card.c_component == 'vcard'">
-              <sg-avatar-image class="md-avatar md-tile-left"
-                               sg-email="editor.card.$preferredEmail()"
-                               sg-src="editor.card.photoURL"
-                               size="40"><!-- avatar --></sg-avatar-image>
-            </div>
-            <div class="md-tile-left md-avatar sg-avatar-list" ng-show="editor.card.$isList()">
-              <!--list avatar-->
-            </div>
+            <sg-avatar-image class="md-avatar md-tile-left"
+                             sg-email="editor.card.$preferredEmail()"
+                             sg-src="editor.card.photoURL"
+                             size="40">{{ editor.card.$avatarIcon }}</sg-avatar-image>
             <div class="msg-header-content">
               <h1 class="sg-md-display-2--thin" ng-bind-html="editor.card.$fullname({html: true})"><!-- fullname --></h1>
               <h6 class="sg-md-display-2-subheader--thin">{{editor.card.$description()}}</h6>
@@ -93,9 +88,7 @@
                 <md-list-item class="md-2-line" ng-repeat="ref in editor.card.refs track by ref.reference">
                   <sg-avatar-image class="md-tile-left"
                                    sg-email="ref.$preferredEmail()"
-                                   size="48">
-                    <!-- contact avatar -->
-                  </sg-avatar-image>
+                                   size="48">person</sg-avatar-image>
                   <div class="md-list-item-text">
                     <h3>
                       <a ui-sref="app.addressbook.card.view({cardId: ref.reference})">{{ ref.$fullname() }}</a>

UI/Templates/ContactsUI/UIxContactsUserFolders.wox

@@ -39,13 +39,9 @@
                            'sg-expanded': user.uid == subscribe.selectedUser.uid }">
         <md-button ng-click="subscribe.selectUser($index)">
           <div layout="row" layout-align="start center" class="md-flex">
-            <span class="card-picture" ng-switch="user.isGroup">
-              <sg-avatar-image class="md-avatar"
-                               ng-switch-when="0"
-                               sg-email="user.c_email"
-                               size="40"><!-- avatar --></sg-avatar-image>
-              <div ng-switch-when="1" class="md-avatar sg-avatar-list"><!-- list avatar --></div>
-            </span>
+            <sg-avatar-image class="md-avatar"
+                             sg-email="user.c_email"
+                             size="40">{{ user.$avatarIcon }}</sg-avatar-image>
             <div class="sg-tile-content">
               <div class="sg-md-subhead"><div>{{user.cn}}</div></div>
               <div class="sg-md-body"><div>{{user.c_email}}</div></div>