diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 629bf6cb7438d5758ca0837ef9bf6d42a6081317..ad803984fe9c6c9ef22c697848a5bfa32caba925 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'
angular_build:
extends: .angular_build
diff --git a/src/app/landing/landing.component.html b/src/app/landing/landing.component.html
index 3651b3db3e9c038861b0413775e4a1f8ce0e7746..f1fbe7786f31d72dad28a34eab57e0d4fb3e4431 100644
--- a/src/app/landing/landing.component.html
+++ b/src/app/landing/landing.component.html
@@ -6,9 +6,9 @@
<h3>
Welcome to the {{config.TITLE}} portal
</h3>
- <h5>{{config.TITLE}} portal is powered by Openslice, a prototype open source, Operations Support System. It supports VNF/NSD onboarding to OpenSourceMANO (OSM) and NSD deployment management. It also supports TM Forum OpenAPIs regarding Service Catalog Management, Ordering, Resource, etc.</h5>
+ <h5>{{config.TITLE}} portal is powered by OpenSlice, a prototype open source, Operations Support System. It supports VNF/NSD onboarding to OpenSourceMANO (OSM) and NSD deployment management. It also supports TM Forum OpenAPIs regarding Service Catalog Management, Ordering, Resource, etc.</h5>
- <h5>Check <a style="color:#FFFFFF;" class="font-weight-bold" href="http://openslice.io">http://openslice.io</a> for further documentation</h5>
+ <h5>Check <a style="color:#FFFFFF;" class="font-weight-bold" href="{{config.WIKI}}">our wiki</a> for further documentation.</h5>
</div>
</div>
diff --git a/src/app/p_product/marketplace/preview-market-place-item/preview-market-place-item.component.ts b/src/app/p_product/marketplace/preview-market-place-item/preview-market-place-item.component.ts
index 78e79043deca7e061a55e06f4f5ae5432a1eefa0..2d5fff5821ed29c4c9edc03a5705a982bd932da7 100644
--- a/src/app/p_product/marketplace/preview-market-place-item/preview-market-place-item.component.ts
+++ b/src/app/p_product/marketplace/preview-market-place-item/preview-market-place-item.component.ts
@@ -35,7 +35,7 @@ export class PreviewMarketPlaceItemComponent implements OnInit {
if (this.productOffering.productSpecification && this.productOffering.productSpecification.id) {
this.retrieveProductSpec(this.data.productOffering)
} else {
- this.specLogoUrl = this.themingService.getConfig().DEFAULT_SERVICE_LOGO_PATH
+ this.specLogoUrl = this.themingService.getConfig().DEPLOYMENT_LOGO_PATH
this.finishedLoading = true
}
}
@@ -47,7 +47,7 @@ export class PreviewMarketPlaceItemComponent implements OnInit {
() => {
this.finishedLoading = true
//Check if spec has a defined logo
- this.specLogoUrl = this.themingService.getConfig().DEFAULT_SERVICE_LOGO_PATH
+ this.specLogoUrl = this.themingService.getConfig().DEPLOYMENT_LOGO_PATH
}
)
diff --git a/src/app/p_services/marketplace/preview-marketplace-item/preview-marketplace-item.component.ts b/src/app/p_services/marketplace/preview-marketplace-item/preview-marketplace-item.component.ts
index a699356085d84318d77f5640717bfa2ee021aa6a..c0c0e5a1d0777fb03ae7fd279b1750b686628270 100644
--- a/src/app/p_services/marketplace/preview-marketplace-item/preview-marketplace-item.component.ts
+++ b/src/app/p_services/marketplace/preview-marketplace-item/preview-marketplace-item.component.ts
@@ -80,7 +80,7 @@ export class PreviewMarketplaceItemComponent implements OnInit {
if (this.specLogoRef) {
this.specLogoUrl = this.specServiceRootUrl+this.specLogoRef.url
} else {
- this.specLogoUrl = this.themingService.getConfig().DEFAULT_SERVICE_LOGO_PATH
+ this.specLogoUrl = this.themingService.getConfig().DEPLOYMENT_LOGO_PATH
}
}
)
diff --git a/src/app/shared/components/contact/contact.component.html b/src/app/shared/components/contact/contact.component.html
index 97fe0d3f6a3a26e23a2378096d986eedb9fffacc..c496ccb15add347f8f4a66b0d005a655ba3fb5c2 100644
--- a/src/app/shared/components/contact/contact.component.html
+++ b/src/app/shared/components/contact/contact.component.html
@@ -5,18 +5,15 @@
<div class="col-xs-12 col-sm-12 col-md-6">
<h3>Who we are</h3>
<div *ngIf="!customIntroductionHTML">
- <address class='font-weight-light'><span class='font-weight-bold'>openslice.io project</span> | <a
- href='http://openslice.io/' class='text-white'>openslice.io</a><br>openslice.io an opensource OSS</address>
+ <address class='font-weight-light'><span class='font-weight-bold'>ETSI SDG OpenSlice</span> | <a
+ href='https://osl.etsi.org/' class='text-white'>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'>{{config.TITLE}}</span> | <a
href='{{config.WEBURL}}' class='text-white'>{{config.WEBURL}}</a><br>A portal that allows 5G
- experimenters to deploy experiment descriptors towards the infrastructure.</address>
+ experimenters to design and deploy network services towards the infrastructure.</address>
<address class='font-weight-light'><span class='font-weight-bold'>{{config.TITLE}} wiki</span> | <a
href='{{config.WIKI}}'
- class='text-white'>{{config.WIKI}}</a><br>A wiki containing project documentation.
+ class='text-white'>{{config.WIKI}}</a><br>A wiki containing OpenSlice software documentation.
</address>
- <address class='font-weight-light'><span class='font-weight-bold'>{{config.TITLE}} Report Issues</span> | <a
- href='{{config.BUGZILLA}}' class='text-white'>{{config.BUGZILLA}}</a><br>Our
- issue tracking system.</address>
</div>
<div [innerHTML]="customIntroductionHTML" *ngIf="customIntroductionHTML">
</div>
@@ -29,14 +26,18 @@
</div>
</div>
<div class="row" *ngIf="!customContactHTML">
- <div class='col-xs-12 col-sm-6 col-md-3'>
- <div><a href='https://twitter.com/OpensliceOSS' class='font-weight-light text-white'><i
- class='fab fa-twitter mr-2'></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'><i
+ class='fab fa-linkedin mr-2'></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'><i
class='fab fa-slack mr-2'></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'><i
+ class='fab fa-twitter mr-2'></i>Twitter</a></div>
+ </div>
</div>
<div class="row" [innerHTML]="customContactHTML" *ngIf="customContactHTML">
diff --git a/src/app/shared/components/footer/footer.component.html b/src/app/shared/components/footer/footer.component.html
index 92101ffbdafc2c1552c8f8bef2a208fc671885a0..f44414a086d985942e13bd641767cd2bb45b6496 100644
--- a/src/app/shared/components/footer/footer.component.html
+++ b/src/app/shared/components/footer/footer.component.html
@@ -3,16 +3,15 @@
<div *ngIf="!customFooterHTML" class="container">
<div class='row align-items-center'>
<div class='col-md-2'><img src='assets/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'>{{config.TITLE}} running openslice.io version {{config.PORTALVERSION}}| <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'>{{config.TITLE}} running OSL version {{config.PORTALVERSION}} |
+ <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/app/shared/navbar/navbar.component.html b/src/app/shared/navbar/navbar.component.html
index 03f5b27d8ea2eb547550ca05bb2b19915bb6796a..39712bd8c049b1de407bf762f236763272cb85a6 100644
--- a/src/app/shared/navbar/navbar.component.html
+++ b/src/app/shared/navbar/navbar.component.html
@@ -9,10 +9,10 @@
class="icon-bar"></span>
</button> -->
<a *ngIf="loggedIn" class="navbar-brand" routerLink="/">
- <img src="{{themeConfig.DEPLOYMENT_LOGO_PATH}}" height="25px">
+ <img src="{{themeConfig.DEPLOYMENT_LOGO_PATH}}" height="37px">
</a>
<a *ngIf="!loggedIn" class="navbar-brand" routerLink="/">
- <img src="{{themeConfig.DEPLOYMENT_LOGO_PATH}}" height="25px">
+ <img src="{{themeConfig.DEPLOYMENT_LOGO_PATH}}" height="37px">
</a>
<!-- Collect the nav links, forms, and other content for toggling -->
<button class="navbar-toggler" type="button" (click)="isNavbarCollapsed = !isNavbarCollapsed"
diff --git a/src/app/shared/navbar/navbar.component.scss b/src/app/shared/navbar/navbar.component.scss
index 5cbeb07bec609cf1ce475cf1288d0fe31ac1a64a..24df4a8997159773e1faaf8cf210f36d3c220c94 100644
--- a/src/app/shared/navbar/navbar.component.scss
+++ b/src/app/shared/navbar/navbar.component.scss
@@ -21,6 +21,7 @@ nav {
.navbar-brand {
display: inline-flex;
+ padding: 0;
}
.dropdown-submenu .dropdown-menu {
diff --git a/src/assets/config/config.prod.default.json b/src/assets/config/config.prod.default.json
index fabecc4e4bef0f0c4a40c421c26844351e5fc2f2..0465cdc3d5adb47e1f414ceac3095c1a551d8b85 100644
--- a/src/assets/config/config.prod.default.json
+++ b/src/assets/config/config.prod.default.json
@@ -1,9 +1,9 @@
{
"TITLE": "OpenSlice by ETSI",
- "PORTALVERSION":"2023-Q3 1.2.0-SNAPSHOT",
- "WIKI": "https://openslice.readthedocs.io/en/stable/",
+ "PORTALVERSION":"2024Q2",
+ "WIKI": "https://osl.etsi.org/documentation",
"BUGZILLA": "{BASEURL}/bugzilla/",
- "STATUS": "http://status.localhost/",
+ "STATUS": "{BASEURL}/healthstatus/",
"WEBURL": "{BASEURL}",
"PORTAL_REPO_APIURL": "{BASEURL}/osapi",
"ASSURANCE_SERVICE_MGMT_APIURL": "{BASEURL}/oas-api",
diff --git a/src/assets/config/config.theming.default.json b/src/assets/config/config.theming.default.json
index 77e01141965373930772a45113f33c56095ef292..bcb6a64f806d5533abc6249e4e5dc37276361100 100644
--- a/src/assets/config/config.theming.default.json
+++ b/src/assets/config/config.theming.default.json
@@ -3,7 +3,7 @@
"DEPLOYMENT_LOGO_PATH":"assets/images/logo_clear.png",
"DEFAULT_SERVICE_LOGO_PATH":"assets/images/logo_icon_original.png",
"FAVICON_PATH":"favicon.ico",
- "WHO_WE_ARE_HTML":"<address class='font-weight-light'><span class='font-weight-bold'>openslice.io project</span> | <a href='http://openslice.io/' class='text-white'>openslice.io</a><br>openslice.io an opensource OSS</address><address class='font-weight-light'><span class='font-weight-bold'>Openslice demo</span> | <a href='http://portal.openslice.io' class='text-white'>http://portal.openslice.io</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'>Openslice demo wiki</span> | <a href='https://openslice.readthedocs.io/en/stable/' class='text-white'>https://openslice.readthedocs.io/en/stable/</a><br>A wiki containing project documentation.</address><address class='font-weight-light'><span class='font-weight-bold'>Openslice demo Report Issues</span> | <a href='http://portal.openslice.io/bugzilla/' class='text-white'>http://portal.openslice.io/bugzilla/</a><br>Our issue tracking system.</address>",
- "CONNECT_WITH_US_HTML":"<div class='col-xs-12 col-sm-6 col-md-3'><div><a href='https://twitter.com/OpensliceOSS' class='font-weight-light text-white'><i class='fab fa-twitter mr-2'></i>Twitter</a></div></div><div class='col-xs-12 col-sm-6 col-md-3'><div><a href='https://openslice.slack.com/' class='font-weight-light text-white'><i class='fab fa-slack mr-2'></i>Slack</a></div></div>",
- "FOOTER_HTML":"<div class='row align-items-center'><div class='col-md-2'><img src='assets/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'>Openslice demo 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-2023 on behalf of <a target='_blank' href='http://openslice.io/' title='openslice.io' class='font-weight-light'>openslice.io</a></div></div></div>"
+ "WHO_WE_ARE_HTML":"<address class='font-weight-light'><span class='font-weight-bold'>ETSI SDG OpenSlice</span>|<a href='https://osl.etsi.org/' class='text-white'>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'>OpenSlice by ETSI</span>|<a href='http' class='text-white'>http://portal.openslice.io</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'>OpenSlice by ETSI wiki</span>|<a href='https://osl.etsi.org/documentation' class='text-white'>https://osl.etsi.org/documentation</a><br>A wiki containing OpenSlice software documentation.</address>",
+ "CONNECT_WITH_US_HTML":"<div class='col-lg-3 col-md-6 col-sm-12'><div><a class='font-weight-light text-white' href='https://www.linkedin.com/company/openslice'><i class='fab mr-2 fa-linkedin'></i>LinkedIn</a></div></div><div class='col-lg-3 col-md-6 col-sm-12'><div><a class='font-weight-light text-white' href='https://openslice.slack.com/'><i class='fab mr-2 fa-slack'></i>Slack</a></div></div><div class='col-lg-3 col-md-6 col-sm-12'><div><a class='font-weight-light text-white' href='https://twitter.com/OpensliceOSS'><i class='fab mr-2 fa-twitter'></i>Twitter</a></div></div>",
+ "FOOTER_HTML":"<div class='row align-items-center'><div class='col-md-2'><img src='assets/images/eu-commission.png'></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'>Openslice by ETSI running OSL version 2024Q2 | <a href='https://osl.etsi.org/files/SDG_OSL_Terms_and_Conditions.pdf' class='font-weight-light'>Terms and Conditions</a> | © 2024 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>"
}
\ No newline at end of file
diff --git a/src/assets/images/logo_clear.png b/src/assets/images/logo_clear.png
index 9f2116089388c8f7573cfac63ac43697bd2827d4..2fa5efc135209ce66cee07ea7a76dc0a4cff9244 100644
Binary files a/src/assets/images/logo_clear.png and b/src/assets/images/logo_clear.png differ
diff --git a/src/assets/images/logo_clear_old.png b/src/assets/images/logo_clear_old.png
new file mode 100644
index 0000000000000000000000000000000000000000..9f2116089388c8f7573cfac63ac43697bd2827d4
Binary files /dev/null and b/src/assets/images/logo_clear_old.png differ
diff --git a/src/assets/images/logo_icon.png b/src/assets/images/logo_icon.png
deleted file mode 100644
index 0e617bf770b1f2e008e57a445c2eaef88067a1c6..0000000000000000000000000000000000000000
Binary files a/src/assets/images/logo_icon.png and /dev/null differ