From 5e39f1cebcf7453047cb7b7712342f0dd4ae7be2 Mon Sep 17 00:00:00 2001
From: Thomas ZILLIOX <thomas@zilliox.me>
Date: Thu, 30 May 2013 21:42:25 +0200
Subject: Rename template file names

---
 plugins/Annotations/templates/_annotation.twig     | 45 ++++++++++++++++++++++
 plugins/Annotations/templates/_annotationList.twig | 29 ++++++++++++++
 plugins/Annotations/templates/annotation.twig      | 45 ----------------------
 .../Annotations/templates/annotationManager.twig   | 27 -------------
 plugins/Annotations/templates/annotations.twig     | 29 --------------
 .../templates/evolutionAnnotations.twig            | 12 ------
 .../templates/getAnnotationManager.twig            | 27 +++++++++++++
 .../Annotations/templates/getEvolutionIcons.twig   | 12 ++++++
 plugins/Annotations/templates/saveAnnotation.twig  |  1 +
 9 files changed, 114 insertions(+), 113 deletions(-)
 create mode 100755 plugins/Annotations/templates/_annotation.twig
 create mode 100755 plugins/Annotations/templates/_annotationList.twig
 delete mode 100755 plugins/Annotations/templates/annotation.twig
 delete mode 100755 plugins/Annotations/templates/annotationManager.twig
 delete mode 100755 plugins/Annotations/templates/annotations.twig
 delete mode 100755 plugins/Annotations/templates/evolutionAnnotations.twig
 create mode 100755 plugins/Annotations/templates/getAnnotationManager.twig
 create mode 100755 plugins/Annotations/templates/getEvolutionIcons.twig
 create mode 100644 plugins/Annotations/templates/saveAnnotation.twig

(limited to 'plugins/Annotations/templates')

