diff --git a/web/app/widgets/chart/chart.widget.js b/web/app/widgets/chart/chart.widget.js index 6a54661a..35a61256 100755 --- a/web/app/widgets/chart/chart.widget.js +++ b/web/app/widgets/chart/chart.widget.js @@ -38,7 +38,7 @@ var height = element[0].parentNode.parentNode.parentNode.style.height.replace('px', ''); if (scope.vm.widget.charttype === 'rrd4j') { // why? scope.vm.width = sprintf("%d", width - 109); - scope.vm.height = sprintf("%d", height - 78); + scope.vm.height = sprintf("%d", height - 91); } else if (scope.vm.widget.charttype === 'default') { scope.vm.width = sprintf("%d", width - 20); scope.vm.height = sprintf("%d", height - 20); diff --git a/web/index.html b/web/index.html index f0c99934..14dbc48e 100755 --- a/web/index.html +++ b/web/index.html @@ -5,7 +5,7 @@ HABpanel - + diff --git a/web/vendor/vendor.min.css b/web/vendor/vendor.min.css old mode 100644 new mode 100755 index 7a340b7c..967cde51 --- a/web/vendor/vendor.min.css +++ b/web/vendor/vendor.min.css @@ -1,4 +1,4 @@ -.chart-tooltip,.rzslider{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none}.chart-legend .item,.chart-tooltip{font-family:sans-serif;font-weight:100}.chart .axis,.chart .grid .tick>line,.chart .hline,.tooltip-line{shape-rendering:crispEdges}@font-face{font-family:Roboto;src:url(fonts/roboto/Roboto-Regular.eot);src:local("Roboto Regular"),local("Roboto-Regular"),url(fonts/roboto/Roboto-Regular.eot?#iefix) format("embedded-opentype"),url(fonts/roboto/Roboto-Regular.woff2) format("woff2"),url(fonts/roboto/Roboto-Regular.woff) format("woff"),url(fonts/roboto/Roboto-Regular.ttf) format("truetype"),url(fonts/roboto/Roboto-Regular.svg#Roboto) format("svg");font-weight:400;font-style:normal}.gridster{position:relative;margin:auto;height:0}.gridster>ul{margin:0;list-style:none;padding:0}.gridster-item{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;list-style:none;z-index:2;position:absolute;display:none}.gridster-loaded{-webkit-transition:height .3s;-moz-transition:height .3s;-o-transition:height .3s;transition:height .3s}.gridster-loaded .gridster-item{display:block;position:absolute;-webkit-transition:opacity .3s,left .3s,top .3s,width .3s,height .3s;-moz-transition:opacity .3s,left .3s,top .3s,width .3s,height .3s;-o-transition:opacity .3s,left .3s,top .3s,width .3s,height .3s;transition:opacity .3s,left .3s,top .3s,width .3s,height .3s;-webkit-transition-delay:50ms;-moz-transition-delay:50ms;-o-transition-delay:50ms;transition-delay:50ms}.gridster-loaded .gridster-preview-holder{display:none;z-index:1;position:absolute;background-color:#ddd;border-color:#fff;opacity:.2}.gridster-loaded .gridster-item.gridster-item-moving,.gridster-loaded .gridster-preview-holder{-webkit-transition:none;-moz-transition:none;-o-transition:none;transition:none}.gridster-mobile{height:auto!important}.gridster-mobile .gridster-item{height:auto;position:static;float:none}.gridster-item.ng-leave.ng-leave-active{opacity:0}.gridster-item.ng-enter{opacity:1}.gridster-item-moving{z-index:3}.gridster-item-resizable-handler{position:absolute;font-size:1px;display:block;z-index:5}.handle-se{cursor:se-resize;width:0;height:0;right:1px;bottom:1px;border-style:solid;border-width:0 0 12px 12px;border-color:transparent}.handle-ne,.handle-nw,.handle-sw{height:12px;width:12px}.handle-ne{cursor:ne-resize;right:1px;top:1px}.handle-nw{cursor:nw-resize;left:1px;top:1px}.handle-sw{cursor:sw-resize;left:1px;bottom:1px}.handle-e{cursor:e-resize;width:12px;bottom:0;right:1px;top:0}.handle-n,.handle-s{height:12px;right:0;left:0}.handle-s{cursor:s-resize;bottom:1px}.handle-n{cursor:n-resize;top:1px}.handle-w{cursor:w-resize;width:12px;left:1px;top:0;bottom:0}.gridster .gridster-item:hover .gridster-box{border:1.5px solid #B3B2B3}.gridster .gridster-item:hover .handle-se{border-color:transparent transparent #ccc}/*! angularjs-slider - v5.4.3 - +.chart-tooltip,.rzslider{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none}.chart-legend .item,.chart-tooltip{font-family:sans-serif;font-weight:100}.chart .axis,.chart .grid .tick>line,.chart .hline,.tooltip-line{shape-rendering:crispEdges}@font-face{font-family:Roboto;src:url(../fonts/roboto/Roboto-Regular.eot);src:local("Roboto Regular"),local("Roboto-Regular"),url(../fonts/roboto/Roboto-Regular.eot?#iefix) format("embedded-opentype"),url(../fonts/roboto/Roboto-Regular.woff2) format("woff2"),url(../fonts/roboto/Roboto-Regular.woff) format("woff"),url(../fonts/roboto/Roboto-Regular.ttf) format("truetype"),url(../fonts/roboto/Roboto-Regular.svg#Roboto) format("svg");font-weight:400;font-style:normal}.gridster{position:relative;margin:auto;height:0}.gridster>ul{margin:0;list-style:none;padding:0}.gridster-item{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;list-style:none;z-index:2;position:absolute;display:none}.gridster-loaded{-webkit-transition:height .3s;-moz-transition:height .3s;-o-transition:height .3s;transition:height .3s}.gridster-loaded .gridster-item{display:block;position:absolute;-webkit-transition:opacity .3s,left .3s,top .3s,width .3s,height .3s;-moz-transition:opacity .3s,left .3s,top .3s,width .3s,height .3s;-o-transition:opacity .3s,left .3s,top .3s,width .3s,height .3s;transition:opacity .3s,left .3s,top .3s,width .3s,height .3s;-webkit-transition-delay:50ms;-moz-transition-delay:50ms;-o-transition-delay:50ms;transition-delay:50ms}.gridster-loaded .gridster-preview-holder{display:none;z-index:1;position:absolute;background-color:#ddd;border-color:#fff;opacity:.2}.gridster-loaded .gridster-item.gridster-item-moving,.gridster-loaded .gridster-preview-holder{-webkit-transition:none;-moz-transition:none;-o-transition:none;transition:none}.gridster-mobile{height:auto!important}.gridster-mobile .gridster-item{height:auto;position:static;float:none}.gridster-item.ng-leave.ng-leave-active{opacity:0}.gridster-item.ng-enter{opacity:1}.gridster-item-moving{z-index:3}.gridster-item-resizable-handler{position:absolute;font-size:1px;display:block;z-index:5}.handle-se{cursor:se-resize;width:0;height:0;right:1px;bottom:1px;border-style:solid;border-width:0 0 12px 12px;border-color:transparent}.handle-ne,.handle-nw,.handle-sw{height:12px;width:12px}.handle-ne{cursor:ne-resize;right:1px;top:1px}.handle-nw{cursor:nw-resize;left:1px;top:1px}.handle-sw{cursor:sw-resize;left:1px;bottom:1px}.handle-e{cursor:e-resize;width:12px;bottom:0;right:1px;top:0}.handle-n,.handle-s{height:12px;right:0;left:0}.handle-s{cursor:s-resize;bottom:1px}.handle-n{cursor:n-resize;top:1px}.handle-w{cursor:w-resize;width:12px;left:1px;top:0;bottom:0}.gridster .gridster-item:hover .gridster-box{border:1.5px solid #B3B2B3}.gridster .gridster-item:hover .handle-se{border-color:transparent transparent #ccc}/*! angularjs-slider - v5.4.3 - (c) Rafal Zajac , Valentin Hervieu , Jussi Saarivirta , Angelin Sirbu - https://github.com/angular-slider/angularjs-slider - 2016-08-07 */.rzslider{position:relative;display:inline-block;width:100%;height:4px;margin:35px 0 15px;vertical-align:middle;user-select:none}.rzslider.with-legend{margin-bottom:40px}.rzslider[disabled]{cursor:not-allowed}.rzslider[disabled] .rz-pointer{cursor:not-allowed;background-color:#d8e0f3}.rzslider span{position:absolute;display:inline-block;white-space:nowrap}.rzslider .rz-base{width:100%;height:100%;padding:0}.rzslider .rz-bar-wrapper{left:0;z-index:1;width:100%;height:32px;padding-top:16px;margin-top:-16px;box-sizing:border-box}.rzslider .rz-bar-wrapper.rz-draggable{cursor:move}.rzslider .rz-bar{left:0;z-index:1;width:100%;height:4px;background:#d8e0f3;-webkit-border-radius:2px;-moz-border-radius:2px;border-radius:2px}.rzslider .rz-bar.rz-selection{z-index:2;background:#0db9f0;-webkit-border-radius:2px;-moz-border-radius:2px;border-radius:2px}.rzslider .rz-pointer{top:-14px;z-index:3;width:32px;height:32px;cursor:pointer;background-color:#0db9f0;-webkit-border-radius:16px;-moz-border-radius:16px;border-radius:16px}.rzslider .rz-pointer:after{position:absolute;top:12px;left:12px;width:8px;height:8px;background:#fff;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;content:''}.rzslider .rz-pointer:hover:after{background-color:#fff}.rzslider .rz-pointer.rz-active{z-index:4}.rzslider .rz-pointer.rz-active:after{background-color:#451aff}.rzslider .rz-bubble{bottom:16px;padding:1px 3px;color:#55637d;cursor:default}.rzslider .rz-bubble.rz-selection{top:16px}.rzslider .rz-bubble.rz-limit{color:#55637d}.rzslider .rz-ticks{position:absolute;top:-3px;left:0;z-index:1;display:-webkit-flex;display:-ms-flexbox;display:flex;width:100%;height:0;padding:0 11px;margin:0;list-style:none;box-sizing:border-box;-webkit-justify-content:space-between;-ms-flex-pack:justify;justify-content:space-between}.chart-legend .item,.chart-legend .item>*,.chart-tooltip .tooltip-item>*{display:inline-block}.rzslider .rz-ticks .rz-tick{width:10px;height:10px;text-align:center;cursor:pointer;background:#d8e0f3;border-radius:50%}.rzslider .rz-ticks .rz-tick.rz-selected{background:#0db9f0}.rzslider .rz-ticks .rz-tick .rz-tick-value{position:absolute;top:-30px;transform:translate(-50%,0)}.rzslider .rz-ticks .rz-tick .rz-tick-legend{position:absolute;top:24px;max-width:50px;white-space:normal;transform:translate(-50%,0)}.rzslider .rz-ticks.rz-ticks-values-under .rz-tick-value{top:initial;bottom:-40px}.rzslider.rz-vertical{position:relative;width:4px;height:100%;padding:0;margin:0 20px;vertical-align:baseline}.chart-legend .item>*,.rzslider.rz-vertical .rz-ticks .rz-tick{vertical-align:middle}.rzslider.rz-vertical .rz-base{width:100%;height:100%;padding:0}.rzslider.rz-vertical .rz-bar-wrapper{top:auto;left:0;width:32px;height:100%;padding:0 0 0 16px;margin:0 0 0 -16px}.rzslider.rz-vertical .rz-bar{bottom:0;left:auto;width:4px;height:100%}.rzslider.rz-vertical .rz-pointer{top:auto;bottom:0;left:-14px!important}.rzslider.rz-vertical .rz-bubble{bottom:0;left:16px!important;margin-left:3px}.rzslider.rz-vertical .rz-bubble.rz-selection{top:auto;left:16px!important}.rzslider.rz-vertical .rz-ticks{top:0;left:-3px;z-index:1;width:0;height:100%;padding:11px 0;-webkit-flex-direction:column-reverse;-ms-flex-direction:column-reverse;flex-direction:column-reverse}.rzslider.rz-vertical .rz-ticks .rz-tick .rz-tick-value{top:initial;left:22px;transform:translate(0,-28%)}.rzslider.rz-vertical .rz-ticks .rz-tick .rz-tick-legend{top:initial;right:24px;max-width:none;white-space:nowrap;transform:translate(0,-28%)}.rzslider.rz-vertical .rz-ticks.rz-ticks-values-under .rz-tick-value{right:12px;bottom:initial;left:initial}.chart-legend{margin-left:20px}.chart-legend .item{cursor:pointer;height:16px;font-size:.8em;margin-right:10px}.chart-legend .item>.legend-label{height:16px;line-height:17px}.chart-legend .item>.icon{width:16px;border-radius:50%;height:16px;margin-right:5px;background-repeat:no-repeat;background-position:50% 25%}.chart-legend .item.legend-hidden{opacity:.4}.chart-legend .item.column>.icon{background-image:url("data:image/svg+xml;utf8,")}.chart-legend .item.dot>.icon{background-image:url("data:image/svg+xml;utf8,")}.chart-legend .item.dashed-line>.icon{background-image:url("data:image/svg+xml;utf8,\a \a \a \a ")}.chart-legend .item.line>.icon{background-image:url("data:image/svg+xml;utf8,\a \a \a \a ")}.chart-legend .item.area>.icon{background-image:url("data:image/svg+xml;utf8,")}.tooltip-line{stroke:grey;stroke-width:1}.tooltip-dot{stroke-width:2px;fill:#fff}.chart-tooltip{position:absolute;user-select:none;background-color:#fff;z-index:100;box-shadow:1px 1px 2px rgba(61,61,61,.5);padding:5px 10px;border-radius:1px}.chart-tooltip>.abscissas{margin-bottom:5px;font-size:.7em;white-space:nowrap}.chart-tooltip .tooltip-item{font-size:.8em;white-space:nowrap}.chart-tooltip .tooltip-item:not(:last-child){margin-bottom:.2em}.chart .axis.x2-axis,.chart .grid .tick>text{display:none}.chart-tooltip .tooltip-item>:not(:last-child){margin-right:.4em}.chart-tooltip .tooltip-item .color-dot{width:10px;height:10px;border-radius:50%}.chart-tooltip .tooltip-item .y-value{font-weight:500}.chart{position:relative;box-sizing:border-box;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.chart .axis{font:10px Roboto}.chart .axis>path{fill:none;stroke:#000}.chart .axis>.tick>text{fill:#000}.chart .axis>.tick>line{stroke:#000}.chart .grid .tick>line{stroke:#eee;stroke-width:1}.chart .dot-series circle{fill:#fff;stroke-width:2px}.chart .hline,.chart .line-series path{stroke-width:1px}.chart .column-series{fill-opacity:.3}.chart .area-series{opacity:.3}.chart .chart-brush{fill:rgba(166,166,166,.5)} \ No newline at end of file diff --git a/web/vendor/vendor.scss b/web/vendor/vendor.scss old mode 100644 new mode 100755 index 58c9fd12..8d3564e8 --- a/web/vendor/vendor.scss +++ b/web/vendor/vendor.scss @@ -1,13 +1,13 @@ @font-face { font-family: Roboto; - src: url("fonts/roboto/Roboto-Regular.eot"); + src: url("../fonts/roboto/Roboto-Regular.eot"); src: local("Roboto Regular"), local("Roboto-Regular"), - url("fonts/roboto/Roboto-Regular.eot?#iefix") format("embedded-opentype"), - url("fonts/roboto/Roboto-Regular.woff2") format("woff2"), - url("fonts/roboto/Roboto-Regular.woff") format("woff"), - url("fonts/roboto/Roboto-Regular.ttf") format("truetype"), - url("fonts/roboto/Roboto-Regular.svg#Roboto") format("svg"); + url("../fonts/roboto/Roboto-Regular.eot?#iefix") format("embedded-opentype"), + url("../fonts/roboto/Roboto-Regular.woff2") format("woff2"), + url("../fonts/roboto/Roboto-Regular.woff") format("woff"), + url("../fonts/roboto/Roboto-Regular.ttf") format("truetype"), + url("../fonts/roboto/Roboto-Regular.svg#Roboto") format("svg"); font-weight: 400; font-style: normal; }