diff options
| -rw-r--r-- | public/js/calculator.coffee | 10 | ||||
| -rw-r--r-- | views/main/merchants.html | 29 |
2 files changed, 20 insertions, 19 deletions
diff --git a/public/js/calculator.coffee b/public/js/calculator.coffee index 6c68ae85..82829628 100644 --- a/public/js/calculator.coffee +++ b/public/js/calculator.coffee @@ -106,14 +106,17 @@ setupSocket = -> setTimeout(setupSocket, 10000) unless g.websocket and g.websocket.readyState is 1 - g.websocket = new WebSocket("ws://ws.blockchain.info:8335/inv") + g.websocket = new WebSocket("ws://ws.blockchain.info/inv") g.websocket.onopen = -> g.websocket.send('{"op":"addr_sub", "addr":"' + g.address + '"}') - g.websocket.onerror = g.websocket.onclose = -> + g.websocket.onerror = -> fail(SOCKET_FAIL) + g.websocket.onclose = -> + setupSocket() + g.websocket.onmessage = (e) -> results = eval('(' + e.data + ')') from_address = '' @@ -153,7 +156,8 @@ updateTotal = -> total = '' $('#total').html(total.toString()) - new QRCode('qr', "bitcoin: #{g.address}?amount=#{total.toString()}") + $('#qr').html('') + new QRCode('qr', "bitcoin:#{g.address}?amount=#{total.toString()}") fail = (msg) -> g.errors.push(msg) diff --git a/views/main/merchants.html b/views/main/merchants.html index fa30a44d..db5816cb 100644 --- a/views/main/merchants.html +++ b/views/main/merchants.html @@ -18,12 +18,12 @@ </div> <div class="directory"> - <h2><a href="http://www.artofmuse.com/">Art of Muse</a></h2> - <a href="http://www.artofmuse.com/"><img src="/img/artofmuse.png" alt="Art of Muse" /></a> - <p style="clear: both; overflow: hidden"> - Music lessons for youth & adults. Learn how to play Piano or Keyboard from basic to intermediate levels. Whether you are interested in playing classical pieces or making pop, rock or electronic music, we will give you the skills and knowledge. + <h2><a href="http://pacificblissmassage.com/">Pacific Bliss Massage</a></h2> + <a href="http://pacificblissmassage.com/"><img src="/img/pacificbliss.jpg" alt="Pacific Bliss" /></a> + <p style="overflow: hidden"> + Vancouver's most blissful massage and integrated healing center. We specialize in Swedish relaxation massage and Hot & Cold Stone Therapy. Treatments can be scheduled at Infinity Salon & Spa and in the summer months at Vancouver's most beautiful location - Wreck Beach! </p> - </div> + </div> <div class="directory"> <h2><a href="http://nolimitlandscapes.com/">No Limit Landscaping</a></h2> @@ -32,14 +32,6 @@ </div> <div class="directory"> - <h2><a href="http://pacificblissmassage.com/">Pacific Bliss Massage</a></h2> - <a href="http://pacificblissmassage.com/"><img src="/img/pacificbliss.jpg" alt="Pacific Bliss" /></a> - <p style="overflow: hidden"> - Vancouver's most blissful massage and integrated healing center. We specialize in Swedish relaxation massage and Hot & Cold Stone Therapy. Treatments can be scheduled at Infinity Salon & Spa and in the summer months at Vancouver's most beautiful location - Wreck Beach! - </p> - </div> - - <div class="directory"> <h2><a href="http://yourlocalmoversbc.com/">Your Local Movers</a></h2> <a href="http://yourlocalmoversbc.com/"><img src="/img/yourlocalmovers.png" alt="Your Local Movers" /></a> <p style="clear: both"> @@ -50,6 +42,14 @@ Your Local Movers provides service to the entire Lower Mainland as well as the S </div> <div class="directory"> + <h2><a href="http://www.artofmuse.com/">Art of Muse</a></h2> + <a href="http://www.artofmuse.com/"><img src="/img/artofmuse.png" alt="Art of Muse" /></a> + <p style="clear: both; overflow: hidden"> + Music lessons for youth & adults. Learn how to play Piano or Keyboard from basic to intermediate levels. Whether you are interested in playing classical pieces or making pop, rock or electronic music, we will give you the skills and knowledge. + </p> + </div> + + <div class="directory"> <h2><a href="http://www.cabin12.ca/">Cabin 12 Restaurant</a></h2> <a href="http://www.cabin12.ca/"><img src="/img/cabin12.jpg" alt="Cabin 12 Restaurant" /></a> <p> @@ -68,9 +68,6 @@ Your Local Movers provides service to the entire Lower Mainland as well as the S Cash, debit, Visa or MasterCard, Canadian Tire Money and Bitcoins accepted. </p> </div> - - - </div> </div> </div> |