Browse Source

Fixes (#384)

master
rozetko 5 years ago committed by Alexey Velikiy
parent
commit
a28732f129
  1. 23
      src/panel/graph_panel/partials/analytic_units_5.x.html
  2. 13
      src/panel/graph_panel/partials/analytic_units_6.x.html

23
src/panel/graph_panel/partials/analytic_units_5.x.html

@ -82,17 +82,20 @@
</a> </a>
</label> </label>
<label class="gf-form-label"> <label class="gf-form-label" bs-tooltip="'Delete'">
<a class="pointer" ng-click="ctrl.onRemove(analyticUnit.id)" role="menuitem"> <a class="pointer" ng-click="ctrl.onRemove(analyticUnit.id)" role="menuitem">
<i class="fa fa-trash" bs-tooltip="'Delete'" ></i> <i class="fa fa-trash"></i>
</a> </a>
</label> </label>
<div class="gf-form-label" ng-if=" <div class="gf-form-label"
(analyticUnit.detectorType === 'pattern' || ng-if="
(analyticUnit.detectorType === 'anomaly' && analyticUnit.hasSeasonality)) && (analyticUnit.detectorType === 'pattern' ||
!analyticUnit.selected (analyticUnit.detectorType === 'anomaly' && analyticUnit.hasSeasonality)) &&
" bs-tooltip="'Save'" > !analyticUnit.selected
"
bs-tooltip="'Label'"
>
<a <a
class="pointer" class="pointer"
ng-style="analyticUnit.status === 'LEARNING' && { 'cursor': 'not-allowed' }" ng-style="analyticUnit.status === 'LEARNING' && { 'cursor': 'not-allowed' }"
@ -112,7 +115,10 @@
ng-disabled="analyticUnit.status === 'LEARNING'" ng-disabled="analyticUnit.status === 'LEARNING'"
/> />
<label class="gf-form-label" ng-if="analyticUnit.selected && !analyticUnit.saving" bs-tooltip="'Learn & Detect'"> <label class="gf-form-label"
ng-if="analyticUnit.selected && !analyticUnit.saving"
bs-tooltip="'Cancel labeling'"
>
<a class="pointer" ng-click="ctrl.onCancelLabeling(analyticUnit.id)"> <a class="pointer" ng-click="ctrl.onCancelLabeling(analyticUnit.id)">
<i class="fa fa-ban"></i> <i class="fa fa-ban"></i>
</a> </a>
@ -121,6 +127,7 @@
<label class="gf-form-label" <label class="gf-form-label"
ng-click="ctrl.runDetectInCurrentRange(analyticUnit)" ng-click="ctrl.runDetectInCurrentRange(analyticUnit)"
ng-disabled="analyticUnit.status === 'LEARNING' || analyticUnit.saving" ng-disabled="analyticUnit.status === 'LEARNING' || analyticUnit.saving"
bs-tooltip="'Learn & Detect'"
> >
<a class="pointer"> <a class="pointer">
Apply Apply

13
src/panel/graph_panel/partials/analytic_units_6.x.html

@ -71,8 +71,8 @@
</button> </button>
<button class="query-editor-row__action" <button class="query-editor-row__action"
ng-click="ctrl.onRemove(analyticUnit.id)" ng-click="ctrl.onRemove(analyticUnit.id)"
bs-tooltip="'Delete'" bs-tooltip="'Delete'"
> >
<a class="pointer"> <a class="pointer">
<i class="fa fa-fw fa-trash"></i> <i class="fa fa-fw fa-trash"></i>
@ -83,7 +83,7 @@
(analyticUnit.detectorType === 'pattern' || (analyticUnit.detectorType === 'pattern' ||
(analyticUnit.detectorType === 'anomaly' && analyticUnit.hasSeasonality)) && (analyticUnit.detectorType === 'anomaly' && analyticUnit.hasSeasonality)) &&
!analyticUnit.selected" !analyticUnit.selected"
bs-tooltip="'Save'" bs-tooltip="'Label'"
> >
<a <a
class="pointer" class="pointer"
@ -105,9 +105,9 @@
/> />
<button class="query-editor-row__action" <button class="query-editor-row__action"
ng-if="analyticUnit.selected && !analyticUnit.saving" ng-if="analyticUnit.selected && !analyticUnit.saving"
bs-tooltip="'Learn & Detect'" bs-tooltip="'Cancel labeling'"
> >
<a class="pointer" ng-click="ctrl.onCancelLabeling(analyticUnit.id)"> <a class="pointer" ng-click="ctrl.onCancelLabeling(analyticUnit.id)">
<i class="fa fa-fw fa-ban"></i> <i class="fa fa-fw fa-ban"></i>
</a> </a>
@ -116,6 +116,7 @@
<button class="query-editor-row__action" <button class="query-editor-row__action"
ng-click="ctrl.runDetectInCurrentRange(analyticUnit)" ng-click="ctrl.runDetectInCurrentRange(analyticUnit)"
ng-disabled="analyticUnit.status === 'LEARNING' || analyticUnit.saving" ng-disabled="analyticUnit.status === 'LEARNING' || analyticUnit.saving"
bs-tooltip="'Learn & Detect'"
> >
<a class="pointer"> <a class="pointer">
Apply Apply

Loading…
Cancel
Save