Merge pull request #8488 from piwik/icons

Fixes #7618, add new icons to Piwik & use where appropriate. Also includes slight re-designs to entity management tables & a new CSS API using the icons easily.

3 files changed, 18 insertions, 27 deletions

diff --git a/plugins/ScheduledReports/javascripts/pdf.js b/plugins/ScheduledReports/javascripts/pdf.js
index 126f956adf..2b86809517 100644
--- a/plugins/ScheduledReports/javascripts/pdf.js
+++ b/plugins/ScheduledReports/javascripts/pdf.js
@@ -155,7 +155,7 @@ function initManagePdf() {
     });
 
     // Delete Report
-    $('a[name=linkDeleteReport]').click(function () {
+    $('.delete-report').click(function () {
         var idReport = $(this).attr('id');
 
         function onDelete() {
@@ -173,7 +173,7 @@ function initManagePdf() {
     });
 
     // Edit Report click
-    $('a[name=linkEditReport]').click(function () {
+    $('.edit-report').click(function () {
         var idReport = $(this).attr('id');
         formSetEditReport(idReport);
         $('.entityAddContainer').show();
@@ -188,7 +188,7 @@ function initManagePdf() {
     });
 
     // Add a Report click
-    $('#linkAddReport').click(function () {
+    $('#add-report').click(function () {
         $('.entityAddContainer').show();
         $('#entityEditContainer').hide();
         formSetEditReport(/*idReport = */0);
diff --git a/plugins/ScheduledReports/templates/_listReports.twig b/plugins/ScheduledReports/templates/_listReports.twig
index 72b6698fcb..12dc5dd785 100644
--- a/plugins/ScheduledReports/templates/_listReports.twig
+++ b/plugins/ScheduledReports/templates/_listReports.twig
@@ -76,30 +76,29 @@
                     {{ 'General_Download'|translate }}
                 </a>
             </td>
-            <td>
-                {# edit link #}
-                <a href='#' name="linkEditReport" id="{{ report.idreport }}" class="link_but withIcon">
-                    <img src='plugins/Morpheus/images/ico_edit.png' border="0"/>
-                    {{ 'General_Edit'|translate }}
-                </a>
+            <td class="text-center">
+                <button id="{{ report.idreport }}" class="edit-report btn btn-flat btn-lg" title="{{ 'General_Edit'|translate }}">
+                    <span class="icon-edit"></span>
+                </button>
             </td>
-            <td>
-                {# delete link #}
-                <a href='#' name="linkDeleteReport" id="{{ report.idreport }}" class="link_but withIcon">
-                    <img src='plugins/Morpheus/images/ico_delete.png' border="0"/>
-                    {{ 'General_Delete'|translate }}
-                </a>
+            <td class="text-center">
+                <button id="{{ report.idreport }}" class="delete-report btn btn-flat btn-lg" title="{{ 'General_Delete'|translate }}">
+                    <span class="icon-delete"></span>
+                </button>
             </td>
         </tr>
     {% endfor %}
     {% endif %}
 
     </table>
+
     {% if userLogin != 'anonymous' %}
-        <br/>
-        <div id='linkAddReport' class="addrow"><img src='plugins/Morpheus/images/add.png'/> {{ 'ScheduledReports_CreateAndScheduleReport'|translate }}</div>
-        <br/>
-        <br/>
+        <p>
+            <button id="add-report" class="btn btn-lg btn-flat">
+                <span class="icon-add"></span>
+                {{ 'ScheduledReports_CreateAndScheduleReport'|translate }}
+            </button>
+        </p>
     {% endif %}
 
 </div>
diff --git a/plugins/ScheduledReports/templates/index.twig b/plugins/ScheduledReports/templates/index.twig
index 89065c5d90..09539ef8cd 100644
--- a/plugins/ScheduledReports/templates/index.twig
+++ b/plugins/ScheduledReports/templates/index.twig
@@ -54,14 +54,6 @@
         position:relative;
     }
 
-    #linkAddReport {
-        margin-top: 0px;
-    }
-
-    #linkAddReport:hover {
-        text-decoration: underline;
-    }
-
     .emailReports .top_controls {
         padding-bottom: 18px;
     }