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

Re-design configuration interface 

refs #5705
This commit is contained in:
Alexander Klimov 2014-03-05 17:40:08 +01:00
parent 360c14b0d5
commit 2f8160d020
4 changed files with 69 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
application/views/scripts/config/authentication.phtml
View File

@ -14,11 +14,9 @@ $createDbBackend = $this->href('/config/createAuthenticationBackend', array('typ
<h1>Create Authentication Provider</h1>
<p>
<a href="<?= $createLdapBackend ?>"><?= $this->img('img/icons/create.png', array('title' => 'Create A New LDAP Authentication Backend'));
?> Create A New LDAP Authentication Backend</a>
<a href="<?= $createLdapBackend ?>"><?= $this->img('img/icons/create.png'); ?> Create A New LDAP Authentication Backend</a>
<br />
<a href="<?= $createDbBackend ?>"><?= $this->img('img/icons/create.png', array('title' => 'Create A New DB Authentication Backend'));
?> Create A New DB Authentication Backend</a>
<a href="<?= $createDbBackend ?>"><?= $this->img('img/icons/create.png'); ?> Create A New DB Authentication Backend</a>
</p>
<table class="configTable">
@ -33,10 +31,10 @@ $createDbBackend = $this->href('/config/createAuthenticationBackend', array('typ
<?= $backend->reorderForm; ?>
</div>
<a href="<?= $this->href('config/editAuthenticationBackend', array('auth_backend' => $backend->name));?>">
<?= $this->img('img/icons/edit.png', array('title' => 'Edit')); ?> Edit</a>&emsp;
<?= $this->img('img/icons/edit.png'); ?> Edit</a>&emsp;
<?php if (count($this->backends) > 1): ?>
<a href="<?= $this->href('config/removeAuthenticationBackend', array('auth_backend' => $backend->name));?>">
<?= $this->img('img/icons/remove.png', array('title' => 'Remove')); ?> Remove</a>&emsp;
<?= $this->img('img/icons/remove.png'); ?> Remove</a>&emsp;
<?php endif; ?>
</div>
</td>

7
application/views/scripts/config/resource.phtml
View File

@ -12,8 +12,7 @@ $createResource = $this->href('/config/createresource');
<?php endif ?>
<h1>Create Resource</h1>
<p><a href="<?= $createResource ?>"><?= $this->img('img/icons/create.png', array('title' => 'Create A New Resource'));
?> Create A New Resource</a></p>
<p><a href="<?= $createResource ?>"><?= $this->img('img/icons/create.png'); ?> Create A New Resource</a></p>
<table class="configTable">
<?php foreach ($this->resources as $name => $resource): ?>
@ -24,10 +23,10 @@ $createResource = $this->href('/config/createresource');
</div>
<div>
<a href="<?= $this->href('config/editresource', array('resource' => $name));?>">
<?= $this->img('img/icons/edit.png', array('title' => 'Edit')); ?> Edit</a>&emsp;
<?= $this->img('img/icons/edit.png'); ?> Edit</a>&emsp;
<?php if (count($this->resources) > 1): ?>
<a href="<?= $this->href('config/removeresource', array('resource' => $name));?>">
<?= $this->img('img/icons/remove.png', array('title' => 'Remove')); ?> Remove</a>&emsp;
<?= $this->img('img/icons/remove.png'); ?> Remove</a>&emsp;
<?php endif; ?>
</div>
</td>

112
modules/monitoring/application/views/scripts/config/index.phtml
View File

@ -1,56 +1,66 @@
<?php use Icinga\Web\Url; ?>
<?= $this->tabs->render($this); ?>
<h3>Monitoring Backends</h3>
<?php if (isset($this->messageBox)): ?>
<?= $this->messageBox->render() ?>
<?php endif ?>
<div>
<a href="<?= Url::fromPath('/monitoring/config/createbackend')->getAbsoluteUrl();?>">
<?= $this->img('img/icons/create.png') ?> Create New Monitoring Backend
</a>
</div>
<br/>
<?php foreach ($this->backends as $backendName => $config): ?>
<div>
<?php $removeUrl = Url::fromPath('/monitoring/config/removebackend', array('backend' => $backendName)); ?>
<?php $editUrl = Url::fromPath('/monitoring/config/editbackend', array('backend' => $backendName)); ?>
<b><?= $this->escape($backendName); ?></b>
<small>(Type: <?= $this->escape($config['type'] === 'ido' ? 'IDO' : ucfirst($config['type'])); ?>)</small>
<div>
<a href="<?= $removeUrl; ?>"><i class="icinga-icon-remove"></i> Remove This Backend</a><br/>
<a href="<?= $editUrl; ?>"><i class="icinga-icon-edit"></i> Edit This Backend</a>
</div>
</div>
<br/>
<?php endforeach; ?>
<br/>
<h3>Monitoring Instances</h3>
<div>
<a href="<?= Url::fromPath('/monitoring/config/createinstance')->getAbsoluteUrl();?>">
<i class="icinga-icon-create"></i> Create New Instance
</a>
<div class="controls">
<?= $this->tabs->render($this); ?>
</div>
<br/>
<?php foreach ($this->instances as $instanceName => $config): ?>
<?php $removeUrl = Url::fromPath('/monitoring/config/removeinstance', array('instance' => $instanceName)); ?>
<?php $editUrl = Url::fromPath('/monitoring/config/editinstance', array('instance' => $instanceName)); ?>
<div>
<b><?= $this->escape($instanceName); ?></b>
<small>(Type: <?= isset($config['host']) ? 'Remote' : 'Local'; ?>)</small>
<div class="content">
<h1>Monitoring Backends</h1>
<div>
<a href="<?= $removeUrl; ?>"><i class="icinga-icon-remove"></i> Remove This Instance</a><br/>
<a href="<?= $editUrl; ?>"><i class="icinga-icon-edit"></i> Edit This Instance</a>
</div>
<?php if (isset($this->messageBox)): ?>
<?= $this->messageBox->render() ?>
<?php endif ?>
<p>
<a href="<?= Url::fromPath('/monitoring/config/createbackend')->getAbsoluteUrl();?>">
<?= $this->img('img/icons/create.png'); ?> Create New Monitoring Backend
</a>
</p>
<table class="configTable">
<?php foreach ($this->backends as $backendName => $config): ?>
<tr>
<td class="configTable">
<?php
$removeUrl = Url::fromPath('/monitoring/config/removebackend', array('backend' => $backendName));
$editUrl = Url::fromPath('/monitoring/config/editbackend', array('backend' => $backendName));
?>
<b><?= $this->escape($backendName); ?></b>
<small>(Type: <?= $this->escape($config['type'] === 'ido' ? 'IDO' : ucfirst($config['type'])); ?>)</small>
<div>
<a href="<?= $removeUrl; ?>"><?= $this->img('img/icons/remove.png'); ?> Remove</a>&emsp;
<a href="<?= $editUrl; ?>"><?= $this->img('img/icons/edit.png'); ?> Edit</a>
</div>
</td>
</tr>
<?php endforeach; ?>
</table>
<h1>Monitoring Instances</h1>
<p>
<a href="<?= Url::fromPath('/monitoring/config/createinstance')->getAbsoluteUrl();?>">
<?= $this->img('img/icons/create.png'); ?> Create New Instance
</a>
</p>
<table class="configTable">
<?php foreach ($this->instances as $instanceName => $config): ?>
<tr>
<td class="configTable">
<?php
$removeUrl = Url::fromPath('/monitoring/config/removeinstance', array('instance' => $instanceName));
$editUrl = Url::fromPath('/monitoring/config/editinstance', array('instance' => $instanceName));
?>
<div>
<b><?= $this->escape($instanceName); ?></b>
<small>(Type: <?= isset($config['host']) ? 'Remote' : 'Local'; ?>)</small>
<div>
<a href="<?= $removeUrl; ?>"><?= $this->img('img/icons/remove.png'); ?> Remove</a>&emsp;
<a href="<?= $editUrl; ?>"><?= $this->img('img/icons/edit.png'); ?> Edit</a>
</div>
</div>
</td>
</tr>
<?php endforeach; ?>
</table>
</div>
<br/>
<?php endforeach; ?>

1
public/css/icinga/forms.less
View File

@ -12,6 +12,7 @@ td.configTable {
border: solid;
border-width: thin;
padding: 10px;
min-width: 300px;
}
div.config-form-group {