diff --git a/plugins/Annotations/templates/_annotation.twig b/plugins/Annotations/templates/_annotation.twig
new file mode 100755
index 0000000000..e3e879c403
--- /dev/null
+++ b/plugins/Annotations/templates/_annotation.twig
@@ -0,0 +1,45 @@
+<tr class="annotation" data-id="{{ annotation.idNote }}" data-date="{{ annotation.date }}">
+    <td class="annotation-meta">
+        <div class="annotation-star{% if annotation.canEditOrDelete %} annotation-star-changeable{% endif %}" data-starred="{{ annotation.starred }}"
+            {% if annotation.canEditOrDelete %}title="{{ 'Annotations_ClickToStarOrUnstar'|translate }}"{% endif %}>
+            {% if annotation.starred %}
+                <img src="plugins/Zeitgeist/images/star.png"/>
+            {% else %}
+                <img src="plugins/Zeitgeist/images/star_empty.png"/>
+            {% endif %}
+        </div>
+        <div class="annotation-period {% if annotation.canEditOrDelete %}annotation-enter-edit-mode{% endif %}">({{ annotation.date }})</div>
+        {% if annotation.canEditOrDelete %}
+            <div class="annotation-period-edit" style="display:none">
+                <a href="#">{{ annotation.date }}</a>
+                <div class="datepicker" style="display:none"/>
+            </div>
+        {% endif %}
+    </td>
+    <td class="annotation-value">
+        <div class="annotation-view-mode">
+            <span {% if annotation.canEditOrDelete %}title="{{ 'Annotations_ClickToEdit'|translate }}"
+                  class="annotation-enter-edit-mode"{% endif %}>{{ annotation.note }}</span>
+            {% if annotation.canEditOrDelete %}
+                <a href="#" class="edit-annotation annotation-enter-edit-mode" title="{{ 'Annotations_ClickToEdit'|translate }}">{{ 'General_Edit'|translate }}...</a>
+            {% endif %}
+        </div>
+        {% if annotation.canEditOrDelete %}
+            <div class="annotation-edit-mode" style="display:none">
+                <input class="annotation-edit" type="text" value="{{ annotation.note }}"/>
+                <br/>
+                <input class="annotation-save submit" type="button" value="{{ 'General_Save'|translate }}"/>
+                <input class="annotation-cancel submit" type="button" value="{{ 'General_Cancel'|translate }}"/>
+            </div>
+        {% endif %}
+    </td>
+    {% if annotation.user is defined and userLogin != 'anonymous' %}
+        <td class="annotation-user-cell">
+            <span class="annotation-user">{{ annotation.user }}</span><br/>
+            {% if annotation.canEditOrDelete %}
+                <a href="#" class="delete-annotation" style="display:none" title="{{ 'Annotations_ClickToDelete'|translate }}">{{ 'General_Delete'|translate }}</a>
+            {% endif %}
+        </td>
+    {% endif %}
+</tr>
+
diff --git a/plugins/Annotations/templates/_annotationList.twig b/plugins/Annotations/templates/_annotationList.twig
new file mode 100755
index 0000000000..f3820ab833
--- /dev/null
+++ b/plugins/Annotations/templates/_annotationList.twig
@@ -0,0 +1,29 @@
+<div class="annotations">
+
+    {% if annotations is empty %}
+        <div class="empty-annotation-list">{{ 'Annotations_NoAnnotations'|translate }}</div>
+    {% endif %}
+
+    <table>
+        {% for annotation in annotations %}
+            {% include "@Annotations/_annotation.twig" %}
+        {% endfor %}
+        <tr class="new-annotation-row" style="display:none" data-date="{{ startDate }}">
+            <td class="annotation-meta">
+                <div class="annotation-star">&nbsp;</div>
+                <div class="annotation-period-edit">
+                    <a href="#">{{ startDate }}</a>
+
+                    <div class="datepicker" style="display:none"/>
+                </div>
+            </td>
+            <td class="annotation-value">
+                <input type="text" value="" class="new-annotation-edit" placeholder="{{ 'Annotations_EnterAnnotationText'|translate }}"/><br/>
+                <input type="button" class="submit new-annotation-save" value="{{ 'General_Save'|translate }}"/>
+                <input type="button" class="submit new-annotation-cancel" value="{{ 'General_Cancel'|translate }}"/>
+            </td>
+            <td class="annotation-user-cell"><span class="annotation-user">{{ userLogin }}</span></td>
+        </tr>
+    </table>
+
+</div>
diff --git a/plugins/Annotations/templates/annotation.twig b/plugins/Annotations/templates/annotation.twig
deleted file mode 100755
index e3e879c403..0000000000
--- a/plugins/Annotations/templates/annotation.twig
+++ /dev/null
@@ -1,45 +0,0 @@
-<tr class="annotation" data-id="{{ annotation.idNote }}" data-date="{{ annotation.date }}">
-    <td class="annotation-meta">
-        <div class="annotation-star{% if annotation.canEditOrDelete %} annotation-star-changeable{% endif %}" data-starred="{{ annotation.starred }}"
-            {% if annotation.canEditOrDelete %}title="{{ 'Annotations_ClickToStarOrUnstar'|translate }}"{% endif %}>
-            {% if annotation.starred %}
-                <img src="plugins/Zeitgeist/images/star.png"/>
-            {% else %}
-                <img src="plugins/Zeitgeist/images/star_empty.png"/>
-            {% endif %}
-        </div>
-        <div class="annotation-period {% if annotation.canEditOrDelete %}annotation-enter-edit-mode{% endif %}">({{ annotation.date }})</div>
-        {% if annotation.canEditOrDelete %}
-            <div class="annotation-period-edit" style="display:none">
-                <a href="#">{{ annotation.date }}</a>
-                <div class="datepicker" style="display:none"/>
-            </div>
-        {% endif %}
-    </td>
-    <td class="annotation-value">
-        <div class="annotation-view-mode">
-            <span {% if annotation.canEditOrDelete %}title="{{ 'Annotations_ClickToEdit'|translate }}"
-                  class="annotation-enter-edit-mode"{% endif %}>{{ annotation.note }}</span>
-            {% if annotation.canEditOrDelete %}
-                <a href="#" class="edit-annotation annotation-enter-edit-mode" title="{{ 'Annotations_ClickToEdit'|translate }}">{{ 'General_Edit'|translate }}...</a>
-            {% endif %}
-        </div>
-        {% if annotation.canEditOrDelete %}
-            <div class="annotation-edit-mode" style="display:none">
-                <input class="annotation-edit" type="text" value="{{ annotation.note }}"/>
-                <br/>
-                <input class="annotation-save submit" type="button" value="{{ 'General_Save'|translate }}"/>
-                <input class="annotation-cancel submit" type="button" value="{{ 'General_Cancel'|translate }}"/>
-            </div>
-        {% endif %}
-    </td>
-    {% if annotation.user is defined and userLogin != 'anonymous' %}
-        <td class="annotation-user-cell">
-            <span class="annotation-user">{{ annotation.user }}</span><br/>
-            {% if annotation.canEditOrDelete %}
-                <a href="#" class="delete-annotation" style="display:none" title="{{ 'Annotations_ClickToDelete'|translate }}">{{ 'General_Delete'|translate }}</a>
-            {% endif %}
-        </td>
-    {% endif %}
-</tr>
-
diff --git a/plugins/Annotations/templates/annotationManager.twig b/plugins/Annotations/templates/annotationManager.twig
deleted file mode 100755
index 8cd93e2b10..0000000000
--- a/plugins/Annotations/templates/annotationManager.twig
+++ /dev/null
@@ -1,27 +0,0 @@
-<div class="annotation-manager"
-     {% if startDate != endDate %}data-date="{{ startDate }},{{ endDate }}" data-period="range"
-     {% else %}data-date="{{ startDate }}" data-period="{{ period }}"
-     {% endif %}>
-
-    <div class="annotations-header">
-        <span>{{ 'Annotations_Annotations'|translate }}</span>
-    </div>
-
-    <div class="annotation-list-range">{{ startDatePretty }}{% if startDate != endDate %} &mdash; {{ endDatePretty }}{% endif %}</div>
-
-    <div class="annotation-list">
-        {% include "@Annotations/annotations.twig" %}
-
-        <span class="loadingPiwik" style="display:none"><img src="plugins/Zeitgeist/images/loading-blue.gif"/>{{ 'General_Loading_js'|translate }}</span>
-
-    </div>
-
-    <div class="annotation-controls">
-        {% if canUserAddNotes %}
-            <a href="#" class="add-annotation" title="{{ 'Annotations_CreateNewAnnotation'|translate }}">{{ 'Annotations_CreateNewAnnotation'|translate }}</a>
-        {% elseif userLogin == 'anonymous' %}
-            <a href="index.php?module=Login">{{ 'Annotations_LoginToAnnotate'|translate }}</a>
-        {% endif %}
-    </div>
-
-</div>
diff --git a/plugins/Annotations/templates/annotations.twig b/plugins/Annotations/templates/annotations.twig
deleted file mode 100755
index 72f5c93ca5..0000000000
--- a/plugins/Annotations/templates/annotations.twig
+++ /dev/null
@@ -1,29 +0,0 @@
-<div class="annotations">
-
-    {% if annotations is empty %}
-        <div class="empty-annotation-list">{{ 'Annotations_NoAnnotations'|translate }}</div>
-    {% endif %}
-
-    <table>
-        {% for annotation in annotations %}
-            {% include "@Annotations/annotation.twig" %}
-        {% endfor %}
-        <tr class="new-annotation-row" style="display:none" data-date="{{ startDate }}">
-            <td class="annotation-meta">
-                <div class="annotation-star">&nbsp;</div>
-                <div class="annotation-period-edit">
-                    <a href="#">{{ startDate }}</a>
-
-                    <div class="datepicker" style="display:none"/>
-                </div>
-            </td>
-            <td class="annotation-value">
-                <input type="text" value="" class="new-annotation-edit" placeholder="{{ 'Annotations_EnterAnnotationText'|translate }}"/><br/>
-                <input type="button" class="submit new-annotation-save" value="{{ 'General_Save'|translate }}"/>
-                <input type="button" class="submit new-annotation-cancel" value="{{ 'General_Cancel'|translate }}"/>
-            </td>
-            <td class="annotation-user-cell"><span class="annotation-user">{{ userLogin }}</span></td>
-        </tr>
-    </table>
-
-</div>
diff --git a/plugins/Annotations/templates/evolutionAnnotations.twig b/plugins/Annotations/templates/evolutionAnnotations.twig
deleted file mode 100755
index f2475c2416..0000000000
--- a/plugins/Annotations/templates/evolutionAnnotations.twig
+++ /dev/null
@@ -1,12 +0,0 @@
-<div class="evolution-annotations">
-    {% for dateCountPair in annotationCounts %}
-        {% set date=dateCountPair[0] %}
-        {% 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/images/{% if counts.starred > 0 %}yellow_marker.png{% else %}grey_marker.png{% endif %}" width="16" height="16"/>
-	</span>
-    {% endfor %}
-</div>
diff --git a/plugins/Annotations/templates/getAnnotationManager.twig b/plugins/Annotations/templates/getAnnotationManager.twig
new file mode 100755
index 0000000000..cea1d7e2ac
--- /dev/null
+++ b/plugins/Annotations/templates/getAnnotationManager.twig
@@ -0,0 +1,27 @@
+<div class="annotation-manager"
+     {% if startDate != endDate %}data-date="{{ startDate }},{{ endDate }}" data-period="range"
+     {% else %}data-date="{{ startDate }}" data-period="{{ period }}"
+     {% endif %}>
+
+    <div class="annotations-header">
+        <span>{{ 'Annotations_Annotations'|translate }}</span>
+    </div>
+
+    <div class="annotation-list-range">{{ startDatePretty }}{% if startDate != endDate %} &mdash; {{ endDatePretty }}{% endif %}</div>
+
+    <div class="annotation-list">
+        {% include "@Annotations/_annotationList.twig" %}
+
+        <span class="loadingPiwik" style="display:none"><img src="plugins/Zeitgeist/images/loading-blue.gif"/>{{ 'General_Loading_js'|translate }}</span>
+
+    </div>
+
+    <div class="annotation-controls">
+        {% if canUserAddNotes %}
+            <a href="#" class="add-annotation" title="{{ 'Annotations_CreateNewAnnotation'|translate }}">{{ 'Annotations_CreateNewAnnotation'|translate }}</a>
+        {% elseif userLogin == 'anonymous' %}
+            <a href="index.php?module=Login">{{ 'Annotations_LoginToAnnotate'|translate }}</a>
+        {% endif %}
+    </div>
+
+</div>
diff --git a/plugins/Annotations/templates/getEvolutionIcons.twig b/plugins/Annotations/templates/getEvolutionIcons.twig
new file mode 100755
index 0000000000..f2475c2416
--- /dev/null
+++ b/plugins/Annotations/templates/getEvolutionIcons.twig
@@ -0,0 +1,12 @@
+<div class="evolution-annotations">
+    {% for dateCountPair in annotationCounts %}
+        {% set date=dateCountPair[0] %}
+        {% 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/images/{% if counts.starred > 0 %}yellow_marker.png{% else %}grey_marker.png{% endif %}" width="16" height="16"/>
+	</span>
+    {% endfor %}
+</div>
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
-- 
cgit v1.2.3