Merge pull request #301 from sumitwebkul/gli-669

Unused CSS file htl-reservation-general.css and its classes are removed
Qloapps · Jan 31, 2022 · 537eff3 · 537eff3
2 parents c3b45a7 + af61e4e
commit 537eff3
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 22 deletions.
diff --git a/controllers/front/AuthController.php b/controllers/front/AuthController.php
@@ -64,8 +64,6 @@ public function setMedia()
             $this->addCSS(_THEME_CSS_DIR_.'authentication.css');
         }
 
-        $this->addCSS(_THEME_CSS_DIR_.'htl-reservation-general.css');// webkul
-
         $this->addJqueryPlugin('typewatch');
         $this->addJS(array(
             _THEME_JS_DIR_.'tools/vatManagement.js',

diff --git a/controllers/front/PasswordController.php b/controllers/front/PasswordController.php
@@ -116,6 +116,5 @@ public function setMedia()
         if (count($this->errors)) {
             return;
         }
-        $this->addCSS(_THEME_CSS_DIR_.'htl-reservation-general.css');// by webkul
     }
 }
diff --git a/modules/bankwire/views/templates/front/payment_execution.tpl b/modules/bankwire/views/templates/front/payment_execution.tpl
@@ -45,19 +45,19 @@
             <h3 class="page-subheading">
                 {l s='Bank-wire payment' mod='bankwire'}
             </h3>
-            <p class="cheque-indent htl-reservation-page-content">
+            <p class="cheque-indent">
                 <strong class="dark">
                     {l s='You have chosen to pay by bank wire.' mod='bankwire'} {l s='Here is a short summary of your order:' mod='bankwire'}
                 </strong>
             </p>
-            <p class="htl-reservation-page-content">
+            <p>
                 - {l s='The total amount of your order is' mod='bankwire'}
                 <span id="amount" class="price">{displayPrice price=$total}</span>
                 {if $use_taxes == 1}
                     {l s='(tax incl.)' mod='bankwire'}
                 {/if}
             </p>
-            <p class="htl-reservation-page-content">
+            <p>
                 -
                 {if $currencies|@count > 1}
                     {l s='We allow several currencies to be sent via bank wire.' mod='bankwire'}
@@ -78,14 +78,14 @@
                     <input type="hidden" name="currency_payment" value="{$currencies.0.id_currency}" />
                 {/if}
             </p>
-            <p class="htl-reservation-page-content">
+            <p>
                 - {l s='Bank wire account information will be displayed on the next page.' mod='bankwire'}
                 <br />
                 - {l s='Please confirm your order by clicking "I confirm my order".' mod='bankwire'}
             </p>
         </div><!-- .cheque-box -->
         <p class="cart_navigation clearfix" id="cart_navigation">
-            <a class="btn htl-reservation-form-btn-small" href="{$link->getPageLink('order', true, NULL, "step=3")|escape:'html':'UTF-8'}">
+            <a class="btn" href="{$link->getPageLink('order', true, NULL, "step=3")|escape:'html':'UTF-8'}">
                 <i class="icon-chevron-left"></i>&nbsp;{l s='Other payment methods' mod='bankwire'}
             </a>
             {*By webkul To Check Order restrict condition before Payment by the customer*}

diff --git a/modules/cheque/views/templates/front/payment_execution.tpl b/modules/cheque/views/templates/front/payment_execution.tpl
@@ -82,7 +82,7 @@
 			</a>
 			{*By webkul To Check Order restrict condition before Payment by the customer*}
             {if !$restrict_order}
-                <button class="btn pull-right htl-reservation-form-btn-default" type="submit">
+                <button class="btn pull-right" type="submit">
                     <span>{l s='I confirm my order' mod='bankwire'}&nbsp;<i class="icon-chevron-right right"></i></span>
                 </button>
             {/if}

diff --git a/themes/hotel-reservation-theme/authentication.tpl b/themes/hotel-reservation-theme/authentication.tpl
@@ -283,7 +283,7 @@
 						{assign var=stateExist value=false}
 						{assign var=postCodeExist value=false}
 						{assign var=dniExist value=false}
-						<h3 class="page-subheading top-indent htl-reservation-page-sub-heading">{l s='Invoice address'}</h3>
+						<h3 class="page-subheading top-indent">{l s='Invoice address'}</h3>
 						{foreach from=$inv_all_fields item=field_name}
 						{if $field_name eq "company"}
 						<div class="form-group">
@@ -427,7 +427,7 @@
 	<form action="{$link->getPageLink('authentication', true)|escape:'html':'UTF-8'}" method="post" id="account-creation_form" class="std box">
 		{$HOOK_CREATE_ACCOUNT_TOP}
 		<div class="account_creation">
-			<h3 class="page-subheading htl-reservation-page-sub-heading">{l s='Your personal information'}</h3>
+			<h3 class="page-subheading">{l s='Your personal information'}</h3>
 			<div class="clearfix">
 				<label>{l s='Title'}</label>
 				<br />
@@ -521,7 +521,7 @@
 		</div>
 		{if $b2b_enable}
 			<div class="account_creation">
-				<h3 class="page-subheading htl-reservation-page-sub-heading">{l s='Your company information'}</h3>
+				<h3 class="page-subheading">{l s='Your company information'}</h3>
 				<p class="form-group">
 					<label for="">{l s='Company'}</label>
 					<input type="text" class="form-control" id="company" name="company" value="{if isset($smarty.post.company)}{$smarty.post.company}{/if}" />
