matt/paperclip-wallet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed CSS & Table, Removed Close buttons on upload start.

Browse Source
This commit is contained in:
FallenGravity
2019-10-17 16:49:24 +02:00
parent d9dbd39e66
commit 1cc838d2d1
3 changed files with 43 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
assets/dashboard/css/style.css
View File

@@ -3115,7 +3115,7 @@ section.content {
box-shadow: 0 2px 10px rgba(0, 0, 0, 0.2); box-shadow: 0 2px 10px rgba(0, 0, 0, 0.2);
position: relative; position: relative;
margin-bottom: 30px; margin-bottom: 30px;
max-height: 400px; max-height: 550px;
-webkit-border-radius: 2px; -webkit-border-radius: 2px;
-moz-border-radius: 2px; -moz-border-radius: 2px;
-ms-border-radius: 2px; -ms-border-radius: 2px;

113
assets/templates/uploads.html
View File

@@ -1,7 +1,6 @@
<head> <head>
<!-- Google Fonts --> <!-- Google Fonts -->
<link href="https://fonts.googleapis.com/css?family=Roboto:400,700&subset=latin,cyrillic-ext" rel="stylesheet" <link href="https://fonts.googleapis.com/css?family=Roboto:400,700&subset=latin,cyrillic-ext" rel="stylesheet" type="text/css">
type="text/css">
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet" type="text/css"> <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet" type="text/css">
<!-- Bootstrap Core Css --> <!-- Bootstrap Core Css -->
<!--<link href="assets/dashboard/plugins/bootstrap/css/bootstrap.css" rel="stylesheet">--> <!--<link href="assets/dashboard/plugins/bootstrap/css/bootstrap.css" rel="stylesheet">-->
@@ -13,8 +12,7 @@
<link href="assets/dashboard/plugins/morrisjs/morris.css" rel="stylesheet" />--> <link href="assets/dashboard/plugins/morrisjs/morris.css" rel="stylesheet" />-->
<!-- Custom Css --> <!-- Custom Css -->
<link href="assets/dashboard/css/style.css" rel="stylesheet"> <link href="assets/dashboard/css/style.css" rel="stylesheet">
<link rel="stylesheet" <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/material-design-iconic-font/2.2.0/css/material-design-iconic-font.min.css">
href="https://cdnjs.cloudflare.com/ajax/libs/material-design-iconic-font/2.2.0/css/material-design-iconic-font.min.css">
<!-- AdminBSB Themes. You can choose a theme from css/themes instead of get all themes --> <!-- AdminBSB Themes. You can choose a theme from css/themes instead of get all themes -->
<link href="assets/dashboard/css/themes/all-themes.css" rel="stylesheet" /> <link href="assets/dashboard/css/themes/all-themes.css" rel="stylesheet" />
<script src="https://medium-widget.pixelpoint.io/widget.js"></script> <script src="https://medium-widget.pixelpoint.io/widget.js"></script>
@@ -130,13 +128,11 @@
</div> </div>
<center> <center>
<button type="button" class="btn bg-indigo waves-effect" id="main-upload-button" <button type="button" class="btn bg-indigo waves-effect" id="main-upload-button" style="margin: 10px; display:inline-block;">
style="margin: 10px; display:inline-block;">
<i class="material-icons">cloud_upload</i> <i class="material-icons">cloud_upload</i>
<span>Upload to ethoFS</span> <span>Upload to ethoFS</span>
</button> </button>
<button type="button" class="btn bg-indigo waves-effect" id="main-login-button" <button type="button" class="btn bg-indigo waves-effect" id="main-login-button" style="margin: 10px; display:inline-block;">
style="margin: 10px; display:inline-block;">
<i class="material-icons">fingerprint</i> <i class="material-icons">fingerprint</i>
<span id="ethofs-login-button-text">Login To ethoFS</span> <span id="ethofs-login-button-text">Login To ethoFS</span>
</button> </button>
@@ -154,29 +150,25 @@
<!-- #END# CPU Usage --> <!-- #END# CPU Usage -->
<!-- Table of hashes --> <!-- Table of hashes -->
<div class="row clearfix"> <div class="row">
<div class="col-xs-24 col-sm-24 col-md-16 col-lg-16"> <div class="col s12">
<div class="card"> <div class="card">
<div class="header"> <center><h2 style="color: white; background: #212529;">ETHOFS HOSTING CONTRACTS</h2></center>
<h2>ETHOFS HOSTING CONTRACTS</h2> </div>
</div> <div class="responsive-table">
<div class="body"> <table class="responsive-table">
<div class="table-responsive"> <thead>
<table class="table table-hover dashboard-task-infos"> <tr>
<thead> <th style="color:#fff;">Name</th>
<tr> <th style="color:#fff;">ethoFS Contract Hash</th>
<th style="color:#000;">Name</th> <th style="color:#fff;">Start Block</th>
<th style="color:#000;">ethoFS Contract Hash</th> <th style="color:#fff;">End Block</th>
<th style="color:#000;">Start Block</th> <th style="color:#fff;">Status</th>
<th style="color:#000;">End Block</th> <th style="color:#fff;">Options</th>
<th style="color:#000;">Status</th> </tr>
<th style="color:#000;">Options</th> </thead>
</tr> <tbody id="hostingcontractstablebody" class="responsive-table"></tbody>
</thead> </table>
<tbody id="hostingcontractstablebody"></tbody>
</table>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>
@@ -204,8 +196,7 @@
</tr> </tr>
<tr style="border-color:#000;"> <tr style="border-color:#000;">
<td data-th="Private Key"> <td data-th="Private Key">
<input type="text" id="privatekey" name="privatekey" placeholder="Enter Private Key" <input type="text" id="privatekey" name="privatekey" placeholder="Enter Private Key" style="color:White;">
style="color:White;">
</td> </td>
</tr> </tr>
</table> </table>
@@ -245,8 +236,7 @@
</div> </div>
</div> </div>
<div class="modal-footer" style="background-color: #840032;"> <div class="modal-footer" style="background-color: #840032;">
<button type="button" class="btn btn-link waves-effect" data-dismiss="modal" <button type="button" class="btn btn-link waves-effect" data-dismiss="modal" id="ethofs-registration-button">REGISTER</button>
id="ethofs-registration-button">REGISTER</button>
</div> </div>
</div> </div>
</div> </div>
@@ -317,8 +307,7 @@
box to upload. box to upload.
</p> </p>
</center> </center>
<input type="file" id="fileUploadButton" webkitdirectory="true" mozdirectory="true" msdirectory="true" <input type="file" id="fileUploadButton" webkitdirectory="true" mozdirectory="true" msdirectory="true" odirectory="true" directory="true" multiple="true">
odirectory="true" directory="true" multiple="true">
</div> </div>
<div id="progress-container"> <div id="progress-container">
<div id="progress-bar"></div> <div id="progress-bar"></div>
@@ -359,8 +348,7 @@
</tr> </tr>
<tr style="border-color:#000;"> <tr style="border-color:#000;">
<td data-th="Contract Name"> <td data-th="Contract Name">
<input type="text" id="newcontractname" name="newcontractname" placeholder="Enter Contract Name" <input type="text" id="newcontractname" name="newcontractname" placeholder="Enter Contract Name" style="color:white;">
style="color:white;">
</td> </td>
</tr> </tr>
<tr> <tr>
@@ -417,10 +405,6 @@
<div class="modal-content" style="background-color: #840032;"> <div class="modal-content" style="background-color: #840032;">
<div class="modal-header"> <div class="modal-header">
<h4 class="modal-title" id="defaultModalLabel" style="color:white;"> <h4 class="modal-title" id="defaultModalLabel" style="color:white;">
<button type="button" class="close" data-dismiss="modal" aria-label="Close" style="color:#ffffff;"
id="tracker-close-button">
<span aria-hidden="true">&times;</span>
</button>
<br> <br>
<center> <center>
<img src="assets/dashboard/images/ethofslogo.png" width="200" alt="Ether-1 ethoFS Logo"> <img src="assets/dashboard/images/ethofslogo.png" width="200" alt="Ether-1 ethoFS Logo">
@@ -437,29 +421,24 @@
<h3 style="padding-left:10px;">Message Log:</h3> <h3 style="padding-left:10px;">Message Log:</h3>
<span class="upload-message" style="color: #3CB371; font-size: 24px; padding: 10px"></span> <span class="upload-message" style="color: #3CB371; font-size: 24px; padding: 10px"></span>
</div> </div>
<div class="summary" <div class="summary" style="text-align: center !important; padding: 10px; width:100%; background: #000000;">
style="text-align: center !important; padding: 10px; width:100%; background: #000000;">
<div id="myBar">0%</div> <div id="myBar">0%</div>
</div> </div>
</div> </div>
</main> </main>
</div> </div>
<div class="modal-footer" <div class="modal-footer" style="background-color: #840032; border-bottom-right-radius: 0px; border-bottom-left-radius: 0px; border-color:#000">
style="background-color: #840032; border-bottom-right-radius: 0px; border-bottom-left-radius: 0px; border-color:#000"> <button type="button" class="btn btn-primary" id="upload-check-button" onclick="event.stopPropagation();">Close</button>
<button type="button" class="btn btn-primary" id="upload-check-button"
onclick="event.stopPropagation();">Close</button>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="modal fade" id="analyzeDataModal" tabindex="-1" role="dialog" aria-labelledby="staticModalLabel" <div class="modal fade" id="analyzeDataModal" tabindex="-1" role="dialog" aria-labelledby="staticModalLabel" aria-hidden="true" data-backdrop="static">
aria-hidden="true" data-backdrop="static">
<div class="modal-dialog" role="document"> <div class="modal-dialog" role="document">
<div class="modal-content" style="background-color: #840032;"> <div class="modal-content" style="background-color: #840032;">
<div class="modal-header"> <div class="modal-header">
<h4 class="modal-title" id="defaultModalLabel" style="color:white;"> <h4 class="modal-title" id="defaultModalLabel" style="color:white;">
<button type="button" class="close" data-dismiss="modal" id="analyze-close-button" aria-label="Close" <button type="button" class="close" data-dismiss="modal" id="analyze-close-button" aria-label="Close" style="color:#ffffff;">
style="color:#ffffff;">
<span aria-hidden="true">&times;</span> <span aria-hidden="true">&times;</span>
</button> </button>
<br> <br>
@@ -479,17 +458,14 @@
<h4 style="padding-left:10px;">Message Log:</h4> <h4 style="padding-left:10px;">Message Log:</h4>
<pre class="analyze-message" style="color: #3CB371; font-size: 24px;"></pre> <pre class="analyze-message" style="color: #3CB371; font-size: 24px;"></pre>
</div> </div>
<div class="summary" <div class="summary" style="text-align: center !important; padding: 10px; width:100%; background: #000000;">
style="text-align: center !important; padding: 10px; width:100%; background: #000000;">
<div id="myAnalyzeBar">0%</div> <div id="myAnalyzeBar">0%</div>
</div> </div>
</div> </div>
<div class="modal-footer" <div class="modal-footer" style="background-color: #840032; border-bottom-right-radius: 0px; border-bottom-left-radius: 0px; border-color:#000">
style="background-color: #840032; border-bottom-right-radius: 0px; border-bottom-left-radius: 0px; border-color:#000"> <button type="button" class="btn btn-primary" id="upload-check-button" onclick="event.stopPropagation();">Close</button>
<button type="button" class="btn btn-primary" id="upload-check-button"
onclick="event.stopPropagation();">Close</button>
</div> </div>
</main> </main>
</div> </div>
@@ -499,8 +475,7 @@
<!-- end analyze data modal --> <!-- end analyze data modal -->
<!-- begin mined block checking modal --> <!-- begin mined block checking modal -->
<div class="modal fade" id="minedBlockTrackerModal" tabindex="-1" role="dialog" aria-labelledby="staticModalLabel" <div class="modal fade" id="minedBlockTrackerModal" tabindex="-1" role="dialog" aria-labelledby="staticModalLabel" aria-hidden="true" data-backdrop="static">
aria-hidden="true" data-backdrop="static">
<div class="modal-dialog" role="document"> <div class="modal-dialog" role="document">
<div class="modal-content" style="background-color: #840032;"> <div class="modal-content" style="background-color: #840032;">
<div class="modal-header"> <div class="modal-header">
@@ -510,16 +485,12 @@
<center> <center>
<img src="assets/dashboard/images/ethofslogo.png" width="200" alt="Ether-1 ethoFS Logo"> <img src="assets/dashboard/images/ethofslogo.png" width="200" alt="Ether-1 ethoFS Logo">
</center> </center>
<button type="button" class="close" data-dismiss="modal" aria-label="Close" style="color:#ffffff;">
<span aria-hidden="true">&times;</span>
</button>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<main> <main>
<div class="box node" style="width:100%; background: #000000; background-color: #000;"> <div class="box node" style="width:100%; background: #000000; background-color: #000;">
<h3 style="padding: 20px;">Ether-1 Transaction Status: <h3 style="padding: 20px;">Ether-1 Transaction Status:
<span id="mining-status-message" <span id="mining-status-message" style="color: #3CB371; font-size: 24px; text-align: center !important;">In
style="color: #3CB371; font-size: 24px; text-align: center !important;">In
Progress</span> Progress</span>
</h3> </h3>
<div> <div>
@@ -528,8 +499,7 @@
<span class="mining-message" id="mining-message" style="color: #3CB371; font-size: 24px;"></span> <span class="mining-message" id="mining-message" style="color: #3CB371; font-size: 24px;"></span>
</center> </center>
</div> </div>
<div class="summary" <div class="summary" style="text-align: center !important; padding: 20px; width:100%; background: #000000;">
style="text-align: center !important; padding: 20px; width:100%; background: #000000;">
<h3 style="font-size: 24px;">Current Ether-1 Block Height: <h3 style="font-size: 24px;">Current Ether-1 Block Height:
&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp &nbsp&nbsp&nbsp&nbsp&nbsp&nbsp
<span id="block-height" style="color: #3CB371; font-size: 24px;">0</span> <span id="block-height" style="color: #3CB371; font-size: 24px;">0</span>
@@ -544,8 +514,7 @@
<!-- end mined block checking modal --> <!-- end mined block checking modal -->
<!-- begin preparing upload modal --> <!-- begin preparing upload modal -->
<div class="modal fade" id="preparingUploadModal" tabindex="-1" role="dialog" aria-labelledby="staticModalLabel" <div class="modal fade" id="preparingUploadModal" tabindex="-1" role="dialog" aria-labelledby="staticModalLabel" aria-hidden="true" data-backdrop="static">
aria-hidden="true" data-backdrop="static">
<div class="modal-dialog" role="document"> <div class="modal-dialog" role="document">
<div class="modal-content" style="background-color: #840032;"> <div class="modal-content" style="background-color: #840032;">
<div class="modal-header"> <div class="modal-header">
@@ -555,9 +524,6 @@
<center> <center>
<img src="assets/dashboard/images/ethofslogo.png" width="200" alt="Ether-1 ethoFS Logo"> <img src="assets/dashboard/images/ethofslogo.png" width="200" alt="Ether-1 ethoFS Logo">
</center> </center>
<button type="button" class="close" data-dismiss="modal" aria-label="Close" style="color:#ffffff;">
<span aria-hidden="true">&times;</span>
</button>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<main> <main>
@@ -691,8 +657,7 @@
</div> </div>
</main> </main>
</div> </div>
<div class="modal-footer" <div class="modal-footer" style="background-color: #840032; border-bottom-right-radius: 0px; border-bottom-left-radius: 0px; border-color:#000">
style="background-color: #840032; border-bottom-right-radius: 0px; border-bottom-left-radius: 0px; border-color:#000">
<div class="row clearfix"> <div class="row clearfix">
<button class="btn btn-primary" id="contract-extension-button" type="button">Extend Hosting <button class="btn btn-primary" id="contract-extension-button" type="button">Extend Hosting
Contract</button> Contract</button>

2
renderer/uploads.js
View File

@@ -475,7 +475,7 @@ class Uploads {
hostingContracts += '<tr class="tr-shadow" style="display: none;"><td>' + ethoFSHostingContractName + '</td><td><span class="block-email"><a href="#" onclick="EthoUploads.showHostingContractDetails(' + counter + ');">' + ethoFSHostingContractHash + '</a></span></td><td class="desc">' + ethoFSHostingContractStartBlock + '</td><td>' + ethoFSHostingContractEndBlock + '</td><td><span class="status--process"><font color="red">' + ethoFSHostingContractStatus + '</font></span></td><td><div class="table-data-feature"><button class="item" data-toggle="modal" data-target="#minedBlockTrackerModal" data-placement="top" title="Delete" onclick="EthoUploads.RemoveContract(\'' + ethoFSHostingContractAddress + '\',\'' + ethoFSHostingContractMainHash + '\');"><i class="zmdi zmdi-delete"></i></button><button class="item" data-toggle="tooltip" data-placement="top" title="More" onclick="showHostingContractDetails(' + counter + ');"><i class="zmdi zmdi-more"></i></button></div></td></tr>'; hostingContracts += '<tr class="tr-shadow" style="display: none;"><td>' + ethoFSHostingContractName + '</td><td><span class="block-email"><a href="#" onclick="EthoUploads.showHostingContractDetails(' + counter + ');">' + ethoFSHostingContractHash + '</a></span></td><td class="desc">' + ethoFSHostingContractStartBlock + '</td><td>' + ethoFSHostingContractEndBlock + '</td><td><span class="status--process"><font color="red">' + ethoFSHostingContractStatus + '</font></span></td><td><div class="table-data-feature"><button class="item" data-toggle="modal" data-target="#minedBlockTrackerModal" data-placement="top" title="Delete" onclick="EthoUploads.RemoveContract(\'' + ethoFSHostingContractAddress + '\',\'' + ethoFSHostingContractMainHash + '\');"><i class="zmdi zmdi-delete"></i></button><button class="item" data-toggle="tooltip" data-placement="top" title="More" onclick="showHostingContractDetails(' + counter + ');"><i class="zmdi zmdi-more"></i></button></div></td></tr>';
} else { } else {
var ethoFSHostingContractStatus = "Active"; var ethoFSHostingContractStatus = "Active";
hostingContracts += '<tr class="tr-shadow"><td>' + ethoFSHostingContractName + '</td><td><span class="block-email"><a href="#" onclick="EthoUploads.showHostingContractDetails(' + counter + ');">' + ethoFSHostingContractHash + '</a></span></td><td class="desc">' + ethoFSHostingContractStartBlock + '</td><td>' + ethoFSHostingContractEndBlock + '</td><td><span class="status--process">' + ethoFSHostingContractStatus + '</span></td><td><div class="table-data-feature"><button class="item" data-toggle="modal" data-target="#minedBlockTrackerModal" data-placement="top" title="Delete" onclick="EthoUploads.RemoveContract(\'' + ethoFSHostingContractAddress + '\',\'' + ethoFSHostingContractMainHash + '\');"><i class="zmdi zmdi-delete"></i></button><button class="item" data-toggle="tooltip" data-placement="top" title="More" onclick="EthoUploads.showHostingContractDetails(' + counter + ');"><i class="zmdi zmdi-more"></i></button></div></td></tr>'; hostingContracts += '<tr class="tr-shadow"><td style="color:white">' + ethoFSHostingContractName + '</td><td><span class="block-email"><a href="#" style="color: #d8477e" onclick="EthoUploads.showHostingContractDetails(' + counter + ');">' + ethoFSHostingContractHash + '</a></span></td><td class="desc" style="color: yellow">' + ethoFSHostingContractStartBlock + '</td><td style="color: red">' + ethoFSHostingContractEndBlock + '</td><td><span class="status--process" style="color: #43d043">' + ethoFSHostingContractStatus + '</span></td><td><div class="table-data-feature"><button class="item" data-toggle="modal" data-target="#minedBlockTrackerModal" data-placement="top" title="Delete" onclick="EthoUploads.RemoveContract(\'' + ethoFSHostingContractAddress + '\',\'' + ethoFSHostingContractMainHash + '\');"><i class="zmdi zmdi-delete"></i></button><button class="item" data-toggle="tooltip" data-placement="top" title="More" onclick="EthoUploads.showHostingContractDetails(' + counter + ');"><i class="zmdi zmdi-more"></i></button></div></td></tr>';
} }
GlobalHostingContractArray[counter]['status'] = ethoFSHostingContractStatus; GlobalHostingContractArray[counter]['status'] = ethoFSHostingContractStatus;
document.getElementById("hostingcontractstablebody").innerHTML = hostingContracts; document.getElementById("hostingcontractstablebody").innerHTML = hostingContracts;