logo fixes : ps

This commit is contained in:
VE10-Sanjeev 2023-09-27 11:28:57 +05:30
parent c1a0c5b1a9
commit 1f7915d503
5 changed files with 14 additions and 9 deletions

View File

@ -267,6 +267,8 @@ class Authentication extends BaseController
$data['loggedin_person_role'] = $details[0]['role'];
$data['favicon'] = file_exists(FCPATH."public/uploads/".$details[0]['favicon']) ? base_url("public/uploads/".$details[0]['favicon']) : base_url("public/uploads/default.ico");
$data['profile_picture'] = file_exists(FCPATH."public/uploads/".$details[0]['profile_picture']) ? base_url("public/uploads/" . $details[0]['profile_picture']) : base_url("public/assets/images/users/avatar-9.jpg");
$data['company_logo_small'] = file_exists(FCPATH."public/uploads/".$details[0]['company_logo_small']) ? base_url("public/uploads/" . $details[0]['company_logo_small']) : base_url("public/uploads/default_logo.png");
$data['company_logo_large'] = file_exists(FCPATH."public/uploads/".$details[0]['company_logo_large']) ? base_url("public/uploads/" . $details[0]['company_logo_large']) : base_url("public/uploads/default.png");
$successMessage = session()->getFlashdata('success');
$validationErrors = session()->getFlashdata('error');
// Load and display the form view with the above data

View File

@ -76,6 +76,8 @@ abstract class BaseController extends Controller
$data['loggedin_person_role'] = $details[0]['role'];
$data['favicon'] = file_exists(FCPATH."public/uploads/".$details[0]['favicon']) ? base_url("public/uploads/".$details[0]['favicon']) : base_url("public/uploads/default.ico");
$data['profile_picture'] = file_exists(FCPATH."public/uploads/".$details[0]['profile_picture']) ? base_url("public/uploads/" . $details[0]['profile_picture']) : base_url("public/assets/images/users/avatar-9.jpg");
$data['company_logo_small'] = file_exists(FCPATH."public/uploads/".$details[0]['company_logo_small']) ? base_url("public/uploads/" . $details[0]['company_logo_small']) : base_url("public/uploads/default_logo.png");
$data['company_logo_large'] = file_exists(FCPATH."public/uploads/".$details[0]['company_logo_large']) ? base_url("public/uploads/" . $details[0]['company_logo_large']) : base_url("public/uploads/default.png");
$data['browser_title'] = $data['company_name'] . ' | ' . $data['company_short_name'] . ' ' . $data['page_name'];
$data['heading'] = $data['page_name'] == "Dashboard" ? 'Welcome to ' . $data['company_name'] : "";
echo view('template/header.php', $data);

View File

@ -10,8 +10,9 @@ class AuthenticationModel extends Model
public function getheringDetailsForHeader($user_id)
{
$builder = $this->db->table('users');
$builder->select('user_id,user_name,email,first_name,last_name,password,mobile_no,date_of_birth,address,gender,profile_picture,city,state,postal_code,users.country,role,setting_id,site_name,site_title,favicon,logo,terms_service,footer_about,admin_email,mobile,copyright,pagination_limit,site_info,about_info,mail_protocol,mail_title,mail_host,mail_port,mail_encryption,mail_username,mail_password,currency,settings.country');
$builder->select('user_id,user_name,users.email,users.first_name,users.last_name,users.password,users.mobile_no,date_of_birth,users.address,gender,profile_picture,users.city,users.state,users.postal_code,users.country,role,setting_id,site_name,site_title,favicon,logo,terms_service,footer_about,admin_email,mobile,copyright,pagination_limit,site_info,about_info,mail_protocol,mail_title,mail_host,mail_port,mail_encryption,mail_username,mail_password,currency,settings.country,settings.logo as company_logo_large,business.business_logo as company_logo_small');
$builder->join('settings', 'settings.business_id = users.business_id', 'left');
$builder->join('business', 'business.business_id = users.business_id', 'left');
$builder->where('user_id', $user_id);
//$template_mapping_details['fk_entity_id'];
$query = $builder->get();

View File

@ -45,11 +45,11 @@
<div class="logo-box">
<a href="dashboard" class="logo logo-dark text-center">
<span class="logo-sm">
<img src="<?= base_url()."public/uploads/default_logo.png" ?>" alt="<?= $company_short_name; ?>" height="24">
<img src="<?= $company_logo_small; ?>" alt="<?= $company_short_name; ?>" height="24">
<!-- <span class="logo-lg-text-light">Minton</span> -->
</span>
<span class="logo-lg">
<img src="<?= base_url()."public/uploads/default.png" ?>" alt="<?= $company_name; ?>" height="50">
<img src="<?= $company_logo_large; ?>" alt="<?= $company_name; ?>" height="50">
<!-- <img src="<?= base_url()."public/uploads/default.png" ?>" alt="<?= $company_name; ?>" height="20"> -->
<!-- <span class="logo-lg-text-light">M</span> -->
</span>
@ -57,11 +57,11 @@
<a href="dashboard" class="logo logo-light text-center">
<span class="logo-sm">
<img src="<?= base_url()."public/uploads/default_logo.png" ?>" alt="<?= $company_short_name; ?>" height="24">
<img src="<?= $company_logo_small; ?>" alt="<?= $company_short_name; ?>" height="24">
</span>
<span class="logo-lg">
<!-- <img src="<?= base_url()."public/uploads/default.png" ?>" alt="<?= $company_name; ?>" height="24"> -->
<img src="<?= base_url()."public/uploads/default.png" ?>" alt="<?= $company_name; ?>" height="50">
<img src="<?= $company_logo_large; ?>" alt="<?= $company_name; ?>" height="50">
</span>
</a>
</div>

View File

@ -272,11 +272,11 @@
<div class="logo-box">
<a href="dashboard" class="logo logo-dark text-center">
<span class="logo-sm">
<img src="<?= base_url()."public/uploads/default_logo.png" ?>" alt="<?= $company_short_name; ?>" height="24">
<img src="<?= $company_logo_small; ?>" alt="<?= $company_short_name; ?>" height="24">
<!-- <span class="logo-lg-text-light">Minton</span> -->
</span>
<span class="logo-lg">
<img src="<?= base_url()."public/uploads/default.png" ?>" alt="<?= $company_name; ?>" height="50">
<img src="<?= $company_logo_large; ?>" alt="<?= $company_name; ?>" height="50">
<!-- <img src="<?= base_url()."public/uploads/default.png" ?>" alt="<?= $company_name; ?>" height="20"> -->
<!-- <span class="logo-lg-text-light">M</span> -->
</span>
@ -284,11 +284,11 @@
<a href="dashboard" class="logo logo-light text-center">
<span class="logo-sm">
<img src="<?= base_url()."public/uploads/default_logo.png" ?>" alt="<?= $company_short_name; ?>" height="24">
<img src="<?= $company_logo_small; ?>" alt="<?= $company_short_name; ?>" height="24">
</span>
<span class="logo-lg">
<!-- <img src="<?= base_url()."public/uploads/default.png" ?>" alt="<?= $company_name; ?>" height="24"> -->
<img src="<?= base_url()."public/uploads/default.png" ?>" alt="<?= $company_name; ?>" height="50">
<img src="<?= $company_logo_large; ?>" alt="<?= $company_name; ?>" height="50">
</span>
</a>
</div>