Rename template file names

6 files changed, 6 insertions, 5 deletions

diff --git a/plugins/Annotations/Controller.php b/plugins/Annotations/Controller.php
index 295f2fb949..3b88fadb9d 100755
--- a/plugins/Annotations/Controller.php
+++ b/plugins/Annotations/Controller.php
@@ -55,7 +55,7 @@ class Piwik_Annotations_Controller extends Piwik_Controller
         }
 
         // create & render the view
-        $view = new Piwik_View('@Annotations/annotationManager');
+        $view = new Piwik_View('@Annotations/getAnnotationManager');
 
         $allAnnotations = Piwik_API_Request::processRequest(
             'Annotations.getAll', array('date' => $date, 'period' => $period, 'lastN' => $lastN));
@@ -103,7 +103,7 @@ class Piwik_Annotations_Controller extends Piwik_Controller
         if ($_SERVER["REQUEST_METHOD"] == "POST") {
             $this->checkTokenInUrl();
 
-            $view = new Piwik_View('@Annotations//annotation');
+            $view = new Piwik_View('@Annotations/saveAnnotation');
 
             // NOTE: permissions checked in API method
             // save the annotation
@@ -208,7 +208,7 @@ class Piwik_Annotations_Controller extends Piwik_Controller
             "Annotations.getAnnotationCountForDates", array('getAnnotationText' => 1));
 
         // create & render the view
-        $view = new Piwik_View('@Annotations/evolutionAnnotations');
+        $view = new Piwik_View('@Annotations/getEvolutionIcons');
         $view->annotationCounts = reset($annotationCounts); // only one idSite allowed for this action
 
         echo $view->render();
diff --git a/plugins/Annotations/templates/annotation.twig b/plugins/Annotations/templates/_annotation.twig
index e3e879c403..e3e879c403 100755
--- a/plugins/Annotations/templates/annotation.twig
+++ b/plugins/Annotations/templates/_annotation.twig
diff --git a/plugins/Annotations/templates/annotations.twig b/plugins/Annotations/templates/_annotationList.twig
index 72f5c93ca5..f3820ab833 100755
--- a/plugins/Annotations/templates/annotations.twig
+++ b/plugins/Annotations/templates/_annotationList.twig
@@ -6,7 +6,7 @@
 
     <table>
         {% for annotation in annotations %}
-            {% include "@Annotations/annotation.twig" %}
+            {% include "@Annotations/_annotation.twig" %}
         {% endfor %}
         <tr class="new-annotation-row" style="display:none" data-date="{{ startDate }}">
             <td class="annotation-meta">
diff --git a/plugins/Annotations/templates/annotationManager.twig b/plugins/Annotations/templates/getAnnotationManager.twig
index 8cd93e2b10..cea1d7e2ac 100755
--- a/plugins/Annotations/templates/annotationManager.twig
+++ b/plugins/Annotations/templates/getAnnotationManager.twig
@@ -10,7 +10,7 @@
     <div class="annotation-list-range">{{ startDatePretty }}{% if startDate != endDate %} &mdash; {{ endDatePretty }}{% endif %}</div>
 
     <div class="annotation-list">
-        {% include "@Annotations/annotations.twig" %}
+        {% include "@Annotations/_annotationList.twig" %}
 
         <span class="loadingPiwik" style="display:none"><img src="plugins/Zeitgeist/images/loading-blue.gif"/>{{ 'General_Loading_js'|translate }}</span>
 
diff --git a/plugins/Annotations/templates/evolutionAnnotations.twig b/plugins/Annotations/templates/getEvolutionIcons.twig
index f2475c2416..f2475c2416 100755
--- a/plugins/Annotations/templates/evolutionAnnotations.twig
+++ b/plugins/Annotations/templates/getEvolutionIcons.twig
diff --git a/plugins/Annotations/templates/saveAnnotation.twig b/plugins/Annotations/templates/saveAnnotation.twig
new file mode 100644
index 0000000000..e5cd120205
--- /dev/null
+++ b/plugins/Annotations/templates/saveAnnotation.twig
@@ -0,0 +1 @@
+{% include "@Annotations/_annotation.twig" %}
\ No newline at end of file