diff --git a/.sign/.manifest.tmp b/.sign/.manifest.tmp
index 25e212a..69ee1e0 100644
--- a/.sign/.manifest.tmp
+++ b/.sign/.manifest.tmp
@@ -1,4 +1,4 @@
-.git/COMMIT_EDITMSG__DEL__S+723M+4XfgLCJ0+E2VDlngMzD9sVdlQeTqZODAHYsk=
+.git/COMMIT_EDITMSG__DEL__zcfTfR42Hp+H75bMNYkDQLV9RYb7Fr10Bnmdza0/wbk=
.git/HEAD__DEL__9vK5RfbEEbAro9qces6I3PcbavZbouDYmqgpAAQrWhA=
.git/config__DEL__/Rbd4AUUTUPjlJZYYUUBZKcEeNgeUuzmriIZUFh7T/s=
.git/description__DEL__hatsFj1DoX6pz3eIMIvKFGbxsKjRzJLibpv2PaQGKu4=
@@ -13,11 +13,11 @@
.git/hooks/pre-receive.sample__DEL__pMPSuce7P9jRRBwxvU7nGlldZrRPz0ndsxAlIyAWmYk=
.git/hooks/prepare-commit-msg.sample__DEL__6d3KpBif3dJe2X/Ix4nsp7bKFjkLI5KuMnbwyOGqRhk=
.git/hooks/update.sample__DEL__dRwDcyACTsLuJ1fz/64LEK0slGNnaE5wWdTcl+rH5DE=
-.git/index__DEL__82qvwEwIehdJSRRTUQ5k0l/xZTX/gUmx13w14SBGkb4=
+.git/index__DEL__pyS8kEZfsVBGpOv9SvlFqo6UBj2HpGQgNcHX4Rs3Utg=
.git/info/exclude__DEL__ZnH+g7egfIky7okWTR8nk7IxgFjri5jcXAbuClo7DsE=
-.git/logs/HEAD__DEL__HdamRaCuNhCoWwShMG0gRoCmyP5xz/kqVVCO7L+dOAw=
-.git/logs/refs/heads/master__DEL__HdamRaCuNhCoWwShMG0gRoCmyP5xz/kqVVCO7L+dOAw=
-.git/logs/refs/remotes/origin/master__DEL__6K6MWQd6yfMVNVP6y4EJgchCZlLqTssS1g/kY4epsp0=
+.git/logs/HEAD__DEL__wpmVLUxvBL3eAdGAtZjwyYpbwNfeY94DatVmpCucCrs=
+.git/logs/refs/heads/master__DEL__wpmVLUxvBL3eAdGAtZjwyYpbwNfeY94DatVmpCucCrs=
+.git/logs/refs/remotes/origin/master__DEL__btdsa2RxeDDqQsRq2xXhygBmAPEBTar3K9p6FIPo2Ng=
.git/objects/02/741fe0d44ace36d88f500de55fe02f60e39681__DEL__cVGnHJSbIxxTbHZ4cc0XEetbMGr4Ig04SwFvCJL0tcg=
.git/objects/05/bd71b6ec2c1982d1e8a5653073281994564ae8__DEL__PXNsl0l7EuMPFASARrf2c4vkfoU8MqkL51Cf4LHE3Ik=
.git/objects/07/89c5456f19123401bbbea06ccc14cd42067219__DEL__wl7lmcXANjTQcOsw471SlI61qAqEpWF6oTpIbNZsGwQ=
@@ -25,39 +25,49 @@
.git/objects/1a/30a49ab1682a8c70f37f960b7d1871c5942eb9__DEL__cTC88UJJXLJyBu7pmRkB07i2eLJk4EVv/DBrMDlG2Jk=
.git/objects/1c/1a4d080ef81238e544eab07ae38d6e727dba85__DEL__NCXGus1XG1CzGfD8cnKh9R6Yoh5qQibiIvC1KioagDU=
.git/objects/23/86351522759e2a0b051a0cb0e4b35a56dff088__DEL__9KKkz5G0UwI91vXfoRqDff+Kg+vZkM5aU2GGZ77/nug=
+.git/objects/25/e212adedb872da5b017d291d48f55c61a38b29__DEL__QDKqylvpL5aKPcDz/9zSuGXDiGaa0HESAG0hK13UMpk=
.git/objects/28/7c88e226a4ec4c071904c15bf4f645ac3cd2dc__DEL__wwu4NPLQylGD4xQh9o083s2OtoFpL3dRLSMUfxyXunQ=
+.git/objects/2d/64341eef53052d2dacc5f5a4ad01c75b8dd652__DEL__dk7aYwpCa5ILFLFs53nmgi7a/fhAWv4OpIqistb4Qm4=
.git/objects/3b/d5d0a4803967bc0bf72a7dd66d7e292ed2e586__DEL__NWl0p1AAhqGIhpiPNnefVL7uzkqYFG1ZET6Oni7l45M=
.git/objects/4a/b357c7634f49e522aeaaedefa83c4ff08443a9__DEL__a0Cz4lWC+0xWCzZUYUQL5O/bt35C7pRZ1XW3fOKXBBo=
.git/objects/4e/35166f13f37f8c3aed30d3019174573a026f4a__DEL__QvXy5hjAaFV6M3+qW1WfnrX4ZyFuiBAqpnCqfAheYXE=
.git/objects/53/f31f54130c9a3441480f9e416f805437fb71c9__DEL__TI9vZZsmF1Ydh6O/gd51GoLyXZZyto7wjobmKY2woQo=
.git/objects/5d/dc6bd5f24cf4e67a53e20384dfc868809d10b3__DEL__zIPachBagXO0J8zFADVIaaSzJRpTr24o5b0VEKPnHS0=
.git/objects/66/de0dcf1f16eb3dfe1aedf78790b4e002c08516__DEL__FZmqOATlAZ5v6hGivuWkZ9NLyIA0B464HQ9hvqMUJBQ=
+.git/objects/6f/2bf25b4a2c42093a219e1f448e60df4691edd9__DEL__GIQkHw2nvNnV/t1FJI6M9nGukDfi3PkzR+YQVBdkoew=
+.git/objects/78/fdbb1d64048da4271091ddb1768f8670919069__DEL__3hbwK3TLaW1TVvT461gSaigsje2W/Ol74Ps+ElGSyIQ=
.git/objects/7c/a3e1f9fd26cc61f712e13322b05c7e24ce1813__DEL__HvEW3s9pr5lX/U/e4ZOjuGQ5UKstesDe/4eJic1wvlo=
.git/objects/84/f503801400f81a402f3fb3f2830ec00ab4c630__DEL__evQo0GymDPIEFqd5BUKUqhrrNQXb9nr3wqTmCHV+J48=
.git/objects/86/49fa565d87dd3c332e8e318c779b8e53ffea0b__DEL__C3Xw+yuUDSdezXAhqzBXlRS1SPXOSn2AyLwueNf7ug4=
.git/objects/8a/1d8c688268b802bd5ad18a64b883016b132076__DEL__fB08qAMNyvrNiut/zN7hw0epaAbaQDnXxDBRQx7HGlE=
+.git/objects/8e/5d802326c308c497e217c4d5b600f2f11ac3c4__DEL__I9nY+iedh8TO2HV91DIps+SueQgcc0WCoPaYqIhzUq0=
.git/objects/90/a27f9cea6e8f02e05a8bbab5d14650e3e932af__DEL__lpDm120MOA6vW/mrh0cy1pu67SJ6dPu/cY8rN8I7xW8=
.git/objects/99/96115961d2aa418fb03ff90d529f642f4f7261__DEL__3VGlqOkDSaru/bmv6eS/4byvPdKJeBDS6Bo/lnU2bgY=
.git/objects/9d/ab2d1408775ca4094f6806e481cf85e8709ec4__DEL__8dWV9Unqdt7vmdOSzL5TGY9RETmJ1B9ZpX7jLIO3qBs=
.git/objects/9f/29e0dab7efd2ce2bda4adb262584b22321e534__DEL__KJdBI+69yuhRSrTwXepr5NJxdIXgmy1V+2rtaOmYYok=
.git/objects/9f/8c12f57065dff219dd33568a55e81ffee69f4e__DEL__lf8xF9EWtMhpmIGzqX+k8LnCZI0pmzyvQrchmCzvxGg=
.git/objects/a5/5db3f213c6fd9f1611473c99181cb6bd8ce9f2__DEL__Hljb7WQV6HW2SlXWnf79Z0JHFEEXiF854oWTNGeoqG0=
+.git/objects/b6/2f236dddb5e68cc7e60e76c9f773b0eb90ce31__DEL__mEncbCDO5beLVf4GshoEy6LOyko6GMkMcEErkep3JDM=
.git/objects/c4/87c068cae1a73c7bf7239555c1329610507ec9__DEL__PBdNy+ElDdG/ulzGKnoHefxPQEVB5zq5pMe/pZHZRAc=
+.git/objects/c8/c746454b625dbe8b6259a6bd2d4f0cd03f0d24__DEL__KKHH2pD0qfizOadYZbJkZrm29T/oVjobBOqJM+rRwYg=
.git/objects/d1/cc196d5d84ce44efa808521b9ad8fdc51ecead__DEL__12mjogpHHWqxDDPm4hsC7303iOQBAb4eoC4CjMKYPYg=
.git/objects/d4/7f9cd915695b4798f907982d77646a99bf4264__DEL__N8tjv5j1qEgx6o08Q8GEEq+c5oVBme8ZkQ1esJ7fjTM=
.git/objects/d6/45695673349e3947e8e5ae42332d0ac3164cd7__DEL__bK1/lEV5blLPpFrn/ZNVdLDE2RnlA4SnQhDpURW+znc=
+.git/objects/d6/732ea134c5ff05e87ee89dbad7c5f97bb7724b__DEL__hTPwSlNSKTaSuUMuvBi0AzOTFOEpKwcbrCd4aQ/6cHk=
+.git/objects/d6/e10997a5611ce965e0c34551b973478dc7172e__DEL__vm4JtKqoDEF/pwWpYnqKnfacIDpptH1kPV47pgSIcH0=
.git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391__DEL__FkxfqAZ/rPGkPwnOPQ416/U6f1cj7L8VqGZ8/FPCb2w=
.git/objects/e6/e64a7a10f9c3f4c2218db906b18d6c96f153e1__DEL__ORQK4eEcZ9zLwMxPa08xowgH4TMPKDOsAJxkYscIos8=
.git/objects/f0/fc0dd5e890f0a3929c22ac364c71e6623f4e8e__DEL__zgSOtLXhZmKmL98vDoytepbOXYqk43npI3T5HsIbgjc=
-.git/refs/heads/master__DEL__KXUPQ/nYYMp7WqlpkZ/Knt20YxFULD6ZfWYpj2keBHU=
-.git/refs/remotes/origin/master__DEL__KXUPQ/nYYMp7WqlpkZ/Knt20YxFULD6ZfWYpj2keBHU=
+.git/refs/heads/master__DEL__+tXu3ZGHKDRFy0S40mBgm+tGdOosszeJESBI/NtHvnM=
+.git/refs/remotes/origin/master__DEL__+tXu3ZGHKDRFy0S40mBgm+tGdOosszeJESBI/NtHvnM=
LICENSE.APLv2__DEL__z8d0m5b2O9McPEK1xHG/dWgUBT6EfBDz6wA0F7xSPTA=
NOTICE__DEL__ijjaB8GEO5OJP/jK6n7Hr3vZFI9gy8ocoDhviViKNnU=
README.md__DEL__47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=
-config.xml__DEL__Qkr7TJvy4gd86evi4H+4ktLvdr8FgmzvFv1ia8HsEC4=
+config.xml__DEL__coG2QfwI4dJYdeBpyPbkCmdN8sAQ8/P74NTeGIx6kWk=
css/style.css__DEL__YCx4tiqoai276nR9sDZsPUcn0/z3Xi4XYMDXIcnGRhU=
+icon.jpg__DEL__2ZXXmZkVOzH42v5SF/c73PYgxmcHHRii2/gn73UUhlo=
icon.png__DEL__kd617JYkX8IEUQERd72gL14zj6pgNVcKiSRAFQz6HX8=
index.html__DEL__CdntWzqB8DQYZKIF68hQqqZVLQPbLRf1hXjozO+agxA=
-js/app.js__DEL__9EpEjkd24MipRP5Wf2AcmTfBRwY8XuiKKQCqHRBa4yY=
+js/app.js__DEL__qAH6L1c0b9HsljfVO01W4pPPJppPjS4q9bbHtrfap1o=
version.txt__DEL__jFS/q38a6b0acUjq5B57Co9K03JuDKxw+COi1F255gw=
-author-signature.xml__DEL__/OFKQco7PmrsxABT6A7dr+y2TDUxoUxYYSxxm07/XUs=
+author-signature.xml__DEL__zbeHy8sdYpGk8PQBOxft9I40IMiu1StArvdue2tmgvM=
diff --git a/.sign/author-signature.xml b/.sign/author-signature.xml
index 2d64341..94d0352 100644
--- a/.sign/author-signature.xml
+++ b/.sign/author-signature.xml
@@ -4,7 +4,7 @@
-S+723M+4XfgLCJ0+E2VDlngMzD9sVdlQeTqZODAHYsk=
+zcfTfR42Hp+H75bMNYkDQLV9RYb7Fr10Bnmdza0/wbk=
@@ -64,7 +64,7 @@
-82qvwEwIehdJSRRTUQ5k0l/xZTX/gUmx13w14SBGkb4=
+pyS8kEZfsVBGpOv9SvlFqo6UBj2HpGQgNcHX4Rs3Utg=
@@ -72,15 +72,15 @@
-HdamRaCuNhCoWwShMG0gRoCmyP5xz/kqVVCO7L+dOAw=
+wpmVLUxvBL3eAdGAtZjwyYpbwNfeY94DatVmpCucCrs=
-HdamRaCuNhCoWwShMG0gRoCmyP5xz/kqVVCO7L+dOAw=
+wpmVLUxvBL3eAdGAtZjwyYpbwNfeY94DatVmpCucCrs=
-6K6MWQd6yfMVNVP6y4EJgchCZlLqTssS1g/kY4epsp0=
+btdsa2RxeDDqQsRq2xXhygBmAPEBTar3K9p6FIPo2Ng=
@@ -110,10 +110,18 @@
9KKkz5G0UwI91vXfoRqDff+Kg+vZkM5aU2GGZ77/nug=
+
+
+QDKqylvpL5aKPcDz/9zSuGXDiGaa0HESAG0hK13UMpk=
+
wwu4NPLQylGD4xQh9o083s2OtoFpL3dRLSMUfxyXunQ=
+
+
+dk7aYwpCa5ILFLFs53nmgi7a/fhAWv4OpIqistb4Qm4=
+
NWl0p1AAhqGIhpiPNnefVL7uzkqYFG1ZET6Oni7l45M=
@@ -138,6 +146,14 @@
FZmqOATlAZ5v6hGivuWkZ9NLyIA0B464HQ9hvqMUJBQ=
+
+
+GIQkHw2nvNnV/t1FJI6M9nGukDfi3PkzR+YQVBdkoew=
+
+
+
+3hbwK3TLaW1TVvT461gSaigsje2W/Ol74Ps+ElGSyIQ=
+
HvEW3s9pr5lX/U/e4ZOjuGQ5UKstesDe/4eJic1wvlo=
@@ -154,6 +170,10 @@
fB08qAMNyvrNiut/zN7hw0epaAbaQDnXxDBRQx7HGlE=
+
+
+I9nY+iedh8TO2HV91DIps+SueQgcc0WCoPaYqIhzUq0=
+
lpDm120MOA6vW/mrh0cy1pu67SJ6dPu/cY8rN8I7xW8=
@@ -178,10 +198,18 @@
Hljb7WQV6HW2SlXWnf79Z0JHFEEXiF854oWTNGeoqG0=
+
+
+mEncbCDO5beLVf4GshoEy6LOyko6GMkMcEErkep3JDM=
+
PBdNy+ElDdG/ulzGKnoHefxPQEVB5zq5pMe/pZHZRAc=
+
+
+KKHH2pD0qfizOadYZbJkZrm29T/oVjobBOqJM+rRwYg=
+
12mjogpHHWqxDDPm4hsC7303iOQBAb4eoC4CjMKYPYg=
@@ -194,6 +222,14 @@
bK1/lEV5blLPpFrn/ZNVdLDE2RnlA4SnQhDpURW+znc=
+
+
+hTPwSlNSKTaSuUMuvBi0AzOTFOEpKwcbrCd4aQ/6cHk=
+
+
+
+vm4JtKqoDEF/pwWpYnqKnfacIDpptH1kPV47pgSIcH0=
+
FkxfqAZ/rPGkPwnOPQ416/U6f1cj7L8VqGZ8/FPCb2w=
@@ -208,11 +244,11 @@
-KXUPQ/nYYMp7WqlpkZ/Knt20YxFULD6ZfWYpj2keBHU=
++tXu3ZGHKDRFy0S40mBgm+tGdOosszeJESBI/NtHvnM=
-KXUPQ/nYYMp7WqlpkZ/Knt20YxFULD6ZfWYpj2keBHU=
++tXu3ZGHKDRFy0S40mBgm+tGdOosszeJESBI/NtHvnM=
@@ -228,12 +264,16 @@
-Qkr7TJvy4gd86evi4H+4ktLvdr8FgmzvFv1ia8HsEC4=
+coG2QfwI4dJYdeBpyPbkCmdN8sAQ8/P74NTeGIx6kWk=
YCx4tiqoai276nR9sDZsPUcn0/z3Xi4XYMDXIcnGRhU=
+
+
+2ZXXmZkVOzH42v5SF/c73PYgxmcHHRii2/gn73UUhlo=
+
kd617JYkX8IEUQERd72gL14zj6pgNVcKiSRAFQz6HX8=
@@ -244,7 +284,7 @@
-9EpEjkd24MipRP5Wf2AcmTfBRwY8XuiKKQCqHRBa4yY=
+qAH6L1c0b9HsljfVO01W4pPPJppPjS4q9bbHtrfap1o=
@@ -259,11 +299,11 @@
-HMdolt8DX8leOnO9iLPIUcH6ADtJUsnVspkG4m1lTi/cdCpKmKzVX+WbW204HWnY+kGlyVa7J7QP
-+FG9t/Iy85e+0wXmRwlrbzIKKvIJH6nYC9JkL+HPf/CJYVu3Sm0GsItkmLXaHYzSCpiPJB7ZdAK6
-NaN4MybpIkEnZOG5VjbYLfaP7+4pjNvsDkMx/HEDkuL4xzq52C236zG85rGYM5ru5s7VfdisJerm
-EyfLDcJxlMkkEGGe+yrJXBmT7Kp1A3U23mhikQBUUgyOfsDIPnybw4GoYWw4NvOYOHcK/AdT0R4B
-rfNQ7MtcN/Ex+0JjGGqShyIq/Tfl3O2mUVaLGQ==
+KPLcxFZnTnI9wPU0XTquZmWpAuw8dIxUy/I3dzb7VUv57jlD1kHeD0Iw9e/AUpXVZ1VuD1yFqsKp
+kmGOa7ThV8ZBEBSdiaQYNsa4GK0B4rQMqx/P4nfy0J7tk6rre/Sb0km4vrhNbMSn0m7OeybXALVc
+TEPHqJIRkhTwKCos0KrpdplhR9XN43W4HT1uXNgSjEs1Cf+n4CFZcScKQ+zS0vTQCScrQBJw7uIl
+tgkFE9D+aozlu7N0G8ietdrW2x4mH4KjuVpeamVE2rVyD0//tgJ8h+JTd+NKSNPUW/zAt0eqsB4Q
+Lp6RK6ttOg6DjilVWacK5SwKA0kMqjzYGfbN6Q==
diff --git a/.sign/signature1.xml b/.sign/signature1.xml
index 6f2bf25..b097cff 100644
--- a/.sign/signature1.xml
+++ b/.sign/signature1.xml
@@ -4,7 +4,7 @@
-S+723M+4XfgLCJ0+E2VDlngMzD9sVdlQeTqZODAHYsk=
+zcfTfR42Hp+H75bMNYkDQLV9RYb7Fr10Bnmdza0/wbk=
@@ -64,7 +64,7 @@
-82qvwEwIehdJSRRTUQ5k0l/xZTX/gUmx13w14SBGkb4=
+pyS8kEZfsVBGpOv9SvlFqo6UBj2HpGQgNcHX4Rs3Utg=
@@ -72,15 +72,15 @@
-HdamRaCuNhCoWwShMG0gRoCmyP5xz/kqVVCO7L+dOAw=
+wpmVLUxvBL3eAdGAtZjwyYpbwNfeY94DatVmpCucCrs=
-HdamRaCuNhCoWwShMG0gRoCmyP5xz/kqVVCO7L+dOAw=
+wpmVLUxvBL3eAdGAtZjwyYpbwNfeY94DatVmpCucCrs=
-6K6MWQd6yfMVNVP6y4EJgchCZlLqTssS1g/kY4epsp0=
+btdsa2RxeDDqQsRq2xXhygBmAPEBTar3K9p6FIPo2Ng=
@@ -110,10 +110,18 @@
9KKkz5G0UwI91vXfoRqDff+Kg+vZkM5aU2GGZ77/nug=
+
+
+QDKqylvpL5aKPcDz/9zSuGXDiGaa0HESAG0hK13UMpk=
+
wwu4NPLQylGD4xQh9o083s2OtoFpL3dRLSMUfxyXunQ=
+
+
+dk7aYwpCa5ILFLFs53nmgi7a/fhAWv4OpIqistb4Qm4=
+
NWl0p1AAhqGIhpiPNnefVL7uzkqYFG1ZET6Oni7l45M=
@@ -138,6 +146,14 @@
FZmqOATlAZ5v6hGivuWkZ9NLyIA0B464HQ9hvqMUJBQ=
+
+
+GIQkHw2nvNnV/t1FJI6M9nGukDfi3PkzR+YQVBdkoew=
+
+
+
+3hbwK3TLaW1TVvT461gSaigsje2W/Ol74Ps+ElGSyIQ=
+
HvEW3s9pr5lX/U/e4ZOjuGQ5UKstesDe/4eJic1wvlo=
@@ -154,6 +170,10 @@
fB08qAMNyvrNiut/zN7hw0epaAbaQDnXxDBRQx7HGlE=
+
+
+I9nY+iedh8TO2HV91DIps+SueQgcc0WCoPaYqIhzUq0=
+
lpDm120MOA6vW/mrh0cy1pu67SJ6dPu/cY8rN8I7xW8=
@@ -178,10 +198,18 @@
Hljb7WQV6HW2SlXWnf79Z0JHFEEXiF854oWTNGeoqG0=
+
+
+mEncbCDO5beLVf4GshoEy6LOyko6GMkMcEErkep3JDM=
+
PBdNy+ElDdG/ulzGKnoHefxPQEVB5zq5pMe/pZHZRAc=
+
+
+KKHH2pD0qfizOadYZbJkZrm29T/oVjobBOqJM+rRwYg=
+
12mjogpHHWqxDDPm4hsC7303iOQBAb4eoC4CjMKYPYg=
@@ -194,6 +222,14 @@
bK1/lEV5blLPpFrn/ZNVdLDE2RnlA4SnQhDpURW+znc=
+
+
+hTPwSlNSKTaSuUMuvBi0AzOTFOEpKwcbrCd4aQ/6cHk=
+
+
+
+vm4JtKqoDEF/pwWpYnqKnfacIDpptH1kPV47pgSIcH0=
+
FkxfqAZ/rPGkPwnOPQ416/U6f1cj7L8VqGZ8/FPCb2w=
@@ -208,11 +244,11 @@
-KXUPQ/nYYMp7WqlpkZ/Knt20YxFULD6ZfWYpj2keBHU=
++tXu3ZGHKDRFy0S40mBgm+tGdOosszeJESBI/NtHvnM=
-KXUPQ/nYYMp7WqlpkZ/Knt20YxFULD6ZfWYpj2keBHU=
++tXu3ZGHKDRFy0S40mBgm+tGdOosszeJESBI/NtHvnM=
@@ -228,16 +264,20 @@
-/OFKQco7PmrsxABT6A7dr+y2TDUxoUxYYSxxm07/XUs=
+zbeHy8sdYpGk8PQBOxft9I40IMiu1StArvdue2tmgvM=
-Qkr7TJvy4gd86evi4H+4ktLvdr8FgmzvFv1ia8HsEC4=
+coG2QfwI4dJYdeBpyPbkCmdN8sAQ8/P74NTeGIx6kWk=
YCx4tiqoai276nR9sDZsPUcn0/z3Xi4XYMDXIcnGRhU=
+
+
+2ZXXmZkVOzH42v5SF/c73PYgxmcHHRii2/gn73UUhlo=
+
kd617JYkX8IEUQERd72gL14zj6pgNVcKiSRAFQz6HX8=
@@ -248,7 +288,7 @@
-9EpEjkd24MipRP5Wf2AcmTfBRwY8XuiKKQCqHRBa4yY=
+qAH6L1c0b9HsljfVO01W4pPPJppPjS4q9bbHtrfap1o=
@@ -263,11 +303,11 @@
-JMTFgx2hxUlpcAGLAq6J8VnkYXc0ZsA4Gcmi0Or7fFlIisseUlOEL0NaYDojS99GA76fCm1GjPxC
-inWW9hUp06G6/O4HRCK8+sxFytoGan0orewyIkG27+ao2evmbBhltqYA6rOb/BAQ1MRNVZfD4OTm
-jCppan69D5CE49Ae4Gpgh4DO1lkS+1G7bz38sRYAl3TuUc7EcEgqZDXYJqaQbOHasuoAH+2NCocl
-FBmkRdK5BVsPUdgKVPaCY6DGJjhJ8+oNhN33ujqxi7IdVgEl+lqo7c9cX+EcLN2pORAnYOW6XFSK
-6S4pzLroHTf9oNKNF60maVwxjwbUdJ6m5yy+vA==
+FpBth+mhvZWqnAsg5Nq1Tm0z2kFg0AlVaifk8J4IZbFSUlyjg+Abw+GtwI0Wc/aTS4kSfvlTrBM0
+nXWHfcIlnTfirhB2wwdX2p/ClNjFcz79iY3j9eN53pbxcaXdKibpfmmbxiKfBQCQcgU7fwMoCiN2
+5EoqR1H4uhm/vzp50nrO98gWk1ZOlaK4TKRYL7e1Eo62RfpuF0DLGO/DZzMNExfxTCNeveVZ5yMO
+rR8yNn2CojaGRXIT+rkyV7S3ToCRHP7cGVcgdF8j9tXRIxDDLfZN71UBc3tKfdVmyulR5SgvFSww
+L0kqrLv0owbGtML+HyhklS+bbVQastBqCazXCA==
diff --git a/CalendarWatch.wgt b/CalendarWatch.wgt
index 78fdbb1..f804e46 100644
Binary files a/CalendarWatch.wgt and b/CalendarWatch.wgt differ
diff --git a/config.xml b/config.xml
index 9f29e0d..2329725 100644
--- a/config.xml
+++ b/config.xml
@@ -1,10 +1,11 @@
-
-
+
+
+ Raphael Maenle
-
+
CalendarWatch
diff --git a/icon.jpg b/icon.jpg
new file mode 100644
index 0000000..5802e94
Binary files /dev/null and b/icon.jpg differ
diff --git a/js/app.js b/js/app.js
index 8e5d802..cd92d69 100644
--- a/js/app.js
+++ b/js/app.js
@@ -66,7 +66,7 @@ var eventsTimeStamp = 0;
}
function getJSON() {
- var downloadRequest = new tizen.DownloadRequest('http://192.168.68.103.xip.io:1234/userinfo/107971745944668140075/calendarevents.json', 'downloads');
+ var downloadRequest = new tizen.DownloadRequest('https://longitudecalendar.com/userinfo/107971745944668140075/calendarevents.json', 'downloads');
tizen.systeminfo.getPropertyValue('NETWORK', function(networkInfo) {
if (networkInfo.networkType === 'NONE') {
console.log('Network connection is not available.Download is not possible.');
@@ -136,11 +136,22 @@ var eventsTimeStamp = 0;
hardStart = false;
if(hardStop == undefined)
hardStop= false;
-
- context.save();
- context.beginPath();
-
+
seperation = 5;
+ // if arc size smaller than separation for circles or circle,
+ // draw a circle
+
+ var arcsize = 0;
+ if(endAngle < startAngle) {
+ arcsize = 360 - startAngle + endAngle;
+ } else {
+ arcsize = endAngle - startAngle;
+ }
+
+ if(arcsize < 2*seperation) {
+ renderCircle(context, polToCart(radius, startAngle + arcsize /2 ), 9, color);
+ return;
+ }
if(!hardStart)
startAngle += seperation;
@@ -153,6 +164,12 @@ var eventsTimeStamp = 0;
if(endAngle<0)
endAngle += 360;
+
+
+ // else draw an arc and two circles
+ context.save();
+ context.beginPath();
+
context.arc(center.x, center.y, radius, startAngle * Math.PI / 180., endAngle * Math.PI / 180.);
context.fillStyle = color;
context.strokeStyle = color;
@@ -358,11 +375,9 @@ var eventsTimeStamp = 0;
edge = document.body.clientWidth / 2 - thickness / 2 - 2;
for(var event in events.events){
-
var startedBeforeToday = false;
var endsAfterToday = false;
var e = events.events[event];
-
// check if not today
if(e.startDateTime.date.year != tizen.time.getCurrentDateTime().getFullYear() ||
e.startDateTime.date.month != tizen.time.getCurrentDateTime().getMonth() + 1 ||
@@ -477,9 +492,32 @@ var eventsTimeStamp = 0;
// Update the content of the watch every second
setInterval(function() {
drawWatchContent();
- updateCalendar(60000);
+ // updateCalendar(60000);
}, 1000);
}
window.onload = init;
-}());
\ No newline at end of file
+}());
+
+document.addEventListener('ambientmodechanged', function(ev) {
+ var mode = ev.detail.ambientMode;
+ if (mode == true) {
+ /* Change the UI for ambient mode */
+
+ //updateAmbientWatchFaceDOM(); // function to rearange DOM for AOD mode
+
+ updateTime();
+ } else {
+ /* Change the UI for normal mode */
+
+ // updateNormalWatchFaceDOM(); // function to rearange DOM for AOD mode
+
+ updateTime();
+ }
+});
+
+document.addEventListener('timetick', function(ev) {
+ /* Update the UI */
+
+ drawWatchContent();
+});
\ No newline at end of file