r31k/bludit
2
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Bug fixes, and dictionary updated

Browse Source
This commit is contained in:
Diego Najar 2018-11-08 20:59:06 -03:00
parent 91782166fb
commit 7df5ee322e
44 changed files with 165 additions and 173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bl-kernel/admin/controllers/edit-user.php
View File

@ -19,20 +19,24 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST') {
unset($_POST['role']);
}
if (isset($_POST['deleteUserAndDeleteContent'])) {
if (isset($_POST['deleteUserAndDeleteContent']) && ($login->role()==='admin')) {
$_POST['deleteContent'] = true;
deleteUser($_POST);
} elseif (isset($_POST['deleteUserAndKeepContent'])) {
} elseif (isset($_POST['deleteUserAndKeepContent']) && ($login->role()==='admin')) {
$_POST['deleteContent'] = false;
deleteUser($_POST);
} elseif (isset($_POST['disableUser'])) {
} elseif (isset($_POST['disableUser']) && ($login->role()==='admin')) {
disableUser(array('username'=>$_POST['username']));
} else {
editUser($_POST);
}
Alert::set($L->g('The changes have been saved'));
Redirect::page('users');
if ($login->role()==='admin') {
Redirect::page('users');
}
Redirect::page('edit-user/'.$login->username());
}
// ============================================================================

16
bl-kernel/admin/controllers/install-theme.php
View File

@ -21,20 +21,10 @@ checkRole(array('admin'));
// ============================================================================
// Main after POST
// ============================================================================
$themeDirname = $layout['parameters'];
$themeDirectory = $layout['parameters'];
if (Sanitize::pathFile(PATH_THEMES.$themeDirname)) {
$site->set(array('theme'=>$themeDirname));
// Add to syslog
$syslog->add(array(
'dictionaryKey'=>'new-theme-configured',
'notes'=>$themeDirname
));
// Create an alert
Alert::set( $L->g('The changes have been saved') );
}
// Activate theme
activateTheme($themeDirectory);
// Redirect
Redirect::page('themes');

5
bl-kernel/admin/controllers/user-password.php
View File

@ -20,7 +20,10 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST') {
'newPassword'=>$_POST['newPassword'],
'confirmPassword'=>$_POST['confirmPassword']
))) {
Redirect::page('users');
if ($login->role()==='admin') {
Redirect::page('users');
}
Redirect::page('edit-user/'.$login->username());
}
}

6
bl-kernel/admin/themes/booty/css/bludit.css
View File

@ -318,4 +318,10 @@ td.child {
background-color: rgba(255,255,255,0.7);
z-index: 10;
display: none;
}
img.profilePicture {
width: 30px;
border-radius: 30px;
border: 1px solid #ccc;
}

5
bl-kernel/admin/themes/booty/html/sidebar.php
View File

@ -17,10 +17,13 @@
</li>
<?php if (checkRole(array('editor'),false)): ?>
<li class="nav-item">
<a class="nav-link" href="<?php echo HTML_PATH_ADMIN_ROOT.'content' ?>"><span class="oi oi-layers"></span><?php $L->p('Content') ?></a>
</li>
<li class="nav-item">
<a class="nav-link" href="<?php echo HTML_PATH_ADMIN_ROOT.'edit-user/'.$login->username() ?>"><span class="oi oi-person"></span><?php $L->p('Profile') ?></a>
</li>
<?php endif; ?>
<?php if (checkRole(array('admin'),false)): ?>

28
bl-kernel/admin/views/configure-plugin.php
View File

