diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bb1503a3ed100625b2ec7bcb2e68842ffbe1bb6b..b4860c350f7b6c0c684524713903a961f614a026 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,13 +15,21 @@ include: rules: - if: '$CI_COMMIT_REF_NAME == "develop"' + - project: osl/code/org.etsi.osl.main + ref: $CI_COMMIT_REF_NAME + file: + - ci-templates/default.yml + - ci-templates/build.yml + rules: + - if: '$CI_COMMIT_REF_PROTECTED && $CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop"' + - project: osl/code/org.etsi.osl.main ref: develop file: - ci-templates/default.yml - ci-templates/build_unprotected.yml rules: - - if: '$CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop"' + - if: '$CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop" && !$CI_COMMIT_REF_PROTECTED' docker_build: extends: .docker_build diff --git a/src/Footer.html b/src/Footer.html index 673f24695e3882dcb7b15e1bb3e159eb9e689604..78f7fdf5fd585101e19a8cb6f34729f4d9b6156f 100644 --- a/src/Footer.html +++ b/src/Footer.html @@ -5,31 +5,34 @@

Who we are

-
openslice.io project | openslice.io
openslice.io an opensource OSS +
ETSI SDG OpenSlice | https://osl.etsi.org
The ETSI Software Development Group + for OpenSlice (SDG OSL) is developing an open source service based Operations Support System (OSS) to deliver + Network Slice as a Service (NSaaS).
-
{{portalName}} | {{weburl}}
A portal that allows 5G - experimenters to deploy experiment descriptors towards the infrastructure.
-
{{portalName}} wiki | {{portalwiki}}
A wiki containing project - documentation. -
-
{{portalName}} Report Issues | {{bugzilla}}
Our - issue tracking system.
+
{{portalName}} | {{weburl}}
A portal that allows 5G + experimenters to design and deploy network services towards the infrastructure.
+
{{portalName}} wiki | {{portalwiki}}
A wiki containing OpenSlice software documentation. +

Connect with us

-
-
Twitter
+
+
LinkedIn
-
+
+ class='fa fa-slack mr-2' style="margin-right: 0.5rem;">Slack
+
+
+
Twitter
@@ -45,16 +48,15 @@
-
OpenSlice has received funding from
- 5GinFIRE | https://5ginfire.eu/ project from the European Horizon 2020 Programme for research, technological - development and demonstration under grant agreement number 732497.
-
5G-VINNI project | https://5g-vinni.eu/ 5G-VINNI project has received funding - from the European Horizon 2020 Programme for research, technological development and demonstration under - grant agreement number 815279
-
{{portalName}} running openslice.io version 2023-Q3 1.2.0-SNAPSHOT | Data Protection - Declaration | © 2019-{{currentYear}} on behalf of openslice.io
+
+
+ OpenSlice has received funding from various projects under European Programmes for research, technological development + and demonstration. You may refer to our extensive ecosystem for further details. +
+
{{portalName}} running OSL version version 2024Q2 | + Terms and Conditions | + © {{currentYear}} on behalf of osl.etsi.org +
diff --git a/src/SignInHomeSection.html b/src/SignInHomeSection.html index c18384233fcf314a6c3be40dceba8a78748d588f..39dddf3a2c6678306a103a938059d786fe3a5f52 100644 --- a/src/SignInHomeSection.html +++ b/src/SignInHomeSection.html @@ -4,9 +4,9 @@

 

- Welcome to the openslice {{portalName}}! + Welcome to the {{portalName}}!

-

Use the fields on the right to login +

Use the field on the right to login to {{portalName}} and easily deploy an experiment over the {{portalName}} infrastructure!

Check our wiki for further documenation

diff --git a/src/images/logo_clear.png b/src/images/logo_clear.png index 9f2116089388c8f7573cfac63ac43697bd2827d4..2fa5efc135209ce66cee07ea7a76dc0a4cff9244 100644 Binary files a/src/images/logo_clear.png and b/src/images/logo_clear.png differ diff --git a/src/images/logo_clear_old.png b/src/images/logo_clear_old.png new file mode 100644 index 0000000000000000000000000000000000000000..9f2116089388c8f7573cfac63ac43697bd2827d4 Binary files /dev/null and b/src/images/logo_clear_old.png differ diff --git a/src/js/portalapp.js b/src/js/portalapp.js index 259224601027def4b744fd66603b1f034b6e3b8c..ad4c360b62aaf5d5e789dbfc7716f215606e8245 100644 --- a/src/js/portalapp.js +++ b/src/js/portalapp.js @@ -8,7 +8,7 @@ var app = angular.module('portalapp', [ 'ngCookies', 'ngResource', 'ngRoute', 'angular-loading-bar', 'ngAnimate' ]); -var portalversion = '1.1.0-SNAPSHOT'; +var portalversion = '2024Q2'; app.config(function($routeProvider, $locationProvider, $anchorScrollProvider, cfpLoadingBarProvider) { @@ -206,6 +206,7 @@ app.config(function($routeProvider, $locationProvider, $anchorScrollProvider, cf app.controller('mpMainCtrl', function($scope, PortalUser, $log, $location ) { $scope.mpversion = portalversion; $scope.location = $location; + $scope.currentYear = new Date().getFullYear(); }); diff --git a/src/openslicehome/index.html b/src/openslicehome/index.html index 9710087337a41706743601829ac7f36a2d260913..9c5029c84e938c4e8e47ba994994a679d8cd2f80 100644 --- a/src/openslicehome/index.html +++ b/src/openslicehome/index.html @@ -1,3 +1,5 @@ + +