[icinga-checkins] icinga.org: icingaweb2-module-director/feature/job-scheduling-11627: views /scripts, css: fix web2.3.x issues, improve...

git at icinga.org git at icinga.org
Mon May 2 10:43:11 CEST 2016


Module: icingaweb2-module-director
Branch: feature/job-scheduling-11627
Commit: 7279fd7c40412a165dad8fec5878775b67162d2c
URL:    https://git.icinga.org/?p=icingaweb2-module-director.git;a=commit;h=7279fd7c40412a165dad8fec5878775b67162d2c

Author: Thomas Gelf <thomas at gelf.net>
Date:   Mon May  2 10:30:01 2016 +0200

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

...responsiveness for dashboard and dashlets

---

 application/views/scripts/command/arguments.phtml |    2 +-
 application/views/scripts/config/file.phtml       |    2 +-
 application/views/scripts/config/files.phtml      |    2 +-
 application/views/scripts/host/services.phtml     |    2 +-
 application/views/scripts/list/importrun.phtml    |    2 +-
 application/views/scripts/list/table.phtml        |    2 +-
 application/views/scripts/object/fields.phtml     |    2 +-
 application/views/scripts/object/form.phtml       |    2 +-
 application/views/scripts/object/show.phtml       |    2 +-
 application/views/scripts/objects/table.phtml     |    2 +-
 application/views/scripts/syncrule/history.phtml  |    2 +-
 public/css/module.less                            |   21 ++++++++++++++-------
 12 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/application/views/scripts/command/arguments.phtml b/application/views/scripts/command/arguments.phtml
index e5a0458..693053d 100644
--- a/application/views/scripts/command/arguments.phtml
+++ b/application/views/scripts/command/arguments.phtml
@@ -1,7 +1,7 @@
 <div class="controls">
 <?= $this->tabs ?>
 <h1><?= $this->escape($this->title) ?></h1>
-<span data-base-target="_next">
+<span class="action-links" data-base-target="_next">
 <?= $this->addLink ?>
 </div>
 
diff --git a/application/views/scripts/config/file.phtml b/application/views/scripts/config/file.phtml
index 468bf95..586ba87 100644
--- a/application/views/scripts/config/file.phtml
+++ b/application/views/scripts/config/file.phtml
@@ -1,7 +1,7 @@
 <div class="controls">
 <?= $this->tabs ?>
 <h1><?= $title ?></h1>
-<span data-base-target="_self">
+<span class="action-links" data-base-target="_self">
 <?= $this->addLink ?>
 </span>
 </div>
diff --git a/application/views/scripts/config/files.phtml b/application/views/scripts/config/files.phtml
index d9663b8..db7dab9 100644
--- a/application/views/scripts/config/files.phtml
+++ b/application/views/scripts/config/files.phtml
@@ -1,7 +1,7 @@
 <div class="controls">
 <?= $this->tabs ?>
 <h1><?= $this->escape($this->title) ?></h1>
-<span data-base-target="_next">
+<span class="action-links" data-base-target="_next">
 <?= $this->addLink ?>
 </span>
 <?php if (count($table) || ! $this->filterEditor->getFilter()->isEmpty()): ?>
diff --git a/application/views/scripts/host/services.phtml b/application/views/scripts/host/services.phtml
index 83e1115..2109b7b 100644
--- a/application/views/scripts/host/services.phtml
+++ b/application/views/scripts/host/services.phtml
@@ -1,7 +1,7 @@
 <div class="controls">
 <?= $this->tabs ?>
 <h1><?= $this->escape($this->title) ?></h1>
-<span>
+<span class="action-links">
 <?= $this->addLink ?>
 </span>
 <?php if (count($table) || ($this->filterEditor && ! $this->filterEditor->getFilter()->isEmpty())): ?>
diff --git a/application/views/scripts/list/importrun.phtml b/application/views/scripts/list/importrun.phtml
index b58bdd8..ce1db76 100644
--- a/application/views/scripts/list/importrun.phtml
+++ b/application/views/scripts/list/importrun.phtml
@@ -27,7 +27,7 @@ $pt = $loc['thousands_sep'];
  </tr>
 </tbody>
 </table>
-<span data-base-target="_next">
+<span class="action-links" data-base-target="_next">
 <?= $this->addLink ?>
 </span><br />
 <?= $this->table->getPaginator() ?>
