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

Merge pull request #730 from anaggh/master 

Small fixes
This commit is contained in:
Diego Najar 2018-08-01 16:15:27 +03:00 committed by GitHub
parent 1d7859bc58 92ece7eb7f
commit a515a588b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.htaccess
View File

@ -15,4 +15,4 @@ RewriteRule ^bl-content/(.*)\.txt$ - [R=404,L]
RewriteCond %{REQUEST_FILENAME} !-f RewriteCond %{REQUEST_FILENAME} !-f
RewriteRule ^(.*) index.php [PT,L] RewriteRule ^(.*) index.php [PT,L]
</IfModule> </IfModule>

4
bl-kernel/admin/themes/booty/login.php
View File

@ -36,7 +36,7 @@
<div class="container"> <div class="container">
<div class="row justify-content-md-center pt-5"> <div class="row justify-content-md-center pt-5">
<div class="col-4 pt-5"> <div class="col-md-4 pt-5">
<?php <?php
if (Sanitize::pathFile(PATH_ADMIN_VIEWS, $layout['view'].'.php')) { if (Sanitize::pathFile(PATH_ADMIN_VIEWS, $layout['view'].'.php')) {
include(PATH_ADMIN_VIEWS.$layout['view'].'.php'); include(PATH_ADMIN_VIEWS.$layout['view'].'.php');
@ -50,4 +50,4 @@
<?php Theme::plugins('loginBodyEnd') ?> <?php Theme::plugins('loginBodyEnd') ?>
</body> </body>
</html> </html>

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

@ -15,7 +15,7 @@ function table($type) {
$list = $published; $list = $published;
if (empty($list)) { if (empty($list)) {
echo '<p class="mt-4 text-muted">'; echo '<p class="mt-4 text-muted">';
echo $Language->g('There are not pages in this moment.'); echo $Language->g('There are no pages at this moment.');
echo '</p>'; echo '</p>';
return false; return false;
} }
@ -23,7 +23,7 @@ function table($type) {
$list = $drafts; $list = $drafts;
if (empty($list)) { if (empty($list)) {
echo '<p class="mt-4 text-muted">'; echo '<p class="mt-4 text-muted">';
echo $Language->g('There are not draft pages in this moment.'); echo $Language->g('There are no draft pages at this moment.');
echo '</p>'; echo '</p>';
return false; return false;
} }
@ -31,7 +31,7 @@ function table($type) {
$list = $scheduled; $list = $scheduled;
if (empty($list)) { if (empty($list)) {
echo '<p class="mt-4 text-muted">'; echo '<p class="mt-4 text-muted">';
echo $Language->g('There are not scheduled pages in this moment.'); echo $Language->g('There are no scheduled pages at this moment.');
echo '</p>'; echo '</p>';
return false; return false;
} }
@ -39,7 +39,7 @@ function table($type) {
$list = $static; $list = $static;
if (empty($list)) { if (empty($list)) {
echo '<p class="mt-4 text-muted">'; echo '<p class="mt-4 text-muted">';
echo $Language->g('There are not static pages in this moment.'); echo $Language->g('There are no static pages at this moment.');
echo '</p>'; echo '</p>';
return false; return false;
} }
@ -47,7 +47,7 @@ function table($type) {
$list = $sticky; $list = $sticky;
if (empty($list)) { if (empty($list)) {
echo '<p class="mt-4 text-muted">'; echo '<p class="mt-4 text-muted">';
echo $Language->g('There are not sticky pages in this moment.'); echo $Language->g('There are no sticky pages at this moment.');
echo '</p>'; echo '</p>';
return false; return false;
} }
@ -126,7 +126,7 @@ function table($type) {
echo '<td class="pt-3 d-none d-lg-table-cell"><a target="_blank" href="'.$page->permalink().'">'.$friendlyURL.'</a></td>'; echo '<td class="pt-3 d-none d-lg-table-cell"><a target="_blank" href="'.$page->permalink().'">'.$friendlyURL.'</a></td>';
echo '<td class="pt-3 text-center d-none d-sm-table-cell">'.PHP_EOL; echo '<td class="pt-3 text-center d-none d-sm-table-cell">'.PHP_EOL;
echo '<a class="btn btn-secondary btn-sm" href="'.HTML_PATH_ADMIN_ROOT.'edit-content/'.$page->key().'">Edit</a>'.PHP_EOL; echo '<a class="btn btn-secondary btn-sm" href="'.HTML_PATH_ADMIN_ROOT.'edit-content/'.$page->key().'"><span class="oi oi-pencil"></span> Edit</a>'.PHP_EOL;
echo '<button type="button" class="btn btn-secondary btn-sm deletePageButton" data-toggle="modal" data-target="#jsdeletePageModal" data-key="'.$page->key().'"><span class="oi oi-trash"></span> Delete</button>'.PHP_EOL; echo '<button type="button" class="btn btn-secondary btn-sm deletePageButton" data-toggle="modal" data-target="#jsdeletePageModal" data-key="'.$page->key().'"><span class="oi oi-trash"></span> Delete</button>'.PHP_EOL;
echo '</td>'; echo '</td>';
@ -222,8 +222,8 @@ function table($type) {
<!-- Modal for delete page --> <!-- Modal for delete page -->
<?php echo Bootstrap::modal(array( <?php echo Bootstrap::modal(array(
'modalId'=>'jsdeletePageModal', 'modalId'=>'jsdeletePageModal',
'modalTitle'=>'Delete content', 'modalTitle'=>'<span class="oi oi-trash"></span> ' . 'Delete content',
'modalText'=>'Are you sure you ?', 'modalText'=>'Are you sure you want to delete this page?',
'buttonPrimary'=>'Delete', 'buttonPrimary'=>'Delete',
'buttonPrimaryClass'=>'deletePageModalAcceptButton', 'buttonPrimaryClass'=>'deletePageModalAcceptButton',
'buttonSecondary'=>'Cancel', 'buttonSecondary'=>'Cancel',
@ -263,4 +263,4 @@ $(document).ready(function() {
form.hide().appendTo("body").submit(); form.hide().appendTo("body").submit();
}); });
}); });
</script> </script>

6
bl-kernel/admin/views/dashboard.php
View File

@ -1,6 +1,6 @@
<div id="dashboard" class="container mt-3"> <div id="dashboard" class="container mt-3">
<div class="row"> <div class="row">
<div class="col-7"> <div class="col-md-7">
<!-- Quick Links --> <!-- Quick Links -->
<div class="container border-bottom pb-4"> <div class="container border-bottom pb-4">
@ -51,7 +51,7 @@
<?php Theme::plugins('dashboard') ?> <?php Theme::plugins('dashboard') ?>
</div> </div>
<div class="col-5"> <div class="col-md-5">
<!-- Notifications --> <!-- Notifications -->
<ul class="list-group list-group-striped b-0"> <ul class="list-group list-group-striped b-0">
@ -76,4 +76,4 @@
</div> </div>
</div> </div>
</div> </div>

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

@ -124,7 +124,7 @@
'name'=>'externalCoverImage', 'name'=>'externalCoverImage',
'placeholder'=>'https://', 'placeholder'=>'https://',
'value'=>$externalCoverImage, 'value'=>$externalCoverImage,
'tip'=>'Set a cover image from external URL, such as a CDN or some server dedicate for images.' 'tip'=>'Set a cover image from external URL, such as a CDN or some server dedicated for images.'
)); ));
?> ?>
@ -216,7 +216,7 @@
'label'=>'Tags', 'label'=>'Tags',
'placeholder'=>'', 'placeholder'=>'',
'value'=>$page->tags(), 'value'=>$page->tags(),
'tip'=>'Write the tags separeted by comma' 'tip'=>'Write the tags separated by comma'
)); ));
// Friendly URL // Friendly URL
@ -295,7 +295,7 @@
'label'=>'', 'label'=>'',
'selected'=>$page->categoryKey(), 'selected'=>$page->categoryKey(),
'class'=>'', 'class'=>'',
'emptyOption'=>'- Without category -', 'emptyOption'=>'- Uncategorized -',
'options'=>$dbCategories->getKeyNameArray() 'options'=>$dbCategories->getKeyNameArray()
)); ));
?> ?>

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

