Skip to content

Commit d84079d

Browse files
authored
Merge branch 'master' into bugfix/371-misplaced-icon-for-note-editor
2 parents e209f93 + db59726 commit d84079d

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ All notable changes to AET will be documented in this file.
1212
**List of changes that are finished but not yet released in any final version.**
1313

1414
- [PR-565](https://github.com/Cognifide/aet/pull/565) Fixing styles of note-editor icon ([#371](https://github.com/Cognifide/aet/issues/371))
15+
- [PR-567](https://github.com/Cognifide/aet/pull/567) Added missing tooltips in the report - "Previous url" and "Next url" ([#566](https://github.com/Cognifide/aet/issues/566))
16+
- [PR-563](https://github.com/Cognifide/aet/pull/563) Fixed bug with tooltips for "Re-run" buttons. ([#476](https://github.com/Cognifide/aet/issues/476))
1517
- [PR-522](https://github.com/Cognifide/aet/pull/522) Improve performance of generating /configs/list. ([#519](https://github.com/Cognifide/aet/issues/519))
1618
- [PR-554](https://github.com/Cognifide/aet/pull/554) Fix race condition under non-native bash environments ([#551](https://github.com/Cognifide/aet/issues/551))
1719

report/src/main/webapp/app/layout/toolbar/toolbarBottom.view.html

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ <h4 class="toolbar-link-header ellipsis">
2929
<i class="fas fa-crosshairs fa-sm"></i>
3030
</div>
3131
<div
32-
ng-if="toolbarBottom.viewMode != 'suite' && toolbarBottom.viewMode != 'test' && toolbarBottom.isLastSuiteVersion"
32+
ng-show="toolbarBottom.viewMode != 'suite' && toolbarBottom.viewMode != 'test' && toolbarBottom.isLastSuiteVersion"
3333
class="fontawesome-link"
3434
data-toggle="popover"
3535
data-content="Rerun current URL"
@@ -38,7 +38,7 @@ <h4 class="toolbar-link-header ellipsis">
3838
data-ng-click="toolbarBottom.rerunURL(toolbarBottom.model.url)">
3939
<i class="far fa-play-circle fa-sm"></i>
4040
</div>
41-
<div ng-if="toolbarBottom.viewMode == 'suite' && toolbarBottom.isLastSuiteVersion"
41+
<div ng-show="toolbarBottom.viewMode == 'suite' && toolbarBottom.isLastSuiteVersion"
4242
class="fontawesome-link"
4343
data-toggle="popover"
4444
data-content="Rerun current suite"
@@ -47,7 +47,7 @@ <h4 class="toolbar-link-header ellipsis">
4747
data-ng-click="toolbarBottom.rerunSuite()">
4848
<i class="far fa-play-circle fa-sm"></i>
4949
</div>
50-
<div ng-if="toolbarBottom.viewMode != 'url' && toolbarBottom.viewMode != 'suite' && toolbarBottom.isLastSuiteVersion" class="fontawesome-link"
50+
<div ng-show="toolbarBottom.viewMode != 'url' && toolbarBottom.viewMode != 'suite' && toolbarBottom.isLastSuiteVersion" class="fontawesome-link"
5151
data-toggle="popover"
5252
data-content="Rerun current test"
5353
data-trigger="hover"
@@ -86,7 +86,7 @@ <h5 ng-if="toolbarBottom.viewMode == 'url'">
8686
data-trigger="hover"
8787
data-container="body"
8888
data-ng-click="toolbarBottom.rerunTest()"
89-
ng-if="toolbarBottom.isLastSuiteVersion">
89+
ng-show="toolbarBottom.isLastSuiteVersion">
9090
<i class="far fa-play-circle fa-sm"></i>
9191
</div>
9292
<span class="preformatted">test:</span><span>{{toolbarBottom.model.testGroupName}}</span>
@@ -102,14 +102,16 @@ <h5 ng-if="toolbarBottom.viewMode == 'url'">
102102
<div class="toolbar-nav toolbar-nav-urls pull-left"
103103
ng-show="toolbarBottom.viewMode == 'url' || toolbarBottom.viewMode == 'test'">
104104
<a ng-click="traverseTree('up')">
105-
<div class="nav-prev">
105+
<div class="nav-prev" data-toggle="popover" data-content="Previous url"
106+
data-trigger="hover" data-container="body">
106107
<i class="fas fa-chevron-left"></i>
107108
</div>
108109
</a>
109110

110111
<a ng-click="traverseTree('down')"
111112
ng-show="toolbarBottom.viewMode == 'url' || toolbarBottom.viewMode == 'test'">
112-
<div class="nav-next">
113+
<div class="nav-next" data-toggle="popover" data-content="Next url"
114+
data-trigger="hover" data-container="body">
113115
<i class="fas fa-chevron-right"></i>
114116
</div>
115117
</a>

0 commit comments

Comments
 (0)