From 42b5c38c21aba3b312591eaaab4013ae9b5abadc Mon Sep 17 00:00:00 2001 From: Cristian Deluxe Date: Wed, 7 Dec 2016 05:46:53 +0100 Subject: [PATCH] Moved Scripts to html bottom and some reformatting --- .../templates/munin-categoryview.tmpl | 26 ++++++------- .../templates/munin-comparison-day.tmpl | 1 + .../templates/munin-comparison-month.tmpl | 3 +- .../templates/munin-comparison-week.tmpl | 1 + .../templates/munin-comparison-year.tmpl | 3 +- .../munstrap/templates/munin-domainview.tmpl | 4 +- .../munstrap/templates/munin-nodeview.tmpl | 21 ++++++----- .../munstrap/templates/munin-overview.tmpl | 1 + .../munstrap/templates/munin-problemview.tmpl | 3 +- .../munstrap/templates/munin-serviceview.tmpl | 7 ++-- .../munstrap/templates/partial/footer.tmpl | 27 +------------- .../templates/partial/footer_pre.tmpl | 16 ++++++++ .../munstrap/templates/partial/head.tmpl | 37 +++++++++++-------- .../munstrap/templates/partial/path.tmpl | 20 +++++++++- 14 files changed, 95 insertions(+), 75 deletions(-) create mode 100644 templates/munstrap/templates/partial/footer_pre.tmpl diff --git a/templates/munstrap/templates/munin-categoryview.tmpl b/templates/munstrap/templates/munin-categoryview.tmpl index a9225677..f33bd974 100644 --- a/templates/munstrap/templates/munin-categoryview.tmpl +++ b/templates/munstrap/templates/munin-categoryview.tmpl @@ -18,28 +18,24 @@
"> - " alt="" - class="img-responsive i warn crit" + " alt="" class="img-responsive i warn crit" width="" height=""/> - " alt="" - class="img-responsive i warn crit" - width="" - height=""/> + " alt="" class="img-responsive i warn crit" + width="" + height=""/> - " alt="" - class="img-responsive i warn crit" - width="" - height=""/> + " alt="" class="img-responsive i warn crit" + width="" + height=""/> - " alt="" - class="img-responsive i warn crit" - width="" - height=""/> + " alt="" class="img-responsive i warn crit" + width="" + height=""/> @@ -47,5 +43,5 @@ + - diff --git a/templates/munstrap/templates/munin-comparison-day.tmpl b/templates/munstrap/templates/munin-comparison-day.tmpl index 99fae003..6c26865b 100644 --- a/templates/munstrap/templates/munin-comparison-day.tmpl +++ b/templates/munstrap/templates/munin-comparison-day.tmpl @@ -29,4 +29,5 @@ + diff --git a/templates/munstrap/templates/munin-comparison-month.tmpl b/templates/munstrap/templates/munin-comparison-month.tmpl index 96be02ad..a0964e12 100644 --- a/templates/munstrap/templates/munin-comparison-month.tmpl +++ b/templates/munstrap/templates/munin-comparison-month.tmpl @@ -28,5 +28,6 @@ - + + diff --git a/templates/munstrap/templates/munin-comparison-week.tmpl b/templates/munstrap/templates/munin-comparison-week.tmpl index 5fec1b11..17eca662 100644 --- a/templates/munstrap/templates/munin-comparison-week.tmpl +++ b/templates/munstrap/templates/munin-comparison-week.tmpl @@ -29,5 +29,6 @@ + diff --git a/templates/munstrap/templates/munin-comparison-year.tmpl b/templates/munstrap/templates/munin-comparison-year.tmpl index b0c2daa8..48ee8d75 100644 --- a/templates/munstrap/templates/munin-comparison-year.tmpl +++ b/templates/munstrap/templates/munin-comparison-year.tmpl @@ -28,5 +28,6 @@ - + + \ No newline at end of file diff --git a/templates/munstrap/templates/munin-domainview.tmpl b/templates/munstrap/templates/munin-domainview.tmpl index 115c5c31..2f3c52c4 100644 --- a/templates/munstrap/templates/munin-domainview.tmpl +++ b/templates/munstrap/templates/munin-domainview.tmpl @@ -66,5 +66,5 @@
- - + + diff --git a/templates/munstrap/templates/munin-nodeview.tmpl b/templates/munstrap/templates/munin-nodeview.tmpl index e6e95f63..8dd5ca3f 100644 --- a/templates/munstrap/templates/munin-nodeview.tmpl +++ b/templates/munstrap/templates/munin-nodeview.tmpl @@ -1,31 +1,33 @@ -
+ diff --git a/templates/munstrap/templates/munin-problemview.tmpl b/templates/munstrap/templates/munin-problemview.tmpl index 60ddc972..0adea867 100644 --- a/templates/munstrap/templates/munin-problemview.tmpl +++ b/templates/munstrap/templates/munin-problemview.tmpl @@ -92,4 +92,5 @@ - + + \ No newline at end of file diff --git a/templates/munstrap/templates/munin-serviceview.tmpl b/templates/munstrap/templates/munin-serviceview.tmpl index 3998e461..8bc972a6 100644 --- a/templates/munstrap/templates/munin-serviceview.tmpl +++ b/templates/munstrap/templates/munin-serviceview.tmpl @@ -195,7 +195,8 @@ - + + @@ -228,5 +229,5 @@ }); - - + + \ No newline at end of file diff --git a/templates/munstrap/templates/partial/footer.tmpl b/templates/munstrap/templates/partial/footer.tmpl index 62263e48..1b0d120c 100644 --- a/templates/munstrap/templates/partial/footer.tmpl +++ b/templates/munstrap/templates/partial/footer.tmpl @@ -1,28 +1,3 @@ - -
-
- This page was generated by Munin version at with MunStrap template. -
-
- - - - - + \ No newline at end of file diff --git a/templates/munstrap/templates/partial/footer_pre.tmpl b/templates/munstrap/templates/partial/footer_pre.tmpl new file mode 100644 index 00000000..ec96ecca --- /dev/null +++ b/templates/munstrap/templates/partial/footer_pre.tmpl @@ -0,0 +1,16 @@ + + +
+
+ + This page was generated by Munin + version at + with MunStrap template. + +
+
+ + + + + diff --git a/templates/munstrap/templates/partial/head.tmpl b/templates/munstrap/templates/partial/head.tmpl index 9250da4f..9b40068b 100644 --- a/templates/munstrap/templates/partial/head.tmpl +++ b/templates/munstrap/templates/partial/head.tmpl @@ -2,7 +2,7 @@ Munin <TMPL_LOOP NAME="PATH"><TMPL_IF NAME="pathname"> :: <TMPL_VAR ESCAPE="HTML" NAME="pathname"><TMPL_ELSE>Munin</TMPL_IF></TMPL_LOOP> - + @@ -13,9 +13,8 @@ /static/img/favicon.png" /> /static/css/bootstrap.min.css" rel="stylesheet" /> /static/css/style-munstrap.css" rel="stylesheet" /> - - + - -
- + +
- diff --git a/templates/munstrap/templates/partial/path.tmpl b/templates/munstrap/templates/partial/path.tmpl index fb27324c..49fa8630 100644 --- a/templates/munstrap/templates/partial/path.tmpl +++ b/templates/munstrap/templates/partial/path.tmpl @@ -1 +1,19 @@ - :: ">">Overview + + :: + + "> + + + + + + + + "> + + Overview + + + + +