BRS 2.2.3 release

PoC-Consortium · Sep 17, 2018 · ec130b6 · ec130b6
1 parent 43863e8
commit ec130b6
Show file tree

Hide file tree

Showing 39 changed files with 1,392 additions and 566 deletions.
diff --git a/README.md b/README.md
@@ -48,28 +48,26 @@ new option naming system.
 
 ###### MariaDb
 
-In the conf directory, copy brs-default.properties into a new file named brs.properties.
+In the conf directory, copy `brs-default.properties` into a new file named `brs.properties`.
 
 Download and install MariaDB <https://mariadb.com/downloads/mariadb-tx>
 
 The MariaDb installation will ask to setup a password for the root user. 
-Add this password to the brs.properties file created above in the following section:
+Add this password to the `brs.properties` file created above in the following section:
 ```
 DB.Url=jdbc:mariadb://localhost:3306/brs_master
 DB.Username=root
 DB.Password=YOUR_PASSWORD
 ```
 
 The MariaDB installation will also install HeidiSQL, a gui tool to administer MariaDb.
-Use it to connect to the newly created mariaDb server and create a new DB called 'burstwallet'. 
+Use it to connect to the newly created mariaDb server and create a new DB called `burstwallet`. 
 
 #### MacOS
 
-Plase use beatsbears' comfortable script <https://github.com/beatsbears/macos_burst/>
-to install and maintain the Burst wallet on your Mac.
-An older howto at ecomineearth
-<https://ecomine.earth/macoswalletinstallguide/> basically describes
-the manual steps the script above does for you.
+BRS can be installed using a [Homebrew](https://brew.sh/) [formula](https://github.com/nixops/homebrew-burstcoind). A short tutorial on how to install BRS using homebrew can be found at [ecomine.earth/macos](https://ecomine.earth/macos/).
+
+A number of other Hombrew formulas (written by [Nixops](https://github.com/nixops)) are also available for plotters and miners.
 
 #### Other Unix-like systems
 
@@ -95,7 +93,7 @@ mysql -uroot < init-mysql.sql
 
 ##### Configure your Wallet
 
-Now you need to add the following stuff to your conf/brs.properties:
+Now you need to add the following stuff to your `conf/brs.properties`:
 
 ```
 DB.Url=jdbc:mariadb://localhost:3306/brs_master

diff --git a/html/ui/css/dev/burstold.css b/html/ui/css/dev/burstold.css
@@ -371,6 +371,12 @@ padding:5px
 .padding-left-10{
     padding-left:10px;
 }
+.padding-right-5{
+    padding-right:5px;
+}
+.padding-right-10{
+    padding-right:10px;
+}
 .font-size-10{
     font-size:10px;
 }
@@ -578,14 +584,34 @@ to {
   color: #749a02;
   text-shadow: 0 0 9px #266000;
 }
-.btn-suggested-fee{
-     color: #fff !important;
-     background-color: #428bca;
-     border-color: #357ebd;
-     text-shadow: 0 -1px 0 rgba(0,0,0,0.2);
-     -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,0.15),0 1px 1px rgba(0,0,0,0.075);
-     box-shadow: inset 0 1px 0 rgba(255,255,255,0.15),0 1px 1px rgba(0,0,0,0.075);
- }
- .btn-suggested-fee:hover, .btn-suggested-fee:active, .btn-suggested-fee:focus {
-     color: #fff !important;
- }
+.btn-suggested-fee {
+    color: #fff !important;
+    background-color: #428bca;
+    border-color: #357ebd;
+    text-shadow: 0 -1px 0 rgba(0,0,0,0.2);
+    -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,0.15),0 1px 1px rgba(0,0,0,0.075);
+    box-shadow: inset 0 1px 0 rgba(255,255,255,0.15),0 1px 1px rgba(0,0,0,0.075);
+}
+.btn-suggested-fee:hover, .btn-suggested-fee:active, .btn-suggested-fee:focus {
+    color: #fff !important;
+}
+.btn-generic {
+    color: #fff !important;
+    background-color: #428bca;
+    border-color: #357ebd;
+    text-shadow: 0 -1px 0 rgba(0,0,0,0.2);
+    -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,0.15),0 1px 1px rgba(0,0,0,0.075);
+    box-shadow: inset 0 1px 0 rgba(255,255,255,0.15),0 1px 1px rgba(0,0,0,0.075);
+}
+.btn-generic:hover, .btn-generic:active, .btn-generic:focus {
+    color: #fff !important;
+}
+.display-none{
+    display:none;
+}
+.display-visible{
+    display:visible;
+}
+.bold{
+    font-weight:bold;
+}
diff --git a/html/ui/html/header.html b/html/ui/html/header.html
@@ -19,6 +19,7 @@
       <ul class="nav navbar-nav">
         <li class="dropdown" id="new-project" style="display: none;"><a href="#deployCrowd" data-toggle="modal" data-target="#deployCrowd" title="New Project"><i class="glyphicon glyphicon-plus"></i> New Project</a></li>
         <li class="dropdown"><a href="#" data-toggle="modal" data-target="#send_money_modal" data-i18n="send_burst"> Send BURST</a></li>
+        <li class="dropdown"><a href="#" data-toggle="modal" data-target="#request_burst_qr_modal" data-i18n="request_burst_qr"> Request BURST QR</a></li>
         <li class="dropdown">
           <a href="#" class="dropdown-toggle" data-toggle="dropdown">
           <i class="fas fa-envelope-open"></i>

diff --git a/html/ui/html/modals/alias.html b/html/ui/html/modals/alias.html
@@ -38,23 +38,23 @@ <h4 class="modal-title" data-i18n="transfer_alias">Transfer Alias</h4>
               <label for="transfer_alias_encrypt_message" style="font-weight:normal;color:#666"><input type="checkbox" name="encrypt_message" id="transfer_alias_encrypt_message" value="1" data-default="checked" checked="checked" /> <span data-i18n="encrypt_message">Encrypt Message</span></label>
             </div>
           </div>
-          <div class="row advanced">
-            <div class="col-xs-6 col-sm-6 col-md-6">
-              <div class="form-group">
-                <label for="transfer_alias_fee" data-i18n="fee">FEE</label>
-                <div class="input-group">
-                  <input type="number" name="feeNXT" id="transfer_alias_fee" class="form-control" step="any" min="0.00735" placeholder="Fee" data-i18n="[placeholder]fee" data-default="0.1" value="0.1" tabindex="4">
-                  <span class="input-group-addon">BURST</span>
-                </div>
-              </div>
+          <div class="form-group">
+            <label for="transfer_alias_fee" data-i18n="fee">FEE</label>
+            <div class="input-group">
+              <input type="number" name="feeNXT" id="transfer_alias_fee" class="form-control" step="any" min="0.00735" placeholder="Fee" data-i18n="[placeholder]fee" data-default="0.1" value="0.1" tabindex="4">
+              <span class="input-group-addon">BURST</span>
             </div>
-            <div class="col-xs-6 col-sm-6 col-md-6">
-              <div class="form-group">
-                <label for="transfer_alias_deadline" data-i18n="deadline_hours">DEADLINE (HOURS)</label>
-                <input type="number" name="deadline" id="transfer_alias_deadline" class="form-control" placeholder="Deadline" data-i18n="[placeholder]deadline" min="1" data-default="24" value="24" tabindex="5">
-              </div>
+            <div class="padding-top-5 padding-bottom-5 font-size-14">
+              <span class="suggested_fee" data-i18n="[title]click_to_refresh"><a href="#" class="btn btn-suggested-fee btn-xs" id="suggested_fee_alias_transfer" data-i18n="suggested_fee">Suggested fee:</a></span>
+              <span id="suggested_fee_response_alias_transfer" class="suggested_fee margin-left-5"></span>
+              <span class="suggested_fee margin-left-10" data-toggle="tooltip" data-placement="top" data-html="true"  data-i18n="[title]suggested_fee_help"><i class="fa fa-info" aria-hidden="true"></i></span>
+              <span class="suggested_fee margin-left-10 suggested_fee_spinner_display_none" name="suggested_fee_spinner"><i class="fa fa-spinner fa-spin fa-fw text-danger"></i></span>
             </div>
           </div>
+          <div class="form-group" advanced>
+            <label for="transfer_alias_deadline" data-i18n="deadline_hours">DEADLINE (HOURS)</label>
+            <input type="number" name="deadline" id="transfer_alias_deadline" class="form-control" placeholder="Deadline" data-i18n="[placeholder]deadline" min="1" data-default="24" value="24" tabindex="5">
+          </div>
           <div class="form-group secret_phrase">
             <label for="transfer_alias_password" data-i18n="passphrase">PASSPHRASE</label>
             <input type="password" name="secretPhrase" id="transfer_alias_password" class="form-control" placeholder="" tabindex="6" autocomplete="">
@@ -193,29 +193,33 @@ <h4 class="modal-title" data-i18n="buy_alias">Buy Alias</h4>
           <div class="form-group">
             <input type="checkbox" name="add_message" id="buy_alias_add_message" class="add_message" tabindex="6" /> <label for="buy_alias_add_message" style="font-weight:normal;margin-bottom:0;"> <span data-i18n="add_message_q">Add a Message?</span></label>
           </div>
+          <div class="form-group">
+            <label for="buy_alias_fee" data-i18n="fee">FEE</label>
+            <div class="input-group">
+              <input type="number" name="feeNXT" id="buy_alias_fee" class="form-control" step="any" min="0.00735" placeholder="Fee" data-i18n="[placeholder]fee" data-default="0.1" value="0.1" tabindex="2">
+              <span class="input-group-addon">BURST</span>
+            </div>
+          </div>
+          <div class="row margin-bottom-5">
+            <div class="col-xs-12 col-sm-12 col-md-12">
+              <div class="padding-top-5 padding-bottom-5 font-size-14">
+                <span class="suggested_fee" data-i18n="[title]click_to_refresh"><a href="#" class="btn btn-suggested-fee btn-xs" id="suggested_fee_alias_buy" data-i18n="suggested_fee">Suggested fee:</a></span>
+                <span id="suggested_fee_response_alias_buy" class="suggested_fee margin-left-5"></span>
+                <span class="suggested_fee margin-left-10" data-toggle="tooltip" data-placement="top" data-html="true"  data-i18n="[title]suggested_fee_help"><i class="fa fa-info" aria-hidden="true"></i></span>
+                <span class="suggested_fee margin-left-10 suggested_fee_spinner_display_none" name="suggested_fee_spinner"><i class="fa fa-spinner fa-spin fa-fw text-danger"></i></span>
+              </div>
+            </div>
+          </div>
           <div class="form-group optional_message">
             <label for="buy_alias_message" data-i18n="message">MESSAGE</label>
             <textarea class="form-control" id="buy_alias_message" name="message" rows="4" tabindex="7"></textarea>
             <div style="margin-top:3px">
               <label for="buy_alias_encrypt_message" style="font-weight:normal;color:#666"><input type="checkbox" name="encrypt_message" id="buy_alias_encrypt_message" value="1" data-default="checked" checked="checked" /> <span data-i18n="encrypt_message">Encrypt Message</span></label>
             </div>
           </div>
-          <div class="row advanced">
-            <div class="col-xs-6 col-sm-6 col-md-6">
-              <div class="form-group">
-                <label for="buy_alias_fee" data-i18n="fee">FEE</label>
-                <div class="input-group">
-                  <input type="number" name="feeNXT" id="buy_alias_fee" class="form-control" step="any" min="0.00735" placeholder="Fee" data-i18n="[placeholder]fee" data-default="0.1" value="0.1" tabindex="2">
-                  <span class="input-group-addon">BURST</span>
-                </div>
-              </div>
-            </div>
-            <div class="col-xs-6 col-sm-6 col-md-6">
-              <div class="form-group">
-                <label for="buy_alias_deadline" data-i18n="deadline_hours">DEADLINE (HOURS)</label>
-                <input type="number" name="deadline" id="buy_alias_deadline" class="form-control" placeholder="Deadline" data-i18n="deadline" min="1" data-default="24" value="24" tabindex="3">
-              </div>
-            </div>
+          <div class="form-group advanced">
+            <label for="buy_alias_deadline" data-i18n="deadline_hours">DEADLINE (HOURS)</label>
+            <input type="number" name="deadline" id="buy_alias_deadline" class="form-control" placeholder="Deadline" data-i18n="deadline" min="1" data-default="24" value="24" tabindex="3">
           </div>
           <div class="form-group secret_phrase">
             <label for="buy_alias_password" data-i18n="passphrase">PASSPHRASE</label>
@@ -283,34 +287,38 @@ <h4 class="modal-title" data-i18n="sell_alias">Sell Alias</h4>
             <label for="sell_alias_recipient_public_key" data-i18n="recipient_public_key">Recipient Public Key</label>
             <input type="text" class="form-control" name="recipientPublicKey" id="sell_alias_recipient_public_key" placeholder="Public Key" data-i18n="[placeholder]public_key" tabindex="2" spellcheck="false" />
           </div>
-          <div class="row">
-            <div class="col-xs-12 col-sm-12 col-md-12 advanced_extend" data-normal="12" data-advanced="6">
-              <div class="form-group">
-                <label for="sell_alias_price" data-i18n="price">PRICE</label>
-                <div class="input-group">
-                  <input type="text" name="priceNXT" id="sell_alias_price" step="any" min="0" class="form-control" placeholder="Price" tabindex="3">
-                  <span class="input-group-addon">BURST</span>
-                </div>
-              </div>
+          <div class="form-group">
+            <label for="sell_alias_price" data-i18n="price">PRICE</label>
+            <div class="input-group">
+              <input type="text" name="priceNXT" id="sell_alias_price" step="any" min="0" class="form-control" placeholder="Price" tabindex="3">
+              <span class="input-group-addon">BURST</span>
             </div>
-            <div class="col-xs-3 col-sm-3 col-md-3 advanced">
-              <div class="form-group">
+          </div>
+          <div class="row">
+            <div class="col-xs-12 col-sm-12 col-md-12">
+              <div class="form-group padding-left-5 padding-right-5">
                 <label for="sell_alias_fee" data-i18n="fee">FEE</label>
                 <div class="input-group">
                   <input type="number" name="feeNXT" id="sell_alias_fee" class="form-control" step="any" min="0.00735" placeholder="Fee" data-i18n="[placeholder]fee" data-default="0.1" value="0.1" tabindex="4">
                   <span class="input-group-addon">BURST</span>
                 </div>
+                <div class="padding-top-5 padding-bottom-5 font-size-14">
+                  <span class="suggested_fee" data-i18n="[title]click_to_refresh"><a href="#" class="btn btn-suggested-fee btn-xs" id="suggested_fee_alias_sell" data-i18n="suggested_fee">Suggested fee:</a></span>
+                  <span id="suggested_fee_response_alias_sell" class="suggested_fee margin-left-5"></span>
+                  <span class="suggested_fee margin-left-10" data-toggle="tooltip" data-placement="top" data-html="true"  data-i18n="[title]suggested_fee_help"><i class="fa fa-info" aria-hidden="true"></i></span>
+                  <span class="suggested_fee margin-left-10 suggested_fee_spinner_display_none" name="suggested_fee_spinner"><i class="fa fa-spinner fa-spin fa-fw text-danger"></i></span>
+                </div>
               </div>
             </div>
-            <div class="col-xs-3 col-sm-3 col-md-3 advanced">
-              <div class="form-group">
+          </div>
+            <div class="form-group advanced">
                 <label for="sell_alias_deadline" data-i18n="deadline_hours">DEADLINE (HOURS)</label>
                 <input type="number" name="deadline" id="sell_alias_deadline" class="form-control" placeholder="Deadline" data-i18n="[placeholder]deadline" min="1" data-default="24" value="24" tabindex="5">
-              </div>
             </div>
-          </div>
           <div class="form-group add_message_container">
-            <input type="checkbox" name="add_message" id="sell_alias_add_message" class="add_message" tabindex="6" /> <label for="sell_alias_add_message" style="font-weight:normal;margin-bottom:0;"> <span data-i18n="add_message_q">Add a Message?</span></label>
+            <div class="checkbox">
+              <label for="sell_alias_add_message" style="font-weight:normal;margin-bottom:0;"><input type="checkbox" name="add_message" id="sell_alias_add_message" class="add_message" tabindex="6" />  <span data-i18n="add_message_q">Add a Message?</span></label>
+              </div>
           </div>
           <div class="form-group optional_message">
             <label for="sell_alias_message" data-i18n="message">MESSAGE</label>