diff --git a/.sign/.manifest.tmp b/.sign/.manifest.tmp
index 69ee1e0..4bc066e 100644
--- a/.sign/.manifest.tmp
+++ b/.sign/.manifest.tmp
@@ -1,6 +1,6 @@
-.git/COMMIT_EDITMSG__DEL__zcfTfR42Hp+H75bMNYkDQLV9RYb7Fr10Bnmdza0/wbk=
+.git/COMMIT_EDITMSG__DEL__4TnT2tbLmZbrnrA7yUY8PFH3TS+z2OMzNn3KL4GgPA8=
.git/HEAD__DEL__9vK5RfbEEbAro9qces6I3PcbavZbouDYmqgpAAQrWhA=
-.git/config__DEL__/Rbd4AUUTUPjlJZYYUUBZKcEeNgeUuzmriIZUFh7T/s=
+.git/config__DEL__au1NdB+8TXr2Rmn1de8XxOJ7XvRR2HhR61c9MY4LTcg=
.git/description__DEL__hatsFj1DoX6pz3eIMIvKFGbxsKjRzJLibpv2PaQGKu4=
.git/hooks/applypatch-msg.sample__DEL__AiNJeguLAzqlijpSG4YphpOGz3qw4vEBlj0yiqYhk/c=
.git/hooks/commit-msg.sample__DEL__H3TV6SkpebVz69WXQdRsuT/zkazdCD00C5Q3B1PZJDc=
@@ -13,43 +13,59 @@
.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__pyS8kEZfsVBGpOv9SvlFqo6UBj2HpGQgNcHX4Rs3Utg=
+.git/index__DEL__5JJZc5Kuj4Z/pZvz9pze+jQQI0jTmWtU0oQMwNjdWVg=
.git/info/exclude__DEL__ZnH+g7egfIky7okWTR8nk7IxgFjri5jcXAbuClo7DsE=
-.git/logs/HEAD__DEL__wpmVLUxvBL3eAdGAtZjwyYpbwNfeY94DatVmpCucCrs=
-.git/logs/refs/heads/master__DEL__wpmVLUxvBL3eAdGAtZjwyYpbwNfeY94DatVmpCucCrs=
-.git/logs/refs/remotes/origin/master__DEL__btdsa2RxeDDqQsRq2xXhygBmAPEBTar3K9p6FIPo2Ng=
+.git/logs/HEAD__DEL__cFUJu+DEVOEy3fH95uYK6jiiqTpCNDE3Kyv5kDAfRF0=
+.git/logs/refs/heads/dev__DEL__q20Bv7wjBkQHG9fg8cC64InwcBytMlrnZqO32+lD1LE=
+.git/logs/refs/heads/master__DEL__9i53tn0/qVsgysZxECV+joEJhm9Ypps9KWZX9pvOTN8=
+.git/logs/refs/remotes/origin/dev__DEL__wvti+A+HmltuMEEaFVgwS4Xh16oYsmcKLCml+4mFyy8=
+.git/logs/refs/remotes/origin/master__DEL__hX2wYuZws+kwR9PpwRC+10ML1WrntJO7RwE4/cRWRZ8=
.git/objects/02/741fe0d44ace36d88f500de55fe02f60e39681__DEL__cVGnHJSbIxxTbHZ4cc0XEetbMGr4Ig04SwFvCJL0tcg=
+.git/objects/03/240c2d93bda6a3706feaeb68273e9a270e432c__DEL__Ms6qdss7hkzXr1x2TOTA2cWJgps+JGTzSg5ipDkyC5E=
.git/objects/05/bd71b6ec2c1982d1e8a5653073281994564ae8__DEL__PXNsl0l7EuMPFASARrf2c4vkfoU8MqkL51Cf4LHE3Ik=
.git/objects/07/89c5456f19123401bbbea06ccc14cd42067219__DEL__wl7lmcXANjTQcOsw471SlI61qAqEpWF6oTpIbNZsGwQ=
.git/objects/13/fb568ca97112e3039b47ab7b9f36de9834ee89__DEL__rqiQE/qsgBRiZw6iG+cFJxVCHRIhuay+VEK+82gvaFQ=
.git/objects/1a/30a49ab1682a8c70f37f960b7d1871c5942eb9__DEL__cTC88UJJXLJyBu7pmRkB07i2eLJk4EVv/DBrMDlG2Jk=
.git/objects/1c/1a4d080ef81238e544eab07ae38d6e727dba85__DEL__NCXGus1XG1CzGfD8cnKh9R6Yoh5qQibiIvC1KioagDU=
+.git/objects/23/29725dee7fc5e05dda73e06720ee4ac222efcf__DEL__UW+PAFYQyX8qQnmYODL6ZtyHqhaP9nXc3gl2TbcccvA=
.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/33/67b3daa6e81b654716813fa33ffd6a20c7f370__DEL__6QULNx552KmOJjqXf9j/gdUWqSUkA3lQihi7Zxe0v9k=
.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/58/02e94b1cd8db05ccc5aa2dad551e7f5ec63174__DEL__Jgxge3taYKB1/6zR1DI5xqTEo+Xf97cD0Ji/7S1AiKY=
.git/objects/5d/dc6bd5f24cf4e67a53e20384dfc868809d10b3__DEL__zIPachBagXO0J8zFADVIaaSzJRpTr24o5b0VEKPnHS0=
+.git/objects/66/9e339e0d59da886483c0834d9397a29b53227a__DEL__+nhf1Io/Q9w8bVqA9LcSp1XFxyGSBjidM2mQC0g7m94=
.git/objects/66/de0dcf1f16eb3dfe1aedf78790b4e002c08516__DEL__FZmqOATlAZ5v6hGivuWkZ9NLyIA0B464HQ9hvqMUJBQ=
+.git/objects/69/ee1e082bef2099596adb59c63a64e468b50882__DEL__atW1+50UydpPDgaUThyc1/EPt+MrvfsPzcegGGfRvjM=
+.git/objects/6d/62893bf75605d744173ea8bed3f6198ce18cdc__DEL__nFOWpOHMvHeg/SQuat4JS9Tihoup9kB5YJ7jit0guIA=
.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/82/2ac63bb0a8e9ab24ff26a1aff59635c79b038c__DEL__og3HdYsG8csdD7xUnIqOn7Lq9lyAlwRjG2XXXBZ+Cm4=
.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/94/d035297d32719c863d2bd49b285d1f5775703d__DEL__xkjG1a7P7VoVxIIlO2M+AKBYr77uohSmSrRN8AJzs5I=
.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/b0/2c87ba502c06af3fb09ba7424e5846b1ba7575__DEL__9Ixa5p/uNZxKIdg2yDMUNp0wqic/7TnjdkMVm1eIqvs=
+.git/objects/b0/97cff9350a4425e6159c455a26787f29243576__DEL__4zBEC7z3sZDhmhKOLkXJZ7/ecu7UN+W3I9kkaOUsMk4=
.git/objects/b6/2f236dddb5e68cc7e60e76c9f773b0eb90ce31__DEL__mEncbCDO5beLVf4GshoEy6LOyko6GMkMcEErkep3JDM=
+.git/objects/b9/9aef2abe46750c45d0637bae3c293af58b5ba7__DEL__dX0sJvi5Qp7vZSwGM413141B3yt9P0sz5P+h2dRQdYM=
.git/objects/c4/87c068cae1a73c7bf7239555c1329610507ec9__DEL__PBdNy+ElDdG/ulzGKnoHefxPQEVB5zq5pMe/pZHZRAc=
.git/objects/c8/c746454b625dbe8b6259a6bd2d4f0cd03f0d24__DEL__KKHH2pD0qfizOadYZbJkZrm29T/oVjobBOqJM+rRwYg=
+.git/objects/cd/92d69e5f3e618dc9005368c6a3f525e07e7c44__DEL__pJZUH5JNo+ToD++u0yhTili2JJt6p6JMF/3hpxihWrA=
+.git/objects/cf/8af88eea85172ff804a387058fb0d667fce087__DEL__AusTE5xWutmTaUCeXuzeFC2o2ahEltLk3nJy1fuTJpA=
.git/objects/d1/cc196d5d84ce44efa808521b9ad8fdc51ecead__DEL__12mjogpHHWqxDDPm4hsC7303iOQBAb4eoC4CjMKYPYg=
.git/objects/d4/7f9cd915695b4798f907982d77646a99bf4264__DEL__N8tjv5j1qEgx6o08Q8GEEq+c5oVBme8ZkQ1esJ7fjTM=
.git/objects/d6/45695673349e3947e8e5ae42332d0ac3164cd7__DEL__bK1/lEV5blLPpFrn/ZNVdLDE2RnlA4SnQhDpURW+znc=
@@ -58,16 +74,19 @@
.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__+tXu3ZGHKDRFy0S40mBgm+tGdOosszeJESBI/NtHvnM=
-.git/refs/remotes/origin/master__DEL__+tXu3ZGHKDRFy0S40mBgm+tGdOosszeJESBI/NtHvnM=
+.git/objects/f8/04e46ae59b95fa82280d55e65c5deb7c23619a__DEL__nGm01CzTeVlO+cEBhatCJfqvefpI81P907olWncqhbk=
+.git/refs/heads/dev__DEL__EIvs3h1xxNea4PFAxSSkyksJf7F8PzmIYmkW20Ddo64=
+.git/refs/heads/master__DEL__gBQxs7gDjo/hpBc3i1zxrE1XQpW4Ve8xDNJKBSAteMM=
+.git/refs/remotes/origin/dev__DEL__EIvs3h1xxNea4PFAxSSkyksJf7F8PzmIYmkW20Ddo64=
+.git/refs/remotes/origin/master__DEL__gBQxs7gDjo/hpBc3i1zxrE1XQpW4Ve8xDNJKBSAteMM=
LICENSE.APLv2__DEL__z8d0m5b2O9McPEK1xHG/dWgUBT6EfBDz6wA0F7xSPTA=
NOTICE__DEL__ijjaB8GEO5OJP/jK6n7Hr3vZFI9gy8ocoDhviViKNnU=
README.md__DEL__47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=
-config.xml__DEL__coG2QfwI4dJYdeBpyPbkCmdN8sAQ8/P74NTeGIx6kWk=
+config.xml__DEL__jkk+Xqz4u6x2QmoyRFqH2toTrfVpeEAs2LmKY/4dhuA=
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__qAH6L1c0b9HsljfVO01W4pPPJppPjS4q9bbHtrfap1o=
+js/app.js__DEL__rmrHdDr1N9ElNs0icHuQEjA4D+AanVAQsvwZKOYYvQU=
version.txt__DEL__jFS/q38a6b0acUjq5B57Co9K03JuDKxw+COi1F255gw=
-author-signature.xml__DEL__zbeHy8sdYpGk8PQBOxft9I40IMiu1StArvdue2tmgvM=
+author-signature.xml__DEL__1Uz08mb4I9Cj6tDCPa3m+B1Gdb3P2zXA9/lWw6+hyMw=
diff --git a/.sign/author-signature.xml b/.sign/author-signature.xml
index 94d0352..9762422 100644
--- a/.sign/author-signature.xml
+++ b/.sign/author-signature.xml
@@ -4,7 +4,7 @@
-zcfTfR42Hp+H75bMNYkDQLV9RYb7Fr10Bnmdza0/wbk=
+4TnT2tbLmZbrnrA7yUY8PFH3TS+z2OMzNn3KL4GgPA8=
@@ -12,7 +12,7 @@
-/Rbd4AUUTUPjlJZYYUUBZKcEeNgeUuzmriIZUFh7T/s=
+au1NdB+8TXr2Rmn1de8XxOJ7XvRR2HhR61c9MY4LTcg=
@@ -64,7 +64,7 @@
-pyS8kEZfsVBGpOv9SvlFqo6UBj2HpGQgNcHX4Rs3Utg=
+5JJZc5Kuj4Z/pZvz9pze+jQQI0jTmWtU0oQMwNjdWVg=
@@ -72,20 +72,32 @@
-wpmVLUxvBL3eAdGAtZjwyYpbwNfeY94DatVmpCucCrs=
+cFUJu+DEVOEy3fH95uYK6jiiqTpCNDE3Kyv5kDAfRF0=
+
+
+
+q20Bv7wjBkQHG9fg8cC64InwcBytMlrnZqO32+lD1LE=
-wpmVLUxvBL3eAdGAtZjwyYpbwNfeY94DatVmpCucCrs=
+9i53tn0/qVsgysZxECV+joEJhm9Ypps9KWZX9pvOTN8=
+
+
+
+wvti+A+HmltuMEEaFVgwS4Xh16oYsmcKLCml+4mFyy8=
-btdsa2RxeDDqQsRq2xXhygBmAPEBTar3K9p6FIPo2Ng=
+hX2wYuZws+kwR9PpwRC+10ML1WrntJO7RwE4/cRWRZ8=
cVGnHJSbIxxTbHZ4cc0XEetbMGr4Ig04SwFvCJL0tcg=
+
+
+Ms6qdss7hkzXr1x2TOTA2cWJgps+JGTzSg5ipDkyC5E=
+
PXNsl0l7EuMPFASARrf2c4vkfoU8MqkL51Cf4LHE3Ik=
@@ -106,6 +118,10 @@
NCXGus1XG1CzGfD8cnKh9R6Yoh5qQibiIvC1KioagDU=
+
+
+UW+PAFYQyX8qQnmYODL6ZtyHqhaP9nXc3gl2TbcccvA=
+
9KKkz5G0UwI91vXfoRqDff+Kg+vZkM5aU2GGZ77/nug=
@@ -122,6 +138,10 @@
dk7aYwpCa5ILFLFs53nmgi7a/fhAWv4OpIqistb4Qm4=
+
+
+6QULNx552KmOJjqXf9j/gdUWqSUkA3lQihi7Zxe0v9k=
+
NWl0p1AAhqGIhpiPNnefVL7uzkqYFG1ZET6Oni7l45M=
@@ -138,14 +158,30 @@
TI9vZZsmF1Ydh6O/gd51GoLyXZZyto7wjobmKY2woQo=
+
+
+Jgxge3taYKB1/6zR1DI5xqTEo+Xf97cD0Ji/7S1AiKY=
+
zIPachBagXO0J8zFADVIaaSzJRpTr24o5b0VEKPnHS0=
+
+
++nhf1Io/Q9w8bVqA9LcSp1XFxyGSBjidM2mQC0g7m94=
+
FZmqOATlAZ5v6hGivuWkZ9NLyIA0B464HQ9hvqMUJBQ=
+
+
+atW1+50UydpPDgaUThyc1/EPt+MrvfsPzcegGGfRvjM=
+
+
+
+nFOWpOHMvHeg/SQuat4JS9Tihoup9kB5YJ7jit0guIA=
+
GIQkHw2nvNnV/t1FJI6M9nGukDfi3PkzR+YQVBdkoew=
@@ -158,6 +194,10 @@
HvEW3s9pr5lX/U/e4ZOjuGQ5UKstesDe/4eJic1wvlo=
+
+
+og3HdYsG8csdD7xUnIqOn7Lq9lyAlwRjG2XXXBZ+Cm4=
+
evQo0GymDPIEFqd5BUKUqhrrNQXb9nr3wqTmCHV+J48=
@@ -178,6 +218,10 @@
lpDm120MOA6vW/mrh0cy1pu67SJ6dPu/cY8rN8I7xW8=
+
+
+xkjG1a7P7VoVxIIlO2M+AKBYr77uohSmSrRN8AJzs5I=
+
3VGlqOkDSaru/bmv6eS/4byvPdKJeBDS6Bo/lnU2bgY=
@@ -198,10 +242,22 @@
Hljb7WQV6HW2SlXWnf79Z0JHFEEXiF854oWTNGeoqG0=
+
+
+9Ixa5p/uNZxKIdg2yDMUNp0wqic/7TnjdkMVm1eIqvs=
+
+
+
+4zBEC7z3sZDhmhKOLkXJZ7/ecu7UN+W3I9kkaOUsMk4=
+
mEncbCDO5beLVf4GshoEy6LOyko6GMkMcEErkep3JDM=
+
+
+dX0sJvi5Qp7vZSwGM413141B3yt9P0sz5P+h2dRQdYM=
+
PBdNy+ElDdG/ulzGKnoHefxPQEVB5zq5pMe/pZHZRAc=
@@ -210,6 +266,14 @@
KKHH2pD0qfizOadYZbJkZrm29T/oVjobBOqJM+rRwYg=
+
+
+pJZUH5JNo+ToD++u0yhTili2JJt6p6JMF/3hpxihWrA=
+
+
+
+AusTE5xWutmTaUCeXuzeFC2o2ahEltLk3nJy1fuTJpA=
+
12mjogpHHWqxDDPm4hsC7303iOQBAb4eoC4CjMKYPYg=
@@ -242,13 +306,25 @@
zgSOtLXhZmKmL98vDoytepbOXYqk43npI3T5HsIbgjc=
+
+
+nGm01CzTeVlO+cEBhatCJfqvefpI81P907olWncqhbk=
+
+
+
+EIvs3h1xxNea4PFAxSSkyksJf7F8PzmIYmkW20Ddo64=
+
-+tXu3ZGHKDRFy0S40mBgm+tGdOosszeJESBI/NtHvnM=
+gBQxs7gDjo/hpBc3i1zxrE1XQpW4Ve8xDNJKBSAteMM=
+
+
+
+EIvs3h1xxNea4PFAxSSkyksJf7F8PzmIYmkW20Ddo64=
-+tXu3ZGHKDRFy0S40mBgm+tGdOosszeJESBI/NtHvnM=
+gBQxs7gDjo/hpBc3i1zxrE1XQpW4Ve8xDNJKBSAteMM=
@@ -264,7 +340,7 @@
-coG2QfwI4dJYdeBpyPbkCmdN8sAQ8/P74NTeGIx6kWk=
+jkk+Xqz4u6x2QmoyRFqH2toTrfVpeEAs2LmKY/4dhuA=
@@ -284,7 +360,7 @@
-qAH6L1c0b9HsljfVO01W4pPPJppPjS4q9bbHtrfap1o=
+rmrHdDr1N9ElNs0icHuQEjA4D+AanVAQsvwZKOYYvQU=
@@ -299,11 +375,11 @@
-KPLcxFZnTnI9wPU0XTquZmWpAuw8dIxUy/I3dzb7VUv57jlD1kHeD0Iw9e/AUpXVZ1VuD1yFqsKp
-kmGOa7ThV8ZBEBSdiaQYNsa4GK0B4rQMqx/P4nfy0J7tk6rre/Sb0km4vrhNbMSn0m7OeybXALVc
-TEPHqJIRkhTwKCos0KrpdplhR9XN43W4HT1uXNgSjEs1Cf+n4CFZcScKQ+zS0vTQCScrQBJw7uIl
-tgkFE9D+aozlu7N0G8ietdrW2x4mH4KjuVpeamVE2rVyD0//tgJ8h+JTd+NKSNPUW/zAt0eqsB4Q
-Lp6RK6ttOg6DjilVWacK5SwKA0kMqjzYGfbN6Q==
+j6wQ2e/3bRdLNaoLpIUuf2tGaMnoO1/0Kfa4hc8Hf7Mib1wfhvk6QsI+MnfT75A5kqjDVu1FTuh4
+NL8ghDldXDX41bo6gt6c+OuRqNkVXYIaf8eWew513cnyNO7M6hlJ4jMXUfQ96czlckGmSZultPR+
+182yvmeWWdtunTuKU723KkYpZWHO7uYhGtFVb51Dv3okGUNSmTv2SCfmpRk77WmiPDhPeskdxnSm
+806Ir3bMArZUcSHNuHQQJkFG0MneFAAamzcthRXbqoH7l9AtKqXHEUYj8CuY+7bu9BknukJmvej6
+4jBh+yRXzeKmJGUC4UkT1dGg2n1lZjOC+BMvpQ==
diff --git a/.sign/signature1.xml b/.sign/signature1.xml
index b097cff..5d85405 100644
--- a/.sign/signature1.xml
+++ b/.sign/signature1.xml
@@ -4,7 +4,7 @@
-zcfTfR42Hp+H75bMNYkDQLV9RYb7Fr10Bnmdza0/wbk=
+4TnT2tbLmZbrnrA7yUY8PFH3TS+z2OMzNn3KL4GgPA8=
@@ -12,7 +12,7 @@
-/Rbd4AUUTUPjlJZYYUUBZKcEeNgeUuzmriIZUFh7T/s=
+au1NdB+8TXr2Rmn1de8XxOJ7XvRR2HhR61c9MY4LTcg=
@@ -64,7 +64,7 @@
-pyS8kEZfsVBGpOv9SvlFqo6UBj2HpGQgNcHX4Rs3Utg=
+5JJZc5Kuj4Z/pZvz9pze+jQQI0jTmWtU0oQMwNjdWVg=
@@ -72,20 +72,32 @@
-wpmVLUxvBL3eAdGAtZjwyYpbwNfeY94DatVmpCucCrs=
+cFUJu+DEVOEy3fH95uYK6jiiqTpCNDE3Kyv5kDAfRF0=
+
+
+
+q20Bv7wjBkQHG9fg8cC64InwcBytMlrnZqO32+lD1LE=
-wpmVLUxvBL3eAdGAtZjwyYpbwNfeY94DatVmpCucCrs=
+9i53tn0/qVsgysZxECV+joEJhm9Ypps9KWZX9pvOTN8=
+
+
+
+wvti+A+HmltuMEEaFVgwS4Xh16oYsmcKLCml+4mFyy8=
-btdsa2RxeDDqQsRq2xXhygBmAPEBTar3K9p6FIPo2Ng=
+hX2wYuZws+kwR9PpwRC+10ML1WrntJO7RwE4/cRWRZ8=
cVGnHJSbIxxTbHZ4cc0XEetbMGr4Ig04SwFvCJL0tcg=
+
+
+Ms6qdss7hkzXr1x2TOTA2cWJgps+JGTzSg5ipDkyC5E=
+
PXNsl0l7EuMPFASARrf2c4vkfoU8MqkL51Cf4LHE3Ik=
@@ -106,6 +118,10 @@
NCXGus1XG1CzGfD8cnKh9R6Yoh5qQibiIvC1KioagDU=
+
+
+UW+PAFYQyX8qQnmYODL6ZtyHqhaP9nXc3gl2TbcccvA=
+
9KKkz5G0UwI91vXfoRqDff+Kg+vZkM5aU2GGZ77/nug=
@@ -122,6 +138,10 @@
dk7aYwpCa5ILFLFs53nmgi7a/fhAWv4OpIqistb4Qm4=
+
+
+6QULNx552KmOJjqXf9j/gdUWqSUkA3lQihi7Zxe0v9k=
+
NWl0p1AAhqGIhpiPNnefVL7uzkqYFG1ZET6Oni7l45M=
@@ -138,14 +158,30 @@
TI9vZZsmF1Ydh6O/gd51GoLyXZZyto7wjobmKY2woQo=
+
+
+Jgxge3taYKB1/6zR1DI5xqTEo+Xf97cD0Ji/7S1AiKY=
+
zIPachBagXO0J8zFADVIaaSzJRpTr24o5b0VEKPnHS0=
+
+
++nhf1Io/Q9w8bVqA9LcSp1XFxyGSBjidM2mQC0g7m94=
+
FZmqOATlAZ5v6hGivuWkZ9NLyIA0B464HQ9hvqMUJBQ=
+
+
+atW1+50UydpPDgaUThyc1/EPt+MrvfsPzcegGGfRvjM=
+
+
+
+nFOWpOHMvHeg/SQuat4JS9Tihoup9kB5YJ7jit0guIA=
+
GIQkHw2nvNnV/t1FJI6M9nGukDfi3PkzR+YQVBdkoew=
@@ -158,6 +194,10 @@
HvEW3s9pr5lX/U/e4ZOjuGQ5UKstesDe/4eJic1wvlo=
+
+
+og3HdYsG8csdD7xUnIqOn7Lq9lyAlwRjG2XXXBZ+Cm4=
+
evQo0GymDPIEFqd5BUKUqhrrNQXb9nr3wqTmCHV+J48=
@@ -178,6 +218,10 @@
lpDm120MOA6vW/mrh0cy1pu67SJ6dPu/cY8rN8I7xW8=
+
+
+xkjG1a7P7VoVxIIlO2M+AKBYr77uohSmSrRN8AJzs5I=
+
3VGlqOkDSaru/bmv6eS/4byvPdKJeBDS6Bo/lnU2bgY=
@@ -198,10 +242,22 @@
Hljb7WQV6HW2SlXWnf79Z0JHFEEXiF854oWTNGeoqG0=
+
+
+9Ixa5p/uNZxKIdg2yDMUNp0wqic/7TnjdkMVm1eIqvs=
+
+
+
+4zBEC7z3sZDhmhKOLkXJZ7/ecu7UN+W3I9kkaOUsMk4=
+
mEncbCDO5beLVf4GshoEy6LOyko6GMkMcEErkep3JDM=
+
+
+dX0sJvi5Qp7vZSwGM413141B3yt9P0sz5P+h2dRQdYM=
+
PBdNy+ElDdG/ulzGKnoHefxPQEVB5zq5pMe/pZHZRAc=
@@ -210,6 +266,14 @@
KKHH2pD0qfizOadYZbJkZrm29T/oVjobBOqJM+rRwYg=
+
+
+pJZUH5JNo+ToD++u0yhTili2JJt6p6JMF/3hpxihWrA=
+
+
+
+AusTE5xWutmTaUCeXuzeFC2o2ahEltLk3nJy1fuTJpA=
+
12mjogpHHWqxDDPm4hsC7303iOQBAb4eoC4CjMKYPYg=
@@ -242,13 +306,25 @@
zgSOtLXhZmKmL98vDoytepbOXYqk43npI3T5HsIbgjc=
+
+
+nGm01CzTeVlO+cEBhatCJfqvefpI81P907olWncqhbk=
+
+
+
+EIvs3h1xxNea4PFAxSSkyksJf7F8PzmIYmkW20Ddo64=
+
-+tXu3ZGHKDRFy0S40mBgm+tGdOosszeJESBI/NtHvnM=
+gBQxs7gDjo/hpBc3i1zxrE1XQpW4Ve8xDNJKBSAteMM=
+
+
+
+EIvs3h1xxNea4PFAxSSkyksJf7F8PzmIYmkW20Ddo64=
-+tXu3ZGHKDRFy0S40mBgm+tGdOosszeJESBI/NtHvnM=
+gBQxs7gDjo/hpBc3i1zxrE1XQpW4Ve8xDNJKBSAteMM=
@@ -264,11 +340,11 @@
-zbeHy8sdYpGk8PQBOxft9I40IMiu1StArvdue2tmgvM=
+1Uz08mb4I9Cj6tDCPa3m+B1Gdb3P2zXA9/lWw6+hyMw=
-coG2QfwI4dJYdeBpyPbkCmdN8sAQ8/P74NTeGIx6kWk=
+jkk+Xqz4u6x2QmoyRFqH2toTrfVpeEAs2LmKY/4dhuA=
@@ -288,7 +364,7 @@
-qAH6L1c0b9HsljfVO01W4pPPJppPjS4q9bbHtrfap1o=
+rmrHdDr1N9ElNs0icHuQEjA4D+AanVAQsvwZKOYYvQU=
@@ -303,11 +379,11 @@
-FpBth+mhvZWqnAsg5Nq1Tm0z2kFg0AlVaifk8J4IZbFSUlyjg+Abw+GtwI0Wc/aTS4kSfvlTrBM0
-nXWHfcIlnTfirhB2wwdX2p/ClNjFcz79iY3j9eN53pbxcaXdKibpfmmbxiKfBQCQcgU7fwMoCiN2
-5EoqR1H4uhm/vzp50nrO98gWk1ZOlaK4TKRYL7e1Eo62RfpuF0DLGO/DZzMNExfxTCNeveVZ5yMO
-rR8yNn2CojaGRXIT+rkyV7S3ToCRHP7cGVcgdF8j9tXRIxDDLfZN71UBc3tKfdVmyulR5SgvFSww
-L0kqrLv0owbGtML+HyhklS+bbVQastBqCazXCA==
+k/BX+FLNLWtP5BclGr7SvufjaGjfoxXDZhND4uGB+2UL6IGdxCtS0ZUhrbI7CuYUhtWBE0J+Z7V7
+jSVdG2ZdBQhUEmjZ7sULTwjf3HrX54N6J8HBsycFK8Fr0DOcmJKaUv+IXQOtvm7/bFu/jyyCqVrC
+pY+rYS0te23zWoj/psKGBKwe2KvYP5c7hsFWnSdjIZQqEfPAscyVWspw9X+Lp01czg8IA9LYyp9j
+wGZdCDhPHd7GEGw3HvESfmlEjxv/Y8x4vMZ6PsHGpMELB6rCvO/IQIvevHkE1bPjg3xqRu8wEPCg
+UyUqYD5QA2CT7BnBePys/gVH7l5uX0z9nCY4fw==
diff --git a/CalendarWatch.wgt b/CalendarWatch.wgt
index f804e46..6028ff1 100644
Binary files a/CalendarWatch.wgt and b/CalendarWatch.wgt differ
diff --git a/config.xml b/config.xml
index 2329725..73714eb 100644
--- a/config.xml
+++ b/config.xml
@@ -1,6 +1,6 @@
-
+
Raphael Maenle
@@ -13,5 +13,6 @@
+
diff --git a/js/app.js b/js/app.js
index cd92d69..e13c9db 100644
--- a/js/app.js
+++ b/js/app.js
@@ -11,7 +11,7 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
- * limitations under the License.
+ * limitations under the License.
*/
var events;
@@ -26,47 +26,39 @@ var eventsTimeStamp = 0;
watchRadius;
function readJSON(path) {
- var xhr = new XMLHttpRequest();
- xhr.open('GET', path, true);
- xhr.responseType = 'blob';
- xhr.onload = function(e) {
- if (this.status == 0) {
- var file = new File([this.response], 'temp');
- var fileReader = new FileReader();
- fileReader.addEventListener('load', function(){
- events = JSON.parse(fileReader.result);
-
- var onError = function(e) {
- console.log('Error!' + e.message);
- };
-
- var onResolveSuccess = function(dir) {
- var onListFilesSuccess = function(files) {
- files.forEach(function(file) {
- if (!file.isDirectory) {
- dir.deleteFile(file.fullPath, onDeleteSuccess, onError);
- }
- });
- };
-
- dir.listFiles(onListFilesSuccess, onError);
- };
-
- var onDeleteSuccess = function() {};
-
- tizen.filesystem.resolve('/opt/usr/media/Downloads', onResolveSuccess, onError);
-
-
-
- });
- fileReader.readAsText(file);
- }
+ /* - requests permission to view media storage
+ * - resolves the file 'calendarevents'
+ * - opens stream and reads entire file as json
+ */
+
+ function onsuccess(dir){
+ var dirfile = dir.resolve("calendarevents");
+ console.log(dirfile);
+
+ /* for tizen 4.0, should work on 5.5 aswell but tizen 5.5 uses 'openFile' for Filereading */
+ dirfile.openStream("r", function(fs) {
+ events = JSON.parse(fs.read(dirfile.fileSize));
+ fs.close();
+ })
+ }
+
+ function onerror(e){
+ console.log("error"+e);
}
- xhr.send();
+
+ function onsuccessPermission(){
+ tizen.filesystem.resolve("wgt-private", onsuccess, onerror, "rw");
+ }
+
+ function onErrorPermission(e){
+ console.log("error "+ JSON.stringify(e));
+ }
+
+ tizen.ppm.requestPermission("http://tizen.org/privilege/mediastorage", onsuccessPermission, onErrorPermission);
}
function getJSON() {
- var downloadRequest = new tizen.DownloadRequest('https://longitudecalendar.com/userinfo/107971745944668140075/calendarevents.json', 'downloads');
+ var downloadRequest = new tizen.DownloadRequest('https://longitudecalendar.com/userinfo/107971745944668140075/calendarevents.json', 'wgt-private');
tizen.systeminfo.getPropertyValue('NETWORK', function(networkInfo) {
if (networkInfo.networkType === 'NONE') {
console.log('Network connection is not available.Download is not possible.');
@@ -429,9 +421,7 @@ var eventsTimeStamp = 0;
function updateCalendar(offset_ms) {
var d = new Date();
var currentTime = d.getTime();
- console.log("current Time: " + currentTime);
if(eventsTimeStamp + offset_ms < currentTime){
- console.log("updating Events");
getJSON();
eventsTimeStamp = currentTime;
}
@@ -482,6 +472,7 @@ var eventsTimeStamp = 0;
* @private
*/
function init() {
+
setDefaultVariables();
setDefaultEvents();
@@ -492,7 +483,7 @@ var eventsTimeStamp = 0;
// Update the content of the watch every second
setInterval(function() {
drawWatchContent();
- // updateCalendar(60000);
+ updateCalendar(600000);
}, 1000);
}