Merging 2024Q2_RC into develop

Kostis Trantzasrequested to merge
2024Q2_RC into develop

Merging 2024Q2_RC into develop #19 (closed)

Merge request reports

src/app/landing/landing.component.html

+2 −2
Changes for src/app/landing/landing.component.html: 2 added lines, 2 removed lines.
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
Changes for src/app/p_product/marketplace/preview-market-place-item/preview-market-place-item.component.ts: 2 added lines, 2 removed lines.
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
Changes for src/app/p_services/marketplace/preview-marketplace-item/preview-marketplace-item.component.ts: 1 added line, 1 removed line.
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
Changes for src/app/shared/components/contact/contact.component.html: 12 added lines, 11 removed lines.
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">

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

+9 −10
Changes for src/app/shared/components/footer/footer.component.html: 9 added lines, 10 removed lines.
Original line number Original line Diff line number Diff line
@@ -3,16 +3,15 @@ 
        <div *ngIf="!customFooterHTML" class="container">

        <div *ngIf="!customFooterHTML" class="container">

            <div class='row align-items-center'>

            <div class='row align-items-center'>

                <div class='col-md-2'><img src='assets/images/eu-commission.png' /></div>

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

                <div class='col-md-10 font-weight-light'>

                        5GinFIRE | https://5ginfire.eu/ project from the European Horizon 2020 Programme for research, technological

                    <div class='font-weight-light'>

                        development and demonstration under grant agreement number 732497.</div>

                        OpenSlice has received funding from various projects under European Programmes for research, technological development

                    <div class='font-weight-light'>5G-VINNI project | https://5g-vinni.eu/ 5G-VINNI project has received funding

                        and demonstration. You may refer to our extensive <a href="https://osl.etsi.org/ecosystem/">ecosystem</a> for further details.

                        from the European Horizon 2020 Programme for research, technological development and demonstration under

                    </div>

                        grant agreement number 815279</div>

                    <div class='font-weight-light'>{{config.TITLE}} running OSL version {{config.PORTALVERSION}} | 

                    <div class='font-weight-light'>{{config.TITLE}} running openslice.io version {{config.PORTALVERSION}}| <a

                        <a href='https://osl.etsi.org/files/SDG_OSL_Terms_and_Conditions.pdf' class='font-weight-light'>Terms and Conditions</a> | 

                            href='https://openslice.io/data-protection-declaration/' class='font-weight-light'>Data Protection

                        &copy; {{currentYear}} on behalf of <a target='_blank' href='https://osl.etsi.org/' title='osl.etsi.org' class='font-weight-light'>osl.etsi.org</a>

                            Declaration</a> | &copy; 2019-{{currentYear}} on behalf of <a target='_blank' href='http://openslice.io/'

                    </div>

                            title='openslice.io' class='font-weight-light'>openslice.io</a></div>

                </div>

                </div>

            </div>

            </div>