Merge branch 'master' into location

This commit is contained in:
vita10gy
2013-04-15 00:14:56 -05:00
18 changed files with 8456 additions and 65 deletions

View File

@ -92,8 +92,9 @@ document.getElementsByTagName('body')[0].innerHTML = ''
+ ' <div id="portaldetails"></div>'
+ ' <input id="redeem" placeholder="Redeem code…" type="text"/>'
+ ' <div id="toolbox">'
+ ' <a onmouseover="setPermaLink(this)" onclick="setPermaLink(this);return androidCopy(this.href)" >Permalink</a>'
+ ' <a onclick="window.aboutIITC()" style="cursor: help">About&nbsp;IITC</a></div>'
+ ' <a onmouseover="setPermaLink(this)" onclick="setPermaLink(this);return androidCopy(this.href)" title="URL link to this map view">Permalink</a>'
+ ' <a onclick="window.aboutIITC()" style="cursor: help">About IITC</a>'
+ ' </div>'
+ ' </div>'
+ '</div>'
+ '<div id="updatestatus"></div>'