Skip to content

Commit

Permalink
Merge pull request #26 from lat-lon/fixLinks-8112-141
Browse files Browse the repository at this point in the history
Fix links to help
  • Loading branch information
stephanr authored Apr 13, 2022
2 parents 1a374ec + 0d764d8 commit e279c2e
Show file tree
Hide file tree
Showing 9 changed files with 39 additions and 25 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<Description>Description of deegree Datasets</Description>
<Contact>
<Name>deegree</Name>
<Url>https://deegree-enterprise.de</Url>
<EMail>info@deegree-enterprise.de</EMail>
<Url>https://www.deegree.org</Url>
<EMail>info@deegree.org</EMail>
</Contact>

</Datasets>
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
</DatasetLicense>
<DatasetCreator>
<Name>Test</Name>
<Url>http://deegree-enterprise.de</Url>
<EMail>info@deegree-enterprise.de</EMail>
<Url>https://www.deegree.org</Url>
<EMail>info@deegree.org</EMail>
</DatasetCreator>
<MetadataURL format="application/xml">http://metaver?service=CSW&amp;request=GetRecordById&amp;version=2.0.2&amp;id=89362</MetadataURL>
<MetadataURL format="text/html">http://localhost:8080/linkZuHTml/89362</MetadataURL>
Expand Down
8 changes: 5 additions & 3 deletions deegree-ogcapi-features/src/main/resources/collection.html
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ <h1 v-cloak class="mt-5">{{ title }}</h1>
<a v-cloak v-bind:href="legalNoticeUrl" target="_blank" class="legalNotice"> Legal Notice</a>
</span>
<span v-else>
<a href="https://deegree-enterprise.de" target="_blank" class="legalNotice"> deegree Enterprise Edition</a>
<a href="https://www.deegree.org" target="_blank" class="legalNotice"> deegree</a>
</span>
<span v-if="privacyUrl && privacyUrl.length > 0">
<span> | </span>
Expand Down Expand Up @@ -238,7 +238,7 @@ <h1 v-cloak class="mt-5">{{ title }}</h1>
var footerApp = new Vue({
el: '#footer',
data: {
helpUrl: '',
helpUrl: createDocumentationUrl(),
legalNoticeUrl: '',
privacyUrl: ''
},
Expand All @@ -251,7 +251,9 @@ <h1 v-cloak class="mt-5">{{ title }}</h1>
dataType: "json",
url: createHtmlConfigUrl(),
success: function(data) {
self.helpUrl = data.documentationUrl ? data.documentationUrl : createDocumentationUrl();
if ( data.documentationUrl ) {
self.helpUrl = data.documentationUrl;
}
self.legalNoticeUrl = data.legalNoticeUrl;
self.privacyUrl = data.privacyUrl;
}
Expand Down
8 changes: 5 additions & 3 deletions deegree-ogcapi-features/src/main/resources/collections.html
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ <h5 v-cloak>{{ collection.title }}</h5>
<a v-cloak v-bind:href="legalNoticeUrl" target="_blank" class="legalNotice"> Legal Notice</a>
</span>
<span v-else>
<a href="https://deegree-enterprise.de" target="_blank" class="legalNotice"> deegree Enterprise Edition</a>
<a href="https://www.deegree.org" target="_blank" class="legalNotice"> deegree</a>
</span>
<span v-if="privacyUrl && privacyUrl.length > 0">
<span> | </span>
Expand Down Expand Up @@ -219,7 +219,7 @@ <h5 v-cloak>{{ collection.title }}</h5>
var footerApp = new Vue({
el: '#footer',
data: {
helpUrl: '',
helpUrl: createDocumentationUrl(),
legalNoticeUrl: '',
privacyUrl: ''
},
Expand All @@ -232,7 +232,9 @@ <h5 v-cloak>{{ collection.title }}</h5>
dataType: "json",
url: createHtmlConfigUrl(),
success: function(data) {
self.helpUrl = data.documentationUrl ? data.documentationUrl : createDocumentationUrl();
if ( data.documentationUrl ) {
self.helpUrl = data.documentationUrl;
}
self.legalNoticeUrl = data.legalNoticeUrl;
self.privacyUrl = data.privacyUrl;
}
Expand Down
8 changes: 5 additions & 3 deletions deegree-ogcapi-features/src/main/resources/conformance.html
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ <h1 class="mt-5">Conformance Classes</h1>
<a v-cloak v-bind:href="legalNoticeUrl" target="_blank" class="legalNotice"> Legal Notice</a>
</span>
<span v-else>
<a href="https://deegree-enterprise.de" target="_blank" class="legalNotice"> deegree Enterprise Edition</a>
<a href="https://www.deegree.org" target="_blank" class="legalNotice"> deegree</a>
</span>
<span v-if="privacyUrl && privacyUrl.length > 0">
<span> | </span>
Expand Down Expand Up @@ -162,7 +162,7 @@ <h1 class="mt-5">Conformance Classes</h1>
var footerApp = new Vue({
el: '#footer',
data: {
helpUrl: '',
helpUrl: createDocumentationUrl(),
legalNoticeUrl: '',
privacyUrl: ''
},
Expand All @@ -175,7 +175,9 @@ <h1 class="mt-5">Conformance Classes</h1>
dataType: "json",
url: createHtmlConfigUrl(),
success: function(data) {
self.helpUrl = data.documentationUrl ? data.documentationUrl : createDocumentationUrl();
if ( data.documentationUrl ) {
self.helpUrl = data.documentationUrl;
}
self.legalNoticeUrl = data.legalNoticeUrl;
self.privacyUrl = data.privacyUrl;
}
Expand Down
8 changes: 5 additions & 3 deletions deegree-ogcapi-features/src/main/resources/datasets.html
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ <h3 class="mt-5" >Contact</h3>
<a v-cloak v-bind:href="legalNoticeUrl" target="_blank" class="legalNotice"> Legal Notice</a>
</span>
<span v-else>
<a href="https://deegree-enterprise.de" target="_blank" class="legalNotice"> deegree Enterprise Edition</a>
<a href="https://www.deegree.org" target="_blank" class="legalNotice"> deegree</a>
</span>
<span v-if="privacyUrl && privacyUrl.length > 0">
<span> | </span>
Expand Down Expand Up @@ -174,7 +174,7 @@ <h3 class="mt-5" >Contact</h3>
var footerApp = new Vue({
el: '#footer',
data: {
helpUrl: '',
helpUrl: createDocumentationUrl(),
legalNoticeUrl: '',
privacyUrl: ''
},
Expand All @@ -187,7 +187,9 @@ <h3 class="mt-5" >Contact</h3>
dataType: "json",
url: createHtmlConfigUrl(),
success: function(data) {
self.helpUrl = data.documentationUrl ? data.documentationUrl : createDocumentationUrl();
if ( data.documentationUrl ) {
self.helpUrl = data.documentationUrl;
}
self.legalNoticeUrl = data.legalNoticeUrl;
self.privacyUrl = data.privacyUrl;
}
Expand Down
8 changes: 5 additions & 3 deletions deegree-ogcapi-features/src/main/resources/feature.html
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ <h3 v-cloak class="mt-5">Error retrieving feature with ID {{ featureId }}</h3>
<a v-cloak v-bind:href="legalNoticeUrl" target="_blank" class="legalNotice"> Legal Notice</a>
</span>
<span v-else>
<a href="https://deegree-enterprise.de" target="_blank" class="legalNotice"> deegree Enterprise Edition</a>
<a href="https://www.deegree.org" target="_blank" class="legalNotice"> deegree</a>
</span>
<span v-if="privacyUrl && privacyUrl.length > 0">
<span> | </span>
Expand Down Expand Up @@ -327,7 +327,7 @@ <h3 v-cloak class="mt-5">Error retrieving feature with ID {{ featureId }}</h3>
var footerApp = new Vue({
el: '#footer',
data: {
helpUrl: '',
helpUrl: createDocumentationUrl(),
legalNoticeUrl: '',
privacyUrl: ''
},
Expand All @@ -340,7 +340,9 @@ <h3 v-cloak class="mt-5">Error retrieving feature with ID {{ featureId }}</h3>
dataType: "json",
url: createHtmlConfigUrl(),
success: function(data) {
self.helpUrl = data.documentationUrl ? data.documentationUrl : createDocumentationUrl();
if ( data.documentationUrl ) {
self.helpUrl = data.documentationUrl;
}
self.legalNoticeUrl = data.legalNoticeUrl;
self.privacyUrl = data.privacyUrl;
}
Expand Down
8 changes: 5 additions & 3 deletions deegree-ogcapi-features/src/main/resources/features.html
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ <h5 class="filter-header">End Period</h5>
<a v-cloak v-bind:href="legalNoticeUrl" target="_blank" class="legalNotice"> Legal Notice</a>
</span>
<span v-else>
<a href="https://deegree-enterprise.de" target="_blank" class="legalNotice"> deegree Enterprise Edition</a>
<a href="https://www.deegree.org" target="_blank" class="legalNotice"> deegree</a>
</span>
<span v-if="privacyUrl && privacyUrl.length > 0">
<span> | </span>
Expand Down Expand Up @@ -691,7 +691,7 @@ <h5 class="filter-header">End Period</h5>
var footerApp = new Vue({
el: '#footer',
data: {
helpUrl: '',
helpUrl: createDocumentationUrl(),
legalNoticeUrl: '',
privacyUrl: ''
},
Expand All @@ -704,7 +704,9 @@ <h5 class="filter-header">End Period</h5>
dataType: "json",
url: createHtmlConfigUrl(),
success: function(data) {
self.helpUrl = data.documentationUrl ? data.documentationUrl : createDocumentationUrl();
if ( data.documentationUrl ) {
self.helpUrl = data.documentationUrl;
}
self.legalNoticeUrl = data.legalNoticeUrl;
self.privacyUrl = data.privacyUrl;
}
Expand Down
8 changes: 5 additions & 3 deletions deegree-ogcapi-features/src/main/resources/landingpage.html
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ <h1 v-cloak class="mt-5">{{ title }}</h1>
<a v-cloak v-bind:href="legalNoticeUrl" target="_blank" class="legalNotice"> Legal Notice</a>
</span>
<span v-else>
<a href="https://deegree-enterprise.de" target="_blank" class="legalNotice"> deegree Enterprise Edition</a>
<a href="https://www.deegree.org" target="_blank" class="legalNotice"> deegree</a>
</span>
<span v-if="privacyUrl && privacyUrl.length > 0">
<span> | </span>
Expand Down Expand Up @@ -212,7 +212,7 @@ <h1 v-cloak class="mt-5">{{ title }}</h1>
var footerApp = new Vue({
el: '#footer',
data: {
helpUrl: '',
helpUrl: createDocumentationUrl(),
legalNoticeUrl: '',
privacyUrl: ''
},
Expand All @@ -225,7 +225,9 @@ <h1 v-cloak class="mt-5">{{ title }}</h1>
dataType: "json",
url: createHtmlConfigUrl(),
success: function(data) {
self.helpUrl = data.documentationUrl ? data.documentationUrl : createDocumentationUrl();
if ( data.documentationUrl ) {
self.helpUrl = data.documentationUrl;
}
self.legalNoticeUrl = data.legalNoticeUrl;
self.privacyUrl = data.privacyUrl;
}
Expand Down

0 comments on commit e279c2e

Please sign in to comment.