From 0fa7bd127fc8bc9eab3e4533088a14d6dfe4a35b Mon Sep 17 00:00:00 2001 From: Dan Head Date: Wed, 14 May 2014 21:05:33 +0100 Subject: [PATCH] Update to v1.0.2 Change timeout to 30 seconds Add version info to settings --- .DS_Store | Bin 6148 -> 0 bytes app/.lock-waf_darwin_build | 2 +- app/appinfo.json | 5 +- app/src/js/pebble-js-app.js | 24 +-- app/src/minewatch.c | 18 +- httpdocs/.idea/workspace.xml | 171 +++++++++--------- .../main.scssc | Bin 0 -> 37282 bytes httpdocs/config.src/body.html | 13 +- httpdocs/config.src/build.sh | 2 +- httpdocs/config.src/index.html | 22 ++- httpdocs/config.src/main-min.js | 5 +- httpdocs/config.src/main.css | 2 +- httpdocs/config.src/main.js | 18 ++ httpdocs/config.src/main.scss | 7 + httpdocs/config/index.html | 22 ++- httpdocs/index.php | 11 ++ 16 files changed, 201 insertions(+), 121 deletions(-) delete mode 100644 .DS_Store create mode 100644 httpdocs/config.src/.sass-cache/fbbfd24a85cf759959729bf58a2b088cc49edd70/main.scssc mode change 100644 => 100755 httpdocs/config.src/build.sh diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index a22a95961a99096bfab733c59116aaeceb050534..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKOK;Oa5S~raViO61gm~P1qlg4KZ9;M*3Iz#qK?KnQMIo-E#*$@6u|p0aB1fKg zegUsDKZ74o!H)^w>@LtWsZ^;Fs$j>O{bpxpAM-iu%@UDl4*fDwfru<9W9~GHCBp5j z3zE?u8z^{;c*hH44>canh+)7maMBszy_=;D^{Ib1oZG*5(6ROR)QrF!RnQU%l^^|4Xc{_jRZ2n2B7mr$LCmklu&fqcE?sw9jr|pMv9R9XD-lL#9 zY8TGmilej>MBRbx9Qa*?Y;OgTACH>xF!Gb_mU3ap>QRcPPd>%8L&-dC;sIiqwv482A$}i$-%l8U7slgC(Wz85c=*QRClyDbo^AI>P|w=jB)hL!jjD-^wmQ+y53M|O2dF*V4i`jsuuYC zzkT@qf4-Bc83qgk{}clvx7pfkA|-vcE+ofitpj}uW#PD~LfHj{K8~fqNAV@76tp>P X02>;o3gLm6KLU~lQy2#RDg!?OV&(J5 diff --git a/app/.lock-waf_darwin_build b/app/.lock-waf_darwin_build index 169f48a..d17b671 100644 --- a/app/.lock-waf_darwin_build +++ b/app/.lock-waf_darwin_build @@ -1,5 +1,5 @@ argv = ['/Users/dan/pebble-dev/PebbleSDK-2.0.2/Pebble/waf', 'configure', 'build'] -environ = {'TERM_SESSION_ID': '0E771BB8-6D47-41B3-A896-1B67A6BC492D', 'SSH_AUTH_SOCK': '/tmp/launch-mBweRR/Listeners', 'PYTHONPATH': '/Users/dan/pebble-dev/PebbleSDK-current/bin/../.env/lib/python2.7/site-packages', 'VERSIONER_PYTHON_PREFER_32_BIT': 'no', 'TERM_PROGRAM_VERSION': '326', 'SHELL': '/bin/bash', 'LOGNAME': 'dan', 'USER': 'dan', 'HOME': '/Users/dan', 'PATH': '/Users/dan/pebble-dev/PebbleSDK-2.0.2/arm-cs-tools/bin:/Users/dan/pebble-dev/PebbleSDK-current/bin:/Applications/Android Studio.app/sdk/tools/:/Applications/Android Studio.app/sdk/platform-tools/:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/opt/X11/bin', 'DISPLAY': '/tmp/launch-FHtlTI/org.macosforge.xquartz:0', 'TMPDIR': '/var/folders/5l/h8wjt5t52cs2n6h7zcd3kw040000gn/T/', 'TERM_PROGRAM': 'Apple_Terminal', 'LANG': 'en_GB.UTF-8', 'TERM': 'xterm-256color', 'Apple_PubSub_Socket_Render': '/tmp/launch-BrNYWU/Render', 'VERSIONER_PYTHON_VERSION': '2.7', 'SHLVL': '2', '__CF_USER_TEXT_ENCODING': '0x1F5:0:0', 'PWD': '/Users/dan/Workspace/minewatch/app', '_': '/Users/dan/pebble-dev/PebbleSDK-2.0.2/Pebble/waf', '__CHECKFIX1436934': '1', 'PEBBLE_PHONE': '192.168.1.147'} +environ = {'TERM_SESSION_ID': '3CD8238C-58C7-4290-8ACF-B40F29CAA6DF', 'SSH_AUTH_SOCK': '/tmp/launch-6iGfhV/Listeners', 'PYTHONPATH': '/Users/dan/pebble-dev/PebbleSDK-current/bin/../.env/lib/python2.7/site-packages', 'VERSIONER_PYTHON_PREFER_32_BIT': 'no', 'TERM_PROGRAM_VERSION': '326', 'SHELL': '/bin/bash', 'LOGNAME': 'dan', 'USER': 'dan', 'HOME': '/Users/dan', 'PATH': '/Users/dan/pebble-dev/PebbleSDK-2.0.2/arm-cs-tools/bin:/Users/dan/pebble-dev/PebbleSDK-current/bin:/Applications/Android Studio.app/sdk/tools/:/Applications/Android Studio.app/sdk/platform-tools/:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/opt/X11/bin', 'DISPLAY': '/tmp/launch-oMwao1/org.macosforge.xquartz:0', 'TMPDIR': '/var/folders/5l/h8wjt5t52cs2n6h7zcd3kw040000gn/T/', 'TERM_PROGRAM': 'Apple_Terminal', 'LANG': 'en_GB.UTF-8', 'TERM': 'xterm-256color', 'Apple_PubSub_Socket_Render': '/tmp/launch-YAZ4GK/Render', 'VERSIONER_PYTHON_VERSION': '2.7', 'SHLVL': '2', '__CF_USER_TEXT_ENCODING': '0x1F5:0:0', 'PWD': '/Users/dan/Workspace/minewatch/app', '_': '/Users/dan/pebble-dev/PebbleSDK-2.0.2/Pebble/waf', 'JAVA_HOME': '/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home', '__CHECKFIX1436934': '1', 'PEBBLE_PHONE': '192.168.1.147'} files = ['/Users/dan/Workspace/minewatch/app/wscript'] hash = 4672844372416070989 options = {'files': '', 'jobs': 4, 'verbose': 0, 'nocache': False, 'progress_bar': 0, 'timestamp': None, 'distcheck_args': None, 'top': '', 'destdir': '', 'keep': 0, 'zones': '', 'debug': False, 'prefix': '/usr/local/', 'download': False, 'force': False, 'targets': '', 'out': ''} diff --git a/app/appinfo.json b/app/appinfo.json index ee52f64..78fd6b3 100644 --- a/app/appinfo.json +++ b/app/appinfo.json @@ -3,13 +3,14 @@ "shortName": "MineWatch", "longName": "MineWatch", "companyName": "Daniel Head", - "versionCode": 2, - "versionLabel": "1.0.1", + "versionCode": 3, + "versionLabel": "1.0.2", "watchapp": { "watchface": true }, "capabilities": [ "configurable" ], "appKeys": { + "version":0, "response":1, "update":2, "dark":3, diff --git a/app/src/js/pebble-js-app.js b/app/src/js/pebble-js-app.js index 1750404..d3c4f09 100644 --- a/app/src/js/pebble-js-app.js +++ b/app/src/js/pebble-js-app.js @@ -1,4 +1,6 @@ var config = { + "jsversion":"1.0.2", + "pblversion":(localStorage.getItem("pblversion") || ""), "dark":((localStorage.getItem("dark") == "true")?true:false), "notify":((localStorage.getItem("notify") == "true")?true:false), "flick":((localStorage.getItem("flick") == "true")?true:false), @@ -35,13 +37,7 @@ var sendResponseWithUpdate = function(obj) { return; } var req = new XMLHttpRequest(); - req.timeout = 30000; - req.ontimeout = function() { - if(!obj) obj = {}; - obj["response"] = "TIMEOUT"; - Pebble.sendAppMessage(obj); - } - req.onload = function(e) { + req.onreadystatechange = function() { if (req.readyState == 4) { if(req.status == 200) { var response = JSON.parse(req.responseText); @@ -78,13 +74,15 @@ var sendResponseWithUpdate = function(obj) { obj["response"] = "InvAPI"; Pebble.sendAppMessage(obj); } - } else { - if(!obj) obj = {}; - obj["response"] = "TIMEOUT"; - Pebble.sendAppMessage(obj); } } req.open('GET', "https://mining.bitcoin.cz/accounts/profile/json/" + config.apikey, true); + req.timeout = 30000; + req.ontimeout = function() { + if(!obj) obj = {}; + obj["response"] = "TIMEOUT"; + Pebble.sendAppMessage(obj); + } req.send(null); } var getSettings = function() { @@ -101,6 +99,10 @@ Pebble.addEventListener("ready", function(e) { }); Pebble.addEventListener("appmessage", function(e) { + if(e.payload.version) { + config.pblversion = e.payload.version; + localStorage.setItem("pblversion",e.payload.version); + } sendResponseWithUpdate(); }); Pebble.addEventListener("showConfiguration", function(e) { diff --git a/app/src/minewatch.c b/app/src/minewatch.c index 46562a9..80e621e 100644 --- a/app/src/minewatch.c +++ b/app/src/minewatch.c @@ -4,6 +4,7 @@ static Window *window; static GFont font_xs, font_s, font_m, font_l; static InverterLayer *inverter_layer; +static char *version_number = "1.0.2"; //TIME/DATE static TextLayer *time_layer; @@ -13,7 +14,7 @@ static char date_text[] = "00 Xxxxxxxxx"; //REFRESH ICON static AppTimer *timeout_timer; -static int timeout_length = 15000; //ms +//static int timeout_length = 65000; //ms static BitmapLayer *refresh_layer; static GBitmap *refresh_icon; @@ -59,6 +60,7 @@ static int progress_width = 0; //KEYS enum { + VERSION = 0x0, RESPONSE = 0x1, UPDATE = 0x2, DARK = 0x3, @@ -100,8 +102,8 @@ static void fetch_msg(void) { //Make sure we don't request more than once per min (be nice to Mr Slush) if(current_min == last_update_min) return; last_update_min = current_min; - Tuplet fetch_tuple = TupletInteger(0x0, 1); - timeout_timer = app_timer_register(timeout_length,timeout_callback, NULL); + + //timeout_timer = app_timer_register(timeout_length,timeout_callback, NULL); show_refresh(true); DictionaryIterator *iter; app_message_outbox_begin(&iter); @@ -109,11 +111,11 @@ static void fetch_msg(void) { if (iter == NULL) { return; } - - dict_write_tuplet(iter, &fetch_tuple); + dict_write_cstring(iter, VERSION, version_number); dict_write_end(iter); - app_message_outbox_send(); + uint32_t appMsgResp = app_message_outbox_send(); + if(appMsgResp != APP_MSG_OK) show_refresh(false); } static void handle_flick(AccelAxisType axis, int32_t direction) { @@ -258,7 +260,7 @@ static void in_received_handler(DictionaryIterator *iter, void *context) { layer_set_hidden(btc_parent_layer,false); strcpy(last_update_text,time_text); } - app_timer_cancel(timeout_timer); + //app_timer_cancel(timeout_timer); if(strcmp(response_tuple->value->cstring,"TIMEOUT")!=0) layer_set_hidden(bitmap_layer_get_layer(refresh_layer),true); } } @@ -483,7 +485,7 @@ static void init(void) { bluetooth_connection_service_subscribe(handle_bluetooth); tick_timer_service_subscribe(MINUTE_UNIT, handle_minute_tick); if(flick) enable_flick(true); - timeout_timer = app_timer_register(timeout_length,timeout_callback, NULL); + //timeout_timer = app_timer_register(timeout_length,timeout_callback, NULL); } static void deinit(void) { diff --git a/httpdocs/.idea/workspace.xml b/httpdocs/.idea/workspace.xml index fba3dd3..5acb1d1 100644 --- a/httpdocs/.idea/workspace.xml +++ b/httpdocs/.idea/workspace.xml @@ -27,11 +27,11 @@ - + - - + + @@ -40,7 +40,7 @@ - + @@ -57,10 +57,10 @@ - + - + @@ -70,7 +70,7 @@ - + @@ -80,8 +80,28 @@ - - + + + + + + + + + + + + + + + + + + + + + + @@ -105,8 +125,11 @@ @@ -144,6 +167,7 @@ + @@ -236,20 +260,6 @@ - - - - - - - - - @@ -312,26 +321,26 @@ - - - - - - - - + - - + + + + + + + + + - + @@ -356,22 +365,6 @@ - - - - - - - - - - - - - - - - @@ -694,14 +687,6 @@ - - - - - - - - @@ -709,28 +694,12 @@ - + - - - - - - - - - - - - - - - - @@ -739,22 +708,62 @@ - + - - + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/httpdocs/config.src/.sass-cache/fbbfd24a85cf759959729bf58a2b088cc49edd70/main.scssc b/httpdocs/config.src/.sass-cache/fbbfd24a85cf759959729bf58a2b088cc49edd70/main.scssc new file mode 100644 index 0000000000000000000000000000000000000000..06731ef6817ba03a502ce68d5e0ca2afe687940c GIT binary patch literal 37282 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 QBPOkR3Y#t!r2*sr151%P&Hw-a literal 0 HcmV?d00001 diff --git a/httpdocs/config.src/body.html b/httpdocs/config.src/body.html index 42b8b72..01168f6 100644 --- a/httpdocs/config.src/body.html +++ b/httpdocs/config.src/body.html @@ -22,7 +22,14 @@ SAVE

