From b193ea5d3242c1024de9d8c552b3c1dc80890cac Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Thu, 10 Dec 2015 12:05:48 +0100 Subject: [PATCH] Fix print styles --- application/layouts/scripts/layout.phtml | 3 +- application/views/scripts/group/list.phtml | 2 +- application/views/scripts/group/show.phtml | 2 +- application/views/scripts/user/list.phtml | 2 +- application/views/scripts/user/show.phtml | 2 +- library/Icinga/Web/StyleSheet.php | 3 +- library/Icinga/Web/Widget/FilterEditor.php | 2 +- .../views/scripts/alertsummary/index.phtml | 2 +- .../views/scripts/list/comments.phtml | 2 +- .../list/components/hostssummary.phtml | 2 +- .../list/components/servicesummary.phtml | 2 +- .../views/scripts/list/downtimes.phtml | 2 +- public/css/icinga/base.less | 6 ---- public/css/icinga/print.less | 31 +++++++++++++++++++ public/css/pdf/pdfprint.less | 26 +++++++++------- 15 files changed, 59 insertions(+), 30 deletions(-) create mode 100644 public/css/icinga/print.less diff --git a/application/layouts/scripts/layout.phtml b/application/layouts/scripts/layout.phtml index b2c14dba0..1a2a24d39 100644 --- a/application/layouts/scripts/layout.phtml +++ b/application/layouts/scripts/layout.phtml @@ -41,13 +41,12 @@ $innerLayoutScript = $this->layout()->innerLayout . '.phtml'; }()); - + - 

diff --git a/application/views/scripts/group/list.phtml b/application/views/scripts/group/list.phtml
index 12e1bd51e..cf0645633 100644
--- a/application/views/scripts/group/list.phtml
+++ b/application/views/scripts/group/list.phtml
@@ -4,7 +4,7 @@ use Icinga\Data\Extensible;
 use Icinga\Data\Reducible;
 
 if (! $this->compact): ?>
-

+

     
     

         sortBox ?>
diff --git a/application/views/scripts/group/show.phtml b/application/views/scripts/group/show.phtml
index a460c7ece..0394fd2f5 100644
--- a/application/views/scripts/group/show.phtml
+++ b/application/views/scripts/group/show.phtml
@@ -23,7 +23,7 @@ if ($this->hasPermission('config/authentication/groups/edit') && $backend instan
 }
 
 ?>
-

+

 compact): ?>
     
 
diff --git a/application/views/scripts/user/list.phtml b/application/views/scripts/user/list.phtml
index 6ed523198..182e26e87 100644
--- a/application/views/scripts/user/list.phtml
+++ b/application/views/scripts/user/list.phtml
@@ -4,7 +4,7 @@ use Icinga\Data\Extensible;
 use Icinga\Data\Reducible;
 
 if (! $this->compact): ?>
-

+

     
     

         sortBox ?>
diff --git a/application/views/scripts/user/show.phtml b/application/views/scripts/user/show.phtml
index 2fc476bed..5aabdd11a 100644
--- a/application/views/scripts/user/show.phtml
+++ b/application/views/scripts/user/show.phtml
@@ -22,7 +22,7 @@ if ($this->hasPermission('config/authentication/users/edit') && $backend instanc
 }
 
 ?>
-

+

 compact): ?>
     
 
diff --git a/library/Icinga/Web/StyleSheet.php b/library/Icinga/Web/StyleSheet.php
index ba19cc530..33cca2121 100644
--- a/library/Icinga/Web/StyleSheet.php
+++ b/library/Icinga/Web/StyleSheet.php
@@ -53,7 +53,8 @@ class StyleSheet
         'css/icinga/dev.less',
 //        'css/icinga/logo.less',
         'css/icinga/spinner.less',
