Updated index.html

Author: brainwallet

index.html

@@ -150,21 +150,25 @@ <h3><span class="pull-right" id="qr_addr"></span></h3>
                         </div><span class="help-inline" id="progress"></span> 
                     </div>
                 </div>
+                <div class="control-group"> 
+                    <label class="control-label" for="range">Range</label> 
+                    <div class="controls"> 
+                        <input class="span2" id="range" maxlength="3" type="text" value="6"> 
+                    </div>
+                </div>
                 <div class="control-group"> 
                     <label class="control-label" for="csv">Wallet Format</label> 
-                    <div class="controls form-inline"> 
-                        <span class="btn-group" data-toggle="buttons-radio" id="chain_format"> 
-                        <button class="btn active" id="csv" type="button">CSV</button> 
-                        <button class="btn" id="json" type="button">JSON</button> 
-                        </span> <label class="span2 checkbox">Range 
-                        <input class="span1" id="range" maxlength="3" type="text" value="6"> 
-                        </label> 
+                    <div class="controls"> 
+                        <div class="btn-group" data-toggle="buttons-radio" id="chain_format"> 
+                            <button class="btn active" id="csv" type="button">CSV</button> 
+                            <button class="btn" id="json" type="button">JSON</button> 
+                        </div>
                     </div>
                 </div>
                 <div class="control-group"> 
                     <label class="control-label" for="chain">Chain</label> 
                     <div class="controls"> 
-<textarea class="span8" id="chain" readonly rows="15"></textarea>
+<textarea class="span8" id="chain" readonly rows="13"></textarea>
                     </div>
                 </div>
                 <div class="control-group"> 
@@ -233,7 +237,7 @@ <h3><span class="pull-right" id="qr_addr"></span></h3>
                         <input class="span4" id="txDest" type="text"> 
                         <div class="input-prepend"> <span class="add-on">BTC</span><input class="span2" id="txValue" type="text"> 
                         </div><span class="help-inline errormsg"></span> 
-                        <button class="btn" id="txAddDest" type="button" title="Not implemented" disabled>+</button> 
+                        <button class="btn" disabled id="txAddDest" title="Not implemented" type="button">+</button> 
                         <button class="btn" id="txSend" type="button">Send Transaction</button> 
                     </div>
                 </div>

js/brainwallet.js

@@ -652,10 +652,8 @@
         Electrum.stop();
 
         if (chain_type == 'chain_electrum') {
-
            if (seed.length == 0)
                return;
-
             Electrum.init(seed, electrum_seed_update, electrum_seed_success);
         }
 
@@ -841,6 +839,15 @@
 
     $(document).ready( function() {
 
+        if (window.location.hash == '#converter')
+            $('#tab-converter').tab('show');
+        else if (window.location.hash == '#chains')
+            $('#tab-chains').tab('show');
+        else if (window.location.hash == '#transactions')
+            $('#tab-transactions').tab('show');
+
+        // generator
+
         onInput('#pass', onChangePass);
         onInput('#hash', onChangeHash);
         onInput('#sec', onChangePrivKey);
@@ -859,17 +866,7 @@
         generate();
         $('#pass').focus();
 
-        onInput('#src', onChangeFrom);
-
-        $("body").on("click", "#enc_from .btn", update_enc_from);
-        $("body").on("click", "#enc_to .btn", update_enc_to);
-
-        if (window.location.hash == '#converter')
-            $('#tab-converter').tab('show');
-        else if (window.location.hash == '#chains')
-            $('#tab-chains').tab('show');
-        else if (window.location.hash == '#transactions')
-            $('#tab-transactions').tab('show');
+        // chains
 
         $('#seed_random').click(onSeedRandom);
 
@@ -883,7 +880,7 @@
         onInput($('#seed'), onChangeSeed);
         onInput($('#memo'), onChangeMemo);
 
-        // -- transactions -- 
+        // transactions
 
         $('#txSec').val(tx_sec);
         $('#txAddr').val(tx_addr);
@@ -906,5 +903,11 @@
         $('#txAddDest').click(txOnAddDest);
         $('#txSend').click(txSend);
 
+        // converter
+
+        onInput('#src', onChangeFrom);
+        $("body").on("click", "#enc_from .btn", update_enc_from);
+        $("body").on("click", "#enc_to .btn", update_enc_to);
+
     });
 })(jQuery);