@ -1,9 +1,19 @@
<?php defined('BLUDIT') or die('Bludit CMS.');
<?php defined('BLUDIT') or die('Bludit CMS.'); ?>
echo Bootstrap::pageTitle(array('title'=>$plugin->name(), 'icon'=>'wrench'));
<?php echo Bootstrap::formOpen(array('id'=>'jsform', 'class'=>'plugin-form')); ?>
echo Bootstrap::formOpen(array('class'=>'plugin-form'));
<div class="align-middle">
<?php if ($plugin->formButtons()): ?>
<div class="float-right mt-1">
<button type="submit" class="btn btn-primary btn-sm" name="save"><?php $L->p('Save') ?></button>
<a class="btn btn-secondary btn-sm" href="<?php echo HTML_PATH_ADMIN_ROOT.'plugins' ?>" role="button"><?php $L->p('Cancel') ?></a>
</div>
<?php endif; ?>
<?php echo Bootstrap::pageTitle(array('title'=>$plugin->name(), 'icon'=>'cog')); ?>
</div>
<?php
// Token CSRF
echo Bootstrap::formInputHidden(array(
'name'=>'tokenCSRF',
'value'=>$security->getTokenCSRF()
@ -11,14 +21,6 @@ echo Bootstrap::formOpen(array('class'=>'plugin-form'));
// Print the plugin form
echo $plugin->form();
?>
if ($plugin->formButtons()) {
echo '
<div class="form-group mt-4">
<button type="submit" class="btn btn-primary mr-2" name="save">'.$L->g('Save').'</button>
<a class="btn btn-secondary" href="'.HTML_PATH_ADMIN_ROOT.'plugins" role="button">'.$L->g('Cancel').'</a>
</div>
';
}
echo Bootstrap::formClose();
<?php echo Bootstrap::formClose(); ?>

2
bl-kernel/admin/views/content.php
View File

@ -239,7 +239,7 @@ function table($type) {
<?php
echo Bootstrap::modal(array(
'buttonPrimary'=>$L->g('Delete'),
'buttonPrimaryClass'=>'btn-danger jsbuttonDeleteAccept',
'buttonPrimaryClass'=>'btn-danger deletePageModalAcceptButton',
'buttonSecondary'=>$L->g('Cancel'),
'buttonSecondaryClass'=>'btn-secondary',
'modalTitle'=>$L->g('Delete content'),

2
bl-kernel/admin/views/edit-content.php
View File

@ -238,7 +238,7 @@ echo Bootstrap::formOpen(array(
'name'=>'',
'label'=>$L->g('Author'),
'placeholder'=>'',
'value'=>$login->username(),
'value'=>$page->username(),
'tip'=>'',
'disabled'=>true
));

50
bl-kernel/admin/views/edit-user.php
View File

@ -13,10 +13,10 @@
<!-- TABS -->
<nav class="mb-3">
<div class="nav nav-tabs" id="nav-tab" role="tablist">
<a class="nav-item nav-link active" id="nav-profile-tab" data-toggle="tab" href="#profile" role="tab" aria-controls="nav-profile" aria-selected="false">Profile</a>
<a class="nav-item nav-link" id="nav-picture-tab" data-toggle="tab" href="#picture" role="tab" aria-controls="nav-picture" aria-selected="false">Profile picture</a>
<a class="nav-item nav-link" id="nav-security-tab" data-toggle="tab" href="#security" role="tab" aria-controls="nav-security" aria-selected="false">Security</a>
<a class="nav-item nav-link" id="nav-social-tab" data-toggle="tab" href="#social" role="tab" aria-controls="nav-social" aria-selected="false">Social Networks</a>
<a class="nav-item nav-link active" id="nav-profile-tab" data-toggle="tab" href="#profile" role="tab" aria-controls="nav-profile" aria-selected="false"><?php $L->p('Profile') ?></a>
<a class="nav-item nav-link" id="nav-picture-tab" data-toggle="tab" href="#picture" role="tab" aria-controls="nav-picture" aria-selected="false"><?php $L->p('Profile picture') ?></a>
<a class="nav-item nav-link" id="nav-security-tab" data-toggle="tab" href="#security" role="tab" aria-controls="nav-security" aria-selected="false"><?php $L->p('Security') ?></a>
<a class="nav-item nav-link" id="nav-social-tab" data-toggle="tab" href="#social" role="tab" aria-controls="nav-social" aria-selected="false"><?php $L->p('Social Networks') ?></a>
</div>
</nav>
@ -149,28 +149,30 @@
'tip'=>$L->g('this-token-is-similar-to-a-password-it-should-not-be-shared')
));
echo Bootstrap::formTitle(array('title'=>$L->g('Status')));
if (checkRole(array('admin'),false)) {
echo Bootstrap::formTitle(array('title'=>$L->g('Status')));
echo Bootstrap::formInputText(array(
'name'=>'status',
'label'=>$L->g('Current status'),
'value'=>$user->enabled()?$L->g('Enabled'):$L->g('Disabled'),
'class'=>'',
'disabled'=>true,
'tip'=>$user->enabled()?'':$L->g('To enable the user you must set a new password')
));
echo Bootstrap::formInputText(array(
'name'=>'status',
'label'=>$L->g('Current status'),
'value'=>$user->enabled()?$L->g('Enabled'):$L->g('Disabled'),
'class'=>'',
'disabled'=>true,
'tip'=>$user->enabled()?'':$L->g('To enable the user you must set a new password')
));
if ($user->enabled()) {
echo '
<div class="form-group row">
<div class="col-sm-2"></div>
<div class="col-sm-10">
<button type="submit" class="btn btn-warning mr-2" id="jsdisableUser" name="disableUser">'.$L->g('Disable user').'</button>
<button type="submit" class="btn btn-danger mr-2" id="jsdeleteUserAndKeepContent" name="deleteUserAndKeepContent">'.$L->g('Delete user and keep content').'</button>
<button type="submit" class="btn btn-danger mr-2" id="jsdeleteUserAndDeleteContent" name="deleteUserAndDeleteContent">'.$L->g('Delete user and delete content').'</button>
</div>
</div>
';
if ($user->enabled()) {
echo '
<div class="form-group row">
<div class="col-sm-2"></div>
<div class="col-sm-10">
<button type="submit" class="btn btn-warning mr-2" id="jsdisableUser" name="disableUser">'.$L->g('Disable user').'</button>
<button type="submit" class="btn btn-danger mr-2" id="jsdeleteUserAndKeepContent" name="deleteUserAndKeepContent">'.$L->g('Delete user and keep content').'</button>
<button type="submit" class="btn btn-danger mr-2" id="jsdeleteUserAndDeleteContent" name="deleteUserAndDeleteContent">'.$L->g('Delete user and delete content').'</button>
</div>
</div>
';
}
}
?>
</div>

8
bl-kernel/admin/views/users.php
View File

@ -15,8 +15,7 @@ echo '
<thead>
<tr>
<th class="border-bottom-0" scope="col">'.$L->g('Username').'</th>
<th class="border-bottom-0 d-none d-lg-table-cell" scope="col">'.$L->g('First name').'</th>
<th class="border-bottom-0 d-none d-lg-table-cell" scope="col">'.$L->g('Last name').'</th>
<th class="border-bottom-0 d-none d-lg-table-cell" scope="col">'.$L->g('Nickname').'</th>
<th class="border-bottom-0" scope="col">'.$L->g('Email').'</th>
<th class="border-bottom-0" scope="col">'.$L->g('Status').'</th>
<th class="border-bottom-0" scope="col">'.$L->g('Role').'</th>
@ -31,9 +30,8 @@ foreach ($list as $username) {
try {
$user = new User($username);
echo '<tr>';
echo '<td><a href="'.HTML_PATH_ADMIN_ROOT.'edit-user/'.$username.'">'.$username.'</a></td>';
echo '<td class="d-none d-lg-table-cell">'.$user->firstName().'</td>';
echo '<td class="d-none d-lg-table-cell">'.$user->lastName().'</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_ADMIN_THEME_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>';
if ($user->role()=='admin') {

6
bl-kernel/functions.php
View File

@ -790,16 +790,18 @@ function getTag($key) {
}
}
// Activate a theme
function activateTheme($themeDirectory) {
global $site;
global $syslog;
global $L;
if (Sanitize::pathFile(PATH_THEMES.$themeDirectory)) {
$site->set(array('theme'=>$themeDirname));
$site->set(array('theme'=>$themeDirectory));
$syslog->add(array(
'dictionaryKey'=>'new-theme-configured',
'notes'=>$themeDirname
'notes'=>$themeDirectory
));
Alert::set( $L->g('The changes have been saved') );

20
bl-kernel/helpers/theme.class.php
View File

@ -2,6 +2,26 @@
class Theme {
public static function socialNetworks()
{
global $site;
$socialNetworks = array(
'github'=>'Github',
'twitter'=>'Twitter',
'facebook'=>'Facebook',
'instagram'=>'Instagram',
'codepen'=>'Codepen',
'linkedin'=>'Linkedin'
);
foreach ($socialNetworks as $key=>$label) {
if (!$site->{$key}()) {
unset($socialNetworks[$key]);
}
}
return $socialNetworks;
}
public static function title()
{
global $site;

3
bl-languages/ar_MA.json
View File

@ -365,5 +365,6 @@
"select-cover-image": "Select cover image",
"this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins.",
"no-pages-found": "No pages found",
"system-updated": "System updated"
"system-updated": "System updated",
"security": "Security"
}

3
bl-languages/bg_BG.json
View File

@ -365,5 +365,6 @@
"select-cover-image": "Select cover image",
"this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins.",
"no-pages-found": "No pages found",
"system-updated": "System updated"
"system-updated": "System updated",
"security": "Security"
}

3
bl-languages/cs_CZ.json
View File

@ -366,5 +366,6 @@
"select-cover-image": "Select cover image",
"this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins.",
"no-pages-found": "No pages found",
"system-updated": "System updated"
"system-updated": "System updated",
"security": "Security"
}

3
bl-languages/de_CH.json
View File

@ -366,5 +366,6 @@
"select-cover-image": "Select cover image",
"this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins.",
"no-pages-found": "No pages found",
"system-updated": "System updated"
"system-updated": "System updated",
"security": "Security"
}

3
bl-languages/de_DE.json
View File

@ -366,5 +366,6 @@
"select-cover-image": "Select cover image",
"this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins.",
"no-pages-found": "No pages found",
"system-updated": "System updated"
"system-updated": "System updated",
"security": "Security"
}

3
bl-languages/en.json
View File

@ -366,5 +366,6 @@
"select-cover-image": "Select cover image",
"this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins.",
"no-pages-found": "No pages found.",
"system-updated": "System updated."
"system-updated": "System updated.",
"security": "Security"
}

3
bl-languages/es.json
View File

@ -365,5 +365,6 @@
"select-cover-image": "Seleccionar imagen de portada",
"this-plugin-depends-on-the-following-plugins": "Este plugin depende de los siguientes plugins.",
"no-pages-found": "No se han encontrado páginas.",
"system-updated": "Sistema actualizado."
"system-updated": "Sistema actualizado.",
"security": "Seguridad"
}

3
bl-languages/fa_IR.json
View File

@ -365,5 +365,6 @@
"select-cover-image": "Select cover image",
"this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins.",
"no-pages-found": "No pages found",
"system-updated": "System updated"
"system-updated": "System updated",
"security": "Security"
}

3
bl-languages/fi_FI.json
View File

@ -365,5 +365,6 @@
"select-cover-image": "Select cover image",
"this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins.",
"no-pages-found": "No pages found",
"system-updated": "System updated"
"system-updated": "System updated",
"security": "Security"
}

3
bl-languages/fr_FR.json
View File

@ -366,5 +366,6 @@
"select-cover-image": "Sélectionnez une image d’accroche.",
"this-plugin-depends-on-the-following-plugins": "Ce plugin dépend des plugins suivants.",
"no-pages-found": "Aucune page trouvée",
"system-updated": "System updated"
"system-updated": "System updated",
"security": "Security"
}

