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:
authormattab <matthieu.aubry@gmail.com>2014-01-23 01:09:22 +0400
committermattab <matthieu.aubry@gmail.com>2014-01-23 01:09:22 +0400
commit23bd9b791b64cdc4abf8ce55ad4ad0fa2a342245 (patch)
treea75b47f81ff1fa13c99f1916c05ac17b3a2fef7b /plugins
parent7f6509cf7fe1a924358815e753216ff736f73c49 (diff)
Rename annotations icons + adding two missing icons refs #4457
Diffstat (limited to 'plugins')
-rwxr-xr-xplugins/Annotations/javascripts/annotations.js4
-rwxr-xr-xplugins/Annotations/templates/getEvolutionIcons.twig2
-rw-r--r--plugins/CoreHome/templates/_dataTableFooter.twig2
-rw-r--r--plugins/Morpheus/images/annotations.png (renamed from plugins/Morpheus/images/grey_marker.png)bin1069 -> 1069 bytes
-rw-r--r--[-rwxr-xr-x]plugins/Zeitgeist/images/annotations.png (renamed from plugins/Zeitgeist/images/grey_marker.png)bin1627 -> 1627 bytes
-rw-r--r--[-rwxr-xr-x]plugins/Zeitgeist/images/annotations_starred.png (renamed from plugins/Zeitgeist/images/yellow_marker.png)bin1618 -> 1618 bytes
6 files changed, 4 insertions, 4 deletions
diff --git a/plugins/Annotations/javascripts/annotations.js b/plugins/Annotations/javascripts/annotations.js
index 628d9f2ea1..85b70f070c 100755
--- a/plugins/Annotations/javascripts/annotations.js
+++ b/plugins/Annotations/javascripts/annotations.js
@@ -459,9 +459,9 @@
// modify the starred count & make sure the correct image is used
var newStarCount = starredCount + starAmt;
if (newStarCount > 0) {
- var newImg = 'plugins/Zeitgeist/images/yellow_marker.png';
+ var newImg = 'plugins/Zeitgeist/images/annotations_starred.png';
} else {
- var newImg = 'plugins/Zeitgeist/images/grey_marker.png';
+ var newImg = 'plugins/Zeitgeist/images/annotations.png';
}
$(this).attr('data-starred', newStarCount).find('img').attr('src', newImg);
diff --git a/plugins/Annotations/templates/getEvolutionIcons.twig b/plugins/Annotations/templates/getEvolutionIcons.twig
index f54e9b4b37..b9955599a3 100755
--- a/plugins/Annotations/templates/getEvolutionIcons.twig
+++ b/plugins/Annotations/templates/getEvolutionIcons.twig
@@ -8,7 +8,7 @@
counts.note)|raw }}
{{ 'Annotations_ClickToEditOrAdd'|translate }}"
{% else %}}title="{{ 'Annotations_ViewAndAddAnnotations'|translate(date) }}"{% endif %}>
- <img src="plugins/Zeitgeist/images/{% if counts.starred > 0 %}yellow_marker.png{% else %}grey_marker.png{% endif %}" width="16" height="16"/>
+ <img src="plugins/Zeitgeist/images/{% if counts.starred > 0 %}annotations_starred.png{% else %}annotations.png{% endif %}" width="16" height="16"/>
</span>
{% endfor %}
</div>
diff --git a/plugins/CoreHome/templates/_dataTableFooter.twig b/plugins/CoreHome/templates/_dataTableFooter.twig
index 6216c0b804..0304563fdc 100644
--- a/plugins/CoreHome/templates/_dataTableFooter.twig
+++ b/plugins/CoreHome/templates/_dataTableFooter.twig
@@ -101,7 +101,7 @@
{% if isPluginLoaded('Annotations') and not properties.hide_annotations_view %}
<div class="annotationView" title="{{ 'Annotations_IconDesc'|translate }}">
<a class="tableIcon">
- <img width="16" height="16" src="plugins/Zeitgeist/images/grey_marker.png"/>
+ <img width="16" height="16" src="plugins/Zeitgeist/images/annotations.png"/>
</a>
<span>{{ 'Annotations_Annotations'|translate }}</span>
</div>
diff --git a/plugins/Morpheus/images/grey_marker.png b/plugins/Morpheus/images/annotations.png
index 7b6909c10b..7b6909c10b 100644
--- a/plugins/Morpheus/images/grey_marker.png
+++ b/plugins/Morpheus/images/annotations.png
Binary files differ
diff --git a/plugins/Zeitgeist/images/grey_marker.png b/plugins/Zeitgeist/images/annotations.png
index b0e3e3e6ae..b0e3e3e6ae 100755..100644
--- a/plugins/Zeitgeist/images/grey_marker.png
+++ b/plugins/Zeitgeist/images/annotations.png
Binary files differ
diff --git a/plugins/Zeitgeist/images/yellow_marker.png b/plugins/Zeitgeist/images/annotations_starred.png
index a2506a2a7d..a2506a2a7d 100755..100644
--- a/plugins/Zeitgeist/images/yellow_marker.png
+++ b/plugins/Zeitgeist/images/annotations_starred.png
Binary files differ