Skip to content

Commit fbd8f76

Browse files
authored
Merge pull request #41256 from nextcloud/enh/40689/add-foto-description-2
add descriptions for background pictures
2 parents 50de755 + bb6c241 commit fbd8f76

File tree

4 files changed

+23
-4
lines changed

4 files changed

+23
-4
lines changed

apps/theming/lib/Service/BackgroundService.php

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,101 +57,120 @@ class BackgroundService {
5757
public const SHIPPED_BACKGROUNDS = [
5858
'hannah-maclean-soft-floral.jpg' => [
5959
'attribution' => 'Soft floral (Hannah MacLean, CC0)',
60+
'description' => 'Abstract background picture in yellow and white color whith a flower on it',
6061
'attribution_url' => 'https://stocksnap.io/photo/soft-floral-XOYWCCW5PA',
6162
'theming' => self::THEMING_MODE_DARK,
6263
'primary_color' => '#9f652f',
6364
],
6465
'ted-moravec-morning-fog.jpg' => [
6566
'attribution' => 'Morning fog (Ted Moravec, Public Domain)',
67+
'description' => 'Background picture of a forest shrouded in fog',
6668
'attribution_url' => 'https://flickr.com/photos/tmoravec/52392410261',
6769
'theming' => self::THEMING_MODE_DARK,
6870
'primary_color' => '#114c3b',
6971
],
7072
'stefanus-martanto-setyo-husodo-underwater-ocean.jpg' => [
7173
'attribution' => 'Underwater ocean (Stefanus Martanto Setyo Husodo, CC0)',
74+
'description' => 'Background picture of an underwater ocean',
7275
'attribution_url' => 'https://stocksnap.io/photo/underwater-ocean-TJA9LBH4WS',
7376
'primary_color' => '#04577e',
7477
],
7578
'zoltan-voros-rhythm-and-blues.jpg' => [
7679
'attribution' => 'Rhythm and blues (Zoltán Vörös, CC BY)',
80+
'description' => 'Abstract background picture of sand dunes during night',
7781
'attribution_url' => 'https://flickr.com/photos/v923z/51634409289/',
7882
'primary_color' => '#1c243c',
7983
],
8084
'anatoly-mikhaltsov-butterfly-wing-scale.jpg' => [
8185
'attribution' => 'Butterfly wing scale (Anatoly Mikhaltsov, CC BY-SA)',
86+
'description' => 'Background picture of a red-ish butterfly wing under microscope',
8287
'attribution_url' => 'https://commons.wikimedia.org/wiki/File:%D0%A7%D0%B5%D1%88%D1%83%D0%B9%D0%BA%D0%B8_%D0%BA%D1%80%D1%8B%D0%BB%D0%B0_%D0%B1%D0%B0%D0%B1%D0%BE%D1%87%D0%BA%D0%B8.jpg',
8388
'primary_color' => '#a53c17',
8489
],
8590
'bernie-cetonia-aurata-take-off-composition.jpg' => [
8691
'attribution' => 'Cetonia aurata take off composition (Bernie, Public Domain)',
92+
'description' => 'Montage of a cetonia aurata bug that takes off with white background',
8793
'attribution_url' => 'https://commons.wikimedia.org/wiki/File:Cetonia_aurata_take_off_composition_05172009.jpg',
8894
'theming' => self::THEMING_MODE_DARK,
8995
'primary_color' => '#56633d',
9096
],
9197
'dejan-krsmanovic-ribbed-red-metal.jpg' => [
9298
'attribution' => 'Ribbed red metal (Dejan Krsmanovic, CC BY)',
99+
'description' => 'Abstract background picture of red ribbed metal with two horizontal white elements on top of it',
93100
'attribution_url' => 'https://www.flickr.com/photos/dejankrsmanovic/42971456774/',
94101
'primary_color' => '#9c4236',
95102
],
96103
'eduardo-neves-pedra-azul.jpg' => [
97104
'attribution' => 'Pedra azul milky way (Eduardo Neves, CC BY-SA)',
105+
'description' => 'Background picture of the milky way during night with a mountain in front of it',
98106
'attribution_url' => 'https://commons.wikimedia.org/wiki/File:Pedra_Azul_Milky_Way.jpg',
99107
'primary_color' => '#4f6071',
100108
],
101109
'european-space-agency-barents-bloom.jpg' => [
102110
'attribution' => 'Barents bloom (European Space Agency, CC BY-SA)',
111+
'description' => 'Abstract background picture of blooming barents in blue and green colors',
103112
'attribution_url' => 'https://www.esa.int/ESA_Multimedia/Images/2016/08/Barents_bloom',
104113
'primary_color' => '#396475',
105114
],
106115
'hannes-fritz-flippity-floppity.jpg' => [
107116
'attribution' => 'Flippity floppity (Hannes Fritz, CC BY-SA)',
117+
'description' => 'Abstract background picture of many pairs of flip flops hanging on a wall in multiple colors',
108118
'attribution_url' => 'http://hannes.photos/flippity-floppity',
109119
'primary_color' => '#98415a',
110120
],
111121
'hannes-fritz-roulette.jpg' => [
112122
'attribution' => 'Roulette (Hannes Fritz, CC BY-SA)',
123+
'description' => 'Background picture of a rotating giant wheel during night',
113124
'attribution_url' => 'http://hannes.photos/roulette',
114125
'primary_color' => '#845334',
115126
],
116127
'hannes-fritz-sea-spray.jpg' => [
117128
'attribution' => 'Sea spray (Hannes Fritz, CC BY-SA)',
129+
'description' => 'Background picture of a stone coast with fog and sea behind it',
118130
'attribution_url' => 'http://hannes.photos/sea-spray',
119131
'primary_color' => '#4f6071',
120132
],
121133
'kamil-porembinski-clouds.jpg' => [
122134
'attribution' => 'Clouds (Kamil Porembiński, CC BY-SA)',
135+
'description' => 'Background picture of white clouds on in front of a blue sky',
123136
'attribution_url' => 'https://www.flickr.com/photos/paszczak000/8715851521/',
124137
'primary_color' => self::DEFAULT_COLOR,
125138
],
126139
'bernard-spragg-new-zealand-fern.jpg' => [
127140
'attribution' => 'New zealand fern (Bernard Spragg, CC0)',
141+
'description' => 'Abstract background picture of fern leafes',
128142
'attribution_url' => 'https://commons.wikimedia.org/wiki/File:NZ_Fern.(Blechnum_chambersii)_(11263534936).jpg',
129143
'primary_color' => '#316b26',
130144
],
131145
'rawpixel-pink-tapioca-bubbles.jpg' => [
132146
'attribution' => 'Pink tapioca bubbles (Rawpixel, CC BY)',
147+
'description' => 'Abstract background picture of pink tapioca bubbles',
133148
'attribution_url' => 'https://www.flickr.com/photos/byrawpixel/27665140298/in/photostream/',
134149
'theming' => self::THEMING_MODE_DARK,
135150
'primary_color' => '#7b4e7e',
136151
],
137152
'nasa-waxing-crescent-moon.jpg' => [
138153
'attribution' => 'Waxing crescent moon (NASA, Public Domain)',
154+
'description' => 'Background picture of glowing earth in foreground and moon in the background',
139155
'attribution_url' => 'https://www.nasa.gov/image-feature/a-waxing-crescent-moon',
140156
'primary_color' => '#005ac1',
141157
],
142158
'tommy-chau-already.jpg' => [
143159
'attribution' => 'Cityscape (Tommy Chau, CC BY)',
160+
'description' => 'Background picture of a skyscraper city during night',
144161
'attribution_url' => 'https://www.flickr.com/photos/90975693@N05/16910999368',
145162
'primary_color' => '#6a2af4',
146163
],
147164
'tommy-chau-lion-rock-hill.jpg' => [
148165
'attribution' => 'Lion rock hill (Tommy Chau, CC BY)',
166+
'description' => 'Background picture of mountains during sunset or sunrise',
149167
'attribution_url' => 'https://www.flickr.com/photos/90975693@N05/17136440246',
150168
'theming' => self::THEMING_MODE_DARK,
151169
'primary_color' => '#7f4f70',
152170
],
153171
'lali-masriera-yellow-bricks.jpg' => [
154172
'attribution' => 'Yellow bricks (Lali Masriera, CC BY)',
173+
'description' => 'Background picture of yellow bricks with some yellow tubes',
155174
'attribution_url' => 'https://www.flickr.com/photos/visualpanic/3982464447',
156175
'theming' => self::THEMING_MODE_DARK,
157176
'primary_color' => '#7f5700',

apps/theming/src/components/BackgroundSettings.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
<button v-for="shippedBackground in shippedBackgrounds"
8888
:key="shippedBackground.name"
8989
:title="shippedBackground.details.attribution"
90-
:aria-label="shippedBackground.details.attribution"
90+
:aria-label="shippedBackground.details.description"
9191
:aria-pressed="backgroundImage === shippedBackground.name"
9292
:class="{
9393
'background background__shipped': true,

dist/theming-personal-theming.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/theming-personal-theming.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.

0 commit comments

Comments
 (0)