Skip to content
Snippets Groups Projects
Commit ee0fe587 authored by gnaegi's avatar gnaegi
Browse files

OO-3451 make tile icons work without the browserconfig that requries absolute urls

parent 83b5088f
No related branches found
No related tags found
No related merge requests found
Showing
with 17 additions and 14 deletions
......@@ -44,6 +44,9 @@ public class Theme {
private static final String CUSTOM_FAVICON_PNG32_FILENAME = "meta/favicon32.png";
private static final String CUSTOM_FAVICON_PNG64_FILENAME = "meta/favicon64.png";
private static final String CUSTOM_APPICON_PNG180_FILENAME = "meta/appicon180.png";
private static final String CUSTOM_TILEICON_PNG70_FILENAME = "meta/tileicon70.png";
private static final String CUSTOM_TILEICON_PNG150_FILENAME = "meta/tileicon150.png";
private static final String CUSTOM_TILEICON_PNG310_FILENAME = "meta/tileicon310.png";
private static final String CUSTOM_MANIFEST_FILENAME = "meta/manifest.json";
private static final String CUSTOM_MS_APPLICATION_CONFIG_FILENAM = "meta/msapplication-config.xml";
......@@ -168,9 +171,20 @@ public class Theme {
if (new File(themeFolder,CUSTOM_MANIFEST_FILENAME).exists()) {
sb.append("<link rel='manifest' href='").append(baseURI).append(CUSTOM_MANIFEST_FILENAME).append("' />\n");
}
// Include Microsoft application config file
// Include Microsoft application config file (make sure any referenced image in the file has absolute path configuration
if (new File(themeFolder,CUSTOM_MS_APPLICATION_CONFIG_FILENAM).exists()) {
sb.append("<meta name='msapplication-config' content='").append(baseURI).append(CUSTOM_MS_APPLICATION_CONFIG_FILENAM).append("' />\n");
} else {
sb.append("<meta name='msapplication-TileColor' content='").append("#ffffff").append("' />\n");
if (new File(themeFolder,CUSTOM_TILEICON_PNG70_FILENAME).exists()) {
sb.append("<meta name='msapplication-square70x70logo' content='").append(baseURI).append(CUSTOM_TILEICON_PNG70_FILENAME).append("' />\n");
}
if (new File(themeFolder,CUSTOM_TILEICON_PNG150_FILENAME).exists()) {
sb.append("<meta name='msapplication-square150x150logo' content='").append(baseURI).append(CUSTOM_TILEICON_PNG150_FILENAME).append("' />\n");
}
if (new File(themeFolder,CUSTOM_TILEICON_PNG310_FILENAME).exists()) {
sb.append("<meta name='msapplication-square310x310logo' content='").append(baseURI).append(CUSTOM_TILEICON_PNG310_FILENAME).append("' />\n");
}
}
return sb.toString();
......
src/main/webapp/static/themes/light/meta/appicon.png

36.6 KiB

src/main/webapp/static/themes/light/meta/appicon150.png

10.2 KiB

src/main/webapp/static/themes/light/meta/appicon180.png

12.3 KiB | W: | H:

src/main/webapp/static/themes/light/meta/appicon180.png

12.9 KiB | W: | H:

src/main/webapp/static/themes/light/meta/appicon180.png
src/main/webapp/static/themes/light/meta/appicon180.png
src/main/webapp/static/themes/light/meta/appicon180.png
src/main/webapp/static/themes/light/meta/appicon180.png
  • 2-up
  • Swipe
  • Onion skin
src/main/webapp/static/themes/light/meta/appicon192.png

13.6 KiB | W: | H:

src/main/webapp/static/themes/light/meta/appicon192.png

13.7 KiB | W: | H:

src/main/webapp/static/themes/light/meta/appicon192.png
src/main/webapp/static/themes/light/meta/appicon192.png
src/main/webapp/static/themes/light/meta/appicon192.png
src/main/webapp/static/themes/light/meta/appicon192.png
  • 2-up
  • Swipe
  • Onion skin
src/main/webapp/static/themes/light/meta/appicon270.png

20.1 KiB

src/main/webapp/static/themes/light/meta/appicon310.png

23.9 KiB

src/main/webapp/static/themes/light/meta/appicon70.png

4.24 KiB

src/main/webapp/static/themes/light/meta/favicon.png

81.3 KiB

src/main/webapp/static/themes/light/meta/favicon16.png

595 B | W: | H:

src/main/webapp/static/themes/light/meta/favicon16.png

601 B | W: | H:

src/main/webapp/static/themes/light/meta/favicon16.png
src/main/webapp/static/themes/light/meta/favicon16.png
src/main/webapp/static/themes/light/meta/favicon16.png
src/main/webapp/static/themes/light/meta/favicon16.png
  • 2-up
  • Swipe
  • Onion skin
src/main/webapp/static/themes/light/meta/favicon32.png

1.42 KiB | W: | H:

src/main/webapp/static/themes/light/meta/favicon32.png

1.42 KiB | W: | H:

src/main/webapp/static/themes/light/meta/favicon32.png
src/main/webapp/static/themes/light/meta/favicon32.png
src/main/webapp/static/themes/light/meta/favicon32.png
src/main/webapp/static/themes/light/meta/favicon32.png
  • 2-up
  • Swipe
  • Onion skin
src/main/webapp/static/themes/light/meta/favicon64.png

3.29 KiB | W: | H:

src/main/webapp/static/themes/light/meta/favicon64.png

3.3 KiB | W: | H:

src/main/webapp/static/themes/light/meta/favicon64.png
src/main/webapp/static/themes/light/meta/favicon64.png
src/main/webapp/static/themes/light/meta/favicon64.png
src/main/webapp/static/themes/light/meta/favicon64.png
  • 2-up
  • Swipe
  • Onion skin
{
"name":"OpenOLAT - Infinite Learning",
"name":"OpenOLAT eLearning",
"icons": [
{
"src":"appicon192.png", "sizes":"192x192", "type":"image/png"
}
],
"theme_color":"#ffffff",
"display":"standalone"
"display":"minimal-ui"
}
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<browserconfig>
<msapplication>
<tile>
<square70x70logo src="appicon70.png" />
<square150x150logo src="appicon150.png" />
<square310x310logo src="appicon310.png" />
<TileColor>#04283d</TileColor>
</tile>
</msapplication>
</browserconfig>
\ No newline at end of file
src/main/webapp/static/themes/light/meta/src/appicon.png

43 KiB

src/main/webapp/static/themes/light/meta/src/favicon.png

29.6 KiB

src/main/webapp/static/themes/light/meta/src/tileicon.png

44.4 KiB

src/main/webapp/static/themes/light/meta/tileicon150.png

9.06 KiB

src/main/webapp/static/themes/light/meta/tileicon310.png

21.5 KiB

src/main/webapp/static/themes/light/meta/tileicon70.png

3.75 KiB

0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment