kazhnuz/koblog
1
0
Fork 0
Code Issues 36 Pull requests 1 Projects 4 Releases Packages Wiki Activity Actions

🐛 (bootstrap): fix some bad use of margin values

Browse source
This commit is contained in:
Kazhnuz 2025-01-18 19:00:33 +01:00
parent 38e3900395
commit 9dd82a6015
15 changed files with 31 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
bl-kernel/admin/views/content.php
View file

@ -98,9 +98,9 @@ function table($type) {
echo '<td class="contentTools pt-3 text-end d-sm-table-cell">'.PHP_EOL;
echo '<a class="btn btn-sm btn-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="btn btn-sm btn-secondary d-none d-md-inline ml-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="btn btn-sm btn-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;
if (count($page->children())==0) {
echo '<a href="#" class="ml-2 btn btn-sm btn-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 btn btn-sm btn-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 '</td>';
@ -129,8 +129,8 @@ function table($type) {
if ($type=='published' || $type=='static' || $type=='sticky') {
echo '<a class="btn btn-sm btn-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="btn btn-sm btn-secondary d-none d-md-inline ml-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="ml-2 btn btn-sm btn-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="btn btn-sm btn-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="ms-2 btn btn-sm btn-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 '</td>';
echo '</tr>';
@ -166,9 +166,9 @@ function table($type) {
if ($type=='published' || $type=='static' || $type=='sticky') {
echo '<a class="btn btn-sm btn-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="btn btn-sm btn-secondary d-none d-md-inline ml-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="btn btn-sm btn-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;
if (count($page->children())==0) {
echo '<a href="#" class="ml-2 btn btn-sm btn-danger deletePageButton d-block d-sm-inline" data-bs-toggle="modal" data-bs-target="#jsdeletePageModal" data-key="'.$page->key().'"><i class="fa fa-trash"></i>'.$L->g('Delete').'</a>'.PHP_EOL;
echo '<a href="#" class="ms-2 btn btn-sm btn-danger deletePageButton d-block d-sm-inline" data-bs-toggle="modal" data-bs-target="#jsdeletePageModal" data-key="'.$page->key().'"><i class="fa fa-trash"></i>'.$L->g('Delete').'</a>'.PHP_EOL;
}
echo '</td>';

2
bl-kernel/admin/views/dashboard.php
View file

@ -88,7 +88,7 @@
html += '<div class="search-suggestion-item">' + data.text + ' <span class="badge badge-pill badge-light">' + data.type + '</span></div>';
html += '<div class="search-suggestion-options">';
html += '<a target="_blank" href="' + DOMAIN_PAGES + data.id + '"><?php $L->p('view') ?></a>';
html += '<a class="ml-2" href="' + DOMAIN_ADMIN + 'edit-content/' + data.id + '"><?php $L->p('edit') ?></a>';
html += '<a class="ms-2" href="' + DOMAIN_ADMIN + 'edit-content/' + data.id + '"><?php $L->p('edit') ?></a>';
html += '</div></div>';
}

6
bl-kernel/admin/views/edit-content.php
View file

@ -51,7 +51,7 @@ echo Bootstrap::formInputHidden(array(
<!-- TOOLBAR -->
<div class="mb-3 col-lg-6">
<button type="button" class="btn btn-light" data-bs-toggle="modal" data-bs-target="#jsmediaManagerModal"><span class="fa fa-image"></span> <?php $L->p('Images') ?></button>
<span id="jsswitchButton" data-switch="<?php echo ($page->draft() ? 'draft' : 'publish') ?>" class="ml-2 btn-outline-<?php echo ($page->draft() ? 'light' : 'success') ?> btn"><?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 btn-outline-<?php echo ($page->draft() ? 'light' : 'success') ?> btn"><?php echo ($page->draft() ? $L->g('Draft') : $L->g('Publish')) ?></span>
<?php if ($page->scheduled()) : ?>
<div class="alert alert-warning p-1 mt-1 mb-0"><?php $L->p('scheduled') ?>: <?php echo $page->date(SCHEDULED_DATE_FORMAT) ?></div>
@ -489,11 +489,11 @@ foreach ($customFields as $field => $options) {
if ($(this).data("switch") == "publish") {
$(this).html('<?php $L->p('Draft') ?>');
$(this).data("switch", "draft");
$(this).attr('class', "ml-2 btn-outline-secondary btn");
$(this).attr('class', "ms-2 btn-outline-secondary btn");
} else {
$(this).html('<?php $L->p('Publish') ?>');
$(this).data("switch", "publish");
$(this).attr('class', "ml-2 btn-outline-success btn");
$(this).attr('class', "ms-2 btn-outline-success btn");
}
});

2
bl-kernel/admin/views/login.php
View file

@ -28,7 +28,7 @@ echo '
</div>
<div class="form-group mt-3">
<button type="submit" class="btn btn-primary btn-lg mr-2 w-100" name="save">' . $L->g('Login') . '</button>
<button type="submit" class="btn btn-primary btn-lg me-2 w-100" name="save">' . $L->g('Login') . '</button>
</div>
';

6
bl-kernel/admin/views/new-content.php
View file

@ -44,7 +44,7 @@ echo Bootstrap::formInputHidden(array(
<!-- TOOLBAR -->
<div class="mb-3 col-lg-6">
<button type="button" class="btn btn-light" data-bs-toggle="modal" data-bs-target="#jsmediaManagerModal"><span class="fa fa-image"></span> <?php $L->p('Images') ?></button>
<span id="jsswitchButton" data-switch="publish" class="ml-2 btn-outline-success btn"><?php $L->p('Publish') ?></span>
<span id="jsswitchButton" data-switch="publish" class="ms-2 btn-outline-success btn"><?php $L->p('Publish') ?></span>
</div>
<div class="col-lg-6 text-end">
@ -444,11 +444,11 @@ foreach ($customFields as $field => $options) {
if ($(this).data("switch") == "publish") {
$(this).html('<?php $L->p('Draft') ?>');
$(this).data("switch", "draft");
$(this).attr('class', "ml-2 btn-outline-secondary btn");
$(this).attr('class', "ms-2 btn-outline-secondary btn");
} else {
$(this).html('<?php $L->p('Publish') ?>');
$(this).data("switch", "publish");
$(this).attr('class', "ml-2 btn-outline-success btn");
$(this).attr('class', "ms-2 btn-outline-success btn");
}
});

2
bl-kernel/admin/views/themes.php
View file

@ -20,7 +20,7 @@ foreach ($themes as $theme) {
echo '
<tr class="card-tablebody">
<td class="align-middle pt-3 pb-3">
<div>'.$theme['name'].($theme['dirname']==$site->theme()?'<span class="badge badge-primary ml-2">'.$L->g('Active').'</span>':'').'</div>
<div>'.$theme['name'].($theme['dirname']==$site->theme()?'<span class="badge badge-primary ms-2">'.$L->g('Active').'</span>':'').'</div>
<div class="mt-1">
';

2
bl-themes/alternative/php/footer.php
View file

@ -1,5 +1,5 @@
<footer class="footer bg-dark">
<div class="container">
<p class="m-0 text-center text-white text-uppercase"><?php echo $site->footer(); ?><span class="ml-5 text-warning"><img class="mini-logo" src="<?php echo DOMAIN_THEME_IMG.'favicon.png'; ?>"/> Powered by <a target="_blank" class="text-white" href="https://www.koblog.com"><?php echo (defined('KOBLOG_PRO'))?'KOBLOG PRO':'KOBLOG' ?></a></span></p>
<p class="m-0 text-center text-white text-uppercase"><?php echo $site->footer(); ?><span class="ms-5 text-warning"><img class="mini-logo" src="<?php echo DOMAIN_THEME_IMG.'favicon.png'; ?>"/> Powered by <a target="_blank" class="text-white" href="https://www.koblog.com"><?php echo (defined('KOBLOG_PRO'))?'KOBLOG PRO':'KOBLOG' ?></a></span></p>
</div>
</footer>

6
bl-themes/alternative/php/home.php
View file

@ -12,7 +12,7 @@
<!-- Custom search form if the plugin "search" is enabled -->
<?php if (pluginActivated('pluginSearch')) : ?>
<div class="form-inline d-block">
<input id="search-input" class="form-control mr-sm-2" type="search" placeholder="<?php $language->p('Search') ?>" aria-label="Search">
<input id="search-input" class="form-control me-sm-2" type="search" placeholder="<?php $language->p('Search') ?>" aria-label="Search">
<button class="btn btn-outline-primary my-2 my-sm-0" type="button" onClick="searchNow()"><?php $language->p('Search') ?></button>
<script>
function searchNow() {
@ -91,7 +91,7 @@
<!-- Previous button -->
<?php if (Paginator::showPrev()) : ?>
<li class="page-item mr-2">
<li class="page-item me-2">
<a class="page-link" href="<?php echo Paginator::previousPageUrl() ?>" tabindex="-1">&#9664; <?php echo $L->get('Previous'); ?></a>
</li>
<?php endif; ?>
@ -103,7 +103,7 @@
<!-- Next button -->
<?php if (Paginator::showNext()) : ?>
<li class="page-item ml-2">
<li class="page-item ms-2">
<a class="page-link" href="<?php echo Paginator::nextPageUrl() ?>"><?php echo $L->get('Next'); ?> &#9658;</a>
</li>
<?php endif; ?>

2
bl-themes/alternative/php/navbar.php
View file

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

2
bl-themes/blogx/php/footer.php
View file

@ -1,5 +1,5 @@
<footer class="footer bg-dark">
<div class="container">
<p class="m-0 text-center text-white text-uppercase"><?php echo $site->footer(); ?><span class="ml-5 text-warning"><img class="mini-logo" src="<?php echo DOMAIN_THEME_IMG.'favicon.png'; ?>"/> Powered by <a target="_blank" class="text-white" href="https://www.koblog.com"><?php echo (defined('KOBLOG_PRO'))?'KOBLOG PRO':'KOBLOG' ?></a></span></p>
<p class="m-0 text-center text-white text-uppercase"><?php echo $site->footer(); ?><span class="ms-5 text-warning"><img class="mini-logo" src="<?php echo DOMAIN_THEME_IMG.'favicon.png'; ?>"/> Powered by <a target="_blank" class="text-white" href="https://www.koblog.com"><?php echo (defined('KOBLOG_PRO'))?'KOBLOG PRO':'KOBLOG' ?></a></span></p>
</div>
</footer>

6
bl-themes/blogx/php/home.php
View file

@ -25,7 +25,7 @@
<!-- Creation date -->
<h6 class="card-subtitle mt-1 mb-4 text-muted">
<i class="bi bi-calendar"></i><?php echo $page->date(); ?>
<i class="ml-3 bi bi-clock-history"></i><?php echo $L->get('Reading time') . ': ' . $page->readingTime(); ?>
<i class="ms-3 bi bi-clock-history"></i><?php echo $L->get('Reading time') . ': ' . $page->readingTime(); ?>
</h6>
<!-- Breaked content -->
@ -52,7 +52,7 @@
<!-- Previous button -->
<?php if (Paginator::showPrev()) : ?>
<li class="page-item mr-2">
<li class="page-item me-2">
<a class="page-link" href="<?php echo Paginator::previousPageUrl() ?>" tabindex="-1">&#9664; <?php echo $L->get('Previous'); ?></a>
</li>
<?php endif; ?>
@ -64,7 +64,7 @@
<!-- Next button -->
<?php if (Paginator::showNext()) : ?>
<li class="page-item ml-2">
<li class="page-item ms-2">
<a class="page-link" href="<?php echo Paginator::nextPageUrl() ?>"><?php echo $L->get('Next'); ?> &#9658;</a>
</li>
<?php endif; ?>

2
bl-themes/blogx/php/navbar.php
View file

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

6
bl-themes/popeye/php/home.php
View file

@ -27,7 +27,7 @@
<!-- Search input -->
<?php if (pluginActivated('pluginSearch')) : ?>
<form class="d-flex mb-4">
<input id="search-input" class="form-control mr-2" type="search" placeholder="Search" aria-label="Search">
<input id="search-input" class="form-control me-2" type="search" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-primary" type="button" onClick="searchNow()">Search</button>
</form>
<script>
@ -104,7 +104,7 @@
if (!empty($tagsList)) {
echo '<small>';
foreach ($tagsList as $tagKey => $tagName) {
echo '<a class="badge bg-gray text-dark text-decoration-none mr-2" href="' . DOMAIN_TAGS . $tagKey . '">' . $tagName . '</a>';
echo '<a class="badge bg-gray text-dark text-decoration-none me-2" href="' . DOMAIN_TAGS . $tagKey . '">' . $tagName . '</a>';
}
echo '</small>';
}
@ -132,7 +132,7 @@
<!-- Newer pages -->
<?php if (Paginator::showPrev()) : ?>
<li class="page-item ml-auto">
<li class="page-item ms-auto">
<a class="page-link" href="<?php echo Paginator::previousPageUrl() ?>" tabindex="-1"><?php echo $L->get('Next'); ?> &#9658;</a>
</li>
<?php endif; ?>

2
bl-themes/popeye/php/navbar.php
View file

@ -4,7 +4,7 @@
<div class="d-flex">
<!-- Static pages -->
<?php foreach ($staticContent as $tmp) : ?>
<a class="mr-3 ml-3" href="<?php echo $tmp->permalink(); ?>"><?php echo $tmp->title(); ?></a>
<a class="me-3 ms-3" href="<?php echo $tmp->permalink(); ?>"><?php echo $tmp->title(); ?></a>
<?php endforeach ?>
</div>
</div>

4
install.php
View file

@ -664,7 +664,7 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST') {
</div>
<div class="form-group mt-4">
<button type="submit" class="btn btn-primary btn-lg mr-2 w-100" name="install"><?php $L->p('Install') ?></button>
<button type="submit" class="btn btn-primary btn-lg me-2 w-100" name="install"><?php $L->p('Install') ?></button>
</div>
</form>
<?php
@ -682,7 +682,7 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST') {
</select>
<div class="form-group mt-4">
<button type="submit" class="btn btn-primary btn-lg mr-2 w-100"><?php $L->p('Next') ?></button>
<button type="submit" class="btn btn-primary btn-lg me-2 w-100"><?php $L->p('Next') ?></button>
</div>
</form>
<?php