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.

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

Winter edition #449

Merged
merged 5 commits into from
Dec 10, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ All notable changes to AET will be documented in this file.

**List of changes that are finished but not yet released in any final version.**

- [PR-449](https://github.com/Cognifide/aet/pull/449) Improvements to the Winter Edition Theme
- [PR-354](https://github.com/Cognifide/aet/pull/354) Remove jmsEndpointConfig information from communication settings endpoint ([#352](https://github.com/Cognifide/aet/issues/352))
- [PR-412](https://github.com/Cognifide/aet/pull/412) ([PR-336](https://github.com/Cognifide/aet/pull/336), [PR-337](https://github.com/Cognifide/aet/pull/337), [PR-395](https://github.com/Cognifide/aet/pull/395)) - Added rerun functionality for suite, test and url
- [PR-429](https://github.com/Cognifide/aet/pull/429) - `aet-cookbook` version updated to [`v5.1.1`](https://github.com/Cognifide/aet-cookbook/blob/master/CHANGELOG.md#511) in Vagrant. **Important**: please follow the instructions from [PR-43 description](https://github.com/Cognifide/aet-cookbook/pull/43) in order to keep the MongoDB data on your local environment.
Expand Down
9 changes: 7 additions & 2 deletions report/src/main/webapp/app/themes/winterEdition.directive.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ define(['angularAMD'], function (angularAMD) {
};

function linkFunc($scope) {
// change to true to enable Winter Theme
var winterEditionEnabled = false;

var WINTER_THEME = {
name: 'winter',
statusClasses: {
Expand All @@ -42,9 +45,11 @@ define(['angularAMD'], function (angularAMD) {
var DAY_MARGIN = 14;
var isChristmas = isDateWithinMargin(TODAY, CHRISTMAS_DATE, DAY_MARGIN);

if (isChristmas) {
if (winterEditionEnabled && isChristmas) {
_.merge($scope.theme, WINTER_THEME);
snowFall.snow(document.body, {flakeCount: 200, maxSpeed: 20});
$scope.$on('$viewContentLoaded', function() {
snowFall.snow(document.querySelector('.aside'), {flakeCount: 15, maxSpeed: 5});
});
}
}

Expand Down
Binary file modified report/src/main/webapp/assets/img/logo_winter.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.