From 75bd61ce91b4e8adc9e63796c0cb03b08ee71576 Mon Sep 17 00:00:00 2001
From: Martin Edenhofer <me@edenhofer.de>
Date: Wed, 19 Apr 2017 14:41:16 +0200
Subject: [PATCH] Improved ldap summary layout.

---
 .../integration/ldap_last_import.jst.eco      | 27 +++++++++++--------
 .../views/integration/ldap_summary.jst.eco    |  7 ++++-
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/app/assets/javascripts/app/views/integration/ldap_last_import.jst.eco b/app/assets/javascripts/app/views/integration/ldap_last_import.jst.eco
index 0b3d7f027..eba98b8a5 100644
--- a/app/assets/javascripts/app/views/integration/ldap_last_import.jst.eco
+++ b/app/assets/javascripts/app/views/integration/ldap_last_import.jst.eco
@@ -23,18 +23,23 @@
         <div class="flex">
           <progress max="<%= @job.result.sum %>" value="<%= @countDone %>"></progress>
         </div>
-        <ul>
-          <li><%- @T('Users') %>: <%= @countDone %>/<%= @job.result.sum %> (<%= @job.result.created %> <%- @T('created') %>, <%= @job.result.updated %> <%- @T('updated') %>, <%= @job.result.unchanged %> <%- @T('untouched') %>, <%= @job.result.skipped %> <%- @T('skipped') %>, <%= @job.result.failed %> <%- @T('failed') %>)
-          <% if !_.isEmpty(@job.result.roles): %>
-            <li><%- @T('%s groups to %s roles assignments', 'LDAP', 'Zammad') %>:
-              <ul>
-                <% for role, result of @job.result.roles: %>
-                  <li> <%- @T(role) %>: <%= result.created %> <%- @T('created') %>, <%= result.updated %> <%- @T('updated') %>, <%= result.unchanged %> <%- @T('untouched') %>, <%= result.failed %> <%- @T('failed') %>
-                <% end %>
-              </ul>
-          <% end %>
-        </ul>
       <% end %>
     <% end %>
+    <% if !_.isEmpty(@job.result): %>
+      <ul>
+        <li><%- @T('%s user to %s user', 'LDAP', 'Zammad') %> (<%= @countDone %>/<%= @job.result.sum %>):
+          <ul>
+            <li><%- @T('Users') %>: <%= @job.result.created %> <%- @T('created') %>, <%= @job.result.updated %> <%- @T('updated') %>, <%= @job.result.unchanged %> <%- @T('untouched') %>, <%= @job.result.skipped %> <%- @T('skipped') %>, <%= @job.result.failed %> <%- @T('failed') %>
+          </ul>
+        <% if !_.isEmpty(@job.result.roles): %>
+          <li><%- @T('%s groups to %s roles assignments', 'LDAP', 'Zammad') %>:
+            <ul>
+              <% for role, result of @job.result.roles: %>
+                <li> <%- @T(role) %>: <%= result.created %> <%- @T('created') %>, <%= result.updated %> <%- @T('updated') %>, <%= result.unchanged %> <%- @T('untouched') %>, <%= result.failed %> <%- @T('failed') %>
+              <% end %>
+            </ul>
+        <% end %>
+      </ul>
+    <% end %>
   <% end %>
 </div>
diff --git a/app/assets/javascripts/app/views/integration/ldap_summary.jst.eco b/app/assets/javascripts/app/views/integration/ldap_summary.jst.eco
index e7040fddb..2cac7c834 100644
--- a/app/assets/javascripts/app/views/integration/ldap_summary.jst.eco
+++ b/app/assets/javascripts/app/views/integration/ldap_summary.jst.eco
@@ -1,5 +1,9 @@
 <ul>
-  <li><%- @T('Users') %>: <%= @countDone %> (<%= @job.result.created %> <%- @T('created') %>, <%= @job.result.updated %> <%- @T('updated') %>, <%= @job.result.unchanged %> <%- @T('untouched') %>, <%= @job.result.skipped %> <%- @T('skipped') %>, <%= @job.result.failed %> <%- @T('failed') %>)
+  <li><%- @T('%s user to %s user', 'LDAP', 'Zammad') %> (<%= @countDone %>):
+    <ul>
+      <li><%- @T('Users') %>: <%= @job.result.created %> <%- @T('created') %>, <%= @job.result.updated %> <%- @T('updated') %>, <%= @job.result.unchanged %> <%- @T('untouched') %>, <%= @job.result.skipped %> <%- @T('skipped') %>, <%= @job.result.failed %> <%- @T('failed') %>
+    </ul>
+  </li>
   <% if !_.isEmpty(@job.result.roles): %>
     <li><%- @T('%s groups to %s roles assignments', 'LDAP', 'Zammad') %>:
       <ul>
@@ -7,5 +11,6 @@
           <li><%- @T(role) %>: <%= result.created %> <%- @T('created') %>, <%= result.updated %> <%- @T('updated') %>, <%= result.unchanged %> <%- @T('untouched') %>, <%= result.failed %> <%- @T('failed') %>
         <% end %>
       </ul>
+    </li>
   <% end %>
 </ul>