3
bl-languages/gr.json
View File

@ -366,5 +366,6 @@
"select-cover-image": "Select cover image",
"this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins.",
"no-pages-found": "No pages found",
"system-updated": "System updated"
"system-updated": "System updated",
"security": "Security"
}

3
bl-languages/he_IL.json
View File

@ -366,5 +366,6 @@
"select-cover-image": "Select cover image",
"this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins.",
"no-pages-found": "No pages found",
"system-updated": "System updated"
"system-updated": "System updated",
"security": "Security"
}

3
bl-languages/hu_HU.json
View File

@ -365,5 +365,6 @@
"select-cover-image": "Select cover image",
"this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins.",
"no-pages-found": "No pages found",
"system-updated": "System updated"
"system-updated": "System updated",
"security": "Security"
}

3
bl-languages/it_IT.json
View File

@ -365,5 +365,6 @@
"select-cover-image": "Select cover image",
"this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins.",
"no-pages-found": "No pages found",
"system-updated": "System updated"
"system-updated": "System updated",
"security": "Security"
}

3
bl-languages/ja_JP.json
View File

@ -366,5 +366,6 @@
"select-cover-image": "Select cover image",
"this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins.",
"no-pages-found": "No pages found",
"system-updated": "System updated"
"system-updated": "System updated",
"security": "Security"
}

