From 5020f1bb2a6e2c6aa16e598c6b5d18b1bf748893 Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Sat, 5 Mar 2022 17:03:47 +0100
Subject: [PATCH] render fixes, minor bug fixes

---
 Theme/Backend/Lang/en.lang.php       |  4 ++--
 Theme/Backend/task-dashboard.tpl.php |  4 ++--
 Theme/Backend/task-single.tpl.php    | 24 ++++++++++++++++++++----
 3 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php
index 38318fc..6ecb0a1 100644
--- a/Theme/Backend/Lang/en.lang.php
+++ b/Theme/Backend/Lang/en.lang.php
@@ -20,7 +20,7 @@ return ['Tasks' => [
     'BCC'                => 'BCC',
     'By'                 => 'By',
     'CC'                 => 'CC',
-    'Completion'         => '',
+    'Completion'         => 'Completion',
     'Created'            => 'Created',
     'Creator'            => 'Creator',
     'Day'                => 'Day',
@@ -62,7 +62,7 @@ return ['Tasks' => [
     'Size'               => 'Size',
     'Statistics'         => 'Statistics',
     'Status'             => 'Status',
-    'Tag'                => '',
+    'Tag'                => 'Tag',
     'Task'               => 'Task',
     'Tasks'              => 'Tasks',
     'Template'           => 'Template',
diff --git a/Theme/Backend/task-dashboard.tpl.php b/Theme/Backend/task-dashboard.tpl.php
index a107010..87f06e9 100755
--- a/Theme/Backend/task-dashboard.tpl.php
+++ b/Theme/Backend/task-dashboard.tpl.php
@@ -74,7 +74,7 @@ echo $this->getData('nav')->render(); ?>
                             </a>
                             <?php endforeach; ?>
                         <td data-label="<?= $this->getHtml('Creator'); ?>">
-                            <a class="content" href="<?= UriFactory::build('{/prefix}profile/single?{?}&for=' . $task->createdBy->getId()); ?>"><?= $this->printHtml($task->createdBy->name1); ?></a>
+                            <a class="content" href="<?= UriFactory::build('{/prefix}profile/single?{?}&for=' . $task->createdBy->getId()); ?>"><?= $this->printHtml($this->renderUserName('%3$s %2$s %1$s', [$task->createdBy->name1, $task->createdBy->name2, $task->createdBy->name3, $task->createdBy->login ?? ''])); ?></a>
                         <td data-label="<?= $this->getHtml('Created'); ?>">
                             <a href="<?= $url; ?>"><?= $this->printHtml($task->createdAt->format('Y-m-d H:i')); ?></a>
                 <?php endforeach; if ($c == 0) : ?>
@@ -88,4 +88,4 @@ echo $this->getData('nav')->render(); ?>
             </div>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/Theme/Backend/task-single.tpl.php b/Theme/Backend/task-single.tpl.php
index 2b82e35..9013803 100755
--- a/Theme/Backend/task-single.tpl.php
+++ b/Theme/Backend/task-single.tpl.php
@@ -177,7 +177,11 @@ echo $this->getData('nav')->render(); ?>
                     <section class="portlet">
                         <div class="portlet-body">
                             <?= \sprintf($this->getHtml('status_change'),
-                                '<a href="' . UriFactory::build('{/prefix}profile/single?{?}&for=' . $element->createdBy->getId()) . '">' . $this->printHtml($element->createdBy->name1) . '</a>',
+                                '<a href="' . UriFactory::build('{/prefix}profile/single?{?}&for=' . $element->createdBy->getId()) . '">' . $this->printHtml(
+                                    $this->renderUserName(
+                                        '%3$s %2$s %1$s',
+                                        [$element->createdBy->name1, $element->createdBy->name2, $element->createdBy->name3, $element->createdBy->login])
+                                    ) . '</a>',
                                 $element->createdAt->format('Y-m-d H:i')
                             ); ?>
                             <span class="tag task-status-<?= $element->getStatus(); ?>">
@@ -193,7 +197,11 @@ echo $this->getData('nav')->render(); ?>
                     <section class="portlet">
                         <div class="portlet-body">
                             <?= \sprintf($this->getHtml('priority_change'),
-                                '<a href="' . UriFactory::build('{/prefix}profile/single?{?}&for=' . $element->createdBy->getId()) . '">' . $this->printHtml($element->createdBy->name1) . '</a>',
+                                '<a href="' . UriFactory::build('{/prefix}profile/single?{?}&for=' . $element->createdBy->getId()) . '">' . $this->printHtml(
+                                    $this->renderUserName(
+                                        '%3$s %2$s %1$s',
+                                        [$element->createdBy->name1, $element->createdBy->name2, $element->createdBy->name3, $element->createdBy->login])
+                                    ) . '</a>',
                                 $element->createdAt->format('Y-m-d H:i')
                             ); ?>
                             <span class="tag task-priority-<?= $element->getPriority(); ?>">
@@ -218,7 +226,11 @@ echo $this->getData('nav')->render(); ?>
                                 <img class="profile-image" loading="lazy" alt="<?= $this->getHtml('User', '0', '0'); ?>" src="<?= $this->getAccountImage($element->createdBy->getId()); ?>">
                             </span>
                             <span class="col-xs">
-                                <?= $this->printHtml($element->createdBy->name1); ?> - <?= $this->printHtml($element->createdAt->format('Y-m-d H:i')); ?>
+                                <?= $this->printHtml(
+                                    $this->renderUserName(
+                                        '%3$s %2$s %1$s',
+                                        [$element->createdBy->name1, $element->createdBy->name2, $element->createdBy->name3, $element->createdBy->login])
+                                    ); ?> - <?= $this->printHtml($element->createdAt->format('Y-m-d H:i')); ?>
                             </span>
                         </div>
                     </div>
@@ -289,7 +301,11 @@ echo $this->getData('nav')->render(); ?>
                     ) : ?>
                     <section class="portlet wf-100">
                         <div class="portlet-body">
-                            <a href="<?= UriFactory::build('{/prefix}profile/single?{?}&for=' . $element->createdBy->getId()); ?>"><?= $this->printHtml($element->createdBy->name1); ?></a> <?= $this->getHtml('forwarded_to'); ?>
+                            <a href="<?= UriFactory::build('{/prefix}profile/single?{?}&for=' . $element->createdBy->getId()); ?>"><?= $this->printHtml(
+                                $this->renderUserName(
+                                    '%3$s %2$s %1$s',
+                                    [$element->createdBy->name1, $element->createdBy->name2, $element->createdBy->name3, $element->createdBy->login])
+                                ); ?></a> <?= $this->getHtml('forwarded_to'); ?>
                             <?php foreach ($tos as $to) : ?>
                                 <?php if ($to instanceof AccountRelation) : ?>
                                     <a href="<?= UriFactory::build('{/prefix}profile/single?{?}&for=' . $to->getRelation()->getId()); ?>"><?= $this->printHtml($to->getRelation()->name1); ?></a>