diff --git a/CHANGELOG.md b/CHANGELOG.md index ba692e6d2..576804024 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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-479](https://github.com/Cognifide/aet/pull/479) Added Secure and HttpOnly flags for cookies. ([#477](https://github.com/Cognifide/aet/issues/477)) +- [PR-506](https://github.com/Cognifide/aet/pull/506) About tab ([#475](https://github.com/Cognifide/aet/issues/475)) ## Version 3.2.2 diff --git a/report/src/main/webapp/app/layout/toolbar/toolbarTop.view.html b/report/src/main/webapp/app/layout/toolbar/toolbarTop.view.html index 8bebf429d..1c881d88c 100644 --- a/report/src/main/webapp/app/layout/toolbar/toolbarTop.view.html +++ b/report/src/main/webapp/app/layout/toolbar/toolbarTop.view.html @@ -98,8 +98,15 @@
Execution time: {{toolbarTop.suiteInfo.duration | date: 'mm:ss'}}
-
- +
+ + + +
+
+ + +
diff --git a/report/src/main/webapp/app/services/metadataEndpoint.service.js b/report/src/main/webapp/app/services/metadataEndpoint.service.js index 187426e7c..135c4e3c0 100644 --- a/report/src/main/webapp/app/services/metadataEndpoint.service.js +++ b/report/src/main/webapp/app/services/metadataEndpoint.service.js @@ -23,7 +23,7 @@ define(['angularAMD', 'endpointConfiguration', 'requestParametersService'], /** * Service responsible for communication with AET metadata REST API endpoint. */ - function MetadataEndpointService($q, $http, endpointConfiguration, + function MetadataEndpointService($q, $rootScope, $http, endpointConfiguration, requestParametersService) { var service = { getMetadata: getMetadata, @@ -65,6 +65,7 @@ define(['angularAMD', 'endpointConfiguration', 'requestParametersService'], } }).then(function (data) { deferred.resolve(data.data); + $rootScope.applicationVersion = data.headers()['x-application-version']; return deferred.promise; }).catch(function (exception) { handleFailed('Failed to load report data!', exception); diff --git a/report/src/main/webapp/assets/img/cognifide.png b/report/src/main/webapp/assets/img/cognifide.png new file mode 100644 index 000000000..04cfd0c87 Binary files /dev/null and b/report/src/main/webapp/assets/img/cognifide.png differ diff --git a/report/src/main/webapp/assets/sass/_report.scss b/report/src/main/webapp/assets/sass/_report.scss index 8af5d7957..ec4fbb712 100644 --- a/report/src/main/webapp/assets/sass/_report.scss +++ b/report/src/main/webapp/assets/sass/_report.scss @@ -306,6 +306,21 @@ ul { } } +p.copyright { + padding-top: 10px; + font-style: italic; + text-align: center; + font-size: 12px; +} + +img.cognifide-logo { + padding-top: 15px; + display: block; + margin: 0 auto; + height: 10%; + width: 10%; +} + // cookies report .failed { diff --git a/report/src/main/webapp/assets/sass/_toolbar.scss b/report/src/main/webapp/assets/sass/_toolbar.scss index aa2deb669..fc121b57f 100644 --- a/report/src/main/webapp/assets/sass/_toolbar.scss +++ b/report/src/main/webapp/assets/sass/_toolbar.scss @@ -106,6 +106,10 @@ display: flex; justify-content: center; } + + .slim-padding { + padding: 6px; + } } &-generate-raport { diff --git a/report/src/main/webapp/report.html b/report/src/main/webapp/report.html index 6fd9e9b5a..0f6d9036b 100644 --- a/report/src/main/webapp/report.html +++ b/report/src/main/webapp/report.html @@ -75,6 +75,34 @@

Handful keyboard shortcuts

+ + + + \ No newline at end of file diff --git a/rest-endpoint/pom.xml b/rest-endpoint/pom.xml index 5febf2eb7..fa09162db 100644 --- a/rest-endpoint/pom.xml +++ b/rest-endpoint/pom.xml @@ -111,6 +111,10 @@ com.github.stefanbirkner system-rules + + org.osgi + org.osgi.core + diff --git a/rest-endpoint/src/main/java/com/cognifide/aet/rest/MetadataServlet.java b/rest-endpoint/src/main/java/com/cognifide/aet/rest/MetadataServlet.java index 2cf90e5a1..df51852b7 100644 --- a/rest-endpoint/src/main/java/com/cognifide/aet/rest/MetadataServlet.java +++ b/rest-endpoint/src/main/java/com/cognifide/aet/rest/MetadataServlet.java @@ -22,6 +22,7 @@ import com.cognifide.aet.communication.api.exceptions.AETException; import com.cognifide.aet.communication.api.metadata.Suite; import com.cognifide.aet.communication.api.metadata.ValidatorException; +import com.cognifide.aet.rest.helpers.BundleVersionProvider; import com.cognifide.aet.vs.DBKey; import com.cognifide.aet.vs.MetadataDAO; import com.cognifide.aet.vs.StorageException; @@ -55,6 +56,7 @@ public class MetadataServlet extends BasicDataServlet { private static final Logger LOGGER = LoggerFactory.getLogger(MetadataServlet.class); private static final String FORMATTED_PARAM = "formatted"; + private static final String APP_VERSION_HEADER = "X-Application-Version"; private static final Gson PRETTY_PRINT_GSON = new GsonBuilder().setPrettyPrinting().create(); private static final JsonParser JSON_PARSER = new JsonParser(); @@ -64,6 +66,9 @@ public class MetadataServlet extends BasicDataServlet { @Reference private LockService lockService; + @Reference + private BundleVersionProvider bundleVersionProvider; + @Reference private transient HttpService httpService; @@ -74,6 +79,7 @@ protected void process(DBKey dbKey, HttpServletRequest req, HttpServletResponse String suiteName = req.getParameter(Helper.SUITE_PARAM); String suiteVersion = req.getParameter(Helper.VERSION_PARAM); String formatted = req.getParameter(FORMATTED_PARAM); + resp.setHeader(APP_VERSION_HEADER, bundleVersionProvider.getBundleVersion()); resp.setCharacterEncoding("UTF-8"); Suite suite; diff --git a/rest-endpoint/src/main/java/com/cognifide/aet/rest/helpers/BundleVersionProvider.java b/rest-endpoint/src/main/java/com/cognifide/aet/rest/helpers/BundleVersionProvider.java new file mode 100644 index 000000000..34ae39cac --- /dev/null +++ b/rest-endpoint/src/main/java/com/cognifide/aet/rest/helpers/BundleVersionProvider.java @@ -0,0 +1,35 @@ +/** + * AET + * + * Copyright (C) 2013 Cognifide Limited + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License + * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. See the License for the specific language governing permissions and limitations under + * the License. + */ +package com.cognifide.aet.rest.helpers; + +import org.osgi.framework.BundleContext; +import org.osgi.service.component.annotations.Activate; +import org.osgi.service.component.annotations.Component; + +@Component(service = BundleVersionProvider.class, immediate = true) +public class BundleVersionProvider { + + private String bundleVersion; + + @Activate + public void activate(BundleContext context) { + bundleVersion = context.getBundle().getVersion().toString(); + } + + public String getBundleVersion() { + return bundleVersion; + } +}