Merge pull request #730 from anaggh/master

Small fixes

.htaccess

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

bl-kernel/admin/themes/booty/login.php

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

bl-kernel/admin/views/content.php

@@ -15,7 +15,7 @@ function table($type) {
 		$list = $published;
 		if (empty($list)) {
 			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>';
 			return false;
 		}
@@ -23,7 +23,7 @@ function table($type) {
 		$list = $drafts;
 		if (empty($list)) {
 			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>';
 			return false;
 		}
@@ -31,7 +31,7 @@ function table($type) {
 		$list = $scheduled;
 		if (empty($list)) {
 			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>';
 			return false;
 		}
@@ -39,7 +39,7 @@ function table($type) {
 		$list = $static;
 		if (empty($list)) {
 			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>';
 			return false;
 		}
@@ -47,7 +47,7 @@ function table($type) {
 		$list = $sticky;
 		if (empty($list)) {
 			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>';
 			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 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 '</td>';
 
@@ -222,8 +222,8 @@ function table($type) {
 <!-- Modal for delete page -->
 <?php echo Bootstrap::modal(array(
 	'modalId'=>'jsdeletePageModal',
-	'modalTitle'=>'Delete content',
-	'modalText'=>'Are you sure you ?',
+	'modalTitle'=>'<span class="oi oi-trash"></span> ' . 'Delete content',
+	'modalText'=>'Are you sure you want to delete this page?',
 	'buttonPrimary'=>'Delete',
 	'buttonPrimaryClass'=>'deletePageModalAcceptButton',
 	'buttonSecondary'=>'Cancel',
@@ -263,4 +263,4 @@ $(document).ready(function() {
 		form.hide().appendTo("body").submit();
 	});
 });
-</script>
+</script>

bl-kernel/admin/views/dashboard.php

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

bl-kernel/admin/views/edit-content.php

@@ -124,7 +124,7 @@
 				'name'=>'externalCoverImage',
 				'placeholder'=>'https://',
 				'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',
 				'placeholder'=>'',
 				'value'=>$page->tags(),
-				'tip'=>'Write the tags separeted by comma'
+				'tip'=>'Write the tags separated by comma'
 			));
 
 			// Friendly URL
@@ -295,7 +295,7 @@
 							'label'=>'',
 							'selected'=>$page->categoryKey(),
 							'class'=>'',
-							'emptyOption'=>'- Without category -',
+							'emptyOption'=>'- Uncategorized -',
 							'options'=>$dbCategories->getKeyNameArray()
 						));
 					?>

bl-kernel/admin/views/new-content.php

@@ -100,7 +100,7 @@
 				'name'=>'externalCoverImage',
 				'placeholder'=>"https://",
 				'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',
 				'label'=>'Tags',
 				'placeholder'=>'',
-				'tip'=>'Write the tags separeted by comma'
+				'tip'=>'Write the tags separated by comma'
 			));
 
 			// Friendly URL
@@ -229,7 +229,7 @@
 							'label'=>'',
 							'selected'=>'',
 							'class'=>'',
-							'emptyOption'=>'- Without category -',
+							'emptyOption'=>'- Uncategorized -',
 							'options'=>$dbCategories->getKeyNameArray()
 						));
 					?>

bl-kernel/dbpages.class.php

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

bl-kernel/pagex.class.php

@@ -232,7 +232,7 @@ class PageX {
 	}
 
 	// 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 )
 	public function tags($returnsArray=false)
 	{
@@ -247,7 +247,7 @@ class PageX {
 		if (empty($tags)) {
 			return '';
 		}
-		// Return string with tags separeted by comma.
+		// Return string with tags separated by comma.
 		return implode(', ', $tags);
 	}
 

install.php

@@ -575,7 +575,7 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST') {
 <body class="login">
 <div class="container">
 	<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>
 			<?php
 			$system = checkSystem();