Small review on admin labels

opencart · Oct 7, 2022 · da0e0ae · da0e0ae
1 parent e84ead0
commit da0e0ae
Show file tree

Hide file tree

Showing 10 changed files with 45 additions and 25 deletions.
diff --git a/upload/admin/view/template/catalog/information_form.twig b/upload/admin/view/template/catalog/information_form.twig
@@ -116,7 +116,8 @@
                         <input type="checkbox" name="bottom" value="1" checked="checked" id="input-bottom"/>
                       {% else %}
                         <input type="checkbox" name="bottom" value="1" id="input-bottom"/>
-                      {% endif %}&nbsp;</label>
+                      {% endif %}&nbsp;
+                    </label>
                   </div>
                 </div>
               </div>

diff --git a/upload/admin/view/template/catalog/subscription_form.twig b/upload/admin/view/template/catalog/subscription_form.twig
@@ -149,6 +149,6 @@
   </div>
   <script type="text/javascript"><!--
       $('#language a:first').tab('show');
-      //--></script>
+  //--></script>
 </div>
 {{ footer }}
diff --git a/upload/admin/view/template/extension/advertise/google_campaign.twig b/upload/admin/view/template/extension/advertise/google_campaign.twig
@@ -127,10 +127,16 @@
               {% if not from_dashboard %}
                 <div class="alert alert-info text-left">
                   <div class="checkbox">
-                    <label><input type="checkbox" class="acknowledge"/> {{ text_acknowledge_add_campaign_1 }}</label>
+                    <label>
+                      <input type="checkbox" class="acknowledge"/>
+                      {{ text_acknowledge_add_campaign_1 }}
+                    </label>
                   </div>
                   <div class="checkbox">
-                    <label><input type="checkbox" class="acknowledge"/> {{ text_acknowledge_add_campaign_2 }}</label>
+                    <label>
+                      <input type="checkbox" class="acknowledge"/>
+                      {{ text_acknowledge_add_campaign_2 }}
+                    </label>
                   </div>
                 </div>
               {% endif %}
@@ -144,12 +150,9 @@
       <div class="col-md-3">
         <div class="panel panel-default">
           <div class="panel-heading">
-            <h3 class="panel-title">
-              <i class="fa fa-info-circle"></i>&nbsp;<span>{{ text_panel_heading_more_info }}</span></h3>
-          </div>
-          <div class="panel-body">
-            {{ text_campaign_more_info }}
+            <h3 class="panel-title"><i class="fa fa-info-circle"></i>&nbsp;<span>{{ text_panel_heading_more_info }}</span></h3>
           </div>
+          <div class="panel-body">{{ text_campaign_more_info }}</div>
         </div>
         <div class="panel panel-default">
           <div class="panel-heading">

diff --git a/upload/admin/view/template/extension/advertise/google_merchant.twig b/upload/admin/view/template/extension/advertise/google_merchant.twig
@@ -39,17 +39,26 @@
           <div class="form-group">
             <p class="col-md-12">{{ text_merchant_intro }}</p>
             <div class="col-md-12">
-              <label class="control-label"><input type="radio" name="advertise_google_gmc_account_type" value="api" {% if advertise_google_gmc_account_type == "api" %} checked {% endif %}/> {{ text_new_merchant }}</label>
+              <label class="control-label">
+                <input type="radio" name="advertise_google_gmc_account_type" value="api" {% if advertise_google_gmc_account_type == "api" %} checked {% endif %}/>
+                {{ text_new_merchant }}
+              </label>
             </div>
             <div class="col-md-12">
-              <label class="control-label"><input type="radio" name="advertise_google_gmc_account_type" value="existing" {% if advertise_google_gmc_account_type == "existing" %} checked {% endif %}/> {{ text_existing_merchant }}</label>
+              <label class="control-label">
+                <input type="radio" name="advertise_google_gmc_account_type" value="existing" {% if advertise_google_gmc_account_type == "existing" %} checked {% endif %}/>
+                {{ text_existing_merchant }}
+              </label>
             </div>
           </div>
           <div class="alert alert-info text-left">
             {{ text_merchant_website_claim }}
             <hr>
             <div class="checkbox">
-              <label><input type="checkbox" class="acknowledge"/> {{ text_acknowledge_merchant_tos }}</label>
+              <label>
+                <input type="checkbox" class="acknowledge"/>
+                {{ text_acknowledge_merchant_tos }}
+              </label>
             </div>
           </div>
           <div class="pull-right">