diff --git a/application/views/scripts/list/table.phtml b/application/views/scripts/list/table.phtml
index e444b7a..518c1a7 100644
--- a/application/views/scripts/list/table.phtml
+++ b/application/views/scripts/list/table.phtml
@@ -1,7 +1,7 @@
 <div class="controls">
 <?= $this->tabs ?>
 <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 ?>
 </span>
 <?= $this->filterEditor ?>
diff --git a/application/views/scripts/object/fields.phtml b/application/views/scripts/object/fields.phtml
index 64bd111..22ae8a7 100644
--- a/application/views/scripts/object/fields.phtml
+++ b/application/views/scripts/object/fields.phtml
@@ -1,7 +1,7 @@
 <div class="controls">
 <?= $this->tabs ?>
 <h1><?= $this->escape($this->title) ?></h1>
-<span>
+<span class="action-links">
 <?= $this->actionLinks ?>
 </span>
 </div>
diff --git a/application/views/scripts/object/form.phtml b/application/views/scripts/object/form.phtml
index e697c04..004f2da 100644
--- a/application/views/scripts/object/form.phtml
+++ b/application/views/scripts/object/form.phtml
@@ -1,7 +1,7 @@
 <div class="controls">
 <?= $this->tabs ?>
 <h1><?= $this->escape($this->title) ?></h1>
-<span>
+<span class="action-links">
 <?= $this->actionLinks ?>
 <?= $this->render('object/deploymentLink.phtml') ?>
 </span>
diff --git a/application/views/scripts/object/show.phtml b/application/views/scripts/object/show.phtml
index 66fac28..fd71724 100644
--- a/application/views/scripts/object/show.phtml
+++ b/application/views/scripts/object/show.phtml
@@ -1,7 +1,7 @@
 <div class="controls">
 <?= $this->tabs ?>
 <h1><?= $this->escape($this->title) ?></h1>
-<span>
+<span class="action-links">
 <?= $this->actionLinks ?>
 </span>
 </div>
diff --git a/application/views/scripts/objects/table.phtml b/application/views/scripts/objects/table.phtml
index 549f460..e29bb64 100644
--- a/application/views/scripts/objects/table.phtml
+++ b/application/views/scripts/objects/table.phtml
@@ -3,7 +3,7 @@
 <?= $this->tabs ?>
 
 <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 ?>
 </span>
 <?php if ($this->filterEditor): ?>
diff --git a/application/views/scripts/syncrule/history.phtml b/application/views/scripts/syncrule/history.phtml
index a225d77..9994dd0 100644
--- a/application/views/scripts/syncrule/history.phtml
+++ b/application/views/scripts/syncrule/history.phtml
@@ -1,7 +1,7 @@
 <div class="controls">
 <?= $this->tabs ?>
 <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 ?>
 </span>
 <?= $this->filterEditor ?>
diff --git a/public/css/module.less b/public/css/module.less
index 4972edf..734d602 100644
--- a/public/css/module.less
+++ b/public/css/module.less
@@ -34,9 +34,11 @@ span.disabled {
   color: @gray-light;
 }
 
-.controls span a {
-  color: @icinga-blue;
-  margin-right: 1em;
+.controls span.action-links {
+  a {
+    color: @icinga-blue;
+    margin-right: 1em;
+  }
 }
 
 pre.disabled {
@@ -404,9 +406,15 @@ a:hover::before {
   text-decoration: none;
 }
 
+h1 {
+    min-width: 27em;
+}
+
 ul.main-actions {
   margin: 0;
   padding: 0;
+  min-width: 36em;
+
   li {
     list-style-type: none;
 
@@ -415,7 +423,6 @@ ul.main-actions {
     padding: 0;
     clear: both;
     width: 19em;
-    min-width: 16em;
     vertical-align: top;
 
     a {
@@ -450,7 +457,6 @@ ul.main-actions {
         }
 
         padding: 1em;
-        font-size: 1.1em;
         color: #666;
         font-weight: bold;
         display: block;
@@ -477,8 +483,9 @@ ul.main-actions {
 #layout.poor-layout ul.main-actions {
   li {
     a { height: 12em; }
+    width: 18em;
     > a > i {
-      font-size: 2.4em;
+      font-size: 2em;
     }
   }
 }
@@ -487,7 +494,7 @@ ul.main-actions {
 #layout.twocols ul.main-actions {
   li {
     a { height: 12em; }
-    width: 16em;
+    width: 17em;
     > a > i {
       font-size: 1.8em;
     }



More information about the icinga-checkins mailing list