From 3e5e512f723007d90734ff4228e37ce72aaaf6b3 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Sat, 14 Feb 2015 09:58:01 -0500
Subject: [PATCH] CRM-15705 - Hover button cleanup

---
 css/civicrm.css                              |  2 ++
 partials/crmAttachment/attachments.html      |  8 +++++---
 partials/crmCaseType/activityTypesTable.html |  4 +---
 partials/crmCaseType/rolesTable.html         |  4 +---
 partials/crmCaseType/sequenceTable.html      |  4 +---
 partials/crmCaseType/timelineTable.html      |  5 +++--
 partials/crmMailing/edit-unified.html        |  2 +-
 partials/crmMailing/edit-unified2.html       |  2 +-
 partials/crmMailing/edit-wizard.html         |  2 +-
 partials/crmMailing/edit.html                |  2 +-
 partials/crmMailing/mailing.html             |  2 +-
 partials/crmMailing/recipients.html          |  4 +---
 partials/crmMailing/review.html              | 14 +++++++-------
 partials/crmMailingAB/edit.html              |  2 +-
 partials/crmMailingAB/joint-mailing.html     |  6 +++---
 partials/crmUi/datetime.html                 |  3 ++-
 16 files changed, 32 insertions(+), 34 deletions(-)

diff --git a/css/civicrm.css b/css/civicrm.css
index d2a55114aa..2fa64257db 100644
--- a/css/civicrm.css
+++ b/css/civicrm.css
@@ -1551,6 +1551,7 @@ input.crm-form-entityref {
   color: #000;
   padding: 1px 2px 1px 0;
   opacity: .7;
+  cursor: pointer;
 }
 .crm-container a.crm-hover-button.action-item,
 .crm-container .crm-hover-button.btn-slide {
@@ -2227,6 +2228,7 @@ div.grippie {
 .crm-container .red-icon,
 .crm-container a:hover .icon.delete-icon,
 .crm-container .crm-button:hover .icon.ui-icon-trash,
+.crm-container .crm-hover-button:hover .icon.ui-icon-trash,
 .crm-container span:hover > .icon.delete-icon {
   background-image: url("../i/icons/jquery-ui-8A1F11.png");
 }
diff --git a/partials/crmAttachment/attachments.html b/partials/crmAttachment/attachments.html
index 53c8239752..7716140780 100644
--- a/partials/crmAttachment/attachments.html
+++ b/partials/crmAttachment/attachments.html
@@ -10,8 +10,10 @@
         <input ng-model="file.description" class="crm-form-text" placeholder="{{ts('Description')}}"/>
       </td>
       <td>
-        <a crm-confirm="{message: ts('Deleting an attachment will completely remove it from server.'), title: ts('Delete Attachment?')}" on-yes="att.deleteFile(file)" class="crm-hover-button">
-          <span class="icon delete-icon" title="{{ts('Delete attachment')}}"></span>
+        <a
+          crm-icon="trash"
+          crm-confirm="{message: ts('Deleting an attachment will completely remove it from server.'), title: ts('Delete Attachment?')}" on-yes="att.deleteFile(file)"
+          class="crm-hover-button">
         </a>
       </td>
     </tr>
@@ -24,7 +26,7 @@
         <!-- item.isReady item.isUploading item.isUploaded item.isSuccess item.isCancel item.isError -->
       </td>
       <td>
-        <a ng-click="item.remove()" class="crm-hover-button"><span class="icon ui-icon-close" title="{{ts('Remove unsaved attachment')}}"></span></a>
+        <a crm-icon="close" ng-click="item.remove()" class="crm-hover-button" title="{{ts('Remove unsaved attachment')}}"></a>
       </td>
     </tr>
     </tbody>
diff --git a/partials/crmCaseType/activityTypesTable.html b/partials/crmCaseType/activityTypesTable.html
index 1205c661ca..724ef6e2a6 100644
--- a/partials/crmCaseType/activityTypesTable.html
+++ b/partials/crmCaseType/activityTypesTable.html
@@ -21,9 +21,7 @@ Required vars: caseType
       <input class="number" type="text" ng-pattern="/^[0-9]*$/" ng-model="activityType.max_instances" />
     </td>
     <td>
-      <a class="crm-hover-button" ng-click="removeItem(caseType.definition.activityTypes, activityType)">
-        <span class="icon delete-icon" title="Remove"></span>
-      </a>
+      <a crm-icon="trash" class="crm-hover-button" ng-click="removeItem(caseType.definition.activityTypes, activityType)" title="Remove"></a>
     </td>
   </tr>
   </tbody>
diff --git a/partials/crmCaseType/rolesTable.html b/partials/crmCaseType/rolesTable.html
index e5c2afe6de..57bd47f2bb 100644
--- a/partials/crmCaseType/rolesTable.html
+++ b/partials/crmCaseType/rolesTable.html
@@ -17,9 +17,7 @@ Required vars: caseType
 	    <td><input type="checkbox" ng-model="relType.creator" ng-true-value="1" ng-false-value="0"/></td>
 	    <td><input type="radio" ng-model="relType.manager" value="1" ng-change="onManagerChange(relType)"/></td>
 	    <td>
-	      <a class="crm-hover-button" ng-click="removeItem(caseType.definition.caseRoles,relType)">
-	        <span class="icon delete-icon" title="Remove"></span>
-	      </a>
+	      <a crm-icon="trash" class="crm-hover-button" ng-click="removeItem(caseType.definition.caseRoles,relType)" title="Remove"></a>
 	    </td>
 	  </tr>
   </tbody>
diff --git a/partials/crmCaseType/sequenceTable.html b/partials/crmCaseType/sequenceTable.html
index 5334f6949c..c767883148 100644
--- a/partials/crmCaseType/sequenceTable.html
+++ b/partials/crmCaseType/sequenceTable.html
@@ -17,9 +17,7 @@ Required vars: activitySet
       {{ activity.name }}
     </td>
     <td>
-      <a class="crm-hover-button" ng-click="removeItem(activitySet.activityTypes, activity)">
-        <span class="icon delete-icon" title="Remove"></span>
-      </a>
+      <a crm-icon="trash" class="crm-hover-button" ng-click="removeItem(activitySet.activityTypes, activity)" title="Remove"></a>
     </td>
   </tr>
   </tbody>
diff --git a/partials/crmCaseType/timelineTable.html b/partials/crmCaseType/timelineTable.html
index 824629527f..9eb68c615a 100644
--- a/partials/crmCaseType/timelineTable.html
+++ b/partials/crmCaseType/timelineTable.html
@@ -64,9 +64,10 @@ Required vars: activitySet
     </td>
     <td>
       <a class="crm-hover-button"
+         crm-icon="trash"
          ng-show="isActivityRemovable(activitySet, activity)"
-         ng-click="removeItem(activitySet.activityTypes, activity)">
-        <span class="icon delete-icon" title="Remove"></span>
+         ng-click="removeItem(activitySet.activityTypes, activity)"
+         title="Remove">
       </a>
     </td>
   </tr>
diff --git a/partials/crmMailing/edit-unified.html b/partials/crmMailing/edit-unified.html
index ef6b847c3f..15ece1ea92 100644
--- a/partials/crmMailing/edit-unified.html
+++ b/partials/crmMailing/edit-unified.html
@@ -47,6 +47,6 @@
 
     <button crm-icon="check" ng-disabled="block.check() || crmMailing.$invalid" ng-click="submit()">{{ts('Submit Mailing')}}</button>
     <button crm-icon="disk" ng-disabled="block.check()" ng-click="save().then(leave)">{{ts('Save Draft')}}</button>
-    <button crm-icon="trash" ng-disabled="block.check()" crm-confirm="{title:ts('Delete Draft?'), message:ts('Are you sure you want to permanently delete this mailing?')}" on-yes="delete()">{{ts('Delete Draft')}}</button>
+    <button crm-icon="trash" ng-disabled="block.check()" crm-confirm="{title:ts('Delete Draft'), message:ts('Are you sure you want to permanently delete this mailing?')}" on-yes="delete()">{{ts('Delete Draft')}}</button>
   </div>
 </form>
diff --git a/partials/crmMailing/edit-unified2.html b/partials/crmMailing/edit-unified2.html
index c293c61294..2d6f53967e 100644
--- a/partials/crmMailing/edit-unified2.html
+++ b/partials/crmMailing/edit-unified2.html
@@ -43,6 +43,6 @@
 
     <button crm-icon="check" ng-disabled="block.check() || crmMailing.$invalid" ng-click="submit()">{{ts('Submit Mailing')}}</button>
     <button crm-icon="disk" ng-disabled="block.check()" ng-click="save().then(leave)">{{ts('Save Draft')}}</button>
-    <button crm-icon="trash" ng-disabled="block.check()" crm-confirm="{title:ts('Delete Draft?'), message:ts('Are you sure you want to permanently delete this mailing?')}" on-yes="delete()">{{ts('Delete Draft')}}</button>
+    <button crm-icon="trash" ng-disabled="block.check()" crm-confirm="{title:ts('Delete Draft'), message:ts('Are you sure you want to permanently delete this mailing?')}" on-yes="delete()">{{ts('Delete Draft')}}</button>
   </div>
 </form>
diff --git a/partials/crmMailing/edit-wizard.html b/partials/crmMailing/edit-wizard.html
index ec07b9ecf3..e202a4f0ad 100644
--- a/partials/crmMailing/edit-wizard.html
+++ b/partials/crmMailing/edit-wizard.html
@@ -60,7 +60,7 @@
       </div>
 
       <span crm-ui-wizard-buttons style="float:right;">
-        <button crm-icon="trash" ng-disabled="block.check()" crm-confirm="{title:ts('Delete Draft?'), message:ts('Are you sure you want to permanently delete this mailing?')}" on-yes="delete()">{{ts('Delete Draft')}}</button>
+        <button crm-icon="trash" ng-disabled="block.check()" crm-confirm="{title:ts('Delete Draft'), message:ts('Are you sure you want to permanently delete this mailing?')}" on-yes="delete()">{{ts('Delete Draft')}}</button>
         <button crm-icon="disk" ng-disabled="block.check()" ng-click="save().then(leave)">{{ts('Save Draft')}}</button>
       </span>
     </div>
diff --git a/partials/crmMailing/edit.html b/partials/crmMailing/edit.html
index c15023d969..b10c5a922d 100644
--- a/partials/crmMailing/edit.html
+++ b/partials/crmMailing/edit.html
@@ -58,7 +58,7 @@
       </div>
 
       <span crm-ui-wizard-buttons style="float:right;">
-        <button crm-icon="trash" ng-disabled="block.check()" crm-confirm="{title:ts('Delete Draft?'), message:ts('Are you sure you want to permanently delete this mailing?')}" on-yes="delete()">{{ts('Delete Draft')}}</button>
+        <button crm-icon="trash" ng-disabled="block.check()" crm-confirm="{title:ts('Delete Draft'), message:ts('Are you sure you want to permanently delete this mailing?')}" on-yes="delete()">{{ts('Delete Draft')}}</button>
         <button crm-icon="disk" ng-disabled="block.check()" ng-click="save().then(leave)">{{ts('Save Draft')}}</button>
       </span>
     </div>
diff --git a/partials/crmMailing/mailing.html b/partials/crmMailing/mailing.html
index c633edb7a5..2ef321ca27 100644
--- a/partials/crmMailing/mailing.html
+++ b/partials/crmMailing/mailing.html
@@ -18,7 +18,7 @@ It could perhaps be thinned by 30-60% by making more directives.
           <option value=""></option>
           <option ng-repeat="frm in crmMsgTemplates.getAll() | orderBy:'msg_title'" ng-value="frm.id">{{frm.msg_title}}</option>
         </select>
-        <a ng-click="saveTemplate(mailing)" class="crm-hover-button" title="{{ts('Save As')}}"><span class="icon ui-icon-disk"></span></a>
+        <a crm-icon="disk" ng-click="saveTemplate(mailing)" class="crm-hover-button" title="{{ts('Save As')}}"></a>
       </div>
     </div>
     <div crm-ui-field="subform.fromAddress" crm-title="ts('From')">
diff --git a/partials/crmMailing/recipients.html b/partials/crmMailing/recipients.html
index 9d14bc25c0..905a27bd67 100644
--- a/partials/crmMailing/recipients.html
+++ b/partials/crmMailing/recipients.html
@@ -14,7 +14,5 @@
     ng-required="true"
     multiple>
   </select>
-  <a ng-click="editOptions(mailing)" class="crm-hover-button" title="{{ts('Edit Options')}}">
-    <span class="icon ui-icon-wrench"></span>
-  </a>
+  <a crm-icon="wrench" ng-click="editOptions(mailing)" class="crm-hover-button" title="{{ts('Edit Options')}}"></a>
 </div>
diff --git a/partials/crmMailing/review.html b/partials/crmMailing/review.html
index f8b9bec20f..d6a8660711 100644
--- a/partials/crmMailing/review.html
+++ b/partials/crmMailing/review.html
@@ -10,7 +10,7 @@ Required vars: mailing
       </div>
       <div crm-ui-field crm-title="ts('Recipients')">
         <div ng-controller="EditRecipCtrl">
-          <div><a class="crm-hover-button action-item" ng-click="previewRecipients()">{{getRecipientsEstimate()}} <span class="icon ui-icon-newwin"></span></a></div>
+          <div><a crm-icon="newwin" class="crm-hover-button action-item" ng-click="previewRecipients()">{{getRecipientsEstimate()}}</a></div>
           <div ng-show="getIncludesAsString()">
             (<strong>{{ts('Include:')}}</strong> {{getIncludesAsString()}})
           </div>
@@ -20,8 +20,8 @@ Required vars: mailing
         </div>
       </div>
       <div crm-ui-field crm-title="ts('Content')">
-        <span ng-show="mailing.body_html"><a class="crm-hover-button action-item" ng-click="previewMailing(mailing, 'html')">{{ts('HTML')}} <span class="icon ui-icon-newwin"></span></a></span>
-        <span ng-show="mailing.body_text"><a class="crm-hover-button action-item" ng-click="previewMailing(mailing, 'text')">{{ts('Plain Text')}} <span class="icon ui-icon-newwin"></span></a></span>
+        <span ng-show="mailing.body_html"><a crm-icon="newwin" class="crm-hover-button action-item" ng-click="previewMailing(mailing, 'html')">{{ts('HTML')}}</a></span>
+        <span ng-show="mailing.body_text"><a crm-icon="newwin" class="crm-hover-button action-item" ng-click="previewMailing(mailing, 'text')">{{ts('Plain Text')}}</a></span>
         <!-- TODO: attachments -->
       </div>
       <div crm-ui-field crm-title="ts('Attachments')" ng-show="attachments.files.length > 0 || attachments.uploader.queue.length > 0">
@@ -42,10 +42,10 @@ Required vars: mailing
           <span crm-mailing-review-bool crm-on="mailing.override_verp=='0' && mailing.forward_replies=='1'" crm-title="ts('Forward Replies')"></span>
         </div>
         <div ng-controller="PreviewComponentCtrl">
-          <span ng-show="mailing.override_verp == '0' && mailing.auto_responder"><a class="crm-hover-button action-item" ng-click="previewComponent(ts('Auto-Respond'), mailing.reply_id)">{{ts('Auto-Respond')}} <span class="icon ui-icon-newwin"></span></a></span>
-          <span><a class="crm-hover-button action-item" ng-click="previewComponent(ts('Opt-out'), mailing.optout_id)">{{ts('Opt-out')}} <span class="icon ui-icon-newwin"></span></a></span>
-          <span><a class="crm-hover-button action-item" ng-click="previewComponent(ts('Resubscribe'), mailing.resubscribe_id)">{{ts('Resubscribe')}} <span class="icon ui-icon-newwin"></span></a></span>
-          <span><a class="crm-hover-button action-item" ng-click="previewComponent(ts('Unsubscribe'), mailing.unsubscribe_id)">{{ts('Unsubscribe')}} <span class="icon ui-icon-newwin"></span></a></span>
+          <span ng-show="mailing.override_verp == '0' && mailing.auto_responder"><a crm-icon="newwin" class="crm-hover-button action-item" ng-click="previewComponent(ts('Auto-Respond'), mailing.reply_id)">{{ts('Auto-Respond')}}</a></span>
+          <span><a crm-icon="newwin" class="crm-hover-button action-item" ng-click="previewComponent(ts('Opt-out'), mailing.optout_id)">{{ts('Opt-out')}}</a></span>
+          <span><a crm-icon="newwin" class="crm-hover-button action-item" ng-click="previewComponent(ts('Resubscribe'), mailing.resubscribe_id)">{{ts('Resubscribe')}}</a></span>
+          <span><a crm-icon="newwin" class="crm-hover-button action-item" ng-click="previewComponent(ts('Unsubscribe'), mailing.unsubscribe_id)">{{ts('Unsubscribe')}}</a></span>
         </div>
       </div>
       <div crm-ui-field crm-title="ts('Publication')">
diff --git a/partials/crmMailingAB/edit.html b/partials/crmMailingAB/edit.html
index 3722ad98fe..0553280a46 100644
--- a/partials/crmMailingAB/edit.html
+++ b/partials/crmMailingAB/edit.html
@@ -174,7 +174,7 @@
         <button
           crm-icon="trash"
           ng-disabled="block.check()"
-          crm-confirm="{title:ts('Delete Draft?'), message:ts('Are you sure you want to permanently delete this mailing?')}"
+          crm-confirm="{title:ts('Delete Draft'), message:ts('Are you sure you want to permanently delete this mailing?')}"
           on-yes="delete()">{{ts('Delete Draft')}}
         </button>
         <button crm-icon="disk" ng-disabled="block.check()" ng-click="save().then(leave) ">{{ts('Save Draft')}}</button>
diff --git a/partials/crmMailingAB/joint-mailing.html b/partials/crmMailingAB/joint-mailing.html
index 9238dbeee5..65592a99df 100644
--- a/partials/crmMailingAB/joint-mailing.html
+++ b/partials/crmMailingAB/joint-mailing.html
@@ -27,7 +27,7 @@ processed by Angular; if false, the field will be hidden and completely ignored
           <option value=""></option>
           <option ng-repeat="frm in crmMsgTemplates.getAll() | orderBy:'msg_title'" ng-value="frm.id">{{frm.msg_title}}</option>
         </select>
-        <a ng-click="saveTemplate(abtest.mailings.a)" class="crm-hover-button" title="{{ts('Save As')}}"><span class="icon ui-icon-disk"></span></a>
+        <a crm-icon="disk" ng-click="saveTemplate(abtest.mailings.a)" class="crm-hover-button" title="{{ts('Save As')}}"></a>
       </div>
     </div>
     <div crm-ui-field="subform.msg_template_idA" crm-title="ts('Template (A)')" style="background: #bbf; width:100%; padding: 0.1em;" ng-if="fields.msg_template_idA">
@@ -42,7 +42,7 @@ processed by Angular; if false, the field will be hidden and completely ignored
           <option value=""></option>
           <option ng-repeat="frm in crmMsgTemplates.getAll() | orderBy:'msg_title'" ng-value="frm.id">{{frm.msg_title}}</option>
         </select>
-        <a ng-click="saveTemplate(abtest.mailings.a)" class="crm-hover-button" title="{{ts('Save As')}}"><span class="icon ui-icon-disk"></span></a>
+        <a crm-icon="disk" ng-click="saveTemplate(abtest.mailings.a)" class="crm-hover-button" title="{{ts('Save As')}}"></a>
       </div>
     </div>
     <div crm-ui-field="subform.msg_template_idB" crm-title="ts('Template (B)')" style="background: #bbf; width:100%; padding: 0.1em;" ng-if="fields.msg_template_idB">
@@ -57,7 +57,7 @@ processed by Angular; if false, the field will be hidden and completely ignored
           <option value=""></option>
           <option ng-repeat="frm in crmMsgTemplates.getAll() | orderBy:'msg_title'" ng-value="frm.id">{{frm.msg_title}}</option>
         </select>
-        <a ng-click="saveTemplate(abtest.mailings.b)" class="crm-hover-button" title="{{ts('Save As')}}"><span class="icon ui-icon-disk"></span></a>
+        <a crm-icon="disk" ng-click="saveTemplate(abtest.mailings.b)" class="crm-hover-button" title="{{ts('Save As')}}"></a>
       </div>
     </div>
 
diff --git a/partials/crmUi/datetime.html b/partials/crmUi/datetime.html
index e7c455efee..1533bb5bcb 100644
--- a/partials/crmUi/datetime.html
+++ b/partials/crmUi/datetime.html
@@ -11,8 +11,9 @@
   ng-class="{incomplete: !dtparts.time && (required||dtparts.date)}"
   placeholder="{{timeLabel}}"/>
 <a
+  crm-icon="close"
   class="crm-hover-button"
   ng-click="reset()"
   ng-show="dtparts.date || dtparts.time"
   title="Clear"
-  ><span class="icon ui-icon-close"></span></a>
+  ></a>
-- 
2.25.1