diff --git a/src/main/java/org/olat/core/gui/themes/Theme.java b/src/main/java/org/olat/core/gui/themes/Theme.java
index 60131bf91942e3df2f97165cc2f2ee5bdd1e5424..c8b65a4e2b9856bd655da5ee7c7f62bf90fe39fb 100644
--- a/src/main/java/org/olat/core/gui/themes/Theme.java
+++ b/src/main/java/org/olat/core/gui/themes/Theme.java
@@ -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();
diff --git a/src/main/webapp/static/themes/light/meta/appicon.png b/src/main/webapp/static/themes/light/meta/appicon.png
deleted file mode 100644
index 35d5028af8869c7a65ca8867fddfd1e99a23a2ad..0000000000000000000000000000000000000000
Binary files a/src/main/webapp/static/themes/light/meta/appicon.png and /dev/null differ
diff --git a/src/main/webapp/static/themes/light/meta/appicon150.png b/src/main/webapp/static/themes/light/meta/appicon150.png
deleted file mode 100644
index 87e742132f7262c27283f704b8c4e45ae2beb310..0000000000000000000000000000000000000000
Binary files a/src/main/webapp/static/themes/light/meta/appicon150.png and /dev/null differ
diff --git a/src/main/webapp/static/themes/light/meta/appicon180.png b/src/main/webapp/static/themes/light/meta/appicon180.png
index daeacdd1ab446e6d16a6f13b4d8aa0575f0f9f9c..198e34500c45bb54faaee5763e1c7b94c7f5d326 100644
Binary files a/src/main/webapp/static/themes/light/meta/appicon180.png and b/src/main/webapp/static/themes/light/meta/appicon180.png differ
diff --git a/src/main/webapp/static/themes/light/meta/appicon192.png b/src/main/webapp/static/themes/light/meta/appicon192.png
index 4607d733a852dd393c6cc08c234a963f44ee5a90..ec53d0efa46f903cd388481bb4509b22334c2097 100644
Binary files a/src/main/webapp/static/themes/light/meta/appicon192.png and b/src/main/webapp/static/themes/light/meta/appicon192.png differ
diff --git a/src/main/webapp/static/themes/light/meta/appicon270.png b/src/main/webapp/static/themes/light/meta/appicon270.png
deleted file mode 100644
index 6a5e00c8acbdc3d50f706bf601428cebf4248023..0000000000000000000000000000000000000000
Binary files a/src/main/webapp/static/themes/light/meta/appicon270.png and /dev/null differ
diff --git a/src/main/webapp/static/themes/light/meta/appicon310.png b/src/main/webapp/static/themes/light/meta/appicon310.png
deleted file mode 100644
index d34649b21d0751147840fa3a482c7b95ca8afd86..0000000000000000000000000000000000000000
Binary files a/src/main/webapp/static/themes/light/meta/appicon310.png and /dev/null differ
diff --git a/src/main/webapp/static/themes/light/meta/appicon70.png b/src/main/webapp/static/themes/light/meta/appicon70.png
deleted file mode 100644
index 0fb545c63688c0d9188a6b52365bb64e2786bcbb..0000000000000000000000000000000000000000
Binary files a/src/main/webapp/static/themes/light/meta/appicon70.png and /dev/null differ
diff --git a/src/main/webapp/static/themes/light/meta/favicon.png b/src/main/webapp/static/themes/light/meta/favicon.png
deleted file mode 100644
index b3cc6bfc35306ededf03b46b685b7946fe1b95da..0000000000000000000000000000000000000000
Binary files a/src/main/webapp/static/themes/light/meta/favicon.png and /dev/null differ
diff --git a/src/main/webapp/static/themes/light/meta/favicon16.png b/src/main/webapp/static/themes/light/meta/favicon16.png
index 643d96da6c16c256775ef7df38ee802ff156e61d..5a6dbecf1324283d6ccf0cea6d39627643b69044 100644
Binary files a/src/main/webapp/static/themes/light/meta/favicon16.png and b/src/main/webapp/static/themes/light/meta/favicon16.png differ
diff --git a/src/main/webapp/static/themes/light/meta/favicon32.png b/src/main/webapp/static/themes/light/meta/favicon32.png
index a546d3017baa73fbe16642da834ded57f6a2532e..9725a2aeceddccbb4d3d3b68197d22be5e91d92c 100644
Binary files a/src/main/webapp/static/themes/light/meta/favicon32.png and b/src/main/webapp/static/themes/light/meta/favicon32.png differ
diff --git a/src/main/webapp/static/themes/light/meta/favicon64.png b/src/main/webapp/static/themes/light/meta/favicon64.png
index 359ae5ef133b5d8be6756334f145d0913052c589..dfa7c180906fc435fb02934d35e7125b8ae67eca 100644
Binary files a/src/main/webapp/static/themes/light/meta/favicon64.png and b/src/main/webapp/static/themes/light/meta/favicon64.png differ
diff --git a/src/main/webapp/static/themes/light/meta/manifest.json b/src/main/webapp/static/themes/light/meta/manifest.json
index 6c145a783e0a8d02ffc2f5405bf65411224ffba4..9a6aafebe06ce56ca795b908c35b0f73f917c540 100644
--- a/src/main/webapp/static/themes/light/meta/manifest.json
+++ b/src/main/webapp/static/themes/light/meta/manifest.json
@@ -1,10 +1,10 @@
{
- "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
diff --git a/src/main/webapp/static/themes/light/meta/msapplication-config.xml b/src/main/webapp/static/themes/light/meta/msapplication-config.xml
deleted file mode 100644
index 588c0ca5ec8ae949f1a6c26394a165800cb4118c..0000000000000000000000000000000000000000
--- a/src/main/webapp/static/themes/light/meta/msapplication-config.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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
diff --git a/src/main/webapp/static/themes/light/meta/src/appicon.png b/src/main/webapp/static/themes/light/meta/src/appicon.png
new file mode 100644
index 0000000000000000000000000000000000000000..350e590e9ea5a5b200167a747148590a8c583a13
Binary files /dev/null and b/src/main/webapp/static/themes/light/meta/src/appicon.png differ
diff --git a/src/main/webapp/static/themes/light/meta/src/favicon.png b/src/main/webapp/static/themes/light/meta/src/favicon.png
new file mode 100644
index 0000000000000000000000000000000000000000..b83c9a419e00197825ada39d9ee974af7099fd29
Binary files /dev/null and b/src/main/webapp/static/themes/light/meta/src/favicon.png differ
diff --git a/src/main/webapp/static/themes/light/meta/src/tileicon.png b/src/main/webapp/static/themes/light/meta/src/tileicon.png
new file mode 100644
index 0000000000000000000000000000000000000000..4b9fe8935b0bb5759e70b4f4df6d368694c7789a
Binary files /dev/null and b/src/main/webapp/static/themes/light/meta/src/tileicon.png differ
diff --git a/src/main/webapp/static/themes/light/meta/tileicon150.png b/src/main/webapp/static/themes/light/meta/tileicon150.png
new file mode 100644
index 0000000000000000000000000000000000000000..29bafe6cdc5059bd8b98d9821076a9e6586733e1
Binary files /dev/null and b/src/main/webapp/static/themes/light/meta/tileicon150.png differ
diff --git a/src/main/webapp/static/themes/light/meta/tileicon310.png b/src/main/webapp/static/themes/light/meta/tileicon310.png
new file mode 100644
index 0000000000000000000000000000000000000000..1f832765e7dd664b7531bb84c53b21028d9f3bf3
Binary files /dev/null and b/src/main/webapp/static/themes/light/meta/tileicon310.png differ
diff --git a/src/main/webapp/static/themes/light/meta/tileicon70.png b/src/main/webapp/static/themes/light/meta/tileicon70.png
new file mode 100644
index 0000000000000000000000000000000000000000..0e49469e7f4521e1c11fc88fe092080e7e9e60c4
Binary files /dev/null and b/src/main/webapp/static/themes/light/meta/tileicon70.png differ
diff --git a/src/main/webapp/static/themes/openolat/meta/appicon.png b/src/main/webapp/static/themes/openolat/meta/appicon.png
deleted file mode 100644
index 35d5028af8869c7a65ca8867fddfd1e99a23a2ad..0000000000000000000000000000000000000000
Binary files a/src/main/webapp/static/themes/openolat/meta/appicon.png and /dev/null differ
diff --git a/src/main/webapp/static/themes/openolat/meta/appicon150.png b/src/main/webapp/static/themes/openolat/meta/appicon150.png
deleted file mode 100644
index 87e742132f7262c27283f704b8c4e45ae2beb310..0000000000000000000000000000000000000000
Binary files a/src/main/webapp/static/themes/openolat/meta/appicon150.png and /dev/null differ
diff --git a/src/main/webapp/static/themes/openolat/meta/appicon180.png b/src/main/webapp/static/themes/openolat/meta/appicon180.png
index daeacdd1ab446e6d16a6f13b4d8aa0575f0f9f9c..198e34500c45bb54faaee5763e1c7b94c7f5d326 100644
Binary files a/src/main/webapp/static/themes/openolat/meta/appicon180.png and b/src/main/webapp/static/themes/openolat/meta/appicon180.png differ
diff --git a/src/main/webapp/static/themes/openolat/meta/appicon192.png b/src/main/webapp/static/themes/openolat/meta/appicon192.png
index 4607d733a852dd393c6cc08c234a963f44ee5a90..ec53d0efa46f903cd388481bb4509b22334c2097 100644
Binary files a/src/main/webapp/static/themes/openolat/meta/appicon192.png and b/src/main/webapp/static/themes/openolat/meta/appicon192.png differ
diff --git a/src/main/webapp/static/themes/openolat/meta/appicon270.png b/src/main/webapp/static/themes/openolat/meta/appicon270.png
deleted file mode 100644
index 6a5e00c8acbdc3d50f706bf601428cebf4248023..0000000000000000000000000000000000000000
Binary files a/src/main/webapp/static/themes/openolat/meta/appicon270.png and /dev/null differ
diff --git a/src/main/webapp/static/themes/openolat/meta/appicon310.png b/src/main/webapp/static/themes/openolat/meta/appicon310.png
deleted file mode 100644
index d34649b21d0751147840fa3a482c7b95ca8afd86..0000000000000000000000000000000000000000
Binary files a/src/main/webapp/static/themes/openolat/meta/appicon310.png and /dev/null differ
diff --git a/src/main/webapp/static/themes/openolat/meta/appicon70.png b/src/main/webapp/static/themes/openolat/meta/appicon70.png
deleted file mode 100644
index 0fb545c63688c0d9188a6b52365bb64e2786bcbb..0000000000000000000000000000000000000000
Binary files a/src/main/webapp/static/themes/openolat/meta/appicon70.png and /dev/null differ
diff --git a/src/main/webapp/static/themes/openolat/meta/favicon.png b/src/main/webapp/static/themes/openolat/meta/favicon.png
deleted file mode 100644
index b3cc6bfc35306ededf03b46b685b7946fe1b95da..0000000000000000000000000000000000000000
Binary files a/src/main/webapp/static/themes/openolat/meta/favicon.png and /dev/null differ
diff --git a/src/main/webapp/static/themes/openolat/meta/favicon16.png b/src/main/webapp/static/themes/openolat/meta/favicon16.png
index 643d96da6c16c256775ef7df38ee802ff156e61d..5a6dbecf1324283d6ccf0cea6d39627643b69044 100644
Binary files a/src/main/webapp/static/themes/openolat/meta/favicon16.png and b/src/main/webapp/static/themes/openolat/meta/favicon16.png differ
diff --git a/src/main/webapp/static/themes/openolat/meta/favicon32.png b/src/main/webapp/static/themes/openolat/meta/favicon32.png
index a546d3017baa73fbe16642da834ded57f6a2532e..9725a2aeceddccbb4d3d3b68197d22be5e91d92c 100644
Binary files a/src/main/webapp/static/themes/openolat/meta/favicon32.png and b/src/main/webapp/static/themes/openolat/meta/favicon32.png differ
diff --git a/src/main/webapp/static/themes/openolat/meta/favicon64.png b/src/main/webapp/static/themes/openolat/meta/favicon64.png
index 359ae5ef133b5d8be6756334f145d0913052c589..dfa7c180906fc435fb02934d35e7125b8ae67eca 100644
Binary files a/src/main/webapp/static/themes/openolat/meta/favicon64.png and b/src/main/webapp/static/themes/openolat/meta/favicon64.png differ
diff --git a/src/main/webapp/static/themes/openolat/meta/manifest.json b/src/main/webapp/static/themes/openolat/meta/manifest.json
index 6c145a783e0a8d02ffc2f5405bf65411224ffba4..9a6aafebe06ce56ca795b908c35b0f73f917c540 100644
--- a/src/main/webapp/static/themes/openolat/meta/manifest.json
+++ b/src/main/webapp/static/themes/openolat/meta/manifest.json
@@ -1,10 +1,10 @@
{
- "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
diff --git a/src/main/webapp/static/themes/openolat/meta/msapplication-config.xml b/src/main/webapp/static/themes/openolat/meta/msapplication-config.xml
deleted file mode 100644
index 588c0ca5ec8ae949f1a6c26394a165800cb4118c..0000000000000000000000000000000000000000
--- a/src/main/webapp/static/themes/openolat/meta/msapplication-config.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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
diff --git a/src/main/webapp/static/themes/openolat/meta/tileicon150.png b/src/main/webapp/static/themes/openolat/meta/tileicon150.png
new file mode 100644
index 0000000000000000000000000000000000000000..29bafe6cdc5059bd8b98d9821076a9e6586733e1
Binary files /dev/null and b/src/main/webapp/static/themes/openolat/meta/tileicon150.png differ
diff --git a/src/main/webapp/static/themes/openolat/meta/tileicon310.png b/src/main/webapp/static/themes/openolat/meta/tileicon310.png
new file mode 100644
index 0000000000000000000000000000000000000000..1f832765e7dd664b7531bb84c53b21028d9f3bf3
Binary files /dev/null and b/src/main/webapp/static/themes/openolat/meta/tileicon310.png differ
diff --git a/src/main/webapp/static/themes/openolat/meta/tileicon70.png b/src/main/webapp/static/themes/openolat/meta/tileicon70.png
new file mode 100644
index 0000000000000000000000000000000000000000..0e49469e7f4521e1c11fc88fe092080e7e9e60c4
Binary files /dev/null and b/src/main/webapp/static/themes/openolat/meta/tileicon70.png differ
diff --git a/src/main/webapp/static/themes/themes.README b/src/main/webapp/static/themes/themes.README
index adcf0ef1913a08e56a49f368d65ff3edad6c5c02..296f11aea62ca8817382d7461065f4329b2817a3 100644
--- a/src/main/webapp/static/themes/themes.README
+++ b/src/main/webapp/static/themes/themes.README
@@ -83,9 +83,18 @@ Optional:
mytheme/meta/favicon.16.png -> optional, to add a 16x16 bookmark icon
mytheme/meta/favicon.32.png -> optional, to add a 32x32 bookmark icon
mytheme/meta/favicon.64.png -> optional, to add a 64x64 bookmark icon
+- Place your own application icons for older iOS to
mytheme/meta/appicon180.png -> optional, to add iOS homescreen icons
- mytheme/meta/manifest.json -> optional, to add Android homescreen icons
+- Place your own manifest and application icons for modern Safari and Android to
+ mytheme/meta/manifest.json -> optional, to add Android homescreen icons (and add the appicons linked from within manifest.json)
+- Place your own Windows Tile icons to
+ mytheme/meta/tileicon70png
+ mytheme/meta/tileicon150png
+ mytheme/meta/tileicon310png
+- OR alternatively add a browser config file to the location below.
mytheme/meta/msapplication-config.xml -> optional, to add Windows tiles icons
+ Note, when the browser config is there, the tile icons above will not be included. In the browser config the
+ links to the tile icons must be absolute path to work despite the MS doku tells otherwise
- Create a file mytheme/theme.js and add your theme specific JavaScript. Best is to create a JQuery module
for it. Make sure you check for necessary changes after each DOM replacement cycle. See the theme.js file