Merge branch 'master' into 2.x-twig

Conflicts:
	core/ReportRenderer/Html.php
	plugins/Annotations/templates/annotations.js
	plugins/CoreHome/templates/header.tpl
	plugins/CoreHome/templates/index_content.tpl
	plugins/CoreHome/templates/period_select.tpl
	plugins/Goals/templates/list_goal_edit.tpl
	plugins/MultiSites/templates/index.tpl
	plugins/PDFReports/templates/report_parameters.tpl

1 files changed, 6 insertions, 7 deletions

diff --git a/plugins/Annotations/templates/annotations.js b/plugins/Annotations/templates/annotations.js
index e958f788b6..941ae4486a 100755
--- a/plugins/Annotations/templates/annotations.js
+++ b/plugins/Annotations/templates/annotations.js
@@ -194,7 +194,7 @@
      * attributes.
      *
      * @param {Element} manager The annotation manager.
-     * @param {string} tml The HTML of the new annotation manager.
+     * @param {string} html The HTML of the new annotation manager.
      */
     var replaceAnnotationManager = function (manager, html) {
         var newManager = $(html);
@@ -208,7 +208,7 @@
      * Returns true if an annotation element is starred, false if otherwise.
      *
      * @param {Element} annotation The annotation element.
-     * @return {bool}
+     * @return {boolean}
      */
     var isAnnotationStarred = function (annotation) {
         return +$('.annotation-star', annotation).attr('data-starred') == 1 ? true : false;
@@ -432,7 +432,7 @@
         });
     };
 
-    // used in below function
+// used in below function
     var loadingAnnotationManager = false;
 
     /**
@@ -443,9 +443,8 @@
      * @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} lastN 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) {
@@ -462,9 +461,9 @@
                     // modify the starred count & make sure the correct image is used
                     var newStarCount = starredCount + starAmt;
                     if (newStarCount > 0) {
-                        var newImg = 'plugins/Zeitgeist/theme/images/yellow_marker.png';
+                        var newImg = 'themes/default/images/yellow_marker.png';
                     } else {
-                        var newImg = 'plugins/Zeitgeist/theme/images/grey_marker.png';
+                        var newImg = 'themes/default/images/grey_marker.png';
                     }
                     $(this).attr('data-starred', newStarCount).find('img').attr('src', newImg);