@@ -542,7 +542,7 @@
 		{/if}
 		{if isset($PS_REGISTRATION_PROCESS_TYPE) && $PS_REGISTRATION_PROCESS_TYPE}
 			<div class="account_creation">
-				<h3 class="page-subheading htl-reservation-page-sub-heading">{l s='Your address'}</h3>
+				<h3 class="page-subheading">{l s='Your address'}</h3>
 				{foreach from=$dlv_all_fields item=field_name}
 					{if $field_name eq "company"}
 						{if !$b2b_enable}

diff --git a/themes/hotel-reservation-theme/modules/bankwire/views/templates/front/payment_execution.tpl b/themes/hotel-reservation-theme/modules/bankwire/views/templates/front/payment_execution.tpl
@@ -45,19 +45,19 @@
             <h3 class="page-subheading">
                 {l s='Bank-wire payment' mod='bankwire'}
             </h3>
-            <p class="cheque-indent htl-reservation-page-content">
+            <p class="cheque-indent">
                 <strong class="dark">
                     {l s='You have chosen to pay by bank wire.' mod='bankwire'} {l s='Here is a short summary of your order:' mod='bankwire'}
                 </strong>
             </p>
-            <p class="htl-reservation-page-content">
+            <p>
                 - {l s='The total amount of your order is' mod='bankwire'}
                 <span id="amount" class="price">{displayPrice price=$total}</span>
                 {if $use_taxes == 1}
                     {l s='(tax incl.)' mod='bankwire'}
                 {/if}
             </p>
-            <p class="htl-reservation-page-content">
+            <p>
                 -
                 {if $currencies|@count > 1}
                     {l s='We allow several currencies to be sent via bank wire.' mod='bankwire'}
@@ -78,7 +78,7 @@
                     <input type="hidden" name="currency_payment" value="{$currencies.0.id_currency}" />
                 {/if}
             </p>
-            <p class="htl-reservation-page-content">
+            <p>
                 - {l s='Bank wire account information will be displayed on the next page.' mod='bankwire'}
                 <br />
                 - {l s='Please confirm your order by clicking "I confirm my order".' mod='bankwire'}

diff --git a/themes/hotel-reservation-theme/order-confirmation.tpl b/themes/hotel-reservation-theme/order-confirmation.tpl
@@ -260,7 +260,7 @@
 		</div>
 	{/if}
 	<p class="cart_navigation exclusive">
-		<a class="btn htl-reservation-form-btn-small" href="{$link->getPageLink('history', true)|escape:'html':'UTF-8'}" title="{l s='Go to your order history page'}"><i class="icon-chevron-left"></i>{l s='View your order history'}</a>
+		<a class="btn" href="{$link->getPageLink('history', true)|escape:'html':'UTF-8'}" title="{l s='Go to your order history page'}"><i class="icon-chevron-left"></i>{l s='View your order history'}</a>
 	</p>
 {/if}
 

diff --git a/themes/hotel-reservation-theme/password.tpl b/themes/hotel-reservation-theme/password.tpl
@@ -25,7 +25,7 @@
 
 {capture name=path}<a href="{$link->getPageLink('authentication', true)|escape:'html':'UTF-8'}" title="{l s='Authentication'}" rel="nofollow">{l s='Authentication'}</a><span class="navigation-pipe">{$navigationPipe}</span>{l s='Forgot your password'}{/capture}
 <div class="box">
-<h1 class="page-subheading htl-reservation-page-sub-heading">{l s='Forgot your password?'}</h1>
+<h1 class="page-subheading">{l s='Forgot your password?'}</h1>
 
 {include file="$tpl_dir./errors.tpl"}
 
@@ -34,12 +34,12 @@
 {elseif isset($confirmation) && $confirmation == 2}
 <p class="alert alert-success">{l s='A confirmation email has been sent to your address:'} {if isset($customer_email)}{$customer_email|escape:'html':'UTF-8'|stripslashes}{/if}</p>
 {else}
-<p class="htl-reservation-page-content">{l s='Please enter the email address you used to register. We will then send you a new password. '}</p>
+<p>{l s='Please enter the email address you used to register. We will then send you a new password. '}</p>
 <form action="{$request_uri|escape:'html':'UTF-8'}" method="post" class="std" id="form_forgotpassword">
 	<fieldset>
 		<div class="form-group">
-			<label for="email" class="htl-reservation-form-label">{l s='Email address'}</label>
-			<input class="form-control htl-reservation-form-input" type="email" id="email" name="email" value="{if isset($smarty.post.email)}{$smarty.post.email|escape:'html':'UTF-8'|stripslashes}{/if}" />
+			<label for="email">{l s='Email address'}</label>
+			<input class="form-control" type="email" id="email" name="email" value="{if isset($smarty.post.email)}{$smarty.post.email|escape:'html':'UTF-8'|stripslashes}{/if}" />
 		</div>
 		<p class="submit">
             <button type="submit" class="btn button button-medium"><span>{l s='Retrieve Password'}&nbsp;<i class="icon-chevron-right right"></i></span></button>
-Original file line number
+Diff line change
@@ Expand Up / @@ -116,6 +116,5 @@ public function setMedia() @@
             if (count($this->errors)) {
                 return;
             }
-            $this->addCSS(_THEME_CSS_DIR_.'htl-reservation-general.css');// by webkul
         }
     }