-        'css/icinga/compat.less'
+        'css/icinga/compat.less',
+        'css/icinga/print.less'
     );
 
     /**
diff --git a/library/Icinga/Web/Widget/FilterEditor.php b/library/Icinga/Web/Widget/FilterEditor.php
index 115fb1790..26cea5930 100644
--- a/library/Icinga/Web/Widget/FilterEditor.php
+++ b/library/Icinga/Web/Widget/FilterEditor.php
@@ -703,7 +703,7 @@ class FilterEditor extends AbstractWidget
 
     public function renderSearch()
     {
-        $html = ' 

     tabs; ?>
-    

+    

         
     

     limiter; ?>
diff --git a/modules/monitoring/application/views/scripts/list/comments.phtml b/modules/monitoring/application/views/scripts/list/comments.phtml
index b98bdd3a0..1dd5c4063 100644
--- a/modules/monitoring/application/views/scripts/list/comments.phtml
+++ b/modules/monitoring/application/views/scripts/list/comments.phtml
@@ -1,5 +1,5 @@
 compact): ?>
-

+

     
     render('list/components/selectioninfo.phtml') ?>
     

diff --git a/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml b/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml
index 688fafc0f..4b9f1cdd3 100644
--- a/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml
+++ b/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml
@@ -7,7 +7,7 @@ if (! $stats instanceof stdClass) {
     $stats = $stats->fetchRow();
 }
 ?>
-

+

     qlink(
         sprintf($this->translatePlural('%u Host', '%u Hosts', $stats->hosts_total), $stats->hosts_total),
         // @TODO(el): Fix that
diff --git a/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml b/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml
index a56c33c33..5b0bfc529 100644
--- a/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml
+++ b/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml
@@ -7,7 +7,7 @@ if (! $stats instanceof stdClass) {
     $stats = $stats->fetchRow();
 }
 ?>
-

+

     qlink(
         sprintf($this->translatePlural(
             '%u Service', '%u Services', $stats->services_total),
diff --git a/modules/monitoring/application/views/scripts/list/downtimes.phtml b/modules/monitoring/application/views/scripts/list/downtimes.phtml
index 9a07a0f15..7e0ef6876 100644
--- a/modules/monitoring/application/views/scripts/list/downtimes.phtml
+++ b/modules/monitoring/application/views/scripts/list/downtimes.phtml
@@ -3,7 +3,7 @@ use Icinga\Module\Monitoring\Object\Host;
 use Icinga\Module\Monitoring\Object\Service;
 
 if (! $this->compact): ?>
-

+

     
     render('list/components/selectioninfo.phtml') ?>
     

diff --git a/public/css/icinga/base.less b/public/css/icinga/base.less
index 595618022..40233846c 100644
--- a/public/css/icinga/base.less
+++ b/public/css/icinga/base.less
@@ -148,9 +148,3 @@ td, th {
   font-size: @font-size;
   line-height: @line-height;
 }
-
-@media print {
-  .dont-print {
-    display: none;
-  }
-}
diff --git a/public/css/icinga/print.less b/public/css/icinga/print.less
new file mode 100644
index 000000000..2e86f09b1
--- /dev/null
+++ b/public/css/icinga/print.less
@@ -0,0 +1,31 @@
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+// Print styles
+
+@media print {
+  #fileupload-frame-target,
+  #header,
+  #responsive-debug,
+  #sidebar,
+  .controls > .tabs,
+  .controls .filter,
+  .controls .limiter-control,
+  .controls .pagination-control,
+  .controls .selection-info,
+  .controls .sort-control,
+  .dontprint, // Compat only, use dont-print instead
+  .dont-print {
+    display: none;
+  }
+
+  #layout,
+  #main,
+  .controls {
+    position: static;
+  }
+
+  .container {
+    float: none !important;
+    width: 100% !important;
+  }
+}
diff --git a/public/css/pdf/pdfprint.less b/public/css/pdf/pdfprint.less
index 7b7855eaf..7f6c15e4e 100644
--- a/public/css/pdf/pdfprint.less
+++ b/public/css/pdf/pdfprint.less
@@ -1,6 +1,11 @@
 /*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
-.controls form, .controls .pagination, .controls .widgetLimiter, .controls > .tabs, .dontprint {
+.controls form,
+.controls .pagination,
+.controls .widgetLimiter,
+.controls > .tabs,
+.dontprint, // Compat only, use dont-print instead
+.dont-print {
   display: none !important;
 }
 
@@ -10,7 +15,7 @@ table.action img.inlinepie {
 }
 
 @page {
-	margin: 2cm;
+  margin: 2cm;
 }
 
 .container * {
@@ -26,15 +31,15 @@ body > h1 {
   font-weight: bold;
   position: fixed;
   left: 1em;
-	right: 1em;
-	color: #aaa;
-	font-size: 0.9em;
+  right: 1em;
+  color: #aaa;
+  font-size: 0.9em;
 }
 
 #page-header table, #page-footer table {
-	width: 100%;
-	border-collapse: collapse;
-	border: none;
+  width: 100%;
+  border-collapse: collapse;
+  border: none;
 }
 
 #page-header table {
@@ -45,12 +50,12 @@ body > h1 {
   font-family: fixed;
   padding: 0;
   color: #aaa;
-	width: 50%;
+  width: 50%;
 }
 
 #page-header {
   top: 0.5em;
-	border-bottom: 0.2pt solid #aaa;
+  border-bottom: 0.2pt solid #aaa;
 }
 
 #page-footer {
@@ -93,4 +98,3 @@ h1 form {
 body {
   margin: 1cm 1cm 1.5cm 1cm;
 }
-