Remove unused assets/images directory and move favicon.ico to admin a…

…ssets directory
tastyigniter · Dec 4, 2018 · d47c3fe · d47c3fe
1 parent 75960bb
commit d47c3fe
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 28 deletions.
diff --git a/assets/images/favicon.ico → app/admin/assets/images/favicon.ico b/assets/images/favicon.ico → app/admin/assets/images/favicon.ico
diff --git a/app/admin/views/_meta/assets.json b/app/admin/views/_meta/assets.json
@@ -1,6 +1,6 @@
 {
   "doctype": "html5",
-  "favicon": "/assets/images/favicon.ico",
+  "favicon": "/app/admin/assets/images/favicon.ico",
   "meta": [
     {
       "name": "Content-type",

diff --git a/app/admin/views/_partials/top_nav.php b/app/admin/views/_partials/top_nav.php
@@ -1,9 +1,4 @@
-<?php
-$isLogged = AdminAuth::isLogged();
-$systemLogo = image_url('tastyigniter-logo.png');
-$systemName = lang('system::lang.system_name');
-?>
-<?php if ($isLogged) { ?>
+<?php if (AdminAuth::isLogged()) { ?>
     <nav class="navbar navbar-top navbar-expand navbar-fixed-top" role="navigation">
         <div class="container-fluid">
             <div class="navbar-brand">

diff --git a/app/admin/views/auth/login.php b/app/admin/views/auth/login.php
@@ -1,23 +1,18 @@
 <div class="container-fluid">
     <div class="login-container">
         <div class="card">
-            <div class="card-header">
-                <?php $logo = setting('site_logo', 'tastyigniter-logo.png'); ?>
-                <img alt="<?= setting('site_name'); ?>"
-                     src="<?= image_url($logo) ?>"
-                     height="64px" width="250px">
-            </div>
             <div class="card-body">
                 <?= form_open(current_url(),
                     [
-                        'id'     => 'edit-form',
-                        'role'   => 'form',
+                        'id' => 'edit-form',
+                        'role' => 'form',
                         'method' => 'POST',
                     ]
                 ); ?>
 
                 <div class="form-group">
-                    <label for="input-user" class="control-label"><?= lang('admin::lang.login.label_username'); ?></label>
+                    <label for="input-user"
+                           class="control-label"><?= lang('admin::lang.login.label_username'); ?></label>
                     <input name="user" type="text" id="input-user" class="form-control"/>
                     <?= form_error('user', '<span class="text-danger">', '</span>'); ?>
                 </div>
@@ -33,7 +28,8 @@ class="control-label"><?= lang('admin::lang.login.label_password'); ?></label>
                         class="btn btn-primary btn-lg pull-right"
                     ><i class="fa fa-sign-in fa-fw"></i>&nbsp;&nbsp;&nbsp;<?= lang('admin::lang.login.button_login'); ?>
                     </button>
-                    <p><a href="<?= admin_url('login/reset'); ?>"><?= lang('admin::lang.login.text_forgot_password'); ?></a>
+                    <p>
+                        <a href="<?= admin_url('login/reset'); ?>"><?= lang('admin::lang.login.text_forgot_password'); ?></a>
                     </p>
                 </div>
 

diff --git a/app/admin/views/auth/reset.php b/app/admin/views/auth/reset.php
@@ -1,18 +1,12 @@
 <div class="container-fluid">
     <div class="login-container">
         <div class="card">
-            <div class="card-header">
-                <?php $logo = setting('site_logo', 'tastyigniter-logo.png'); ?>
-                <img alt="<?= setting('site_name'); ?>"
-                     src="<?= image_url($logo) ?>"
-                     height="64px" width="250px">
-            </div>
             <div class="card-body">
                 <h5><?= lang('admin::lang.login.text_reset_password_title'); ?></h5>
                 <?= form_open(current_url(),
                     [
-                        'id'     => 'edit-form',
-                        'role'   => 'form',
+                        'id' => 'edit-form',
+                        'role' => 'form',
                         'method' => 'POST',
                     ]
                 ); ?>

diff --git a/app/system/database/records/settings.json b/app/system/database/records/settings.json
@@ -32,7 +32,7 @@
   {
     "sort": "config",
     "item": "site_logo",
-    "value": "tastyigniter-logo.png"
+    "value": "no_photo.png"
   },
   {
     "sort": "config",

diff --git a/assets/images/select2-spinner.gif b/assets/images/select2-spinner.gif
diff --git a/assets/images/select2.png b/assets/images/select2.png
diff --git a/assets/images/select2x2.png b/assets/images/select2x2.png
diff --git a/assets/images/spritemap.png b/assets/images/spritemap.png
diff --git a/assets/images/spritemap@2x.png b/assets/images/spritemap@2x.png
diff --git a/assets/images/tastyigniter-logo.png b/assets/images/tastyigniter-logo.png
diff --git a/themes/demo/_partials/head.php b/themes/demo/_partials/head.php
@@ -1,6 +1,6 @@
 <?= get_metas(); ?>
-<link href="<?= image_url('favicon.ico'); ?>" rel="shortcut icon" type="image/ico">
+<link href="<?= asset('app/admin/assets/images/favicon.ico'); ?>" rel="shortcut icon" type="image/ico">
 <title><?= sprintf(lang('main::lang.site_title'), lang(get_title()), setting('site_name')); ?></title>
 <link href="<?= asset('app/system/assets/ui/flame.css') ?>" rel="stylesheet" type="text/css" id="flame-css">
-<?= get_style_tags(['widget', 'component', 'theme']); ?>
+<?= get_style_tags(); ?>
 <link href="<?= theme_url('demo/assets/css/demo.css') ?>" rel="stylesheet" type="text/css" id="demo-css">