diff --git a/config/local_info.xml b/config/local_info.xml index 6115d7ed8..795d3392d 100755 --- a/config/local_info.xml +++ b/config/local_info.xml @@ -13,6 +13,19 @@ + + + + + + + + + + + + + no-reply@localhost gocdb-admins@localhost diff --git a/htdocs/web_portal/controllers/ngi/view_ngis.php b/htdocs/web_portal/controllers/ngi/view_ngis.php index cfab47056..dc9228acb 100644 --- a/htdocs/web_portal/controllers/ngi/view_ngis.php +++ b/htdocs/web_portal/controllers/ngi/view_ngis.php @@ -25,6 +25,8 @@ function view_ngis() { require_once __DIR__ . '/../utils.php'; require_once __DIR__.'/../../../../lib/Gocdb_Services/Factory.php'; + $configService = \Factory::getConfigservice(); + $filterParams = array(); // $scope = '%%'; @@ -68,6 +70,11 @@ function view_ngis() { $params['ngis'] = $ngis; $params['scopes']=$scopes; $params['selectedScopes']=$selectedScopes; + + // adding the configurable ngi documentation link to the params array + $ngiDocLink = $configService->getNgiDocLink(); + $params['ngiDocLink'] = $ngiDocLink; + show_view('ngi/view_ngis.php', $params, "NGIs"); } diff --git a/htdocs/web_portal/controllers/project/view_all.php b/htdocs/web_portal/controllers/project/view_all.php index fc42ee8fd..bdac88dfd 100644 --- a/htdocs/web_portal/controllers/project/view_all.php +++ b/htdocs/web_portal/controllers/project/view_all.php @@ -22,9 +22,20 @@ function show_all_projects() { require_once __DIR__.'/../../../../lib/Gocdb_Services/Factory.php'; - $projects = \Factory::getProjectService()->getProjects(); + + $params = array(); + + $configService = \Factory::getConfigService(); + $projectService = \Factory::getProjectService(); + + $projects = $projectService->getProjects(); $params['Projects'] = $projects; + + // adding the configurable project documentation link to the params array + $projectDocLink = $configService->getProjectDocLink(); + $params['projectDocLink'] = $projectDocLink; + show_view('project/view_all.php', $params, "Projects"); } -?> \ No newline at end of file +?> diff --git a/htdocs/web_portal/controllers/service_group/view_all.php b/htdocs/web_portal/controllers/service_group/view_all.php index cfb89ba34..639e8e6a8 100644 --- a/htdocs/web_portal/controllers/service_group/view_all.php +++ b/htdocs/web_portal/controllers/service_group/view_all.php @@ -22,6 +22,8 @@ function showAllServiceGroups(){ require_once __DIR__.'/../../../../lib/Gocdb_Services/Factory.php'; + $configService = \Factory::getConfigService(); + $filterParams = array(); // Scope parameters @@ -90,5 +92,10 @@ function showAllServiceGroups(){ $params['selectedExtKeyName'] = $extensionPropName; //$sgKeyNames; $params['selectedExtKeyValue'] = $extensionPropValue; //$sgKeyValues; $params['extKeyName'] = $keynames; + + // adding the configurable service group documentation link to the params array + $serviceGroupDocLink = $configService->getServiceGroupDocLink(); + $params['serviceGroupDocLink'] = $serviceGroupDocLink; + show_view("service_group/view_all.php", $params); } diff --git a/htdocs/web_portal/views/ngi/view_ngis.php b/htdocs/web_portal/views/ngi/view_ngis.php index a6c68f3d8..2f7d40ef4 100644 --- a/htdocs/web_portal/views/ngi/view_ngis.php +++ b/htdocs/web_portal/views/ngi/view_ngis.php @@ -13,7 +13,7 @@ National Grid Initiatives - What is an NGI? + What is an NGI? diff --git a/htdocs/web_portal/views/project/view_all.php b/htdocs/web_portal/views/project/view_all.php index 3bbd44b4a..c0dcc3e05 100644 --- a/htdocs/web_portal/views/project/view_all.php +++ b/htdocs/web_portal/views/project/view_all.php @@ -11,7 +11,7 @@ - + What is a project? diff --git a/htdocs/web_portal/views/service_group/view_all.php b/htdocs/web_portal/views/service_group/view_all.php index a704fd9c5..62f09a22e 100644 --- a/htdocs/web_portal/views/service_group/view_all.php +++ b/htdocs/web_portal/views/service_group/view_all.php @@ -10,7 +10,7 @@ All Service Groups in GOCDB. - + What is a service group? diff --git a/lib/Gocdb_Services/Config.php b/lib/Gocdb_Services/Config.php index b7bd22328..8c4ecd11f 100644 --- a/lib/Gocdb_Services/Config.php +++ b/lib/Gocdb_Services/Config.php @@ -556,4 +556,25 @@ public function getEmailTo() return $emailTo; } + + public function getProjectDocLink() + { + $projectDocLink = $this->GetLocalInfoXML()->project->doc_link; + + return $projectDocLink; + } + + public function getNgiDocLink() + { + $ngiDocLink = $this->GetLocalInfoXML()->ngi->doc_link; + + return $ngiDocLink; + } + + public function getServiceGroupDocLink() + { + $serviceGroupDocLink = $this->GetLocalInfoXML()->service_group->doc_link; + + return $serviceGroupDocLink; + } }