Skip to content

Commit 4d1e6d8

Browse files
committed
[TASK] Refactor Web App icon configuration
1 parent 63dd06a commit 4d1e6d8

33 files changed

+269
-130
lines changed

Configuration/Sets/Sitepackage/Setup/browserconfig.xml.typoscript

Lines changed: 0 additions & 52 deletions
This file was deleted.

Configuration/Sets/Sitepackage/Setup/page.typoscript

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,11 @@ page {
2828
10 = TEXT
2929
10 {
3030
value (
31-
<link rel="apple-touch-icon" sizes="180x180" href="{path:EXT:sitepackage/Resources/Public/Icons/Favicon/apple-touch-icon.png}">
32-
<link rel="icon" type="image/png" sizes="32x32" href="{path:EXT:sitepackage/Resources/Public/Icons/Favicon/favicon-32x32.png}">
33-
<link rel="icon" type="image/png" sizes="194x194" href="{path:EXT:sitepackage/Resources/Public/Icons/Favicon/favicon-194x194.png}">
34-
<link rel="icon" type="image/png" sizes="192x192" href="{path:EXT:sitepackage/Resources/Public/Icons/Favicon/android-chrome-192x192.png}">
35-
<link rel="icon" type="image/png" sizes="16x16" href="{path:EXT:sitepackage/Resources/Public/Icons/Favicon/favicon-16x16.png}">
36-
<link rel="manifest" href="/site.webmanifest">
37-
<link rel="mask-icon" href="{path:EXT:sitepackage/Resources/Public/Icons/Favicon/safari-pinned-tab.svg}" color="#5bbad5">
38-
<meta name="msapplication-config" content="/browserconfig.xml">
39-
<meta name="msapplication-TileColor" content="#da532c">
40-
<meta name="msapplication-TileImage" content="{path:EXT:sitepackage/Resources/Public/Icons/Favicon/mstile-144x144.png}">
41-
<meta name="theme-color" content="#ffffff">
31+
<link rel="icon" type="image/png" href="/favicon-48x48.png" sizes="48x48" />
32+
<link rel="icon" type="image/svg+xml" href="/favicon.svg" />
33+
<link rel="shortcut icon" href="/favicon.ico" />
34+
<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png" />
35+
<link rel="manifest" href="/site.webmanifest" />
4236
)
4337
insertData = 1
4438
}

Configuration/Sets/Sitepackage/Setup/site.webmanifest.typoscript

Lines changed: 6 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -7,41 +7,13 @@ site\.webmanifest {
77
admPanel = 0
88
debug = 0
99
}
10-
10 = COA
10+
10 = FLUIDTEMPLATE
1111
10 {
12-
stdWrap.wrap = {|}
13-
14-
10 = TEXT
15-
10 {
16-
dataWrap (
17-
"name":"{siteLanguage:websiteTitle // site:websiteTitle}",
18-
"short_name":"{siteLanguage:websiteTitle // site:websiteTitle}",
19-
"icons":[|],
20-
"theme_color":"#ffffff",
21-
"background_color":"#ffffff",
22-
"display":"standalone"
23-
)
24-
25-
value = 36x36, 48x48, 72x72, 96x96, 144x144, 192x192, 256x256, 384x384, 512x512
26-
split {
27-
token = ,
28-
wrap = {|},|*|{|},|*|{|}
29-
cObjNum = 1
30-
1.cObject = COA
31-
1.cObject {
32-
10 = TEXT
33-
10 {
34-
current = 1
35-
trim = 1
36-
dataWrap = "src":"{path:EXT:sitepackage/Resources/Public/Icons/Favicon/android-chrome-|.png}",
37-
}
38-
20 = TEXT
39-
20 {
40-
current = 1
41-
trim = 1
42-
wrap = "sizes":"|","type":"image/png"
43-
}
44-
}
12+
file = EXT:sitepackage/Resources/Private/Templates/Pages/WebManifest.html
13+
dataProcessing {
14+
10 = site
15+
10 {
16+
as = site
4517
}
4618
}
4719
}

Configuration/Sets/Sitepackage/de.labels.xlf

Lines changed: 79 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
3-
<file source-language="en" target-language="de" original="messages" datatype="plaintext" product-name="sitepackage" date="2024-10-18T11:40:16+02:00">
3+
<file source-language="en" target-language="de" original="messages" datatype="plaintext" product-name="sitepackage" date="2024-10-18T20:01:16+02:00">
44
<header></header>
55
<body>
66
<trans-unit id="label" resname="label">
@@ -19,6 +19,10 @@
1919
<source>HTML Meta Information</source>
2020
<target>HTML-Metainformationen</target>
2121
</trans-unit>
22+
<trans-unit id="categories.sitepackage.webmanifest" resname="categories.sitepackage.webmanifest">
23+
<source>Web App Manifest</source>
24+
<target>Web App Manifest</target>
25+
</trans-unit>
2226
<trans-unit id="settings.page.view.templateRootPath" resname="settings.page.view.templateRootPath">
2327
<source>Template Root Path</source>
2428
<target>Wurzelverzeichnis für Templates</target>
@@ -92,13 +96,85 @@
9296
<target>Bestätigen Sie Ihre Website-Inhaberschaft</target>
9397
</trans-unit>
9498
<trans-unit id="settings.page.meta.apple-mobile-web-app-title" resname="settings.page.meta.apple-mobile-web-app-title">
95-
<source>Mobile web app title</source>
96-
<target>Titel der mobilen App</target>
99+
<source>Mobile web app title (iOS)</source>
100+
<target>Titel der mobilen App (iOS)</target>
97101
</trans-unit>
98102
<trans-unit id="settings.description.page.meta.apple-mobile-web-app-title" resname="settings.description.page.meta.apple-mobile-web-app-title">
99103
<source>If empty, iOS will use the page title</source>
100104
<target>Wenn leer, verwendet iOS den Seitentitel</target>
101105
</trans-unit>
106+
<trans-unit id="settings.page.webmanifest.name" resname="settings.page.webmanifest.name">
107+
<source>Name</source>
108+
<target>Name</target>
109+
</trans-unit>
110+
<trans-unit id="settings.description.page.webmanifest.name" resname="settings.description.page.webmanifest.name">
111+
<source>Mobile web app name</source>
112+
<target>Name der mobilen Web App</target>
113+
</trans-unit>
114+
<trans-unit id="settings.page.webmanifest.short_name" resname="settings.page.webmanifest.short_name">
115+
<source>Short Name</source>
116+
<target>Kurzname</target>
117+
</trans-unit>
118+
<trans-unit id="settings.description.page.webmanifest.short_name" resname="settings.description.page.webmanifest.short_name">
119+
<source>Mobile web app short name</source>
120+
<target>Kurzname der mobilen Web App</target>
121+
</trans-unit>
122+
<trans-unit id="settings.page.webmanifest.icons.sizes" resname="settings.page.webmanifest.icons.sizes">
123+
<source>Icon Sizes</source>
124+
<target>Icon-Abmessungen</target>
125+
</trans-unit>
126+
<trans-unit id="settings.description.page.webmanifest.icons.sizes" resname="settings.description.page.webmanifest.icons.sizes">
127+
<source>Define the height and width of the icon dimensions to be used for mobile web apps in the form &lt;width&gt;x&lt;height&gt;</source>
128+
<target>Definieren Sie die Höhe und Breite der für mobile Web Apps zu verwendenden Icon-Abmessungen in der Form &lt;Breite&gt;x&lt;Höhe&gt;.</target>
129+
</trans-unit>
130+
<trans-unit id="settings.page.webmanifest.icons.file.type" resname="settings.page.webmanifest.icons.file.type">
131+
<source>File Type</source>
132+
<target>Datei-Typ</target>
133+
</trans-unit>
134+
<trans-unit id="settings.page.webmanifest.icons.file.prefix" resname="settings.page.webmanifest.icons.file.prefix">
135+
<source>File Prefix</source>
136+
<target>Datei-Präfix</target>
137+
</trans-unit>
138+
<trans-unit id="settings.description.page.webmanifest.icons.file.prefix" resname="settings.description.page.webmanifest.icons.file.prefix">
139+
<source>Prefix for icon files of the web manifest</source>
140+
<target>Präfix für Icon Dateien des Webmanifests</target>
141+
</trans-unit>
142+
<trans-unit id="settings.description.page.webmanifest.icons.file.type" resname="settings.description.page.webmanifest.icons.file.type">
143+
<source>Type of webmanifest referenced files</source>
144+
<target>Typ der referenzierten Webmanifest-Dateien</target>
145+
</trans-unit>
146+
<trans-unit id="settings.page.webmanifest.icons.file.purpose" resname="settings.page.webmanifest.icons.file.purpose">
147+
<source>File Purpose</source>
148+
<target>Datei-Zweck</target>
149+
</trans-unit>
150+
<trans-unit id="settings.description.page.webmanifest.icons.file.purpose" resname="settings.description.page.webmanifest.icons.file.purpose">
151+
<source>Context in which the symbol can be used by the browser or operating system</source>
152+
<target>Kontext, in dem das Symbol vom Browser oder Betriebssystem verwendet werden kann</target>
153+
</trans-unit>
154+
<trans-unit id="settings.page.webmanifest.theme_color" resname="settings.page.webmanifest.theme_color">
155+
<source>Theme Color</source>
156+
<target>Theme-Farbe</target>
157+
</trans-unit>
158+
<trans-unit id="settings.description.page.webmanifest.theme_color" resname="settings.description.page.webmanifest.theme_color">
159+
<source>Default color of the web app</source>
160+
<target>Standardfarbe der Web App</target>
161+
</trans-unit>
162+
<trans-unit id="settings.page.webmanifest.background_color" resname="settings.page.webmanifest.background_color">
163+
<source>Background Color</source>
164+
<target>Hintergrundfarbe</target>
165+
</trans-unit>
166+
<trans-unit id="settings.description.page.webmanifest.background_color" resname="settings.description.page.webmanifest.background_color">
167+
<source>Background color of the web application on initial load</source>
168+
<target>Hintergrundfarbe der Webanwendung beim anfänglichen laden</target>
169+
</trans-unit>
170+
<trans-unit id="settings.page.webmanifest.display" resname="settings.page.webmanifest.display">
171+
<source>Display</source>
172+
<target>Anzeige</target>
173+
</trans-unit>
174+
<trans-unit id="settings.description.page.webmanifest.display" resname="settings.description.page.webmanifest.display">
175+
<source>Preferred display mode for the web application</source>
176+
<target>Bevorzugter Anzeigemodus für die Webanwendung</target>
177+
</trans-unit>
102178
</body>
103179
</file>
104180
</xliff>

Configuration/Sets/Sitepackage/labels.xlf

Lines changed: 59 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
3-
<file source-language="en" original="EXT:seo/Configuration/Sets/Sitemap/labels.xlf" datatype="plaintext" product-name="seo" date="2024-10-18T11:40:16+02:00">
3+
<file source-language="en" original="EXT:seo/Configuration/Sets/Sitemap/labels.xlf" datatype="plaintext" product-name="seo" date="2024-10-18T20:01:16+02:00">
44
<header></header>
55
<body>
66
<trans-unit id="label" resname="label">
@@ -15,6 +15,9 @@
1515
<trans-unit id="categories.sitepackage.meta" resname="categories.sitepackage.meta">
1616
<source>HTML Meta Information</source>
1717
</trans-unit>
18+
<trans-unit id="categories.sitepackage.webmanifest" resname="categories.sitepackage.webmanifest">
19+
<source>Web App Manifest</source>
20+
</trans-unit>
1821
<trans-unit id="settings.page.view.templateRootPath" resname="settings.page.view.templateRootPath">
1922
<source>Template Root Path</source>
2023
</trans-unit>
@@ -70,11 +73,65 @@
7073
<source>Verify your site ownership</source>
7174
</trans-unit>
7275
<trans-unit id="settings.page.meta.apple-mobile-web-app-title" resname="settings.page.meta.apple-mobile-web-app-title">
73-
<source>Mobile web app title</source>
76+
<source>Mobile web app title (iOS)</source>
7477
</trans-unit>
7578
<trans-unit id="settings.description.page.meta.apple-mobile-web-app-title" resname="settings.description.page.meta.apple-mobile-web-app-title">
7679
<source>If empty, iOS will use the page title</source>
7780
</trans-unit>
81+
<trans-unit id="settings.page.webmanifest.name" resname="settings.page.webmanifest.name">
82+
<source>Name</source>
83+
</trans-unit>
84+
<trans-unit id="settings.description.page.webmanifest.name" resname="settings.description.page.webmanifest.name">
85+
<source>Mobile web app name</source>
86+
</trans-unit>
87+
<trans-unit id="settings.page.webmanifest.short_name" resname="settings.page.webmanifest.short_name">
88+
<source>Short Name</source>
89+
</trans-unit>
90+
<trans-unit id="settings.description.page.webmanifest.short_name" resname="settings.description.page.webmanifest.short_name">
91+
<source>Mobile web app short name</source>
92+
</trans-unit>
93+
<trans-unit id="settings.page.webmanifest.icons.sizes" resname="settings.page.webmanifest.icons.sizes">
94+
<source>Icon Sizes</source>
95+
</trans-unit>
96+
<trans-unit id="settings.description.page.webmanifest.icons.sizes" resname="settings.description.page.webmanifest.icons.sizes">
97+
<source>Define the height and width of the icon dimensions to be used for mobile web apps in the form &lt;width&gt;x&lt;height&gt;</source>
98+
</trans-unit>
99+
<trans-unit id="settings.page.webmanifest.icons.file.type" resname="settings.page.webmanifest.icons.file.type">
100+
<source>File Type</source>
101+
</trans-unit>
102+
<trans-unit id="settings.page.webmanifest.icons.file.prefix" resname="settings.page.webmanifest.icons.file.prefix">
103+
<source>File Prefix</source>
104+
</trans-unit>
105+
<trans-unit id="settings.description.page.webmanifest.icons.file.prefix" resname="settings.description.page.webmanifest.icons.file.prefix">
106+
<source>Prefix for icon files of the web manifest</source>
107+
</trans-unit>
108+
<trans-unit id="settings.description.page.webmanifest.icons.file.type" resname="settings.description.page.webmanifest.icons.file.type">
109+
<source>Type of webmanifest referenced files</source>
110+
</trans-unit>
111+
<trans-unit id="settings.page.webmanifest.icons.file.purpose" resname="settings.page.webmanifest.icons.file.purpose">
112+
<source>File Purpose</source>
113+
</trans-unit>
114+
<trans-unit id="settings.description.page.webmanifest.icons.file.purpose" resname="settings.description.page.webmanifest.icons.file.purpose">
115+
<source>Context in which the symbol can be used by the browser or operating system</source>
116+
</trans-unit>
117+
<trans-unit id="settings.page.webmanifest.theme_color" resname="settings.page.webmanifest.theme_color">
118+
<source>Theme Color</source>
119+
</trans-unit>
120+
<trans-unit id="settings.description.page.webmanifest.theme_color" resname="settings.description.page.webmanifest.theme_color">
121+
<source>Default color of the web app</source>
122+
</trans-unit>
123+
<trans-unit id="settings.page.webmanifest.background_color" resname="settings.page.webmanifest.background_color">
124+
<source>Background Color</source>
125+
</trans-unit>
126+
<trans-unit id="settings.description.page.webmanifest.background_color" resname="settings.description.page.webmanifest.background_color">
127+
<source>Background color of the web application on initial load</source>
128+
</trans-unit>
129+
<trans-unit id="settings.page.webmanifest.display" resname="settings.page.webmanifest.display">
130+
<source>Display</source>
131+
</trans-unit>
132+
<trans-unit id="settings.description.page.webmanifest.display" resname="settings.description.page.webmanifest.display">
133+
<source>Preferred display mode for the web application</source>
134+
</trans-unit>
78135
</body>
79136
</file>
80137
</xliff>

Configuration/Sets/Sitepackage/settings.definitions.yaml

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ categories:
44
parent: sitepackage
55
sitepackage.meta:
66
parent: sitepackage
7+
sitepackage.webmanifest:
8+
parent: sitepackage
79

810
settings:
911
page.view.layoutRootPath:
@@ -46,3 +48,61 @@ settings:
4648
type: string
4749
default: 'Sitepackage'
4850
category: sitepackage.meta
51+
page.webmanifest.name:
52+
type: string
53+
default: 'TYPO3 Sitepackage'
54+
category: sitepackage.webmanifest
55+
page.webmanifest.short_name:
56+
type: string
57+
default: 'Sitepackage'
58+
category: sitepackage.webmanifest
59+
page.webmanifest.icons.sizes:
60+
type: stringlist
61+
default:
62+
- 192x192
63+
- 512x512
64+
category: sitepackage.webmanifest
65+
page.webmanifest.icons.file.prefix:
66+
type: string
67+
default: 'web-app-manifest-'
68+
category: sitepackage.webmanifest
69+
page.webmanifest.icons.file.type:
70+
type: string
71+
default: 'png'
72+
category: sitepackage.webmanifest
73+
enum:
74+
'apng': 'Animated Portable Network Graphics (APNG) image'
75+
'avif': 'Archive document (multiple files embedded)'
76+
'bmp': 'Windows OS/2 Bitmap Graphics'
77+
'gif': 'Graphics Interchange Format (GIF)'
78+
'ico': 'Icon format'
79+
'jpg': 'JPEG images'
80+
'png': 'Portable Network Graphics'
81+
'svg': 'Scalable Vector Graphics (SVG)'
82+
'tif': 'Tagged Image File Format (TIFF)'
83+
'webp': 'WEBP image'
84+
page.webmanifest.icons.file.purpose:
85+
type: string
86+
default: 'maskable'
87+
category: sitepackage.webmanifest
88+
enum:
89+
'maskable': 'Maskable'
90+
'monochrome': 'Monochrome'
91+
'any': 'Any'
92+
page.webmanifest.theme_color:
93+
type: color
94+
default: '#ffffff'
95+
category: sitepackage.webmanifest
96+
page.webmanifest.background_color:
97+
type: color
98+
default: '#ffffff'
99+
category: sitepackage.webmanifest
100+
page.webmanifest.display:
101+
type: string
102+
default: 'standalone'
103+
category: sitepackage.webmanifest
104+
enum:
105+
'fullscreen': 'Fullscreen'
106+
'standalone': 'Standalone'
107+
'minimal-ui': 'Minimal UI'
108+
'browser': 'Browser'

0 commit comments

Comments
 (0)