Merge pull request #2360 from colegleason/qr-code

Made QR code valid JSON. Fixes #2354
This commit is contained in:
Tyler Renelle 2014-01-15 15:45:24 -08:00
commit cdcf130b6f

View file

@ -81,7 +81,7 @@ script(type='text/ng-template', id='partials/options.settings.api.html')
h6 API Token
pre.prettyprint {{user.apiToken}}
h6 QR Code
img(src='https://chart.googleapis.com/chart?cht=qr&chs=200x200&chl=%7Baddress%3A%22https%3A%2F%2Fhabitrpg.com%22%2Cuser%3A%22{{user.id}}%22%2Ckey%3A%22{{user.apiToken}}%22%7D,&choe=UTF-8&chld=L', alt='qrcode')
img(src='https://chart.googleapis.com/chart?cht=qr&chs=200x200&chl=%7B%22address%22%3A%22https%3A%2F%2Fhabitrpg.com%22%2C%22user%22%3A%22{{user.id}}%22%2C%22key%22%3A%22{{user.apiToken}}%22%7D&choe=UTF-8&chld=L', alt='qrcode')
script(id='partials/options.settings.export.html', type="text/ng-template")
.row.fluid