From a8101ea2f2d7f9d1ceec14b6974ba848714360ca Mon Sep 17 00:00:00 2001
From: Diego Najar <dignajar@gmail.com>
Date: Wed, 20 Sep 2017 23:00:03 +0200
Subject: [PATCH] Pages, and static pages

---
 bl-kernel/admin/controllers/pages.php    |  2 +-
 bl-kernel/admin/themes/default/index.php |  8 ++++----
 bl-kernel/admin/views/dashboard.php      |  8 ++++----
 bl-kernel/admin/views/edit-page.php      |  4 ++--
 bl-kernel/admin/views/new-page.php       |  6 +++---
 bl-kernel/admin/views/pages.php          | 11 +++++------
 bl-kernel/dbpages.class.php              |  6 +++---
 bl-kernel/page.class.php                 |  6 +++---
 bl-languages/en.json                     | 12 +++++++++---
 install.php                              |  2 +-
 10 files changed, 35 insertions(+), 30 deletions(-)

diff --git a/bl-kernel/admin/controllers/pages.php b/bl-kernel/admin/controllers/pages.php
index 7cbcb013..9c3d6ac6 100644
--- a/bl-kernel/admin/controllers/pages.php
+++ b/bl-kernel/admin/controllers/pages.php
@@ -36,7 +36,7 @@ $drafts = $dbPages->getDraftDB();
 
 $scheduled = $dbPages->getScheduledDB();
 
-$fixed = $dbPages->getFixedDB();
+$static = $dbPages->getStaticDB();
 
 // Title of the page
 $layout['title'] .= ' - '.$Language->g('Manage Content');
