CRM-15705 - Hover button cleanup

diff --git a/css/civicrm.css b/css/civicrm.css
index d2a55114aac3c427f7258fb28d1c109c248b5aa5..2fa64257dbe9181725dc9a6f2937e13f8d9f468e 100644 (file)
--- 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 53c8239752a19f046c2816587566be27aab1c3fc..77161407801421d220e73ee07b13b2b9dfc0a0a7 100644 (file)
--- 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 1205c661cad221814170f35bac588eed4f16fafb..724ef6e2a6b79451391d43c7a45ab7eefad7aad4 100644 (file)
--- 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 e5c2afe6de2f9e66cf00287403ac774b3f60d7f9..57bd47f2bb6ae31894b9e772c9d0de1a8d491282 100644 (file)
--- 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 5334f6949c10f691727971d6e512686a8f45063d..c76788314873b074c3feaabfc79afa9cc22cd87b 100644 (file)
--- 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 824629527f4376f44899d0fee2ca4f8540dfcac0..9eb68c615a039d8113f4f8ec1904baacc94425ec 100644 (file)
--- 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 ef6b847c3f0c98941aa30cde2f0c2751b546303d..15ece1ea924854007382277b620ff1548df9ae90 100644 (file)
--- 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 c293c612943322c0e286206801255dc83510d462..2d6f53967e181c24333873ff43d44a57c8fd3ff4 100644 (file)
--- 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 ec07b9ecf34269f1cc03b51b179b88f105806a13..e202a4f0ad62dd01dbff07dfe88bf7c77d6451ba 100644 (file)
--- 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 c15023d969c3c536ed3c5a65fb4161faa21f8007..b10c5a922d110d599228ec3deb6cfd43c5ff3210 100644 (file)
--- 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 c633edb7a5f73237c274e48b971e76ce0e882ca8..2ef321ca2710a356e591a8210ab04616588e5281 100644 (file)
--- 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 9d14bc25c091ad2faaf6fca2fe68c2dc5a4db0c8..905a27bd674a32b86096349f9c7a19ef0ab434d7 100644 (file)
--- 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 f8b9bec20fb4d5ebf923dd24a750a9f31539f186..d6a8660711a3ea631c9790bf0bb8c9ec3d9ec267 100644 (file)
--- 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 3722ad98fed1fe0c9cb588c59ac000cd27cc4157..0553280a463ccf5b00cd142af6951fab62700c9d 100644 (file)
--- 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 9238dbeee50e683a6275560ee5fa4bbe92fd5b5e..65592a99df144b275751524f7e9ab4250387e7fa 100644 (file)
--- 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 e7c455efeecb9630e87a9dbbdae9505ca9c2db70..1533bb5bcb5d86a25ff74df73b965528c9d9422b 100644 (file)
--- 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>