Merge branch '2024Q2_RC' into 'develop' (f1ddda0e) · Commits · OSL / code / org.etsi.osl.tmf.web

.gitlab-ci.yml

+9 −1

Original line number	Original line	Diff line number	Diff line
	@@ -15,13 +15,21 @@ include:
	rules:		rules:
	- if: '$CI_COMMIT_REF_NAME == "develop"'		- 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		- project: osl/code/org.etsi.osl.main
	ref: develop		ref: develop
	file:		file:
	- ci-templates/default.yml		- ci-templates/default.yml
	- ci-templates/build_unprotected.yml		- ci-templates/build_unprotected.yml
	rules:		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:		angular_build:
	extends: .angular_build		extends: .angular_build

src/app/landing/landing.component.html

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -6,9 +6,9 @@
	<h3>		<h3>
	Welcome to the {{config.TITLE}} portal		Welcome to the {{config.TITLE}} portal
	</h3>		</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>
	</div>		</div>

src/app/p_product/marketplace/preview-market-place-item/preview-market-place-item.component.ts

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -35,7 +35,7 @@ export class PreviewMarketPlaceItemComponent implements OnInit {
	if (this.productOffering.productSpecification && this.productOffering.productSpecification.id) {		if (this.productOffering.productSpecification && this.productOffering.productSpecification.id) {
	this.retrieveProductSpec(this.data.productOffering)		this.retrieveProductSpec(this.data.productOffering)
	} else {		} else {
	this.specLogoUrl = this.themingService.getConfig().DEFAULT_SERVICE_LOGO_PATH		this.specLogoUrl = this.themingService.getConfig().DEPLOYMENT_LOGO_PATH
	this.finishedLoading = true		this.finishedLoading = true
	}		}
	}		}
	@@ -47,7 +47,7 @@ export class PreviewMarketPlaceItemComponent implements OnInit {
	() => {		() => {
	this.finishedLoading = true		this.finishedLoading = true
	//Check if spec has a defined logo		//Check if spec has a defined logo
	this.specLogoUrl = this.themingService.getConfig().DEFAULT_SERVICE_LOGO_PATH		this.specLogoUrl = this.themingService.getConfig().DEPLOYMENT_LOGO_PATH
	}		}
	)		)

src/app/p_services/marketplace/preview-marketplace-item/preview-marketplace-item.component.ts

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -80,7 +80,7 @@ export class PreviewMarketplaceItemComponent implements OnInit {
	if (this.specLogoRef) {		if (this.specLogoRef) {
	this.specLogoUrl = this.specServiceRootUrl+this.specLogoRef.url		this.specLogoUrl = this.specServiceRootUrl+this.specLogoRef.url
	} else {		} else {
	this.specLogoUrl = this.themingService.getConfig().DEFAULT_SERVICE_LOGO_PATH		this.specLogoUrl = this.themingService.getConfig().DEPLOYMENT_LOGO_PATH
	}		}
	}		}
	)		)

src/app/shared/components/contact/contact.component.html

+12 −11

Original line number	Original line	Diff line number	Diff line
	@@ -5,18 +5,15 @@
	<div class="col-xs-12 col-sm-12 col-md-6">		<div class="col-xs-12 col-sm-12 col-md-6">
	<h3>Who we are</h3>		<h3>Who we are</h3>
	<div *ngIf="!customIntroductionHTML">		<div *ngIf="!customIntroductionHTML">
	<address class='font-weight-light'><span class='font-weight-bold'>openslice.io project</span> \| <a		<address class='font-weight-light'><span class='font-weight-bold'>ETSI SDG OpenSlice</span> \| <a
	href='http://openslice.io/' class='text-white'>openslice.io</a><br>openslice.io an opensource OSS</address>		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		<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		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		<address class='font-weight-light'><span class='font-weight-bold'>{{config.TITLE}} wiki</span> \| <a
	href='{{config.WIKI}}'		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>
	<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>
	<div [innerHTML]="customIntroductionHTML" *ngIf="customIntroductionHTML">		<div [innerHTML]="customIntroductionHTML" *ngIf="customIntroductionHTML">
	</div>		</div>
	@@ -29,14 +26,18 @@
	</div>		</div>
	</div>		</div>
	<div class="row" *ngIf="!customContactHTML">		<div class="row" *ngIf="!customContactHTML">
	<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://twitter.com/OpensliceOSS' class='font-weight-light text-white'><i		<div><a href='https://www.linkedin.com/company/openslice' class='font-weight-light text-white'><i
	class='fab fa-twitter mr-2'></i>Twitter</a></div>		class='fab fa-linkedin mr-2'></i>LinkedIn</a></div>
	</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		<div><a href='https://openslice.slack.com/' class='font-weight-light text-white'><i
	class='fab fa-slack mr-2'></i>Slack</a></div>		class='fab fa-slack mr-2'></i>Slack</a></div>
	</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>

	<div class="row" [innerHTML]="customContactHTML" *ngIf="customContactHTML">		<div class="row" [innerHTML]="customContactHTML" *ngIf="customContactHTML">