From 1295d219abecea969f95f301711d01a6546a6795 Mon Sep 17 00:00:00 2001
From: Diego Najar <dignajar@gmail.com>
Date: Thu, 7 Mar 2019 16:13:47 +0100
Subject: [PATCH] Move images to bl-kernel folder #981

---
 bl-kernel/admin/themes/gris                        |   2 +-
 bl-kernel/admin/views/edit-content.php             |   4 ++--
 bl-kernel/admin/views/edit-user.php                |   2 +-
 bl-kernel/admin/views/new-content.php              |   4 ++--
 bl-kernel/admin/views/settings.php                 |   2 +-
 bl-kernel/admin/views/users.php                    |   2 +-
 bl-kernel/boot/init.php                            |   2 +-
 bl-kernel/{admin/themes/booty => }/img/default.svg |   0
 bl-kernel/{admin/themes/booty => }/img/favicon.png | Bin
 bl-kernel/{admin/themes/booty => }/img/logo.svg    |   0
 bl-kernel/js/variables.php                         |   2 +-
 11 files changed, 10 insertions(+), 10 deletions(-)
 rename bl-kernel/{admin/themes/booty => }/img/default.svg (100%)
 rename bl-kernel/{admin/themes/booty => }/img/favicon.png (100%)
 rename bl-kernel/{admin/themes/booty => }/img/logo.svg (100%)

