Skip to content

Commit 432c8a0

Browse files
Merge pull request #22319 from nextcloud/enh/dashboard/attributions
Add attributions for weather status in modal
2 parents b91f36d + 18057db commit 432c8a0

File tree

3 files changed

+33
-3
lines changed

3 files changed

+33
-3
lines changed

apps/dashboard/js/dashboard.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/dashboard/js/dashboard.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/dashboard/src/App.vue

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<div id="app-dashboard" :style="backgroundStyle">
33
<h2>{{ greeting.text }}</h2>
44
<ul class="statuses">
5-
<div v-for="status in registeredStatus"
5+
<div v-for="status in sortedRegisteredStatus"
66
:id="'status-' + status"
77
:key="status">
88
<div :ref="'status-' + status" />
@@ -59,6 +59,14 @@
5959

6060
<h3>{{ t('dashboard', 'Change background image') }}</h3>
6161
<BackgroundSettings :background="background" @update:background="updateBackground" />
62+
63+
<h3>{{ t('dashboard', 'Weather service') }}</h3>
64+
<p>
65+
{{ t('dashboard', 'For your privacy, the weather data is requested by your Nextcloud server on your behalf so the weather service receives no personal information.') }}
66+
</p>
67+
<p class="credits--end">
68+
<a href="https://api.met.no/doc/TermsOfService" target="_blank" rel="noopener">{{ t('dashboard', 'Weather data from Met.no') }}</a>, <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy" target="_blank" rel="noopener">{{ t('dashboard', 'geocoding with Nominatim') }}</a>, <a href="https://www.opentopodata.org/#public-api" target="_blank" rel="noopener">{{ t('dashboard', 'elevation data from OpenTopoData') }}</a>.
69+
</p>
6270
</div>
6371
</Modal>
6472
</div>
@@ -164,6 +172,9 @@ export default {
164172
return indexA - indexB || a.id - b.id
165173
})
166174
},
175+
sortedRegisteredStatus() {
176+
return this.registeredStatus.slice().sort((a, b) => a > b)
177+
},
167178
},
168179
watch: {
169180
callbacks() {
@@ -494,6 +505,25 @@ export default {
494505
padding: 12px 24px;
495506
margin: 0;
496507
}
508+
509+
p {
510+
max-width: 650px;
511+
margin: 0 auto;
512+
513+
a:hover,
514+
a:focus {
515+
border-bottom: 2px solid var(--color-border);
516+
}
517+
}
518+
519+
.credits--end {
520+
padding-bottom: 32px;
521+
color: var(--color-text-maxcontrast);
522+
523+
a {
524+
color: var(--color-text-maxcontrast);
525+
}
526+
}
497527
}
498528
499529
.flip-list-move {

0 commit comments

Comments
 (0)