Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Glyphicons changed to Font Awesome #233

Merged
merged 16 commits into from
Mar 6, 2018
Merged

Glyphicons changed to Font Awesome #233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
5d6c50f
Toolbar bottom Glyphicons to Font Awesome
Feb 28, 2018
4c8b3a1
Font Awesome styling
Feb 28, 2018
0307ff1
Font Awesome in search bar
Feb 28, 2018
3b5ea69
Filter icons changed to Font Awesome
Feb 28, 2018
dca60a7
Changed animated icon in test menu
Feb 28, 2018
f37b0b3
Help icon changed to Font Awesome
Feb 28, 2018
185927b
Toggle toolbar icon changed to Font Awesome
Feb 28, 2018
07524ab
Changed test icons to Font Awesome
Mar 2, 2018
20fa6d2
Fixed font weight
Mar 2, 2018
34a203f
Deleted old comment modal and its styling
Mar 2, 2018
fc6c465
Pull request added to Changelog
Mar 2, 2018
1b0ea49
Merge branch 'master' into fontawesome
edworczak Mar 2, 2018
f06d3e7
Fixed conflict resolved css after merge
Mar 2, 2018
9fe96af
Font Awesome on main view
Mar 2, 2018
5888c29
Pattern icon changed to Font Awesome
Mar 5, 2018
9b22622
Cleaning up scss files
Mar 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ All notable changes to AET will be documented in this file.
## Unreleased
**List of changes that are finished but not yet released in any final version.**

