Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthieu Napoli <matthieu@mnapoli.fr>2015-08-06 14:51:39 +0300
committerMatthieu Napoli <matthieu@mnapoli.fr>2015-08-06 14:51:39 +0300
commitd57e68354f70b43c08290cd0444ded5dbf305173 (patch)
treedbd8140308d2fcef77657837bc222a79cbeb9c76 /plugins/ScheduledReports
parent6a7c6f2286a94875d5daa0bbbcaf5478d6dca8d4 (diff)
Use new icons and simplify "manager" tables
For example simplify user manager, site manager, reports manager, etc.
Diffstat (limited to 'plugins/ScheduledReports')
-rw-r--r--plugins/ScheduledReports/javascripts/pdf.js6
-rw-r--r--plugins/ScheduledReports/templates/_listReports.twig30
-rw-r--r--plugins/ScheduledReports/templates/index.twig8
3 files changed, 16 insertions, 28 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..c97d408618 100644
--- a/plugins/ScheduledReports/templates/_listReports.twig
+++ b/plugins/ScheduledReports/templates/_listReports.twig
@@ -72,34 +72,30 @@
'format': (report.format in ['html', 'csv']) ? report.format : false
}) }}"
rel="noreferrer" target="_blank" name="linkDownloadReport" id="{{ report.idreport }}" class="link_but withIcon">
- <img src='{{ reportFormatsByReportType[report.type][report.format] }}' border="0"/>
+ <span class="icon-download"></span>
{{ '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">{{ '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;
}