3
bl-languages/ms_MY.json
View File

@ -365,5 +365,6 @@
"select-cover-image": "Select cover image",
"this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins.",
"no-pages-found": "No pages found",
"system-updated": "System updated"
"system-updated": "System updated",
"security": "Security"
}

3
bl-languages/nl_NL.json
View File

@ -365,5 +365,6 @@
"select-cover-image": "Select cover image",
"this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins.",
"no-pages-found": "No pages found",
"system-updated": "System updated"
"system-updated": "System updated",
"security": "Security"
}

3
bl-languages/pl_PL.json
View File

@ -366,5 +366,6 @@
"select-cover-image": "Wybierz okładkę wpisu",
"this-plugin-depends-on-the-following-plugins": "Ta wtyczka zależna jest od innych rozszerzeń",
"no-pages-found": "No pages found",
"system-updated": "System updated"
"system-updated": "System updated",
"security": "Security"
}

3
bl-languages/pt_BR.json
View File

@ -366,5 +366,6 @@
"select-cover-image": "Select cover image",
"this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins.",
"no-pages-found": "No pages found",
"system-updated": "System updated"
"system-updated": "System updated",
"security": "Security"
}

3
bl-languages/pt_PT.json
View File

@ -366,5 +366,6 @@
"select-cover-image": "Select cover image",
"this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins.",
"no-pages-found": "No pages found",
"system-updated": "System updated"
"system-updated": "System updated",
"security": "Security"
}

