Upstream Updates

2019-10-20 20:58:04 -07:00
parent f69ab25e0b 3e3eca1b3f
commit 12b169f591
3252 changed files with 18992 additions and 349761 deletions
--- a/assets/templates/send.html
+++ b/assets/templates/send.html
@@ -15,10 +15,10 @@
          <label for="sendToAddress" class="active">To address:</label>
          <div class="addressInputWrapper">
            <input id="sendToAddress" placeholder="recipient address" type="text">
-            <button type="button" class="btn btn-etho btnSendToolButton" id="btnAddToAddressBook">
+            <button type="button" class="btn button3 btnSendToolButton" id="btnAddToAddressBook">
              <i class="fas fa-plus"></i>
            </button>
-            <button type="button" class="btn btn-etho btnSendToolButton" id="btnLookForToAddress">
+            <button type="button" class="btn button3 btnSendToolButton" id="btnLookForToAddress">
              <i class="fas fa-search"></i>
            </button>
          </div>
@@ -27,19 +27,19 @@
      </div>
      <div class="row">
        <div class="input-field col s6">
-          <input id="sendAmmount" placeholder="0" type="number" value="0">
+          <input id="sendAmmount" placeholder="0" type="number">
          <label for="sendAmmount" class="active">Amount:</label>
        </div>
        <div class="input-field col s6">
          <div class="input-field col s12">
            <span id="sendMaxAmmount">0</span><span>ETHO</span>
-            <button type="button" class="btn btn-etho" id="btnSendAll">ALL</button>
+            <button type="button" class="button4" id="btnSendAll">ALL</button>
          </div>
        </div>
      </div>
      <div class="row">
        <div class="input-field col s12">
-          <button type="button" class="btn btn-etho" id="btnSendTransaction">Send</button>
+          <button type="button" class="button4" id="btnSendTransaction">Send</button>
        </div>
      </div>
    </form>
@@ -96,7 +96,7 @@
      <label for="usr">Type Password:</label>
      <input type="password" class="form-control" id="walletPassword">
    </div>
-    <button type="button" class="btn btn-etho btn-dialog-confirm" id="btnSendWalletPasswordConfirm">Confirm</button>
+    <button type="button" class="btn button3 btn-dialog-confirm" id="btnSendWalletPasswordConfirm">Confirm</button>
  </div>
 </div>

@@ -112,7 +112,7 @@
      <label for="usr">Address Name:</label>
      <input type="text" class="form-control" id="inputAddressName">
    </div>
-    <button type="button" class="btn btn-etho btn-dialog-confirm" id="btnAddAddressToBookConfirm">Confirm</button>
+    <button type="button" class="btn button3 btn-dialog-confirm" id="btnAddAddressToBookConfirm">Confirm</button>
  </div>
 </div>
 <span id="nodestorage" style="display:none;">Loading</span>
--- a/assets/templates/uploads.html
+++ b/assets/templates/uploads.html
@@ -1,24 +1,24 @@
 <head>
+<<<<<<< HEAD
  <!-- Google Fonts -->
  <link href="https://fonts.googleapis.com/css?family=Roboto:400,700&subset=latin,cyrillic-ext" rel="stylesheet"
    type="text/css">
+=======
+  <link href="https://fonts.googleapis.com/css?family=Roboto:400,700&subset=latin,cyrillic-ext" rel="stylesheet" type="text/css">
+>>>>>>> 3e3eca1b3fe4254614dadc63f41fe2e72405e83f
  <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet" type="text/css">
-  <!-- Bootstrap Core Css -->
-  <!--<link href="assets/dashboard/plugins/bootstrap/css/bootstrap.css" rel="stylesheet">-->
-  <!-- Waves Effect Css -->
  <link href="assets/dashboard/plugins/node-waves/waves.css" rel="stylesheet" />
-  <!-- Animation Css -->
  <link href="assets/dashboard/plugins/animate-css/animate.css" rel="stylesheet" />
-  <!-- Morris Chart Css
-<link href="assets/dashboard/plugins/morrisjs/morris.css" rel="stylesheet" />-->
-  <!-- Custom Css -->
  <link href="assets/dashboard/css/style.css" rel="stylesheet">
