#225 fixed the main page link on nav

AtlasOfLivingAustralia · Nov 24, 2023 · 93f5605 · 93f5605
1 parent b4ae3e0
commit 93f5605
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 7 deletions.
diff --git a/grails-app/conf/application.yml b/grails-app/conf/application.yml
@@ -277,7 +277,7 @@ gazField: 'cl915'
 userObjectsField: 'cl1083'
 
 apiKeyCheckUrlTemplate: 'https://auth.ala.org.au/apikey/ws/check?apikey={0}'
-spatialService.remote: "https://spatial.ala.org.au/ws"
+#spatialService.remote: "https://spatial.ala.org.au/ws"
 
 journalmap.api_key: ''
 journalmap.url: 'https://www.journalmap.org/'
@@ -400,10 +400,11 @@ environments:
     # Slave config
     spatialService:
       url: "http://devt.ala.org.au:8081/ws"
+      remote: "https://spatial-test.ala.org.au/ws"
     geoserver:
       # use localhost to play nice with locally running geoserver docker instance.
-      #url: 'http://localhost:8079/geoserver'
-      url: 'https://spatial-test.ala.org.au/geoserver'
+      url: 'http://localhost:8079/geoserver'
+      #url: 'https://spatial-test.ala.org.au/geoserver'
       username: 'admin'
       password: 'geoserver'
     dataSource:

diff --git a/grails-app/views/layer/show.gsp b/grails-app/views/layer/show.gsp
@@ -2,8 +2,9 @@
 <html>
 <head>
     <title>${layer.displayname}</title>
+    <g:set var="baseUrl" value="${request.scheme}://${request.serverName}:${request.serverPort}${request.contextPath}" />
     <meta name="breadcrumbs"
-          content="${g.createLink(controller: 'main', action: 'index')}, Spatial Service \\ ${g.createLink(controller: 'layer', action: 'list')}, Layers"/>
+          content="${g.createLink(uri: baseUrl)}, Spatial Service \\ ${g.createLink(controller: 'layer', action: 'list')}, Layers"/>
     <meta name="layout" content="ala-main"/>
 </head>
 

diff --git a/grails-app/views/manageLayers/field.gsp b/grails-app/views/manageLayers/field.gsp
@@ -2,8 +2,9 @@
 <html>
 <head>
     <title>Edit Field</title>
+    <g:set var="baseUrl" value="${request.scheme}://${request.serverName}:${request.serverPort}${request.contextPath}" />
     <meta name="breadcrumbs"
-          content="${g.createLink(controller: 'main', action: 'index')}, Spatial Service \\ ${g.createLink(controller: 'manageLayers', action: 'layers')}, Layers"/>
+          content="${g.createLink(uri: baseUrl)}, Spatial Service \\ ${g.createLink(controller: 'manageLayers', action: 'layers')}, Layers"/>
 
     <meta name="layout" content="ala-main"/>
     <link rel="stylesheet" href="${resource(dir: 'css', file: 'leaflet.css')}"/>

diff --git a/grails-app/views/manageLayers/remote.gsp b/grails-app/views/manageLayers/remote.gsp
@@ -2,7 +2,9 @@
 <html>
 <head>
     <title>Copy Layers</title>
-    <meta name="breadcrumbs" content="${g.createLink(controller: 'main', action: 'index')}, Spatial Service"/>
+    <g:set var="baseUrl" value="${request.scheme}://${request.serverName}:${request.serverPort}${request.contextPath}" />
+    <meta name="breadcrumbs" content="${g.createLink(uri: baseUrl)}, Spatial Service"/>
+
     <meta name="layout" content="ala-main"/>
 
     <script src="${resource(dir: 'js', file: 'jquery.js')}"></script>

diff --git a/grails-app/views/tasks/index.gsp b/grails-app/views/tasks/index.gsp
@@ -4,7 +4,8 @@
 <head>
     <meta name="layout" content="ala-main">
     <title>Tasks</title>
-    <meta name="breadcrumbs" content="${g.createLink(controller: 'main', action: 'index')}, Spatial Service"/>
+    <g:set var="baseUrl" value="${request.scheme}://${request.serverName}:${request.serverPort}${request.contextPath}" />
+    <meta name="breadcrumbs" content="${g.createLink(uri: baseUrl)}, Spatial Service"/>
     <g:set var="entityName" value="${message(code: 'task.label', default: 'Task')}"/>
     <script src="${resource(dir: 'js', file: 'jquery.js')}"></script>
     <script src="${resource(dir: 'js', file: 'jquery.dataTables.min.js')}"></script>