views/scripts, css: fix web2.3.x issues, improve...

...responsiveness for dashboard and dashlets
This commit is contained in:
Thomas Gelf 2016-05-02 10:30:01 +02:00
parent f7bd50838d
commit 7279fd7c40
12 changed files with 25 additions and 18 deletions

View File

@ -1,7 +1,7 @@
<div class="controls"> <div class="controls">
<?= $this->tabs ?> <?= $this->tabs ?>
<h1><?= $this->escape($this->title) ?></h1> <h1><?= $this->escape($this->title) ?></h1>
<span data-base-target="_next"> <span class="action-links" data-base-target="_next">
<?= $this->addLink ?> <?= $this->addLink ?>
</div> </div>

View File

@ -1,7 +1,7 @@
<div class="controls"> <div class="controls">
<?= $this->tabs ?> <?= $this->tabs ?>
<h1><?= $title ?></h1> <h1><?= $title ?></h1>
<span data-base-target="_self"> <span class="action-links" data-base-target="_self">
<?= $this->addLink ?> <?= $this->addLink ?>
</span> </span>
</div> </div>

View File

@ -1,7 +1,7 @@
<div class="controls"> <div class="controls">
<?= $this->tabs ?> <?= $this->tabs ?>
<h1><?= $this->escape($this->title) ?></h1> <h1><?= $this->escape($this->title) ?></h1>
<span data-base-target="_next"> <span class="action-links" data-base-target="_next">
<?= $this->addLink ?> <?= $this->addLink ?>
</span> </span>
<?php if (count($table) || ! $this->filterEditor->getFilter()->isEmpty()): ?> <?php if (count($table) || ! $this->filterEditor->getFilter()->isEmpty()): ?>

View File

@ -1,7 +1,7 @@
<div class="controls"> <div class="controls">
<?= $this->tabs ?> <?= $this->tabs ?>
<h1><?= $this->escape($this->title) ?></h1> <h1><?= $this->escape($this->title) ?></h1>
<span> <span class="action-links">
<?= $this->addLink ?> <?= $this->addLink ?>
</span> </span>
<?php if (count($table) || ($this->filterEditor && ! $this->filterEditor->getFilter()->isEmpty())): ?> <?php if (count($table) || ($this->filterEditor && ! $this->filterEditor->getFilter()->isEmpty())): ?>

View File

@ -27,7 +27,7 @@ $pt = $loc['thousands_sep'];
</tr> </tr>
</tbody> </tbody>
</table> </table>
<span data-base-target="_next"> <span class="action-links" data-base-target="_next">
<?= $this->addLink ?> <?= $this->addLink ?>
</span><br /> </span><br />
<?= $this->table->getPaginator() ?> <?= $this->table->getPaginator() ?>

View File

@ -1,7 +1,7 @@
<div class="controls"> <div class="controls">
<?= $this->tabs ?> <?= $this->tabs ?>
<h1><?= $this->escape($this->title) ?></h1> <h1><?= $this->escape($this->title) ?></h1>
<span<?php if (! $this->stayHere): ?> data-base-target="_next"<?php endif ?>> <span class="action-links"<?php if (! $this->stayHere): ?> data-base-target="_next"<?php endif ?>>
<?= $this->addLink ?> <?= $this->addLink ?>
</span> </span>
<?= $this->filterEditor ?> <?= $this->filterEditor ?>

View File

@ -1,7 +1,7 @@
<div class="controls"> <div class="controls">
<?= $this->tabs ?> <?= $this->tabs ?>
<h1><?= $this->escape($this->title) ?></h1> <h1><?= $this->escape($this->title) ?></h1>
<span> <span class="action-links">
<?= $this->actionLinks ?> <?= $this->actionLinks ?>
</span> </span>
</div> </div>

View File

@ -1,7 +1,7 @@
<div class="controls"> <div class="controls">
<?= $this->tabs ?> <?= $this->tabs ?>
<h1><?= $this->escape($this->title) ?></h1> <h1><?= $this->escape($this->title) ?></h1>
<span> <span class="action-links">
<?= $this->actionLinks ?> <?= $this->actionLinks ?>
<?= $this->render('object/deploymentLink.phtml') ?> <?= $this->render('object/deploymentLink.phtml') ?>
</span> </span>

View File

@ -1,7 +1,7 @@
<div class="controls"> <div class="controls">
<?= $this->tabs ?> <?= $this->tabs ?>
<h1><?= $this->escape($this->title) ?></h1> <h1><?= $this->escape($this->title) ?></h1>
<span> <span class="action-links">
<?= $this->actionLinks ?> <?= $this->actionLinks ?>
</span> </span>
</div> </div>

View File

@ -3,7 +3,7 @@
<?= $this->tabs ?> <?= $this->tabs ?>
<h1><?= $this->escape($this->title) ?><?= $this->quickSearch ?></h1> <h1><?= $this->escape($this->title) ?><?= $this->quickSearch ?></h1>
<span<?php if (! $this->stayHere): ?> data-base-target="_next"<?php endif ?>> <span class="action-links"<?php if (! $this->stayHere): ?> data-base-target="_next"<?php endif ?>>
<?= $this->addLink ?> <?= $this->addLink ?>
</span> </span>
<?php if ($this->filterEditor): ?> <?php if ($this->filterEditor): ?>

View File

@ -1,7 +1,7 @@
<div class="controls"> <div class="controls">
<?= $this->tabs ?> <?= $this->tabs ?>
<h1><?= $this->escape($this->title) ?></h1> <h1><?= $this->escape($this->title) ?></h1>
<span<?php if (! $this->stayHere): ?> data-base-target="_next"<?php endif ?>> <span class="action-links"<?php if (! $this->stayHere): ?> data-base-target="_next"<?php endif ?>>
<?= $this->addLink ?> <?= $this->addLink ?>
</span> </span>
<?= $this->filterEditor ?> <?= $this->filterEditor ?>

View File

@ -34,9 +34,11 @@ span.disabled {
color: @gray-light; color: @gray-light;
} }
.controls span a { .controls span.action-links {
color: @icinga-blue; a {
margin-right: 1em; color: @icinga-blue;
margin-right: 1em;
}
} }
pre.disabled { pre.disabled {
@ -404,9 +406,15 @@ a:hover::before {
text-decoration: none; text-decoration: none;
} }
h1 {
min-width: 27em;
}
ul.main-actions { ul.main-actions {
margin: 0; margin: 0;
padding: 0; padding: 0;
min-width: 36em;
li { li {
list-style-type: none; list-style-type: none;
@ -415,7 +423,6 @@ ul.main-actions {
padding: 0; padding: 0;
clear: both; clear: both;
width: 19em; width: 19em;
min-width: 16em;
vertical-align: top; vertical-align: top;
a { a {
@ -450,7 +457,6 @@ ul.main-actions {
} }
padding: 1em; padding: 1em;
font-size: 1.1em;
color: #666; color: #666;
font-weight: bold; font-weight: bold;
display: block; display: block;
@ -477,8 +483,9 @@ ul.main-actions {
#layout.poor-layout ul.main-actions { #layout.poor-layout ul.main-actions {
li { li {
a { height: 12em; } a { height: 12em; }
width: 18em;
> a > i { > a > i {
font-size: 2.4em; font-size: 2em;
} }
} }
} }
@ -487,7 +494,7 @@ ul.main-actions {
#layout.twocols ul.main-actions { #layout.twocols ul.main-actions {
li { li {
a { height: 12em; } a { height: 12em; }
width: 16em; width: 17em;
> a > i { > a > i {
font-size: 1.8em; font-size: 1.8em;
} }