diff --git a/.gitignore b/.gitignore
index fcc7cca2..efc4f8aa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,5 @@ node_modules
grails-app/assets/compile/
grails-app/conf/application-backup.yml
+/.asscache
+/npm-debug.log
diff --git a/.jpb/persistence-units.xml b/.jpb/persistence-units.xml
new file mode 100644
index 00000000..a462c23d
--- /dev/null
+++ b/.jpb/persistence-units.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/_Events.groovy b/_Events.groovy
index 8e10ced2..57610121 100644
--- a/_Events.groovy
+++ b/_Events.groovy
@@ -233,7 +233,7 @@ def build(String baseDir) {
print(label)
def newCount = 0
- String input = FileUtils.readFileToString(f)
+ String input = FileUtils.readFileToString(f)
def output = new StringBuilder()
@@ -325,6 +325,7 @@ def findLastIndex(directory, startString, endString) {
last_idx = Math.max(last_idx, Integer.parseInt(value))
}
}
+ }
start = next + 1
} else {
diff --git a/embedExample.html b/embedExample.html
index 1eecd08c..1afb2c15 100644
--- a/embedExample.html
+++ b/embedExample.html
@@ -96,7 +96,7 @@
'https://collections.ala.org.au/**',
'http://phylolink.ala.org.au/**'
],
- i18n: 'default',
+ i18n: 'de',
editable: false
};
diff --git a/gradle-base-services-1.0.jar.zip b/gradle-base-services-1.0.jar.zip
new file mode 100644
index 00000000..172b6bb9
Binary files /dev/null and b/gradle-base-services-1.0.jar.zip differ
diff --git a/gradle-base-services-1.0.jar/gradle-base-services-1.0.jar b/gradle-base-services-1.0.jar/gradle-base-services-1.0.jar
new file mode 100644
index 00000000..21253316
Binary files /dev/null and b/gradle-base-services-1.0.jar/gradle-base-services-1.0.jar differ
diff --git a/grails-app/assets/javascripts/spApp/controller/toolCtrl.js b/grails-app/assets/javascripts/spApp/controller/toolCtrl.js
index a1f5059e..a5bbf4e6 100644
--- a/grails-app/assets/javascripts/spApp/controller/toolCtrl.js
+++ b/grails-app/assets/javascripts/spApp/controller/toolCtrl.js
@@ -194,7 +194,7 @@
if (value.type === 'species') {
c.splice(parseInt(k) + 1, 0, {
type: "date",
- description: "Select date range",
+ description: $i18n(531),
name: '_date'
})
}
diff --git a/grails-app/assets/javascripts/spApp/service/facetAutoCompleteService.js b/grails-app/assets/javascripts/spApp/service/facetAutoCompleteService.js
index ae75b5cc..b9042684 100644
--- a/grails-app/assets/javascripts/spApp/service/facetAutoCompleteService.js
+++ b/grails-app/assets/javascripts/spApp/service/facetAutoCompleteService.js
@@ -97,7 +97,7 @@
}
}
list.unshift({
- title: $i18n("Other"),
+ title: $i18n(22),
facets: dynamicList
})
}
diff --git a/grails-app/assets/javascripts/spApp/service/menuService.js b/grails-app/assets/javascripts/spApp/service/menuService.js
index 64785234..92508aab 100644
--- a/grails-app/assets/javascripts/spApp/service/menuService.js
+++ b/grails-app/assets/javascripts/spApp/service/menuService.js
@@ -21,11 +21,29 @@
return httpconfig;
};
-
//TODO: support dynamic menu update
-
+ /*
+ if ($SH.menu.indexOf('http') == 0) {
+ var setup = $http.get($SH.menu, _httpDescription('getMenu')).then(function (data) {
+ menuConfig = data.data;
+ return menuConfig;
+ });
+ } else {
+ menuConfig = $SH.menu;
+ setup = $q.when(menuConfig)
+ }
+ */
+ //TODO: support dynamic menu update
if ($SH.menu.indexOf('http') == 0) {
var setup = $http.get($SH.menu, _httpDescription('getMenu')).then(function (data) {
+ var it_0 = 0;
+ var it_1 = 0;
+ for(it_0 = 0; it_0 < data.data.length; it_0++) {
+ data.data[it_0].name = $i18n(data.data[it_0].i18nNr);
+ for(it_1 = 0; it_1 < data.data[it_0].items.length; it_1++) {
+ data.data[it_0].items[it_1].name = $i18n(data.data[it_0].items[it_1].i18nNr);
+ }
+ }
menuConfig = data.data;
return menuConfig;
});
diff --git a/grails-app/assets/javascripts/spApp/service/predefinedAreasService.js b/grails-app/assets/javascripts/spApp/service/predefinedAreasService.js
index aa746380..25d51304 100644
--- a/grails-app/assets/javascripts/spApp/service/predefinedAreasService.js
+++ b/grails-app/assets/javascripts/spApp/service/predefinedAreasService.js
@@ -38,7 +38,7 @@
}
return [
- MapService.newArea($i18n("Current extent"),
+ MapService.newArea($i18n(16),
["longitude:[" + extents[0] + " TO " + extents[2] + "]", "latitude:[" + extents[1] + " TO " + extents[3] + "]"],
'POLYGON((' + extents[0] + ' ' + extents[3] + ',' + extents[0] + ' ' + extents[1] + ',' +
extents[2] + ' ' + extents[1] + ',' + extents[2] + ' ' + extents[3] + ',' +
diff --git a/grails-app/assets/javascripts/spApp/service/toolAddLayerService.js b/grails-app/assets/javascripts/spApp/service/toolAddLayerService.js
index be3a9da6..f88fc8e5 100644
--- a/grails-app/assets/javascripts/spApp/service/toolAddLayerService.js
+++ b/grails-app/assets/javascripts/spApp/service/toolAddLayerService.js
@@ -15,14 +15,14 @@
spec: {
"input": [
{
- "description": "Select layers.",
+ "description": $i18n(298),
"type": "layer",
"constraints": {
"min": 1,
"optional": false
}
}],
- "description": "Add environmental and contextual layers to the map."
+ "description": $i18n(415)
},
execute: function (inputs) {
diff --git a/grails-app/assets/javascripts/spApp/service/toolAddSpeciesService.js b/grails-app/assets/javascripts/spApp/service/toolAddSpeciesService.js
index 6cc8222f..b74752ff 100644
--- a/grails-app/assets/javascripts/spApp/service/toolAddSpeciesService.js
+++ b/grails-app/assets/javascripts/spApp/service/toolAddSpeciesService.js
@@ -13,11 +13,12 @@
return {
// Override text with view-config.json
+ // Im Moment nur deutsche Internationalisierung
spec: {
"input": [
{
"name": "species",
- "description": "Select species.",
+ "description": $i18n(416),
"type": "species",
"constraints": {
"min": 1,
@@ -30,7 +31,7 @@
},
{
"name": "speciesOptions",
- "description": "Include related areas.",
+ "description": $i18n(417),
"type": "speciesOptions",
"constraints": {
"optional": true,
@@ -41,7 +42,7 @@
},
{
"name": "area",
- "description": "Restrict to an area.",
+ "description": $i18n(418),
"type": "area",
"constraints": {
"min": 1,
@@ -49,7 +50,7 @@
"defaultToWorld": true
}
}],
- "description": "Add a species layer to the map"
+ "description": $i18n(419)
},
diff --git a/grails-app/assets/javascripts/spApp/service/toolAreaReportService.js b/grails-app/assets/javascripts/spApp/service/toolAreaReportService.js
index e1c85200..735d381b 100644
--- a/grails-app/assets/javascripts/spApp/service/toolAreaReportService.js
+++ b/grails-app/assets/javascripts/spApp/service/toolAreaReportService.js
@@ -15,7 +15,7 @@
spec: {
"input": [
{
- "description": $i18n("Select area."),
+ "description": $i18n(352),
"type": "area",
"constraints": {
"min": 1,
@@ -23,7 +23,7 @@
"optional": false
}
}],
- "description": $i18n("Area Report")
+ "description": $i18n(353)
},
execute: function (inputs) {
diff --git a/grails-app/assets/javascripts/spApp/service/toolExportAreaService.js b/grails-app/assets/javascripts/spApp/service/toolExportAreaService.js
index 240b582d..9bb6f639 100644
--- a/grails-app/assets/javascripts/spApp/service/toolExportAreaService.js
+++ b/grails-app/assets/javascripts/spApp/service/toolExportAreaService.js
@@ -15,7 +15,7 @@
spec: {
"input": [
{
- "description": "Select areas.",
+ "description": $i18n(420),
"type": "area",
"constraints": {
"min": 1,
@@ -25,7 +25,7 @@
}
},
{
- "description": "Filetype.",
+ "description": $i18n(421),
"type": "list",
"constraints": {
"default": "Shapefile",
@@ -41,26 +41,26 @@
}],
"view": [
{
- "name": "Select areas to export.",
+ "name": $i18n(422),
"inputs": [
"area"
]
},
{
- "name": "Select filetype.",
+ "name": $i18n(423),
"inputs": [
"layer"
]
},
{
- "name": "Number of groups and Shapefile generation",
+ "name": $i18n(424),
"inputs": [
"groups",
"shp"
]
}
],
- "description": "Export areas."
+ "description": $i18n(425)
},
execute: function (inputs) {
diff --git a/grails-app/assets/javascripts/spApp/service/toolExportChecklistService.js b/grails-app/assets/javascripts/spApp/service/toolExportChecklistService.js
index be5d6418..3f08462c 100644
--- a/grails-app/assets/javascripts/spApp/service/toolExportChecklistService.js
+++ b/grails-app/assets/javascripts/spApp/service/toolExportChecklistService.js
@@ -15,7 +15,7 @@
spec: {
"input": [
{
- "description": "Restrict to an area.",
+ "description": $i18n(418),
"type": "area",
"constraints": {
"min": 1,
@@ -24,7 +24,7 @@
}
},
{
- "description": "Species options.",
+ "description": $i18n(411),
"type": "speciesOptions",
"constraints": {
"areaIncludes": false,
@@ -33,7 +33,7 @@
"absentOption": true
}
}],
- "description": "Export a species list."
+ "description": $i18n(426)
},
downloading: false,
diff --git a/grails-app/assets/javascripts/spApp/service/toolExportMapService.js b/grails-app/assets/javascripts/spApp/service/toolExportMapService.js
index 2d7152ec..e18821dc 100644
--- a/grails-app/assets/javascripts/spApp/service/toolExportMapService.js
+++ b/grails-app/assets/javascripts/spApp/service/toolExportMapService.js
@@ -17,7 +17,7 @@
"input": [
{
"name": "caption",
- "description": "Enter a map caption.",
+ "description": $i18n(530),
"type": "text",
"constraints": {
"optional": true
@@ -25,7 +25,7 @@
},
{
"name": "format",
- "description": "Select an image format.",
+ "description": $i18n(529),
"type": "list",
"constraints": {
"default": "png",
@@ -39,7 +39,7 @@
}
}],
- "description": "Export areas."
+ "description": $i18n(425)
},
execute: function (inputs) {
diff --git a/grails-app/assets/javascripts/spApp/service/toolExportSampleService.js b/grails-app/assets/javascripts/spApp/service/toolExportSampleService.js
index f3d5b4c9..a93444f3 100644
--- a/grails-app/assets/javascripts/spApp/service/toolExportSampleService.js
+++ b/grails-app/assets/javascripts/spApp/service/toolExportSampleService.js
@@ -23,7 +23,7 @@
"input": [
{
"name": "area",
- "description": "Select area.",
+ "description": $i18n(420),
"type": "area",
"constraints": {
"min": 1,
@@ -34,7 +34,7 @@
},
{
"name": "species",
- "description": "Select species.",
+ "description": $i18n(416),
"type": "species",
"constraints": {
"min": 1,
@@ -46,7 +46,7 @@
},
{
"name": "layers",
- "description": "Select layers.",
+ "description": $i18n(414),
"type": "layer",
"constraints": {
"min": 1,
@@ -54,7 +54,7 @@
}
}
],
- "description": "Export points."
+ "description": "Punkte exportieren."
},
execute: function (inputs) {
diff --git a/grails-app/assets/javascripts/spApp/templates/toolContent.tpl.htm b/grails-app/assets/javascripts/spApp/templates/toolContent.tpl.htm
index 6d8c348d..0351ff6d 100644
--- a/grails-app/assets/javascripts/spApp/templates/toolContent.tpl.htm
+++ b/grails-app/assets/javascripts/spApp/templates/toolContent.tpl.htm
@@ -25,7 +25,7 @@
{{stepCount[idx - 1] + $index + 1}}. {{sv.name !== u
- Mandatory.
+ Mandatory.
diff --git a/grails-app/assets/stylesheets/spatial-hub-generic.css b/grails-app/assets/stylesheets/spatial-hub-generic.css
index a3a8770e..55e62090 100644
--- a/grails-app/assets/stylesheets/spatial-hub-generic.css
+++ b/grails-app/assets/stylesheets/spatial-hub-generic.css
@@ -1071,8 +1071,8 @@ section#breadcrumb {
}
section#breadcrumb li + li::before {
- content: "\f105";
- font-family: FontAwesome;
+ /* content: "\f105";
+ font-family: FontAwesome; */
margin: 0 .6em;
height: .8em;
opacity: .6;
@@ -1810,7 +1810,7 @@ input[type="date"] {
top: 0;
right: 0;
bottom: 0;
- left: 0;
+ left: auto;
z-index: 1050;
-webkit-overflow-scrolling: touch;
outline: 0;
diff --git a/grails-app/conf/application.yml b/grails-app/conf/application.yml
index fc557f15..7304a424 100644
--- a/grails-app/conf/application.yml
+++ b/grails-app/conf/application.yml
@@ -10,6 +10,8 @@ grails:
- file:/data/spatial-hub/config/spatial-hub-config.properties
- file:/data/spatial-hub/config/spatial-hub-config.yml
- file:/data/spatial-hub/config/spatial-hub-config.groovy
+ # - file:C:\\Users\\Georg Neubauer\\IdeaProjects\\REMDB_2021_servers\\backups_30_09_2021\\data\\spatial-hub\\config\\spatial-hub-config.yml
+ # - file:D:\\reinhardt\\firma\\Biodiversity\\working\\data\\spatial-hub\\spatial-hub-config.yml
spring:
transactionManagement:
proxies: false
diff --git a/grails-app/views/layouts/generic_AT.gsp b/grails-app/views/layouts/generic_AT.gsp
new file mode 100644
index 00000000..685b6368
--- /dev/null
+++ b/grails-app/views/layouts/generic_AT.gsp
@@ -0,0 +1,661 @@
+
+
+
+
+
+
+
+
+
+
+
+
Biodiversitäts-Atlas Österreich – Frei zugängliches Onlineportal zur Entdeckung der Vielfalt an Organismen und Lebensräumen in Österreich
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+