From b170e1adf66923d6679a1ad0764ec9d02f927ece Mon Sep 17 00:00:00 2001 From: VE10-Sanjeev Date: Mon, 25 Sep 2023 13:09:25 +0530 Subject: [PATCH] sanjeev --- app/Controllers/BaseController.php | 4 +- app/Views/auth_confirm_mail.php | 8 +- app/Views/auth_lock_screen.php | 8 +- app/Views/auth_login.php | 8 +- app/Views/auth_logout.php | 8 +- app/Views/auth_reset_password.php | 2 +- app/Views/template/footer.php | 6 +- app/Views/template/header.php | 17 +-- app/Views/template/topbar.php | 44 +++---- .../company/JerryCharlesMiculekPublishing.ico | Bin 58374 -> 0 bytes .../company/JerryCharlesMiculekPublishing.png | Bin 4955 -> 0 bytes .../images/company/LuminaDatamatics.ico | Bin 150014 -> 0 bytes .../images/company/LuminaDatamatics.png | Bin 5484 -> 0 bytes .../assets/images/company/RenaMadhuBalan.ico | Bin 20519 -> 0 bytes .../assets/images/company/RenaMadhuBalan.png | Bin 50594 -> 0 bytes .../company/VijayabharathamPublishing.ico | Bin 58546 -> 0 bytes .../company/VijayabharathamPublishing.png | Bin 7954 -> 0 bytes public/assets/images/company/default.ico | Bin 207494 -> 0 bytes public/assets/images/company/default.png | Bin 22351 -> 0 bytes public/assets/images/file-icons/3ds.svg | 106 ++++++++-------- public/assets/images/file-icons/aac.svg | 108 ++++++++--------- public/assets/images/file-icons/ai.svg | 96 +++++++-------- public/assets/images/file-icons/avi.svg | 100 +++++++-------- public/assets/images/file-icons/bmp.svg | 112 ++++++++--------- public/assets/images/file-icons/cad.svg | 106 ++++++++-------- public/assets/images/file-icons/cdr.svg | 106 ++++++++-------- public/assets/images/file-icons/css.svg | 112 ++++++++--------- public/assets/images/file-icons/dat.svg | 100 +++++++-------- public/assets/images/file-icons/dll.svg | 98 +++++++-------- public/assets/images/file-icons/dmg.svg | 108 ++++++++--------- public/assets/images/file-icons/doc.svg | 108 ++++++++--------- public/assets/images/file-icons/eps.svg | 108 ++++++++--------- public/assets/images/file-icons/fla.svg | 102 ++++++++-------- public/assets/images/file-icons/flv.svg | 102 ++++++++-------- public/assets/images/file-icons/gif.svg | 106 ++++++++-------- public/assets/images/file-icons/html.svg | 108 ++++++++--------- public/assets/images/file-icons/indd.svg | 104 ++++++++-------- public/assets/images/file-icons/iso.svg | 106 ++++++++-------- public/assets/images/file-icons/jpg.svg | 110 ++++++++--------- public/assets/images/file-icons/js.svg | 100 +++++++-------- public/assets/images/file-icons/midi.svg | 106 ++++++++-------- public/assets/images/file-icons/mov.svg | 108 ++++++++--------- public/assets/images/file-icons/mp3.svg | 114 +++++++++--------- public/assets/images/file-icons/mpg.svg | 112 ++++++++--------- public/assets/images/file-icons/pdf.svg | 102 ++++++++-------- public/assets/images/file-icons/php.svg | 108 ++++++++--------- public/assets/images/file-icons/png.svg | 112 ++++++++--------- public/assets/images/file-icons/ppt.svg | 102 ++++++++-------- public/assets/images/file-icons/ps.svg | 102 ++++++++-------- public/assets/images/file-icons/psd.svg | 106 ++++++++-------- public/assets/images/file-icons/raw.svg | 106 ++++++++-------- public/assets/images/file-icons/sql.svg | 110 ++++++++--------- public/assets/images/file-icons/svg.svg | 110 ++++++++--------- public/assets/images/file-icons/tif.svg | 100 +++++++-------- public/assets/images/file-icons/txt.svg | 102 ++++++++-------- public/assets/images/file-icons/wmv.svg | 108 ++++++++--------- public/assets/images/file-icons/xls.svg | 106 ++++++++-------- public/assets/images/file-icons/xml.svg | 106 ++++++++-------- public/assets/images/file-icons/zip.svg | 102 ++++++++-------- public/assets/images/logo-ci.png | Bin 7870 -> 0 bytes 60 files changed, 2159 insertions(+), 2174 deletions(-) delete mode 100644 public/assets/images/company/JerryCharlesMiculekPublishing.ico delete mode 100644 public/assets/images/company/JerryCharlesMiculekPublishing.png delete mode 100644 public/assets/images/company/LuminaDatamatics.ico delete mode 100644 public/assets/images/company/LuminaDatamatics.png delete mode 100755 public/assets/images/company/RenaMadhuBalan.ico delete mode 100755 public/assets/images/company/RenaMadhuBalan.png delete mode 100644 public/assets/images/company/VijayabharathamPublishing.ico delete mode 100644 public/assets/images/company/VijayabharathamPublishing.png delete mode 100644 public/assets/images/company/default.ico delete mode 100644 public/assets/images/company/default.png delete mode 100644 public/assets/images/logo-ci.png diff --git a/app/Controllers/BaseController.php b/app/Controllers/BaseController.php index 812be8b8..f9eba771 100644 --- a/app/Controllers/BaseController.php +++ b/app/Controllers/BaseController.php @@ -74,8 +74,8 @@ abstract class BaseController extends Controller $data['loggedin_person'] = $session_uname; $data['loggedin_person_id'] = $session_uid; $data['loggedin_person_role'] = $details[0]['role']; - $data['favicon'] = $details[0]['favicon']; - $data['profile_picture'] = $details[0]['profile_picture']; + $data['favicon'] = file_exists(base_url()."public/uploads/".$details[0]['favicon']) ? base_url()."public/uploads/".$details[0]['favicon'] : base_url()."public/uploads/default.ico"; + $data['profile_picture'] = file_exists(base_url()."public/uploads/".$details[0]['profile_picture']) ? base_url()."public/uploads/".$details[0]['profile_picture'] : base_url()."public/assets/images/users/avatar-9.jpg"; $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); diff --git a/app/Views/auth_confirm_mail.php b/app/Views/auth_confirm_mail.php index af6a618c..e36eade1 100644 --- a/app/Views/auth_confirm_mail.php +++ b/app/Views/auth_confirm_mail.php @@ -9,7 +9,7 @@ - "> + "> " rel="stylesheet" type="text/css" id="bs-default-stylesheet" /> @@ -37,16 +37,14 @@ diff --git a/app/Views/auth_lock_screen.php b/app/Views/auth_lock_screen.php index 04c39814..2302b587 100644 --- a/app/Views/auth_lock_screen.php +++ b/app/Views/auth_lock_screen.php @@ -8,7 +8,7 @@ - "> + "> " rel="stylesheet" type="text/css" id="bs-default-stylesheet" /> " rel="stylesheet" type="text/css" id="app-default-stylesheet" /> @@ -35,16 +35,14 @@ diff --git a/app/Views/auth_login.php b/app/Views/auth_login.php index 27d3dbc5..9a45727e 100755 --- a/app/Views/auth_login.php +++ b/app/Views/auth_login.php @@ -9,7 +9,7 @@ - "> + "> " rel="stylesheet" type="text/css" id="bs-default-stylesheet" /> @@ -36,16 +36,14 @@

