Merging upstream version 1.2.4.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 10 insertions, 19 deletions

diff --git a/public/css/module.less b/public/css/module.less
index bb651e7..cf89fc4 100644
--- a/public/css/module.less
+++ b/public/css/module.less
@@ -1,22 +1,5 @@
-div.images {
-    h3 {
-        clear: both;
-    }
-
-    img.svg {
-        float: left;
-        border: none;
-    }
-
-}
-
-div.images.object-detail-view {
-  display: block;
-
-  img.graphiteImg {
+.images.object-detail-view > img {
     width: 100%;
-    display: block;
-  }
 }
 
 .timerangepicker-container {
diff --git a/public/js/module.js b/public/js/module.js
index a2a32f2..89c1a54 100644
--- a/public/js/module.js
+++ b/public/js/module.js
@@ -79,7 +79,15 @@
             container.querySelectorAll('img.graphiteImg[data-actualimageurl]').forEach(img => {
                 let params = { ...this.colorParams }; // Theming ftw!
                 params.r = (new Date()).getTime(); // To bypass the browser cache
-                params.width = img.scrollWidth; // It's either fixed or dependent on parent width
+                params.width = img.scrollWidth;
+                if ('width' in img.dataset) {
+                    // If the width is defined in the data attributes, it has been explicitly defined in a template and
+                    // therefore must be handled specially. In detail areas the image must not be scaled to 100% and
+                    // in the other views it must not exceed the width of the parent container.
+                    // Note the `+str` which will convert str to number.
+                    params.width = Math.min(+img.dataset.width, img.parentElement.clientWidth);
+                    img.style.width = params.width + 'px';
+                }
 
                 img.src = this.icinga.utils.addUrlParams(img.dataset.actualimageurl, params);
             });