From e66bd67d5cc931575e6213fe7bbfa2199dfd0212 Mon Sep 17 00:00:00 2001
From: Jeroen Thora <jeroenthora@gmail.com>
Date: Wed, 22 May 2019 14:06:53 +0200
Subject: [PATCH] [AllBundles] Improve the kunstmaan toolbar items

---
 .../Resources/translations/messages.en.yml    |  9 ++--
 .../views/Toolbar/Icon/exception.svg          |  1 +
 .../views/Toolbar/bundles_version.html.twig   | 45 +++++++++++++------
 .../views/Toolbar/exception.html.twig         | 21 ++++++---
 .../views/Toolbar/toolbar_item.html.twig      |  2 +-
 .../Resources/translations/messages.en.yml    |  5 +++
 .../views/Toolbar/translations.html.twig      | 11 ++---
 7 files changed, 66 insertions(+), 28 deletions(-)
 create mode 100644 src/Kunstmaan/AdminBundle/Resources/views/Toolbar/Icon/exception.svg

diff --git a/src/Kunstmaan/AdminBundle/Resources/translations/messages.en.yml b/src/Kunstmaan/AdminBundle/Resources/translations/messages.en.yml
index b09688ec54..44684f6044 100644
--- a/src/Kunstmaan/AdminBundle/Resources/translations/messages.en.yml
+++ b/src/Kunstmaan/AdminBundle/Resources/translations/messages.en.yml
@@ -143,8 +143,11 @@ toolbar:
         unknown: Unknown
         uptodate: Up-to-date
         toupdate: Outdated
-        version: Bundle version
-        status: Bundle status
+        version: Cms version
+        status: Status
+        error: Error while fetching version information.
     exception:
+        info:
+            exceptions: Exceptions
+            events: Events
         title: Exceptions
-        message: "<strong>%X%</strong> exception triggered by <strong>%Y%</strong> events"
diff --git a/src/Kunstmaan/AdminBundle/Resources/views/Toolbar/Icon/exception.svg b/src/Kunstmaan/AdminBundle/Resources/views/Toolbar/Icon/exception.svg
new file mode 100644
index 0000000000..0e4df2b23a
--- /dev/null
+++ b/src/Kunstmaan/AdminBundle/Resources/views/Toolbar/Icon/exception.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="#AAA" d="M23.5 9.5c0-.2-1.2.2-1.6.2l.4-.8C23 7.4 22 6.6 21 7.5c-.4.4 0 1.1 0 1.8v.3l-.6-.3c-.5-.8-1.1-.2-1.1 0 0 .3.7.9 1.1.9h.2v.5c0 .7-.8 1.1-1.7 1.2V9.1c0-4.3-3.3-6.4-6.9-6.4-3.5 0-6.9 2-6.9 6.4v2.8c-.9-.2-1.8-.5-1.8-1.2v-.2h.2c.5 0 1.1-.2 1.1-.4.2-1.4-.6-.5-1.1-.5h-.3l.1-.4c0-.5 1.2-1.7-.8-1.9-.4 0-.5.9-.4 1.3l.4 1.2c-.1-.2-.3-.2-.5-.3-.2-.2-1.6-1.9-1.9 0-.1 1.1 1 1.2 1.9 1l.3-.1-.2 1.2c0 1.3 1.5 1.6 2.9 1.7v5.2c0 1.6.5 2.8 2.2 2.8 1.8 0 2.4-1.3 2.4-2.9 0 1.6.6 2.9 2.3 2.9s2.3-2.2 2.3-2.8c0 1.7.7 2.8 2.4 2.8s2.2-1.2 2.2-2.9v-5.1c1.4-.1 2.9-.4 2.9-1.7l-.1-1c.4.5 1.1.8 1.7.5 1.2-.7.2-1.4.2-1.6zM6.8 8.4c0-1.5 1-2.5 2.3-2.5 1.3 0 2.3 1.1 2.3 2.5s-1 2.6-2.2 2.6c.6 0 1.1-.5 1.1-1.2 0-.6-.5-1.2-1.2-1.2-.6 0-1.2.5-1.2 1.2 0 .6.5 1.2 1.2 1.2-1.3 0-2.3-1.1-2.3-2.6zm5.1 7.5c-2.9-.1-3.1-1.6-3.1-2.5 0-.9 1.7-.3 3.2-.3 1.5 0 3.1-.7 3.1.2 0 1-.8 2.7-3.2 2.6zM15 11c.6-.1 1-.6 1-1.2s-.5-1.2-1.2-1.2c-.6 0-1.2.5-1.2 1.2 0 .6.5 1.2 1.1 1.2-1.3 0-2.3-1.2-2.3-2.6 0-1.5 1-2.5 2.3-2.5C16 5.9 17 7 17 8.4c.1 1.4-.8 2.5-2 2.6z"/></svg>
diff --git a/src/Kunstmaan/AdminBundle/Resources/views/Toolbar/bundles_version.html.twig b/src/Kunstmaan/AdminBundle/Resources/views/Toolbar/bundles_version.html.twig
index 1d86ef4d67..5af28a5a2a 100644
--- a/src/Kunstmaan/AdminBundle/Resources/views/Toolbar/bundles_version.html.twig
+++ b/src/Kunstmaan/AdminBundle/Resources/views/Toolbar/bundles_version.html.twig
@@ -4,42 +4,59 @@
     {% endif %}
 
     {% if data is defined %}
