Add ability to install theme as desktop app 1/2

webmin · Aug 19, 2021 · 40a9dec · 40a9dec
1 parent 8349ff4
commit 40a9dec
Show file tree

Hide file tree

Showing 16 changed files with 38 additions and 20 deletions.
diff --git a/authentic-init.pl b/authentic-init.pl
@@ -119,12 +119,12 @@ sub embed_favicon
         print ' <link ' .
           $ref_link . ' rel="icon" type="image/png" sizes="16x16" href="' . $favicon_path . '/favicon-16x16.png">' . "\n";
 
-        print ' <link ' .
-          $ref_link . ' crossorigin="use-credentials" rel="manifest" href="' . $favicon_path . '/manifest.json">' . "\n";
+        print ' <link ' . $ref_link . ' crossorigin="use-credentials" rel="manifest" href="' .
+          $theme_webprefix . '/manifest-' . $product . '.json">' . "\n";
         print ' <link ' . $ref_link .
           ' rel="mask-icon" href="' . $favicon_path . '/safari-pinned-tab.svg" color="' . get_theme_color() . '">' . "\n";
         print ' <meta ' .
-          $ref_link . ' name="msapplication-TileImage" content="' . $favicon_path . '/mstile-144x144.png">' . "\n";
+          $ref_link . ' name="msapplication-TileImage" content="' . $favicon_path . '/mstile-150x150.png">' . "\n";
     }
 
     # Embed custom favicons using base64 encoding
@@ -137,9 +137,14 @@ sub embed_favicon
           trim_lines(trim(encode_base64(read_file_contents($favicon_spath . '/android-chrome-192x192.png')))) . '">' . "\n";
         print ' <link ' . $ref_link . ' rel="icon" type="image/png" sizes="16x16" href="data:text/css;base64,' .
           trim_lines(trim(encode_base64(read_file_contents($favicon_spath . '/favicon-16x16.png')))) . '">' . "\n";
+        if (-r "$favicon_cpath/manifest.json") {
+            print ' <link ' . $ref_link . ' crossorigin="use-credentials" rel="manifest" href="' .
+              $theme_webprefix . '/manifest-c-' . $product . '.json">' . "\n";
+        }
     }
     print ' <meta name="msapplication-TileColor" content="' . get_theme_color() . '">' . "\n";
     print ' <meta name="theme-color" content="' . get_theme_color() . '">' . "\n";
+    print ' <script src="' . $theme_webprefix . '/service-worker.js" defer></script>' . "\n";
 }
 
 sub embed_header

