From 9d1e1d73344b89b2222c965274b3cdc92af8d192 Mon Sep 17 00:00:00 2001
From: carmenliao <30969508+carmenliao@users.noreply.github.com>
Date: Fri, 19 Jan 2018 11:00:23 +1300
Subject: Improvements to Annotations listing design (#12476)
* Improvements to Annotations listing design
:# Please enter the commit message for your changes. Lines starting
* fixed create a new annotation
Please enter the commit message for your changes. Lines starting
* fixed the delete feature so it's not a button
---
plugins/Annotations/templates/_annotation.twig | 45 ++++++++++++++--------
plugins/Annotations/templates/_annotationList.twig | 8 +++-
.../templates/getAnnotationManager.twig | 9 ++++-
3 files changed, 43 insertions(+), 19 deletions(-)
(limited to 'plugins/Annotations/templates')
diff --git a/plugins/Annotations/templates/_annotation.twig b/plugins/Annotations/templates/_annotation.twig
index ab0a8a2ca6..c90e99a428 100755
--- a/plugins/Annotations/templates/_annotation.twig
+++ b/plugins/Annotations/templates/_annotation.twig
@@ -8,23 +8,32 @@
{% endif %}
-
({{ annotation.date }})
+
+ {{ annotation.date }}
{% if annotation.canEditOrDelete %}
{% endif %}
+
+ {% if annotation.user is defined and userLogin != 'anonymous' %}
+
+ {{ annotation.user }}
+
+ |
+ {% endif %}
+
+
- {% if annotation.canEditOrDelete %}
+
+
+ {% if annotation.canEditOrDelete %}
|
- {% if annotation.user is defined and userLogin != 'anonymous' %}
-
- {{ annotation.user }}
- {% if annotation.canEditOrDelete %}
- {{ 'General_Delete'|translate }}
- {% endif %}
- |
- {% endif %}
-
+
+{% if annotation.canEditOrDelete %}
+
+
+
+
+
+
+
+
+{% endif %}
+ |
+
+
+
diff --git a/plugins/Annotations/templates/_annotationList.twig b/plugins/Annotations/templates/_annotationList.twig
index c5a0db951c..e7f8a503e3 100755
--- a/plugins/Annotations/templates/_annotationList.twig
+++ b/plugins/Annotations/templates/_annotationList.twig
@@ -5,18 +5,23 @@
{% endif %}
diff --git a/plugins/Annotations/templates/getAnnotationManager.twig b/plugins/Annotations/templates/getAnnotationManager.twig
index e700e2cc5d..3a3899334d 100755
--- a/plugins/Annotations/templates/getAnnotationManager.twig
+++ b/plugins/Annotations/templates/getAnnotationManager.twig
@@ -4,7 +4,7 @@
{% endif %}>
{{ startDatePretty }}{% if startDate != endDate %} — {{ endDatePretty }}{% endif %}
@@ -17,11 +17,16 @@
--
cgit v1.2.3