-        {% set status_color = '#00529B' %}
+        {% set status_color = 'yellow' %}
+        {% set version = 'Unknown' %}
         {% set txt = 'toolbar.bundle_version.unknown'|trans %}
-        {% set version = null %}
 
         {% if data is iterable %}
             {% for bundle in data %}
                 {% if bundle.name == "kunstmaan/bundles-cms" %}
                     {% set version = bundle.version %}
                     {% if bundle.status == 'UP_TO_DATE' %}
-                        {% set status_color = '#4F8A10' %}
+                        {% set status_color = '' %}
+                        {% set label_color = 'green' %}
                         {% set txt = 'toolbar.bundle_version.uptodate'|trans %}
                     {% elseif bundle.status == 'TO_UPDATE' %}
-                        {% set status_color = '#9F6000' %}
+                        {% set status_color = 'red' %}
+                        {% set txt = 'toolbar.bundle_version.toupdate'|trans %}
+                    {% endif %}
+                {% elseif bundle.name == 'kunstmaan/admin-bundle' %}
+                    {% set version = bundle.version %}
+                    {% if bundle.status == 'UP_TO_DATE' %}
+                        {% set status_color = '' %}
+                        {% set label_color = 'green' %}
+                        {% set txt = 'toolbar.bundle_version.uptodate'|trans %}
+                    {% elseif bundle.status == 'TO_UPDATE' %}
+                        {% set status_color = 'red' %}
                         {% set txt = 'toolbar.bundle_version.toupdate'|trans %}
                     {% endif %}
                 {% endif %}
             {% endfor %}
         {% else %}
-            <div class="alert-error">{{ 'settings.version.error'|trans }}</div>
+            {% set status_color = 'red' %}
+            {% set version = 'Unknown' %}
+            {% set txt = 'toolbar.bundle_version.error'|trans %}
         {% endif %}
 
         {% set icon %}
             {{ include('@KunstmaanAdmin/Toolbar/Icon/time.svg') }}
-            <span class="sf-toolbar-value">{{ txt }}</span>
-            <span class="sf-toolbar-label">{{ version }}</span>
+            <span class="sf-toolbar-value">{{ version }}</span>
         {% endset %}
 
         {% set text %}
-            <div class="sf-toolbar-info-piece">
-                <b> {{ 'toolbar.bundle_version.version'|trans }}</b>
-                <span>{{ version }}</span>
-            </div>
-            <div class="sf-toolbar-info-piece">
-                <b> {{ 'toolbar.bundle_version.status'|trans }}</b>
-                <span>{{ txt }} </span>
+            <div class="sf-toolbar-info-group">
+                <div class="sf-toolbar-info-piece">
+                    <div class="sf-toolbar-info-piece">
+                        <b> {{ 'toolbar.bundle_version.version'|trans }}</b>
+                        <span>{{ version }}</span>
+                    </div>
+                    <div class="sf-toolbar-info-piece">
+                        <b> {{ 'toolbar.bundle_version.status'|trans }}</b>
+                        <span class="sf-toolbar-status sf-toolbar-status-{% if label_color is defined %}{{ label_color }}{% else %}{{ status_color }}{% endif %}">{{ txt }} </span>
+                    </div>
+                </div>
             </div>
+
         {% endset %}
 
         {{ include('@KunstmaanAdmin/Toolbar/toolbar_item.html.twig', { status: status_color }) }}
diff --git a/src/Kunstmaan/AdminBundle/Resources/views/Toolbar/exception.html.twig b/src/Kunstmaan/AdminBundle/Resources/views/Toolbar/exception.html.twig
index 0158830e07..8f78dbb70c 100644
--- a/src/Kunstmaan/AdminBundle/Resources/views/Toolbar/exception.html.twig
+++ b/src/Kunstmaan/AdminBundle/Resources/views/Toolbar/exception.html.twig
@@ -5,14 +5,25 @@
 
     {% if data is defined %}
         {% set icon %}
