fix manifest.jsonHEADmaster

16 files changed, 204 insertions, 24 deletions

diff --git a/Makefile b/Makefile
index 628f107..302ea1d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 BABEL=node node_modules/babel-cli/bin/babel.js
 FILES=zalmy.js zalmy.js.map style index*.html sworker.js \
       require.js config.js config.js.map activePage.js activePage.js.map \
-      favicon.ico favicon-*.png a*.png screen.css site.webmanifest
+      favicon.ico favicon-*.png a*.png screen.css manifest.json
 
 all: config.js activePage.js zalmy.js
 
diff --git a/index.html b/index.html
index d73e722..f90af82 100644
--- a/index.html
+++ b/index.html
@@ -12,7 +12,7 @@
   <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
   <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
   <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
-  <link rel="manifest" href="/site.webmanifest">
+  <link rel="manifest" href="/manifest.json">
   <script data-main="config" type="text/javascript" src="require.js"></script>
   <style>
     p {
diff --git a/index_en.html b/index_en.html
index bf3f7a7..ae06ffe 100644
--- a/index_en.html
+++ b/index_en.html
@@ -9,7 +9,7 @@
         <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
         <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
         <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
-        <link rel="manifest" href="/site.webmanifest">
+        <link rel="manifest" href="/manifest.json">
         <script data-main="config" type="text/javascript" src="require.js"></script>
         <style type="text/javascript">
             p {
diff --git a/manifest.json b/manifest.json
new file mode 100644
index 0000000..1945a51
--- /dev/null
+++ b/manifest.json
@@ -0,0 +1,40 @@
+{
+  "short_name": "Žalmy",
+  "name": "Denní čtení žalmů",
+  "icons": [
+    {
+      "src": "/style/icon-60.png",
+      "type" : "image/png",
+      "sizes": "60x60"
+    },
+    {
+      "src": "/style/icon-64.png",
+      "type" : "image/png",
+      "sizes": "64x64"
+    },
+    {
+      "src": "/style/icon-128.png",
+      "type" : "image/png",
+      "sizes": "128x128"
+    },
+    {
+      "src": "/style/icon-192.png",
+      "type" : "image/png",
+      "sizes": "192x192"
+    },
+    {
+      "src": "/style/icon-512.png",
+      "type" : "image/png",
+      "sizes": "512x512"
+    },
+    {
+      "src": "/style/icon.svg",
+      "type" : "image/svg+xml",
+      "sizes": "72x72",
+      "density": 2
+    }
+  ],
+  "lang": "cs-CZ",
+  "display": "standalone",
+  "start_url": "/"
+}
diff --git a/site.webmanifest b/site.webmanifest
deleted file mode 100644
index 4ff8bf5..0000000
--- a/site.webmanifest
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-   "background_color" : "#ffffff",
-   "display" : "standalone",
-   "icons" : [
-      {
-         "sizes" : "192x192",
-         "src" : "/android-chrome-192x192.png",
-         "type" : "image/png"
-      },
-      {
-         "sizes" : "512x512",
-         "src" : "/android-chrome-512x512.png",
-         "type" : "image/png"
-      }
-   ],
-   "name" : "",
-   "short_name" : "",
-   "theme_color" : "#ffffff"
-}
diff --git a/style/OpenSans-SemiBold.ttf b/style/OpenSans-SemiBold.ttf
new file mode 100644
index 0000000..1a7679e
--- /dev/null
+++ b/style/OpenSans-SemiBold.ttf
diff --git a/style/basic.css b/style/basic.css
new file mode 100644
index 0000000..20f5d79
--- /dev/null
+++ b/style/basic.css
@@ -0,0 +1,6 @@
+body {
+  font-family: "Fira Sans", "Fira Sans", "Segoe UI", Frutiger,
+        "Frutiger Linotype", "Dejavu Sans", "Helvetica Neue",
+        Arial, sans-serif;
+  font-size: 120%;
+}
diff --git a/style/icon-128.png b/style/icon-128.png
new file mode 100644
index 0000000..c9a068f
--- /dev/null
+++ b/style/icon-128.png
diff --git a/android-chrome-192x192.png b/style/icon-192.png
index 4183da7..4183da7 100644
--- a/android-chrome-192x192.png
+++ b/style/icon-192.png
diff --git a/android-chrome-512x512.png b/style/icon-512.png
index e333ef3..e333ef3 100644
--- a/android-chrome-512x512.png
+++ b/style/icon-512.png
diff --git a/style/icon-60.png b/style/icon-60.png
new file mode 100644
index 0000000..06ecf8a
--- /dev/null
+++ b/style/icon-60.png
diff --git a/style/icon-64.png b/style/icon-64.png
new file mode 100644
index 0000000..3836889
--- /dev/null
+++ b/style/icon-64.png
diff --git a/style/icon.svg b/style/icon.svg
new file mode 100644
index 0000000..5dc82c3
--- /dev/null
+++ b/style/icon.svg
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg1332"
+   viewBox="0 0 1234.7362 1234.7362"
+   version="1.0"
+   inkscape:version="0.48.5 r10040"
+   width="100%"
+   height="100%"
+   sodipodi:docname="Anonymous_praying_hands.svg"
+   inkscape:export-filename="/home/matej/archiv/2014/projekty/zalmy/style/icon-64.png"
+   inkscape:export-xdpi="4.8299999"
+   inkscape:export-ydpi="4.8299999">
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1680"
+     inkscape:window-height="984"
+     id="namedview7"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     units="mm"
+     inkscape:zoom="0.25155624"
+     inkscape:cx="-889.12128"
+     inkscape:cy="636.54268"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg1332" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work>
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
+        <dc:publisher>
+          <cc:Agent
+             rdf:about="http://openclipart.org/">
+            <dc:title>Openclipart</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:title>praying hands</dc:title>
+        <dc:date>2008-02-05T05:19:57</dc:date>
+        <dc:description>art, black and white, body part, christianity, clip art, clipart, hand, line art, outline, pray, prayer, religion, </dc:description>
+        <dc:source>http://openclipart.org/detail/12800/praying-hands-by-anonymous</dc:source>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Anonymous</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>art</rdf:li>
+            <rdf:li>black and white</rdf:li>
+            <rdf:li>body part</rdf:li>
+            <rdf:li>christianity</rdf:li>
+            <rdf:li>clip art</rdf:li>
+            <rdf:li>clipart</rdf:li>
+            <rdf:li>hand</rdf:li>
+            <rdf:li>line art</rdf:li>
+            <rdf:li>outline</rdf:li>
+            <rdf:li>pray</rdf:li>
+            <rdf:li>prayer</rdf:li>
+            <rdf:li>religion</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/publicdomain/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <path
+     sodipodi:type="arc"
+     style="fill:#cec8c8;fill-opacity:0.76923078;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     id="path2988"
+     sodipodi:cx="-985.86304"
+     sodipodi:cy="-139.1339"
+     sodipodi:rx="596.28815"
+     sodipodi:ry="596.28815"
+     d="m -389.57489,-139.1339 a 596.28815,596.28815 0 1 1 -1192.57631,0 596.28815,596.28815 0 1 1 1192.57631,0 z"
+     transform="translate(1603.2312,756.50199)"
+     inkscape:transform-center-x="365.72339"
+     inkscape:transform-center-y="-763.24881"
+     inkscape:export-filename="/home/matej/archiv/2014/projekty/zalmy/style/path2988.png"
+     inkscape:export-xdpi="4.5241523"
+     inkscape:export-ydpi="4.5241523" />
+  <path
+     style="fill:#030303"
+     inkscape:connector-curvature="0"
+     d="m 768.765,1080.1248 c -8.51,-2 -29.54,-11.16 -49.13,-21.33 -18.83,-9.78 -38.72,-19.95 -44.19,-22.59 -5.46,-2.64 -9.92,-5.86 -9.9,-7.14 0.02,-1.29 3.63,-21.29 8.02,-44.44998 l 7.98,-42.11 -7.31,-12.23 c -9.91,-16.58 -27.67,-38.2 -30.13,-36.69 -1.1,0.68 -2.02,5.65 -2.04,11.04 -0.08,14.16 -7.79,46.95 -16.1,68.44 -29.94,77.43998 -100,113.45998 -169.77,87.39998 -27.5,-10.29 -50.48,-33.35 -65.4,-65.64998 -17.09,-36.97 -22.44,-79.45 -15.44,-122.49 3.52,-21.69 16.43,-53.68 31.96,-79.19 l 12.6,-20.7 -8.06,-17.9 c -19.74,-43.79 -34.41,-95.91 -38.81,-137.89 -2.44,-23.25 -8.75,-37.04 -30.748,-67.21 -8.425,-11.55 -17.052,-26.2 -19.171,-32.54 -7.112,-21.27 -4.577,-56.49 8.23,-114.3 4.703,-21.23 4.806,-23.46 1.411,-30.58 -5.965,-12.51 -9.617,-41.79 -8.15,-65.35 1.467,-23.55 6.1,-39.53 13.854,-47.79 4.722,-5.02 4.847,-6.18 2.208,-20.5 -3.016,-16.37 -1.874,-25.64 3.992,-32.38 2.731,-3.14 3.733,-9.34 3.78,-23.39 0.077,-23.068 5.184,-32.525 19.944,-36.948 12.63,-3.785 20.62,-0.017 36,16.975 6.83,7.542 13.21,13.713 14.19,13.713 0.98,0 3.85,-2.632 6.38,-5.849 9.65,-12.272 31.8,-4.757 54.65,18.549 17.57,17.91 41.01,38.47 71.34,62.57 25.02,19.86 35.09,30.44 42.12,44.22 6.11,11.98 10.44,13.63 16.26,6.23 8.75,-11.13 30.3,-17.31 36.99,-10.62 1.54,1.54 2.8,5.85 2.8,9.57 0,14.18 10.01,55.22 18.85,77.33 5.07,12.67 16.57,36.04 25.57,51.93 30.33,53.56 36.7,71.34 39.7,110.81 1.23,16.22 4.33,36.32 6.88,44.68 8.54,28 14.28,53.31 20.25,89.35 3.26,19.68 6.92,39.52 8.13,44.09 2.44,9.2 11.06,18.35 22.98,24.37 7.5,3.78 8.34,3.74 19.15,-0.91 14.56,-6.26 31.49,-6.21 48.52,0.14 7.36,2.74 20.76,7.48 29.76,10.52 9.01,3.04 20.84,7.2 26.3,9.23 l 9.91,3.69 -8.27,8.59 c -10.6,11 -31.12,41.72 -40.78,61.03 -23.63,47.26 -43.82,114.12 -66.57,220.35998 -2.09,9.79 -5.08,19.41 -6.65,21.37 -4.31,5.43 -17.56,6.43 -34.09,2.53 z M 542.915,945.95482 c 22.25,-11.2 46.95,-35.84 56.58,-56.4 11.94,-25.52 11.72,-26.44 -10.02,-41.15 -61.21,-41.42 -112.23,-124.02 -129.85,-210.23 -2.61,-12.75 -6.36,-28.82 -8.34,-35.69 -3.41,-11.84 -3.94,-12.43 -9.91,-10.98 -3.47,0.84 -11.81,5.15 -18.55,9.58 -6.73,4.43 -12.79,8.05 -13.45,8.05 -3.04,0 -0.59,-7.07 6.08,-17.59 l 7.29,-11.5 -9.83,-19.96 c -5.41,-10.98 -14.48,-28.07 -20.16,-37.99 -10.54,-18.4 -17.34,-38.99 -17.34,-52.51 0,-13.9 4.13,-10.32 10.54,9.14 9.03,27.45 45.45,95.27 51.16,95.3 5.99,0.03 4.11,-8.64 -6.98,-32.12 -11.38,-24.1 -66.58,-173.09 -69.91,-188.69 -2.49,-11.7 -5.48,-3.77 -10.468,27.85 -2.639,16.71 -6.292,37.23 -8.117,45.6 -6.016,27.56 -8.568,58.56 -6.288,76.39 1.808,14.13 3.594,18.67 11.518,29.24 24.275,32.37 32.495,52.37 36.875,89.65 1.82,15.47 5.47,36.03 8.1,45.68 11.53,42.23 38.24,102.19 54.21,121.65 16.3,19.88 21.21,31.22 22.44,51.79 0.98,16.33 0.49,18.94 -5.65,30.22 -12.03,22.1 -7.88,53.89 9.2,70.47 11.3,10.96 19.31,13.59 39.29,12.88 12.28,-0.44 18.75,-2.21 31.58,-8.68 z m 149.72,-48.02 c 10.73,-37.31 41.75,-89.77 72.22,-122.17 9.69,-10.3 17.62,-19.33 17.62,-20.06 0,-0.73 -4.77,-4.12 -10.61,-7.54 -12.43,-7.29 -17.46,-15.73 -17.46,-29.28 0,-12.03 -7.87,-58.3 -13.69,-80.51 -2.36,-9 -8.27,-26.3 -13.14,-38.44 -8.25,-20.6 -8.92,-24.11 -10.03,-52.64 -1.6,-41.48 -7.56,-57.87 -43.41,-119.26 -5.94,-10.18 -13.88,-27.03 -17.65,-37.43 -7.76,-21.48 -16.71,-62.07 -16.71,-75.81 0,-16.28 -9.04,-17.62 -25.5,-3.78 -9.12,7.68 -9.03,8.86 3.43,42.42 9.54,25.74 30.45,68.6 45.26,92.78 5.4,8.83 9.42,16.46 8.93,16.95 -2.26,2.26 -21.17,-17.11 -30.57,-31.31 -17.46,-26.35 -26.45,-44.81 -36.68,-75.38 -17.38,-51.93 -25.9,-63.41 -81.85,-110.23 -14.79,-12.39 -37.68,-32.65 -50.85,-45.04 -13.17,-12.39 -25.59,-22.52 -27.6,-22.52 -6.16,0 -17.46,6.93 -17.46,10.71 0,9.59 27.42,44.01 66.03,82.87 45.63,45.93 58.49,64.27 77.69,110.82 11.97,29.03 25.15,52.22 40.14,70.62 10.72,13.17 9.66,16.14 -3.38,9.4 -12.29,-6.36 -26.17,-24.54 -38.18,-50 -41.46,-87.93 -48.45,-98.49 -93.12,-140.71 -29.36,-27.76 -35.8,-35.3 -55.24,-64.73 -24.18,-36.598 -35.13,-47.696 -47.06,-47.696 -10.04,0 -14.77,7.362 -16.42,25.526 -1.26,13.92 -1.23,14.01 5.48,15.45 25.32,5.47 32.93,12.15 53.29,46.81 12.6,21.43 25.14,38.33 51.49,69.38 35.09,41.34 43.53,57.67 65.65,126.95 13.78,43.14 14.1,44.39 10.82,42.37 -4.72,-2.92 -18.16,-30.31 -32.2,-65.64 -16.94,-42.61 -29.48,-62.86 -60.12,-97.09 -22.58,-25.23 -30.48,-36.16 -49.37,-68.39 -14.37,-24.53 -22.05,-32.55 -35.31,-36.93 -12.26,-4.05 -14.33,-1.05 -10.97,15.84 4.03,20.23 6.32,56.73 3.55,56.73 -1.28,0 -4.43,-5.53 -6.99,-12.28 -2.569,-6.76 -6.107,-12.28 -7.864,-12.28 -5.711,0 -9.376,23.49 -8.395,53.8 1.007,31.11 2.572,37.96 7.703,33.7 1.78,-1.48 3.236,-3.97 3.236,-5.55 0,-1.57 2.105,-4.76 4.679,-7.09 3.221,-2.92 4.681,-7.22 4.691,-13.82 0.02,-13.63 4.14,-26.67 9.29,-29.43 7.26,-3.89 17.57,-2.71 26.03,2.97 11.77,7.92 42.25,62.19 59.59,106.14 5,12.67 17.8,40.76 28.44,62.42 10.64,21.66 19.34,40.37 19.34,41.58 0,4.71 -11.24,-5.55 -22.64,-20.66 -14.97,-19.85 -26.58,-42.96 -34.45,-68.55 -3.35,-10.9 -10.56,-27.79 -16.03,-37.52 -5.46,-9.73 -16.24,-28.92 -23.96,-42.65 -14.34,-25.51 -19.5,-29.83 -24.49,-20.52 -3.89,7.27 -3,13.87 8.13,60.27 8.75,36.46 15,55.2 36.53,109.49 34.78,87.7 42.83,110.58 53.73,152.67 10.12,39.14 14.15,50.51 26.94,75.97 25.76,51.28 68.28,100.48 108,124.96 9.94,6.12 22.46,14.66 27.82,18.96 9.42,7.57 34.54,38.23 40.36,49.26 1.57,2.98 4,5.03 5.4,4.56 1.4,-0.47 4.95,-9.22 7.89,-19.44 z"
+     id="path2355" />
+</svg>
diff --git a/style/readme-1.0.0rc1.txt b/style/readme-1.0.0rc1.txt
new file mode 100644
index 0000000..2a2cfa7
--- /dev/null
+++ b/style/readme-1.0.0rc1.txt
@@ -0,0 +1,16 @@
+Mozilla Brick
+
+To include Brick in your project, include the bundled stylesheet and script 
+files in your project's page like any other CSS/JS file.
+
+To use the provided default font for your components, include the font file in 
+the same directory as your Brick stylesheet. 
+(If you move the font file elsewhere, look for the "OpenSans-SemiBold.ttf" in 
+ the @font-face declaration at the start of the included stylesheet and 
+ replace it with the correct path to the file).
+
+Further documentation can be found at http://mozilla.github.io/brick/
+
+If you run into issues with this release of Brick, please file an issue
+at https://github.com/mozilla/brick/. We're still in prerelease, so all feedback
+is welcome!
\ No newline at end of file
diff --git a/sworker.js b/sworker.js
index b80e7ae..0cd6b3f 100644
--- a/sworker.js
+++ b/sworker.js
@@ -1,4 +1,4 @@
-var VERSION = 'v44 2022-03-31';
+var VERSION = 'v45 2024-08-22';
 var toCache = [
   '/',
   'activePage.js',
@@ -17,7 +17,7 @@ var toCache = [
   'jsconfig.json',
   'require.js',
   'screen.css',
-  'site.webmanifest',
+  'manifest.json',
   'sworker.js',
   'system.js',
   'zalmy.js',
diff --git a/zalmy.webapp b/zalmy.webapp
new file mode 100644
index 0000000..15a0ac8
--- /dev/null
+++ b/zalmy.webapp
@@ -0,0 +1,18 @@
+{
+    "name": "Žalmy",
+        "description": "Denní čtení žalmů",
+        "launch_path": "/",
+        "appcache_path": "/zalmy.appcache",
+        "display": "standalone",
+        "icons": {
+            "60": "/style/icon-60.png",
+            "64": "/style/icon-64.png",
+            "128": "/style/icon-128.png",
+            "512": "/style/icon-512.png"
+        },
+        "developer": {
+            "name": "Matěj Cepl",
+            "url": "https://gitlab.com/mcepl/zalmy.git"
+        },
+        "default_locale": "cs"
+}