AI-46 Used logos returned by API rather than custom logos in extension

JMAConsulting · May 14, 2015 · b808b90 · b808b90
1 parent d7b99b7
commit b808b90
Show file tree

Hide file tree

Showing 11 changed files with 8 additions and 5 deletions.
diff --git a/CRM/Attentively/BAO/Attentively.php b/CRM/Attentively/BAO/Attentively.php
@@ -135,7 +135,7 @@ static public function pullMembers() {
       $errors[] = $result['error'];
     }
     curl_close($ch);
-    
+
     if ($result['success'] && $result['deferred_status'] == 'complete') {
       // Store members
       foreach ($result['members'] as $key => $value) {
@@ -190,6 +190,7 @@ static public function pullMembers() {
           $network[$key][$k]['name'] = $networks->name;
           $network[$key][$k]['url'] = $networks->url;
           $network[$key][$k]['photo'] = $networks->photo;
+          $network[$key][$k]['icon'] = $networks->icon;
         }
       }
       foreach ($network as $key => $v) {
@@ -198,8 +199,8 @@ static public function pullMembers() {
           $flag = CRM_Core_DAO::singleValueQuery($check);
           if ($flag) 
             continue;
-          $query = "INSERT INTO civicrm_attentively_member_network (`contact_id`, `name`, `url`, `photo`)
-          VALUES ( '{$value['contact_id']}', '{$value['name']}', '{$value['url']}', '{$value['photo']}' )";
+          $query = "INSERT INTO civicrm_attentively_member_network (`contact_id`, `name`, `url`, `photo`, `icon`)
+          VALUES ( '{$value['contact_id']}', '{$value['name']}', '{$value['url']}', '{$value['photo']}', '{$value['icon']}' )";
           $dao = CRM_Core_DAO::executeQuery($query);
         }
       }
@@ -353,6 +354,7 @@ static public function getNetworks($cid) {
       elseif ($dao->name != 'klout') {
         $network[$dao->name]['url'] = $dao->url;
         $network[$dao->name]['image'] = '<img class="network-image" src="' .$config->extensionsURL. '/biz.jmaconsulting.attentively/images/' .$dao->name. '.png" style="width:80px !important; height:80px !important;"/>';
+        $network[$dao->name]['image'] = '<img class="network-image" src="' .$dao->icon. '" />';
       }
       if ($dao->photo != '' && $dao->name != 'gravatar') {
         $network['gravatar']['image'] = '<img class="photo" src=' . $dao->photo . ' />';

diff --git a/images/facebook.png b/images/facebook.png
diff --git a/images/instagram.png b/images/instagram.png
diff --git a/images/linkedin.png b/images/linkedin.png
diff --git a/images/myspace.png b/images/myspace.png
diff --git a/images/pinterest.png b/images/pinterest.png
diff --git a/images/tumblr.png b/images/tumblr.png
diff --git a/images/tungleme.png b/images/tungleme.png
diff --git a/images/twitter.png b/images/twitter.png
diff --git a/sql/attentively_install.sql b/sql/attentively_install.sql
@@ -41,6 +41,7 @@ CREATE TABLE IF NOT EXISTS `civicrm_attentively_member_network` (
   `name` varchar(64) DEFAULT NULL,
   `url` varchar(255) DEFAULT NULL,
   `photo` varchar(255) DEFAULT NULL,
+  `icon` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 

diff --git a/templates/CRM/Attentively/Page/SocialMedia.tpl b/templates/CRM/Attentively/Page/SocialMedia.tpl
@@ -1,6 +1,6 @@
 <style>
 
-.user-avatar, .network-container {ldelim}
+.user-avatar {ldelim}
     background-color: #fff;
     border: 1px solid #a8a8a8;
     border-radius: 50%;
@@ -85,7 +85,7 @@
      <tr>
   {foreach from=$networkData item=url key=name}
     {if $name neq 'gravatar'}
-      <td style="padding-top:14px; border:none;"><div class="network-container"><a href="{$url.url}">{$url.image}</a></div></td>
+      <td style="padding-top:14px; padding-bottom:14px; border:none;"><div><a href="{$url.url}">{$url.image}  {$name|upper}</a></div></td>
     {/if}
   {/foreach}
      </tr>