-            <span class="sf-toolbar-value">{{ 'toolbar.exception.title' | trans }}</span>
+            {{ include('@KunstmaanAdmin/Toolbar/Icon/exception.svg') }}
+            <span class="sf-toolbar-value">{{ data['cp_all'] }}</span>
+            <span class="sf-toolbar-info-piece-additional-detail">
+                <span class="sf-toolbar-label">{{ 'toolbar.exception.title' | trans }}</span>
+            </span>
         {% endset %}
 
         {% set text %}
-            <div class="sf-toolbar-info-piece">
-                <span>
-                    {{ 'toolbar.exception.message' | trans({'%X%': data['cp_all'], '%Y%': data['cp_sum']}) | raw }}
-                </span>
+            <div class="sf-toolbar-info-group">
+                <div class="sf-toolbar-info-piece">
+                    <div class="sf-toolbar-info-piece">
+                        <b> {{ 'toolbar.exception.info.exceptions'|trans }}</b>
+                        <span class="sf-toolbar-status">{{ data['cp_all'] }}</span>
+                    </div>
+                    <div class="sf-toolbar-info-piece">
+                        <b> {{ 'toolbar.exception.info.events'|trans }}</b>
+                        <span class="sf-toolbar-status">{{ data['cp_sum'] }} </span>
+                    </div>
+                </div>
             </div>
         {% endset %}
 
diff --git a/src/Kunstmaan/AdminBundle/Resources/views/Toolbar/toolbar_item.html.twig b/src/Kunstmaan/AdminBundle/Resources/views/Toolbar/toolbar_item.html.twig
index bd03dada0a..6ef594e1a4 100644
--- a/src/Kunstmaan/AdminBundle/Resources/views/Toolbar/toolbar_item.html.twig
+++ b/src/Kunstmaan/AdminBundle/Resources/views/Toolbar/toolbar_item.html.twig
@@ -1,4 +1,4 @@
-<div class="sf-toolbar-block kuma-toolbar-block" {% if status_color is defined %} style="background-color: {{ status_color }}" {% endif %}>
+<div class="sf-toolbar-block kuma-toolbar-block sf-toolbar-status-{{ status|default('normal') }}">
     {% if link is defined and link %}
         <a href="{{ link }}">
     {% endif %}
diff --git a/src/Kunstmaan/NodeBundle/Resources/translations/messages.en.yml b/src/Kunstmaan/NodeBundle/Resources/translations/messages.en.yml
index 80a6cbd750..9e9459a871 100644
--- a/src/Kunstmaan/NodeBundle/Resources/translations/messages.en.yml
+++ b/src/Kunstmaan/NodeBundle/Resources/translations/messages.en.yml
@@ -177,3 +177,8 @@ kuma_node:
         export_pagetemplate:
             button:
                 title:   Export pagetemplate
+
+toolbar:
+    node:
+        title: 'Page title'
+        edit: 'Edit page'
diff --git a/src/Kunstmaan/TranslatorBundle/Resources/views/Toolbar/translations.html.twig b/src/Kunstmaan/TranslatorBundle/Resources/views/Toolbar/translations.html.twig
index 42961d32bc..23bad95f9e 100644
--- a/src/Kunstmaan/TranslatorBundle/Resources/views/Toolbar/translations.html.twig
+++ b/src/Kunstmaan/TranslatorBundle/Resources/views/Toolbar/translations.html.twig
@@ -6,18 +6,19 @@
     {% if data is defined %}
         {% set icon %}
             {{ include('@KunstmaanTranslator/Toolbar/Icon/translation.svg') }}
-            <span class="sf-toolbar-value">{{ 'toolbar.translations.title' | trans }}</span>
-            <span class="sf-toolbar-label">{{ data.translations | length }}</span>
+            <span class="sf-toolbar-value">{{ data.translations | length }}</span>
+            <span class="sf-toolbar-label">{{ 'toolbar.translations.title' | trans }}</span>
         {% endset %}
 
         {% set text %}
             {% for translation in data.translations %}
                 <div class="sf-toolbar-info-piece">
-                    <b>
+                    <b>{{ translation.id }}</b>
+                    <span>
                         <a href="{{ translation.route }}" style="text-decoration: none !important;">
-                            {{ translation.message }}
+                            {{ translation.message|length > 40 ? translation.message|slice(0, 40) ~ '...' : translation.message  }}
                         </a>
-                    </b>
+                    </span>
                 </div>
             {% endfor %}
         {% endset %}