fix for #7

src/Footer.html

@@ -5,31 +5,34 @@
 			
 				<div class="col-xs-12 col-sm-12 col-md-6">
 					<h2>Who we are</h2>
-					<address class='font-weight-light'><span class='font-weight-bold'><strong>openslice.io project</strong></span> | <a
-							href='http://openslice.io/' class='text-white' style="color:#FFFFFF;">openslice.io</a><br>openslice.io an opensource OSS
+					<address class='font-weight-light'><span class='font-weight-bold'>ETSI SDG OpenSlice</span> | <a
+							href='https://osl.etsi.org/' class='text-white' style="color:#FFFFFF;">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'><strong>{{portalName}}</strong></span> | <a
-							href='{{weburl}}' class='text-white' style="color:#FFFFFF;">{{weburl}}</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'><strong>{{portalName}} wiki</strong></span> | <a
-							href='{{portalwiki}}' class='text-white' style="color:#FFFFFF;">{{portalwiki}}</a><br>A wiki containing project
-						documentation.
-					</address>
-					<address class='font-weight-light'><span class='font-weight-bold'><strong>{{portalName}} Report Issues</strong></span> | <a
-							href='{{bugzilla}}' class='text-white' style="color:#FFFFFF;">{{bugzilla}}</a><br>Our
-						issue tracking system.</address>
+					<address class='font-weight-light'><span class='font-weight-bold'>{{portalName}}</span> | <a
+						href='{{weburl}}' class='text-white' style="color:#FFFFFF;">{{weburl}}</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'>{{portalName}} wiki</span> | <a
+						href='{{portalwiki}}'
+						class='text-white' style="color:#FFFFFF;">{{portalwiki}}</a><br>A wiki containing OpenSlice software documentation.
+ 					</address>
 				</div>
 
 				<div class="col-xs-12 col-sm-12 col-md-6 col-lg-6">
 					<h2>Connect with us</h2>
 					<div class="row">
-						<div class="col-xs-12 col-sm-6 col-md-3">
-							<div><a href='https://twitter.com/OpensliceOSS' class='font-weight-light text-white' style="color:#FFFFFF;"><i
-									class='fa fa-twitter mr-2' style="margin-right: .5rem;"></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' style="color:#FFFFFF;"><i
+										class='fa fa-linkedin mr-2' style="margin-right: 0.5rem;"></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' style="color:#FFFFFF;"><i
-									class='fa fa-slack mr-2' style="margin-right: .5rem;"></i>Slack</a></div>
+										class='fa fa-slack mr-2' style="margin-right: 0.5rem;"></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' style="color:#FFFFFF;"><i
+										class='fa fa-twitter mr-2' style="margin-right: 0.5rem;"></i>Twitter</a></div>
 						</div>
 					</div>
 				</div>
@@ -45,16 +48,23 @@
 				<div class="container">
 					<div class='row align-items-center' style="display: flex; align-items: center;">
 						<div class='col-md-2'><img src='./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'>{{portalName}} 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> | &copy; 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'>OpenSlice has received funding from
+							<div class='font-weight-light'>
+								<a href="https://5ginfire.eu/">5GinFIRE project</a> from the European Horizon 2020 Programme for research, technological
+								development and demonstration under grant agreement number 732497.
+							</div>
+							<div class='font-weight-light'>
+								<a href='https://5g-vinni.eu/'>5G-VINNI project</a> from the European Horizon 2020 Programme for research, technological
+								development and demonstration under grant agreement number 815279.
+							</div>
+							<div class='font-weight-light'>
+								<a href='https://5gasp.eu/'>5GASP project</a> from the European Horizon 2020 Programme for research, technological
+								development and demonstration under grant agreement number 101016448.
+							</div>
+							<div class='font-weight-light'>{{portalName}} running OSL version version 2024Q2 | 
+								<a href='https://osl.etsi.org/files/SDG_OSL_Terms_and_Conditions.pdf' class='font-weight-light'>Terms and Conditions</a> | 
+                        &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>
+							</div>
 						</div>
 					</div>
 		

src/SignInHomeSection.html

@@ -4,9 +4,9 @@
 			<div class="col-xs-12 col-sm-8 col-md-8 col-lg-8 ">
 				<h1>&nbsp;</h1>
 				<h2>
-					Welcome to the openslice {{portalName}}!
+					Welcome to the {{portalName}}!
 				</h2>
-				<h4>Use the fields on the right to login
+				<h4>Use the field on the right to login
 					to {{portalName}} and easily deploy an experiment over 
 					the {{portalName}} infrastructure!</h4>
 				<h4>Check our <strong><a style="color:#FFFFFF;" href="{{portalwiki}}">wiki</a></strong> for further documenation</h4>

src/js/portalapp.js

@@ -8,7 +8,7 @@ var app = angular.module('portalapp', [   'ngCookies', 'ngResource', 'ngRoute',
                                          'angular-loading-bar', 'ngAnimate' ]);
 
 
-var portalversion = '1.1.0-SNAPSHOT';
+var portalversion = '2024Q2';
 
 app.config(function($routeProvider, $locationProvider, $anchorScrollProvider, cfpLoadingBarProvider) {
 	
@@ -206,6 +206,7 @@ app.config(function($routeProvider, $locationProvider, $anchorScrollProvider, cf
 app.controller('mpMainCtrl', function($scope, PortalUser, $log, $location ) {
 	$scope.mpversion = portalversion;
 	$scope.location = $location;
+	$scope.currentYear = new Date().getFullYear();
 });
 
 

src/openslicehome/index.html

+<!-- THIS IS DEPRECATED. OpenSlice Homepage is handled by the tmf.web project. -->
+
 <!doctype html>
 <html ng-app='portalapp'>
 <head>