diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000000000000000000000000000000000000..b4860c350f7b6c0c684524713903a961f614a026
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,35 @@
+include:
+ - project: osl/code/org.etsi.osl.main
+ ref: main
+ file:
+ - ci-templates/default.yml
+ - ci-templates/build.yml
+ rules:
+ - if: '$CI_COMMIT_REF_NAME == "main"'
+
+ - project: osl/code/org.etsi.osl.main
+ ref: develop
+ file:
+ - ci-templates/default.yml
+ - ci-templates/build.yml
+ 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" && !$CI_COMMIT_REF_PROTECTED'
+
+docker_build:
+ extends: .docker_build
diff --git a/nginx-custom.conf b/nginx-custom.conf
index 9a3b80c937b6cf269ac99734212caf090aa8a8fd..0ab3edc627fdc9330cbbc39a1c92b61c9f4630b1 100644
--- a/nginx-custom.conf
+++ b/nginx-custom.conf
@@ -1,33 +1,24 @@
+# Expires map
+map $sent_http_content_type $expires {
+ default off;
+ text/html epoch;
+ text/css max;
+ application/json max;
+ application/javascript max;
+ ~image/ max;
+}
+server {
+ listen 80;
+ include /etc/nginx/mime.types;
- # Expires map
- map $sent_http_content_type $expires {
- default off;
- text/html epoch;
- text/css max;
- application/json max;
- application/javascript max;
- ~image/ max;
- }
+ server_name portal_web;
+ location / {
+ root /usr/share/nginx/html/;
+ index index.html index.htm;
+ try_files $uri $uri/ /index.html =404;
+ }
- server {
- listen 80;
- include /etc/nginx/mime.types;
-
- server_name localhost;
-
- location / {
- root /usr/share/nginx/html/nfvportal/openslicehome;
- index index.html;
- }
-
- location ^~/nfvportal/ {
-
- root /usr/share/nginx/html;
- index index.html index.htm;
- try_files $uri $uri/ /nfvportal/index.html =404;
- }
-
- expires $expires;
- gzip on;
- }
+ expires $expires;
+ gzip on;
+}
\ No newline at end of file
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 @@
<div class="col-xs-12 col-sm-12 col-md-6">
<h2>Who we are</h2>
- <address class='font-weight-light'><span class='font-weight-bold'><strong>openslice.io project</strong></span> | <a
- href='http://openslice.io/' class='text-white' style="color:#FFFFFF;">openslice.io</a><br>openslice.io an opensource OSS
+ <address class='font-weight-light'><span class='font-weight-bold'>ETSI SDG OpenSlice</span> | <a
+ href='https://osl.etsi.org/' class='text-white' style="color:#FFFFFF;">https://osl.etsi.org</a><br>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).
</address>
- <address class='font-weight-light'><span class='font-weight-bold'><strong>{{portalName}}</strong></span> | <a
- href='{{weburl}}' class='text-white' style="color:#FFFFFF;">{{weburl}}</a><br>A portal that allows 5G
- experimenters to deploy experiment descriptors towards the infrastructure.</address>
- <address class='font-weight-light'><span class='font-weight-bold'><strong>{{portalName}} wiki</strong></span> | <a
- href='{{portalwiki}}' class='text-white' style="color:#FFFFFF;">{{portalwiki}}</a><br>A wiki containing project
- documentation.
- </address>
- <address class='font-weight-light'><span class='font-weight-bold'><strong>{{portalName}} Report Issues</strong></span> | <a
- href='{{bugzilla}}' class='text-white' style="color:#FFFFFF;">{{bugzilla}}</a><br>Our
- issue tracking system.</address>
+ <address class='font-weight-light'><span class='font-weight-bold'>{{portalName}}</span> | <a
+ href='{{weburl}}' class='text-white' style="color:#FFFFFF;">{{weburl}}</a><br>A portal that allows 5G
+ experimenters to design and deploy network services towards the infrastructure.</address>
+ <address class='font-weight-light'><span class='font-weight-bold'>{{portalName}} wiki</span> | <a
+ href='{{portalwiki}}'
+ class='text-white' style="color:#FFFFFF;">{{portalwiki}}</a><br>A wiki containing OpenSlice software documentation.
+ </address>
</div>
<div class="col-xs-12 col-sm-12 col-md-6 col-lg-6">
<h2>Connect with us</h2>
<div class="row">
- <div class="col-xs-12 col-sm-6 col-md-3">
- <div><a href='https://twitter.com/OpensliceOSS' class='font-weight-light text-white' style="color:#FFFFFF;"><i
- class='fa fa-twitter mr-2' style="margin-right: .5rem;"></i>Twitter</a></div>
+ <div class='col-sm-12 col-md-6 col-lg-3'>
+ <div><a href='https://www.linkedin.com/company/openslice' class='font-weight-light text-white' style="color:#FFFFFF;"><i
+ class='fa fa-linkedin mr-2' style="margin-right: 0.5rem;"></i>LinkedIn</a></div>
</div>
- <div class='col-xs-12 col-sm-6 col-md-3'>
+ <div class='col-sm-12 col-md-6 col-lg-3'>
<div><a href='https://openslice.slack.com/' class='font-weight-light text-white' style="color:#FFFFFF;"><i
- class='fa fa-slack mr-2' style="margin-right: .5rem;"></i>Slack</a></div>
+ class='fa fa-slack mr-2' style="margin-right: 0.5rem;"></i>Slack</a></div>
+ </div>
+ <div class='col-sm-12 col-md-6 col-lg-3'>
+ <div><a href='https://twitter.com/OpensliceOSS' class='font-weight-light text-white' style="color:#FFFFFF;"><i
+ class='fa fa-twitter mr-2' style="margin-right: 0.5rem;"></i>Twitter</a></div>
</div>
</div>
</div>
@@ -45,16 +48,15 @@
<div class="container">
<div class='row align-items-center' style="display: flex; align-items: center;">
<div class='col-md-2'><img src='./images/eu-commission.png' /></div>
- <div class='col-md-10 font-weight-light'>OpenSlice has received funding from<div class='font-weight-light'>
- 5GinFIRE | https://5ginfire.eu/ project from the European Horizon 2020 Programme for research, technological
- development and demonstration under grant agreement number 732497.</div>
- <div class='font-weight-light'>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</div>
- <div class='font-weight-light'>{{portalName}} running openslice.io version 2023-Q3 1.2.0-SNAPSHOT | <a
- href='https://openslice.io/data-protection-declaration/' class='font-weight-light'>Data Protection
- Declaration</a> | © 2019-{{currentYear}} on behalf of <a target='_blank' href='http://openslice.io/'
- title='openslice.io' class='font-weight-light'>openslice.io</a></div>
+ <div class='col-md-10 font-weight-light'>
+ <div class='font-weight-light'>
+ OpenSlice has received funding from various projects under European Programmes for research, technological development
+ and demonstration. You may refer to our extensive <a href="https://osl.etsi.org/ecosystem/">ecosystem</a> for further details.
+ </div>
+ <div class='font-weight-light'>{{portalName}} running OSL version version 2024Q2 |
+ <a href='https://osl.etsi.org/files/SDG_OSL_Terms_and_Conditions.pdf' class='font-weight-light'>Terms and Conditions</a> |
+ © {{currentYear}} on behalf of <a target='_blank' href='https://osl.etsi.org/' title='osl.etsi.org' class='font-weight-light'>osl.etsi.org</a>
+ </div>
</div>
</div>
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 @@
<div class="col-xs-12 col-sm-8 col-md-8 col-lg-8 ">
<h1> </h1>
<h2>
- Welcome to the openslice {{portalName}}!
+ Welcome to the {{portalName}}!
</h2>
- <h4>Use the fields on the right to login
+ <h4>Use the field on the right to login
to {{portalName}} and easily deploy an experiment over
the {{portalName}} infrastructure!</h4>
<h4>Check our <strong><a style="color:#FFFFFF;" href="{{portalwiki}}">wiki</a></strong> for further documenation</h4>
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/config.js.default b/src/js/config.js.default
index 2d3952636bdc68f7acdb742d08311ca60c1bf781..d81edd3fcc77c893d20d30c40ef203f73e2ebdbb 100644
--- a/src/js/config.js.default
+++ b/src/js/config.js.default
@@ -7,7 +7,7 @@ appConfig.factory('APIEndPointService', function() {
WIKI: "https://osl.etsi.org/documentation/",
BUGZILLA: "ROOTURL/bugzilla/",
STATUS: "ROOTURL/status/",
- APIURL: "http://localost:13000",
+ APIURL: "http://localhost",
WEBURL: "ROOTURL/nfvportal",
APIOAUTHURL: "ROOTURL/auth/realms/openslice",
APITMFURL: "ROOTURL/tmf-api/serviceCatalogManagement/v4"
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 @@
+<!-- THIS IS DEPRECATED. OpenSlice Homepage is handled by the tmf.web project. -->
+
<!doctype html>
<html ng-app='portalapp'>
<head>