Merge branch 'feature/simplified-event-history-date-and-time-representation-11629'

resolves #11629

modules/monitoring/application/locale/de_DE/LC_MESSAGES/monitoring.po

@@ -2,21 +2,21 @@
 # Copyright (C) 2016 Icinga Development Team
 # This file is distributed under the same license as Monitoring Module.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
-#, fuzzy
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: Monitoring Module (2.1.2)\n"
 "Report-Msgid-Bugs-To: dev@icinga.org\n"
 "POT-Creation-Date: 2016-02-29 14:40+0000\n"
-"PO-Revision-Date: 2015-11-16 14:50+0100\n"
+"PO-Revision-Date: 2016-04-26 12:08+0200\n"
 "Last-Translator: Thomas Gelf <thomas@gelf.net>\n"
 "Language: de_DE\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Language-Team: \n"
+"X-Generator: Poedit 1.8.7.1\n"
 
 #: /vagrant/modules/monitoring/application/controllers/ChartController.php:375
 msgid " Down Hosts (Handled)"
@@ -4387,6 +4387,11 @@ msgstr "nicht erreichbar"
 msgid "is reachable"
 msgstr "erreichbar"
 
+#: /vagrant/modules/monitoring/application/views/scripts/partials/event-history.phtml:41
+msgctxt "date.verbose"
+msgid "%A, %B %e, %Y"
+msgstr "%A, %e. %B %Y"
+
 #: /vagrant/modules/monitoring/application/views/scripts/alertsummary/index.phtml:35
 msgid "notifications per hour"
 msgstr "Benachrichtigungen per Stunde"

modules/monitoring/application/views/scripts/list/eventhistory.phtml

@@ -12,6 +12,12 @@ if (! $this->compact): ?>
 <?php endif ?>
 <?= $this->partial(
     'partials/event-history.phtml',
-    array('compact' => $this->compact, 'history' => $history, 'isOverview' => true, 'tableCssClass' => 'table-row-selectable')
+    array(
+        'compact' => $this->compact,
+        'history' => $history,
+        'isOverview' => true,
+        'tableCssClass' => 'table-row-selectable',
+        'translationDomain' => $this->translationDomain
+    )
 ) ?>
 

modules/monitoring/application/views/scripts/partials/event-history.phtml

@@ -31,6 +31,10 @@ $history->limit($limit * $page);
     <p><?= $this->translate('No historical events found matching the filter.') ?></p>
 </div>
 <?php return; endif ?>
+<?php
+$dateFormat = $this->translate('%A, %B %e, %Y', 'date.verbose');
+$lastDate = null;
+?>
     <table class="state-table" data-base-target="_next"<?php if (isset($tableCssClass)): ?> class="<?=$tableCssClass ?>"<?php endif ?>>
     <tbody>
     <?php foreach ($history->peekAhead() as $event):
@@ -104,13 +108,22 @@ $history->limit($limit * $page);
                 $label = $this->translate('DOWNTIME END');
                 break;
         } ?>
+        <?php
+        $currentDate = strftime($dateFormat, (int) $event->timestamp);
+        if ($currentDate !== $lastDate):
+            $lastDate = $currentDate;
+        ?>
+            <tr>
+                <th colspan="2"><?= $currentDate ?></th>
+            </tr>
+        <?php endif ?>
         <tr>
             <td class="state-col state-<?= $stateName ?>">
             <?php if ($history->getIteratorPosition() % $limit === 0): ?>
                 <a id="page-<?= $history->getIteratorPosition() / $limit + 1 ?>"></a>
             <?php endif ?>
                 <div class="state-label"><?= $this->escape($label) ?></div>
-                <div class="state-meta"><?= $this->timeAgo($event->timestamp, $this->compact) ?></div>
+                <div class="state-meta"><?= $this->formatTime($event->timestamp) ?></div>
             </td>
             <td>
                 <?php if ($this->isOverview): ?>