Merge branch 'master' into feature/display-documentation-4820

config/dashboard/dashboard.ini

@@ -24,13 +24,9 @@ title = "Landing page"
 
 [Landing.Hostgroups]
 url = "monitoring/chart/hostgroup"
-height = 540
-width = 540
 
 [Landing.Servicegroups]
 url = "monitoring/chart/servicegroup"
-height = 540
-width = 540
 
 [Landing.Unhandled Problem Services]
 url = "monitoring/list/services"

modules/monitoring/application/views/scripts/chart/hostgroup.phtml

@@ -1,5 +1,5 @@
 
-<div style="max-width:<?= $this->width; ?>px;max-height:<?= $this->height; ?>px;margin:auto;">
+<div style="max-height:548px; margin:auto;">
 <?=
 $chart->render();
 ?>

modules/monitoring/application/views/scripts/chart/servicegroup.phtml

@@ -1,5 +1,5 @@
 
-<div style="max-width:<?= $this->width; ?>px;max-height:<?= $this->height; ?>px;margin:auto;">
+<div style="max-height:548px; margin:auto;">
 <?=
 $chart->render();
 ?>

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

@@ -22,7 +22,7 @@ foreach ($groupData as $groupName => $groupInfo): ?>
                 <div class="box entry">
                     <img src="<?= $this->href('/static/gravatar', array('email' => $c->contact_email )) ?>" />
                     <a href="<?= $this->href(
-                        'monitoring/show/contacts',
+                        'monitoring/show/contact',
                         array('contact' => $c->contact_name)
                     ); ?>">
                         <?= $this->escape($c->contact_alias) ?>

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

@@ -26,23 +26,23 @@ $contactHelper = $this->getHelper('ContactFlags');
             <div><?= sprintf(
                 '%1$s: <a href="mailto:%2$s">%2$s</a>',
                 t('Email'),
-                htmlspecialchars($contact->contact_email)
+                $this->escape($contact->contact_email)
             ) ?></div>
             <?php if ($contact->contact_pager): ?>
             <div>
                 <?= t('Pager') ?>:
-                <?= htmlspecialchars($contact->contact_pager) ?>
+                <?= $this->escape($contact->contact_pager) ?>
             </div>
             <?php endif; ?>
             <div style="clear: both;"></div>
             <div class="notification-periods">
                 <div>
                     <?= t('Service notification period') ?>:
-                    <?= htmlspecialchars($contact->contact_notify_service_timeperiod) ?>
+                    <?= $this->escape($contact->contact_notify_service_timeperiod) ?>
                 </div>
                 <div>
                     <?= t('Host notification period') ?>:
-                    <?= htmlspecialchars($contact->contact_notify_host_timeperiod) ?>
+                    <?= $this->escape($contact->contact_notify_host_timeperiod) ?>
                 </div>
             </div>
         </div>

modules/monitoring/application/views/scripts/show/contact.phtml

@@ -7,8 +7,8 @@ $contactHelper = $this->getHelper('ContactFlags');
             <thead>
             <tr>
                 <th colspan="2" style="text-align: left">
-                    <?= htmlspecialchars($contact->contact_name) ?><span style="font-weight: normal;"> (<?=
+                    <?= $this->escape($contact->contact_name) ?><span style="font-weight: normal;"> (<?=
-                        htmlspecialchars($contact->contact_alias)
+                        $this->escape($contact->contact_alias)
                         ?>)</span>
                 </th>
             </tr>
@@ -18,30 +18,30 @@ $contactHelper = $this->getHelper('ContactFlags');
                 <td><?= t('Email') ?></td>
                 <td><?php printf(
                         '<a href="mailto:%1$s">%1$s</a>',
-                        htmlspecialchars($contact->contact_email)
+                        $this->escape($contact->contact_email)
                     ); ?></td>
             </tr>
             <?php if ($contact->contact_pager): ?>
                 <tr>
                     <td><?= t('Pager') ?></td>
-                    <td><?= htmlspecialchars($contact->contact_pager) ?></td>
+                    <td><?= $this->escape($contact->contact_pager) ?></td>
                 </tr>
             <?php endif; ?>
             <tr>
                 <td><?= t('Flags (service)') ?></td>
-                <td><?= htmlspecialchars($contactHelper->contactFlags($contact, 'service')) ?></td>
+                <td><?= $this->escape($contactHelper->contactFlags($contact, 'service')) ?></td>
             </tr>
             <tr>
                 <td><?= t('Flags (host)') ?></td>
-                <td><?= htmlspecialchars($contactHelper->contactFlags($contact, 'host')) ?></td>
+                <td><?= $this->escape($contactHelper->contactFlags($contact, 'host')) ?></td>
             </tr>
             <tr>
                 <td><?= t('Service notification period') ?></td>
-                <td><?= htmlspecialchars($contact->contact_notify_service_timeperiod) ?></td>
+                <td><?= $this->escape($contact->contact_notify_service_timeperiod) ?></td>
             </tr>
             <tr>
                 <td><?= t('Host notification period') ?></td>
-                <td><?= htmlspecialchars($contact->contact_notify_host_timeperiod) ?></td>
+                <td><?= $this->escape($contact->contact_notify_host_timeperiod) ?></td>
             </tr>
             </tbody>
         </table>