Revert "Show liveness indicator (beating heart)"

This reverts commit 84c4298cd5.

Conflicts:
	gui/app.js
	gui/index.html
This commit is contained in:
Jakob Borg committed 2014-05-20 01:02:24 +02:00
1 parent a8c510cc72
commit 1aef03288a
3 files changed
+10 -32

No files matched your search

+2 -2
View File
@@ -18,7 +18,7 @@ func init() {
bs, _ = ioutil.ReadAll(gr)
Assets["angular.min.js"] = bs
bs, _ = hex.DecodeString("1f8b080000096e8800ffd41c5d6fdbb6f63dbf82f3ba496e1d3b19ee868bbae9b0a5dd90dbf503cdda97200fb245c76a644aa3a82646e6ff7ecf21299914295949daae33b0c5260fcf37cf074575f2f04391264c9019cfae0aca1f13c14b3a22f38c898495b4fa9da76581ffa9dfe4e1646ff2f022cd66514a1e3c268b282d00286217651a71fd1b81f68212be14822773114cf7f63e469c146b3617cb845d90a36ac57895c5654ac3a09e0b46e4ec7c38950b4a9ece22407344024e0bc483a39c2ee0d7f28409ca3f021b47e4f0003e5332999055b1b757a31aa32c3c4b53cac3e0b41a3d163c05228b127e271923e183629ee520c483a510f990dcec11f820a19cd38fcf2281f40fa6f528721271a1c490f2827838a9f08c2fa878fd02a6505d537302b86154d22c60fa66d39c5c2417eef86a7df20ce50fac5196c514919c9d7b909c3094d5c701e53ce39e7505a5ec39ceb994c03e3475d9e234cf3c52a45121dee531e82c864946af08ea2f1c5a404b0aea9bd14828bdca2930dd29f80abb28c88c2e324ec92ccbd282a459760923024c6d332c84040651e4f84d123f26c11f4921280344605f50d01c1c52da9dbce199c8e6594a1404f9258ec18c052d0050ac7370f640d06b01bfb47595b76f4606f297d1f52965f18b595e18e85f97e222435f788b8ef247b24a04095ffc9a17c32d6a56ae669477227f0be82256b9f4a94140cd90dadbc35b63d67ee747ae27ef8eff4dc423d861e95bfa570940a66e406304f4032b592c55b405e98f1f901c2f215ad086e211f96f494a899a55faefad7983c0ef3298fdc2d87316cd521a1b34d41481b90ca205dde245e7ece4fa8f6cde8253cedc05e5298effaa82b5e9df384cb6e3263a6bfdbb37ec8dcb8e1a2138e95f7cde886e6572eadf7c7a4f99ea7b77729f0df7ce1614b1fd528a2585fc348f64e87e6789bc13e19ba828ae321e772335a034e27c3be2435e69a8ce2890014ecbf99cd298c66195507a4749fc240b127e63e613138b8129618930d7c9a930f89651010c5fca981e0c31884769182c9398064de8b6a4859f8dc5d036f1dd929bedc26e5e7c99d56665e36afab7088280ade66e66391525676d42762abd4db337b3687e19f32c076701b2e04ae02a97743dcb221eeba268d3adf886b80644235d762ba40676146209e635df8328cfd375b82d8c9af2b730153a638fc8e1907c477eb4e5313560715fd714b2ae4365785990f5190a105675e123124c8a3504981598a2c02d571406ffb0c3a2a60cf6def42a5c61043670bdc1f250d54f1d0a32dcd15cb7fdfe7af60192ed185ca308cd4a6a38869ae779345f1ac893d8f13faf026485f633a2390a6080b2390cbc7b7b729cadf28c4160434c7dd563a841e23d4be27347138e318def7e1e8dd2b7b7a5b0d666d91550c7e80825ef55381c591002c3678830fb75ad3e2413d90ed89049ac6374f5314a7b58ef75838441c161ef3963362b453d6dcd8321d1762461a44dc132bae3e4781915afaf1854a739e5622d0de581c74fd5964d9dd98d3322f8ba050b124593d6c2bd8cc472bc8aaec38311f92f79a82c21214ed8af6b418b3f3301e5cabea78771a050f5221eba1c5a946bc5b593869ab10f6d0bac95f886405e9f2f4948db54eb28e5a0af081e40d71a963b3d3a6a907331d80e662e50438d7de8734ebbd36c86b15d9b557589bdf769b3b7f493db4cf79afd2354aea22cac708fc3cdc4854558b6b0a312c2415c3a8276b564315d240c8a5a7fa2873a925dc21e6781997d7ca9d1400db6815e0876f13748a215f3a9c8f21c287b31cb130fa1624c8091d94346ce6f5757e0f2efd9c1f95864ef80003f06d340b279a426c02eb342f0f07038b5e5d0cb8fc8009b5e287d06e4efbfc976f4244ee9a0298b9a06371b9070b0e5120f51de503e87fc115d506d984764f0dd70e09556abc410a899dcf3ec180adf2f606fec03f613b6c83e83c525ee181b4efec9ac6e992e48c048dde4f5b60cda4ad82dae42b94137ba9c27ab88afbde8da546adbd6f695cf6e6048ef3baa7753d9eaac52260a89ffa01f56cba0f95ca8534648535ed7c1fda6484c7c00060fd3a66e651a9cd3240d818a3f58e2699f2758e2f0f1c2ea6f90590cfe00e7499a7ac1f815fc3d79766e7b20023655538d8fb1964ca9248b3a044df89269e52d278ca0428246a62214cf86db97e9a04542dc364db29098be1b36317604a2e0595268d9eb00ed51ebc91c45fa372835bbbcad3e753f751ba5ada0c42cdab5e506f0af565d6e90eca5333718eed49919165d95e1c1d717d698664c2a4d9fbb75c5f69f3bec6da8fc1f13a111043af354bb28efe94e33203336a7d2d18c07312d6c6a888f941780dbc7dfe7544f9a40de7ddf4ebb879d5f452b7a2bed007c0b4f26480737b6c855450b9de04ffe14289649f1cac769d309ab27638d75cdc3555d836868bbecc0a2594e8c53ca2ec4124a423ccff28a3b084bd55dc815766ddc640be495c70d80196afbe957a2591a27c238d16f397a0b836fab676e7d4f3de509f9d05b2f461fe96e92de479a8d63520b68fc3a97fb69ac9e39e8d0676d3917ea54f07191a7890883114a16e546bb7b0d0c557abd1e0bc80de0479e0e3acf0ae7bc0b48813afe77fafad5b8904f3693c53ab438198ec8cd9246316cddc7e42638ce18f023f6ff04d70c40a5781aab9f494c3e14190b3616619f450678aa3e68ebb8e58178abbeadc377fb3140db197eb1ccae82ddcad04b2dc81dcfab3d3e8afebc2b4655684bce41937ac58331342f94c5e1cd6654ed0e97152401c23dbf06aff0eac0023ba5e9429d3d36d285952d5c79b78c8deb2762e0813a2c20a67a78fc214b183825f1e80d819f0327191f3f002778c325d35690439b556abbd38eb52d10c5b163809d9abf31650492f19a452ba0b9e9a17dff46b7d5ef87f9f2ca81468f0adaad1f1f45e72198f9d8afa192dd4fb17c7a30a29fca688b2415d47c84d1565bb0caa7bfd93ab5e9be6ab6e558d18ab7af3c7c180757f2bc1c53a43a33578f43fc478c724e9e84367036267a48790f499bd2ba9adf91b3fe8994d1f058ccc09dfe6ad42c2312678c8e4832bdada0bd7c7e5b19b9ba77a0ea40db2c73c003d2684ec3099900c30190ab47f6ab119dbf1d9c7594f285e13bd6073511d49dab1af590483e4120097962ef515575c2c4a347be66d8843d4bcecd56c5564ac7b3bd6af156e2a903aa39b7d360f599711a5df66892d5a32ec0d4b2a595c479592c433735b7c4b47191711156fd69c4e95d43cfd7b01333b1a4bce2b3ad3233bbccd638de3b8c636de206ee9686ab33422450503543f91dbc9a354c048e3975dc9ef5ecc90de1cfd879bb8b7a64968fb0b02de8690af5c8cbb5455b0747c77f26d0be3e75ae5deeb4c63ca5117f5e3d61eb2cc1ccbb9c169f6736d7bab7dd2787e792ad9d094aae9b484e023f970b9e409d9dae5d77864d64b2bacdf9b77716799462Line truncated
bs, _ = hex.DecodeString("1f8b080000096e8800ffd41c5d6fdbb6f6bdbf82f3ba496e1d39192e868bb8c9b0a5dd90dbb50d9ab52f411e648bb6d9c8944751498cccfffd1e7e4822454a569276eb0c6cb1c9c3f3cdf341511d3ffb94a784723465d94d8ed921e2acc02334cb2827b4c0e5ef755ae4e23ff51b3d1b3f193f5ba4d9344ed1d343348fd31c8062ba28d298e9df02e84950c0979c3332e3c1e4c993eb98a17c43677c49e8021d952ba2559614290e836a2e18a18bcbe1442e28583a8d01cd110a18ce259e0a2e128cb22c4d310b83f372f484b31430cc0bf84d328ac2a7f92c5b03874f979caf87e8ee09828fc0bd66f8fa65cc05f2fd4935bac0fcdd6b1812b2d6a38278ccb8e25c8a089c8849855db042b1249803c0dd76d2989c93853bbeda9cbe149205d628cd122c905c5c7a909c5221a8c59e9ec78c65ccb32ec798be12732e25d03c4e5db6185e67a514727c3c46e76046bac8d114cf3386d134cbd21ca5597605239c636653e45c02032f72fc8e248728f89de41c534004d6010967e02bd26ae88c653c9b65295210e8e7240175e7380740be59831f061cdf72f8a5ada01c713b3290bf896fcf314d5e4fd7b981fe5dc11799b0d97b61e6dfc98a7014befe659d0f6bd4b4584d31eb44fe1ed0c5f494829cd7717a6e105033a89c42e1bd316bc7f123d7930fc77f16b318f647fa1eff590090a91bd01802fdc04a9a4815d520fdf1039293256c64dc50bc40fe2b493152b34affbd356f10f84dc6999f297d45e3698a1383869a423097c15ec7355ee19c9d5cff9ecd5a70ca9987a03c17e3bfa8386afab71846f5b889ce5affe18c9eb9eca8112426fd8b2fed28b428c8b97ff3e93d65aaefc3e96336dc075b5081ede7822f31a48e592c03ef074be49d08cfe23cbfc958d28dd480d288d7f5880f79a9a12a1f407c3f2f66338c139c84653a101f3247e13732fa9ba3867609253c1c4eeca930f896620e0c5cc9201b0c45548dd330589204070d6837b788cfd662a1ce34f764a35ed8cd842f95d9ac6c5d95fd1ac36e76f5d5ce2cc3bc60b44d48bf9adb7479378d675709cbd6606ea007ce00c6bec29b6916b344571cdb1655770958e5bb39c8b114c055d160f2260b870810866535f21c05e37c037b67053ce6c29bf23cac1727318f9bc2d96e37f11956610436c47a83e5a1caeda19f3b8dbc3490b9aefefe6efa09f248043acb4333cb0f2348e7afe2d9d2404e12c7305e05c8eae12781e62880014c6730f0e1fde949b65a6714f6acc0d4573d861a24de0b925c3a9a684a657ef7f3689465bd2d25ca3d9add0075511c423976130e4716044f603214307b551139446374b0bfbf6f439244879ff263d49cb0deeb0684422ead6bd2c66c56f06ada9a07430adb2142519b8265841393d132cedfdd5028bcd698f18d3494075e7cca6660e2cc6e9d11ce362d58045161d24ab837315f46abf836dc1fa1ffa267ca1212e294feb2e138ff23e39089f73cf5b5032554cf93a1cba145b9525c3b692887fad0b6c05a896f11a4acd91285b84db58e52f6fb8ae00174ad61b9d3f3a306391783ed60e60235d4d8873ee7b4bba06618dbb5595507d37b9f36fb1e3fb9ede449b3b781a28c17b915eec57033b789fa229bdb5149c0415c3a8256aaa0099e130af59a3ff5418944af608fd3c0cc3e16051735d806ca7cd8c5df0812ad98cf79b65e03652f66d9677315630211993d64e47cbdba04977f2ff62f239e7d0002ec044c03c9e6b99a00bb4ca19d0f0f86135b0ebdfc080d443f07c5c000fdf517aa474f93140f9ab2a86970b3010a073597a2bb3fc36c06f9235e606d98e768f0dd70e09556abc410a899dcd7d9490a35e297b7b72871f7089d675fc0e21277227a29f6d9ac6e992e2060a46ef27a5b066d455d8d2b576ed08d6ecdc82a661b2fba3695dab6b57de58b1b18d27b9be81e65ab1332992824fefd7e582d83aea1f73f121090a6bcae23f69b2231f601183c4c9aba95697086491a02157fb01427519e6029864fe656c52f9815c11fe03c49532f88dec2dfd39797b6070ac0a66acaf148d492299664850e4113be645a7acb29454221412353212c4e24db97e9a08542b16d9a6421317d376c62ec0844c14b926bd9ab00ed51ebe94c88f46f506a76755f7dea7eea3e4a5b418999b76bcb0de05fadbadc20d94b676e30dca933332cba2a13673a7fb3c634635269fa48a92bb6ffd4616f43e5ff98088d20d099a7da45f988779a413063732a1dcd7848d0c2a686b8c62c07dc3efebea47a520279f7633bed1e767e1baff0bdb403f02d3c99201ddcd82297152d74823ffa53205f92fcad8fd3a613964f6d1aebcc0319a306d1d076d9218a663911a5982ef8124a4274d022ee202c54772157d8b571932d90571e370066a8ed275f89667142b87158dd72f41606df968f93fa1e07cac3dfa1b75e8caff16e92dec76d8d63440b287ab796fb2952c7e93af4595bce853ae72ccad729e161301292c56ba3ddbd05864abdde461c7203f891a7835e67b973de05a4401dff3b7ff736cae5433b32df841627c311ba5be23881ad7b88ee82938c023f7cef0f70cd00541aaf812d75dc3efe946734d85a847d16198873e6415bc72d8f885bf56d1d47db07e36da7daf932bb09762b432fb520773c4bf5f8a8f0e75d31aa445b30069ad42b9e46d0bc609a8477db51b93b5c56040910eed52d7885570716d8394ee7eaecb1912eac6ce1ca5b3316550f7bc00375581098aae1e85346283825f2e84d00bf024e32163d0527386392692bc8099b956a7bd08eb52d10278963809d9abf33650492c986c62ba0b9eda17dff46b7d5ef87f9fb95038d1ee6b85b3f3e8ace63217930ec57c9eee73a3e3d18d14f65b4394939361f61b4d516b4f4e96f6aa736dd57cdb61c2b5af1f6ad870fe3e04a9e978b14a9ceccd5e310ff11a39c9327a10d9c8d891e523e42d2a6b4aee677e4ac7f2265343c5664e04e7f356a96114a328a47884cee2b682f9faf2b2357f70e5415689b650e78401acf7038466360380072d5c85e39a2f3b783b38a52be30fcc0faa0222274e7aa463d24924f1010412fec3daaaa4e9878fedcd70c9bb017e4d26c556ca5743cdb2b17d7124f1c50cdb99d06cbcf94e1f8aa4793ac1e7501a6962dad245e17f9327453734b4c8bf28cf1b0ec4f63861f1a7abe869d98f12566259f6d9599d965b6c6f1de615cd4266ee06e69b83a23048182aa19ca1fe0d5b4612270cc89e3f6b4674f6e087f412fdb5dd423b37c8425da829ea6508fbc5c5bb4757038fa8340fb7aec5c09dc698d598a63f6aa7cc2d6598299f70c2d3e2f6cae756fbb870e2e255b3b13945c37969c047e2ee78c409d9d6e5c77864d64b25ae7fcfb3b8b3c4a31f385df65725955c3ffab4430ab02e3a879f621e686c38ea61af0b43455ebac8fc39470f6a50f5f6f2c12e67b98bd5faba357d4ad4e0e25a938f996a68000b5edea7d0c246501e5dc46712a28cf5a8be845b9612fLine truncated
gr, _ = gzip.NewReader(bytes.NewBuffer(bs))
bs, _ = ioutil.ReadAll(gr)
Assets["app.js"] = bs
@@ -63,7 +63,7 @@ func init() {
bs, _ = ioutil.ReadAll(gr)
Assets["favicon.png"] = bs
bs, _ = hex.DecodeString("1f8b080000096e8800ffec5c6d73db3892fe9e5f81b0ee26499d49d97999db72645565eccc8e6b6792549cdcded5d67e804848c4980438006847ebf1fdf6eb06f82e52966429f1dece075b24013480c683ee076083e3c767ef4f3ffdcf87b7243669327934c61f9250313ff198f08898fb34cb4e3cbd10a189b998db47a11446c92461eac4bb28534e8d4a3c122654eb130f3325925e7a2892d168f2889071ca0c25614c9566e6c4cbcdccff935727c4c6643efb2de75727de7ffb9fdff8a732cda8e1d3848158a891092875fef6844573d6282768ca4ebc2bceae33a94c23eb358f4c7c12b12b1e32dfde1c102eb8e134f17548137672141c2e098a980e15cf0c97a2216b291bcd4d2cd5528e848b4ba258021a836413e686f01025c58acd4ebc19bdc2db2003454e1e6101c34dc2269512c9efe4e606aef43b19b17750d3d367b7b7e391cb5555e0844da534da289a8d42ad47d55d907211c013af688759244cc78c19d7427b4fcc22834e18f6c560619b42c854460b72632f09c968144183fca93446a6c7e43f0fb32faf8bb41974da9fd194278b63e2fdc4922b667848c93b9633ef80540f0ec81b05da3e209a0aed6ba6f8cc89b87d647fe2a303123f87bf17f0f712fe5ec1dff75513ee5d4d21e29af1796c8ec98bc3c356f534981a51d586caf023164a4571f08f899082b5f2e7c97fc4afaafc2955732e7c23b3637214bc62692b6f60c5a552489dd190f5f7a94aee14a580799c6411139a4513636790511344f0722a0edb70ea0c70319c5a498e564aee4dad244755efa652454c399d2ca9cf56468c828bb6d269c2e7a0ef10e611536d5524722e3b1a3f2687afdb186d3cb135fbaf6aa8665273379c301b6060af3abace949c2ba67555495c80e5f9512da418ea722a701103c6cc80a0eaca9f5255898579cbfc3ed916109aff83018a9e978f4ba12118599a81b6fd2baed11256f222aeb3842eda6a6e9759ab3817d8b28ed2b936be90fe3407136f1a5d80c7d67cf8683e5cd59d82808f244fc5503dfe3491e165a556d0a9b5cb605dcae953295b39551dd509531a5ece95cc4584b54805433a9f3e7dfee2fb03f2fce521fe3b7af6ba0d4445239e6b98f90d4094988131202fbb630c63038f1be3d0e917cc56114414dc40c70c246c06ad3daced40ab7b4787f5e326e46d275fdfadab52c1a55bed870179cc53f4815474b029e81560d1c79afbcdd7cb6687c7233bc8e0b947ce753f1a5b4360fdd563df279f644610dbbeef9e81f8caefdb9a485921642c2e2336a37902ee197803b3f9f8dcdad9c2f78c235e09419f4a4103aa4843af057a6fd7e14f1515913719f3745ea6a0b5f0885621ba3d1feffca3e77fb2de963836e0bd78ee1553dc5d8f26a472be639dd224990cf8609708bfd094aa5d8d5617cdb2435a373ceb24e31878c4faf313ef134f199133e05bda58264143030d05fb885867b67b45b5560176f8adb49b27cebfe486454f8ea147549929a3869c9c90c3db8a86cd93451623e320d5956ff37a6547a0ab58fbe70c400d26e37782bfc74f7efae9384d9f34bb9d555d9ae66006454121dc4d55213a54f8f333c501600b7badd3120470e7f863c2c34b2098113717cc1850bd7efacc9bb446b9afe9a19cd70d2f4b8e47ae0d55fb46302805a8cacbf1085ae0c03a8033971fd1fd2357301a4a5e1f102992050122772d089f11c142b0ead0abd7e423d306b448aea912c8da8a995088871e72e0678f41fe8ccfcf0502acd21008f6fae00306c64f23c06b95da4e873eb384d8ff7e516d23674f5e1ce8c8e61ac72fda29167edea4ecc53bc62216c16c7f3169286f482cda8256cd88f2c9a79811d7dfdcf12712534da68c81cda457802c182430528600c4f915622da8271e49735479d11c23ab4cc81940efd76dd141038d9d111f6a347295863dd900c9805efc29ec17c9c0271673bc81e4a2e96b8118b83b648f6b2057c320afbb58ee814902d377c6bf783d43d57ed0ba5d9e144b8067f33c01d30df8ecc0b905dc521e16fcc82cbb9230cf911b90a768efd1113eab25f482fcfb35305e3a8c7b63bc682367fa3e08cf93cac9200dca85f5919105816219985e444126c17913fcfd1972211c5a52ecfaadfba8e3dddaeb066f727383e28233ae5888aab636b9e182ba620ae39382ef4afe668b9e9ffd3de0e20a284754a13ba15386ebfc296a1a56fb38376e6efa0bada8b1a3958a332ef57bb0efdd11a8a856e5241b283b3feb153ca043f48da46f061a5abb9175c421dfab06e2fc6c581fb664175f5bf413775b622505ff8733a5601f4cae77d2f750a629acb336ef7f837ca01e4ef1f269a19167a5762e6c43abc75b6a6a3cea47ca9600fa7322a734b1b3b2d0ef8c276c37ea9c836cb615983a736d6e1bf923360c48184daee942bfcbd32953b7b7aebd0764a0d00f0b630b4db9a0681f7ed80b3c7f96e1be9418cb74273a4cb0891baad096d98d06770cdbcfa23603a0b8dda91b569079e447c06a612919ed42f10208e4867ac722fb05ee6eace5369e624c8b1ddaee62074dbc358eebf0c48c899027354d7c0b02c623bab2391b62733cca932586b294b39b6b2f74bbe6d5a49f79377549a3c8aa722d3526e8394b25be89a2066ddd37dd6e9265dc4c68d064dbd507c493b1799b12e4b6d6e257930f8c29524a7ab505831650f6743647122d61e9a7acac1dd16851eee61495ac60275f85d75a40009271ab7827c60a5f0d6d65cd51213031d41a9ab132b6a510b6c70f90dbba2d59a707c76b6b4594fa2998ed3d35b4638a7056f870a2a8610f851b8018014b55185bfdb7425d018ebc5b514e33f4f829338a87b7b770b717a47dcef6a1963cdb8b52646e76a3951da3cb4ed72ba674bd4b7f3f2d6ebbee4685fd17db9b797a804411555f75f79f8f2b2e11834f31d79618dc9f17942f66fe9fb282d35c29f061e4e39b5f486e7852b8c9ddccbf78abe9a717dab034809fe65a0d5bb817db5d6ae0f4c3e7a606c8d3a343a297077d2b45507da9efa38b30cb3f3085010b9d152fdc0a200a8a26c747b7b7ff8e9d7808a6bc451470016268b21b55ee80307c0352b00715dc831c7c630250bc3128a00d7d7d2384cc45c8deff853c3e21b980252617acf1f260688b9516058966ea6a69fdbf9d76d1c4c652892d59bdce437c6bebadeaa537796f232eb6aaa0787b52bdf41da86036bbab863f78cb37e72d2b2af9167b5c25cdd9628fcb71adafb0bbe5aedd16d7a8fdee181fbd554a2add1f1fc130cdbd270d1226e626261372f8100325de49c34376af0089269b858e23936df4bf8af3b9b981a7818d0b2a42713c8cc439060b767b7b5c46e3909b9b99e24c44c9c2ed906121ab6a4b5ff71f1cb111922dca1c10b0a7effff275a31c5a08ad427eaae0357cfc830dec5c2fa6ad0c04296ea1912c2a224349cca38809ff8b5e2fa8ad37360c2050acb95b43d9587c60d38a128dcb76dc99f3f960a7db35d82dc2c276Line truncated
bs, _ = hex.DecodeString("1f8b080000096e8800ffec5ceb73db3892ff9ebf0261dde5516752761e735b8eacaa8c9dd949ed4c928a93dbbbdada0f100989189300038076b41edfdfbedd00df22654996126fed7cb04512400368f4e3d76083e38767ef4f3ffddf8737243669327930c61f9250313ff198f08898fb34cb4e3cbd10a189b998db47a11446c92461eac43b2f4b4e8d4a3c122654eb130f2b25925e784892d168f2809071ca0c25614c9566e6c4cbcdccff935717c4c6643efb92f3cb13ef7ffdcfaffd539966d4f069c2802cf4c804b47afbe6844573d6682768ca4ebc4bceae32a94ca3ea158f4c7c12b14b1e32dfde1c102eb8e134f17548137672141c2e118a980e15cf0c97a2416ba91acd4d2cd5528d848b0ba258021c836213e686f01029c58acd4ebc19bdc4db2003464e1e6003c34dc2261513c9efe4fa1aaef43b19b177d0d393a73737e391ab5575e0884da534da289a8d42ad47d55d907211c013af188759244cc78c1937427b4fcc22834918f6d560635b42c854460b726d2f09c96814c180fca93446a6c7e4bf0fb3afaf8ab2194cda9fd194278b63e2fdcc924b667848c93b9633ef80540f0ec86b05dc3e209a0aed6ba6f8cc91b879607fe2a303123f83bfe7f0f702fe5ec2df0fd510eedc4d41e28af1796c8ec9f3c3c356f734981a51f586ccf023164a4571f18f899082b5eae7c97fc52fabfa2955732e7c23b3637214bc6469ab6e60c9a552489dd190f5cfa92aee34a520f3a86411139a45136335c8a8094af072292edb70e90ce462b8b4a21cada4dc5b5a518eaad94da58a98723c59629fed8c1805176da6d384cf81df21e811536d5624722e3b1c3f2687afda32da78627bf65fd6a29a49cddd728236c0c25e76789d2939574cebaa93b810966747359162a94b55e0220619330384aa2b7f4a554516f496f97db4ad4068fe0f0652f4ac7c5c120dc1c8d20cb8ed5f728d96b0a217719d2574d16673bbcd5acdb9c0917598ceb5f185f4a7399878d398023cb6e6c347f3e1baee3404f948f2540cf5e34f13195e546c059e5abb0cd6a5549f8ad9cab1eaa82e98d2f062ae642e22ec452a58d2f9f4c9b3e73f1c90672f0ef1dfd1d3576d415434e2b906cd6f08442933b006e445778d616de071631d3af3026d154144c10d74cc40c26630dac3da0eb4a67774583f6e8abc9de4abdb795532b874abfd62401ef2147d2015a61efe7864970cfcf0c839e20763abd6d6fb3cf47df249660425d5f7dd33412f2b2f4e2fb1c4fda0569797119bd13c01670b2880d97a7c6ead66e149c611af88a087a4301f5594a10f022eb6fbf0a78a8ac89b8c793a2f4b50f73da255884eccc73bffe8d99facef24ceb77bcf9f7985c2baebd18454ae74ac539a2493018fea0ae11786528d6b9a83828bc239ba9b0ad1a0ab803f3f531c967c61af754a32d01127ab256fa0c081a484871780a2226ece99313022fde429ccb039f979b2c8624404a4ba0249036c500c8c942dc723379c82bd23e0aff5e623e8d42ddb00c75d7d5ce79fb8d20616ecea8048912c0800942b41f88c081682b58239bd221f99365419724595403452c844411e26c501773c04fa333e7f2b90d5157f8070bdc0adc1247e1ac1ca55a5ed7298264b88fdef17dd366af6d4f5518c6dad71fcbc5d626192372967f18eb1884520f7cf2715c786c9a256b47a864ad9e453cc889b6fee700189a92653c6c016d04b30b2b02ea07c86d0109c0b352c0a6a1124698e2c2f86636455097d21f0fdaa4d3a188fb2d6186f1f34fae086666d20c720bbf8536872438e9bc25b0c7d2db9054c0ad5e35a76ab6590576df1ed9b4e9830aa66fcabd7b354ed07addbc64d71b924f06c9e2760c4403e3be2dc12dc921e36fcc82c6a90a0e5e8f3c813b47c68e09fd6147a85fc873564bc349d7796f1628c9ce9bb48789e54e616dd7b2eacb788ac102896316a500a32094e89e0ef2f500bc5a145c5c625dd471d3bdfc6c3dee4fa1ac905675cb110596d8d72c31877c914c627052b9efccd367d7bf6f7808b4b70a55125dd099d328c5fa7c86988625137aeaffb1bade8b1c3950a0b2dcd7b70eedd15a8208447ec0a9e780d297b7bd64b788087391819d2a78186d69e631d728863aa85787b36cc0fdbb22b5f5bcc137711622505ff8733a5601f4cae7732f750a629c40f9bcfdf593b670960a4a778f9a4e0c8d3923be776a0d5e32d39351ef54bca9602f4e7444e6962b5b2e0ef8c43a8bf1376ce8136db4a983aba36b783fc090706488c265774a1dfe5e994a99b1b37de0332d0e8c785b18da65c50b40f3fee453c7f91e1be9818cb74273c4c70881bb2d0b6d90d07772cb69f456d068071bb6337444679e447806a21448a76c17801007243be6393fd0aee6eace5369e624c8b9dc76e7c8326de1ac7757062c644c8931a26be0102e3115d399c0d65733cca932584b254b35b6b2f70bb111ff623ef262f69145956aec5c6043d67c9c4d751d480adfb86db4db08c61750326dba9de239c8cc3db1420b7b916bf9c7c604c9192d2cb2d10b480b6a7b339826809a19fb2b47604a345b9af5174b2029d7c135c6b05022419b7407762acf095c756d61c19028aa1d6e08ca5b12d84b033be87d8d66d353a3e385c5b33a2e44f816cefc8a11d4384b3c28713450dbb2fd800c8080855616df5df0a7605b8f22ea29c66e8f15366140f6f6ee06e2f92f639db075bf26c2f4c91b9d90d57762c5d565d2f99d2f57ef5ddb8b86ddc8d0cfb1fb637f3740f8122b2be9aeebf1e565c02069f62ae2d30b83b2e285f51ec1d153c62a9ce5e7d1f6c709a2b059e8c7c7cfd2bc90d4f0a67b91b2d8cb75242bdd086a501fc3423361ce15e2c78c981d30f9f9b1c204f8e0e895e5efaad1841f585be0b2fc22cffc014be8eefc4bd702b002e289a1c1fdddcfc274ee23e18f4165cc030c4d06437acdc016cf80ed0600f2cb80344f8ce30a0786f508836ccf5b5103217217bff17f2f084e402024d2e58e315c2d0462b2d1a12cdd4e5d22ec076dc45131b4b25b6c4f63a0ff1ddadb76a96dee4bdcd27d8aa83e21d4af5ea77a083d9ecb61efe402fdf1dbdace8e47bec749560678b9d2e87b8bec11e97bb761b5da3f61b647cf44629a9747f9604c332f7b6344898989b984cc8e17d4c9778270d0fd99dd2249a9816268e78b6317f5c639b6e737d0d4f834f3c65e00e40d9d8b1f7f3719a1e8305bbb9392e9372c8f5f54c7126a264e1f6c9b09165b505b1fb4f91d84892ad943941c099beffcbb7cd7568496895f8532573e1e31f6ddae27a395e653a48710b83645191f748621e454cf85ff57a495e5927c30b6d35e28122f26e2d6523f8c0a1152d1a972e33a5c118307160a7db3dd88dc2c2766336f9f10898a343992bcd822a833d10cc8cbcc9799e61ae1c19919fa4ca5367979b8673b08b92113a6d76a6a1b73937713e0d42998e429aa4f1a8ea74a4182cbac6375dbf80dc6b0881dc830dfa5d736a21d09f4bLine truncated
gr, _ = gzip.NewReader(bytes.NewBuffer(bs))
bs, _ = ioutil.ReadAll(gr)
Assets["index.html"] = bs
+6 -21
View File
@@ -5,13 +5,12 @@
var syncthing = angular.module('syncthing', []);
var urlbase = 'rest';
var refreshInterval = 10000; // ms
syncthing.controller('SyncthingCtrl', function ($scope, $http) {
var prevDate = 0;
var getOK = true;
var restarting = false;
$scope.getOK = true;
$scope.connections = {};
$scope.config = {};
$scope.myID = '';
@@ -21,8 +20,6 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http) {
$scope.seenError = '';
$scope.model = {};
$scope.repos = {};
$scope.lastUpdated = new Date();
$scope.heartbeat = 0;
// Strings before bools look better
$scope.settings = [
@@ -46,11 +43,10 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http) {
];
function getSucceeded() {
$scope.lastUpdated = new Date();
if (!$scope.getOK) {
if (!getOK) {
$scope.init();
$('#networkError').modal('hide');
$scope.getOK = true;
getOK = true;
}
if (restarting) {
$scope.init();
@@ -63,18 +59,9 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http) {
if (restarting) {
return;
}
if ($scope.getOK) {
if (getOK) {
$('#networkError').modal({backdrop: 'static', keyboard: false});
$scope.getOK = false;
$scope.heartbeat = 0;
}
}
function heartbeat() {
if ($scope.getOK){
$scope.$apply(function () {
$scope.heartbeat = ($scope.heartbeat + 1) % 5;
});
getOK = false;
}
}
@@ -458,9 +445,7 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http) {
};
$scope.init();
setInterval($scope.refresh, refreshInterval);
setInterval(heartbeat, 650);
setInterval($scope.refresh, 10000);
});
function nodeCompare(a, b) {
+2 -9
View File
@@ -88,10 +88,6 @@
.ng-cloak {
display: none !important;
}
.navbar-text {
margin-top: 14px;
}
</style>
</head>
@@ -102,10 +98,7 @@
<nav class="navbar navbar-top navbar-default" role="navigation">
<div class="container">
<span class="navbar-brand"><img class="logo" src="st-logo-128.png" width="32" height="32" /> Syncthing<small> | {{thisNodeName()}}</small></span>
<div class="navbar-right">
<p class="navbar-text" title="Time of last contact with backend"><small><span ng-class="{'text-muted': heartbeat == 0}" class="glyphicon glyphicon-heart"></span> {{lastUpdated | date:'HH:mm'}}</small></p>
<button type="button" class="btn btn-primary btn-sm navbar-btn" ng-click="editSettings()"><span class="glyphicon glyphicon-cog"></span> Settings</button>
</div>
<button type="button" class="btn btn-primary btn-sm pull-right navbar-btn" ng-click="editSettings()"><span class="glyphicon glyphicon-cog"></span> Settings</button>
</div>
</nav>
@@ -233,7 +226,7 @@
<h5>This Node</h5>
<ul class="list-unstyled" ng-repeat="nodeCfg in thisNode()">
<li>
<span class="text-monospace">{{nodeName(nodeCfg)}}</span>
<span class="text-monospace">{{nodeName(nodeCfg)}}</span>&emsp;
<ul class="list-no-bullet">
<li>
<div class="li-column" title="Current RAM utilization">