EpicCash/epic_explorer
4
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Merge branch 'dev' of https://gitlab.com/epic-tech/explorer2.epic.tech-angular8 into dev

Browse Source
This commit is contained in:
root 2019-09-12 14:44:46 +02:00
commit 18f074bddc
4 changed files with 36 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
server/i18n/de.json
View File

@ -102,5 +102,15 @@
"getblockheight" : "Nimmt einen Hash-Parameter und gibt die entsprechende Blockhöhe zurück.",
"getblocktime" : "Nimmt einen Höhenparameter und gibt die unixtime des Blocks zurück.",
"takes":"nimmt ein"
},
"commit-id-view": {
"output-commit":"Output Commit",
"created-at-block":"Erstellt am Block",
"created-at":"Hergestellt in",
"output-type" : "Ausgabetyp",
"proof" : "Beweis",
"proof-hash" : "Beweis-Hash",
"merkle-proof" : "Merkle Beweis",
"mmr-index" : "MMR Index"
}
}

10
server/i18n/en.json
View File

@ -102,5 +102,15 @@
"getblockheight" : " parameter and returns corresponding block height.",
"getblocktime" : " parameter and returns unixtime of the block.",
"takes" : "takes a"
},
"commit-id-view": {
"output-commit":"Output Commit",
"created-at-block":"Created at block",
"created-at":"Created At",
"output-type" : "Output Type",
"proof" : "Proof",
"proof-hash" : "Proof hash",
"merkle-proof" : "Merkle Proof",
"mmr-index" : "MMR Index"
}
}

30
src/app/view/block-view/block-detail/block-detail.component.html
View File

@ -291,50 +291,50 @@
<div *ngIf="hashdata.viewType == 'Commit'" >
<div class="container">
<h3>&nbsp; Output Commit <span style="font-size:15px"></span></h3>
<h3>&nbsp; {{'commit-id-view.output-commit' | translate}} <span style="font-size:15px"></span></h3>
<table class="table table-horizontal-bordered table-hover hashdata_table">
<tbody>
<tr>
<td class="d-none d-md-table-cell">Created at block </td>
<td class="d-none d-md-table-cell">{{'commit-id-view.created-at-block' | translate}} </td>
<td>
<p class="d-md-none">Created at block</p>
<p class="d-md-none">{{'commit-id-view.created-at-block' | translate}}</p>
{{ hashdata.BlockchainBlockFetchQuery.Height }}</td>
</tr>
<tr>
<td class="d-none d-md-table-cell">Created At </td>
<td class="d-none d-md-table-cell">{{'commit-id-view.created-at' | translate}} </td>
<td>
<p class="d-md-none">Created At</p>
<p class="d-md-none">{{'commit-id-view.created-at' | translate}}</p>
{{ hashdata.BlockchainBlockFetchQuery.Timestamp }}</td>
</tr>
<tr>
<td class="d-none d-md-table-cell">Output Type</td>
<td class="d-none d-md-table-cell">{{'commit-id-view.output-type' | translate}}</td>
<td>
<p class="d-md-none">Output Type</p>
<p class="d-md-none">{{'commit-id-view.output-type' | translate}}</p>
{{ hashdata.BlockchainBlockOutputFetchQuery[0].OutputType }}</td>
</tr>
<tr>
<td class="d-none d-md-table-cell">Proof</td>
<td class="d-none d-md-table-cell">{{'commit-id-view.proof' | translate}}</td>
<td>
<p class="d-md-none">Proof</p>
<p class="d-md-none">{{'commit-id-view.proof' | translate}}</p>
{{ hashdata.BlockchainBlockOutputFetchQuery[0].Proof }}</td>
</tr>
<tr>
<td class="d-none d-md-table-cell">Proof hash</td>
<td class="d-none d-md-table-cell">{{'commit-id-view.proof-hash' | translate}}</td>
<td>
<p class="d-md-none">Proof hash</p>
<p class="d-md-none">{{'commit-id-view.proof-hash' | translate}}</p>
{{ hashdata.BlockchainBlockOutputFetchQuery[0].ProofHash }}</td>
</tr>
<tr>
<td class="d-none d-md-table-cell">Merkle Proof</td>
<td class="d-none d-md-table-cell">{{'commit-id-view.merkle-proof' | translate}}</td>
<td class="text_break">
<p class="d-md-none">Merkle Proof</p>
<p class="d-md-none">{{'commit-id-view.merkle-proof' | translate}}</p>
{{ hashdata.BlockchainBlockOutputFetchQuery[0].MerkleProof }}</td>
</tr>
<tr>
<td class="d-none d-md-table-cell">MMR Index</td>
<td class="d-none d-md-table-cell">{{'commit-id-view.mmr-index' | translate}}</td>
<td>
<p class="d-md-none">MMR Index</p>
<p class="d-md-none">{{'commit-id-view.mmr-index' | translate}}</p>
{{ hashdata.BlockchainBlockOutputFetchQuery[0].MmrIndex }}</td>
</tr>
</tbody>

2
src/app/view/home/graph-list/graph-list.component.ts
View File

@ -1341,7 +1341,7 @@ export class GraphListComponent implements OnInit {
range: range3,
overlaying: 'y',
rangemode: 'nonnegative',
side: 'left',
side: 'right',
position: 1.25
},
yaxis3: {