Enter your email address and password to access admin panel.

diff --git a/app/Views/auth_logout.php b/app/Views/auth_logout.php index 0b3c1d0a..2b709b8a 100755 --- a/app/Views/auth_logout.php +++ b/app/Views/auth_logout.php @@ -8,7 +8,7 @@ - "> + "> " rel="stylesheet" type="text/css" id="bs-default-stylesheet" /> @@ -36,16 +36,14 @@ diff --git a/app/Views/auth_reset_password.php b/app/Views/auth_reset_password.php index ced9118b..6a518ed2 100644 --- a/app/Views/auth_reset_password.php +++ b/app/Views/auth_reset_password.php @@ -9,7 +9,7 @@ - "> + "> " rel="stylesheet" type="text/css" id="bs-default-stylesheet" /> " rel="stylesheet" type="text/css" id="app-default-stylesheet" /> diff --git a/app/Views/template/footer.php b/app/Views/template/footer.php index 57229530..d6aa8617 100644 --- a/app/Views/template/footer.php +++ b/app/Views/template/footer.php @@ -9,8 +9,10 @@
-

© .

- + company fav icon for footer + © +
diff --git a/app/Views/template/header.php b/app/Views/template/header.php index 71c83159..61ad4076 100644 --- a/app/Views/template/header.php +++ b/app/Views/template/header.php @@ -8,7 +8,7 @@ - " > + " rel="stylesheet" type="text/css" /> @@ -45,25 +45,21 @@
@@ -72,8 +68,7 @@
- " alt="user-img" title="Mat Helme" - class="rounded-circle avatar-md"> + user-img
diff --git a/app/Views/template/topbar.php b/app/Views/template/topbar.php index 7a5ad2c8..1db176d2 100644 --- a/app/Views/template/topbar.php +++ b/app/Views/template/topbar.php @@ -221,7 +221,7 @@
  • @@ -270,30 +270,26 @@
    - + - -
    + +