diff --git a/code/request_handling.js b/code/request_handling.js index 3919bcdb..90368909 100644 --- a/code/request_handling.js +++ b/code/request_handling.js @@ -45,12 +45,14 @@ window.requests.abort = function() { // to website. Updates info in layer chooser. window.renderUpdateStatus = function() { - var t = 'portals: '; + var t = ''; + if(!window.isSmartphone()) // space is valueable + t += 'portals: '; var minlvl = getMinPortalLevel(); if(minlvl === 0) - t += 'all'; + t+= 'all'; else - t+= 'L'+minlvl+(minlvl<8?'+':''); + t+= 'L'+minlvl+(minlvl<8?'+':'') + ''; t +=''; t += ' map: '; diff --git a/code/smartphone.js b/code/smartphone.js index 9d913c22..f8cf7d4b 100644 --- a/code/smartphone.js +++ b/code/smartphone.js @@ -70,7 +70,11 @@ window.runOnSmartphonesBeforeBoot = function() { window.smartphoneInfo = function(data) { var d = data.portalDetails; - var t = 'L' + Math.floor(getPortalLevel(d)); + var lvl = Math.floor(getPortalLevel(d)); + if(lvl == 0) + var t = 'L' + lvl + ''; + else + var t = 'L' + lvl + ''; var percentage = '0%'; var totalEnergy = getTotalPortalEnergy(d); if(getTotalPortalEnergy(d) > 0) { @@ -79,6 +83,28 @@ window.smartphoneInfo = function(data) { t += ' ' + percentage + ' '; t += d.portalV2.descriptiveText.TITLE; + var l,v,max,perc; + for(var i=0;i<8;i++) + { + var reso = d.resonatorArray.resonators[i]; + if(reso) { + l = parseInt(reso.level); + v = parseInt(reso.energyTotal); + max = RESO_NRG[l]; + perc = v/max*100; + } + else { + l = 0; + v = 0; + max = 0; + perc = 0; + } + + t += '
'; + t += '
'; + t += '
' + } + $('#mobileinfo').html(t); } diff --git a/mobile/smartphone.css b/mobile/smartphone.css index 0e88ed7c..efcbbfbe 100644 --- a/mobile/smartphone.css +++ b/mobile/smartphone.css @@ -8,22 +8,72 @@ body { width: 100%; color: #d4d5d6; border: 0; + padding: 0; +} + +#updatestatus .map { + margin-left: 4px; } #innerstatus { + padding: 4px; float: right; - max-width: 50%; + width: 50%; text-overflow: ellipsis; white-space: nowrap; overflow: hidden; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; +} + +#loadlevel { + border-width: 0; + background: transparent; + color: #FFF; } #mobileinfo { float: left; - max-width: 50%; + width: 50%; text-overflow: ellipsis; white-space: nowrap; overflow: hidden; + position:relative; + padding: 4px 0; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; +} + +#mobileinfo .portallevel { + padding: 0 0.25em; + color: #FFF; +} + +#mobileinfo .resonator { + position: absolute; + width: 12%; /* a little less that 1/8 to have a small distance */ + height: 100%; + top: 0; + border-top: 3px solid red; + box-sizing: border-box; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; +} + +#mobileinfo .filllevel { + position: absolute; + bottom: 0; + height: 3px; +} + +#mobileinfo .enl .filllevel { + background-color: #03fe03 !important; +} + +#mobileinfo .res .filllevel { + background-color: #00c5ff !important; } #sidebar, #chatcontrols, #chat, #chatinput { diff --git a/style.css b/style.css index 43a4d398..5d3441f3 100644 --- a/style.css +++ b/style.css @@ -721,6 +721,17 @@ h3 { margin-left: 8px; } +#loadlevel { + background: #FFF; + color: #000000; + display: inline-block; + min-width: 1.8em; + border: 1px solid #20A8B1; + border-width: 0 1px; + margin: -4px 0; + padding: 4px 0.2em; +} + /* Dialogs */ .ui-tooltip, .ui-dialog {