Updates

    -
  • +
  • +

    v1.0.2 (15th May 2014)

    +
      +
    • Increase timeout from 10 to 30 seconds
      • +
    • Update settings to show installed version
      • +
    +
    • +

  • v1.0.1 (8th May 2014)

    • Initial release
      • @@ -33,4 +40,6 @@

      Contact

      Please report any bugs and submit feature requests to me@danielhead.com.

      Support for other mining pools can be accomodated upon request.

      -

      Like this watchface? Bitcoin donations, no matter how small are appreciated. My bitcoin address is: 1CCsuAXhEbLiL2a43x1yxuhk5F6hEt1EBQ

      \ No newline at end of file +

      Like this watchface? Bitcoin donations, no matter how small are appreciated. My bitcoin address is: 1CCsuAXhEbLiL2a43x1yxuhk5F6hEt1EBQ

      +

      For further support and feedback, please visit danielhead.com/minewatch

      +

      App version: / JS version:

      \ No newline at end of file diff --git a/httpdocs/config.src/build.sh b/httpdocs/config.src/build.sh old mode 100644 new mode 100755 index 550f40c..97155d7 --- a/httpdocs/config.src/build.sh +++ b/httpdocs/config.src/build.sh @@ -1,6 +1,6 @@ #!/bin/bash scss -t compressed main.scss main.css -java -jar /home/dan/.local/share/gcc/compiler.jar --compilation_level SIMPLE_OPTIMIZATIONS main.js > main-min.js +java -jar /Users/dan/.local/share/gcc/compiler.jar --compilation_level SIMPLE_OPTIMIZATIONS main.js > main-min.js touch index.html echo '' > index.html echo '' >> index.html diff --git a/httpdocs/config.src/index.html b/httpdocs/config.src/index.html index 224fffd..1bb7f25 100644 --- a/httpdocs/config.src/index.html +++ b/httpdocs/config.src/index.html @@ -3,14 +3,15 @@ MineWatch @@ -40,8 +41,15 @@ function(){a.config.apikey=this.value});this.el.save.addEventListener("click",fu SAVE

      Updates

        -
      • -

        v1.0.0 (11th April 2014)

        +
      • +

        v1.0.2 (15th May 2014)

        +
          +
        • Increase timeout from 10 to 30 seconds
          • +
        • Update settings to show installed version
          • +
        +
        • +
      • +

        v1.0.1 (8th May 2014)

        • Initial release
        • Support for Slush's pool
          • @@ -51,5 +59,7 @@ function(){a.config.apikey=this.value});this.el.save.addEventListener("click",fu

          Contact

          Please report any bugs and submit feature requests to me@danielhead.com.

          Support for other mining pools can be accomodated upon request.

          -

          Like this watchface? Bitcoin donations, no matter how small are appreciated. My bitcoin address is: 1CCsuAXhEbLiL2a43x1yxuhk5F6hEt1EBQ

          +

          Like this watchface? Bitcoin donations, no matter how small are appreciated. My bitcoin address is: 1CCsuAXhEbLiL2a43x1yxuhk5F6hEt1EBQ

          +

          For further support and feedback, please visit danielhead.com/minewatch

          +

          App version: / JS version:

          diff --git a/httpdocs/config.src/main-min.js b/httpdocs/config.src/main-min.js index 5b83779..1bd8b63 100644 --- a/httpdocs/config.src/main-min.js +++ b/httpdocs/config.src/main-min.js @@ -1,7 +1,8 @@ document.addEventListener("DOMContentLoaded",function(){document.removeEventListener("DOMContentLoaded",arguments.callee,!1);new form},!1); -var form=function(){this.el={bgcolour:document.getElementById("bgcolour"),notify:document.getElementById("notify"),flick:document.getElementById("flick"),update:document.getElementById("update"),submit:document.getElementById("submit"),apikey:document.getElementById("apikey"),save:document.getElementById("save")};this.config=this.getConfig();this.updateForm();this.attach()}; -form.prototype.getConfig=function(){var a=function(a){a=a.replace(/[\[]/,"\\[").replace(/[\]]/,"\\]");a=RegExp("[\\?&]"+a+"=([^&#]*)").exec(location.search);return null==a?"":decodeURIComponent(a[1].replace(/\+/g," "))},b={};b.apikey=a("apikey");b.update=a("update");b.dark="true"==a("dark")?!0:!1;b.notify="true"==a("notify")?!0:!1;b.flick="true"==a("flick")?!0:!1;return b}; +var form=function(){this.el={bgcolour:document.getElementById("bgcolour"),notify:document.getElementById("notify"),flick:document.getElementById("flick"),update:document.getElementById("update"),submit:document.getElementById("submit"),apikey:document.getElementById("apikey"),save:document.getElementById("save")};this.config=this.getConfig();this.updateForm();this.showVersion(this.config.pblversion,this.config.jsversion);this.attach()}; +form.prototype.getConfig=function(){var a=function(a){a=a.replace(/[\[]/,"\\[").replace(/[\]]/,"\\]");a=(new RegExp("[\\?&]"+a+"=([^&#]*)")).exec(location.search);return null==a?"":decodeURIComponent(a[1].replace(/\+/g," "))},b={};b.jsversion=a("jsversion");b.pblversion=a("pblversion");b.apikey=a("apikey");b.update=a("update");b.dark="true"==a("dark")?!0:!1;b.notify="true"==a("notify")?!0:!1;b.flick="true"==a("flick")?!0:!1;return b}; form.prototype.updateForm=function(){0INSTALLED"}a&&b&&(document.getElementById("appversioninfo").innerHTML=a,document.getElementById("jsversioninfo").innerHTML=b,document.getElementById("versioninfo").style.display="inline")}; form.prototype.attach=function(){var a=this;this.el.bgcolour.addEventListener("click",function(b){b.preventDefault();a.config.dark=!a.config.dark;a.updateForm()});this.el.notify.addEventListener("click",function(b){b.preventDefault();a.config.notify=!a.config.notify;a.updateForm()});this.el.flick.addEventListener("click",function(b){b.preventDefault();a.config.flick=!a.config.flick;a.updateForm()});this.el.update.addEventListener("change",function(){a.config.update=this.value});this.el.apikey.addEventListener("change", function(){a.config.apikey=this.value});this.el.save.addEventListener("click",function(b){b.preventDefault();b="pebblejs://close#"+encodeURIComponent(JSON.stringify(a.config));window.location.href=b})}; diff --git a/httpdocs/config.src/main.css b/httpdocs/config.src/main.css index 6b65e10..4166750 100644 --- a/httpdocs/config.src/main.css +++ b/httpdocs/config.src/main.css @@ -1 +1 @@ -body{margin:0;padding:0;font-family:"Verdana";background:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #fff), color-stop(50%, #f3f3f3), color-stop(51%, #ededed), color-stop(100%, #fff));background:-webkit-linear-gradient(top, #fff 0%, #f3f3f3 50%, #ededed 51%, #fff 100%);background:linear-gradient(to bottom, #fff 0%, #f3f3f3 50%, #ededed 51%, #fff 100%)}h1{margin:0;padding:10px 5px;background:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #45484d), color-stop(100%, #000));background:-webkit-linear-gradient(top, #45484d 0%, #000 100%);background:linear-gradient(to bottom, #45484d 0%, #000 100%);color:white;display:block;text-align:center}h2{font-size:0.9em;margin:20px 10px 0 10px;padding-bottom:5px;border-bottom:2px solid #8e8e8e}h3{margin:5px 0;font-size:0.8em}p{font-size:0.8em;margin:1em 10px}ul.form{margin:0;padding:0;list-style:none}ul.form li{margin:0 10px;padding:10px 0;border-bottom:1px solid #8e8e8e}ul.form li p{display:inline-block;margin:0;line-height:2em}ul.form li input{float:right;width:116px;height:25px}ul.form li a{display:inline-block;float:right;width:120px;height:30px;position:relative;font-weight:bold;text-decoration:none;background-color:#c8c8c8}ul.form li a span{display:block;position:absolute;top:0;width:60px;height:16px;padding:7px 0;background-color:#8e8e8e;color:black;text-align:center;font-size:0.8em}ul.form li a.white span{background-color:white;color:black;right:0}ul.form li a.black span{background-color:black;color:white}ul.form li a.on span{background-color:blue;color:white;right:0}ul.form div.info{font-size:0.5em;margin-top:15px}ul.updates{list-style:none;margin:0;padding:0}ul.updates>li{margin:10px;padding-bottom:10px;border-bottom:1px solid #8e8e8e}ul.updates>li li{font-size:0.8em}a#save{display:block;width:60px;height:16px;padding:7px 0;text-align:center;font-weight:bold;text-decoration:none;margin:10px;background-color:blue;color:white} +body{margin:0;padding:0;font-family:"Verdana";background:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #fff), color-stop(50%, #f3f3f3), color-stop(51%, #ededed), color-stop(100%, #fff));background:-webkit-linear-gradient(top, #fff 0%, #f3f3f3 50%, #ededed 51%, #fff 100%);background:linear-gradient(to bottom, #fff 0%, #f3f3f3 50%, #ededed 51%, #fff 100%)}h1{margin:0;padding:10px 5px;background:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #45484d), color-stop(100%, #000));background:-webkit-linear-gradient(top, #45484d 0%, #000 100%);background:linear-gradient(to bottom, #45484d 0%, #000 100%);color:white;display:block;text-align:center}h2{font-size:0.9em;margin:20px 10px 0 10px;padding-bottom:5px;border-bottom:2px solid #8e8e8e}h3{margin:5px 0;font-size:0.8em}p{font-size:0.8em;margin:1em 10px}ul.form{margin:0;padding:0;list-style:none}ul.form li{margin:0 10px;padding:10px 0;border-bottom:1px solid #8e8e8e}ul.form li p{display:inline-block;margin:0;line-height:2em}ul.form li input{float:right;width:116px;height:25px}ul.form li a{display:inline-block;float:right;width:120px;height:30px;position:relative;font-weight:bold;text-decoration:none;background-color:#c8c8c8}ul.form li a span{display:block;position:absolute;top:0;width:60px;height:16px;padding:7px 0;background-color:#8e8e8e;color:black;text-align:center;font-size:0.8em}ul.form li a.white span{background-color:white;color:black;right:0}ul.form li a.black span{background-color:black;color:white}ul.form li a.on span{background-color:blue;color:white;right:0}ul.form div.info{font-size:0.5em;margin-top:15px}ul.updates{list-style:none;margin:0;padding:0}ul.updates>li{margin:10px;padding-bottom:10px;border-bottom:1px solid #8e8e8e}ul.updates>li li{font-size:0.8em}ul.updates h3>span{color:red}a#save{display:block;width:60px;height:16px;padding:7px 0;text-align:center;font-weight:bold;text-decoration:none;margin:10px;background-color:blue;color:white}p#versioninfo{display:none;font-size:0.6em} diff --git a/httpdocs/config.src/main.js b/httpdocs/config.src/main.js index ddc1857..6c6bacb 100644 --- a/httpdocs/config.src/main.js +++ b/httpdocs/config.src/main.js @@ -15,6 +15,7 @@ var form = function() { }; this.config = this.getConfig(); this.updateForm(); + this.showVersion(this.config.pblversion,this.config.jsversion); this.attach(); } form.prototype.getConfig = function() { @@ -25,6 +26,8 @@ form.prototype.getConfig = function() { return results == null ? "" : decodeURIComponent(results[1].replace(/\+/g, " ")); } var config = {}; + config.jsversion = getParameterByName("jsversion"); + config.pblversion = getParameterByName("pblversion"); config.apikey = getParameterByName("apikey"); config.update = getParameterByName("update"); config.dark = (getParameterByName("dark") == "true")?true:false; @@ -58,6 +61,21 @@ form.prototype.updateForm = function() { this.el.flick.children[0].innerHTML = "OFF"; } } +form.prototype.showVersion = function(pbl,js) { + var version = (pbl)?pbl:js; + var listItems = document.getElementsByClassName("app-version"); + for (var i=0;iINSTALLED"; + } + } + if(pbl && js) { + document.getElementById("appversioninfo").innerHTML = pbl; + document.getElementById("jsversioninfo").innerHTML = js; + document.getElementById("versioninfo").style.display = "inline"; + } +} form.prototype.attach = function() { var that = this; this.el.bgcolour.addEventListener("click", function(e) { diff --git a/httpdocs/config.src/main.scss b/httpdocs/config.src/main.scss index 768bd52..848f5e7 100644 --- a/httpdocs/config.src/main.scss +++ b/httpdocs/config.src/main.scss @@ -107,6 +107,9 @@ ul.updates { font-size: 0.8em; } } + h3 > span { + color: red; + } } a#save { display:block; @@ -119,4 +122,8 @@ a#save { margin: 10px; background-color: $blue; color: white; +} +p#versioninfo { + display: none; + font-size:0.6em; } \ No newline at end of file diff --git a/httpdocs/config/index.html b/httpdocs/config/index.html index 224fffd..1bb7f25 100644 --- a/httpdocs/config/index.html +++ b/httpdocs/config/index.html @@ -3,14 +3,15 @@ MineWatch @@ -40,8 +41,15 @@ function(){a.config.apikey=this.value});this.el.save.addEventListener("click",fu SAVE

          Updates

            -
          • -

            v1.0.0 (11th April 2014)

            +
          • +

            v1.0.2 (15th May 2014)

            +
              +
            • Increase timeout from 10 to 30 seconds
              • +
            • Update settings to show installed version
              • +
            +
            • +
          • +

            v1.0.1 (8th May 2014)

            • Initial release
            • Support for Slush's pool
              • @@ -51,5 +59,7 @@ function(){a.config.apikey=this.value});this.el.save.addEventListener("click",fu

              Contact

              Please report any bugs and submit feature requests to me@danielhead.com.

              Support for other mining pools can be accomodated upon request.

              -

              Like this watchface? Bitcoin donations, no matter how small are appreciated. My bitcoin address is: 1CCsuAXhEbLiL2a43x1yxuhk5F6hEt1EBQ

              +

              Like this watchface? Bitcoin donations, no matter how small are appreciated. My bitcoin address is: 1CCsuAXhEbLiL2a43x1yxuhk5F6hEt1EBQ

              +

              For further support and feedback, please visit danielhead.com/minewatch

              +

              App version: / JS version:

              diff --git a/httpdocs/index.php b/httpdocs/index.php index 1222e57..80e54fd 100644 --- a/httpdocs/index.php +++ b/httpdocs/index.php @@ -48,6 +48,17 @@ define("accessAllowed", true);

              NEWS

              +
              +

              MineWatch updated to 1.0.2

              +

              by Dan – 15th May at 19:42

              + +

              v1.0.2 includes the following fixes:

              + +
                +
              • Increase timeout from 10 to 30 seconds
                • +
              • Update settings to show installed version
                • +
              +

              MineWatch released

              by Dan – 8th May at 21:42