Jingga/oms-Tasks
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Tasks.git synced 2026-01-11 15:38:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

render fixes, minor bug fixes

Browse Source
This commit is contained in:
Dennis Eichhorn 2022-03-05 17:03:47 +01:00
parent cb976cb892
commit 5020f1bb2a
3 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Theme/Backend/Lang/en.lang.php
View File

@ -20,7 +20,7 @@ return ['Tasks' => [
'BCC' => 'BCC', 'BCC' => 'BCC',
'By' => 'By', 'By' => 'By',
'CC' => 'CC', 'CC' => 'CC',
'Completion' => '', 'Completion' => 'Completion',
'Created' => 'Created', 'Created' => 'Created',
'Creator' => 'Creator', 'Creator' => 'Creator',
'Day' => 'Day', 'Day' => 'Day',
@ -62,7 +62,7 @@ return ['Tasks' => [
'Size' => 'Size', 'Size' => 'Size',
'Statistics' => 'Statistics', 'Statistics' => 'Statistics',
'Status' => 'Status', 'Status' => 'Status',
'Tag' => '', 'Tag' => 'Tag',
'Task' => 'Task', 'Task' => 'Task',
'Tasks' => 'Tasks', 'Tasks' => 'Tasks',
'Template' => 'Template', 'Template' => 'Template',

4
Theme/Backend/task-dashboard.tpl.php
View File

@ -74,7 +74,7 @@ echo $this->getData('nav')->render(); ?>
</a> </a>
<?php endforeach; ?> <?php endforeach; ?>
<td data-label="<?= $this->getHtml('Creator'); ?>"> <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'); ?>"> <td data-label="<?= $this->getHtml('Created'); ?>">
<a href="<?= $url; ?>"><?= $this->printHtml($task->createdAt->format('Y-m-d H:i')); ?></a> <a href="<?= $url; ?>"><?= $this->printHtml($task->createdAt->format('Y-m-d H:i')); ?></a>
<?php endforeach; if ($c == 0) : ?> <?php endforeach; if ($c == 0) : ?>
@ -88,4 +88,4 @@ echo $this->getData('nav')->render(); ?>
</div> </div>
</div> </div>
</div> </div>
</div> </div>

24
Theme/Backend/task-single.tpl.php
View File

@ -177,7 +177,11 @@ echo $this->getData('nav')->render(); ?>
<section class="portlet"> <section class="portlet">
<div class="portlet-body"> <div class="portlet-body">
<?= \sprintf($this->getHtml('status_change'), <?= \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') $element->createdAt->format('Y-m-d H:i')
); ?> ); ?>
<span class="tag task-status-<?= $element->getStatus(); ?>"> <span class="tag task-status-<?= $element->getStatus(); ?>">
@ -193,7 +197,11 @@ echo $this->getData('nav')->render(); ?>
<section class="portlet"> <section class="portlet">
<div class="portlet-body"> <div class="portlet-body">
<?= \sprintf($this->getHtml('priority_change'), <?= \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') $element->createdAt->format('Y-m-d H:i')
); ?> ); ?>
<span class="tag task-priority-<?= $element->getPriority(); ?>"> <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()); ?>"> <img class="profile-image" loading="lazy" alt="<?= $this->getHtml('User', '0', '0'); ?>" src="<?= $this->getAccountImage($element->createdBy->getId()); ?>">
</span> </span>
<span class="col-xs"> <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> </span>
</div> </div>
</div> </div>
@ -289,7 +301,11 @@ echo $this->getData('nav')->render(); ?>
) : ?> ) : ?>
<section class="portlet wf-100"> <section class="portlet wf-100">
<div class="portlet-body"> <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 foreach ($tos as $to) : ?>
<?php if ($to instanceof AccountRelation) : ?> <?php if ($to instanceof AccountRelation) : ?>
<a href="<?= UriFactory::build('{/prefix}profile/single?{?}&for=' . $to->getRelation()->getId()); ?>"><?= $this->printHtml($to->getRelation()->name1); ?></a> <a href="<?= UriFactory::build('{/prefix}profile/single?{?}&for=' . $to->getRelation()->getId()); ?>"><?= $this->printHtml($to->getRelation()->name1); ?></a>