Cleanup paperclip icon

diff --git a/CRM/Case/BAO/Case.php b/CRM/Case/BAO/Case.php
index 1226a18dbd317ad0a2eba09ca54b8c028b82051b..854ec01a6a0c624fa242747272532bff22261121 100644 (file)
--- a/CRM/Case/BAO/Case.php
+++ b/CRM/Case/BAO/Case.php
@@ -1363,7 +1363,7 @@ SELECT case_status.label AS case_status, status_id, civicrm_case_type.title AS c
             NULL,
             FALSE
           );
-          $url .= " <a href='$attachmentViewUrl' ><span class='icon paper-icon'></span></a>";
+          $url .= " <a href='$attachmentViewUrl' ><i class='crm-i fa-paperclip'></i></a>";
         }
       }
 

diff --git a/CRM/Core/BAO/File.php b/CRM/Core/BAO/File.php
index d3d9d0073613256560df9d1948b87eed15bce2a2..97210ef52c3dcfde449f8ec8ce4d48a0740b751c 100644 (file)
--- a/CRM/Core/BAO/File.php
+++ b/CRM/Core/BAO/File.php
@@ -691,26 +691,27 @@ AND       CEF.entity_id    = %2";
     $currentAttachmentInfo = self::getEntityFile($entityTable, $entityID);
     foreach ($currentAttachmentInfo as $fileKey => $fileValue) {
       $fileID = $fileValue['fileID'];
-      $fileType = $fileValue['mime_type'];
       if ($fileID) {
+        $fileType = $fileValue['mime_type'];
+        $url = $fileValue['url'];
+        $title = $fileValue['cleanName'];
         if ($fileType == 'image/jpeg' ||
           $fileType == 'image/pjpeg' ||
           $fileType == 'image/gif' ||
           $fileType == 'image/x-png' ||
           $fileType == 'image/png'
         ) {
-          $url = $fileValue['url'];
-          $alt = $fileValue['cleanName'];
           $file_url[$fileID] = "
-              <a href=\"$url\" class='crm-image-popup'>
-              <div class='icon paper-icon' title=\"$alt\" alt=\"$alt\"></div>
+              <a href='$url' class='crm-image-popup' title='$title'>
+                <i class='crm-i fa-file-image-o'></i>
               </a>";
-          // for non image files
         }
+        // for non image files
         else {
-          $url = $fileValue['url'];
-          $alt = $fileValue['cleanName'];
-          $file_url[$fileID] = "<a href=\"$url\"><div class='icon paper-icon' title=\"$alt\" alt=\"$alt\"></div></a>";
+          $file_url[$fileID] = "
+              <a href='$url' title='$title'>
+                <i class='crm-i fa-paperclip'></i>
+              </a>";
         }
       }
     }

diff --git a/css/civicrm.css b/css/civicrm.css
index 56c46d7aa882fd70e9c3136f67becd04f5a60d6f..0bc5d290d4c489e4334ef6c9c92e19f11fba0041 100644 (file)
--- a/css/civicrm.css
+++ b/css/civicrm.css
@@ -3789,10 +3789,6 @@ span.crm-status-icon {
   color: #fff;
 }
 
-.crm-container .paper-icon {
-  background-position: -101px -222px;background-image: url("../i/icons/jquery-ui-3E3E3E.gif");
-}
-
 .crm-container .strikethrough {
   text-decoration: line-through;
 }