port to Bootstrap v5 modals and change icons

This commit is contained in:
dignajar 2020-12-29 18:53:06 +01:00
parent 1e143270aa
commit 39de732f3b
19 changed files with 204 additions and 205 deletions

View file

@ -23,7 +23,7 @@ $numberOfPages = count($listOfFilesByPage);
<!-- <!--
UPLOAD INPUT UPLOAD INPUT
--> -->
<h3 class="mt-2 mb-3"><i class="fa fa-image"></i> <?php $L->p('Images'); ?></h3> <h3 class="mt-2 mb-3"><i class="bi-image"></i> <?php $L->p('Images'); ?></h3>
<div id="jsalertMedia" class="alert alert-warning d-none" role="alert"></div> <div id="jsalertMedia" class="alert alert-warning d-none" role="alert"></div>
@ -107,9 +107,9 @@ function displayFiles(files, numberOfPages = <?= $numberOfPages ?>) {
'<td class="information">'+ '<td class="information">'+
'<div class="text-primary pb-2">'+filename+'<\/div>'+ '<div class="text-primary pb-2">'+filename+'<\/div>'+
'<div>'+ '<div>'+
'<a href="#" class="me-3 text-secondary" onClick="editorInsertMedia(\''+image+'\'); closeMediaManager();"><i class="fa fa-plus"></i><?php $L->p('Insert') ?><\/a>'+ '<a href="#" class="me-3 text-secondary" onClick="editorInsertMedia(\''+image+'\'); closeMediaManager();"><i class="bi-plus"></i><?php $L->p('Insert') ?><\/a>'+
'<a href="#" class="text-secondary" onClick="setCoverImage(\''+filename+'\'); closeMediaManager();"><i class="fa fa-square-o"></i><?php $L->p('Set as cover image') ?><\/button>'+ '<a href="#" class="text-secondary" onClick="setCoverImage(\''+filename+'\'); closeMediaManager();"><i class="bi-square-o"></i><?php $L->p('Set as cover image') ?><\/button>'+
'<a href="#" class="float-end text-danger" onClick="deleteMedia(\''+filename+'\')"><i class="fa fa-trash-o"></i><?php $L->p('Delete') ?><\/a>'+ '<a href="#" class="float-end text-danger" onClick="deleteMedia(\''+filename+'\')"><i class="bi-trash-o"></i><?php $L->p('Delete') ?><\/a>'+
'<\/div>'+ '<\/div>'+
'<\/td>'+ '<\/td>'+
'<\/tr>'; '<\/tr>';

View file

@ -22,10 +22,10 @@
<?php if (!checkRole(array('admin'),false)): ?> <?php if (!checkRole(array('admin'),false)): ?>
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" href="<?php echo HTML_PATH_ADMIN_ROOT.'content' ?>"><span class="fa fa-archive"></span><?php $L->p('Content') ?></a> <a class="nav-link" href="<?php echo HTML_PATH_ADMIN_ROOT.'content' ?>"><span class="bi-archive"></span><?php $L->p('Content') ?></a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" href="<?php echo HTML_PATH_ADMIN_ROOT.'edit-user/'.$login->username() ?>"><span class="fa fa-user"></span><?php $L->p('Profile') ?></a> <a class="nav-link" href="<?php echo HTML_PATH_ADMIN_ROOT.'edit-user/'.$login->username() ?>"><span class="bi-user"></span><?php $L->p('Profile') ?></a>
</li> </li>
<?php endif; ?> <?php endif; ?>
@ -87,6 +87,6 @@
<?php endif; ?> <?php endif; ?>
<li class="nav-item mt-5"> <li class="nav-item mt-5">
<a class="nav-link" href="<?php echo HTML_PATH_ADMIN_ROOT.'logout' ?>"><span class="fa fa-arrow-circle-right"></span><?php $L->p('Logout') ?></a> <a class="nav-link" href="<?php echo HTML_PATH_ADMIN_ROOT.'logout' ?>"><span class="bi-arrow-circle-right"></span><?php $L->p('Logout') ?></a>
</li> </li>
</ul> </ul>

View file

@ -10,7 +10,7 @@ echo '
echo '<tr>'; echo '<tr>';
echo '<td>Bludit Edition</td>'; echo '<td>Bludit Edition</td>';
if (defined('BLUDIT_PRO')) { if (defined('BLUDIT_PRO')) {
echo '<td>PRO - '.$L->g('Thanks for supporting Bludit').' <span class="fa fa-heart" style="color: #ffc107"></span></td>'; echo '<td>PRO - '.$L->g('Thanks for supporting Bludit').' <span class="bi-heart" style="color: #ffc107"></span></td>';
} else { } else {
echo '<td>Standard - <a target="_blank" href="https://pro.bludit.com">'.$L->g('Upgrade to Bludit PRO').'</a></td>'; echo '<td>Standard - <a target="_blank" href="https://pro.bludit.com">'.$L->g('Upgrade to Bludit PRO').'</a></td>';
} }

View file

@ -81,10 +81,10 @@ function table($type) {
} }
echo '<td class="contentTools pt-3 text-center d-sm-table-cell">'.PHP_EOL; echo '<td class="contentTools pt-3 text-center d-sm-table-cell">'.PHP_EOL;
echo '<a class="text-secondary d-none d-md-inline" target="_blank" href="'.$page->permalink().'"><i class="fa fa-desktop"></i>'.$L->g('View').'</a>'.PHP_EOL; echo '<a class="text-secondary d-none d-md-inline" target="_blank" href="'.$page->permalink().'"><i class="bi-desktop"></i>'.$L->g('View').'</a>'.PHP_EOL;
echo '<a class="text-secondary d-none d-md-inline ms-2" href="'.HTML_PATH_ADMIN_ROOT.'edit-content/'.$page->key().'"><i class="fa fa-edit"></i>'.$L->g('Edit').'</a>'.PHP_EOL; echo '<a class="text-secondary d-none d-md-inline ms-2" href="'.HTML_PATH_ADMIN_ROOT.'edit-content/'.$page->key().'"><i class="bi-edit"></i>'.$L->g('Edit').'</a>'.PHP_EOL;
if (count($page->children())==0) { if (count($page->children())==0) {
echo '<a href="#" class="ms-2 text-danger deletePageButton d-block d-sm-inline" data-toggle="modal" data-target="#jsdeletePageModal" data-key="'.$page->key().'"><i class="fa fa-trash"></i>'.$L->g('Delete').'</a>'.PHP_EOL; echo '<a href="#" class="ms-2 text-danger deletePageButton d-block d-sm-inline" data-toggle="modal" data-target="#jsdeletePageModal" data-key="'.$page->key().'"><i class="bi-trash"></i>'.$L->g('Delete').'</a>'.PHP_EOL;
} }
echo '</td>'; echo '</td>';
@ -111,10 +111,10 @@ function table($type) {
echo '<td class="contentTools pt-3 text-center d-sm-table-cell">'.PHP_EOL; echo '<td class="contentTools pt-3 text-center d-sm-table-cell">'.PHP_EOL;
if ($type=='published' || $type=='static' || $type=='sticky') { if ($type=='published' || $type=='static' || $type=='sticky') {
echo '<a class="text-secondary d-none d-md-inline" target="_blank" href="'.$child->permalink().'"><i class="fa fa-desktop"></i>'.$L->g('View').'</a>'.PHP_EOL; echo '<a class="text-secondary d-none d-md-inline" target="_blank" href="'.$child->permalink().'"><i class="bi-desktop"></i>'.$L->g('View').'</a>'.PHP_EOL;
} }
echo '<a class="text-secondary d-none d-md-inline ms-2" href="'.HTML_PATH_ADMIN_ROOT.'edit-content/'.$child->key().'"><i class="fa fa-edit"></i>'.$L->g('Edit').'</a>'.PHP_EOL; echo '<a class="text-secondary d-none d-md-inline ms-2" href="'.HTML_PATH_ADMIN_ROOT.'edit-content/'.$child->key().'"><i class="bi-edit"></i>'.$L->g('Edit').'</a>'.PHP_EOL;
echo '<a class="ms-2 text-danger deletePageButton d-block d-sm-inline" href="#" data-toggle="modal" data-target="#jsdeletePageModal" data-key="'.$child->key().'"><i class="fa fa-trash"></i>'.$L->g('Delete').'</a>'.PHP_EOL; echo '<a class="ms-2 text-danger deletePageButton d-block d-sm-inline" href="#" data-toggle="modal" data-target="#jsdeletePageModal" data-key="'.$child->key().'"><i class="bi-trash"></i>'.$L->g('Delete').'</a>'.PHP_EOL;
echo '</td>'; echo '</td>';
echo '</tr>'; echo '</tr>';
@ -145,11 +145,11 @@ function table($type) {
echo '<td class="contentTools pt-3 text-center d-sm-table-cell">'.PHP_EOL; echo '<td class="contentTools pt-3 text-center d-sm-table-cell">'.PHP_EOL;
if ($type=='published' || $type=='static' || $type=='sticky') { if ($type=='published' || $type=='static' || $type=='sticky') {
echo '<a class="text-secondary d-none d-md-inline" target="_blank" href="'.$page->permalink().'"><i class="fa fa-desktop"></i>'.$L->g('View').'</a>'.PHP_EOL; echo '<a class="text-secondary d-none d-md-inline" target="_blank" href="'.$page->permalink().'"><i class="bi-desktop"></i>'.$L->g('View').'</a>'.PHP_EOL;
} }
echo '<a class="text-secondary d-none d-md-inline ms-2" href="'.HTML_PATH_ADMIN_ROOT.'edit-content/'.$page->key().'"><i class="fa fa-edit"></i>'.$L->g('Edit').'</a>'.PHP_EOL; echo '<a class="text-secondary d-none d-md-inline ms-2" href="'.HTML_PATH_ADMIN_ROOT.'edit-content/'.$page->key().'"><i class="bi-edit"></i>'.$L->g('Edit').'</a>'.PHP_EOL;
if (count($page->children())==0) { if (count($page->children())==0) {
echo '<a href="#" class="ms-2 text-danger deletePageButton d-block d-sm-inline" data-toggle="modal" data-target="#jsdeletePageModal" data-key="'.$page->key().'"><i class="fa fa-trash"></i>'.$L->g('Delete').'</a>'.PHP_EOL; echo '<a href="#" class="ms-2 text-danger deletePageButton d-block d-sm-inline" data-toggle="modal" data-target="#jsdeletePageModal" data-key="'.$page->key().'"><i class="bi-trash"></i>'.$L->g('Delete').'</a>'.PHP_EOL;
} }
echo '</td>'; echo '</td>';
@ -169,7 +169,7 @@ function table($type) {
?> ?>
<!-- TABS --> <!-- TABS -->
<ul class="nav nav-tabs pl-3" role="tablist"> <ul class="nav nav-tabs ps-3" role="tablist">
<li class="nav-item"> <li class="nav-item">
<a class="nav-link active" id="pages-tab" data-toggle="tab" href="#pages" role="tab"><?php $L->p('Pages') ?></a> <a class="nav-link active" id="pages-tab" data-toggle="tab" href="#pages" role="tab"><?php $L->p('Pages') ?></a>
</li> </li>
@ -204,7 +204,7 @@ function table($type) {
<!-- First button --> <!-- First button -->
<li class="page-item <?php if (!Paginator::showPrev()) echo 'disabled' ?>"> <li class="page-item <?php if (!Paginator::showPrev()) echo 'disabled' ?>">
<a class="page-link" href="<?php echo Paginator::firstPageUrl() ?>"><span class="align-middle fa fa-media-skip-backward"></span> <?php echo $L->get('First'); ?></a> <a class="page-link" href="<?php echo Paginator::firstPageUrl() ?>"><span class="align-middle bi-media-skip-backward"></span> <?php echo $L->get('First'); ?></a>
</li> </li>
<!-- Previous button --> <!-- Previous button -->
@ -219,7 +219,7 @@ function table($type) {
<!-- Last button --> <!-- Last button -->
<li class="page-item <?php if (!Paginator::showNext()) echo 'disabled' ?>"> <li class="page-item <?php if (!Paginator::showNext()) echo 'disabled' ?>">
<a class="page-link" href="<?php echo Paginator::lastPageUrl() ?>"><?php echo $L->get('Last'); ?> <span class="align-middle fa fa-media-skip-forward"></span></a> <a class="page-link" href="<?php echo Paginator::lastPageUrl() ?>"><?php echo $L->get('Last'); ?> <span class="align-middle bi-media-skip-forward"></span></a>
</li> </li>
</ul> </ul>

View file

@ -5,7 +5,7 @@
<!-- Good message --> <!-- Good message -->
<div> <div>
<h2 id="hello-message" class="pt-0"> <h2 id="hello-message" class="pt-0">
<span class="fa fa-hand-spock-o"></span><span><?php echo $L->g('hello') ?></span> <span class="bi-hand-spock-o"></span><span><?php echo $L->g('hello') ?></span>
</h2> </h2>
<script> <script>
$( document ).ready(function() { $( document ).ready(function() {
@ -13,13 +13,13 @@
var date = new Date() var date = new Date()
var hours = date.getHours() var hours = date.getHours()
if (hours > 6 && hours < 12) { if (hours > 6 && hours < 12) {
$(this).html('<span class="fa fa-sun-o"></span><?php echo $L->g('good-morning') ?>'); $(this).html('<span class="bi-sun-o"></span><?php echo $L->g('good-morning') ?>');
} else if (hours > 12 && hours < 18) { } else if (hours > 12 && hours < 18) {
$(this).html('<span class="fa fa-sun-o"></span><?php echo $L->g('good-afternoon') ?>'); $(this).html('<span class="bi-sun-o"></span><?php echo $L->g('good-afternoon') ?>');
} else if (hours > 18 && hours < 22) { } else if (hours > 18 && hours < 22) {
$(this).html('<span class="fa fa-moon-o"></span><?php echo $L->g('good-evening') ?>'); $(this).html('<span class="bi-moon-o"></span><?php echo $L->g('good-evening') ?>');
} else { } else {
$(this).html('<span class="fa fa-moon-o"></span><span><?php echo $L->g('good-night') ?></span>'); $(this).html('<span class="bi-moon-o"></span><span><?php echo $L->g('good-night') ?></span>');
} }
}).fadeIn(1000); }).fadeIn(1000);
}); });
@ -65,7 +65,7 @@
var html = ''; var html = '';
if (data.type=='menu') { if (data.type=='menu') {
html += '<a href="'+data.url+'"><div class="search-suggestion">'; html += '<a href="'+data.url+'"><div class="search-suggestion">';
html += '<span class="fa fa-'+data.icon+'"></span>'+data.text+'</div></a>'; html += '<span class="bi-'+data.icon+'"></span>'+data.text+'</div></a>';
} else { } else {
if (typeof data.id === 'undefined') { if (typeof data.id === 'undefined') {
return ''; return '';
@ -97,19 +97,19 @@
<div class="row"> <div class="row">
<div class="col"> <div class="col">
<a class="quick-links text-center" target="_blank" href="https://docs.bludit.com"> <a class="quick-links text-center" target="_blank" href="https://docs.bludit.com">
<div class="fa fa-compass quick-links-icons"></div> <div class="bi-compass quick-links-icons"></div>
<div><?php $L->p('Documentation') ?></div> <div><?php $L->p('Documentation') ?></div>
</a> </a>
</div> </div>
<div class="col border-left border-right"> <div class="col border-left border-right">
<a class="quick-links text-center" target="_blank" href="https://forum.bludit.org"> <a class="quick-links text-center" target="_blank" href="https://forum.bludit.org">
<div class="fa fa-support quick-links-icons"></div> <div class="bi-support quick-links-icons"></div>
<div><?php $L->p('Forum support') ?></div> <div><?php $L->p('Forum support') ?></div>
</a> </a>
</div> </div>
<div class="col"> <div class="col">
<a class="quick-links text-center" target="_blank" href="https://gitter.im/bludit/support"> <a class="quick-links text-center" target="_blank" href="https://gitter.im/bludit/support">
<div class="fa fa-comments quick-links-icons"></div> <div class="bi-comments quick-links-icons"></div>
<div><?php $L->p('Chat support') ?></div> <div><?php $L->p('Chat support') ?></div>
</a> </a>
</div> </div>
@ -135,7 +135,7 @@
echo '<br><span class="notification-date"><small>'; echo '<br><span class="notification-date"><small>';
echo Date::format($log['date'], DB_DATE_FORMAT, NOTIFICATIONS_DATE_FORMAT); echo Date::format($log['date'], DB_DATE_FORMAT, NOTIFICATIONS_DATE_FORMAT);
echo ' [ '.$log['username'] .' ]'; echo ' [ '.$log['username'] .' ]';
echo '</small></span>'; echo '</div></span>';
echo '</li>'; echo '</li>';
} }
?> ?>

View file

@ -49,14 +49,14 @@ echo Bootstrap::formOpen(array(
<!-- TOOLBAR --> <!-- TOOLBAR -->
<div id="editorToolbar" class="mb-1"> <div id="editorToolbar" class="mb-1">
<div id="editorToolbarRight" class="btn-group btn-group-sm float-end" role="group" aria-label="Toolbar right"> <div id="editorToolbarRight" class="btn-group btn-group-sm float-end" role="group" aria-label="Toolbar right">
<button type="button" class="btn btn-light" id="jsmediaManagerOpenModal" data-toggle="modal" data-target="#jsmediaManagerModal"><span class="fa fa-image"></span> <?php $L->p('Images') ?></button> <button type="button" class="btn btn-light" id="jsmediaManagerOpenModal" data-toggle="modal" data-target="#jsmediaManagerModal"><span class="bi-image"></span> <?php $L->p('Images') ?></button>
<button type="button" class="btn btn-light" id="jsoptionsSidebar" style="z-index:30"><span class="fa fa-cog"></span> <?php $L->p('Options') ?></button> <button type="button" class="btn btn-light" id="jsoptionsSidebar" style="z-index:30"><span class="bi-cog"></span> <?php $L->p('Options') ?></button>
</div> </div>
<div id="jseditorToolbarLeft"> <div id="jseditorToolbarLeft">
<button type="button" class="btn btn-sm btn-primary" id="jsbuttonSave"><?php echo $L->g('Save') ?></button> <button type="button" class="btn btn-sm btn-primary" id="jsbuttonSave"><?php echo $L->g('Save') ?></button>
<button id="jsbuttonPreview" type="button" class="btn btn-sm btn-secondary"><?php $L->p('Preview') ?></button> <button id="jsbuttonPreview" type="button" class="btn btn-sm btn-secondary"><?php $L->p('Preview') ?></button>
<span id="jsswitchButton" data-switch="<?php echo ($page->draft()?'draft':'publish') ?>" class="ms-2 text-secondary switch-button"><i class="fa fa-square switch-icon-<?php echo ($page->draft()?'draft':'publish') ?>"></i> <?php echo ($page->draft()?$L->g('Draft'):$L->g('Publish')) ?></span> <span id="jsswitchButton" data-switch="<?php echo ($page->draft()?'draft':'publish') ?>" class="ms-2 text-secondary switch-button"><i class="bi-square switch-icon-<?php echo ($page->draft()?'draft':'publish') ?>"></i> <?php echo ($page->draft()?$L->g('Draft'):$L->g('Publish')) ?></span>
</div> </div>
<?php if($page->scheduled()): ?> <?php if($page->scheduled()): ?>
@ -90,7 +90,7 @@ echo Bootstrap::formOpen(array(
</div> </div>
</nav> </nav>
<div class="tab-content pr-3 pl-3 pb-3"> <div class="tab-content pe-3 ps-3 pb-3">
<div id="nav-general" class="tab-pane fade show active" role="tabpanel" aria-labelledby="general-tab"> <div id="nav-general" class="tab-pane fade show active" role="tabpanel" aria-labelledby="general-tab">
<?php <?php
// Category // Category
@ -482,10 +482,10 @@ $(document).ready(function() {
// Button switch // Button switch
$("#jsswitchButton").on("click", function() { $("#jsswitchButton").on("click", function() {
if ($(this).data("switch")=="publish") { if ($(this).data("switch")=="publish") {
$(this).html('<i class="fa fa-square switch-icon-draft"></i> <?php $L->p('Draft') ?>'); $(this).html('<i class="bi-square switch-icon-draft"></i> <?php $L->p('Draft') ?>');
$(this).data("switch", "draft"); $(this).data("switch", "draft");
} else { } else {
$(this).html('<i class="fa fa-square switch-icon-publish"></i> <?php $L->p('Publish') ?>'); $(this).html('<i class="bi-square switch-icon-publish"></i> <?php $L->p('Publish') ?>');
$(this).data("switch", "publish"); $(this).data("switch", "publish");
} }
}); });

View file

@ -102,12 +102,12 @@
<div class="tab-pane fade" id="picture" role="tabpanel" aria-labelledby="nav-picture-tab"> <div class="tab-pane fade" id="picture" role="tabpanel" aria-labelledby="nav-picture-tab">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-lg-4 col-sm-12 p-0 pr-2"> <div class="col-lg-4 col-sm-12 p-0 pe-2">
<div class="custom-file"> <div class="custom-file">
<input type="file" class="custom-file-input" id="jsprofilePictureInputFile" name="profilePictureInputFile"> <input type="file" class="custom-file-input" id="jsprofilePictureInputFile" name="profilePictureInputFile">
<label class="custom-file-label" for="jsprofilePictureInputFile"><?php $L->p('Upload image'); ?></label> <label class="custom-file-label" for="jsprofilePictureInputFile"><?php $L->p('Upload image'); ?></label>
</div> </div>
<!-- <button id="jsbuttonRemovePicture" type="button" class="btn btn-primary w-100 mt-4 mb-4"><i class="fa fa-trash"></i> Remove picture</button> --> <!-- <button id="jsbuttonRemovePicture" type="button" class="btn btn-primary w-100 mt-4 mb-4"><i class="bi-trash"></i> Remove picture</button> -->
</div> </div>
<div class="col-lg-8 col-sm-12 p-0 text-center"> <div class="col-lg-8 col-sm-12 p-0 text-center">
<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') ?>" /> <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') ?>" />

View file

@ -221,7 +221,7 @@ $(document).ready(function() {
}); });
$('#btnCancelSeo').on('click', function() { $('#btnCancelSeo').on('click', function() {
closeModal('parent'); closeModal('seo');
}); });
// Modal parent events // Modal parent events
@ -249,19 +249,19 @@ $(document).ready(function() {
</script> </script>
<!-- Modal Description --> <!-- Modal Description -->
<div class="modal" id="modal-description" tabindex="-1" aria-labelledby="modal-description" aria-hidden="true"> <div class="modal" id="modal-description" tabindex="-1">
<div class="modal-dialog"> <div class="modal-dialog">
<div class="modal-content"> <div class="modal-content">
<div class="modal-body"> <div class="modal-body">
<div class="m-0"> <div class="m-0">
<label for="parent" class="font-weight-bold">Page description</label> <label for="parent" class="fw-bold mb-2">Page description</label>
<textarea id="description" name="description" class="form-control" rows="3"></textarea> <textarea id="description" name="description" class="form-control" rows="3"></textarea>
<small class="form-text text-muted"><?php echo $L->get('this-field-can-help-describe-the-content') ?></small> <div class="form-text"><?php echo $L->get('this-field-can-help-describe-the-content') ?></div>
</div> </div>
</div> </div>
<div class="modal-footer modal-footer pl-2 pr-2 pt-1 pb-1"> <div class="modal-footer ps-2 pe-2 pt-1 pb-1">
<button id="btnCancelDescription" type="button" class="btn btn-cancel font-weight-bold mr-auto"><i class="fa fa-times"></i> Cancel</button> <button id="btnCancelDescription" type="button" class="btn btn-cancel fw-bold me-auto"><i class="bi-x-square me-2"></i>Cancel</button>
<button id="btnSaveDescription" type="button" class="btn btn-save font-weight-bold"><i class="fa fa-check"></i> Save</button> <button id="btnSaveDescription" type="button" class="btn btn-save fw-bold text-success"><i class="bi-check-square me-2"></i>Save</button>
</div> </div>
</div> </div>
</div> </div>
@ -269,19 +269,19 @@ $(document).ready(function() {
<!-- End Modal Description --> <!-- End Modal Description -->
<!-- Modal Date --> <!-- Modal Date -->
<div class="modal" id="modal-date" aria-labelledby="modal-date" tabindex="-1" aria-hidden="true"> <div class="modal" id="modal-date" tabindex="-1">
<div class="modal-dialog"> <div class="modal-dialog">
<div class="modal-content"> <div class="modal-content">
<div class="modal-body"> <div class="modal-body">
<div class="m-0"> <div class="m-0">
<label for="date" class="font-weight-bold">Publish date</label> <label for="date" class="fw-bold mb-2">Publish date</label>
<input id="date" name="date" type="text" class="form-control" value="<?php echo Date::current(DB_DATE_FORMAT) ?>"> <input id="date" name="date" type="text" class="form-control" value="<?php echo Date::current(DB_DATE_FORMAT) ?>">
<small class="form-text text-muted"><?php echo $L->g('date-format-format') ?></small> <div class="form-text"><?php echo $L->g('date-format-format') ?></div>
</div> </div>
</div> </div>
<div class="modal-footer modal-footer pl-2 pr-2 pt-1 pb-1"> <div class="modal-footer ps-2 pe-2 pt-1 pb-1">
<button id="btnCancelDate" type="button" class="btn btn-cancel font-weight-bold mr-auto"><i class="fa fa-times"></i> Cancel</button> <button id="btnCancelDate" type="button" class="btn btn-cancel fw-bold me-auto"><i class="bi-x-square me-2"></i>Cancel</button>
<button id="btnSaveDate" type="button" class="btn btn-save font-weight-bold"><i class="fa fa-check"></i> Save</button> <button id="btnSaveDate" type="button" class="btn btn-save fw-bold text-success"><i class="bi-check-square me-2"></i>Save</button>
</div> </div>
</div> </div>
</div> </div>
@ -294,42 +294,119 @@ $(document).ready(function() {
<!-- End Modal Date --> <!-- End Modal Date -->
<!-- Modal friendly URL --> <!-- Modal friendly URL -->
<div class="modal" id="modal-friendlyURL" tabindex="-1" aria-labelledby="modal-friendlyURL" aria-hidden="true"> <div class="modal" id="modal-friendlyURL" tabindex="-1">
<div class="modal-dialog"> <div class="modal-dialog">
<div class="modal-content"> <div class="modal-content">
<div class="modal-body"> <div class="modal-body">
<div class="m-0"> <div class="m-0">
<div class="d-flex mb-2"> <div class="d-flex mb-2">
<label for="friendlyURL" class="p-0 m-0 mr-auto font-weight-bold">Page URL</label> <label for="friendlyURL" class="p-0 m-0 me-auto fw-bold">Page URL</label>
<button id="btnGenURLFromTitle" type="button" class="btn p-0 m-0"><i class="fa fa-magic"></i> Generate from page title</button> <button id="btnGenURLFromTitle" type="button" class="btn p-0 m-0 text-primary"><i class="bi-hammer me-2"></i>Generate from page title</button>
</div> </div>
<input id="friendlyURL" name="friendlyURL" type="text" class="form-control" value=""> <input id="friendlyURL" name="friendlyURL" type="text" class="form-control" value="">
<small class="form-text text-muted">https://www.varlogdiego.com/my-page-about-k8s</small> <div class="form-text">https://www.varlogdiego.com/my-page-about-k8s</div>
</div> </div>
</div> </div>
<div class="modal-footer modal-footer pl-2 pr-2 pt-1 pb-1"> <div class="modal-footer ps-2 pe-2 pt-1 pb-1">
<button id="btnCancelFriendlyURL" type="button" class="btn btn-cancel font-weight-bold mr-auto"><i class="fa fa-times"></i> Cancel</button> <button id="btnCancelFriendlyURL" type="button" class="btn btn-cancel fw-bold me-auto"><i class="bi-x-square me-2"></i>Cancel</button>
<button id="btnSaveFriendlyURL" type="button" class="btn btn-save font-weight-bold"><i class="fa fa-check"></i> Save</button> <button id="btnSaveFriendlyURL" type="button" class="btn btn-save fw-bold text-success"><i class="bi-check-square me-2"></i>Save</button>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<!-- End Modal friendly URL --> <!-- End Modal friendly URL -->
<!-- Modal Parent --> <!-- Modal Status -->
<div class="modal" id="modal-parent" aria-labelledby="modal-parent" tabindex="-1" aria-hidden="true"> <div class="modal" id="modal-status" tabindex="-1">
<div class="modal-dialog"> <div class="modal-dialog">
<div class="modal-content"> <div class="modal-content">
<div class="modal-body"> <div class="modal-body">
<div class="m-0"> <div class="m-0">
<label for="parent" class="font-weight-bold">Parent page</label> <label class="fw-bold mb-2">Page status</label>
<select id="parent" name="parent" class="custom-select"></select> </div>
<small class="form-text text-muted"><?php echo $L->g('Start typing a page title to see a list of suggestions.') ?></small> <div class="form-check mb-2">
<input id="statusDraft" name="status" class="form-check-input" type="radio" value="draft" checked>
<label class="form-check-label" for="statusDraft">Draft</label>
<div class="form-text">Page as draft, is not visible for visitors.</div>
</div>
<div class="form-check mb-2">
<input id="statusPublish" name="status" class="form-check-input" type="radio" value="published">
<label class="form-check-label" for="statusPublish">Publish</label>
<div class="form-text">Publish the page, everyone can see it.</div>
</div>
<hr>
<div class="form-check mb-2">
<input id="statusSticky" name="status" class="form-check-input" type="radio" value="sticky">
<label class="form-check-label" for="statusSticky">Publish as sticky</label>
<div class="form-text">The page can be seen by everyone in the top of the main page.</div>
</div>
<div class="form-check mb-2">
<input id="statusStatic" name="status" class="form-check-input" type="radio" value="static">
<label class="form-check-label" for="statusStatic">Publish as static</label>
<div class="form-text">The page can be seen by everyone as static page.</div>
</div>
<div class="form-check mb-2">
<input id="statusUnlisted" name="status" class="form-check-input" type="radio" value="unlisted">
<label class="form-check-label" for="statusUnlisted">Publish as unlisted</label>
<div class="form-text">The page can be seen and shared by anyone with the link.</div>
</div> </div>
</div> </div>
<div class="modal-footer modal-footer pl-2 pr-2 pt-1 pb-1"> <div class="modal-footer ps-2 pe-2 pt-1 pb-1">
<button id="btnCancelParent" type="button" class="btn btn-cancel font-weight-bold mr-auto"><i class="fa fa-times"></i> Cancel</button> <button id="btnCancelStatus" type="button" class="btn btn-cancel fw-bold me-auto"><i class="bi-x-square me-2"></i>Cancel</button>
<button id="btnSaveParent" type="button" class="btn btn-save font-weight-bold"><i class="fa fa-check"></i> Save</button> <button id="btnSaveStatus" type="button" class="btn btn-save fw-bold text-success"><i class="bi-check-square me-2"></i>Save</button>
</div>
</div>
</div>
</div>
<!-- End Modal Status -->
<!-- Modal SEO -->
<div class="modal" id="modal-seo" tabindex="-1">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-body">
<div class="m-0">
<label class="fw-bold mb-2">SEO features</label>
</div>
<div class="form-check mb-2">
<input id="noindex" name="noindex" class="form-check-input" type="checkbox" value="noindex">
<label class="form-check-label" for="noindex"><?php echo $L->g('apply-code-noindex-code-to-this-page') ?></label>
<div class="form-text"><?php echo $L->g('This tells search engines not to show this page in their search results.') ?></div>
</div>
<div class="form-check mb-2">
<input id="nofollow" name="nofollow" class="form-check-input" type="checkbox" value="nofollow">
<label class="form-check-label" for="nofollow"><?php echo $L->g('apply-code-nofollow-code-to-this-page') ?></label>
<div class="form-text"><?php echo $L->g('This tells search engines not to follow links on this page.') ?></div>
</div>
<div class="form-check mb-2">
<input id="noarchive" name="noarchive" class="form-check-input" type="checkbox" value="noarchive">
<label class="form-check-label" for="noarchive"><?php echo $L->g('apply-code-noarchive-code-to-this-page') ?></label>
<div class="form-text"><?php echo $L->g('This tells search engines not to save a cached copy of this page.') ?></div>
</div>
</div>
<div class="modal-footer ps-2 pe-2 pt-1 pb-1">
<button id="btnCancelSeo" type="button" class="btn btn-cancel fw-bold me-auto"><i class="bi-x-square me-2"></i>Cancel</button>
<button id="btnSaveSeo" type="button" class="btn btn-save fw-bold text-success"><i class="bi-check-square me-2"></i>Save</button>
</div>
</div>
</div>
</div>
<!-- End Modal SEO -->
<!-- Modal Parent -->
<div class="modal" id="modal-parent" tabindex="-1">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-body">
<div class="m-0">
<label for="parent" class="fw-bold mb-2">Parent page</label>
<select id="parent" name="parent" class="custom-select"></select>
<div class="form-text"><?php echo $L->g('Start typing a page title to see a list of suggestions.') ?></div>
</div>
</div>
<div class="modal-footer ps-2 pe-2 pt-1 pb-1">
<button id="btnCancelParent" type="button" class="btn btn-cancel fw-bold me-auto"><i class="bi-x-square me-2"></i>Cancel</button>
<button id="btnSaveParent" type="button" class="btn btn-save fw-bold text-success"><i class="bi-check-square me-2"></i>Save</button>
</div> </div>
</div> </div>
</div> </div>
@ -369,96 +446,18 @@ $(document).ready(function() {
</script> </script>
<!-- End Modal Parent --> <!-- End Modal Parent -->
<!-- Modal Status -->
<div class="modal" id="modal-status" tabindex="-1" aria-labelledby="modal-status" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-body">
<div class="m-0">
<label class="font-weight-bold">Page status</label>
</div>
<div class="form-check mb-2">
<input id="statusDraft" name="status" class="form-check-input" type="radio" value="draft" checked>
<label class="form-check-label" for="statusDraft">Draft</label>
<small class="form-text text-muted">Page as draft, is not visible for visitors.</small>
</div>
<div class="form-check mb-2">
<input id="statusPublish" name="status" class="form-check-input" type="radio" value="published">
<label class="form-check-label" for="statusPublish">Publish</label>
<small class="form-text text-muted">Publish the page, everyone can see it.</small>
</div>
<hr>
<div class="form-check mb-2">
<input id="statusSticky" name="status" class="form-check-input" type="radio" value="sticky">
<label class="form-check-label" for="statusSticky">Publish as sticky</label>
<small class="form-text text-muted">The page can be seen by everyone in the top of the main page.</small>
</div>
<div class="form-check mb-2">
<input id="statusStatic" name="status" class="form-check-input" type="radio" value="static">
<label class="form-check-label" for="statusStatic">Publish as static</label>
<small class="form-text text-muted">The page can be seen by everyone as static page.</small>
</div>
<div class="form-check mb-2">
<input id="statusUnlisted" name="status" class="form-check-input" type="radio" value="unlisted">
<label class="form-check-label" for="statusUnlisted">Publish as unlisted</label>
<small class="form-text text-muted">The page can be seen and shared by anyone with the link.</small>
</div>
</div>
<div class="modal-footer modal-footer pl-2 pr-2 pt-1 pb-1">
<button id="btnCancelStatus" type="button" class="btn btn-cancel font-weight-bold mr-auto" data-dismiss="modal"><i class="fa fa-times"></i> Cancel</button>
<button id="btnSaveStatus" type="button" class="btn btn-save font-weight-bold"><i class="fa fa-check"></i> Save</button>
</div>
</div>
</div>
</div>
<!-- End Modal Status -->
<!-- Modal SEO -->
<div class="modal" id="modal-seo" tabindex="-1" aria-labelledby="modal-seo" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-body">
<div class="m-0">
<label class="font-weight-bold">SEO features</label>
</div>
<div class="form-check mb-2">
<input id="noindex" name="noindex" class="form-check-input" type="checkbox" value="noindex">
<label class="form-check-label" for="noindex"><?php echo $L->g('apply-code-noindex-code-to-this-page') ?></label>
<small class="form-text text-muted"><?php echo $L->g('This tells search engines not to show this page in their search results.') ?></small>
</div>
<div class="form-check mb-2">
<input id="nofollow" name="nofollow" class="form-check-input" type="checkbox" value="nofollow">
<label class="form-check-label" for="nofollow"><?php echo $L->g('apply-code-nofollow-code-to-this-page') ?></label>
<small class="form-text text-muted"><?php echo $L->g('This tells search engines not to follow links on this page.') ?></small>
</div>
<div class="form-check mb-2">
<input id="noarchive" name="noarchive" class="form-check-input" type="checkbox" value="noarchive">
<label class="form-check-label" for="noarchive"><?php echo $L->g('apply-code-noarchive-code-to-this-page') ?></label>
<small class="form-text text-muted"><?php echo $L->g('This tells search engines not to save a cached copy of this page.') ?></small>
</div>
</div>
<div class="modal-footer modal-footer pl-2 pr-2 pt-1 pb-1">
<button id="btnCancelSeo" type="button" class="btn btn-cancel font-weight-bold mr-auto" data-dismiss="modal"><i class="fa fa-times"></i> Cancel</button>
<button id="btnSaveSeo" type="button" class="btn btn-save font-weight-bold"><i class="fa fa-check"></i> Save</button>
</div>
</div>
</div>
</div>
<!-- End Modal SEO -->
<!-- Modal Files / Images --> <!-- Modal Files / Images -->
<div class="modal" id="modal-files" tabindex="-1" aria-labelledby="modal-files" aria-hidden="true"> <div class="modal" id="modal-files" tabindex="-1" aria-labelledby="modal-files" aria-hidden="true">
<div class="modal-dialog"> <div class="modal-dialog">
<div class="modal-content"> <div class="modal-content">
<div class="modal-body"> <div class="modal-body">
<div class="m-0"> <div class="m-0">
<label class="font-weight-bold">Files</label> <label class="fw-bold">Files</label>
</div> </div>
</div> </div>
<div class="modal-footer modal-footer pl-2 pr-2 pt-1 pb-1"> <div class="modal-footer ps-2 pe-2 pt-1 pb-1">
<button id="btnCancelSeo" type="button" class="btn btn-cancel font-weight-bold mr-auto" data-dismiss="modal"><i class="fa fa-times"></i> Cancel</button> <button id="btnCancelSeo" type="button" class="btn btn-cancel fw-bold me-auto"><i class="bi-x-square me-2"></i>Cancel</button>
<button id="btnSaveSeo" type="button" class="btn btn-save font-weight-bold"><i class="fa fa-check"></i> Save</button> <button id="btnSaveSeo" type="button" class="btn btn-save fw-bold text-success"><i class="bi-check-square me-2"></i>Save</button>
</div> </div>
</div> </div>
</div> </div>
@ -474,15 +473,15 @@ $(document).ready(function() {
<div id="editorToolbarRight" class="btn-group btn-group-sm float-end" role="group" aria-label="Toolbar right"> <div id="editorToolbarRight" class="btn-group btn-group-sm float-end" role="group" aria-label="Toolbar right">
<div class="dropdown"> <div class="dropdown">
<button type="button" class="btn dropdown-toggle" type="button" id="dropdownMenuOptions" data-bs-toggle="dropdown" aria-expanded="false"> <button type="button" class="btn dropdown-toggle" type="button" id="dropdownMenuOptions" data-bs-toggle="dropdown" aria-expanded="false">
<span class="fa fa-cog"></span><?php $L->p('Options') ?> <i class="bi-gear me-2"></i></span><?php $L->p('Options') ?>
</button> </button>
<div class="dropdown-menu" aria-labelledby="dropdownMenuOptions"> <div class="dropdown-menu" aria-labelledby="dropdownMenuOptions">
<a onclick="openModal('description')" class="dropdown-item" href="#"><i class="fa fa-comment"></i> Description</a> <a onclick="openModal('description')" class="dropdown-item" href="#"><i class="bi-info-square me-2"></i>Description</a>
<a onclick="openModal('date')" class="dropdown-item" href="#"><i class="fa fa-calendar"></i> Publish date</a> <a onclick="openModal('date')" class="dropdown-item" href="#"><i class="bi-calendar me-2"></i>Publish date</a>
<a onclick="openModal('friendlyURL')" class="dropdown-item" href="#"><i class="fa fa-link"></i> Change URL</a> <a onclick="openModal('friendlyURL')" class="dropdown-item" href="#"><i class="bi-link me-2"></i>Change URL</a>
<a onclick="openModal('status')" class="dropdown-item" href="#"><i class="fa fa-eye"></i> Status</a> <a onclick="openModal('status')" class="dropdown-item" href="#"><i class="bi-eye me-2"></i>Status</a>
<a onclick="openModal('seo')" class="dropdown-item" href="#"><i class="fa fa-compass"></i> SEO features</a> <a onclick="openModal('seo')" class="dropdown-item" href="#"><i class="bi-compass me-2"></i>SEO features</a>
<a onclick="openModal('parent')" class="dropdown-item" href="#"><i class="fa fa-sitemap"></i> Parent page</a> <a onclick="openModal('parent')" class="dropdown-item" href="#"><i class="bi-diagram-2 me-2"></i>Parent page</a>
</div> </div>
</div> </div>
</div> </div>
@ -537,9 +536,9 @@ $(document).ready(function() {
</div> </div>
</div> </div>
<small class="d-block text-end mt-3"> <div class="d-block text-end mt-3">
<a href="#">All images</a> <a href="#">All images</a>
</small> </div>
<!-- End Images --> <!-- End Images -->
<!-- Category --> <!-- Category -->

View file

@ -47,14 +47,14 @@ echo Bootstrap::formOpen(array(
<!-- TOOLBAR --> <!-- TOOLBAR -->
<div id="editorToolbar" class="mb-1"> <div id="editorToolbar" class="mb-1">
<div id="editorToolbarRight" class="btn-group btn-group-sm float-end" role="group" aria-label="Toolbar right"> <div id="editorToolbarRight" class="btn-group btn-group-sm float-end" role="group" aria-label="Toolbar right">
<button type="button" class="btn btn-light" id="jsmediaManagerOpenModal" data-toggle="modal" data-target="#jsmediaManagerModal"><span class="fa fa-image"></span> <?php $L->p('Images') ?></button> <button type="button" class="btn btn-light" id="jsmediaManagerOpenModal" data-toggle="modal" data-target="#jsmediaManagerModal"><span class="bi-image"></span> <?php $L->p('Images') ?></button>
<button type="button" class="btn btn-light" id="jsoptionsSidebar" style="z-index:30"><span class="fa fa-cog"></span> <?php $L->p('Options') ?></button> <button type="button" class="btn btn-light" id="jsoptionsSidebar" style="z-index:30"><span class="bi-cog"></span> <?php $L->p('Options') ?></button>
</div> </div>
<div id="jseditorToolbarLeft"> <div id="jseditorToolbarLeft">
<button id="jsbuttonSave" type="button" class="btn btn-sm btn-primary" ><?php $L->p('Save') ?></button> <button id="jsbuttonSave" type="button" class="btn btn-sm btn-primary" ><?php $L->p('Save') ?></button>
<button id="jsbuttonPreview" type="button" class="btn btn-sm btn-secondary"><?php $L->p('Preview') ?></button> <button id="jsbuttonPreview" type="button" class="btn btn-sm btn-secondary"><?php $L->p('Preview') ?></button>
<span id="jsbuttonSwitch" data-switch="publish" class="ms-2 text-secondary switch-button"><i class="fa fa-square switch-icon-publish"></i> <?php $L->p('Publish') ?></span> <span id="jsbuttonSwitch" data-switch="publish" class="ms-2 text-secondary switch-button"><i class="bi-square switch-icon-publish"></i> <?php $L->p('Publish') ?></span>
</div> </div>
</div> </div>
<script> <script>
@ -84,7 +84,7 @@ echo Bootstrap::formOpen(array(
</div> </div>
</nav> </nav>
<div class="tab-content pr-3 pl-3 pb-3"> <div class="tab-content pe-3 ps-3 pb-3">
<div id="nav-general" class="tab-pane fade show active" role="tabpanel" aria-labelledby="general-tab"> <div id="nav-general" class="tab-pane fade show active" role="tabpanel" aria-labelledby="general-tab">
<?php <?php
// Category // Category
@ -429,8 +429,8 @@ echo Bootstrap::formOpen(array(
<!-- Options > General --> <!-- Options > General -->
<div class="general card"> <div class="general card">
<div class="card-header m-0 p-2" id="headingOne"> <div class="card-header m-0 p-2" id="headingOne">
<a href="#optionsGeneral" class="w-100 text-start text-uppercase font-weight-bold" data-toggle="collapse" data-target="#optionsGeneral" aria-expanded="true" aria-controls="optionsGeneral"> <a href="#optionsGeneral" class="w-100 text-start text-uppercase fw-bold" data-toggle="collapse" data-target="#optionsGeneral" aria-expanded="true" aria-controls="optionsGeneral">
General <span class="float-end fa fa-angle-down"></span> General <span class="float-end bi-angle-down"></span>
</a> </a>
</div> </div>
@ -438,7 +438,7 @@ echo Bootstrap::formOpen(array(
<div class="card-body m-0 p-0"> <div class="card-body m-0 p-0">
<!-- Options > General > Cover Image --> <!-- Options > General > Cover Image -->
<label class="mt-4 mb-2 pb-2 text-uppercase w-100 font-weight-bold"><?php $L->p('Cover Image') ?></label> <label class="mt-4 mb-2 pb-2 text-uppercase w-100 fw-bold"><?php $L->p('Cover Image') ?></label>
<div> <div>
<img id="jscoverImagePreview" class="mx-auto d-block w-100" alt="Cover image preview" src="<?php echo HTML_PATH_CORE_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>
@ -493,8 +493,8 @@ echo Bootstrap::formOpen(array(
<!-- Options > Advanced --> <!-- Options > Advanced -->
<div class="advanced card"> <div class="advanced card">
<div class="card-header m-0 p-2" id="headingOne"> <div class="card-header m-0 p-2" id="headingOne">
<a href="#optionsAdvanced" class="w-100 text-start text-uppercase font-weight-bold" data-toggle="collapse" data-target="#optionsAdvanced" aria-expanded="true" aria-controls="optionsAdvanced"> <a href="#optionsAdvanced" class="w-100 text-start text-uppercase fw-bold" data-toggle="collapse" data-target="#optionsAdvanced" aria-expanded="true" aria-controls="optionsAdvanced">
Advanced <span class="float-end fa fa-angle-down"></span> Advanced <span class="float-end bi-angle-down"></span>
</a> </a>
</div> </div>
@ -583,10 +583,10 @@ $(document).ready(function() {
// Button switch // Button switch
$("#jsbuttonSwitch").on("click", function() { $("#jsbuttonSwitch").on("click", function() {
if ($(this).data("switch")=="publish") { if ($(this).data("switch")=="publish") {
$(this).html('<i class="fa fa-square switch-icon-draft"></i> <?php $L->p('Draft') ?>'); $(this).html('<i class="bi-square switch-icon-draft"></i> <?php $L->p('Draft') ?>');
$(this).data("switch", "draft"); $(this).data("switch", "draft");
} else { } else {
$(this).html('<i class="fa fa-square switch-icon-publish"></i> <?php $L->p('Publish') ?>'); $(this).html('<i class="bi-square switch-icon-publish"></i> <?php $L->p('Publish') ?>');
$(this).data("switch", "publish"); $(this).data("switch", "publish");
} }
}); });

View file

@ -26,7 +26,7 @@
echo '<ul class="list-group list-group-sortable">'; echo '<ul class="list-group list-group-sortable">';
foreach ($plugins['siteSidebar'] as $Plugin) { foreach ($plugins['siteSidebar'] as $Plugin) {
echo '<li class="list-group-item" data-plugin="'.$Plugin->className().'"><span class="fa fa-arrows-v"></span> '.$Plugin->name().'</li>'; echo '<li class="list-group-item" data-plugin="'.$Plugin->className().'"><span class="bi-arrows-v"></span> '.$Plugin->name().'</li>';
} }
echo '</ul>'; echo '</ul>';
?> ?>

View file

@ -10,7 +10,7 @@
<!-- Tabs --> <!-- Tabs -->
<nav> <nav>
<div class="nav nav-tabs pl-3" id="nav-tab" role="tablist"> <div class="nav nav-tabs ps-3" id="nav-tab" role="tablist">
<a class="nav-item nav-link active" id="nav-general-tab" data-toggle="tab" href="#general" role="tab" aria-controls="nav-general" aria-selected="false"><?php $L->p('General') ?></a> <a class="nav-item nav-link active" id="nav-general-tab" data-toggle="tab" href="#general" role="tab" aria-controls="nav-general" aria-selected="false"><?php $L->p('General') ?></a>
<a class="nav-item nav-link" id="nav-advanced-tab" data-toggle="tab" href="#advanced" role="tab" aria-controls="nav-advanced" aria-selected="false"><?php $L->p('Advanced') ?></a> <a class="nav-item nav-link" id="nav-advanced-tab" data-toggle="tab" href="#advanced" role="tab" aria-controls="nav-advanced" aria-selected="false"><?php $L->p('Advanced') ?></a>
<a class="nav-item nav-link" id="nav-seo-tab" data-toggle="tab" href="#seo" role="tab" aria-controls="nav-seo" aria-selected="false"><?php $L->p('SEO') ?></a> <a class="nav-item nav-link" id="nav-seo-tab" data-toggle="tab" href="#seo" role="tab" aria-controls="nav-seo" aria-selected="false"><?php $L->p('SEO') ?></a>
@ -26,7 +26,7 @@
<div class="tab-content" id="myTabContent"> <div class="tab-content" id="myTabContent">
<!-- General tab --> <!-- General tab -->
<div class="tab-pane fade show active pt-1 pb-1 pl-3 pr-3" id="general" role="tabpanel" aria-labelledby="general-tab"> <div class="tab-pane fade show active pt-1 pb-1 ps-3 pe-3" id="general" role="tabpanel" aria-labelledby="general-tab">
<?php <?php
echo Bootstrap::formTitle(array('title'=>$L->g('Site'))); echo Bootstrap::formTitle(array('title'=>$L->g('Site')));
@ -80,7 +80,7 @@
<!-- End General tab --> <!-- End General tab -->
<!-- Advanced tab --> <!-- Advanced tab -->
<div class="tab-pane fade pt-1 pb-1 pl-3 pr-3" id="advanced" role="tabpanel" aria-labelledby="advanced-tab"> <div class="tab-pane fade pt-1 pb-1 ps-3 pe-3" id="advanced" role="tabpanel" aria-labelledby="advanced-tab">
<?php <?php
echo Bootstrap::formTitle(array('title'=>$L->g('Page content'))); echo Bootstrap::formTitle(array('title'=>$L->g('Page content')));
@ -526,12 +526,12 @@
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-lg-4 col-sm-12 p-0 pr-2"> <div class="col-lg-4 col-sm-12 p-0 pe-2">
<div class="custom-file"> <div class="custom-file">
<input id="jssiteLogoInputFile" class="custom-file-input" type="file" name="inputFile"> <input id="jssiteLogoInputFile" class="custom-file-input" type="file" name="inputFile">
<label for="jssiteLogoInputFile" class="custom-file-label"><?php $L->p('Upload image'); ?></label> <label for="jssiteLogoInputFile" class="custom-file-label"><?php $L->p('Upload image'); ?></label>
</div> </div>
<button id="jsbuttonRemoveLogo" type="button" class="btn btn-primary w-100 mt-4 mb-4"><i class="fa fa-trash"></i><?php $L->p('Remove logo') ?></button> <button id="jsbuttonRemoveLogo" type="button" class="btn btn-primary w-100 mt-4 mb-4"><i class="bi-trash"></i><?php $L->p('Remove logo') ?></button>
</div> </div>
<div class="col-lg-8 col-sm-12 p-0 text-center"> <div class="col-lg-8 col-sm-12 p-0 text-center">
<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') ?>" /> <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') ?>" />

View file

@ -90,7 +90,7 @@ $(document).ready(function() {
<!-- Tabs --> <!-- Tabs -->
<nav> <nav>
<div class="nav nav-tabs pl-3" id="nav-tab" role="tablist"> <div class="nav nav-tabs ps-3" id="nav-tab" role="tablist">
<a class="nav-item nav-link active" id="nav-general-tab" data-toggle="tab" href="#general" role="tab" aria-controls="nav-general" aria-selected="false"><?php $L->p('General') ?></a> <a class="nav-item nav-link active" id="nav-general-tab" data-toggle="tab" href="#general" role="tab" aria-controls="nav-general" aria-selected="false"><?php $L->p('General') ?></a>
<a class="nav-item nav-link" id="nav-advanced-tab" data-toggle="tab" href="#advanced" role="tab" aria-controls="nav-advanced" aria-selected="false"><?php $L->p('Advanced') ?></a> <a class="nav-item nav-link" id="nav-advanced-tab" data-toggle="tab" href="#advanced" role="tab" aria-controls="nav-advanced" aria-selected="false"><?php $L->p('Advanced') ?></a>
<a class="nav-item nav-link" id="nav-seo-tab" data-toggle="tab" href="#seo" role="tab" aria-controls="nav-seo" aria-selected="false"><?php $L->p('SEO') ?></a> <a class="nav-item nav-link" id="nav-seo-tab" data-toggle="tab" href="#seo" role="tab" aria-controls="nav-seo" aria-selected="false"><?php $L->p('SEO') ?></a>
@ -106,7 +106,7 @@ $(document).ready(function() {
<div class="tab-content" id="myTabContent"> <div class="tab-content" id="myTabContent">
<!-- General tab --> <!-- General tab -->
<div class="tab-pane show active pt-1 pb-1 pl-3 pr-3" id="general" role="tabpanel" aria-labelledby="general-tab"> <div class="tab-pane show active pt-1 pb-1 ps-3 pe-3" id="general" role="tabpanel" aria-labelledby="general-tab">
<?php <?php
echo Bootstrap::formTitle(array('title'=>$L->g('Site'))); echo Bootstrap::formTitle(array('title'=>$L->g('Site')));
@ -160,7 +160,7 @@ $(document).ready(function() {
<!-- End General tab --> <!-- End General tab -->
<!-- Advanced tab --> <!-- Advanced tab -->
<div class="tab-pane pt-1 pb-1 pl-3 pr-3" id="advanced" role="tabpanel" aria-labelledby="advanced-tab"> <div class="tab-pane pt-1 pb-1 ps-3 pe-3" id="advanced" role="tabpanel" aria-labelledby="advanced-tab">
<?php <?php
echo Bootstrap::formTitle(array('title'=>$L->g('Page content'))); echo Bootstrap::formTitle(array('title'=>$L->g('Page content')));
@ -268,7 +268,7 @@ $(document).ready(function() {
</div> </div>
<!-- SEO tab --> <!-- SEO tab -->
<div class="tab-pane pt-1 pb-1 pl-3 pr-3" id="seo" role="tabpanel" aria-labelledby="seo-tab"> <div class="tab-pane pt-1 pb-1 ps-3 pe-3" id="seo" role="tabpanel" aria-labelledby="seo-tab">
<?php <?php
echo Bootstrap::formTitle(array('title'=>$L->g('Extreme friendly URL'))); echo Bootstrap::formTitle(array('title'=>$L->g('Extreme friendly URL')));
@ -326,7 +326,7 @@ $(document).ready(function() {
</div> </div>
<!-- Social Network tab --> <!-- Social Network tab -->
<div class="tab-pane pt-1 pb-1 pl-3 pr-3" id="social" role="tabpanel" aria-labelledby="social-tab"> <div class="tab-pane pt-1 pb-1 ps-3 pe-3" id="social" role="tabpanel" aria-labelledby="social-tab">
<?php <?php
echo Bootstrap::formTitle(array('title'=>$L->g('Social Networks'))); echo Bootstrap::formTitle(array('title'=>$L->g('Social Networks')));
@ -432,7 +432,7 @@ $(document).ready(function() {
</div> </div>
<!-- Images tab --> <!-- Images tab -->
<div class="tab-pane pt-1 pb-1 pl-3 pr-3" id="images" role="tabpanel" aria-labelledby="images-tab"> <div class="tab-pane pt-1 pb-1 ps-3 pe-3" id="images" role="tabpanel" aria-labelledby="images-tab">
<?php <?php
echo Bootstrap::formTitle(array('title'=>$L->g('Thumbnails'))); echo Bootstrap::formTitle(array('title'=>$L->g('Thumbnails')));
@ -466,7 +466,7 @@ $(document).ready(function() {
</div> </div>
<!-- Timezone and language tab --> <!-- Timezone and language tab -->
<div class="tab-pane pt-1 pb-1 pl-3 pr-3" id="language" role="tabpanel" aria-labelledby="language-tab"> <div class="tab-pane pt-1 pb-1 ps-3 pe-3" id="language" role="tabpanel" aria-labelledby="language-tab">
<?php <?php
echo Bootstrap::formTitle(array('title'=>$L->g('Language and timezone'))); echo Bootstrap::formTitle(array('title'=>$L->g('Language and timezone')));
@ -511,7 +511,7 @@ $(document).ready(function() {
</div> </div>
<!-- Custom fields --> <!-- Custom fields -->
<div class="tab-pane pt-1 pb-1 pl-3 pr-3" id="custom-fields" role="tabpanel" aria-labelledby="custom-fields-tab"> <div class="tab-pane pt-1 pb-1 ps-3 pe-3" id="custom-fields" role="tabpanel" aria-labelledby="custom-fields-tab">
<?php <?php
echo Bootstrap::formTitle(array('title'=>$L->g('Custom fields'))); echo Bootstrap::formTitle(array('title'=>$L->g('Custom fields')));
@ -528,19 +528,19 @@ $(document).ready(function() {
</div> </div>
<!-- Site logo tab --> <!-- Site logo tab -->
<div class="tab-pane pt-1 pb-1 pl-3 pr-3" id="logo" role="tabpanel" aria-labelledby="logo-tab"> <div class="tab-pane pt-1 pb-1 ps-3 pe-3" id="logo" role="tabpanel" aria-labelledby="logo-tab">
<?php <?php
echo Bootstrap::formTitle(array('title'=>$L->g('Site logo'))); echo Bootstrap::formTitle(array('title'=>$L->g('Site logo')));
?> ?>
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-lg-4 col-sm-12 p-0 pr-2"> <div class="col-lg-4 col-sm-12 p-0 pe-2">
<div class="custom-file"> <div class="custom-file">
<input id="jssiteLogoInputFile" class="custom-file-input" type="file" name="inputFile"> <input id="jssiteLogoInputFile" class="custom-file-input" type="file" name="inputFile">
<label for="jssiteLogoInputFile" class="custom-file-label"><?php $L->p('Upload image'); ?></label> <label for="jssiteLogoInputFile" class="custom-file-label"><?php $L->p('Upload image'); ?></label>
</div> </div>
<button id="jsbuttonRemoveLogo" type="button" class="btn btn-primary w-100 mt-4 mb-4"><i class="fa fa-trash"></i><?php $L->p('Remove logo') ?></button> <button id="jsbuttonRemoveLogo" type="button" class="btn btn-primary w-100 mt-4 mb-4"><i class="bi-trash"></i><?php $L->p('Remove logo') ?></button>
</div> </div>
<div class="col-lg-8 col-sm-12 p-0 text-center"> <div class="col-lg-8 col-sm-12 p-0 text-center">
<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') ?>" /> <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') ?>" />

View file

@ -40,7 +40,7 @@ EOF;
$tip = ''; $tip = '';
if (isset($args['tip'])) { if (isset($args['tip'])) {
$tip = '<small class="form-text text-muted">'.$args['tip'].'</small>'; $tip = '<div class="form-text">'.$args['tip'].'</div>';
} }
$label = ''; $label = '';
@ -86,7 +86,7 @@ EOF;
} }
$html .= '</select>'; $html .= '</select>';
if (isset($args['tip'])) { if (isset($args['tip'])) {
$html .= '<small class="form-text text-muted">'.$args['tip'].'</small>'; $html .= '<div class="form-text">'.$args['tip'].'</div>';
} }
$html .= '</div>'; $html .= '</div>';
$html .= '</div>'; $html .= '</div>';
@ -138,7 +138,7 @@ EOF;
} }
if (isset($args['icon'])) { if (isset($args['icon'])) {
return '<a '.$options.'><span class="fa fa-'.$args['icon'].'"></span>'.$args['title'].'</a>'; return '<a '.$options.'><span class="bi-'.$args['icon'].'"></span>'.$args['title'].'</a>';
} }
return '<a '.$options.'>'.$args['title'].'</a>'; return '<a '.$options.'>'.$args['title'].'</a>';
@ -150,7 +150,7 @@ EOF;
$title = $args['title']; $title = $args['title'];
return <<<EOF return <<<EOF
<h2 class="mt-0 mb-3"> <h2 class="mt-0 mb-3">
<span class="fa fa-$icon" style="font-size: 0.9em;"></span><span>$title</span> <span class="bi-$icon" style="font-size: 0.9em;"></span><span>$title</span>
</h2> </h2>
EOF; EOF;
} }
@ -208,7 +208,7 @@ EOF;
$tip = ''; $tip = '';
if (!empty($args['tip'])) { if (!empty($args['tip'])) {
$tip = '<small class="form-text text-muted">'.$args['tip'].'</small>'; $tip = '<div class="form-text">'.$args['tip'].'</div>';
} }
$class = 'mb-3 m-0'; $class = 'mb-3 m-0';
@ -281,7 +281,7 @@ EOF;
$html .= '<div class="col-sm-10">'; $html .= '<div class="col-sm-10">';
$html .= '<textarea class="'.$class.'" id="'.$id.'" name="'.$args['name'].'" rows="'.$args['rows'].'" placeholder="'.$args['placeholder'].'">'.$args['value'].'</textarea>'; $html .= '<textarea class="'.$class.'" id="'.$id.'" name="'.$args['name'].'" rows="'.$args['rows'].'" placeholder="'.$args['placeholder'].'">'.$args['value'].'</textarea>';
if (isset($args['tip'])) { if (isset($args['tip'])) {
$html .= '<small class="form-text text-muted">'.$args['tip'].'</small>'; $html .= '<div class="form-text">'.$args['tip'].'</div>';
} }
$html .= '</div>'; $html .= '</div>';
$html .= '</div>'; $html .= '</div>';
@ -308,7 +308,7 @@ EOF;
$html .= '<textarea class="'.$class.'" id="'.$id.'" name="'.$args['name'].'" rows="'.$args['rows'].'" placeholder="'.$args['placeholder'].'">'.$args['value'].'</textarea>'; $html .= '<textarea class="'.$class.'" id="'.$id.'" name="'.$args['name'].'" rows="'.$args['rows'].'" placeholder="'.$args['placeholder'].'">'.$args['value'].'</textarea>';
if (!empty($args['tip'])) { if (!empty($args['tip'])) {
$html .= '<small class="form-text text-muted">'.$args['tip'].'</small>'; $html .= '<div class="form-text">'.$args['tip'].'</div>';
} }
$html .= '</div>'; $html .= '</div>';
@ -321,7 +321,7 @@ EOF;
{ {
$labelForCheckbox = isset($args['labelForCheckbox'])?$args['labelForCheckbox']:''; $labelForCheckbox = isset($args['labelForCheckbox'])?$args['labelForCheckbox']:'';
$placeholder = isset($args['placeholder'])?$args['placeholder']:''; $placeholder = isset($args['placeholder'])?$args['placeholder']:'';
$tip = isset($args['tip'])?'<small class="form-text text-muted">'.$args['tip'].'</small>':''; $tip = isset($args['tip'])?'<div class="form-text">'.$args['tip'].'</div>':'';
$value = isset($args['value'])?$args['value']:''; $value = isset($args['value'])?$args['value']:'';
$name = $args['name']; $name = $args['name'];
$id = 'js'.$name; $id = 'js'.$name;
@ -394,7 +394,7 @@ EOF;
} }
$html .= '</select>'; $html .= '</select>';
if (!empty($args['tip'])) { if (!empty($args['tip'])) {
$html .= '<small class="form-text text-muted">'.$args['tip'].'</small>'; $html .= '<div class="form-text">'.$args['tip'].'</div>';
} }
$html .= '</div>'; $html .= '</div>';

View file

@ -120,12 +120,12 @@ class pluginBackup extends Plugin {
$html .= '<div class="row">'; $html .= '<div class="row">';
$html .= '<div class="col text-start">'; $html .= '<div class="col text-start">';
$html .= '<button name="createBackup" value="true" class="btn btn-primary" type="submit"><span class="fa fa-play-circle"></span> '.$L->get('create-backup').'</button>'; $html .= '<button name="createBackup" value="true" class="btn btn-primary" type="submit"><span class="bi-play-circle"></span> '.$L->get('create-backup').'</button>';
$html .= '</div>'; $html .= '</div>';
$html .= '<div class="col-5 text-end">'; $html .= '<div class="col-5 text-end">';
if ($this->zip) { if ($this->zip) {
$html .= '<input id="backupFile" type="file" name="backupFile" value="" style="position:absolute;top:-500em;" />'; $html .= '<input id="backupFile" type="file" name="backupFile" value="" style="position:absolute;top:-500em;" />';
$html .= '<label for="backupFile" value="true" class="btn btn-light d-inline-block" type="submit" style="margin-top:0 !important;"><span class="fa fa-upload"></span> '.$L->get('upload-backup').'</label>'; $html .= '<label for="backupFile" value="true" class="btn btn-light d-inline-block" type="submit" style="margin-top:0 !important;"><span class="bi-upload"></span> '.$L->get('upload-backup').'</label>';
} }
$html .= '</div>'; $html .= '</div>';
$html .= '</div>'; $html .= '</div>';
@ -145,10 +145,10 @@ class pluginBackup extends Plugin {
$html .= '<h4 class="font-weight-normal">'.$name.($count > 0? " ($count)": "").'</h4>'; $html .= '<h4 class="font-weight-normal">'.$name.($count > 0? " ($count)": "").'</h4>';
// Allow download if a zip file // Allow download if a zip file
if ($this->zip) { if ($this->zip) {
$html .= '<a class="btn btn-outline-secondary btn-sm me-1 mt-1" href="'.DOMAIN_BASE.'plugin-backup-download?file='.$filename.'.zip"><span class="fa fa-download"></span> '.$L->get('download').'</a>'; $html .= '<a class="btn btn-outline-secondary btn-sm me-1 mt-1" href="'.DOMAIN_BASE.'plugin-backup-download?file='.$filename.'.zip"><span class="bi-download"></span> '.$L->get('download').'</a>';
} }
$html .= '<button name="restoreBackup" value="'.$filename.'" class="btn btn-outline-secondary btn-sm me-1 mt-1" type="submit"><span class="fa fa-rotate-left"></span> '.$L->get('restore-backup').'</button>'; $html .= '<button name="restoreBackup" value="'.$filename.'" class="btn btn-outline-secondary btn-sm me-1 mt-1" type="submit"><span class="bi-rotate-left"></span> '.$L->get('restore-backup').'</button>';
$html .= '<button name="deleteBackup" value="'.$filename.'" class="btn btn-outline-danger btn-sm me-1 mt-1" type="submit"><span class="fa fa-trash"></span> '.$L->get('delete-backup').'</button>'; $html .= '<button name="deleteBackup" value="'.$filename.'" class="btn btn-outline-danger btn-sm me-1 mt-1" type="submit"><span class="bi-trash"></span> '.$L->get('delete-backup').'</button>';
$html .= '</div>'; $html .= '</div>';
$html .= '<hr>'; $html .= '<hr>';
} }

File diff suppressed because one or more lines are too long

View file

@ -124,7 +124,7 @@ return <<<EOF
output = "$pageBreak"; output = "$pageBreak";
cm.replaceSelection(output); cm.replaceSelection(output);
}, },
className: "fa fa-crop", className: "bi-crop",
title: "Page break", title: "Page break",
}] }]
}); });

View file

@ -42,10 +42,10 @@ class pluginVersion extends Plugin {
global $L; global $L;
$html = ''; $html = '';
if ($this->getValue('showCurrentVersion')) { if ($this->getValue('showCurrentVersion')) {
$html = '<a id="current-version" class="nav-link" href="'.HTML_PATH_ADMIN_ROOT.'about'.'">'.$L->get('Version').' '.(defined('BLUDIT_PRO')?'<span class="fa fa-heart" style="color: #ffc107"></span>':'').'<span class="badge badge-warning badge-pill">'.BLUDIT_VERSION.'</span></a>'; $html = '<a id="current-version" class="nav-link" href="'.HTML_PATH_ADMIN_ROOT.'about'.'">'.$L->get('Version').' '.(defined('BLUDIT_PRO')?'<span class="bi-heart" style="color: #ffc107"></span>':'').'<span class="badge badge-warning badge-pill">'.BLUDIT_VERSION.'</span></a>';
} }
if ($this->getValue('newVersionAlert')) { if ($this->getValue('newVersionAlert')) {
$html .= '<a id="new-version" style="display: none;" target="_blank" href="https://www.bludit.com">'.$L->get('New version available').' <span class="fa fa-bell" style="color: red"></span></a>'; $html .= '<a id="new-version" style="display: none;" target="_blank" href="https://www.bludit.com">'.$L->get('New version available').' <span class="bi-bell" style="color: red"></span></a>';
} }
return $html; return $html;
} }

View file

@ -8,7 +8,7 @@
</button> </button>
<div class="collapse navbar-collapse" id="navbarResponsive"> <div class="collapse navbar-collapse" id="navbarResponsive">
<ul class="navbar-nav ml-auto"> <ul class="navbar-nav ms-auto">
<!-- Static pages --> <!-- Static pages -->
<?php foreach ($staticContent as $staticPage): ?> <?php foreach ($staticContent as $staticPage): ?>

View file

@ -7,7 +7,7 @@
<span class="navbar-toggler-icon"></span> <span class="navbar-toggler-icon"></span>
</button> </button>
<div class="collapse navbar-collapse" id="navbarResponsive"> <div class="collapse navbar-collapse" id="navbarResponsive">
<ul class="navbar-nav ml-auto"> <ul class="navbar-nav ms-auto">
<!-- Static pages --> <!-- Static pages -->
<?php foreach ($staticContent as $staticPage): ?> <?php foreach ($staticContent as $staticPage): ?>