tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add missing close buttons to views without tabs

This commit is contained in:
Matthias Jentsch 2014-10-14 17:54:52 +02:00
parent 6124f984ee
commit 937dbe2c15
11 changed files with 56 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
application/views/scripts/config/authentication/create.phtml
View File

@ -1,3 +1,6 @@
<div class="controls">
<?= $this->tabs->showOnlyCloseButton() ?>
</div>
<h4><?= $this->translate('Create New Authentication Backend'); ?></h4>
<p>
<?= $this->translate(

3
application/views/scripts/config/authentication/modify.phtml
View File

@ -1,2 +1,5 @@
<div class="controls">
<?= $this->tabs->showOnlyCloseButton() ?>
</div>
<h4><?= $this->translate('Edit Backend'); ?></h4>
<?= $form; ?>

3
application/views/scripts/config/authentication/remove.phtml
View File

@ -1,2 +1,5 @@
<div class="controls">
<?= $this->tabs->showOnlyCloseButton() ?>
</div>
<h4><?= $this->translate('Remove Backend'); ?></h4>
<?= $form; ?>

3
application/views/scripts/config/resource/create.phtml
View File

@ -1,3 +1,6 @@
<div class="controls">
<?= $this->tabs->showOnlyCloseButton() ?>
</div>
<h4><?= $this->translate('Create A New Resource'); ?></h4>
<p><?= $this->translate('Resources are entities that provide data to Icinga Web 2.'); ?></p>
<?= $form; ?>

3
application/views/scripts/config/resource/modify.phtml
View File

@ -1,2 +1,5 @@
<div class="controls">
<?= $this->tabs->showOnlyCloseButton() ?>
</div>
<h4><?= $this->translate('Edit Existing Resource'); ?></h4>
<?= $form; ?>

3
application/views/scripts/config/resource/remove.phtml
View File

@ -1,2 +1,5 @@
<div class="controls">
<?= $this->tabs->showOnlyCloseButton() ?>
</div>
<h4><?= $this->translate('Remove Existing Resource'); ?></h4>
<?= $form; ?>

34
library/Icinga/Web/Widget/Tabs.php
View File

@ -74,6 +74,13 @@ EOT;
*/
private $dropdownTabs = array();
/**
* Whether only the close-button should by rendered for this tab
*
* @var bool
*/
private $closeButtonOnly = false;
/**
* Whether the tabs should contain a close-button
*
@ -275,14 +282,19 @@ EOT;
*/
public function render()
{
if (empty($this->tabs)) {
return '';
if (empty($this->tabs) || true === $this->closeButtonOnly) {
$tabs = '';
$drop = '';
} else {
$tabs = $this->renderTabs();
$drop = $this->renderDropdownTabs();
}
$close = $this->closeTab ? $this->renderCloseTab() : '';
$html = $this->baseTpl;
$html = str_replace('{TABS}', $this->renderTabs(), $html);
$html = str_replace('{DROPDOWN}', $this->renderDropdownTabs(), $html);
$html = str_replace('{CLOSE}', $this->closeTab ? $this->renderCloseTab() : '', $html);
$html = str_replace('{TABS}', $tabs, $html);
$html = str_replace('{DROPDOWN}', $drop, $html);
$html = str_replace('{CLOSE}', $close, $html);
return $html;
}
@ -318,6 +330,18 @@ EOT;
return $this->tabs;
}
/**
* Whether to hide all elements except of the close button
*
* @param bool $value
* @return Tabs fluent interface
*/
public function showOnlyCloseButton($value = true)
{
$this->closeButtonOnly = $value;
return $this;
}
/**
* Apply a Tabextension on this tabs object
*

4
modules/monitoring/application/views/scripts/partials/command-form.phtml
View File

@ -1,3 +1,7 @@
<div class="controls">
<?= $this->tabs->showOnlyCloseButton() ?>
</div>
<div class="content">
<h1><?= $title ?></h1>
<table class="objectlist">

3
modules/monitoring/application/views/scripts/process/disable-notifications.phtml
View File

@ -1,3 +1,6 @@
<div class="controls">
<?= $this->tabs->showOnlyCloseButton() ?>
</div>
<div class="content">
<h1><?= $title ?></h1>
<?php if ((bool) $programStatus->notifications_enabled === false): ?>

1
modules/monitoring/application/views/scripts/show/contact.phtml
View File

@ -1,5 +1,6 @@
<?php $contactHelper = $this->getHelper('ContactFlags') ?>
<div class="controls">
<?= $this->tabs ?>
<h1><?= $this->translate('Contact details') ?></h1>
<div class="circular" style="margin-top: 1em; margin-left: 2em; width: 120px; height: 120px; float: left; background-image: url('<?=
$this->href('static/gravatar', array('email' => $contact->contact_email))

1
modules/monitoring/application/views/scripts/timeline/index.phtml
View File

@ -8,6 +8,7 @@ $firstRow = !$beingExtended;
?>
<?php if (!$beingExtended): ?>
<div class="controls">
<?= $this->tabs ?>
<div style="margin: 1em;" class="dontprint">
<?= $intervalBox; ?>
</div>