Merge branch 'development' of https://github.com/MPOS/php-mpos into development

Author: MPOS123

public/templates/bootstrap/account/edit/detail.tpl

@@ -33,14 +33,14 @@
             <div class="form-group">
               <label>Timezone</label>
               {nocache}
-              <select class="form-control" name="timezone">
+              <select class="form-control select-mini" name="timezone" {if $GLOBAL.twofactor.enabled && $GLOBAL.twofactor.options.details && !$DETAILSUNLOCKED}id="disabledInput" disabled{/if}>
                 {html_options options=$TIMEZONES selected=$GLOBAL.userdata.timezone}
               </select>
               {/nocache}
             </div>
             <div class="form-group">
               <label>Payment Address</label>
-              {nocache}<input class="form-control" type="text" name="paymentAddress" value="{$smarty.request.paymentAddress|default:$GLOBAL.userdata.coin_address|escape}" size="40"  {if $GLOBAL.twofactor.enabled && $GLOBAL.twofactor.options.details && !$DETAILSUNLOCKED}id="disabledInput" disabled{/if}/>{/nocache}
+              {nocache}<input class="form-control" type="text" name="paymentAddress" value="{$smarty.request.paymentAddress|default:$GLOBAL.userdata.coin_address|escape}" size="40" {if $GLOBAL.twofactor.enabled && $GLOBAL.twofactor.options.details && !$DETAILSUNLOCKED}id="disabledInput" disabled{/if}/>{/nocache}
             </div>
             <div class="form-group">
               <label>Donation Percentage</label>