\ No newline at end of file
diff --git a/bl-kernel/admin/themes/default/index.php b/bl-kernel/admin/themes/default/index.php
index 6bdf293b..486eba75 100644
--- a/bl-kernel/admin/themes/default/index.php
+++ b/bl-kernel/admin/themes/default/index.php
@@ -58,8 +58,8 @@ $(document).ready(function() {
 <div class="uk-offcanvas-bar">
 	<ul class="uk-nav uk-nav-offcanvas">
 	<li><a href="<?php echo HTML_PATH_ADMIN_ROOT.'dashboard' ?>"><?php $L->p('Dashboard') ?></a></li>
-	<li><a href="<?php echo HTML_PATH_ADMIN_ROOT.'new-page' ?>"><?php $L->p('New content') ?></a></li>
-	<li><a href="<?php echo HTML_PATH_ADMIN_ROOT.'manage-pages' ?>"><?php $L->p('Manage content') ?></a></li>
+	<li><a href="<?php echo HTML_PATH_ADMIN_ROOT.'new-page' ?>"><?php $L->p('New page') ?></a></li>
+	<li><a href="<?php echo HTML_PATH_ADMIN_ROOT.'manage-pages' ?>"><?php $L->p('Manage pages') ?></a></li>
 	<?php if($Login->role() == 'admin') { ?>
 	<li><a href="<?php echo HTML_PATH_ADMIN_ROOT.'categories' ?>"><?php $L->p('Manage categories') ?></a></li>
 	<li><a href="<?php echo HTML_PATH_ADMIN_ROOT.'users' ?>"><?php $L->p('Manage users') ?></a></li>
@@ -103,12 +103,12 @@ $(document).ready(function() {
 
 			<li class="uk-nav-header"><?php $L->p('Publish') ?></li>
 			<li <?php echo ($layout['view']=='new-page')?'class="uk-active"':'' ?>>
-				<a href="<?php echo HTML_PATH_ADMIN_ROOT.'new-page' ?>"><?php $L->p('New content') ?></a>
+				<a href="<?php echo HTML_PATH_ADMIN_ROOT.'new-page' ?>"><?php $L->p('New page') ?></a>
 			</li>
 
 			<li class="uk-nav-header"><?php $L->p('Manage') ?></li>
 			<li <?php echo ($layout['view']=='pages')?'class="uk-active"':'' ?>>
-				<a href="<?php echo HTML_PATH_ADMIN_ROOT.'pages' ?>"><?php $L->p('Content') ?></a>
+				<a href="<?php echo HTML_PATH_ADMIN_ROOT.'pages' ?>"><?php $L->p('Pages') ?></a>
 			</li>
 			<li <?php echo ($layout['view']=='categories')?'class="uk-active"':'' ?>>
 				<a href="<?php echo HTML_PATH_ADMIN_ROOT.'categories' ?>"><?php $L->p('Categories') ?></a>
diff --git a/bl-kernel/admin/views/dashboard.php b/bl-kernel/admin/views/dashboard.php
index 4d100aae..0bfb0673 100644
--- a/bl-kernel/admin/views/dashboard.php
+++ b/bl-kernel/admin/views/dashboard.php
@@ -4,13 +4,13 @@
 	<div class="uk-width-medium-1-3">
 
 		<div class="uk-panel">
-		<h4><a href="<?php echo HTML_PATH_ADMIN_ROOT.'new-page' ?>"><i class="uk-icon-pencil"></i> <?php $L->p('New content') ?></a></h4>
+		<h4><a href="<?php echo HTML_PATH_ADMIN_ROOT.'new-page' ?>"><i class="uk-icon-pencil"></i> <?php $L->p('New page') ?></a></h4>
 		<p><?php $L->p('Create a new page for your site') ?></p>
 		</div>
 
 		<div class="uk-panel">
-		<h4><a href="<?php echo HTML_PATH_ADMIN_ROOT.'pages' ?>"><i class="uk-icon-folder-o"></i> <?php $L->p('Manage content') ?></a></h4>
-		<p><?php $L->p('Edit or delete content from your site') ?></p>
+		<h4><a href="<?php echo HTML_PATH_ADMIN_ROOT.'pages' ?>"><i class="uk-icon-folder-o"></i> <?php $L->p('Manage pages') ?></a></h4>
+		<p><?php $L->p('Edit or delete pages from your site') ?></p>
 		</div>
 
 	</div>
@@ -19,7 +19,7 @@
 
 		<div class="uk-panel">
 		<h4><a href="<?php echo HTML_PATH_ADMIN_ROOT.'new-category' ?>"><i class="uk-icon-file-text-o"></i> <?php $L->p('New category') ?></a></h4>
-		<p><?php $L->p('Create a new category to organize your content') ?></p>
+		<p><?php $L->p('Create a new category to organize your pages') ?></p>
 		</div>
 
 		<div class="uk-panel">
diff --git a/bl-kernel/admin/views/edit-page.php b/bl-kernel/admin/views/edit-page.php
index 3b627e4d..f1445ff1 100644
--- a/bl-kernel/admin/views/edit-page.php
+++ b/bl-kernel/admin/views/edit-page.php
@@ -1,6 +1,6 @@
 <?php
 
-HTML::title(array('title'=>$L->g('Edit content'), 'icon'=>'file-text-o'));
+HTML::title(array('title'=>$L->g('Edit page'), 'icon'=>'file-text-o'));
 
 HTML::formOpen(array('class'=>'uk-form-stacked'));
 
@@ -142,7 +142,7 @@ echo '<div class="bl-publish-sidebar uk-width-2-10">';
 		'class'=>'uk-width-1-1 uk-form-medium',
 		'options'=>array(
 			'published'=>$L->g('Published'),
-			'fixed'=>$L->g('Fixed'),
+			'static'=>$L->g('Static'),
 			'draft'=>$L->g('Draft')
 		),
 		'selected'=>$page->status(),
diff --git a/bl-kernel/admin/views/new-page.php b/bl-kernel/admin/views/new-page.php
index 6d2b0ccd..a7470b84 100644
--- a/bl-kernel/admin/views/new-page.php
+++ b/bl-kernel/admin/views/new-page.php
@@ -1,6 +1,6 @@
 <?php
 
-HTML::title(array('title'=>$L->g('New content'), 'icon'=>'file-text-o'));
+HTML::title(array('title'=>$L->g('New page'), 'icon'=>'file-text-o'));
 
 HTML::formOpen(array('class'=>'uk-form-stacked'));
 
@@ -120,7 +120,7 @@ echo '<div class="bl-publish-sidebar uk-width-2-10">';
 		'class'=>'uk-width-1-1 uk-form-medium',
 		'options'=>array(
 			'published'=>$L->g('Published'),
-			'fixed'=>$L->g('Fixed'),
+			'static'=>$L->g('Static'),
 			'draft'=>$L->g('Draft')
 		),
 		'selected'=>'published',
@@ -161,7 +161,7 @@ echo '<div class="bl-publish-sidebar uk-width-2-10">';
 		'value'=>'1',
 		'class'=>'uk-width-1-1 uk-form-medium',
 		'label'=>$L->g('Position'),
-		'tip'=>$L->g('This field is used when you order the content by position')
+		'tip'=>$L->g('This field is used when you order the page by position')
 	));
 
 	// External Coverimage
diff --git a/bl-kernel/admin/views/pages.php b/bl-kernel/admin/views/pages.php
index 33512419..50c8f02e 100644
--- a/bl-kernel/admin/views/pages.php
+++ b/bl-kernel/admin/views/pages.php
@@ -1,10 +1,9 @@
 <?php
 
-HTML::title(array('title'=>$L->g('Manage content'), 'icon'=>'folder'));
+HTML::title(array('title'=>$L->g('Manage pages'), 'icon'=>'folder'));
 
 echo '<a href="'.HTML_PATH_ADMIN_ROOT.'new-page"><i class="uk-icon-plus"></i> '.$L->g('Add new content').'</a>';
 
-// Fixed page list
 echo '
 <table class="uk-table uk-table-striped">
 <thead>
@@ -27,7 +26,7 @@ function table($status, $icon='arrow-circle-o-down') {
 	global $published;
 	global $drafts;
 	global $scheduled;
-	global $fixed;
+	global $static;
 
 	if ($status=='published') {
 		$list = $published;
@@ -35,8 +34,8 @@ function table($status, $icon='arrow-circle-o-down') {
 		$list = $drafts;
 	} elseif ($status=='scheduled') {
 		$list = $scheduled;
-	} elseif ($status=='fixed') {
-		$list = $fixed;
+	} elseif ($status=='static') {
+		$list = $static;
 	}
 
 	if (!empty($list)) {
@@ -67,7 +66,7 @@ function table($status, $icon='arrow-circle-o-down') {
 if ($Url->pageNumber()==1) {
 	table('draft', 'spinner');
 	table('scheduled', 'clock-o');
-	table('fixed', 'thumb-tack');
+	table('static', 'thumb-tack');
 }
 table('published', 'check');
 
diff --git a/bl-kernel/dbpages.class.php b/bl-kernel/dbpages.class.php
index 075c7730..1223a5b2 100644
--- a/bl-kernel/dbpages.class.php
+++ b/bl-kernel/dbpages.class.php
@@ -262,12 +262,12 @@ class dbPages extends dbJSON
 		return $tmp;
 	}
 
-	// (array) Returns a database with the fixed pages
-	public function getFixedDB()
+	// (array) Returns a database with the static pages
+	public function getStaticDB()
 	{
 		$tmp = $this->db;
 		foreach($tmp as $key=>$fields) {
-			if($fields['status']!='fixed') {
+			if($fields['status']!='static') {
 				unset($tmp[$key]);
 			}
 		}
diff --git a/bl-kernel/page.class.php b/bl-kernel/page.class.php
index 3e85d163..930ca945 100644
--- a/bl-kernel/page.class.php
+++ b/bl-kernel/page.class.php
@@ -359,10 +359,10 @@ class Page {
 		return ($this->getValue('status')=='sticky');
 	}
 
-	// (boolean) Returns TRUE if the page is fixed, FALSE otherwise
-	public function fixed()
+	// (boolean) Returns TRUE if the page is static, FALSE otherwise
+	public function static()
 	{
-		return ($this->getValue('status')=='fixed');
+		return ($this->getValue('status')=='static');
 	}
 
 	// (string) Returns status of the page
diff --git a/bl-languages/en.json b/bl-languages/en.json
index 91afbae4..5865e865 100644
--- a/bl-languages/en.json
+++ b/bl-languages/en.json
@@ -139,7 +139,7 @@
 	"profile-picture": "Profile picture",
 	"edit-or-delete-your-categories": "Edit or delete your categories",
 	"create-a-new-page-for-your-site": "Create a new page for your site",
-	"create-a-new-category-to-organize-your-content": "Create a new category to organize your content",
+
 	"confirm-delete-this-action-cannot-be-undone": "Confirm delete, this action cannot be undone.",
 	"do-you-want-to-disable-the-user": "Do you want to disable the user ?",
 	"new-password": "New password",
@@ -152,7 +152,7 @@
 	"there-are-no-scheduled-pages": "There are no scheduled pages",
 	"there-are-no-draft-pages": "There are no draft pages",
 	"order-content-by": "Order content By",
-	"edit-or-delete-content-from-your-site": "Edit or delete content from your site",
+
 	"order-the-content-by-position-to-build-a-website": "Order the content by position to build a Website or order the content by date to build a Blog.",
 	"page-not-found-content": "Hey! look like the page doesn't exist.",
 	"page-not-found": "Page not found",
@@ -203,5 +203,11 @@
 	"page-published-from-scheduler": "Page published from scheduler",
 	"installer-page-about-content": "The about page is an important and powerful for potential clients and partners. For those who wonder who is behind the website, your About page is the first source of information.",
 	"blog": "Blog",
-	"complete-all-fields": "Complete all fields"
+	"complete-all-fields": "Complete all fields",
+	"static": "Static",
+	"manage-pages": "Manage pages",
+	"new-page": "New page",
+	"edit-page": "Edit page",
+	"create-a-new-category-to-organize-your-pages": "Create a new category to organize your pages",
+	"edit-or-delete-pages-from-your-site": "Edit or delete pages from your site"
 }
\ No newline at end of file
diff --git a/install.php b/install.php
index f99cd884..80d8ac89 100644
--- a/install.php
+++ b/install.php
@@ -302,7 +302,7 @@ function install($adminPassword, $email, $timezone)
 			'description'=>$Language->get('About your site or yourself'),
 			'username'=>'admin',
 			'tags'=>array(),
-			'status'=>'fixed',
+			'status'=>'static',
 			'date'=>$currentDate,
 			'dateModified'=>'',
 			'allowComments'=>true,