From 8d9b87bb6ee084d2ee71e8ca17cf2537dba87d7f Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Mon, 30 Mar 2015 21:58:16 -0400
Subject: Avoid code duplication in pull-request #746

---
 app/Template/app/dashboard.php    |  2 +-
 app/Template/event/events.php     | 21 +++++++++++++++++++++
 app/Template/project/activity.php |  2 +-
 app/Template/project/events.php   | 21 ---------------------
 app/Template/task/activity.php    |  5 +++++
 app/Template/task/events.php      | 25 -------------------------
 6 files changed, 28 insertions(+), 48 deletions(-)
 create mode 100644 app/Template/event/events.php
 delete mode 100644 app/Template/project/events.php
 create mode 100644 app/Template/task/activity.php
 delete mode 100644 app/Template/task/events.php

(limited to 'app/Template')

diff --git a/app/Template/app/dashboard.php b/app/Template/app/dashboard.php
index 5b83540c..a832345b 100644
--- a/app/Template/app/dashboard.php
+++ b/app/Template/app/dashboard.php
@@ -53,7 +53,7 @@
             </div>
             <div id="dashboard-activities">
                 <h2><?= t('Activity stream') ?></h2>
-                <?= $this->render('project/events', array('events' => $events)) ?>
+                <?= $this->render('event/events', array('events' => $events)) ?>
             </div>
         </div>
     </section>
diff --git a/app/Template/event/events.php b/app/Template/event/events.php
new file mode 100644
index 00000000..93bc6584
--- /dev/null
+++ b/app/Template/event/events.php
@@ -0,0 +1,21 @@
+<?php if (empty($events)): ?>
+    <p class="alert"><?= t('No activity.') ?></p>
+<?php else: ?>
+
+    <?php foreach ($events as $event): ?>
+        <div class="activity-event">
+            <p class="activity-datetime">
+                <?php if ($this->contains($event['event_name'], 'subtask')): ?>
+                    <i class="fa fa-tasks"></i>
+                <?php elseif ($this->contains($event['event_name'], 'task')): ?>
+                    <i class="fa fa-newspaper-o"></i>
+                <?php elseif ($this->contains($event['event_name'], 'comment')): ?>
+                    <i class="fa fa-comments-o"></i>
+                <?php endif ?>
+                &nbsp;<?= dt('%B %e, %Y at %k:%M %p', $event['date_creation']) ?>
+            </p>
+            <div class="activity-content"><?= $event['event_content'] ?></div>
+        </div>
+    <?php endforeach ?>
+
+<?php endif ?>
\ No newline at end of file
diff --git a/app/Template/project/activity.php b/app/Template/project/activity.php
index bc4eb19c..7da6be5c 100644
--- a/app/Template/project/activity.php
+++ b/app/Template/project/activity.php
@@ -23,6 +23,6 @@
         </ul>
     </div>
     <section>
-        <?= $this->render('project/events', array('events' => $events)) ?>
+        <?= $this->render('event/events', array('events' => $events)) ?>
     </section>
 </section>
\ No newline at end of file
diff --git a/app/Template/project/events.php b/app/Template/project/events.php
deleted file mode 100644
index 93bc6584..00000000
--- a/app/Template/project/events.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php if (empty($events)): ?>
-    <p class="alert"><?= t('No activity.') ?></p>
-<?php else: ?>
-
-    <?php foreach ($events as $event): ?>
-        <div class="activity-event">
-            <p class="activity-datetime">
-                <?php if ($this->contains($event['event_name'], 'subtask')): ?>
-                    <i class="fa fa-tasks"></i>
-                <?php elseif ($this->contains($event['event_name'], 'task')): ?>
-                    <i class="fa fa-newspaper-o"></i>
-                <?php elseif ($this->contains($event['event_name'], 'comment')): ?>
-                    <i class="fa fa-comments-o"></i>
-                <?php endif ?>
-                &nbsp;<?= dt('%B %e, %Y at %k:%M %p', $event['date_creation']) ?>
-            </p>
-            <div class="activity-content"><?= $event['event_content'] ?></div>
-        </div>
-    <?php endforeach ?>
-
-<?php endif ?>
\ No newline at end of file
diff --git a/app/Template/task/activity.php b/app/Template/task/activity.php
new file mode 100644
index 00000000..cc4aad03
--- /dev/null
+++ b/app/Template/task/activity.php
@@ -0,0 +1,5 @@
+<div class="page-header">
+    <h2><?= t('Activity stream') ?></h2>
+</div>
+
+<?= $this->render('event/events', array('events' => $events)) ?>
\ No newline at end of file
diff --git a/app/Template/task/events.php b/app/Template/task/events.php
deleted file mode 100644
index 188f46fe..00000000
--- a/app/Template/task/events.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<div class="page-header">
-    <h2><?= t('Activity stream') ?></h2>
-</div>
-
-<?php if (empty($events)): ?>
-    <p class="alert"><?= t('No activity.') ?></p>
-<?php else: ?>
-
-    <?php foreach ($events as $event): ?>
-        <div class="activity-event">
-            <p class="activity-datetime">
-                <?php if ($this->contains($event['event_name'], 'subtask')): ?>
-                    <i class="fa fa-tasks"></i>
-                <?php elseif ($this->contains($event['event_name'], 'task')): ?>
-                    <i class="fa fa-newspaper-o"></i>
-                <?php elseif ($this->contains($event['event_name'], 'comment')): ?>
-                    <i class="fa fa-comments-o"></i>
-                <?php endif ?>
-                &nbsp;<?= dt('%B %e, %Y at %k:%M %p', $event['date_creation']) ?>
-            </p>
-            <div class="activity-content"><?= $event['event_content'] ?></div>
-        </div>
-    <?php endforeach ?>
-
-<?php endif ?>
\ No newline at end of file
-- 
cgit v1.2.3