Improve activity stream layout

This commit is contained in:
Frederic Guillot
2016-03-19 16:22:00 -04:00
parent 84b4139988
commit 6351cb0e27
41 changed files with 96 additions and 106 deletions

View File

@@ -3,8 +3,9 @@
$this->text->e($author),
$this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
) ?>
<span class="activity-date"><?= $this->dt->datetime($date_creation) ?></span>
</p>
<div class="activity-description">
<em><?= $this->text->e($task['title']) ?></em><br/>
<p class="activity-task-title"><?= $this->text->e($task['title']) ?></p>
<div class="markdown"><?= $this->text->markdown($comment['comment']) ?></div>
</div>
</div>

View File

@@ -3,7 +3,8 @@
$this->text->e($author),
$this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
) ?>
<span class="activity-date"><?= $this->dt->datetime($date_creation) ?></span>
</p>
<div class="activity-description">
<em><?= $this->text->e($task['title']) ?></em><br/>
</div>
<p class="activity-task-title"><?= $this->text->e($task['title']) ?></p>
</div>

View File

@@ -1,32 +1,19 @@
<?php if (empty($events)): ?>
<p class="alert"><?= t('There is no activity yet.') ?></p>
<?php else: ?>
<?php foreach ($events as $event): ?>
<div class="activity-event">
<p class="activity-datetime">
<?php if ($this->text->contains($event['event_name'], 'subtask')): ?>
<i class="fa fa-tasks"></i>
<?php elseif ($this->text->contains($event['event_name'], 'task.move')): ?>
<i class="fa fa-arrows-alt"></i>
<?php elseif ($this->text->contains($event['event_name'], 'task')): ?>
<i class="fa fa-newspaper-o"></i>
<?php elseif ($this->text->contains($event['event_name'], 'comment')): ?>
<i class="fa fa-comments-o"></i>
<?php endif ?>
&nbsp;<?= $this->dt->datetime($event['date_creation']) ?>
</p>
<div class="activity-content">
<?= $this->avatar->render(
$event['creator_id'],
$event['author_username'],
$event['author_name'],
$event['email']
) ?>
<?= $this->avatar->render(
$event['creator_id'],
$event['author_username'],
$event['author_name'],
$event['email']
) ?>
<div class="activity-content">
<?= $event['event_content'] ?>
</div>
</div>
<?php endforeach ?>
<?php endif ?>
<?php endif ?>

View File

@@ -3,9 +3,10 @@
$this->text->e($author),
$this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
) ?>
<span class="activity-date"><?= $this->dt->datetime($date_creation) ?></span>
</p>
<div class="activity-description">
<p><em><?= $this->text->e($task['title']) ?></em></p>
<p class="activity-task-title"><?= $this->text->e($task['title']) ?></p>
<ul>
<li>

View File

@@ -3,9 +3,10 @@
$this->text->e($author),
$this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
) ?>
<span class="activity-date"><?= $this->dt->datetime($date_creation) ?></span>
</p>
<div class="activity-description">
<p><em><?= $this->text->e($task['title']) ?></em></p>
<p class="activity-task-title"><?= $this->text->e($task['title']) ?></p>
<ul>
<li>

View File

@@ -10,7 +10,8 @@
<?php else: ?>
<?= e('%s remove the assignee of the task %s', $this->text->e($author), $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))) ?>
<?php endif ?>
<span class="activity-date"><?= $this->dt->datetime($date_creation) ?></span>
</p>
<p class="activity-description">
<em><?= $this->text->e($task['title']) ?></em>
</p>
<div class="activity-description">
<p class="activity-task-title"><?= $this->text->e($task['title']) ?></p>
</div>

View File

@@ -3,7 +3,8 @@
$this->text->e($author),
$this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
) ?>
<span class="activity-date"><?= $this->dt->datetime($date_creation) ?></span>
</p>
<p class="activity-description">
<em><?= $this->text->e($task['title']) ?></em>
</p>
<div class="activity-description">
<p class="activity-task-title"><?= $this->text->e($task['title']) ?></p>
</div>

View File

@@ -3,7 +3,8 @@
$this->text->e($author),
$this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
) ?>
<span class="activity-date"><?= $this->dt->datetime($date_creation) ?></span>
</p>
<p class="activity-description">
<em><?= $this->text->e($task['title']) ?></em>
</p>
<div class="activity-description">
<p class="activity-task-title"><?= $this->text->e($task['title']) ?></p>
</div>

View File

@@ -3,7 +3,8 @@
$this->text->e($author),
$this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
) ?>
<span class="activity-date"><?= $this->dt->datetime($date_creation) ?></span>
</p>
<p class="activity-description">
<em><?= $this->text->e($file['name']) ?></em>
</p>
<div class="activity-description">
<p class="activity-task-title"><?= $this->text->e($file['name']) ?></p>
</div>

View File

@@ -4,7 +4,8 @@
$this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])),
$this->text->e($task['column_title'])
) ?>
<span class="activity-date"><?= $this->dt->datetime($date_creation) ?></span>
</p>
<p class="activity-description">
<em><?= $this->text->e($task['title']) ?></em>
</p>
<div class="activity-description">
<p class="activity-task-title"><?= $this->text->e($task['title']) ?></p>
</div>

View File

@@ -5,7 +5,8 @@
$task['position'],
$this->text->e($task['column_title'])
) ?>
<span class="activity-date"><?= $this->dt->datetime($date_creation) ?></span>
</p>
<p class="activity-description">
<em><?= $this->text->e($task['title']) ?></em>
</p>
<div class="activity-description">
<p class="activity-task-title"><?= $this->text->e($task['title']) ?></p>
</div>

View File

@@ -11,7 +11,8 @@
$this->text->e($task['swimlane_name'])
) ?>
<?php endif ?>
<span class="activity-date"><?= $this->dt->datetime($date_creation) ?></span>
</p>
<p class="activity-description">
<em><?= $this->text->e($task['title']) ?></em>
</p>
<div class="activity-description">
<p class="activity-task-title"><?= $this->text->e($task['title']) ?></p>
</div>

View File

@@ -3,7 +3,8 @@
$this->text->e($author),
$this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
) ?>
<span class="activity-date"><?= $this->dt->datetime($date_creation) ?></span>
</p>
<p class="activity-description">
<em><?= $this->text->e($task['title']) ?></em>
</p>
<div class="activity-description">
<p class="activity-task-title"><?= $this->text->e($task['title']) ?></p>
</div>

View File

@@ -3,12 +3,13 @@
$this->text->e($author),
$this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
) ?>
<span class="activity-date"><?= $this->dt->datetime($date_creation) ?></span>
</p>
<p class="activity-description">
<em><?= $this->text->e($task['title']) ?></em>
<div class="activity-description">
<p class="activity-task-title"><?= $this->text->e($task['title']) ?></p>
<?php if (isset($changes)): ?>
<div class="activity-changes">
<?= $this->render('task/changes', array('changes' => $changes, 'task' => $task)) ?>
</div>
<?php endif ?>
</p>
</div>

View File

@@ -68,7 +68,7 @@
</ul>
<?php if (! empty($changes['description'])): ?>
<p><?= t('The description has been modified') ?></p>
<p><strong><?= t('The description has been modified:') ?></strong></p>
<div class="markdown"><?= $this->text->markdown($task['description']) ?></div>
<?php endif ?>
<?php endif ?>