diff --git a/config/local_info.xml b/config/local_info.xml index 6115d7ed8..5869f1932 100755 --- a/config/local_info.xml +++ b/config/local_info.xml @@ -17,6 +17,14 @@ no-reply@localhost gocdb-admins@localhost + + + + + + + + AUP location AUP title diff --git a/config/web_portal/menu.xml b/config/web_portal/menu.xml index 310afcfc8..1fb99cc1e 100644 --- a/config/web_portal/menu.xml +++ b/config/web_portal/menu.xml @@ -113,11 +113,11 @@ - + all Doc, Help & Support - index.php?Page_Type=Static_HTML&Page=Help_And_Contact + index.php?Page_Type=Help_And_Contact diff --git a/htdocs/web_portal/controllers/help_and_contact.php b/htdocs/web_portal/controllers/help_and_contact.php new file mode 100644 index 000000000..7aa5e723b --- /dev/null +++ b/htdocs/web_portal/controllers/help_and_contact.php @@ -0,0 +1,47 @@ +getCommunityDocs(); + if (!empty($communityDocs)) { + $params['communityDocs'] = $communityDocs; + } + + $helpdeskLink = $configService->getHelpdeskLink(); + if (!empty($helpdeskLink)) { + $params['helpdeskLink'] = $helpdeskLink; + } + + $requestTracker = $configService->getRequestTracker(); + if (!empty($requestTracker)) { + $params['requestTracker'] = $requestTracker; + } + + $title = "Doc, Help and Support"; + show_view('help_and_contact.php', $params, $title); +} diff --git a/htdocs/web_portal/controllers/service_group/search_ses.php b/htdocs/web_portal/controllers/service_group/search_ses.php index a968aa387..252efe10c 100644 --- a/htdocs/web_portal/controllers/service_group/search_ses.php +++ b/htdocs/web_portal/controllers/service_group/search_ses.php @@ -47,10 +47,10 @@ function search_ses() { } catch(Exception $ex){ show_view( 'error.php', $ex->getMessage() . "

Please contact the " - . "" + . "" . "GOCDB support team if you need help with this issue."); } $params = array('ses' => $ses); show_view('service_group/se_search.php', $params, null, true); -} \ No newline at end of file +} diff --git a/htdocs/web_portal/index.php b/htdocs/web_portal/index.php index 2e21d49f6..1640c9715 100644 --- a/htdocs/web_portal/index.php +++ b/htdocs/web_portal/index.php @@ -302,6 +302,11 @@ function Draw_Page($Page_Type) { require_once __DIR__.'/controllers/my_sites.php'; my_sites(); break; + case "Help_And_Contact"; + //rejectIfNotAuthenticated(); + require_once __DIR__.'/controllers/help_and_contact.php'; + help_and_contact(); + break; case "Edit_NGI": rejectIfNotAuthenticated(); require_once __DIR__.'/controllers/ngi/edit_ngi.php'; @@ -654,6 +659,7 @@ function Draw_Page($Page_Type) { } } + /* Draws a static HTML page */ function Draw_Static_HTML() { $Page_Name = Get_Static_Page_Name(); @@ -661,6 +667,7 @@ function Draw_Static_HTML() { Draw_Standard_Page($Page_Content); } + /* Finds out if a static page has been requested. If it has, return * the page name, otherwise return a blank string. */ function Get_Static_Page_Name() { @@ -711,7 +718,6 @@ function Draw_Standard_Page($Page_Content, $title=null) { } - /* Given the name of a file in the view directory, include it * as the body of a standard GOCDB page */ function show_view($view, $params=null, $title=null, $rawOutput=null) { diff --git a/htdocs/web_portal/static_html/Help_And_Contact.html b/htdocs/web_portal/static_html/Help_And_Contact.html deleted file mode 100644 index 7fc80e781..000000000 --- a/htdocs/web_portal/static_html/Help_And_Contact.html +++ /dev/null @@ -1,57 +0,0 @@ -
-

Documentation, Help and Support

-
-
- -

GOCDB

-

What is GOCDB?

-

- See Release notes -
- Download, Install -

- -

Need information?

-

- Please browse the GOCDB - - Documentation or your community documentation source. -

-

- -

Found a bug?

-

- First, check our - - known bugs to see if this has not already been reported.
- If not, please open a request in your community support desk or our - - GitHub issues - page, if the former is not appropriate. -

-

- -

Want to suggest something?

-

- Before you make any request, check this is not already integrated to our development plans, see - GOCDB Development Plans.
- Any suggestion, new feature or improvement request should - be submitted to your community request tracker or our - - GitHub issues - page, if the former is not appropriate.
- Suggestions will be discussed by the GOCDB developers and - any relevant project body before inclusion into development plans. - These bodies reserve the right to decline unsuitable requests. -

-

- -

Need some support?

- -

- For all other enquiries including general questions, temporary - problem reports or support requests please open a - request in your community support desk. -

-
-
diff --git a/htdocs/web_portal/views/help_and_contact.php b/htdocs/web_portal/views/help_and_contact.php new file mode 100644 index 000000000..e025d8e88 --- /dev/null +++ b/htdocs/web_portal/views/help_and_contact.php @@ -0,0 +1,67 @@ + +
+

Documentation, Help and Support

+
+
+ +

GOCDB

+

What is GOCDB?

+

+ See Release notes +
+ Download, Install +

+ +

Need information?

+

+ Please browse your + + community documentation. +

+

+ +

Found a bug?

+

+ First, check our + + known bugs to see if this has not already been reported.
+ If not, please open a request in your + + community support desk + or our + + GitHub issues + page, if the former is not appropriate. +

+

+ +

Want to suggest something?

+

+ Before you make any request, check this is not already integrated to our development plans, see + GOCDB Development Plans.
+ Any suggestion, new feature or improvement request should + be submitted to your + + community request tracker + or our + + GitHub issues + page, if the former is not appropriate.
+ Suggestions will be discussed by the GOCDB developers and + any relevant project body before inclusion into development plans. + These bodies reserve the right to decline unsuitable requests. +

+

+ +

Need some support?

+ +

+ For all other enquiries including general questions, temporary + problem reports or support requests please open a + request in your + + community support desk. +

+
+
+ diff --git a/lib/Gocdb_Services/Config.php b/lib/Gocdb_Services/Config.php index b7bd22328..a417406fc 100644 --- a/lib/Gocdb_Services/Config.php +++ b/lib/Gocdb_Services/Config.php @@ -556,4 +556,32 @@ public function getEmailTo() return $emailTo; } + + public function getHelpdeskLink() + { + $link = $this->GetLocalInfoXML()->helpdesk->link; + + return $link; + } + + public function getHelpdeskSupportUnit() + { + $supportUnit = $this->GetLocalInfoXML()->helpdesk->support_unit; + + return $supportUnit; + } + + public function getRequestTracker() + { + $requestTracker = $this->GetLocalInfoXML()->request_tracker; + + return $requestTracker; + } + + public function getCommunityDocs() + { + $communityDocs = $this->GetLocalInfoXML()->community_docs; + + return $communityDocs; + } }