From 934d51bf038bf82befe5cbd2da113ec8ac5f4dd4 Mon Sep 17 00:00:00 2001 From: Dimitrios Giannopoulos Date: Fri, 14 Jun 2024 11:46:17 +0000 Subject: [PATCH 1/4] fix: add protected run --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 629bf6c..47e8138 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,7 +13,7 @@ include: - ci-templates/default.yml - ci-templates/build.yml rules: - - if: '$CI_COMMIT_REF_NAME == "develop"' + - if: '$CI_COMMIT_REF_NAME == "develop" || $CI_COMMIT_REF_PROTECTED' - project: osl/code/org.etsi.osl.main ref: develop @@ -21,7 +21,7 @@ include: - 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 -- GitLab From 7a9827572ff8f9ab31e00f1d7ecf9ab5f2eccf1f Mon Sep 17 00:00:00 2001 From: Dimitrios Giannopoulos Date: Fri, 14 Jun 2024 13:07:41 +0000 Subject: [PATCH 2/4] fix: side branch references main's side branch --- .gitlab-ci.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 47e8138..ad80398 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,7 +13,15 @@ include: - ci-templates/default.yml - ci-templates/build.yml rules: - - if: '$CI_COMMIT_REF_NAME == "develop" || $CI_COMMIT_REF_PROTECTED' + - 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 -- GitLab From 5f8c7d0efab4119128a571c2b922f2a40075c47e Mon Sep 17 00:00:00 2001 From: Kostis Trantzas Date: Wed, 26 Jun 2024 19:56:13 +0300 Subject: [PATCH 3/4] fix for #19 --- src/app/landing/landing.component.html | 4 +-- .../preview-marketplace-item.component.ts | 2 +- .../components/contact/contact.component.html | 23 ++++++++------- .../components/footer/footer.component.html | 27 +++++++++++------- src/app/shared/navbar/navbar.component.html | 4 +-- src/app/shared/navbar/navbar.component.scss | 1 + src/assets/config/config.prod.default.json | 6 ++-- src/assets/config/config.theming.default.json | 6 ++-- src/assets/images/logo_clear.png | Bin 42388 -> 16566 bytes src/assets/images/logo_clear_old.png | Bin 0 -> 42388 bytes src/assets/images/logo_icon.png | Bin 22093 -> 0 bytes 11 files changed, 41 insertions(+), 32 deletions(-) create mode 100644 src/assets/images/logo_clear_old.png delete mode 100644 src/assets/images/logo_icon.png diff --git a/src/app/landing/landing.component.html b/src/app/landing/landing.component.html index 3651b3d..f1fbe77 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_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 a699356..c0c0e5a 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 97fe0d3..c496ccb 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 @@
-
- +
+
-
+
+
+ +
diff --git a/src/app/shared/components/footer/footer.component.html b/src/app/shared/components/footer/footer.component.html index 92101ff..6335ba6 100644 --- a/src/app/shared/components/footer/footer.component.html +++ b/src/app/shared/components/footer/footer.component.html @@ -3,16 +3,23 @@
-
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 +
+ 5GinFIRE project from the European Horizon 2020 Programme for research, technological + development and demonstration under grant agreement number 732497. +
+
+ 5G-VINNI project from the European Horizon 2020 Programme for research, technological + development and demonstration under grant agreement number 815279. +
+
+ 5GASP project from the European Horizon 2020 Programme for research, technological + development and demonstration under grant agreement number 101016448. +
+
{{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 03f5b27..39712bd 100644 --- a/src/app/shared/navbar/navbar.component.html +++ b/src/app/shared/navbar/navbar.component.html @@ -9,10 +9,10 @@ class="icon-bar"> --> - + - +