From be293f5e49e55015baeabacbdce1238262a872ea Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 23 Feb 2015 17:31:24 +0100
Subject: [PATCH] Add proper titles to the timeline

refs #8458
---
 .../views/scripts/timeline/index.phtml        | 91 ++++++++++++++-----
 1 file changed, 69 insertions(+), 22 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/timeline/index.phtml b/modules/monitoring/application/views/scripts/timeline/index.phtml
index a6e32ac08..58c51fb05 100644
--- a/modules/monitoring/application/views/scripts/timeline/index.phtml
+++ b/modules/monitoring/application/views/scripts/timeline/index.phtml
@@ -27,19 +27,54 @@ $firstRow = !$beingExtended;
 <?php if ($switchedContext): ?>
         <hr>
 <?php endif ?>
-<?php foreach ($timeline as $timeInfo): ?>
+<?php foreach ($timeline as $timeInfo):
+    switch ($intervalBox->getInterval()) {
+        case '1d':
+            $titleTime = sprintf(
+                $this->translate('on %s', 'timeline.link.title.time'),
+                $timeInfo[0]->end->format('d/m/Y')
+            );
+            break;
+        case '1w':
+            $titleTime = sprintf(
+                $this->translate('in week %s of %s', 'timeline.link.title.week.and.year'),
+                $timeInfo[0]->end->format('W'),
+                $timeInfo[0]->end->format('Y')
+            );
+            break;
+        case '1m':
+            $titleTime = sprintf(
+                $this->translate('in %s', 'timeline.link.title.month.and.year'),
+                $timeInfo[0]->end->format('F Y')
+            );
+            break;
+        case '1y':
+            $titleTime = sprintf(
+                $this->translate('in %s', 'timeline.link.title.year'),
+                $timeInfo[0]->end->format('Y')
+            );
+            break;
+        default:
+            $titleTime = sprintf(
+                $this->translate('between %s and %s', 'timeline.link.title.datetime.twice'),
+                $timeInfo[0]->end->format('d/m/Y g:i A'),
+                $timeInfo[0]->start->format('d/m/Y g:i A')
+            );
+    } ?>
         <div class="timeframe">
-            <span>
-                <a href="<?= $this->href(
-                    '/monitoring/list/eventhistory',
-                    array(
-                        'timestamp<' => $timeInfo[0]->start->getTimestamp(),
-                        'timestamp>' => $timeInfo[0]->end->getTimestamp()
-                    )
-                ); ?>">
-                    <?= $timeInfo[0]->end->format($intervalFormat); ?>
-                </a>
-            </span>
+            <span><?= $this->qlink(
+                $timeInfo[0]->end->format($intervalFormat),
+                '/monitoring/list/eventhistory',
+                array(
+                    'timestamp<' => $timeInfo[0]->start->getTimestamp(),
+                    'timestamp>' => $timeInfo[0]->end->getTimestamp()
+                ),
+                array('title' => sprintf(
+                    $this->translate('List all event records registered %s', 'timeline.link.title'),
+                    $titleTime
+                )),
+                false
+            ); ?></span>
 <?php foreach ($groupInfo as $groupName => $labelAndColor): ?>
 <?php if (array_key_exists($groupName, $timeInfo[1])): ?>
 <?php
@@ -63,18 +98,30 @@ $extrapolatedCircleWidth = $timeline->getExtrapolatedCircleWidth($timeInfo[1][$g
                     $circleWidth
                 ); ?>">
 <?php endif ?>
-                    <a class="inner-circle" style="<?= sprintf(
-                        'width: %3$s; height: %3$s; background-color: %2$s; margin-top: -%1$Fem; margin-left: -%1$Fem;',
-                        (float) substr($circleWidth, 0, -2) / 2,
-                        $timeInfo[1][$groupName]->getColor(),
-                        (string) $circleWidth
-                    ); ?>" href="<?= $timeInfo[1][$groupName]->getDetailUrl()->overwriteParams(
+                    <?= $this->qlink(
+                        '',
+                        $timeInfo[1][$groupName]->getDetailUrl(),
                         array(
-                            'timestamp<' => $timeInfo[0]->start->getTimestamp(),
-                            'timestamp>'   => $timeInfo[0]->end->getTimestamp(),
-                            'type'  => $groupName
+                            'type'          => $groupName,
+                            'timestamp<'    => $timeInfo[0]->start->getTimestamp(),
+                            'timestamp>'    => $timeInfo[0]->end->getTimestamp()
+                        ),
+                        array(
+                            'title' => sprintf(
+                                $this->translate('List %u %s registered %s', 'timeline.link.title'),
+                                $timeInfo[1][$groupName]->getValue(),
+                                strtolower($labelAndColor['label']),
+                                $titleTime
+                            ),
+                            'class' => 'inner-circle',
+                            'style' => sprintf(
+                                'width: %3$s; height: %3$s; background-color: %2$s; margin-top: -%1$Fem; margin-left: -%1$Fem;',
+                                (float) substr($circleWidth, 0, -2) / 2,
+                                $timeInfo[1][$groupName]->getColor(),
+                                (string) $circleWidth
+                            )
                         )
-                    ); ?>" title="<?= $timeInfo[1][$groupName]->getValue(); ?> <?= $labelAndColor['label']; ?>"></a>
+                    ); ?>
                 </div>
             </div>
 <?php endif ?>