3
bl-languages/ro_RO.json
View File

@ -362,5 +362,6 @@
"select-cover-image": "Select cover image",
"this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins.",
"no-pages-found": "No pages found",
"system-updated": "System updated"
"system-updated": "System updated",
"security": "Security"
}

3
bl-languages/ru_RU.json
View File

@ -366,5 +366,6 @@
"select-cover-image": "Выбрать изображение обложки",
"this-plugin-depends-on-the-following-plugins": "Этот плагин зависит от следующих плагинов.",
"no-pages-found": "Страниц не найдено",
"system-updated": "System updated"
"system-updated": "System updated",
"security": "Security"
}

3
bl-languages/tr_TR.json
View File

@ -367,5 +367,6 @@
"select-cover-image": "Kapak resmini seç",
"this-plugin-depends-on-the-following-plugins": "Bu eklenti aşağıdaki eklentilere bağlıdır.",
"no-pages-found": "No pages found",
"system-updated": "System updated"
"system-updated": "System updated",
"security": "Security"
}

3
bl-languages/uk_UA.json
View File

@ -366,5 +366,6 @@
"select-cover-image": "Select cover image",
"this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins.",
"no-pages-found": "No pages found",
"system-updated": "System updated"
"system-updated": "System updated",
"security": "Security"
}

3
bl-languages/vi_VN.json
View File

@ -365,5 +365,6 @@
"select-cover-image": "Select cover image",
"this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins.",
"no-pages-found": "No pages found",
"system-updated": "System updated"
"system-updated": "System updated",
"security": "Security"
}

3
bl-languages/zh_CN.json
View File

@ -365,5 +365,6 @@
"select-cover-image": "Select cover image",
"this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins.",
"no-pages-found": "No pages found",
"system-updated": "System updated"
"system-updated": "System updated",
"security": "Security"
}

3
bl-languages/zh_TW.json
View File

@ -365,5 +365,6 @@
"select-cover-image": "Select cover image",
"this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins.",
"no-pages-found": "No pages found",
"system-updated": "System updated"
"system-updated": "System updated",
"security": "Security"
}

4
bl-themes/alternative/index.php
View File

@ -1,5 +1,5 @@
<!DOCTYPE html>
<html>
<html lang="<?php echo Theme::lang() ?>">
<head>
<?php include(THEME_DIR_PHP.'head.php'); ?>
</head>
@ -39,4 +39,4 @@
<?php Theme::plugins('siteBodyEnd'); ?>
</body>
</html>
</html>

29
bl-themes/alternative/php/navbar.php
View File

@ -18,28 +18,13 @@
<?php endforeach ?>
<!-- Social Networks -->
<?php
$socialNetworks = array(
// Key => Label
'github'=>'Github',
'twitter'=>'Twitter',
'facebook'=>'Facebook',
'googleplus'=>'Google Plus',
'instagram'=>'Instagram',
'codepen'=>'Codepen',
'linkedin'=>'Linkedin'
);
?>
<?php foreach ($socialNetworks as $key=>$label): ?>
<?php if ($site->{$key}()): ?>
<li class="nav-item">
<a class="nav-link" href="<?php echo $site->{$key}(); ?>" target="_blank">
<img class="d-none d-sm-block nav-svg-icon" src="<?php echo DOMAIN_THEME.'img/'.$key.'.svg' ?>" alt="icon" />
<span class="d-inline d-sm-none"><?php echo $label; ?></span>
</a>
</li>
<?php endif; ?>
<?php foreach (Theme::socialNetworks() as $key=>$label): ?>
<li class="nav-item">
<a class="nav-link" href="<?php echo $site->{$key}(); ?>" target="_blank">
<img class="d-none d-sm-block nav-svg-icon" src="<?php echo DOMAIN_THEME.'img/'.$key.'.svg' ?>" alt="<?php echo $label ?>" />
<span class="d-inline d-sm-none"><?php echo $label; ?></span>
</a>
</li>
<?php endforeach; ?>
</ul>