@ -100,7 +100,7 @@
'name'=>'externalCoverImage', 'name'=>'externalCoverImage',
'placeholder'=>"https://", 'placeholder'=>"https://",
'value'=>'', 'value'=>'',
'tip'=>'Set a cover image from external URL, such as a CDN or some server dedicate for images.' 'tip'=>'Set a cover image from external URL, such as a CDN or some server dedicated for images.'
)); ));
?> ?>
@ -173,7 +173,7 @@
'name'=>'tags', 'name'=>'tags',
'label'=>'Tags', 'label'=>'Tags',
'placeholder'=>'', 'placeholder'=>'',
'tip'=>'Write the tags separeted by comma' 'tip'=>'Write the tags separated by comma'
)); ));
// Friendly URL // Friendly URL
@ -229,7 +229,7 @@
'label'=>'', 'label'=>'',
'selected'=>'', 'selected'=>'',
'class'=>'', 'class'=>'',
'emptyOption'=>'- Without category -', 'emptyOption'=>'- Uncategorized -',
'options'=>$dbCategories->getKeyNameArray() 'options'=>$dbCategories->getKeyNameArray()
)); ));
?> ?>

4
bl-kernel/dbpages.class.php
View File

@ -789,7 +789,7 @@ class dbPages extends dbJSON {
} }
// Returns an Array, array('tagSlug'=>'tagName') // Returns an Array, array('tagSlug'=>'tagName')
// (string) $tags, tag list separeted by comma. // (string) $tags, tag list separated by comma.
public function generateTags($tags) public function generateTags($tags)
{ {
$tmp = array(); $tmp = array();
@ -818,4 +818,4 @@ class dbPages extends dbJSON {
return $this->save(); return $this->save();
} }
} }

4
bl-kernel/pagex.class.php
View File

@ -232,7 +232,7 @@ class PageX {
} }
// Returns the tags separated by comma // Returns the tags separated by comma
// (boolean) $returnsArray, TRUE to get the tags as an array, FALSE to get the tags separeted by comma // (boolean) $returnsArray, TRUE to get the tags as an array, FALSE to get the tags separated by comma
// The tags in array format returns array( tagKey => tagName ) // The tags in array format returns array( tagKey => tagName )
public function tags($returnsArray=false) public function tags($returnsArray=false)
{ {
@ -247,7 +247,7 @@ class PageX {
if (empty($tags)) { if (empty($tags)) {
return ''; return '';
} }
// Return string with tags separeted by comma. // Return string with tags separated by comma.
return implode(', ', $tags); return implode(', ', $tags);
} }

2
install.php
View File

@ -575,7 +575,7 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST') {
<body class="login"> <body class="login">
<div class="container"> <div class="container">
<div class="row justify-content-md-center pt-5"> <div class="row justify-content-md-center pt-5">
<div class="col-4 pt-5"> <div class="col-md-4 pt-5">
<h1 class="text-center mb-5 mt-5 font-weight-normal text-uppercase" style="color: #555;"><?php echo $Language->get('Bludit Installer') ?></h1> <h1 class="text-center mb-5 mt-5 font-weight-normal text-uppercase" style="color: #555;"><?php echo $Language->get('Bludit Installer') ?></h1>
<?php <?php
$system = checkSystem(); $system = checkSystem();