You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by jc...@apache.org on 2022/06/09 15:53:49 UTC
[brooklyn-ui] branch master updated: Change icon to include/exclude sub-tasks
This is an automated email from the ASF dual-hosted git repository.
jcabrerizo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git
The following commit(s) were added to refs/heads/master by this push:
new b81b200c Change icon to include/exclude sub-tasks
new 9d6fa616 Merge pull request #331 from algairim/improvements/logbook
b81b200c is described below
commit b81b200c58a152e97e6fb51fe9f55e5f69dd06fe
Author: Mykola Mandra <my...@cloudsoft.io>
AuthorDate: Thu Jun 9 13:16:11 2022 +0100
Change icon to include/exclude sub-tasks
Signed-off-by: Mykola Mandra <my...@cloudsoft.io>
---
ui-modules/utils/logbook/logbook.less | 46 ++++++++++++++------------
ui-modules/utils/logbook/logbook.template.html | 20 ++++++-----
2 files changed, 35 insertions(+), 31 deletions(-)
diff --git a/ui-modules/utils/logbook/logbook.less b/ui-modules/utils/logbook/logbook.less
index 6974ecbe..effd7e7d 100644
--- a/ui-modules/utils/logbook/logbook.less
+++ b/ui-modules/utils/logbook/logbook.less
@@ -116,27 +116,29 @@ br-logbook {
min-width: 150px;
}
- .fa-rotate-90 {
- -webkit-transform: rotate(90deg);
- -moz-transform: rotate(90deg);
- -ms-transform: rotate(90deg);
- -o-transform: rotate(90deg);
- transform: rotate(90deg);
- }
-
- .fa-rotate-180 {
- -webkit-transform: rotate(180deg);
- -moz-transform: rotate(180deg);
- -ms-transform: rotate(180deg);
- -o-transform: rotate(180deg);
- transform: rotate(180deg);
- }
-
- .fa-rotate-270 {
- -webkit-transform: rotate(270deg);
- -moz-transform: rotate(270deg);
- -ms-transform: rotate(270deg);
- -o-transform: rotate(270deg);
- transform: rotate(270deg);
+ .tooltip-inner {
+ min-width: 150px;
+ }
+
+ .icon-include-subtasks {
+ left:0;
+ top:0;
+ width: 100%;
+ height: 100%;
+ position: absolute;
+ padding: 7px;
+ }
+
+ .icon-inactive {
+ color: grey;
+ }
+
+ .btn-logbook {
+ width: 40px;
+ height: inherit;
+ }
+
+ .btn-group {
+ height: 34px;
}
}
diff --git a/ui-modules/utils/logbook/logbook.template.html b/ui-modules/utils/logbook/logbook.template.html
index 7d911a35..3f4b3693 100644
--- a/ui-modules/utils/logbook/logbook.template.html
+++ b/ui-modules/utils/logbook/logbook.template.html
@@ -40,12 +40,12 @@
<button ng-show="!autoRefresh" class="btn btn-default btn-primary" ng-click="vm.singleQuery()" ng-disabled="waitingResponse || autoRefresh || !vm.isValidNumber()">Query</button>
</div>
<div class="btn-group">
- <button class="btn btn-default btn-accent" ng-click="vm.autoQuery()" ng-disabled="!autoRefresh && (waitingResponse || !vm.isValidNumber())" uib-tooltip="{{autoRefresh ? 'Stop' : 'Start'}} auto-query">
- <i class="fa fa-refresh" ng-class="autoRefresh ? 'fa-spin' : ''"></i>
+ <button class="btn btn-default btn-accent btn-logbook" ng-click="vm.autoQuery()" ng-disabled="!autoRefresh && (waitingResponse || !vm.isValidNumber())" uib-tooltip="{{autoRefresh ? 'Stop' : 'Start'}} auto-query">
+ <i class="fa fa-refresh" ng-class="{'fa-spin' : autoRefresh, 'icon-inactive': !autoRefresh}"></i>
</button>
</div>
<div class="btn-group" uib-dropdown auto-close="outsideClick">
- <button id="logbook-search-parameters" type="button" class="btn btn-default btn-accent" uib-dropdown-toggle uib-tooltip="Query log levels">
+ <button id="logbook-search-parameters" type="button" class="btn btn-default btn-accent btn-logbook" uib-dropdown-toggle uib-tooltip="Query log levels">
<i class="fa fa-sliders"></i>
</button>
<ul class="dropdown-menu" uib-dropdown-menu role="menu" aria-labelledby="logbook-search-parameters">
@@ -55,17 +55,19 @@
</ul>
</div>
<div class="btn-group">
- <button id="logbook-tail" type="button" ng-click="search.latest = !search.latest" class="btn btn-default btn-accent" uib-dropdown-toggle uib-tooltip="Query {{search.latest ? 'tail' : 'head'}}">
- <i class="fa fa-share" ng-class="{'fa-rotate-90': search.latest, 'fa-rotate-270': !search.latest}"></i>
+ <button id="logbook-tail" type="button" ng-click="search.latest = !search.latest" class="btn btn-default btn-accent btn-logbook" uib-dropdown-toggle uib-tooltip="Query {{search.latest ? 'tail' : 'head'}}">
+ <i class="fa fa-long-arrow-up" ng-class="{'fa-rotate-180': search.latest}"></i>
</button>
</div>
<div class="btn-group">
- <button id="logbook-recursive" type="button" ng-click="search.recursive = !search.recursive" class="btn btn-default btn-accent" uib-dropdown-toggle uib-tooltip="Recursive selection of task children">
- <i class="fa fa-share" ng-class="{'fa-rotate-90': search.latest, 'fa-rotate-270': !search.recursive}"></i>
+ <button id="logbook-recursive" type="button" ng-click="search.recursive = !search.recursive" class="btn btn-default btn-accent btn-logbook" uib-dropdown-toggle uib-tooltip="{{search.recursive ? 'Exclude' : 'Include'}} log messages from sub-tasks (recursively)">
+ <svg class="icon-include-subtasks" ng-class="{'icon-inactive': !search.recursive}" viewBox="0 0 24 24">
+ <path fill="currentColor" d="M12 1A2.5 2.5 0 0 0 9.5 3.5A2.5 2.5 0 0 0 11 5.79V7H7A2 2 0 0 0 5 9V9.71A2.5 2.5 0 0 0 3.5 12A2.5 2.5 0 0 0 5 14.29V15H4A2 2 0 0 0 2 17V18.21A2.5 2.5 0 0 0 .5 20.5A2.5 2.5 0 0 0 3 23A2.5 2.5 0 0 0 5.5 20.5A2.5 2.5 0 0 0 4 18.21V17H8V18.21A2.5 2.5 0 0 0 6.5 20.5A2.5 2.5 0 0 0 9 23A2.5 2.5 0 0 0 11.5 20.5A2.5 2.5 0 0 0 10 18.21V17A2 2 0 0 0 8 15H7V14.29A2.5 2.5 0 0 0 8.5 12A2.5 2.5 0 0 0 7 9.71V9H17V9.71A2.5 2.5 0 0 0 15.5 12A2.5 [...]
+ </svg>
</button>
</div>
<div class="btn-group" uib-dropdown auto-close="outsideClick">
- <button id="logbook-filters" type="button" class="btn btn-default btn-accent" uib-dropdown-toggle uib-tooltip="Toggle log filters">
+ <button id="logbook-filters" type="button" class="btn btn-default btn-accent btn-logbook" uib-dropdown-toggle uib-tooltip="Toggle log filters">
<i class="fa fa-filter"></i>
</button>
<ul class="dropdown-menu" uib-dropdown-menu role="menu" aria-labelledby="logbook-filters">
@@ -75,7 +77,7 @@
</ul>
</div>
<div class="btn-group">
- <button id="logbook-wrap" type="button" ng-click="wordwrap = !wordwrap" class="btn btn-default btn-accent" uib-dropdown-toggle uib-tooltip="Word wrap {{wordwrap ? 'enabled' : 'disabled'}}">
+ <button id="logbook-wrap" type="button" ng-click="wordwrap = !wordwrap" class="btn btn-default btn-accent btn-logbook" uib-dropdown-toggle uib-tooltip="Word wrap {{wordwrap ? 'enabled' : 'disabled'}}">
<i class="fa fa-rotate-180" ng-class="{'fa-align-right': wordwrap, ' fa-align-justify': !wordwrap}"></i>
</button>
</div>