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 @@

Welcome to the {{config.TITLE}} portal

-
{{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.
+
{{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.
-
Check http://openslice.io for further documentation
+
Check our wiki for further documentation.
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 @@

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).
{{config.TITLE}} | {{config.WEBURL}}
A portal that allows 5G - experimenters to deploy experiment descriptors towards the infrastructure.
+ experimenters to design and deploy network services towards the infrastructure.
{{config.TITLE}} wiki | {{config.WIKI}}
A wiki containing project documentation. + class='text-white'>{{config.WIKI}}
A wiki containing OpenSlice software documentation.
-
{{config.TITLE}} Report Issues | {{config.BUGZILLA}}
Our - issue tracking system.
@@ -29,14 +26,18 @@
-
-
Twitter
+
+
LinkedIn
-
+
Slack
+
+
Twitter
+
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 @@
-
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
-
{{config.TITLE}} running openslice.io version {{config.PORTALVERSION}}| 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. +
+
{{config.TITLE}} running OSL version {{config.PORTALVERSION}} | + Terms and Conditions | + © {{currentYear}} on behalf of osl.etsi.org +
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"> --> - + - +