- [PR-233](https://github.com/Cognifide/aet/pull/233) Font Awesome introduced to AET
- [PR-228](https://github.com/Cognifide/aet/pull/228) Remove 'jump to' button from whole suite view.
- [PR-230](https://github.com/Cognifide/aet/pull/230) Bug Fixed: Side panel items not accessible when 'Save/Discard Changes' buttons are visible.
- [PR-229](https://github.com/Cognifide/aet/pull/229) Improved notes (new icons, buttons order)
Expand Down
13 changes: 12 additions & 1 deletion report/src/main/webapp/app/layout/main/suite/mainView.suite.view.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,18 @@
<div class="inner">
<div ng-class="test.getStatus()">
<div class="test-count test-count-dashboard">
<i ng-class="test.getStatus()" class="glyphicon"></i>
<div ng-if="test.getStatus() == 'failed'" class="failed">
<i class="fas fa-times"></i>
</div>
<div ng-if="test.getStatus() == 'passed'">
<i class="fas fa-check"></i>
</div>
<div ng-if="test.getStatus() == 'warning'">
<i class="fas fa-exclamation-triangle"></i>
</div>
<div ng-if="test.getStatus() == 'rebased'">
<i class="fas fa-cloud-upload-alt"></i>
</div>
<span>{{test.name}}</span>
</div>
</div>
Expand Down
13 changes: 12 additions & 1 deletion report/src/main/webapp/app/layout/main/test/mainView.test.view.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,18 @@
<div class="inner">
<div ng-class="url.getStatus()">
<div class="test-count test-count-dashboard">
<i ng-class="url.getStatus()" class="glyphicon"></i>
<div ng-if="url.getStatus() == 'failed'">
<i class="fas fa-times"></i>
</div>
<div ng-if="url.getStatus() == 'passed'">
<i class="fas fa-check"></i>
</div>
<div ng-if="url.getStatus() == 'warning'">
<i class="fas fa-exclamation-triangle"></i>
</div>
<div ng-if="url.getStatus() == 'rebased'">
<i class="fas fa-cloud-upload-alt"></i>
</div>
<div class="tile-stats">
<span class="statistics">Url cases statistics:</span>
<span class="status failed" data-toggle="popover" data-content="Failed cases"
Expand Down
64 changes: 47 additions & 17 deletions report/src/main/webapp/app/layout/sidepanel/sidepanel.view.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,24 +30,42 @@
<div class="form-group sidepanel-search-section">
<input type="text" placeholder="Search..." data-aet-sidepanel-search
data-ng-model="$root.searchText" class="search-input">
<i class="glyphicon glyphicon-search" data-toggle="popover"
data-content="Start typing to filter by url name" data-trigger="hover"
data-container="body"></i>
<i class="glyphicon glyphicon-remove" data-toggle="popover" data-content="Clear search"
data-trigger="hover" data-container="body" ng-click="clearSearch()"
style="display: none;"></i>
<div class="fontawesome"
data-toggle="popover"
data-content="{{!$root.searchText && 'Start typing to filter by url name' || $root.searchText && 'Clear search'}}"
data-trigger="hover"
data-container="body"
ng-click="clearSearch()">
<div ng-if="!$root.searchText">
<i class="fas fa-search"></i>
</div>
<div ng-if="$root.searchText">
<i class="fas fa-times"></i>
</div>
</div>
</div>
<div class="form-group">
<div data-aet-sidepanel-status-filter class="pop" data-toggle="popover">
<div class="filter-list">
<div class="filter-list-title">
<p>No filters applied</p>
<i class="glyphicon glyphicon-chevron-down" data-toggle="popover"
data-content="Apply filtering to urls" data-trigger="hover"
data-container="body"></i>
<i class="glyphicon glyphicon-remove" data-toggle="popover" data-content="Clear filters"
data-trigger="hover" data-container="body" ng-click="clearFilters()"
style="display: none;"></i>
<div class="fontawesome">
<div class="apply-filters"
data-toggle="popover"
data-content="Apply filtering to urls"
data-trigger="hover"
data-container="body">
<i class="fas fa-angle-down fa-lg"></i>
</div>
<div class="clear-filters" style="display: none;"
data-toggle="popover"
data-content="Clear filters"
data-trigger="hover"
data-container="body"
ng-click="clearFilters()">
<i class="fas fa-times"></i>
</div>
</div>
</div>
<form class="dropdown-menu">
<div class="dropdown-field">
Expand Down Expand Up @@ -105,7 +123,7 @@
class="test-name {{filteredUrls.length > 0 ? 'is-visible' : 'is-hidden'}}" aet-toggle-link
type="test-name" ng-class="[test.getStatus()]" data-url="{{test.name}}">
<span>
<i class="glyphicon glyphicon-chevron-right"></i>
<i class="rotate-svg fas fa-angle-right fa-lg fa-fw"></i>
{{test.name}}
</span>
<div class="report-item-stats" data-toggle="popover" data-content="Urls in test"
Expand All @@ -115,9 +133,21 @@
</a>
<ul class="urls-list">
<li ng-repeat="url in test.urls | filter: {name: $root.searchText} | aetUrlStatusFilter:$root.activeFilters | orderBy:'name' as filteredUrls"
ng-class="[url.getStatus()]" class="glyphicon url-name">
ng-class="[url.getStatus()]" class="url-name">
<div aet-truncate-urls class="text-left nowrap">
<a class="test-url" ui-sref-active="is-active"
<div ng-if="url.getStatus() == 'failed'" class="fontawesome">
<i class="fas fa-times"></i>
</div>
<div ng-if="url.getStatus() == 'passed'" class="fontawesome">
<i class="fas fa-check"></i>
</div>
<div ng-if="url.getStatus() == 'warning'" class="fontawesome">
<i class="fas fa-exclamation-triangle"></i>
</div>
<div ng-if="url.getStatus() == 'rebased'" class="fontawesome">
<i class="fas fa-cloud-upload-alt"></i>
</div>
<a class="test-url" ui-sref-active="is-active"
ui-sref="url({'suite':$root.params.project,'test':test.name, 'url':url.name})">
{{url.name}}
</a>
Expand All @@ -134,13 +164,13 @@ <h4 class="no-results" ng-if="sidepanel.testsStats.total === 0">
<div class="aside-actions-wrapper" ng-if="sidepanel.thereAreChangesToSave()">
<div class="js-rebase-all" ng-click="sidepanel.saveAllChanges()">
<span class="button button-blue button-wide">
<i class="glyphicon glyphicon-cloud-upload"></i>
<i class="fas fa-cloud-upload-alt"></i>
Save all changes
</span>
</div>
<div class="js-cancel-all" ng-click="sidepanel.discardAllChanges()">
<span class="button button-darkred button-wide">
<i class="glyphicon glyphicon-cloud-download"></i>
<i class="fas fa-cloud-download-alt"></i>
Discard all changes
</span>
</div>
Expand Down
4 changes: 2 additions & 2 deletions report/src/main/webapp/app/layout/sidepanel/sidepanelStatusFilter.directive.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@ define(['angularAMD'], function (angularAMD) {

function updateFiltersLabel(activeFilters) {
var titleElement = $('.filter-list-title p '),
iconApply = $('.filter-list-title .glyphicon-chevron-down'),
iconCancel = $('.filter-list-title .glyphicon-remove');
iconApply = $('.filter-list-title .apply-filters'),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice :)

iconCancel = $('.filter-list-title .clear-filters');

if (!_.isEmpty(activeFilters)) {
var labelText = '';
Expand Down
18 changes: 11 additions & 7 deletions report/src/main/webapp/app/layout/toolbar/toolbarBottom.view.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,14 @@
<div class="toolbar-bottom">
<div class="toolbar-link">
<h4 class="toolbar-link-header ellipsis">
<i ng-if="toolbarBottom.viewMode != 'suite'" class="glyphicon glyphicon-screenshot"
<div ng-if="toolbarBottom.viewMode != 'suite'"class="fontawesome-link"
data-toggle="popover"
data-content="Localize the currently opened url on side panel"
data-trigger="hover"
data-container="body"
data-ng-click="toolbarBottom.scrollSidepanel(false)"></i>
data-ng-click="toolbarBottom.scrollSidepanel(false)">
<i class="fas fa-crosshairs fa-sm"></i>
</div>
<span class="preformatted">{{toolbarBottom.viewMode}}:</span>
<span ng-if="toolbarBottom.viewMode != 'url'">{{toolbarBottom.model.name}}</span>
<a ng-if="toolbarBottom.viewMode == 'url'"
Expand All @@ -36,12 +38,14 @@ <h4 class="toolbar-link-header ellipsis">
data-container="body">{{toolbarBottom.model.name}}</a>
</h4>
<h5 ng-if="toolbarBottom.viewMode == 'url'">
<i class="glyphicon glyphicon-screenshot"
<div class="fontawesome-link"
data-toggle="popover"
data-content="Localize the test group of the currently opened url on side panel"
data-trigger="hover"
data-container="body"
data-ng-click="toolbarBottom.scrollSidepanel(true)"></i>
data-ng-click="toolbarBottom.scrollSidepanel(true)">
<i class="fas fa-crosshairs"></i>
</div>
</i>
<span class="preformatted">test:</span><span>{{toolbarBottom.model.testGroupName}}</span>
</h5>
Expand All @@ -53,14 +57,14 @@ <h5 ng-if="toolbarBottom.viewMode == 'url'">
ng-show="toolbarBottom.viewMode == 'url' || toolbarBottom.viewMode == 'test'">
<a ng-click="traverseTree('up')">
<div class="nav-prev">
<i class="glyphicon glyphicon-chevron-left"></i>
<i class="fas fa-chevron-left"></i>
</div>
</a>

<a ng-click="traverseTree('down')"
ng-show="toolbarBottom.viewMode == 'url' || toolbarBottom.viewMode == 'test'">
<div class="nav-next">
<i class="glyphicon glyphicon-chevron-right"></i>
<i class="fas fa-chevron-right"></i>
</div>
</a>
</div>
Expand Down Expand Up @@ -97,7 +101,7 @@ <h5 ng-if="toolbarBottom.viewMode == 'url'">
<span class="button js-rebase-suite button-red"
data-ng-if="toolbarBottom.showRevertButton()"
data-ng-click="toolbarBottom.revertAcceptedPatterns()">
<i class="glyphicon glyphicon-cloud-download"></i>
<i class="fas fa-cloud-download-alt"></i>
Revert {{toolbarBottom.viewMode}}
</span>
</div>
Expand Down
26 changes: 14 additions & 12 deletions report/src/main/webapp/app/layout/toolbar/toolbarTop.view.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,13 @@
-->

<div class="toolbar-top">
<div class="toolbar-toggle">
<i class="glyphicon"
data-ng-class="sidebarExpanded ? 'glyphicon-chevron-left' : 'glyphicon-chevron-right'"></i>
<div class="toolbar-toggle fontawesome-link">
<div ng-if="sidebarExpanded">
<i class="fas fa-angle-left fa-lg"></i>
</div>
<div ng-if="!sidebarExpanded">
<i class="fas fa-angle-right fa-lg"></i>
</div>
</div>
<div class="toolbar-blocks">
<div class="toolbar-block" ng-class="{'hidden': toolbarTop.pattern}">
Expand All @@ -33,12 +37,12 @@
<div class="toolbar-block important-message" ng-if="toolbarTop.pattern">
Uses patterns from <a href="{{toolbarTop.pattern.url}}">{{toolbarTop.pattern.name}}</a>.
<a href="https://github.com/Cognifide/aet/wiki/SharedPatterns" target="_blank">
<span class="glyphicon glyphicon-question-sign"></span>
<i class="fas fa-question-circle"></i>
</a>
</div>
<div class="toolbar-block">
Total cases: <span class="name">{{toolbarTop.suiteStatistics.total}}</span>
( <span class="status failed" data-toggle="popover" data-content="Failed cases"
(&nbsp;<span class="status failed" data-toggle="popover" data-content="Failed cases"
data-trigger="hover"
data-container="body">{{toolbarTop.suiteStatistics.failed}}</span> /
<span class="status warning" data-toggle="popover" data-content="Warning cases"
Expand All @@ -48,14 +52,12 @@
data-trigger="hover" data-container="body">{{toolbarTop.suiteStatistics.passed}}</span>
/
<span class="status rebased" data-toggle="popover" data-content="Accepted cases"
data-trigger="hover" data-container="body">{{toolbarTop.suiteStatistics.rebased}}</span>
)
( <span class="status rebased" data-toggle="popover" data-content="Not saved, accepted cases"
data-trigger="hover" data-container="body">{{toolbarTop.suiteStatistics.rebased}}</span>&nbsp;)
(&nbsp;<span class="status rebased" data-toggle="popover" data-content="Not saved, accepted cases"
data-trigger="hover" data-container="body">{{toolbarTop.suiteStatistics.acceptedPatterns}}</span>
/
<span class="status failed" data-toggle="popover" data-content="Cases that may be accepted"
data-trigger="hover" data-container="body">{{toolbarTop.suiteStatistics.patternsToAccept - toolbarTop.suiteStatistics.acceptedPatterns}}</span>
)
data-trigger="hover" data-container="body">{{toolbarTop.suiteStatistics.patternsToAccept - toolbarTop.suiteStatistics.acceptedPatterns}}</span>&nbsp;)
</div>
<div class="toolbar-block">
Project: <span class="name">{{toolbarTop.suiteInfo.project}}</span>
Expand All @@ -73,8 +75,8 @@
<div class="toolbar-block">
Execution time: {{toolbarTop.suiteInfo.duration | date: 'mm:ss'}}
</div>
<div class="toolbar-block" data-toggle="modal" data-target="#helpModal">
<i class="glyphicon glyphicon-question-sign"></i>
<div class="toolbar-block fontawesome-link" data-toggle="modal" data-target="#helpModal">
<i class="fas fa-question-circle fa-lg"></i>
</div>
</div>
</div>
Loading