diff --git a/upload/admin/view/template/extension/payment/cardinity_order_ajax.twig b/upload/admin/view/template/extension/payment/cardinity_order_ajax.twig
@@ -46,8 +46,10 @@
 								{% if refund_action %}
 									<label class="control-label">{{ text_amount }}:</label>
 									<input id="refund-amount" text="text" name="refund_amount" value="{{ max_refund_amount }}"/>
+
 									<label class="control-label">{{ text_description }}</label>
 									<input id="refund-description" text="text" name="refund_description" value=""/>
+
 									<a class="btn btn-primary button-command" data-type="refund">{{ button_refund }}</a>
 								{% else %}
 									{{ text_na }}

diff --git a/upload/admin/view/template/extension/payment/divido.twig b/upload/admin/view/template/extension/payment/divido.twig
@@ -87,12 +87,14 @@
                   <label>
                     <input type="checkbox" name="payment_divido_plans_selected[]" value="{{ plan.id }}" checked="checked">
                     {{ plan.text }} {{ plan.interest_rate }}% APR
-                  </label><br/>
+                  </label>
+                  <br/>
                 {% else %}
                   <label>
                     <input type="checkbox" name="payment_divido_plans_selected[]" value="{{ plan.id }}">
                     {{ plan.text }} {{ plan.interest_rate }}% APR
-                  </label><br/>
+                  </label>
+                  <br/>
                 {% endif %}
               {% endfor %}
             </div>

diff --git a/upload/admin/view/template/extension/payment/laybuy.twig b/upload/admin/view/template/extension/payment/laybuy.twig
@@ -273,14 +273,14 @@
                     <div class="form-group">
                       <label class="control-label" for="input-status">{{ entry_status }}</label>
                       <select name="filter_status" id="input-status" class="form-control"/>
-                      <option value="*"></option>
-                      {% for transaction_status in transaction_statuses %}
-                        {% if transaction_status.status_id == filter_status %}
-                          <option value="{{ transaction_status.status_id }}" selected="selected">{{ transaction_status.status_name }}</option>
-                        {% else %}
-                          <option value="{{ transaction_status.status_id }}">{{ transaction_status.status_name }}</option>
-                        {% endif %}
-                      {% endfor %}
+                        <option value="*"></option>
+                        {% for transaction_status in transaction_statuses %}
+                          {% if transaction_status.status_id == filter_status %}
+                            <option value="{{ transaction_status.status_id }}" selected="selected">{{ transaction_status.status_name }}</option>
+                          {% else %}
+                            <option value="{{ transaction_status.status_id }}">{{ transaction_status.status_name }}</option>
+                          {% endif %}
+                        {% endfor %}
                       </select>
                     </div>
                   </div>

diff --git a/upload/admin/view/template/extension/payment/pp_express_search.twig b/upload/admin/view/template/extension/payment/pp_express_search.twig
@@ -108,7 +108,7 @@
                 <br/>
                 <select name="currency_code" class="form-control">
                   {% for code in currency_codes %}
-                  <option {% if code == default_currency  %} 'selected' {% endif %}>{{ code }}</option>
+                    <option {% if code == default_currency  %} 'selected' {% endif %}>{{ code }}</option>
                   {% endfor %}
                 </select>
               </div>

diff --git a/upload/admin/view/template/extension/payment/sagepay_direct.twig b/upload/admin/view/template/extension/payment/sagepay_direct.twig
@@ -178,7 +178,9 @@
           {% if payment_sagepay_direct_last_cron_job_run %}
             <div class="form-group">
               <label class="col-sm-2 control-label">{{ entry_last_cron_job_run }}</label>
-              <div class="col-sm-10">{{ payment_sagepay_direct_last_cron_job_run }}</div>
+              <div class="col-sm-10">
+                {{ payment_sagepay_direct_last_cron_job_run }}
+              </div>
             </div>
           {% endif %}
         </form>

diff --git a/upload/admin/view/template/extension/payment/securetrading_pp.twig b/upload/admin/view/template/extension/payment/securetrading_pp.twig
@@ -110,7 +110,8 @@
                     {% else %}
                       <input type="checkbox" name="payment_securetrading_pp_cards_accepted[]" value="{{ key }}"/>
                     {% endif %}
-                    {{ value }} </label>
+                    {{ value }}
+                  </label>
                 </div>
               {% endfor %}
               {% if error_cards_accepted %}