Fix icon identifer and capitalization

refs #4550
refs #4584
This commit is contained in:
Marius Hein 2013-08-23 10:58:58 +02:00
parent 895976550c
commit 2f610b70ac
5 changed files with 29 additions and 30 deletions

View File

@ -93,7 +93,7 @@ class DbBackendForm extends BaseBackendForm
) )
); );
$this->setSubmitLabel('{{SAVE_ICON}} Save backend'); $this->setSubmitLabel('{{SAVE_ICON}} Save Backend');
} }
/** /**

View File

@ -65,7 +65,7 @@ class Zend_View_Helper_MonitoringCommands extends Zend_View_Helper_Abstract
$definition->shortDescription, $definition->shortDescription,
$definition->longDescription, $definition->longDescription,
$definition->iconCls, $definition->iconCls,
$definition->btnCls ($definition->btnCls) ? $definition->btnCls : 'btn-default'
); );
if ($type === Meta::TYPE_FULL) { if ($type === Meta::TYPE_FULL) {

View File

@ -43,11 +43,11 @@ $downtimes = $downtimes->fetchAll();
'downtime_internal_downtime_id' => 'Downtime ID', 'downtime_internal_downtime_id' => 'Downtime ID',
'downtime_duration' => 'Duration', 'downtime_duration' => 'Duration',
) )
) );
?> ?>
<noscript> <noscript>
<button class="btn btn-small btn-default" > <button class="btn btn-small btn-default" >
<i>REFRESH ICON</i> <i>{{REFRESH_ICON}}</i>
</button> </button>
</noscript> </noscript>
</form> </form>
@ -90,14 +90,13 @@ $downtimes = $downtimes->fetchAll();
<?= ($downtime->downtime_is_in_effect == 0 ? 'False' : '<b>True</b>'); ?> <?= ($downtime->downtime_is_in_effect == 0 ? 'False' : '<b>True</b>'); ?>
</td> </td>
<td> <td>
<div > <div>
<?php if ($downtime->object_type == 'service'): ?> <?php if ($downtime->object_type == 'service'): ?>
<img title="Service" src="<?='../../img/classic/service.png'?>"/> {{SERVICE_ICON}}
<?php endif; ?> <?php endif; ?>
<?php if ($downtime->object_type == 'host'): ?> <?php if ($downtime->object_type == 'host'): ?>
<img title="Host" src="<?='../../img/classic/server.png'?>"/> {{HOST_ICON}}
<?php endif; ?> <?php endif; ?>
</div> </div>
</td> </td>

View File

@ -1,7 +1,7 @@
<?= $this->tabs->render($this); ?> <?= $this->tabs->render($this); ?>
<?php <?php
$formatter = $this->getHelper('MonitoringProperties'); $formatter = $this->getHelper('MonitoringProperties');
?> ?>
<form method="get" action="<?= <form method="get" action="<?=
@ -24,7 +24,7 @@ $formatter = $this->getHelper('MonitoringProperties');
?> ?>
<noscript> <noscript>
<button class="btn btn-small btn-default"> <button class="btn btn-small btn-default">
<i>REFRESH ICON</i> {{REFRESH_ICON}}
</button> </button>
</noscript> </noscript>
</form> </form>
@ -42,7 +42,7 @@ echo $this->paginationControl($notifications, null, null, array('preserve' => $t
<th>Type</th> <th>Type</th>
<th>Time</th> <th>Time</th>
<th>Contact</th> <th>Contact</th>
<th>Notification command</th> <th>Notification Command</th>
<th>Information</th> <th>Information</th>
</tr> </tr>
</thead> </thead>

View File

@ -21,7 +21,7 @@
$row[] = '<button type="button" data-target="command" class="btn btn-warning"' $row[] = '<button type="button" data-target="command" class="btn btn-warning"'
. ' data-command-id="29" data-command-info="'. $downtime->downtime_internal_downtime_id. '"' . ' data-command-id="29" data-command-info="'. $downtime->downtime_internal_downtime_id. '"'
. '><i class="icon-delete"></i> Delete' . '>{{REMOVE_ICON}} Remove'
. '</button>'; . '</button>';
$list[] = '<td>'. implode('</td><td>', $row). '</td>'; $list[] = '<td>'. implode('</td><td>', $row). '</td>';