diff --git a/bl-kernel/admin/themes/gris b/bl-kernel/admin/themes/gris
index f616042c..2f331dd6 160000
--- a/bl-kernel/admin/themes/gris
+++ b/bl-kernel/admin/themes/gris
@@ -1 +1 @@
-Subproject commit f616042ccc0eaa37dab6a0c3ad67bb022574952b
+Subproject commit 2f331dd640db048102b1f5478f231ecfdb5fa131
diff --git a/bl-kernel/admin/views/edit-content.php b/bl-kernel/admin/views/edit-content.php
index 664d27fc..d6f3c125 100644
--- a/bl-kernel/admin/views/edit-content.php
+++ b/bl-kernel/admin/views/edit-content.php
@@ -141,7 +141,7 @@ echo Bootstrap::formOpen(array(
 			?>
 			<label class="mt-4 mb-2 pb-2 border-bottom text-uppercase w-100"><?php $L->p('Cover Image') ?></label>
 			<div>
-			<img id="jscoverImagePreview" class="mx-auto d-block w-100" alt="Cover image preview" src="<?php echo (empty($coverImage) ? HTML_PATH_ADMIN_THEME_IMG.'default.svg' : $page->coverImage() ) ?>" />
+			<img id="jscoverImagePreview" class="mx-auto d-block w-100" alt="Cover image preview" src="<?php echo (empty($coverImage) ? HTML_PATH_CORE_IMG.'default.svg' : $page->coverImage() ) ?>" />
 			</div>
 			<div class="mt-2 text-center">
 				<button type="button" id="jsbuttonSelectCoverImage" class="btn btn-primary btn-sm"><?php echo $L->g('Select cover image') ?></button>
@@ -159,7 +159,7 @@ echo Bootstrap::formOpen(array(
 
 					$("#jsbuttonRemoveCoverImage").on("click", function() {
 						$("#jscoverImage").val('');
-						$("#jscoverImagePreview").attr('src', HTML_PATH_ADMIN_THEME_IMG+'default.svg');
+						$("#jscoverImagePreview").attr('src', HTML_PATH_CORE_IMG+'default.svg');
 					});
 				});
 			</script>
diff --git a/bl-kernel/admin/views/edit-user.php b/bl-kernel/admin/views/edit-user.php
index d5d2d726..c92a2ae6 100644
--- a/bl-kernel/admin/views/edit-user.php
+++ b/bl-kernel/admin/views/edit-user.php
@@ -105,7 +105,7 @@
 			<label class="custom-file-label" for="jsprofilePictureInputFile"><?php $L->p('Choose images to upload'); ?></label>
 		</div>
 		<div>
-			<img id="jsprofilePicturePreview" class="img-fluid img-thumbnail" alt="Profile picture preview" src="<?php echo (Sanitize::pathFile(PATH_UPLOADS_PROFILES.$user->username().'.png')?DOMAIN_UPLOADS_PROFILES.$user->username().'.png?version='.time():HTML_PATH_ADMIN_THEME_IMG.'default.svg') ?>" />
+			<img id="jsprofilePicturePreview" class="img-fluid img-thumbnail" alt="Profile picture preview" src="<?php echo (Sanitize::pathFile(PATH_UPLOADS_PROFILES.$user->username().'.png')?DOMAIN_UPLOADS_PROFILES.$user->username().'.png?version='.time():HTML_PATH_CORE_IMG.'default.svg') ?>" />
 		</div>
 		<script>
 		$("#jsprofilePictureInputFile").on("change", function() {
diff --git a/bl-kernel/admin/views/new-content.php b/bl-kernel/admin/views/new-content.php
index 9383152a..51e58e9c 100644
--- a/bl-kernel/admin/views/new-content.php
+++ b/bl-kernel/admin/views/new-content.php
@@ -118,7 +118,7 @@ echo Bootstrap::formOpen(array(
 			<!-- Cover Image -->
 			<label class="mt-4 mb-2 pb-2 border-bottom text-uppercase w-100"><?php $L->p('Cover Image') ?></label>
 			<div>
-				<img id="jscoverImagePreview" class="mx-auto d-block w-100" alt="Cover image preview" src="<?php echo HTML_PATH_ADMIN_THEME_IMG ?>default.svg" />
+				<img id="jscoverImagePreview" class="mx-auto d-block w-100" alt="Cover image preview" src="<?php echo HTML_PATH_CORE_IMG ?>default.svg" />
 			</div>
 			<div class="mt-2 text-center">
 				<button type="button" id="jsbuttonSelectCoverImage" class="btn btn-primary btn-sm"><?php echo $L->g('Select cover image') ?></button>
@@ -136,7 +136,7 @@ echo Bootstrap::formOpen(array(
 
 					$("#jsbuttonRemoveCoverImage").on("click", function() {
 						$("#jscoverImage").val('');
-						$("#jscoverImagePreview").attr('src', HTML_PATH_ADMIN_THEME_IMG+'default.svg');
+						$("#jscoverImagePreview").attr('src', HTML_PATH_CORE_IMG+'default.svg');
 					});
 				});
 			</script>
diff --git a/bl-kernel/admin/views/settings.php b/bl-kernel/admin/views/settings.php
index ccf40219..780b5df2 100644
--- a/bl-kernel/admin/views/settings.php
+++ b/bl-kernel/admin/views/settings.php
@@ -514,7 +514,7 @@
 			<label class="custom-file-label" for="jssiteLogoInputFile"><?php $L->p('Choose images to upload'); ?></label>
 		</div>
 		<div>
-			<img id="jssiteLogoPreview" class="img-fluid img-thumbnail" alt="Site logo preview" src="<?php echo ($site->logo()?DOMAIN_UPLOADS.$site->logo(false).'?version='.time():HTML_PATH_ADMIN_THEME_IMG.'default.svg') ?>" />
+			<img id="jssiteLogoPreview" class="img-fluid img-thumbnail" alt="Site logo preview" src="<?php echo ($site->logo()?DOMAIN_UPLOADS.$site->logo(false).'?version='.time():HTML_PATH_CORE_IMG.'default.svg') ?>" />
 		</div>
 		<script>
 		$("#jssiteLogoInputFile").on("change", function() {
diff --git a/bl-kernel/admin/views/users.php b/bl-kernel/admin/views/users.php
index 83e75e1c..20eb6f1a 100644
--- a/bl-kernel/admin/views/users.php
+++ b/bl-kernel/admin/views/users.php
@@ -30,7 +30,7 @@ foreach ($list as $username) {
 	try {
 		$user = new User($username);
 		echo '<tr>';
-		echo '<td><img class="profilePicture mr-1" alt="" src="'.(Sanitize::pathFile(PATH_UPLOADS_PROFILES.$user->username().'.png')?DOMAIN_UPLOADS_PROFILES.$user->username().'.png':HTML_PATH_ADMIN_THEME_IMG.'default.svg').'" /><a href="'.HTML_PATH_ADMIN_ROOT.'edit-user/'.$username.'">'.$username.'</a></td>';
+		echo '<td><img class="profilePicture mr-1" alt="" src="'.(Sanitize::pathFile(PATH_UPLOADS_PROFILES.$user->username().'.png')?DOMAIN_UPLOADS_PROFILES.$user->username().'.png':HTML_PATH_CORE_IMG.'default.svg').'" /><a href="'.HTML_PATH_ADMIN_ROOT.'edit-user/'.$username.'">'.$username.'</a></td>';
 		echo '<td class="d-none d-lg-table-cell">'.$user->nickname().'</td>';
 		echo '<td>'.$user->email().'</td>';
 		echo '<td>'.($user->enabled()?'<b>'.$L->g('Enabled').'</b>':$L->g('Disabled')).'</td>';
diff --git a/bl-kernel/boot/init.php b/bl-kernel/boot/init.php
index a687784b..2bd1604c 100644
--- a/bl-kernel/boot/init.php
+++ b/bl-kernel/boot/init.php
@@ -168,9 +168,9 @@ define('HTML_PATH_ADMIN_ROOT',		HTML_PATH_ROOT.ADMIN_URI_FILTER.'/');
 define('HTML_PATH_ADMIN_THEME',		HTML_PATH_ROOT.'bl-kernel/admin/themes/'.$site->adminTheme().'/');
 define('HTML_PATH_ADMIN_THEME_JS',	HTML_PATH_ADMIN_THEME.'js/');
 define('HTML_PATH_ADMIN_THEME_CSS',	HTML_PATH_ADMIN_THEME.'css/');
-define('HTML_PATH_ADMIN_THEME_IMG',	HTML_PATH_ADMIN_THEME.'img/');
 define('HTML_PATH_CORE_JS',		HTML_PATH_ROOT.'bl-kernel/js/');
 define('HTML_PATH_CORE_CSS',		HTML_PATH_ROOT.'bl-kernel/css/');
+define('HTML_PATH_CORE_IMG',		HTML_PATH_ROOT.'bl-kernel/img/');
 define('HTML_PATH_CONTENT',		HTML_PATH_ROOT.'bl-content/');
 define('HTML_PATH_UPLOADS',		HTML_PATH_ROOT.'bl-content/uploads/');
 define('HTML_PATH_UPLOADS_PAGES',	HTML_PATH_UPLOADS.'pages/');
diff --git a/bl-kernel/admin/themes/booty/img/default.svg b/bl-kernel/img/default.svg
similarity index 100%
rename from bl-kernel/admin/themes/booty/img/default.svg
rename to bl-kernel/img/default.svg
diff --git a/bl-kernel/admin/themes/booty/img/favicon.png b/bl-kernel/img/favicon.png
similarity index 100%
rename from bl-kernel/admin/themes/booty/img/favicon.png
rename to bl-kernel/img/favicon.png
diff --git a/bl-kernel/admin/themes/booty/img/logo.svg b/bl-kernel/img/logo.svg
similarity index 100%
rename from bl-kernel/admin/themes/booty/img/logo.svg
rename to bl-kernel/img/logo.svg
diff --git a/bl-kernel/js/variables.php b/bl-kernel/js/variables.php
index f30ab36b..28ce775d 100644
--- a/bl-kernel/js/variables.php
+++ b/bl-kernel/js/variables.php
@@ -3,7 +3,7 @@
 echo 'var HTML_PATH_ROOT = "'.HTML_PATH_ROOT.'";'.PHP_EOL;
 echo 'var HTML_PATH_ADMIN_ROOT = "'.HTML_PATH_ADMIN_ROOT.'";'.PHP_EOL;
 echo 'var HTML_PATH_ADMIN_THEME = "'.HTML_PATH_ADMIN_THEME.'";'.PHP_EOL;
-echo 'var HTML_PATH_ADMIN_THEME_IMG = "'.HTML_PATH_ADMIN_THEME_IMG.'";'.PHP_EOL;
+echo 'var HTML_PATH_CORE_IMG = "'.HTML_PATH_CORE_IMG.'";'.PHP_EOL;
 echo 'var HTML_PATH_UPLOADS = "'.HTML_PATH_UPLOADS.'";'.PHP_EOL;
 echo 'var HTML_PATH_UPLOADS_THUMBNAILS = "'.HTML_PATH_UPLOADS_THUMBNAILS.'";'.PHP_EOL;
 echo 'var BLUDIT_VERSION = "'.BLUDIT_VERSION.'";'.PHP_EOL;