Helper refactoring

This commit is contained in:
Frederic Guillot
2016-03-04 20:10:34 -05:00
parent f32507d423
commit 8f3e2b2e5c
141 changed files with 562 additions and 445 deletions

View File

@@ -2,11 +2,11 @@
<p class="activity-title">
<?= e('%s commented the task %s',
$this->e($author),
$this->text->e($author),
$this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
) ?>
</p>
<div class="activity-description">
<em><?= $this->e($task['title']) ?></em><br/>
<em><?= $this->text->e($task['title']) ?></em><br/>
<div class="markdown"><?= $this->text->markdown($comment['comment']) ?></div>
</div>

View File

@@ -2,10 +2,10 @@
<p class="activity-title">
<?= e('%s updated a comment on the task %s',
$this->e($author),
$this->text->e($author),
$this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
) ?>
</p>
<div class="activity-description">
<em><?= $this->e($task['title']) ?></em><br/>
<em><?= $this->text->e($task['title']) ?></em><br/>
</div>

View File

@@ -2,16 +2,16 @@
<p class="activity-title">
<?= e('%s created a subtask for the task %s',
$this->e($author),
$this->text->e($author),
$this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
) ?>
</p>
<div class="activity-description">
<p><em><?= $this->e($task['title']) ?></em></p>
<p><em><?= $this->text->e($task['title']) ?></em></p>
<ul>
<li>
<?= $this->e($subtask['title']) ?> (<strong><?= $this->e($subtask['status_name']) ?></strong>)
<?= $this->text->e($subtask['title']) ?> (<strong><?= $this->text->e($subtask['status_name']) ?></strong>)
</li>
<li>
<?php if ($subtask['username']): ?>

View File

@@ -2,16 +2,16 @@
<p class="activity-title">
<?= e('%s updated a subtask for the task %s',
$this->e($author),
$this->text->e($author),
$this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
) ?>
</p>
<div class="activity-description">
<p><em><?= $this->e($task['title']) ?></em></p>
<p><em><?= $this->text->e($task['title']) ?></em></p>
<ul>
<li>
<?= $this->e($subtask['title']) ?> (<strong><?= $this->e($subtask['status_name']) ?></strong>)
<?= $this->text->e($subtask['title']) ?> (<strong><?= $this->text->e($subtask['status_name']) ?></strong>)
</li>
<li>
<?php if ($subtask['username']): ?>

View File

@@ -5,14 +5,14 @@
<?php if (! empty($assignee)): ?>
<?= e('%s changed the assignee of the task %s to %s',
$this->e($author),
$this->text->e($author),
$this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])),
$this->e($assignee)
$this->text->e($assignee)
) ?>
<?php else: ?>
<?= e('%s remove the assignee of the task %s', $this->e($author), $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))) ?>
<?= 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 ?>
</p>
<p class="activity-description">
<em><?= $this->e($task['title']) ?></em>
<em><?= $this->text->e($task['title']) ?></em>
</p>

View File

@@ -2,10 +2,10 @@
<p class="activity-title">
<?= e('%s closed the task %s',
$this->e($author),
$this->text->e($author),
$this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
) ?>
</p>
<p class="activity-description">
<em><?= $this->e($task['title']) ?></em>
<em><?= $this->text->e($task['title']) ?></em>
</p>

View File

@@ -2,10 +2,10 @@
<p class="activity-title">
<?= e('%s created the task %s',
$this->e($author),
$this->text->e($author),
$this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
) ?>
</p>
<p class="activity-description">
<em><?= $this->e($task['title']) ?></em>
<em><?= $this->text->e($task['title']) ?></em>
</p>

View File

@@ -2,10 +2,10 @@
<p class="activity-title">
<?= e('%s attached a new file to the task %s',
$this->e($author),
$this->text->e($author),
$this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
) ?>
</p>
<p class="activity-description">
<em><?= $this->e($file['name']) ?></em>
<em><?= $this->text->e($file['name']) ?></em>
</p>

View File

@@ -2,11 +2,11 @@
<p class="activity-title">
<?= e('%s moved the task %s to the column "%s"',
$this->e($author),
$this->text->e($author),
$this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])),
$this->e($task['column_title'])
$this->text->e($task['column_title'])
) ?>
</p>
<p class="activity-description">
<em><?= $this->e($task['title']) ?></em>
<em><?= $this->text->e($task['title']) ?></em>
</p>

View File

@@ -2,12 +2,12 @@
<p class="activity-title">
<?= e('%s moved the task %s to the position #%d in the column "%s"',
$this->e($author),
$this->text->e($author),
$this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])),
$task['position'],
$this->e($task['column_title'])
$this->text->e($task['column_title'])
) ?>
</p>
<p class="activity-description">
<em><?= $this->e($task['title']) ?></em>
<em><?= $this->text->e($task['title']) ?></em>
</p>

View File

@@ -3,17 +3,17 @@
<p class="activity-title">
<?php if ($task['swimlane_id'] == 0): ?>
<?= e('%s moved the task %s to the first swimlane',
$this->e($author),
$this->text->e($author),
$this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
) ?>
<?php else: ?>
<?= e('%s moved the task %s to the swimlane "%s"',
$this->e($author),
$this->text->e($author),
$this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])),
$this->e($task['swimlane_name'])
$this->text->e($task['swimlane_name'])
) ?>
<?php endif ?>
</p>
<p class="activity-description">
<em><?= $this->e($task['title']) ?></em>
<em><?= $this->text->e($task['title']) ?></em>
</p>

View File

@@ -2,10 +2,10 @@
<p class="activity-title">
<?= e('%s opened the task %s',
$this->e($author),
$this->text->e($author),
$this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
) ?>
</p>
<p class="activity-description">
<em><?= $this->e($task['title']) ?></em>
<em><?= $this->text->e($task['title']) ?></em>
</p>

View File

@@ -2,12 +2,12 @@
<p class="activity-title">
<?= e('%s updated the task %s',
$this->e($author),
$this->text->e($author),
$this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
) ?>
</p>
<p class="activity-description">
<em><?= $this->e($task['title']) ?></em>
<em><?= $this->text->e($task['title']) ?></em>
<?php if (isset($changes)): ?>
<div class="activity-changes">
<?= $this->render('task/changes', array('changes' => $changes, 'task' => $task)) ?>