diff options
Diffstat (limited to 'plugins/Annotations/templates')
| -rwxr-xr-x | plugins/Annotations/templates/annotations.js | 9 | ||||
| -rwxr-xr-x | plugins/Annotations/templates/evolutionAnnotations.twig | 9 |
2 files changed, 8 insertions, 10 deletions
diff --git a/plugins/Annotations/templates/annotations.js b/plugins/Annotations/templates/annotations.js index 85097ad1d6..e958f788b6 100755 --- a/plugins/Annotations/templates/annotations.js +++ b/plugins/Annotations/templates/annotations.js @@ -432,7 +432,7 @@ }); }; -// used in below function + // used in below function var loadingAnnotationManager = false; /** @@ -443,8 +443,9 @@ * @param {int} idSite The ID of the site to show the annotations of. * @param {string} date The start date of the period. * @param {string} period The period type. - * @param {int} Whether to include the last N periods in the date range or not. Can * be undefined. + * @param lastN + * @param callback */ var showAnnotationViewer = function (domElem, idSite, date, period, lastN, callback) { var addToAnnotationCount = function (date, amt, starAmt) { @@ -461,9 +462,9 @@ // modify the starred count & make sure the correct image is used var newStarCount = starredCount + starAmt; if (newStarCount > 0) { - var newImg = 'themes/default/images/yellow_marker.png'; + var newImg = 'plugins/Zeitgeist/theme/images/yellow_marker.png'; } else { - var newImg = 'themes/default/images/grey_marker.png'; + var newImg = 'plugins/Zeitgeist/theme/images/grey_marker.png'; } $(this).attr('data-starred', newStarCount).find('img').attr('src', newImg); diff --git a/plugins/Annotations/templates/evolutionAnnotations.twig b/plugins/Annotations/templates/evolutionAnnotations.twig index c168ac9a31..b860d348d8 100755 --- a/plugins/Annotations/templates/evolutionAnnotations.twig +++ b/plugins/Annotations/templates/evolutionAnnotations.twig @@ -4,12 +4,9 @@ {% set counts=dateCountPair[1] %} <span data-date="{{ date }}" data-count="{{ counts.count }}" data-starred="{{ counts.starred }}" {% if counts.count == 0 %}title="{{ 'Annotations_AddAnnotationsFor_js'|translate(date) }}" - {% elseif counts.count == 1 %}title="{{ 'Annotations_AnnotationOnDate'|translate(date,counts.note) }} - -{{ 'Annotations_ClickToEditOrAdd'|translate }}" - {% else %}}title="{{ 'Annotations_ViewAndAddAnnotations_js'|translate(date) }}" - {% endif %}> - <img src="plugins/Zeitgeist/theme/images/{% if counts.starred > 0 %}yellow_marker.png{% else %}}grey_marker.png{% endif %}}" width="16" height="16"/> + {% elseif counts.count == 1 %}title="{{ 'Annotations_AnnotationOnDate'|translate(date,counts.note) }}{{ 'Annotations_ClickToEditOrAdd'|translate }}" + {% else %}}title="{{ 'Annotations_ViewAndAddAnnotations_js'|translate(date) }}"{% endif %}> + <img src="plugins/Zeitgeist/theme/images/{% if counts.starred > 0 %}yellow_marker.png{% else %}grey_marker.png{% endif %}" width="16" height="16"/> </span> {% endfor %} </div> |