parent
88bae3a4bd
commit
ae1242686d
|
@ -428,7 +428,8 @@ textarea {
|
||||||
|
|
||||||
.key-field__input {
|
.key-field__input {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
padding: 15px 15px 13px 14px;
|
/*padding: 15px 15px 13px 14px;*/
|
||||||
|
padding: 8px 15px 8px 14px;
|
||||||
margin: 10px 0 0;
|
margin: 10px 0 0;
|
||||||
border: 1px solid rgba(0, 0, 0, 0.1);
|
border: 1px solid rgba(0, 0, 0, 0.1);
|
||||||
font-family: inherit;
|
font-family: inherit;
|
||||||
|
@ -442,8 +443,10 @@ textarea {
|
||||||
line-height: 21px;
|
line-height: 21px;
|
||||||
}
|
}
|
||||||
.key-field__input--enter {
|
.key-field__input--enter {
|
||||||
padding-top: 20px;
|
/*padding-top: 20px;*/
|
||||||
padding-bottom: 18px;
|
/*padding-bottom: 18px;*/
|
||||||
|
padding-top: 10px;
|
||||||
|
padding-bottom: 8px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.key-field__btn {
|
.key-field__btn {
|
||||||
|
@ -488,7 +491,8 @@ textarea {
|
||||||
.key-field__select {
|
.key-field__select {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
border: 1px solid rgba(0, 0, 0, 0.1);
|
border: 1px solid rgba(0, 0, 0, 0.1);
|
||||||
padding: 12px 15px;
|
/*padding: 12px 15px;*/
|
||||||
|
padding: 8px 8px;
|
||||||
margin-top: 5px;
|
margin-top: 5px;
|
||||||
background: #fff;
|
background: #fff;
|
||||||
font-family: inherit;
|
font-family: inherit;
|
||||||
|
@ -2773,7 +2777,7 @@ iframe
|
||||||
.btn--float
|
.btn--float
|
||||||
{
|
{
|
||||||
float: left;
|
float: left;
|
||||||
width: 200px;
|
width: 220px;
|
||||||
margin: 10px;
|
margin: 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -44,7 +44,7 @@ function SetHTMLDiagramItem(Item,width)
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
Str = '<BR><DIV>' + Item.text + '<INPUT type="button" class="delete" onclick="DeleteDiagram(\'' + Item.id + '\')" value="X"></DIV>\
|
Str = '<BR><DIV>' + Item.text + '<INPUT type="button" class="delete" onclick="DeleteDiagram(\'' + Item.id + '\')" value="X"></DIV>\
|
||||||
<BR><canvas class="DIAGRAM" width="' + width + '" height="' + MinHeight + '" id="' + Item.id + '"></canvas>';
|
<BR><canvas class="DIAGRAM" width="' + width + '" height="' + MinHeight + '" id="' + Item.id + '"></canvas>';
|
||||||
}
|
}
|
||||||
var ElBlock = document.getElementById("B" + Item.id);
|
var ElBlock = document.getElementById("B" + Item.id);
|
||||||
|
@ -100,13 +100,18 @@ function DrawDiagram(Item)
|
||||||
var arr = Item.arr;
|
var arr = Item.arr;
|
||||||
if(!arr)
|
if(!arr)
|
||||||
arr = Item.ArrList;
|
arr = Item.ArrList;
|
||||||
var arrX = Item.arrX;
|
|
||||||
var GreenValue = Item.value;
|
var GreenValue = Item.value;
|
||||||
var StepTime = Item.steptime;
|
var StepTime = Item.steptime;
|
||||||
var StartNumber = Item.startnumber;
|
var StartNumber = Item.startnumber;
|
||||||
var StartServer = Item.starttime;
|
var StartServer = Item.starttime;
|
||||||
var mouseX = Item.mouseX;
|
var mouseX = Item.mouseX;
|
||||||
var KPrecision = Item.KPrecision;
|
var KPrecision = Item.KPrecision;
|
||||||
|
var CountNameX = Item.CountNameX;
|
||||||
|
if(!CountNameX)
|
||||||
|
CountNameX = 10;
|
||||||
|
var arrX = Item.arrX;
|
||||||
|
if(arrX && arrX.length)
|
||||||
|
CountNameX = arrX.length;
|
||||||
if(!KPrecision)
|
if(!KPrecision)
|
||||||
KPrecision = 1;
|
KPrecision = 1;
|
||||||
if(!arr)
|
if(!arr)
|
||||||
|
@ -122,6 +127,18 @@ function DrawDiagram(Item)
|
||||||
else
|
else
|
||||||
ctx.fillStyle = "#FFF";
|
ctx.fillStyle = "#FFF";
|
||||||
ctx.fillRect(0, 0, obj.width, obj.height);
|
ctx.fillRect(0, 0, obj.width, obj.height);
|
||||||
|
var MaxWidth = obj.width - Left - Right;
|
||||||
|
if(arr.length > MaxWidth)
|
||||||
|
{
|
||||||
|
var K = arr.length / MaxWidth;
|
||||||
|
var arr2 = [];
|
||||||
|
for(var i = 0; i < MaxWidth; i++)
|
||||||
|
{
|
||||||
|
var i2 = Math.floor(i * K);
|
||||||
|
arr2[i] = arr[i2];
|
||||||
|
}
|
||||||
|
arr = arr2;
|
||||||
|
}
|
||||||
if(arr.length <= 0)
|
if(arr.length <= 0)
|
||||||
return ;
|
return ;
|
||||||
var Pow2 = 0;
|
var Pow2 = 0;
|
||||||
|
@ -156,7 +173,7 @@ function DrawDiagram(Item)
|
||||||
var HValue = MaxValue;
|
var HValue = MaxValue;
|
||||||
if(HValue <= 0)
|
if(HValue <= 0)
|
||||||
HValue = 1;
|
HValue = 1;
|
||||||
var KX = (obj.width - Left - Right) / arr.length;
|
var KX = (MaxWidth) / arr.length;
|
||||||
var KY = (obj.height - Top - Button) / HValue;
|
var KY = (obj.height - Top - Button) / HValue;
|
||||||
var DeltaY = 0;
|
var DeltaY = 0;
|
||||||
var bLine = Item.line;
|
var bLine = Item.line;
|
||||||
|
@ -315,10 +332,9 @@ function DrawLines(arr,mode,color)
|
||||||
ctx.strokeStyle = "#00F";
|
ctx.strokeStyle = "#00F";
|
||||||
ctx.fillText(Rigth(" " + AvgValueText, 8), 0, yT + Top);
|
ctx.fillText(Rigth(" " + AvgValueText, 8), 0, yT + Top);
|
||||||
}
|
}
|
||||||
var CountNameX = 10;
|
|
||||||
if(arr.length < CountNameX)
|
if(arr.length < CountNameX)
|
||||||
CountNameX = arr.length;
|
CountNameX = arr.length;
|
||||||
var KX3 = (obj.width - Left - Right) / CountNameX;
|
var KX3 = (MaxWidth) / CountNameX;
|
||||||
var KDelitel = 1;
|
var KDelitel = 1;
|
||||||
var Step = arr.length / CountNameX;
|
var Step = arr.length / CountNameX;
|
||||||
var StartTime, bNumber;
|
var StartTime, bNumber;
|
||||||
|
|
|
@ -676,13 +676,20 @@ function SetArrLog(arr)
|
||||||
}
|
}
|
||||||
CheckSending();
|
CheckSending();
|
||||||
};
|
};
|
||||||
var DiagramArr = [{name:"MAX:ALL_NODES", text:"All nodes count", value:0, red:"#1d506b", MouseText:" nodes"}, {name:"MAX:HASH_RATE_B",
|
var DiagramArr = [{name:"MAX:ALL_NODES", text:"All nodes count", value:0, red:"#1d506b", MouseText:" nodes", CountNameX:10},
|
||||||
text:"HashRate, Tera hash/s", value:0, red:"#286b16", MathPow:2, MathDiv:1024 * 1024 * 1024 * 1024, KPrecision:10, NoTextMax:1,
|
{name:"MAX:HASH_RATE_B", text:"HashRate, Tera hash/s", value:0, red:"#286b16", MathPow:2, MathDiv:1024 * 1024 * 1024 * 1024,
|
||||||
MouseText:" T h/s"}, ];
|
KPrecision:10, NoTextMax:1, MouseText:" T h/s", CountNameX:10}, ];
|
||||||
|
|
||||||
function InitDiagram()
|
function InitDiagram()
|
||||||
{
|
{
|
||||||
InitDiagramByArr(DiagramArr, 1120);
|
var width = 1120;
|
||||||
|
if(isMobile())
|
||||||
|
{
|
||||||
|
for(var i = 0; i < DiagramArr.length; i++)
|
||||||
|
DiagramArr[i].CountNameX = 4;
|
||||||
|
width = 320;
|
||||||
|
}
|
||||||
|
InitDiagramByArr(DiagramArr, width);
|
||||||
};
|
};
|
||||||
|
|
||||||
function ViewCounters(This)
|
function ViewCounters(This)
|
||||||
|
@ -863,6 +870,10 @@ function OKSend()
|
||||||
SetDataUpdateTime(20);
|
SetDataUpdateTime(20);
|
||||||
CancelSend();
|
CancelSend();
|
||||||
openModal('idSending');
|
openModal('idSending');
|
||||||
|
setTimeout(function ()
|
||||||
|
{
|
||||||
|
closeModal();
|
||||||
|
}, 8 * 1000);
|
||||||
};
|
};
|
||||||
|
|
||||||
function CancelSend()
|
function CancelSend()
|
||||||
|
|
|
@ -632,12 +632,12 @@
|
||||||
</form>
|
</form>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
<section class="modal dapp-modal" id="idSending" onclick="closeModal()" style="display: none;">
|
<section class="modal dapp-modal" id="idSending" onclick="closeModal()" style="display: none; margin-top: 100px">
|
||||||
<h2 class="password-modal__title">Sending Tx</h2><BR>
|
<h2 class="password-modal__title">Sending Tx</h2><BR>
|
||||||
<p class="password-modal__subtitle">Wait 5-8 sec, pls</p>
|
<p class="password-modal__subtitle">Wait 5-8 sec, pls</p>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
<section class="modal dapp-modal" id="idSmartEnter" style="display: none;">
|
<section class="modal dapp-modal" id="idSmartEnter" style="display: none; margin-top: 20px; padding: 20px">
|
||||||
<h2 class="password-modal__title"><span>Enter number of dapp</span></h2>
|
<h2 class="password-modal__title"><span>Enter number of dapp</span></h2>
|
||||||
<p class="password-modal__subtitle">Enter the dapps number that will be added to your account. Attention make sure that you trust this dapp, otherwise you may lose all funds in this account.</p>
|
<p class="password-modal__subtitle">Enter the dapps number that will be added to your account. Attention make sure that you trust this dapp, otherwise you may lose all funds in this account.</p>
|
||||||
|
|
||||||
|
|
|
@ -98,7 +98,7 @@ global.STAT_MODE = 1;
|
||||||
setInterval(global.PrepareStatEverySecond, 1000);
|
setInterval(global.PrepareStatEverySecond, 1000);
|
||||||
var IndexName = "index.html";
|
var IndexName = "index.html";
|
||||||
|
|
||||||
if (global.HTTPS_HOSTING_DOMAIN) {
|
if (global.HTTPS_HOSTING_DOMAIN && global.HTTP_HOSTING_PORT === 443) {
|
||||||
var file_sert = global.GetDataPath("sertif.lst");
|
var file_sert = global.GetDataPath("sertif.lst");
|
||||||
global.CheckCreateDir(global.GetDataPath("tmp"));
|
global.CheckCreateDir(global.GetDataPath("tmp"));
|
||||||
var greenlock = require('greenlock').create({
|
var greenlock = require('greenlock').create({
|
||||||
|
@ -322,6 +322,7 @@ function DoCommandNew(response, Type, Path, Params) {
|
||||||
break;
|
break;
|
||||||
case "client":
|
case "client":
|
||||||
global.DappClientCodeFile(response, ArrPath[1]);
|
global.DappClientCodeFile(response, ArrPath[1]);
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
{
|
{
|
||||||
var Name = ArrPath[ArrPath.length - 1];
|
var Name = ArrPath[ArrPath.length - 1];
|
||||||
|
|
Loading…
Reference in New Issue