4
bl-themes/blogx/index.php
View File

@ -1,5 +1,5 @@
<!DOCTYPE html>
<html>
<html lang="<?php echo Theme::lang() ?>">
<head>
<?php include(THEME_DIR_PHP.'head.php'); ?>
</head>
@ -57,4 +57,4 @@
<?php Theme::plugins('siteBodyEnd'); ?>
</body>
</html>
</html>

3
bl-themes/blogx/php/home.php
View File

@ -1,5 +1,4 @@
<?php foreach ($content as $page): ?>
<!-- Post -->
<div class="card my-5 border-0">
@ -34,9 +33,7 @@
<?php Theme::plugins('pageEnd'); ?>
</div>
<hr>
<?php endforeach ?>
<!-- Pagination -->

57
bl-themes/blogx/php/navbar.php
View File

@ -17,61 +17,14 @@
<?php endforeach ?>
<!-- Social Networks -->
<?php if ($site->github()): ?>
<?php foreach (Theme::socialNetworks() as $key=>$label): ?>
<li class="nav-item">
<a class="nav-link" href="<?php echo $site->github() ?>" target="_blank">
<img class="nav-svg-icon" src="<?php echo DOMAIN_THEME.'img/github.svg' ?>" alt="github icon" />
<a class="nav-link" href="<?php echo $site->{$key}(); ?>" target="_blank">
<img class="d-none d-sm-block nav-svg-icon" src="<?php echo DOMAIN_THEME.'img/'.$key.'.svg' ?>" alt="<?php echo $label ?>" />
<span class="d-inline d-sm-none"><?php echo $label; ?></span>
</a>
</li>
<?php endif ?>
<?php if ($site->twitter()): ?>
<li class="nav-item">
<a class="nav-link" href="<?php echo $site->twitter() ?>" target="_blank">
<img class="nav-svg-icon" src="<?php echo DOMAIN_THEME.'img/twitter.svg' ?>" alt="twitter icon" />
</a>
</li>
<?php endif ?>
<?php if ($site->facebook()): ?>
<li class="nav-item">
<a class="nav-link" href="<?php echo $site->facebook() ?>" target="_blank">
<img class="nav-svg-icon" src="<?php echo DOMAIN_THEME.'img/facebook.svg' ?>" alt="facebook icon" />
</a>
</li>
<?php endif ?>
<?php if ($site->googleplus()): ?>
<li class="nav-item">
<a class="nav-link" href="<?php echo $site->googleplus() ?>" target="_blank">
<img class="nav-svg-icon" src="<?php echo DOMAIN_THEME.'img/googleplus.svg' ?>" alt="googleplus icon" />
</a>
</li>
<?php endif ?>
<?php if ($site->instagram()): ?>
<li class="nav-item">
<a class="nav-link" href="<?php echo $site->instagram(); ?>" target="_blank">
<img class="nav-svg-icon" src="<?php echo DOMAIN_THEME.'img/instagram.svg' ?>" alt="instgram icon" />
</a>
</li>
<?php endif ?>
<?php if ($site->codepen()): ?>
<li class="nav-item">
<a class="nav-link" href="<?php echo $site->codepen() ?>" target="_blank">
<img class="nav-svg-icon" src="<?php echo DOMAIN_THEME.'img/codepen.svg' ?>" alt="codepen icon" />
</a>
</li>
<?php endif ?>
<?php if ($site->linkedin()): ?>
<li class="nav-item">
<a class="nav-link" href="<?php echo $site->linkedin() ?>" target="_blank">
<img class="nav-svg-icon" src="<?php echo DOMAIN_THEME.'img/linkedin.svg' ?>" alt="linkedin icon" />
</a>
</li>
<?php endif ?>
<?php endforeach; ?>
</ul>
</div>