Merge remote-tracking branch 'refs/remotes/origin/master' into lazyLoadFollowers

Author: jjeffryes

js/templates/settings.html

@@ -1160,7 +1160,7 @@ <h3 class="padding15 margin0 fontWeight500"><%= polyglot.t('Advanced') %></h3>
                 <% if(config.testnet) { %>
                 <div class="positionTopRight padding10">
                   <span class="btn btn-txt custCol-secondary">
-                    <%= polyglot.t('MustTestnetAddress') %> <!--remove this in production-->
+                    <%= polyglot.t('MustTestnetAddress') %>
                   </span>
                 </div>
                 <% } %>
@@ -1181,8 +1181,10 @@ <h3 class="padding15 margin0 fontWeight500"><%= polyglot.t('Advanced') %></h3>
                 <div class="fieldItem flexRow">
                   <div class="flexRow">
                     <div class="flexCol-4">
-                      <input type="radio" class="fieldItem" id="fancyStylesYes" name="notFancy" value="true" /><label for="fancyStylesYes" class="radioLabel"><%= polyglot.t('Yes') %></label>
-                      <input type="radio" class="fieldItem" id="fancyStylesNo" name="notFancy" value="false" checked/><label for="fancyStylesNo" class="radioLabel"><%= polyglot.t('No') %></label>
+                      <input type="radio" class="fieldItem" id="fancyStylesYes" name="notFancy" value="true" />
+                      <label for="fancyStylesYes" class="radioLabel"><%= polyglot.t('Yes') %></label>
+                      <input type="radio" class="fieldItem" id="fancyStylesNo" name="notFancy" value="false" checked/>
+                      <label for="fancyStylesNo" class="radioLabel"><%= polyglot.t('No') %></label>
                     </div>
                     <div class="flexCol-8">
                       <div class="marginLeft10 textSize11px txt-fade"><%= polyglot.t('NoFancyStylesWarning') %></div>
@@ -1194,7 +1196,6 @@ <h3 class="padding15 margin0 fontWeight500"><%= polyglot.t('Advanced') %></h3>
             </div>
 
             <div class="flexRow">
-
               <div class="flexCol-3  borderRight custCol-border">
                 <div class="fieldItem">
                   <label>
@@ -1208,29 +1209,32 @@ <h3 class="padding15 margin0 fontWeight500"><%= polyglot.t('Advanced') %></h3>
                 <div class="fieldItem flexRow">
                   <div class="flexRow">
                     <div class="flexCol-4">
-                      <input type="radio" class="fieldItem" id="useTestnetYes" name="useTestnet" value="true" <% if(window.config.testnet){ %>checked<% } %> /><label for="useTestnetYes" class="radioLabel"><%= polyglot.t('Yes') %></label>
-                      <input type="radio" class="fieldItem" id="useTestnetNo" name="useTestnet" value="false" <% if(!window.config.testnet){ %>checked<% } %> /><label for="useTestnetNo" class="radioLabel"><%= polyglot.t('No') %></label>
+                      <input type="radio" class="fieldItem" id="useTestnetYes" name="useTestnet" value="true" <% if(window.config.testnet){ %>checked<% } %> />
+                      <label for="useTestnetYes" class="radioLabel"><%= polyglot.t('Yes') %></label>
+                      <input type="radio" class="fieldItem" id="useTestnetNo" name="useTestnet" value="false" <% if(!window.config.testnet){ %>checked<% } %> />
+                      <label for="useTestnetNo" class="radioLabel"><%= polyglot.t('No') %></label>
                     </div>
                   </div>
                 </div>
               </div>
-
             </div>
 
             <div class="flexRow">
               <div class="flexCol-3  borderRight custCol-border">
                 <div class="fieldItem">
                   <label>
                     <%= polyglot.t('AdditionalPaymentData') %>
-                    <i class="ion-help-circled tooltip tooltip-box" data-tooltip="<%= polyglot.t('AdditionalPaymentDataInfo') %>"></i>
                   </label>
+                  <i class="ion-help-circled tooltip tooltip-box" data-tooltip="<%= polyglot.t('AdditionalPaymentDataInfo') %>"></i>
                 </div>
               </div>
 
               <div class="flexCol-9 borderRight0 custCol-border">
                 <div class="fieldItem">
-                  <input type="radio" class="fieldItem" id="additional_payment_data_yes" name="additionalPaymentData" value="true" checked /><label for="additional_payment_data_yes" class="radioLabel"><%= polyglot.t('Yes') %></label>
-                  <input type="radio" class="fieldItem" id="additional_payment_data_no" name="additionalPaymentData" value="false" /><label for="additional_payment_data_no" class="radioLabel"><%= polyglot.t('No') %></label>
+                  <input type="radio" class="fieldItem" id="additional_payment_data_yes" name="additionalPaymentData" value="true" checked />
+                  <label for="additional_payment_data_yes" class="radioLabel"><%= polyglot.t('Yes') %></label>
+                  <input type="radio" class="fieldItem" id="additional_payment_data_no" name="additionalPaymentData" value="false" />
+                  <label for="additional_payment_data_no" class="radioLabel"><%= polyglot.t('No') %></label>
                 </div>
               </div>
             </div>