+<<<<<<< HEAD
  <link rel="stylesheet"
    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 -->
+=======
+  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/material-design-iconic-font/2.2.0/css/material-design-iconic-font.min.css">
+>>>>>>> 3e3eca1b3fe4254614dadc63f41fe2e72405e83f
  <link href="assets/dashboard/css/themes/all-themes.css" rel="stylesheet" />
  <script src="https://medium-widget.pixelpoint.io/widget.js"></script>
-
 </head>

 <div class="marketStats">
@@ -179,7 +179,7 @@
    <!-- #END# Hash Tables -->

    <!-- Login Modal -->
-    <div class="modal fade" id="ethofsLoginModal" tabindex="-1" role="dialog">
+    <div class="modal fade" id="ethofsLoginModal" tabindex="-1" role="dialog" style="background-color: #840032">
      <div class="modal-dialog" role="document">
        <div class="modal-content" style="background-color: #840032; padding-top:150px;">
          <div class="modal-header">
@@ -234,7 +234,7 @@
    </div>

    <!-- Registration Modal -->
-    <div class="modal fade" id="ethofsRegistrationModal" tabindex="-1" role="dialog">
+    <div class="modal fade" id="ethofsRegistrationModal" tabindex="-1" role="dialog" style="background-color: #840032">
      <div class="modal-dialog" role="document">
        <div class="modal-content" style="background-color: #840032; padding-top:150px;">
          <div class="modal-header">
@@ -268,7 +268,7 @@
    </div>

    <!-- Default Size Modal -->
-    <div class="modal fade" id="defaultModal" tabindex="-1" role="dialog">
+    <div class="modal fade" id="defaultModal" tabindex="-1" role="dialog" style="background-color: #840032">
      <div class="modal-dialog" role="document">
        <div class="modal-content" style="background-color: #840032;">
          <div class="modal-header">
@@ -315,7 +315,7 @@
    </div>

    <!--Upload Modal -->
-    <div class="modal fade" id="defaultModal2" tabindex="-1" role="dialog">
+    <div class="modal fade" id="defaultModal2" tabindex="-1" role="dialog" style="background-color: #840032">
      <div class="modal-dialog" role="document">
        <div class="modal-content" style="background-color: #840032;">
          <div class="modal-header">
@@ -359,7 +359,7 @@
      </div>
    </div>

-    <div class="modal fade" id="defaultModal3" tabindex="-1" role="dialog">
+    <div class="modal fade" id="defaultModal3" tabindex="-1" role="dialog" style="background-color: #840032">
      <div class="modal-dialog" role="document">
        <div class="modal-content" style="background-color: #840032;">
          <div class="modal-header">
@@ -428,7 +428,7 @@
      </div>
    </div>

-    <div class="modal fade" id="uploadTrackerModal" tabindex="-1" role="dialog">
+    <div class="modal fade" id="uploadTrackerModal" tabindex="-1" role="dialog" style="background-color: #840032">
      <div class="modal-dialog" role="document">
        <div class="modal-content" style="background-color: #840032;">
          <div class="modal-header">
@@ -511,8 +511,12 @@
    <!-- end analyze data modal -->

    <!-- begin mined block checking modal -->
+<<<<<<< HEAD
    <div class="modal fade" id="minedBlockTrackerModal" tabindex="-1" role="dialog" aria-labelledby="staticModalLabel"
      aria-hidden="true" data-backdrop="static">
+=======
+    <div class="modal fade" id="minedBlockTrackerModal" tabindex="-1" role="dialog" aria-labelledby="staticModalLabel" aria-hidden="true" data-backdrop="static" style="background-color: #840032">
+>>>>>>> 3e3eca1b3fe4254614dadc63f41fe2e72405e83f
      <div class="modal-dialog" role="document">
        <div class="modal-content" style="background-color: #840032;">
          <div class="modal-header">
@@ -553,8 +557,12 @@
    <!-- end mined block checking modal -->

    <!-- begin preparing upload modal -->
+<<<<<<< HEAD
    <div class="modal fade" id="preparingUploadModal" tabindex="-1" role="dialog" aria-labelledby="staticModalLabel"
      aria-hidden="true" data-backdrop="static">