diff --git a/images/favicons/cloudmin/manifest.json b/images/favicons/cloudmin/manifest.json
@@ -6,25 +6,25 @@
     "scope": ".",
     "icons": [
     {
-        "src": "/images/favicons/cloudmin/android-chrome-192x192.png",
+        "src": "images/favicons/cloudmin/android-chrome-192x192.png",
         "sizes": "192x192",
         "type": "image/png",
         "purpose": "any"
     },
     {
-        "src": "/images/favicons/cloudmin/android-chrome-maskable-192x192.png",
+        "src": "images/favicons/cloudmin/android-chrome-maskable-192x192.png",
         "sizes": "192x192",
         "type": "image/png",
         "purpose": "maskable"
     },
     {
-        "src": "/images/favicons/cloudmin/android-chrome-512x512.png",
+        "src": "images/favicons/cloudmin/android-chrome-512x512.png",
         "sizes": "512x512",
         "type": "image/png",
         "purpose": "any"
     },
     {
-        "src": "/images/favicons/cloudmin/android-chrome-maskable-512x512.png",
+        "src": "images/favicons/cloudmin/android-chrome-maskable-512x512.png",
         "sizes": "512x512",
         "type": "image/png",
         "purpose": "maskable"

diff --git a/images/favicons/usermin/manifest.json b/images/favicons/usermin/manifest.json
@@ -6,25 +6,25 @@
     "scope": ".",
     "icons": [
     {
-        "src": "/images/favicons/usermin/android-chrome-192x192.png",
+        "src": "images/favicons/usermin/android-chrome-192x192.png",
         "sizes": "192x192",
         "type": "image/png",
         "purpose": "any"
     },
     {
-        "src": "/images/favicons/usermin/android-chrome-maskable-192x192.png",
+        "src": "images/favicons/usermin/android-chrome-maskable-192x192.png",
         "sizes": "192x192",
         "type": "image/png",
         "purpose": "maskable"
     },
     {
-        "src": "/images/favicons/usermin/android-chrome-512x512.png",
+        "src": "images/favicons/usermin/android-chrome-512x512.png",
         "sizes": "512x512",
         "type": "image/png",
         "purpose": "any"
     },
     {
-        "src": "/images/favicons/usermin/android-chrome-maskable-512x512.png",
+        "src": "images/favicons/usermin/android-chrome-maskable-512x512.png",
         "sizes": "512x512",
         "type": "image/png",
         "purpose": "maskable"

diff --git a/images/favicons/virtualmin/manifest.json b/images/favicons/virtualmin/manifest.json
@@ -6,25 +6,25 @@
     "scope": ".",
     "icons": [
     {
-        "src": "/images/favicons/virtualmin/android-chrome-192x192.png",
+        "src": "images/favicons/virtualmin/android-chrome-192x192.png",
         "sizes": "192x192",
         "type": "image/png",
         "purpose": "any"
     },
     {
-        "src": "/images/favicons/virtualmin/android-chrome-maskable-192x192.png",
+        "src": "images/favicons/virtualmin/android-chrome-maskable-192x192.png",
         "sizes": "192x192",
         "type": "image/png",
         "purpose": "maskable"
     },
     {
-        "src": "/images/favicons/virtualmin/android-chrome-512x512.png",
+        "src": "images/favicons/virtualmin/android-chrome-512x512.png",
         "sizes": "512x512",
         "type": "image/png",
         "purpose": "any"
     },
     {
-        "src": "/images/favicons/virtualmin/android-chrome-maskable-512x512.png",
+        "src": "images/favicons/virtualmin/android-chrome-maskable-512x512.png",
         "sizes": "512x512",
         "type": "image/png",
         "purpose": "maskable"

diff --git a/images/favicons/webmin/manifest.json b/images/favicons/webmin/manifest.json
@@ -6,25 +6,25 @@
     "scope": ".",
     "icons": [
     {
-        "src": "/images/favicons/webmin/android-chrome-192x192.png",
+        "src": "images/favicons/webmin/android-chrome-192x192.png",
         "sizes": "192x192",
         "type": "image/png",
         "purpose": "any"
     },
     {
-        "src": "/images/favicons/webmin/android-chrome-maskable-192x192.png",
+        "src": "images/favicons/webmin/android-chrome-maskable-192x192.png",
         "sizes": "192x192",
         "type": "image/png",
         "purpose": "maskable"
     },
     {
-        "src": "/images/favicons/webmin/android-chrome-512x512.png",
+        "src": "images/favicons/webmin/android-chrome-512x512.png",
         "sizes": "512x512",
         "type": "image/png",
         "purpose": "any"
     },
     {
-        "src": "/images/favicons/webmin/android-chrome-maskable-512x512.png",
+        "src": "images/favicons/webmin/android-chrome-maskable-512x512.png",
         "sizes": "512x512",
         "type": "image/png",
         "purpose": "maskable"

diff --git a/manifest-c-cloudmin.json b/manifest-c-cloudmin.json
@@ -0,0 +1 @@
+/etc/webmin/authentic-theme/favicons/cloudmin/manifest.json
diff --git a/manifest-c-usermin.json b/manifest-c-usermin.json
@@ -0,0 +1 @@
+/etc/webmin/authentic-theme/favicons/usermin/manifest.json
diff --git a/manifest-c-virtualmin.json b/manifest-c-virtualmin.json
@@ -0,0 +1 @@
+/etc/webmin/authentic-theme/favicons/virtualmin/manifest.json
diff --git a/manifest-c-webmin.json b/manifest-c-webmin.json
@@ -0,0 +1 @@
+/etc/webmin/authentic-theme/favicons/webmin/manifest.json
diff --git a/manifest-cloudmin.json b/manifest-cloudmin.json
@@ -0,0 +1 @@
+images/favicons/cloudmin/manifest.json
diff --git a/manifest-usermin.json b/manifest-usermin.json
@@ -0,0 +1 @@
+images/favicons/usermin/manifest.json
diff --git a/manifest-virtualmin.json b/manifest-virtualmin.json
@@ -0,0 +1 @@
+images/favicons/virtualmin/manifest.json
diff --git a/manifest-webmin.json b/manifest-webmin.json
@@ -0,0 +1 @@
+images/favicons/webmin/manifest.json
diff --git a/service-worker.js b/service-worker.js
@@ -0,0 +1 @@
+unauthenticated/js/service-worker.js
diff --git a/theme.info b/theme.info
@@ -1,7 +1,7 @@
 desc=Authentic Theme
 longdesc=Webmin/Usermin/Virtualmin/Cloudmin theme based on Bootstrap and Font Awesome (https://github.com/authentic-theme/authentic-theme)
 version=19.83-RC5
-mversion=00
+mversion=01
 depends=1.974 1.824
 webmin=1
 usermin=1
diff --git a/unauthenticated/js/service-worker.js b/unauthenticated/js/service-worker.js
@@ -0,0 +1,4 @@
+if ('serviceWorker' in navigator) {
+  navigator.serviceWorker.register('service-worker.js')
+}
+self.addEventListener('fetch', function() {});
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		/etc/webmin/authentic-theme/favicons/cloudmin/manifest.json
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		/etc/webmin/authentic-theme/favicons/usermin/manifest.json
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		/etc/webmin/authentic-theme/favicons/virtualmin/manifest.json
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		/etc/webmin/authentic-theme/favicons/webmin/manifest.json