+=======
+    <div class="modal fade" id="preparingUploadModal" tabindex="-1" role="dialog" aria-labelledby="staticModalLabel" aria-hidden="true" data-backdrop="static" style="background-color: #840032">
+>>>>>>> 3e3eca1b3fe4254614dadc63f41fe2e72405e83f
      <div class="modal-dialog" role="document">
        <div class="modal-content" style="background-color: #840032;">
          <div class="modal-header">
@@ -586,7 +594,7 @@
    <!-- end preparing upload modal -->

    <!-- begin contract detail modal -->
-    <div class="modal fade" id="contractDetailModal" tabindex="-1" role="dialog" style="padding-top:0px">
+    <div class="modal fade" id="contractDetailModal" tabindex="-1" role="dialog" style="padding-top:0px;background-color: #840032">
      <div class="modal-dialog" role="document">
        <div class="modal-content" style="background-color: #840032;">
          <div class="modal-header">
--- a/assets/templates/wallets.html
+++ b/assets/templates/wallets.html
@@ -24,8 +24,10 @@
    <table class="bordered" id="addressTable">
      <thead>
        <tr>
+          <th scope="col" class="no-sort"></th>
          <th scope="col">Name</th>
          <th scope="col">Address</th>
+          <th scope="col" class="no-sort"></th>
          <th scope="col" data-sort-method='number'>Balance</th>
        </tr>
      </thead>
@@ -46,7 +48,7 @@
                <i class="fas fa-qrcode"></i>
              </button>
            </td>
-            <td>{{balance}}</td>
+            <td id="colorbal" style="color: red;">{{balance}}</td>
          </tr>
        {{/addressData}}
      </tbody>
@@ -74,32 +76,32 @@

 <!-- The modal to change wallet name -->
 <div id="dlgChangeWalletName" class="modalDialog" data-izimodal-title="Wallet Name" data-izimodal-subtitle="Enter the name for this address" data-izimodal-icon="icon-home">
-<div class="modalBody">
-  <div class="form-group">
-    <label for="inputWalletName">Type Name:</label>
-    <input type="text" class="form-control" id="inputWalletName">
+  <div class="modalBody">
+    <div class="form-group">
+      <label for="inputWalletName">Type Name:</label>
+      <input type="text" class="form-control" id="inputWalletName">
+    </div>
+    <button type="button" class="btn btn-etho btn-dialog-confirm" id="btnChangeWalletNameConfirm">Confirm</button>
  </div>
-  <button type="button" class="btn btn-etho btn-dialog-confirm" id="btnChangeWalletNameConfirm">Confirm</button>
-</div>
 </div>

 <!-- The modal to import from private key -->
 <div id="dlgImportFromPrivateKey" class="modalDialog" data-izimodal-title="Import private key" data-izimodal-subtitle="Import account from private key" data-izimodal-icon="icon-home">
-<div class="modalBody">
-  <div class="form-group">
-    <label for="inputPrivateKey">Private Key:</label>
-    <input type="password" class="form-control" id="inputPrivateKey">
+  <div class="modalBody">
+    <div class="form-group">
+      <label for="inputPrivateKey">Private Key:</label>
+      <input type="password" class="form-control" id="inputPrivateKey">
+    </div>
+    <div class="form-group">
+      <label for="walletPasswordSecond">Account Password:</label>
+      <input type="password" class="form-control" id="keyPasswordFirst">
+    </div>
+    <div class="form-group">
+      <label for="walletPasswordSecond">Confirm Password:</label>
+      <input type="password" class="form-control" id="keyPasswordSecond">
+    </div>
+    <button type="button" class="btn btn-etho btn-dialog-confirm" id="btnImportFromPrivateKeyConfirm">Import</button>
  </div>
-  <div class="form-group">
-    <label for="walletPasswordSecond">Account Password:</label>
-    <input type="password" class="form-control" id="keyPasswordFirst">
-  </div>
-  <div class="form-group">
-    <label for="walletPasswordSecond">Confirm Password:</label>
-    <input type="password" class="form-control" id="keyPasswordSecond">
-  </div>
-  <button type="button" class="btn btn-etho btn-dialog-confirm" id="btnImportFromPrivateKeyConfirm">Import</button>
-</div>
 </div>

 <span id="nodestorage" style="display:none;">Loading</span>