Resolved merge conflict by incorporating both suggestions.

.gitignore

@@ -0,0 +1,8 @@
+.DS_Store
+bl-content/*
+bl-plugins/timemachine
+bl-plugins/remote-content
+bl-plugins/simple-stats
+bl-plugins/discovery
+bl-kernel/bludit.pro.php
+bl-themes/docs

README.md

@@ -0,0 +1,80 @@
+[Bludit](https://www.bludit.com/)
+================================
+**Simple**, **Fast** and **Flexible** CMS
+
+Bludit is a web application to build your own **website** or **blog** in seconds, it's completely **free and open source**. Bludit uses files in JSON format to store the content, you don't need to install or configure a database. You only need a web server with PHP support.
+
+Bludit supports **Markdown** and **HTML code** for the content.
+
+- [Documentation](https://docs.bludit.com)
+- [Help and Support](https://forum.bludit.org)
+- [Plugins](https://plugins.bludit.com)
+- [Themes](https://themes.bludit.com)
+- [More plugins and themes](https://forum.bludit.org/viewforum.php?f=14)
+
+[![Bludit PRO](https://img.shields.io/badge/Bludit-PRO-blue.svg)](https://pro.bludit.com/)
+[![Backers](https://opencollective.com/bludit/tiers/backer/badge.svg?label=Backer&color=red)](https://opencollective.com/bludit)
+[![Sponsors](https://opencollective.com/bludit/tiers/sponsor/badge.svg?label=Sponsor&color=brightgreen)](https://opencollective.com/bludit)
+
+Social Networks
+---------------
+
+- [Twitter](https://twitter.com/bludit)
+- [Facebook](https://www.facebook.com/bluditcms)
+- [Google+](https://plus.google.com/+Bluditcms)
+- [Gitter Chat](https://gitter.im/bludit/support)
+
+Requirements
+------------
+
+You just need a web server with PHP support.
+
+PHP v5.3 or higher.
+PHP mbstring module for full UTF-8 support.
+PHP gd module for image processing.
+PHP dom module for DOM manipulation.
+PHP json module for JSON manipulation.
+Supported web servers:
+Bludit supports almost every webserver
+PHP Built-in web server
+
+- PHP v5.3 or higher.
+- PHP [mbstring](http://php.net/manual/en/book.mbstring.php) module for full UTF-8 support.
+- PHP [gd](http://php.net/manual/en/book.image.php) module for image processing.
+- PHP [dom](http://php.net/manual/en/book.dom.php) module for DOM manipulation.
+- PHP [json](http://php.net/manual/en/book.json.php) module for JSON manipulation.
+- Supported web servers:
+   * Bludit supports almost every webserver
+   * PHP Built-in web server (`php -S localhost:8000`)
+
+Installation Guide
+------------------
+
+1. Download the latest version from the official page. [Bludit.com](https://www.bludit.com)
+2. Extract the zip file into a directory like bludit.
+3. Upload the directory `bludit` to your web server or hosting.
+4. Visit your domain https://example.com/bludit/
+5. Follow the Bludit Installer to configure the website.
+
+Docker Image
+------------
+Bludit provides an official Docker image.
+- https://hub.docker.com/r/bludit/docker/
+
+Backers
+-------
+Become a **Backer** and support Bludit with a monthly contribution to help us continue development.
+- [Become a Backer](https://opencollective.com/bludit#backer)
+
+Sponsors
+--------
+Become a **Sponsor** and support Bludit with a monthly contribution to help us continue development.
+- [Become a Sponsor](https://opencollective.com/bludit#sponsor)
+
+<a href="https://opencollective.com/clickwork" target="_blank"><img src="https://opencollective.com/bludit/sponsor/0/avatar.svg"></a>
+<a href="https://opencollective.com/kreativmind" target="_blank"><img src="https://opencollective.com/proxy/images/?src=https%3A%2F%2Flogo.clearbit.com%2Fkreativmind.com&height=60"></a>
+<a href="https://opencollective.com/janrippl" target="_blank"><img src="https://opencollective.com/bludit/sponsor/2/avatar.svg"></a>
+
+License
+-------
+Bludit is open source software licensed under the [MIT license](https://tldrlegal.com/license/mit-license).

bl-kernel/abstract/plugin.class.php

@@ -227,7 +227,11 @@ class Plugin {
 	// Return TRUE if the installation success, otherwise FALSE.
 	public function install($position=1)
 	{
+<<<<<<< HEAD
 		if($this->installed()) {
+=======
+		if ($this->installed()) {
+>>>>>>> 07153963c9695a734b5721d73818da6a083bc8af
 			return false;
 		}
 
@@ -278,6 +282,20 @@ class Plugin {
 		return $this->save();
 	}
 
+<<<<<<< HEAD
+=======
+	public function setField($field, $value)
+	{
+		$this->db[$field] = Sanitize::html($value);
+		return $this->save();
+	}
+
+	public function setPosition($position)
+	{
+		return $this->setField('position', $position);
+	}
+
+>>>>>>> 07153963c9695a734b5721d73818da6a083bc8af
 	// Returns the parameters after the URI, FALSE if the URI doesn't match with the webhook
 	// Example: https://www.mybludit.com/api/foo/bar
 	public function webhook($URI=false, $returnsAfterURI=false, $fixed=true)

bl-kernel/admin/controllers/plugins-position.php

@@ -0,0 +1,32 @@
+<?php defined('BLUDIT') or die('Bludit CMS.');
+
+// ============================================================================
+// Check role
+// ============================================================================
+
+if ($Login->role()!=='admin') {
+	Alert::set($Language->g('You do not have sufficient permissions'));
+	Redirect::page('dashboard');
+}
+
+// ============================================================================
+// Functions
+// ============================================================================
+
+// ============================================================================
+// Main before POST
+// ============================================================================
+if ($_SERVER['REQUEST_METHOD'] == 'POST') {
+	changePluginsPosition(explode(',',$_POST['plugin-list']));
+	Redirect::page('plugins-position');
+}
+// ============================================================================
+// POST Method
+// ============================================================================
+
+// ============================================================================
+// Main after POST
+// ============================================================================
+
+// Title of the page
+$layout['title'] .= ' - '.$Language->g('Plugins');

bl-kernel/admin/controllers/settings-advanced.php

@@ -31,8 +31,18 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST') {
 // ============================================================================
 $allPages = buildAllpages($publishedPages=true, $staticPages=true, $draftPages=false, $scheduledPages=false);
 
+<<<<<<< HEAD
 // Homepage select options
 $homepageOptions = array(' '=>'- '.$L->g('Latest content').' -');
+=======
+// Generate $pagesByParentByKey and pagesByParent
+$pagesByParent = array(PARENT=>array());
+$pagesByParentByKey = array(PARENT=>array());
+buildPagesByParent(true, true);
+
+// Homepage select options
+$homepageOptions = array(' '=>'- '.$L->g('Default').' -');
+>>>>>>> 07153963c9695a734b5721d73818da6a083bc8af
 foreach ($allPages as $key=>$page) {
 	$parentKey = $page->parentKey();
 	if ($parentKey) {

bl-kernel/admin/themes/default/css/default.css

@@ -86,6 +86,13 @@ body {
 	max-width: 1800px;
 }
 
+<<<<<<< HEAD
+=======
+.hint {
+
+}
+
+>>>>>>> 07153963c9695a734b5721d73818da6a083bc8af
 /* TOPBAR
 ---------------------------------------------------------------- */
 
@@ -649,6 +656,33 @@ div.plugin-links > span.separator {
 	color: #ccc;
 }
 
+<<<<<<< HEAD
+=======
+.plugin-position {
+	display: block !important;
+	margin: 10px 0 !important;
+	padding: 10px !important;
+	line-height: 50px !important;
+	height: 50px !important;
+	width: 30% !important;
+	min-width: 100px !important;
+	cursor: move !important;
+	border: 1px solid #ccc !important;
+	background: #fafafa;
+}
+
+.uk-sortable-item {
+	background: #fafafa !important;
+}
+
+.uk-sortable-placeholder {
+	background: #fafafa !important;
+}
+
+.plugin-position-wrap {
+	z-index: 200;
+}
+>>>>>>> 07153963c9695a734b5721d73818da6a083bc8af
 
 /* ----------- PAGINATOR ----------- */
 

bl-kernel/admin/themes/default/css/uikit/sortable.min.css

@@ -0,0 +1,2 @@
+/*! UIkit 2.27.5 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
+.uk-sortable{position:relative}.uk-sortable>*{touch-action:none}.uk-sortable a,.uk-sortable img{-webkit-touch-callout:none}.uk-sortable>:last-child{margin-bottom:0}.uk-sortable-dragged{position:absolute;z-index:1050;pointer-events:none}.uk-sortable-placeholder{opacity:0}.uk-sortable-empty{min-height:30px}.uk-sortable-handle{touch-action:none}.uk-sortable-handle:hover{cursor:move}.uk-sortable-moving,.uk-sortable-moving *{cursor:move}.uk-sortable-moving iframe{pointer-events:none}

bl-kernel/admin/themes/default/index.php

@@ -16,6 +16,10 @@
 	<link rel="stylesheet" type="text/css" href="<?php echo HTML_PATH_ADMIN_THEME.'css/uikit/form-file.almost-flat.min.css?version='.BLUDIT_VERSION ?>">
 	<link rel="stylesheet" type="text/css" href="<?php echo HTML_PATH_ADMIN_THEME.'css/uikit/placeholder.almost-flat.min.css?version='.BLUDIT_VERSION ?>">
 	<link rel="stylesheet" type="text/css" href="<?php echo HTML_PATH_ADMIN_THEME.'css/uikit/progress.almost-flat.min.css?version='.BLUDIT_VERSION ?>">
+<<<<<<< HEAD
+=======
+	<link rel="stylesheet" type="text/css" href="<?php echo HTML_PATH_ADMIN_THEME.'css/uikit/sortable.min.css?version='.BLUDIT_VERSION ?>">
+>>>>>>> 07153963c9695a734b5721d73818da6a083bc8af
 	<link rel="stylesheet" type="text/css" href="<?php echo HTML_PATH_ADMIN_THEME.'css/default.css?version='.BLUDIT_VERSION ?>">
 	<link rel="stylesheet" type="text/css" href="<?php echo HTML_PATH_ADMIN_THEME.'css/jquery.datetimepicker.css?version='.BLUDIT_VERSION ?>">
 	<link rel="stylesheet" type="text/css" href="<?php echo HTML_PATH_CORE_CSS.'font-awesome/css/font-awesome.min.css?version='.BLUDIT_VERSION ?>">
@@ -24,6 +28,10 @@
 	<script charset="utf-8" src="<?php echo HTML_PATH_CORE_JS.'jquery.min.js?version='.BLUDIT_VERSION ?>"></script>
 	<script charset="utf-8" src="<?php echo HTML_PATH_ADMIN_THEME.'js/uikit/uikit.min.js?version='.BLUDIT_VERSION ?>"></script>
 	<script charset="utf-8" src="<?php echo HTML_PATH_ADMIN_THEME.'js/uikit/upload.min.js?version='.BLUDIT_VERSION ?>"></script>
+<<<<<<< HEAD
+=======
+	<script charset="utf-8" src="<?php echo HTML_PATH_ADMIN_THEME.'js/uikit/sortable.min.js?version='.BLUDIT_VERSION ?>"></script>
+>>>>>>> 07153963c9695a734b5721d73818da6a083bc8af
 	<script charset="utf-8" src="<?php echo HTML_PATH_ADMIN_THEME.'js/jquery.datetimepicker.js?version='.BLUDIT_VERSION ?>"></script>
 
 	<!-- Plugins -->

bl-kernel/admin/views/content.php

@@ -65,8 +65,12 @@ function table($status, $icon='arrow-circle-o-down') {
 					echo '<td><a target="_blank" href="'.$page->permalink().'">'.$friendlyURL.'</a></td>';
 					echo '</tr>';
 
+<<<<<<< HEAD
 					foreach ($page->children() as $childKey) {
 						$child = buildPage($childKey);
+=======
+					foreach ($page->children() as $child) {
+>>>>>>> 07153963c9695a734b5721d73818da6a083bc8af
 						if ($child->published()) {
 						echo '<tr>
 						<td class="child-title">

bl-kernel/admin/views/plugins-position.php

@@ -0,0 +1,38 @@
+<?php
+
+HTML::title(array('title'=>$L->g('Plugins Position'), 'icon'=>'puzzle-piece'));
+
+echo '<div class="hint">'.$L->g('drag-and-drop-to-set-the-position-of-the-plugin').'</div>';
+
+echo '<form class="uk-form" method="post" action="" autocomplete="off">';
+
+HTML::formInputHidden(array(
+	'name'=>'tokenCSRF',
+	'value'=>$Security->getTokenCSRF()
+));
+
+echo '<div class="uk-sortable" data-uk-sortable>';
+
+foreach ($plugins['siteSidebar'] as $Plugin) {
+	echo '<div class="plugin-position" data-plugin="'.$Plugin->className().'"><i class="uk-icon-bars"></i> '.$Plugin->name().'</div>';
+}
+
+echo '</div>';
+echo '<input id="plugin-list" name="plugin-list" type="text" value="" hidden/>';
+echo '<button class="uk-button uk-button-primary" type="button" id="jsSave">'.$L->g('Save').'</button>';
+echo '</form>';
+?>
+
+<script>
+$( document ).ready(function() {
+	$("#jsSave").on("click", function() {
+		var tmp = [];
+		$( "div.plugin-position" ).each(function() {
+			tmp.push( $(this).attr("data-plugin") );
+		});
+		console.log( tmp.join(",") );
+		$("#plugin-list").attr("value", tmp.join(",") );
+		$(".uk-form").submit();
+	});
+});
+</script>

bl-kernel/admin/views/plugins.php

@@ -2,6 +2,11 @@
 
 HTML::title(array('title'=>$L->g('Plugins'), 'icon'=>'puzzle-piece'));
 
+<<<<<<< HEAD
+=======
+echo '<a href="'.HTML_PATH_ADMIN_ROOT.'plugins-position"><i class="uk-icon-plus"></i> '.$L->g('Change the position of the plugins').'</a>';
+
+>>>>>>> 07153963c9695a734b5721d73818da6a083bc8af
 echo '
 <table class="uk-table">
 <thead>

bl-kernel/boot/init.php

@@ -127,6 +127,7 @@ if (Session::started()===false) {
 }
 
 // Objects
+<<<<<<< HEAD
 $dbPages 	= new dbPages();
 $dbUsers 	= new dbUsers();
 $dbTags 	= new dbTags();
@@ -136,6 +137,17 @@ $Url 		= new Url();
 $Parsedown 	= new Parsedown();
 $Security	= new Security();
 $Syslog 	= new dbSyslog();
+=======
+$dbPages 			= new dbPages();
+$dbUsers 			= new dbUsers();
+$dbTags 			= new dbTags();
+$dbCategories 			= new dbCategories();
+$site = $Site 			= new dbSite();
+$url = $Url			= new Url();
+$parsedown = $Parsedown 	= new Parsedown();
+$security = $Security		= new Security();
+$syslog = $Syslog 		= new dbSyslog();
+>>>>>>> 07153963c9695a734b5721d73818da6a083bc8af
 
 // --- Relative paths ---
 // This paths are relative for the user / web browsing.
@@ -183,8 +195,13 @@ define('HTML_PATH_UPLOADS_THUMBNAILS',	HTML_PATH_UPLOADS.'thumbnails/');
 define('HTML_PATH_PLUGINS',		HTML_PATH_ROOT.'bl-plugins/');
 
 // --- Objects with dependency ---
+<<<<<<< HEAD
 $Language 	= new dbLanguage( $Site->language() );
 $Login 		= new Login( $dbUsers );
+=======
+$language = $Language 	= new dbLanguage( $Site->language() );
+$login = $Login 	= new Login( $dbUsers );
+>>>>>>> 07153963c9695a734b5721d73818da6a083bc8af
 $Url->checkFilters( $Site->uriFilters() );
 
 // --- CONSTANTS with dependency ---
@@ -242,7 +259,11 @@ $ID_EXECUTION = uniqid(); // string 13 characters long
 $WHERE_AM_I = $Url->whereAmI();
 
 // --- Objects shortcuts ---
+<<<<<<< HEAD
 $L = $Language;
+=======
+$L = $language;
+>>>>>>> 07153963c9695a734b5721d73818da6a083bc8af
 
 // DEBUG: Print constants
 // $arr = array_filter(get_defined_constants(), 'is_string');

bl-kernel/boot/rules/69.pages.php

@@ -42,7 +42,11 @@ $page = $Page = false;
 			N => Page Object),
 	)
 */
+<<<<<<< HEAD
 $pagesByParent = array(PARENT=>array());
+=======
+//$pagesByParent = array(PARENT=>array()); // DEPREACTED
+>>>>>>> 07153963c9695a734b5721d73818da6a083bc8af
 
 // Array with pages order by parent and by key
 /*
@@ -66,7 +70,11 @@ $pagesByParent = array(PARENT=>array());
 			"childKeyZ" => Page Object),
 	)
 */
+<<<<<<< HEAD
 $pagesByParentByKey = array(PARENT=>array());
+=======
+//$pagesByParentByKey = array(PARENT=>array()); // DEPREACTED
+>>>>>>> 07153963c9695a734b5721d73818da6a083bc8af
 
 // Array with static content, each item is a Page Object
 // Order by position
@@ -100,7 +108,11 @@ if ($dbPages->scheduler()) {
 }
 
 // Generate pages parent tree, only published pages
+<<<<<<< HEAD
 buildPagesByParent(true, true);
+=======
+//buildPagesByParent(true, true);
+>>>>>>> 07153963c9695a734b5721d73818da6a083bc8af
 
 // Set home page is the user defined one
 if ($Site->homepage() && $Url->whereAmI()==='home') {
@@ -111,16 +123,20 @@ if ($Site->homepage() && $Url->whereAmI()==='home') {
 	}
 }
 
+<<<<<<< HEAD
 // The filter blog alway show all the content
 // Change the where am i to use
 if ($Url->whereAmI()==='blog') {
 	//$Url->setWhereAmI('home');
 }
 
+=======
+>>>>>>> 07153963c9695a734b5721d73818da6a083bc8af
 // Build specific page
 if ($Url->whereAmI()==='page') {
 	buildThePage();
 }
+<<<<<<< HEAD
 // Build pages by tag
 elseif ($Url->whereAmI()==='tag') {
 	buildPagesByTag();
@@ -130,6 +146,17 @@ elseif ($Url->whereAmI()==='category') {
         buildPagesByCategory();
 }
 // Build pages for the homepage
+=======
+// Build content by tag
+elseif ($Url->whereAmI()==='tag') {
+	buildPagesByTag();
+}
+// Build content by category
+elseif ($Url->whereAmI()==='category') {
+        buildPagesByCategory();
+}
+// Build content for the homepage
+>>>>>>> 07153963c9695a734b5721d73818da6a083bc8af
 elseif ( ($Url->whereAmI()==='home') || ($Url->whereAmI()==='blog') ) {
         buildPagesForHome();
 }

bl-kernel/boot/variables.php

@@ -57,7 +57,11 @@ define('REMEMBER_COOKIE_TOKEN', 'BLUDITREMEMBERTOKEN');
 define('REMEMBER_COOKIE_EXPIRE_IN_DAYS', 30);
 
 // Filename
+<<<<<<< HEAD
 define('FILENAME', 'index.txt');
+=======
+define('FILENAME', 'index.md');
+>>>>>>> 07153963c9695a734b5721d73818da6a083bc8af
 
 // Database date format
 define('DB_DATE_FORMAT', 'Y-m-d H:i:s');

bl-kernel/functions.php

@@ -1,6 +1,10 @@
 <?php defined('BLUDIT') or die('Bludit CMS.');
 
+<<<<<<< HEAD
 // Returns a Page object, the class is page.class.php, FALSE if something fail to load the page
+=======
+// Returns a Page-Object, the class is page.class.php, FALSE if something fail to load the page
+>>>>>>> 07153963c9695a734b5721d73818da6a083bc8af
 function buildPage($key) {
 	global $dbPages;
 	global $dbUsers;
@@ -59,24 +63,42 @@ function buildPage($key) {
 	$page->setField('categoryMap', $dbCategories->getMap($categoryKey));
 
 	// Get the keys of the child
+<<<<<<< HEAD
 	$page->setField('children', $dbPages->getChildren($key));
+=======
+	$page->setField('childrenKeys', $dbPages->getChildren($key));
+>>>>>>> 07153963c9695a734b5721d73818da6a083bc8af
 
 	return $page;
 }
 
+<<<<<<< HEAD
 // Execute a re-index of categories
+=======
+// Re-index database of categories
+>>>>>>> 07153963c9695a734b5721d73818da6a083bc8af
 // If you create/edit/remove a page is necessary regenerate the database of categories
 function reindexCategories() {
 	global $dbCategories;
 	return $dbCategories->reindex();
 }
 
+<<<<<<< HEAD
+=======
+// Re-index database of tags
+// If you create/edit/remove a page is necessary regenerate the database of tags
+>>>>>>> 07153963c9695a734b5721d73818da6a083bc8af
 function reindexTags() {
 	global $dbTags;
 	return $dbTags->reindex();
 }
 
+<<<<<<< HEAD
 // Returns a Page Object, this generate on the fly a page-not-found
+=======
+// Generate on the fly a 404 page-not-found
+// Returns a Page-Object
+>>>>>>> 07153963c9695a734b5721d73818da6a083bc8af
 function buildErrorPage() {
 	global $dbPages;
 	global $Language;
@@ -91,9 +113,15 @@ function buildErrorPage() {
 }
 
 // This function is only used from the rule 69.pages.php, DO NOT use this function!
+<<<<<<< HEAD
 // This function generate a particular page from the slug of the url
 // The page is stored on the global variable $page
 // If the slug has not a page associacted returns FALSE and set not-found
+=======
+// This function generate a particular page from the current slug of the url
+// The page is stored on the global variable $page
+// If the slug has not a page associacted returns FALSE and is set not-found as true
+>>>>>>> 07153963c9695a734b5721d73818da6a083bc8af
 function buildThePage() {
 	global $Url;
 	global $page, $Page;
@@ -102,12 +130,20 @@ function buildThePage() {
 	$page = $Page = buildPage( $Url->slug() );
 
 	// The page doesn't exist
+<<<<<<< HEAD
 	if($page===false) {
+=======
+	if ($page===false) {
+>>>>>>> 07153963c9695a734b5721d73818da6a083bc8af
 		$Url->setNotFound();
 		return false;
 	}
 	// The page is NOT published
+<<<<<<< HEAD
 	elseif( $page->scheduled() || $page->draft() ) {
+=======
+	elseif ( $page->scheduled() || $page->draft() ) {
+>>>>>>> 07153963c9695a734b5721d73818da6a083bc8af
 		$Url->setNotFound();
 		return false;
 	}
@@ -138,7 +174,13 @@ function buildPagesByTag() {
 	return buildPagesFor('tag', false, $tagKey);
 }
 
+<<<<<<< HEAD
 // Generate the global variables $pages and $content, defined on 69.pages.php
+=======
+// This function is only used from the rule 69.pages.php, DO NOT use this function!
+// Generate the global variables $pages / $content, defined on 69.pages.php
+// This function is use for buildPagesForHome(), buildPagesByCategory(), buildPagesByTag()
+>>>>>>> 07153963c9695a734b5721d73818da6a083bc8af
 function buildPagesFor($for, $categoryKey=false, $tagKey=false) {
 	global $dbPages;
 	global $dbCategories;
@@ -171,9 +213,15 @@ function buildPagesFor($for, $categoryKey=false, $tagKey=false) {
 	}
 
 	$pages = array(); // global variable
+<<<<<<< HEAD
 	foreach($list as $pageKey) {
 		$page = buildPage($pageKey);
 		if($page!==false) {
+=======
+	foreach ($list as $pageKey) {
+		$page = buildPage($pageKey);
+		if ($page!==false) {
+>>>>>>> 07153963c9695a734b5721d73818da6a083bc8af
 			array_push($pages, $page);
 		}
 	}
@@ -181,6 +229,42 @@ function buildPagesFor($for, $categoryKey=false, $tagKey=false) {
 	return $pages;
 }
 
+<<<<<<< HEAD
+=======
+// Returns an array with all the static pages as Page-Object
+// The static pages are order by position all the time
+function buildStaticPages() {
+	global $dbPages;
+
+	$list = array();
+	$staticPages = $dbPages->getStaticDB();
+	foreach ($staticPages as $pageKey) {
+		$staticPage = buildPage($pageKey);
+		array_push($list, $staticPage);
+	}
+
+	return $list;
+}
+
+// Returns an array with all the parent pages as Page-Object
+// The pages are order by the settings on the system
+function buildParentPages() {
+	global $dbPages;
+
+	$list = array();
+	$pagesKey = $dbPages->getPublishedDB();
+	foreach ($pagesKey as $pageKey) {
+		$page = buildPage($pageKey);
+		if ($page->isParent()) {
+			array_push($list, $page);
+		}
+	}
+
+	return $list;
+}
+
+// DEPRECATED
+>>>>>>> 07153963c9695a734b5721d73818da6a083bc8af
 // Generate the global variable $pagesByParent, defined on 69.pages.php
 function buildPagesByParent($publishedPages=true, $staticPages=true) {
 	global $dbPages;
@@ -212,6 +296,7 @@ function buildPagesByParent($publishedPages=true, $staticPages=true) {
 	}
 }
 
+<<<<<<< HEAD
 function buildStaticPages() {
 	global $dbPages;
 
@@ -226,6 +311,10 @@ function buildStaticPages() {
 
 // Returns an Array with all pages existing on the system
 // (boolean) $allPages, TRUE returns all pages with any status, FALSE all published pages
+=======
+// DEPRECATED
+// Returns an Array with all pages existing on the system
+>>>>>>> 07153963c9695a734b5721d73818da6a083bc8af
 /*
 	array(
 		pageKey1 => Page object,
@@ -263,7 +352,11 @@ function buildAllpages($publishedPages=true, $staticPages=true, $draftPages=true
 	return $tmp;
 }
 
+<<<<<<< HEAD
 // Returns the plugin Object if is enabled and installed, FALSE otherwise
+=======
+// Returns the Plugin-Object if is enabled and installed, FALSE otherwise
+>>>>>>> 07153963c9695a734b5721d73818da6a083bc8af
 function getPlugin($pluginClassName) {
 	global $plugins;
 
@@ -336,6 +429,30 @@ function deactivatePlugin($pluginClassName) {
 	return false;
 }
 
+<<<<<<< HEAD
+=======
+function changePluginsPosition($pluginClassList) {
+	global $plugins;
+	global $Syslog;
+	global $Language;
+
+	foreach ($pluginClassList as $position=>$pluginClassName) {
+		if (isset($plugins['all'][$pluginClassName])) {
+			$plugin = $plugins['all'][$pluginClassName];
+			$plugin->setPosition(++$position);
+		}
+	}
+
+	// Add to syslog
+	$Syslog->add(array(
+		'dictionaryKey'=>'plugins-sorted',
+		'notes'=>''
+	));
+
+	return true;
+}
+
+>>>>>>> 07153963c9695a734b5721d73818da6a083bc8af
 function createPage($args) {
 	global $dbPages;
 	global $Syslog;

bl-kernel/helpers/paginator.class.php

@@ -30,6 +30,14 @@ class Paginator {
 		return self::get('amountOfPages');
 	}
 
+<<<<<<< HEAD
+=======
+	public static function currentPage()
+	{
+		return self::get('currentPage');
+	}
+
+>>>>>>> 07153963c9695a734b5721d73818da6a083bc8af
 	public static function nextPage()
 	{
 		return self::get('nextPage');

bl-kernel/page.class.php

@@ -298,8 +298,15 @@ class Page {
 		$tmp['date'] 		= $this->dateRaw();
 		$tmp['dateUTC']		= Date::convertToUTC($this->dateRaw(), DB_DATE_FORMAT, DB_DATE_FORMAT);
 		$tmp['permalink'] 	= $this->permalink(true);
+<<<<<<< HEAD
 
 		if($returnsArray) {
+=======
+		$tmp['coverImage'] 		= $this->coverImage(true);
+		$tmp['coverImageFilename'] 	= $this->coverImage(false);
+
+		if ($returnsArray) {
+>>>>>>> 07153963c9695a734b5721d73818da6a083bc8af
 			return $tmp;
 		}
 
@@ -379,6 +386,15 @@ class Page {
 		return ($this->getValue('status')=='sticky');
 	}
 
+<<<<<<< HEAD
+=======
+	// (boolean) Returns TRUE if the page is static, FALSE otherwise
+	public function static()
+	{
+		return ($this->getValue('status')=='static');
+	}
+
+>>>>>>> 07153963c9695a734b5721d73818da6a083bc8af
 	// (string) Returns status of the page
 	public function status()
 	{
@@ -427,6 +443,15 @@ class Page {
 		return false;
 	}
 
+<<<<<<< HEAD
+=======
+	// Returns TRUE if the page is a parent, has or not children
+	public function isParent()
+	{
+		return $this->parentKey()===false;
+	}
+
+>>>>>>> 07153963c9695a734b5721d73818da6a083bc8af
 	// Returns the parent method output, if the page doesn't have a parent returns FALSE
 	public function parentMethod($method)
 	{
@@ -439,18 +464,22 @@ class Page {
 		return false;
 	}
 
+<<<<<<< HEAD
 	// Returns TURE if the page has a parent, FALSE otherwise
 	public function hasParent()
 	{
 		return $this->parentKey()!==false;
 	}
 
+=======
+>>>>>>> 07153963c9695a734b5721d73818da6a083bc8af
 	// Returns TRUE if the page is a child, FALSE otherwise
 	public function isChild()
 	{
 		return $this->parentKey()!==false;
 	}
 
+<<<<<<< HEAD
 	// Returns an array with all children's key
 	public function children()
 	{
@@ -476,6 +505,50 @@ class Page {
 		return $this->hasSubpages();
 	}
 
+=======
+	// Returns TRUE if the page has children
+	public function hasChildren()
+	{
+		$childrenKeys = $this->childrenKeys();
+		return !empty($childrenKeys);
+	}
+
+	// Returns an array with all children's keys
+	public function childrenKeys()
+	{
+		return $this->getValue('childrenKeys');
+	}
+
+	// Returns an array with all children as Page-Object
+	public function children()
+	{
+		$list = array();
+		$childrenKeys = $this->getValue('childrenKeys');
+		foreach ($childrenKeys as $childKey) {
+			$child = buildPage($childKey);
+			array_push($list, $child);
+		}
+
+		return $list;
+	}
+
+	// Returns the amount of minutes takes to read the page
+	public function readingTime() {
+		global $Language;
+
+		$words = $this->content(true);
+		$words = strip_tags($words);
+		$words = str_word_count($words);
+		$average = $words / 200;
+		$minutes = round($average);
+
+		if ($minutes>0) {
+			return $minutes.' '.$Language->get('minutes');
+		}
+
+		return '~1 '.$Language->get('minute');
+	}
+>>>>>>> 07153963c9695a734b5721d73818da6a083bc8af
 
 	// Returns relative time (e.g. "1 minute ago")
 	// Based on http://stackoverflow.com/a/18602474
@@ -513,6 +586,9 @@ class Page {
 		}
 
 		return $string ? implode(', ', $string) . ' ago' : 'Just now';
+<<<<<<< HEAD
 
+=======
+>>>>>>> 07153963c9695a734b5721d73818da6a083bc8af
 	}
 }

bl-languages/es.json

@@ -275,5 +275,14 @@
     "congratulations-you-have-successfully-installed-your-bludit": "Felicitaciones Usted ha instalado con éxito **Bludit**",
     "this-theme-may-not-be-supported-by-this-version-of-bludit": "Este tema puede no ser compatible con esta versión de Bludit",
     "read-more": "Leer más",
+<<<<<<< HEAD
     "remember-me": "Recordarme"
 }
+=======
+    "remember-me": "Recordarme",
+    "plugins-position": "Plugin position",
+    "plugins-position-changed": "Plugin position changed",
+    "drag-and-drop-to-set-the-position-of-the-plugin": "Drag and Drop to set the position of the plugins",
+    "change-the-position-of-the-plugins": "Change the position of the plugins"
+}
+>>>>>>> 07153963c9695a734b5721d73818da6a083bc8af

bl-languages/lt_LT.json

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 {
     "language-data": {
         "native": "Lietuvių",
@@ -277,3 +278,284 @@
     "read-more": "Skaityti daugiau",
     "remember-me": "Įsiminti mane"
 }
+=======
+{
+    "language-data": {
+        "native": "Lietuvių",
+        "english-name": "Lithuanian",
+        "locale": "en, en_US, en_AU, en_CA, en_GB, en_IE, en_NZ",
+        "last-update": "2018-02-23",
+        "authors": {
+            "0": "Andrius Pratusis",
+            "1": "andrius.pratusis1993@gmail.com"
+	    }
+    },
+    "dates": {
+        "Mon": "Pir",
+        "Tue": "Ant",
+        "Wed": "Tre",
+        "Thu": "Ket",
+        "Fri": "Pen",
+        "Sat": "Šeš",
+        "Sun": "Sek",
+        "Monday": "Pirmadienis",
+        "Tuesday": "Antradienis",
+        "Wednesday": "Trečiadienis",
+        "Thursday": "Ketvirtadienis",
+        "Friday": "Penktadienis",
+        "Saturday": "Šeštadienis",
+        "Sunday": "Sekmadienis",
+        "Jan": "Sau",
+        "Feb": "Vas",
+        "Mar": "Kov",
+        "Apr": "Bal",  
+        "May":"Geg",        
+        "Jun": "Bir",
+        "Jul": "Lie",
+        "Aug": "Rugpj",
+        "Sep": "Rugs",
+        "Oct": "Spa",
+        "Nov": "Lap",
+        "Dec": "Gru",
+        "January": "Sausis",
+        "February": "Vasaris",
+        "March": "Kovas",
+        "April": "Balandis",
+        "May": "Gegužė",
+        "June": "Birželis",
+        "July": "Liepa",
+        "August": "Rugpjūtis",
+        "September": "Rugsėjis",
+        "October": "Spalis",
+        "November": "Lapkritis",
+        "December": "Gruodis"
+    },
+    "dashboard": "Valdymas",
+    "manage-users": "Valdyti naudotojus",
+    "manage-categories": "Valdyti kategorijas",
+    "general-settings": "Paprastieji nustatymai",
+    "advanced-settings": "Išplėstiniai nustatymai",
+    "thanks-for-support-bludit": "Dėkojame už Bludit paramą",
+    "upgrade-to-bludit-pro": "Gauti Bludit PRO",
+    "language": "Kalba",
+    "plugin": "Plėtinys",
+    "plugins": "Plėtiniai",
+    "developers": "Vystytojai",
+    "themes": "Temos",
+    "about": "Apie",
+    "url": "URL",
+    "welcome": "Sveiki prisijungę, ",
+    "logout": "Atsijungti",
+    "website": "Puslapis",
+    "publish": "Skelbti",
+    "manage": "Valdyti",
+    "content": "Turinys",
+    "category": "Kategorija",
+    "categories": "Kategorijos",
+    "users": "Naudotojai",
+    "settings": "Nustatymai",
+    "general": "Paprastieji nustatymai",
+    "advanced": "Išplėstiniai",
+    "new-content": "Naujas turinys",
+    "manage-content": "Valdyti turinį",
+    "add-new-content": "Pridėti turinį",
+    "new-category": "Nauja kategorija",
+    "you-do-not-have-sufficient-permissions": "Neturite reikiamų leidimų",
+    "add-a-new-user": "Pridėti naudotoją",
+    "url-associated-with-the-content": "URL susietas su turiniu.",
+    "language-and-timezone": "Kalba ir laiko zona",
+    "change-your-language-and-region-settings": "Keiskite kalbos ir regiono nustatymus.",
+    "notifications": "Pranešimai",
+    "plugin-activated": "Plėtinys įjungtas",
+    "plugin-deactivated": "Plėtinys išjungtas",
+    "new-theme-configured": "Nauja tema paruošta",
+    "changes-on-settings": "Nustatymų pekeitimas",
+    "plugin-configured": "Plėtinys paruoštas",
+    "welcome-to-bludit": "Sveiki atvykę į Bludit",
+    "statistics": "Statistika",
+    "drafts": "Šablonai",
+    "title": "Pavadinimas",
+    "save": "Saugoti",
+    "save-as-draft": "Saugoti, kaip šabloną",
+    "cancel": "Atšaukti",
+    "description": "Aprašymas",
+    "this-field-can-help-describe-the-content": "Šis laukas padeda aprašyti turinį keliais žodžiais. Ne daugiau 150 rašmenų.",
+    "images": "Paveikslėliai",
+    "error": "Klaida",
+    "supported-image-file-types": "Palaikomi paveikslėlių formatai",
+    "cover-image": "Cover image",
+    "drag-and-drop-or-click-here": "Įvilkite arba paspauskite čia",
+    "there-are-no-images": "Paveikslėlių nėra",
+    "upload-and-more-images": "Įkelkite daugiau paveikslėlių",
+    "click-on-the-image-for-options": "Paspauskite ant paveikslėlio išsamesnėms parinktims.",
+    "click-here-to-cancel": "Paspauskite čia, kad atšauktumėte.",
+    "insert-image": "Įdėti paveikslėlį",
+    "set-as-cover-image": "Nustatyti, kaip fono paveikslėlį",
+    "delete-image": "Trinti paveikslėlį",
+    "tags": "Žymos",
+    "add": "Pridėti",
+    "status": "Būsena",
+    "published": "Paskelbta",
+    "draft": "Šablonas",
+    "empty-title": "Nėra pavadinimo",
+    "empty": "tuščias",
+    "date": "Data",
+    "external-cover-image": "Išorinis fono paveikslėlis",
+    "parent": "Šakninis puslapis",
+    "full-image-url": "Pilnas paveikslėlio URL.",
+    "this-field-is-used-when-you-order-the-content-by-position": "Šis laukas pildomas, kai rikuojate turinį pagal poziciją.",
+    "position": "Pozicija",
+    "friendly-url": "Draugiškas URL",
+    "image-description": "Paveikslėlio aprašymas",
+    "add-a-new-category": "Pridėti naują kategoriją",
+    "name": "Vardas",
+    "username": "Slapyvardis",
+    "first-name": "Vardas",
+    "last-name": "Pavardė",
+    "to-schedule-the-content-select-the-date-and-time": "Suplanuotiems įrašams pasirinkite laiką ir datą. Jų būsena turi būti \"Paskelbta\".",
+    "email": "El. paštas",
+    "role": "Lygis",
+    "registered": "Registruotas",
+    "site-information": "Puslapio informacija",
+    "site-title": "Puslapio pavadinimas",
+    "use-this-field-to-name-your-site": "Puslapio vardas.",
+    "site-slogan": "Puslapio šūkis",
+    "use-this-field-to-add-a-catchy-phrase": "Kabinanti puslapio frazė.",
+    "site-description": "Site description",
+    "you-can-add-a-site-description-to-provide": "Trumpas puslapio aprašymas.",
+    "footer-text": "Footer text",
+    "you-can-add-a-small-text-on-the-bottom": "Smulkus tekstas puslapio apačioje.",
+    "social-networks-links": "Nuorodos į socialinius tinklus",
+    "site-url": "Puslapio URL",
+    "email-account-settings": "Elektroninio pašto nustatymai",
+    "sender-email": "Iš kur siunčiamas paštas",
+    "emails-will-be-sent-from-this-address": "Iš šio adreso bus siunčiami el. laiškai.",
+    "url-filters": "URL filtrai",
+    "select-your-sites-language": "Pasirinkite puslapio kalbą.",
+    "timezone": "Laiko zona",
+    "select-a-timezone-for-a-correct": "Pasirinkite reikiamą laiko zoną Datos\/Laiko atvaizdavimui puslapyje.",
+    "locale": "Lokalė",
+    "date-and-time-formats": "Datos ir laiko formatas",
+    "date-format": "Datos formatas",
+    "current-format": "Dabartinis formatas",
+    "version": "Versija",
+    "author": "Autorius",
+    "activate": "Įjungti",
+    "deactivate": "Išjungti",
+    "edit-category": "Redaguoti kategoriją",
+    "delete": "Ištrinti",
+    "password": "Slaptažodis",
+    "confirm-password": "Patvirtinti Slaptažodį",
+    "editor": "Redaktorius",
+    "administrator": "Administratorius",
+    "edit-user": "Redaguoti naudotoją",
+    "edit-content": "Redaguoti turinį",
+    "profile": "Paskyra",
+    "change-password": "Pakeisti slaptažodį",
+    "enabled": "Įjungta",
+    "disable-the-user": "Blokuoti naudotoją",
+    "profile-picture": "Paskyros paveikslėlis",
+    "edit-or-delete-your-categories": "Redaguokite arba trinkite kategorijas",
+    "create-a-new-category-to-organize-your-content": "Sukurkite naują kategoriją, kad būtų galima efektyviau organizuoti turinį",
+    "confirm-delete-this-action-cannot-be-undone": "Patvirtinti panaikinimą. Šis veiksmas nebegalės būti atšauktas.",
+    "do-you-want-to-disable-the-user": "Ar norite blokuoti šį naudotoją ?",
+    "new-password": "Naujas slaptažodis",
+    "you-can-change-this-field-when-save-the-current-changes": "Galite keisti lauko reikšmę išsaugodami paskiausius pokyčius.",
+    "items-per-page": "Straipsniai puslapyje",
+    "invite-a-friend-to-collaborate-on-your-site": "Pakvieskite prie puslapio kūrybos prisijungti draugą",
+    "number-of-items-to-show-per-page": "Skaičius įrašų, kuris bus rodomas puslapyje.",
+    "website-or-blog": "Puslapis arba tinklaraštis",
+    "order-content-by": "Rikiuoti turinį pagal",
+    "edit-or-delete-content-from-your-site": "Redaguokite arba ištrinkite turinį iš savo puslapio",
+    "order-the-content-by-date-to-build-a-blog": "Norėdami sukurti tinklaraštį rikiuokite įrašus pagal datą. Norėdami sukurti puslapį, rikuokite pagal eiliškumą.",
+    "page-not-found-content": "Oi! Atrodo, kad tokio puslapio nėra.",
+    "page-not-found": "Puslapis nerastas",
+    "predefined-pages": "Suformuoti puslapiai",
+    "returning-page-when-the-page-doesnt-exist": "Nebeegzistuojančio puslapio aplankymas pagal nutylėjimą iššaukia numatytąją žinutę.",
+    "returning-page-for-the-main-page": "Grįžtant į pagrindinį puslapį pagalnutylįjimą rodomi įrašai, kurie rikiuojami pagl poziciją arba datą.",
+    "full-url-of-your-site": "Pilnas puslapio adresas. Naudokite HTTPS tik tada, kai būsite įdiegę sertifikatą serveryje.",
+    "with-the-locales-you-can-set-the-regional-user-interface": "Lokalių pagalba galima keisti tiek grafinės aplinkos kalbą, tiek laiko ir datos formatus.",
+    "bludit-installer": "Bludit diegiklis",
+    "choose-your-language": "Pasirinkite savo kalbą",
+    "next": "Kitas",
+    "complete-the-form-choose-a-password-for-the-username-admin": "Užbaikite pildymą. Pasirinkite slaptažodį. <b>< admin ><\/b>",
+    "show-password": "Rodyti slaptažodį",
+    "install": "Įrašyti",
+    "login": "Prisijungti",
+    "back-to-login-form": "Grįžti atgal",
+    "get-login-access-code": "Gauti prisijungimo kodą",
+    "email-access-code": "Siųsti prisijungimo kodą el. paštu",
+    "whats-next": "Kas toliau",
+    "username-or-password-incorrect": "Naudotojo vardas arba slapažodis neteisingas",
+    "follow-bludit-on": "Sekti Bludit per",
+    "visit-the-forum-for-support": "Aplankyti [forum](https:\/\/forum.bludit.org) ir ieškoti pagalbos",
+    "manage-your-bludit-from-the-admin-panel": "Valdyti Bludit iš  [admin area]({{ADMIN_AREA_LINK}})",
+    "chat-with-developers-and-users-on-gitter": "Kalbėti su naudotojais ir vytytojais [Gitter](https:\/\/gitter.im\/bludit\/support)",
+    "this-is-a-brief-description-of-yourself-our-your-site": "Tai trumpas jūsų įmonės arba puslapio aprašymas. Pakeisti aprašymo turnį galite Plėtinių nuostatose, Apie plėtinyje.",
+    "read-the-documentation-for-more-information": "Daugiau skaitykite [documentation](https:\/\/docs.bludit.com) for more information",
+    "new-version-available": "Galima nauja versija",
+    "new-category-created": "Nauja kategorija sukurta",
+    "category-deleted": "Kategorija ištrinta",
+    "category-edited": "Kategorija redaguota",
+    "new-user-created": "Naudotojas sukurtas",
+    "user-edited": "Naudotojas redaguotas",
+    "user-deleted": "Naudotojas ištrintas",
+    "recommended-for-recovery-password-and-notifications": "Rekomenduojamas atstatymo slaptažodžiui ir svarbiems pranešimams.",
+    "authentication-token": "Autentifikacijos Raktas",
+    "token": "Raktas",
+    "current-status": "Dabartinė būsena",
+    "upload-image": "Įkelti paveikslėlį",
+    "the-changes-have-been-saved": "Pokyčiai buvo išsaugoti",
+    "label": "Etiketė",
+    "links": "Nuorodos",
+    "this-title-is-almost-always-used-in-the-sidebar-of-the-site": "Šis pavadinimas dažniausiai naudojamas puslapio šone.",
+    "password-must-be-at-least-6-characters-long": "Slaptažodis turi būti sudarytas bent jau iš šešių rašmenų",
+    "ip-address-has-been-blocked": "IP adresas buvo užblokuotas",
+    "try-again-in-a-few-minutes": "Pabandykite vėl už keletos minučių",
+    "content-published-from-scheduler": "Turniys paskelbtas kalendoriaus",
+    "installer-page-about-content": "Apie puslapis yra labai svarbus.",
+    "blog": "Tinklaraštis",
+    "complete-all-fields": "Užpildykite visus laukelius",
+    "static": "Statinis",
+    "about-your-site-or-yourself": "Apie save arba puslapį",
+    "homepage": "Pagrindinis",
+    "disabled": "Išjungtas",
+    "to-enable-the-user-you-must-set-a-new-password": "Naudotojo įgalinimui privalote nustatyti slaptažodį.",
+    "delete-the-user-and-associate-his-content-to-admin-user": "Ištrinti naudotoją ir jo turinį priskirti Administratoriui",
+    "delete-the-user-and-all-his-content": "Ištrinti naudotoją ir visą jo turinį",
+    "user-disabled": "Naudotojas užblokuotas",
+    "user-password-changed": "Naudotojo slaptažodis pakeistas",
+    "the-password-and-confirmation-password-do-not-match": "Slaptažodis ir patvirtinimo slaptažodis nesutampa",
+    "scheduled-content": "Suplanuotas turinys",
+    "there-are-no-scheduled-content": "Nėra planuojamo turinio.",
+    "new-content-created": "Naujas turinys sukurtas",
+    "content-edited": "Turinys redaguotas",
+    "content-deleted": "Turinys ištrintas",
+    "undefined": "Neapibūdinta",
+    "create-new-content-for-your-site": "Sukurkite turinio savo puslapiui",
+    "there-are-no-draft-content": "Šablonų nėra.",
+    "order-items-by": "Rikiuoti pagal",
+    "all-content": "Visas turinys",
+    "dynamic": "Dinamiškas",
+    "type": "Tipas",
+    "draft-content": "Turinio šablonas",
+    "post": "Post",
+    "default": "Numatytasis",
+    "latest-content": "Naujausias turinys",
+    "default-message": "Numatytoji žinutė",
+    "no-parent": "Nėra šakninio",
+    "have-you-seen-my-ball": "Ar matei mano kamuolį?",
+    "pagebreak": "Puslapio lūžis",
+    "pages": "Puslapiai",
+    "this-plugin-may-not-be-supported-by-this-version-of-bludit": "Plėtinys gali būti nepalaikomas dabartinės Bludit versijos",
+    "previous": "Ankstesnis",
+    "previous-page": "Sekantis",
+    "next-page": "Kitas puslapis",
+    "scheduled": "Suplanuota",
+    "this-token-is-similar-to-a-password-it-should-not-be-shared": "Šis raktas panašus į slaptažodį. Juo neturėtų būti dalyjamasi.",
+    "congratulations-you-have-successfully-installed-your-bludit": "Sveikiname sėkmingai įdiegus Bludit.",
+    "this-theme-may-not-be-supported-by-this-version-of-bludit": "Tema gali būti nepalaikoma dabartinės Bludit versijos",
+    "read-more": "Skaityti daugiau",
+    "remember-me": "Įsiminti mane"
+}
+>>>>>>> 07153963c9695a734b5721d73818da6a083bc8af

bl-languages/ru_RU.json

@@ -276,5 +276,9 @@
     "congratulations-you-have-successfully-installed-your-bludit": "Поздравляем! Вы успешно установили **Bludit**",
     "this-theme-may-not-be-supported-by-this-version-of-bludit": "Эта тема может не поддерживаться текущей версией Bludit",
     "read-more": "Читать далее",
+<<<<<<< HEAD
     "remember-me": "Remember me"
+=======
+    "remember-me": "Запомнить"
+>>>>>>> 07153963c9695a734b5721d73818da6a083bc8af
 }

bl-languages/tr_TR.json

@@ -65,20 +65,33 @@
     "themes": "Temalar",
     "about": "Hakkında",
     "url": "URL",
+<<<<<<< HEAD
     "welcome": "Hoşgeldiniz",
+=======
+    "welcome": "Merhaba",
+>>>>>>> 07153963c9695a734b5721d73818da6a083bc8af
     "logout": "Çıkış",
     "website": "Website",
     "publish": "Yayınla",
     "manage": "Yönet",
+<<<<<<< HEAD
     "content": "İçerik",
+=======
+    "content": "İçerikler",
+>>>>>>> 07153963c9695a734b5721d73818da6a083bc8af
     "category": "Kategori",
     "categories": "Kategoriler",
     "users": "Kullanıcılar",
     "settings": "Ayarlar",
     "general": "Genel",
     "advanced": "Gelişmiş",
+<<<<<<< HEAD
     "new-content": "Yeni içerik",
     "manage-content": "İçeriği yönet",
+=======
+    "new-content": "İçerik Ekle",
+    "manage-content": "İçerikler",
+>>>>>>> 07153963c9695a734b5721d73818da6a083bc8af
     "add-new-content": "Yeni içerik ekle",
     "new-category": "Yeni kategori",
     "you-do-not-have-sufficient-permissions": "Bu sayfaya erişmek için gerekli izinlere sahip değilsiniz.",
@@ -128,7 +141,11 @@
     "position": "Konum",
     "friendly-url": "Basit URL",
     "image-description": "Resim açıklaması",
+<<<<<<< HEAD
     "add-a-new-category": "Yeni bir kategori ekle",
+=======
+    "add-a-new-category": "Yeni kategori ekle",
+>>>>>>> 07153963c9695a734b5721d73818da6a083bc8af
     "name": "Ad",
     "username": "Kullanıcı Adı",
     "first-name": "Ad",
@@ -140,7 +157,11 @@
     "site-information": "Site bilgisi",
     "site-title": "Site başlığı",
     "use-this-field-to-name-your-site": "Bu alanı sitenize ad vermek için kullanın.",
+<<<<<<< HEAD
     "site-slogan": "Site slogan",
+=======
+    "site-slogan": "Site sloganı",
+>>>>>>> 07153963c9695a734b5721d73818da6a083bc8af
     "use-this-field-to-add-a-catchy-phrase": "Bu alanı sitenize akılda kalıcı bir cümle seçmek için kullanın.",
     "site-description": "Site tanımı",
     "you-can-add-a-site-description-to-provide": "Bir site tanımı ekleyebilirsiniz.",
@@ -159,7 +180,11 @@
     "date-and-time-formats": "Tarih ve saat formatları",
     "date-format": "Tarih formatı",
     "current-format": "Şimdiki format",
+<<<<<<< HEAD
     "version": "Versyion",
+=======
+    "version": "Sürüm",
+>>>>>>> 07153963c9695a734b5721d73818da6a083bc8af
     "author": "Yazar",
     "activate": "Aktifleştir",
     "deactivate": "Pasifleştir",
@@ -186,19 +211,32 @@
     "invite-a-friend-to-collaborate-on-your-site": "Bir arkadaşınızı sitenize davet edin",
     "number-of-items-to-show-per-page": "Sayfa başına gösterilecek öğe sayısı.",
     "website-or-blog": "Web sitesi veya blog",
+<<<<<<< HEAD
     "order-content-by": "İçerik sıralaması:",
+=======
+    "order-content-by": "İçerik sıralaması",
+>>>>>>> 07153963c9695a734b5721d73818da6a083bc8af
     "edit-or-delete-content-from-your-site": "Sitenizden içerik düzenleme veya silme",
     "order-the-content-by-date-to-build-a-blog": "Blog için tarihe göre sıralayın ya da Web sitesi oluşturmak için içeriğe göre sıralayın.",
     "page-not-found-content": "Hey! böyle bir sayfa yok gibi.",
     "page-not-found": "Sayfa bulunamadı",
     "predefined-pages": "Önceden tanımlanmış sayfalar",
+<<<<<<< HEAD
     "returning-page-when-the-page-doesnt-exist": "Şayet dönülen sayfa bulunamadı ise varsayılan bir ileti döndürmek isterseniz boş bırakın.",
     "returning-page-for-the-main-page": "Ana sayfaya dönülürken, ana sayfadaki tüm sayfaları göstermek isterseniz boş bırakın.",
+=======
+    "returning-page-when-the-page-doesnt-exist": "404 sayfası göstermek yerine bir ileti göstermek isterseniz boş bırakın.",
+    "returning-page-for-the-main-page": "Ana sayfadaki tüm sayfaları göstermek isterseniz boş bırakın.",
+>>>>>>> 07153963c9695a734b5721d73818da6a083bc8af
     "full-url-of-your-site": "Sitenizin tam URL'si. HTTP veya HTTPS protokolüyle tamamlayın (yalnızca sunucunuzda SSL'yi etkinleştirdiyseniz).",
     "with-the-locales-you-can-set-the-regional-user-interface": "Yerel ayarlarla, dilinizdeki tarihler gibi bölgesel kullanıcı arabirimini ayarlayabilirsiniz. Yerel ayarların sisteminize kurulması gerekir.",
     "bludit-installer": "Bludit Yükleyici",
     "choose-your-language": "Dili seçin",
+<<<<<<< HEAD
     "next": "İleri",
+=======
+    "next": "Sonraki",
+>>>>>>> 07153963c9695a734b5721d73818da6a083bc8af
     "complete-the-form-choose-a-password-for-the-username-admin": "Bu formu doldurarak, « admin » kullanıcısı için bir şifre belirleyin",
     "show-password": "Şifreyi göster",
     "install": "Yükle",

bl-languages/uk_UA.json

@@ -3,9 +3,15 @@
         "native": "Українська (Україна)",
         "english-name": "Ukrainian",
         "locale": "uk_UA",
+<<<<<<< HEAD
         "last-update": "2017-12-16",
         "authors": {
             "0": "Aleksei86",
+=======
+        "last-update": "2018-02-12",
+        "authors": {
+            "0": "Aleksei86 https://aleksei86.info/",
+>>>>>>> 07153963c9695a734b5721d73818da6a083bc8af
             "1": "",
             "2": "",
             "3": ""
@@ -276,5 +282,13 @@
     "congratulations-you-have-successfully-installed-your-bludit": "Вітаємо, ви успішно встановили **Bludit**",
     "this-theme-may-not-be-supported-by-this-version-of-bludit": "Ця тема може не підтримуватися цією версією Bludit",
     "read-more": "Читати далі",
+<<<<<<< HEAD
     "remember-me": "Remember me"
+=======
+    "remember-me": "Запам'ятати мене",
+    "plugins-position": "Позиція плагіна",
+    "plugins-position-changed": "Позицію плагіна змінено",
+    "drag-and-drop-to-set-the-position-of-the-plugin": "Перетягніть та відпустіть, щоб встановити позицію плагінів",
+    "change-the-position-of-the-plugins": "Змінити положення плагінів"
+>>>>>>> 07153963c9695a734b5721d73818da6a083bc8af
 }

bl-plugins/api/languages/tr_TR.json

@@ -0,0 +1,11 @@
+{
+	"plugin-data":
+	{
+		"name": "API",
+		"description": "HTTP protokolünü kullanarak Bludit ile etkileşimde bulunmak için arabirim. <br> Bu eklenti hakkında daha fazla bilgi için <a href=\"https://docs.bludit.com/en/api/introduction\">API Tanıtımı (ingilizce)</a>."
+	},
+	"api-token": "API Token",
+	"amount-of-pages": "Sayfa miktarı",
+	"this-is-the-maximum-of-pages-to-return-when-you-call-to": "Bu /api/pages sayfasını çağırdığınızda gösterilecek maksimum sayfa sayısıdır.",
+	"this-token-is-for-read-only-and-is-regenerated-every-time-you-install-the-plugin": "Bu token salt okunur amaçlıdır ve eklentiyi her yüklediğinizde yeniden oluşturulur."
+}

bl-plugins/api/plugin.php

@@ -276,6 +276,14 @@ class pluginAPI extends Plugin {
 
 	private function createPage($args)
 	{
+<<<<<<< HEAD
+=======
+		// Unsanitize content because all values are sanitized
+		if (isset($args['content'])) {
+			$args['content'] = Text::htmlDecode($args['content']);
+		}
+
+>>>>>>> 07153963c9695a734b5721d73818da6a083bc8af
 		// This function is defined on functions.php
 		$key = createPage($args);
 
@@ -295,6 +303,14 @@ class pluginAPI extends Plugin {
 
 	private function editPage($key, $args)
 	{
+<<<<<<< HEAD
+=======
+		// Unsanitize content because all values are sanitized
+		if (isset($args['content'])) {
+			$args['content'] = Text::htmlDecode($args['content']);
+		}
+
+>>>>>>> 07153963c9695a734b5721d73818da6a083bc8af
 		$args['key'] = $key;
 		$newKey = editPage($args);
 

bl-plugins/backup/languages/en.json

@@ -3,5 +3,13 @@
 	{
 		"name": "Backup",
 		"description": "The simple way to backup your Bludit."
+<<<<<<< HEAD
 	}
-}
+}
+=======
+	},
+		"create-backup": "Create Backup",
+		"download": "Download",
+		"restore-backup": "Restore Backup"
+}
+>>>>>>> 07153963c9695a734b5721d73818da6a083bc8af

bl-plugins/backup/languages/tr_TR.json

@@ -0,0 +1,10 @@
+{
+	"plugin-data":
+	{
+		"name": "Yedekleme",
+		"description": "Yedek almak için en kolay yol."
+	},
+		"create-backup": "Yedek Al",
+		"download": "İndir",
+		"restore-backup": "Geri Yükle"
+}

bl-plugins/backup/plugin.php

@@ -66,7 +66,11 @@ class pluginBackup extends Plugin {
 		}
 
 		$html  = '<div>';
+<<<<<<< HEAD
 		$html .= '<button name="createBackup" value="true" class="left small blue" type="submit"><i class="uk-icon-plus"></i> '.$Language->get('Create backup').'</button>';
+=======
+		$html .= '<button name="createBackup" value="true" class="left small blue" type="submit"><i class="uk-icon-plus"></i> '.$Language->get('create-backup').'</button>';
+>>>>>>> 07153963c9695a734b5721d73818da6a083bc8af
 		$html .= '</div>';
 		$html .= '<hr>';
 
@@ -76,8 +80,13 @@ class pluginBackup extends Plugin {
 
 			$html .= '<div>';
 			$html .= '<h3>'.Date::format($filename, BACKUP_DATE_FORMAT, 'F j, Y, g:i a').'</h3>';
+<<<<<<< HEAD
 			$html .= '<a class="uk-button small left blue" href="'.DOMAIN_CONTENT.'backup/'.$basename.'"><i class="uk-icon-download"></i> '.$Language->get('Download').'</a>';
 			$html .= '<button name="restoreBackup" value="'.$basename.'" class="uk-button small left" type="submit"><i class="uk-icon-clock-o"></i> '.$Language->get('Restore backup').'</button>';
+=======
+			$html .= '<a class="uk-button small left blue" href="'.DOMAIN_CONTENT.'backup/'.$basename.'"><i class="uk-icon-download"></i> '.$Language->get('download').'</a>';
+			$html .= '<button name="restoreBackup" value="'.$basename.'" class="uk-button small left" type="submit"><i class="uk-icon-clock-o"></i> '.$Language->get('restore-backup').'</button>';
+>>>>>>> 07153963c9695a734b5721d73818da6a083bc8af
 			$html .= '</div>';
 			$html .= '<hr>';
 		}
@@ -122,4 +131,8 @@ class pluginBackup extends Plugin {
 		return Filesystem::copyRecursive($tmp, PATH_CONTENT);
 	}
 
-}
+<<<<<<< HEAD
+}
+=======
+}
+>>>>>>> 07153963c9695a734b5721d73818da6a083bc8af

bl-plugins/disqus/languages/tr_TR.json

@@ -1,7 +1,11 @@
 {
 	"plugin-data":
 	{
+<<<<<<< HEAD
 		"name": "Disqus yorum sistemi",
+=======
+		"name": "Disqus Yorum Sistemi",
+>>>>>>> 07153963c9695a734b5721d73818da6a083bc8af
 		"description": "Diqus siteler için yorum hostingi yapan bir hostingdir.Eklentiyi kullanmadan önce Disqus.com adresine kayıt olmanız gerekmektedir."
 	},
 	"disqus-shortname": "Disqus",

bl-plugins/google/plugin.php

@@ -43,13 +43,21 @@ class pluginGoogle extends Plugin {
 		$html = '';
 
 		// Google HTML tag
+<<<<<<< HEAD
 		if( $this->getValue('google-site-verification') && $Url->whereAmI()=='home' ) {
+=======
+		if ($this->getValue('google-site-verification') && $Url->whereAmI()=='home') {
+>>>>>>> 07153963c9695a734b5721d73818da6a083bc8af
 			$html .= PHP_EOL.'<!-- Google HTML tag -->'.PHP_EOL;
 			$html .= '<meta name="google-site-verification" content="'.$this->getDbField('google-site-verification').'" />'.PHP_EOL;
 		}
 
 		// Google Tag Manager
+<<<<<<< HEAD
 		if( $this->getValue('google-tag-manager') ) {
+=======
+		if ($this->getValue('google-tag-manager')) {
+>>>>>>> 07153963c9695a734b5721d73818da6a083bc8af
 			$html .= PHP_EOL."<!-- Google Tag Manager -->".PHP_EOL;
 			$html .= "<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':".PHP_EOL;
 			$html .= "new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],".PHP_EOL;
@@ -60,7 +68,11 @@ class pluginGoogle extends Plugin {
 		}
 
 		// Google Analytics
+<<<<<<< HEAD
 		if( $this->getValue('google-analytics-tracking-id') ) {
+=======
+		if ($this->getValue('google-analytics-tracking-id')) {
+>>>>>>> 07153963c9695a734b5721d73818da6a083bc8af
 			$html .= PHP_EOL.'<!-- Google Analytics -->'.PHP_EOL;
 			$html .= '
 			<script async src="https://www.googletagmanager.com/gtag/js?id='.$this->getValue('google-analytics-tracking-id').'"></script>
@@ -78,6 +90,7 @@ class pluginGoogle extends Plugin {
 
 	public function siteBodyBegin()
 	{
+<<<<<<< HEAD
 		// Google Tag Manager
 		if ($this->getValue('google-tag-manager')) {
 			$html  = '<!-- Google Tag Manager (noscript) -->'.PHP_EOL;
@@ -88,4 +101,17 @@ class pluginGoogle extends Plugin {
 		return false;
 	}
 
+=======
+		$html = '';
+
+		// Google Tag Manager
+		if ($this->getValue('google-tag-manager')) {
+			$html .= '<!-- Google Tag Manager (noscript) -->'.PHP_EOL;
+			$html .= '<noscript><iframe src="https://www.googletagmanager.com/ns.html?id='.$this->getValue('google-tag-manager').'" height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>'.PHP_EOL;
+			$html .= '<!-- End Google Tag Manager (noscript) -->'.PHP_EOL;
+		}
+
+		return $html;
+	}
+>>>>>>> 07153963c9695a734b5721d73818da6a083bc8af
 }

bl-plugins/html-code/languages/de_CH.json

@@ -4,7 +4,11 @@
 		"name": "HTML Code",
 		"description": "HTML-, JavaScript- oder CSS-Code in den Header-Bereich des Themes oder über oder unter den Inhaltsbereich des Themes einfügen."
 	},
+<<<<<<< HEAD
 	"insert-code-in-the-theme-inside-the-tag-head": "Code in den Bereich &#60;head&#62; &#60;/head&#62; des Themes einfügen,
+=======
+	"insert-code-in-the-theme-inside-the-tag-head": "Code in den Bereich &#60;head&#62; &#60;/head&#62; des Themes einfügen.",
+>>>>>>> 07153963c9695a734b5721d73818da6a083bc8af
 	"insert-code-in-the-theme-at-the-top": "Code über dem Inhaltsbereich des Themes einfügen.",
 	"insert-code-in-the-theme-at-the-bottom": "Code unter dem Inhaltsbereich des Themes einfügen."
 }

bl-plugins/html-code/languages/de_DE.json

@@ -4,7 +4,11 @@
 		"name": "HTML Code",
 		"description": "HTML-, JavaScript- oder CSS-Code in den Header-Bereich des Themes oder über oder unter den Inhaltsbereich des Themes einfügen."
 	},
+<<<<<<< HEAD
 	"insert-code-in-the-theme-inside-the-tag-head": "Code in den Bereich &#60;head&#62; &#60;/head&#62; des Themes einfügen,
+=======
+	"insert-code-in-the-theme-inside-the-tag-head": "Code in den Bereich &#60;head&#62; &#60;/head&#62; des Themes einfügen.",
+>>>>>>> 07153963c9695a734b5721d73818da6a083bc8af
 	"insert-code-in-the-theme-at-the-top": "Code über dem Inhaltsbereich des Themes einfügen.",
 	"insert-code-in-the-theme-at-the-bottom": "Code unter dem Inhaltsbereich des Themes einfügen."
 }

bl-plugins/navigation/languages/de_CH.json

@@ -0,0 +1,10 @@
+{
+	"plugin-data":
+	{
+		"name": "Neueste Inhalte",
+		"description": "Liste der neuesten Inhalte in der Seitenleiste (bei Themes mit einer Seitenleiste). Die Anzahl kann in den Einstellungen gewählt werden. Die Reihenfolge entspricht der unter \"Einstellungen\" > \"Erweitert\" gewählten Option."
+	},
+	"home-link": "Hauptseite",
+	"show-the-home-link-on-the-sidebar": "Link zur Hauptseite.",
+	"amount-of-items": "Anzahl der Inhalte"
+}

bl-plugins/navigation/languages/de_DE.json

@@ -0,0 +1,10 @@
+{
+	"plugin-data":
+	{
+		"name": "Neueste Inhalte",
+		"description": "Liste der neuesten Inhalte in der Seitenleiste (bei Themes mit einer Seitenleiste). Die Anzahl kann in den Einstellungen gewählt werden. Die Reihenfolge entspricht der unter \"Einstellungen\" > \"Erweitert\" gewählten Option."
+	},
+	"home-link": "Hauptseite",
+	"show-the-home-link-on-the-sidebar": "Link zur Hauptseite.",
+	"amount-of-items": "Anzahl der Inhalte"
+}

bl-plugins/navigation/languages/en.json

@@ -0,0 +1,10 @@
+{
+	"plugin-data":
+	{
+		"name": "Latest content",
+		"description": "List of latest contents, you can set the number of items.<br>The order of the content is taken from the advanced settings of Bludit."
+	},
+	"home-link": "Home link",
+	"show-the-home-link-on-the-sidebar": "Show the home link on the sidebar.",
+	"amount-of-items": "Amount of items"
+}

bl-plugins/navigation/languages/es.json

@@ -0,0 +1,10 @@
+{
+	"plugin-data":
+	{
+		"name": "Último contenido",
+		"description": "Lista los últimos contenidos, puede establecer el número de elementos.<br>El orden del contenido se toma de la configuración avanzada de Bludit."
+	},
+	"home-link": "Enlace Home",
+	"show-the-home-link-on-the-sidebar": "Mostrar el vínculo de inicio en la barra lateral.",
+	"amount-of-items": "Cantidad de artículos"
+}

bl-plugins/navigation/languages/fr_FR.json

@@ -0,0 +1,10 @@
+{
+	"plugin-data":
+	{
+		"name": "Dernier contenu",
+		"description": "Liste des derniers contenus, vous pouvez définir le nombre d’éléments. <br> L’ordre du contenu est tiré des paramètres avancés de Bludit."
+	},
+	"home-link": "Lien vers la page d’acceuil.",
+	"show-the-home-link-on-the-sidebar": "Afficher le lien vers la page d’acceuil sur la barre latérale.",
+	"amount-of-items": "Quantité d’objets"
+}

bl-plugins/navigation/languages/ru_RU.json

@@ -0,0 +1,10 @@
+{
+	"plugin-data":
+	{
+		"name": "Последний контент",
+		"description": "Список последнего содержимого, вы можете задать количество позиций.<br>Порядок отображения содержимого задаётся в расширенных настройках Bludit."
+	},
+	"home-link": "Ссылка на главную страницу",
+	"show-the-home-link-on-the-sidebar": "Показывать ссылку на главную страницу на боковой панели",
+	"amount-of-items": "Количество позиций"
+}

bl-plugins/navigation/metadata.json

@@ -0,0 +1,10 @@
+{
+	"author": "Bludit",
+	"email": "",
+	"website": "https://plugins.bludit.com",
+	"version": "2.2",
+	"releaseDate": "2018-01-23",
+	"license": "MIT",
+	"compatible": "2.2",
+	"notes": ""
+}

bl-plugins/navigation/plugin.php

@@ -0,0 +1,125 @@
+<?php
+
+class pluginNavigation extends Plugin {
+
+	public function init()
+	{
+		// Fields and default values for the database of this plugin
+		$this->dbFields = array(
+			'label'=>'Navigation',
+			'homeLink'=>true,
+			'amountOfItems'=>5
+		);
+	}
+
+	// Method called on the settings of the plugin on the admin area
+	public function form()
+	{
+		global $Language;
+
+		$html  = '<div>';
+		$html .= '<label>'.$Language->get('Label').'</label>';
+		$html .= '<input id="jslabel" name="label" type="text" value="'.$this->getValue('label').'">';
+		$html .= '<span class="tip">'.$Language->get('This title is almost always used in the sidebar of the site').'</span>';
+		$html .= '</div>';
+
+		$html .= '<div>';
+		$html .= '<label>'.$Language->get('Home link').'</label>';
+		$html .= '<select name="homeLink">';
+		$html .= '<option value="true" '.($this->getValue('homeLink')===true?'selected':'').'>'.$Language->get('Enabled').'</option>';
+		$html .= '<option value="false" '.($this->getValue('homeLink')===false?'selected':'').'>'.$Language->get('Disabled').'</option>';
+		$html .= '</select>';
+		$html .= '<span class="tip">'.$Language->get('Show the home link on the sidebar').'</span>';
+		$html .= '</div>';
+
+		$html .= '<div>';
+		$html .= '<label>'.$Language->get('Amount of items').'</label>';
+		$html .= '<input id="jsamountOfItems" name="amountOfItems" type="text" value="'.$this->getValue('amountOfItems').'">';
+		$html .= '</div>';
+
+		return $html;
+	}
+
+	// Method called on the sidebar of the website
+	public function siteSidebar()
+	{
+		global $Language;
+		global $Url;
+		global $Site;
+		global $dbPages;
+		global $pagesByParent;
+
+		// Amount of pages to show
+		$amountOfItems = $this->getValue('amountOfItems');
+
+		// Page number the first one
+		$pageNumber = 1;
+
+		// Only published pages
+		$onlyPublished = true;
+
+		// Get the list of pages
+		$pages = $dbPages->getList($pageNumber, $amountOfItems, $onlyPublished, true);
+
+		// HTML for sidebar
+		$html  = '<div class="plugin plugin-navigation">';
+
+		// Print the label if not empty
+		$label = $this->getValue('label');
+		if (!empty($label)) {
+			$html .= '<h2 class="plugin-label">'.$label.'</h2>';
+		}
+
+		$html .= '<div class="plugin-content">';
+		$html .= '<ul>';
+
+		if(ORDER_BY==='position') {
+			foreach($pagesByParent[PARENT] as $Parent) {
+				$html .= '<li class="parent">';
+				$html .= '<h3>';
+				$html .= $Parent->title();
+				$html .= '</h3>';
+
+				if(!empty($pagesByParent[$Parent->key()])) {
+					$html .= '<ul class="child">';
+					foreach($pagesByParent[$Parent->key()] as $child) {
+						$html .= '<li class="child">';
+						$html .= '<a class="child" href="'.$child->permalink().'">';
+						$html .= $child->title();
+						$html .= '</a>';
+						$html .= '</li>';
+					}
+					$html .= '</ul>';
+				}
+				$html .= '</li>';
+			}
+		}
+		else {
+			// Show Home page link
+			if( $this->getValue('homeLink') ) {
+				$html .= '<li>';
+				$html .= '<a href="'.$Site->url().'">';
+				$html .= $Language->get('Home page');
+				$html .= '</a>';
+				$html .= '</li>';
+			}
+
+			// Get keys of pages
+			foreach($pages as $pageKey) {
+				// Create the page object from the page key
+				$page = buildPage($pageKey);
+				$html .= '<li>';
+				$html .= '<a href="'.$page->permalink().'">';
+				$html .= $page->title();
+				$html .= '</a>';
+				$html .= '</li>';
+			}
+		}
+
+		$html .= '</ul>';
+ 		$html .= '</div>';
+ 		$html .= '</div>';
+
+		return $html;
+	}
+}

bl-plugins/rss/languages/tr_TR.json

@@ -0,0 +1,9 @@
+{
+	"plugin-data":
+	{
+		"name": "RSS Beslemesi",
+		"description": "Bu eklenti, sitenizin RSS beslemesini üretir.<br>Besleme URL'si https://example.com/rss.xml gibi görünür."
+	},
+	"amount-of-items-to-show-on-the-feed": "Özet akışında gösterilecek öğe miktarı.",
+	"rss-url": "RSS URL"
+}

bl-plugins/tinymce/tinymce/plugins/paypal/plugin.min.js

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 tinymce.PluginManager.add('paypal', function(editor, url) {
     // Add a button that opens a window
     editor.addButton('paypal', {
@@ -36,4 +37,45 @@ tinymce.PluginManager.add('paypal', function(editor, url) {
     });
   
   });
-  
+  
+=======
+tinymce.PluginManager.add('paypal', function(editor, url) {
+    // Add a button that opens a window
+    editor.addButton('paypal', {
+      text: 'Paypal',
+      icon: false,
+      onclick: function() {
+        // Open window
+        editor.windowManager.open({
+          title: 'Paypal Bludit plugin',
+          body: [
+              // If you and only you will use this plugin comment out email and currency rows below. Define e.data.email and e.data.currency variable in onsubmit method
+            {type: 'textbox', name: 'email', label: 'Your Paypal email'},            
+            {type: 'textbox', name: 'title', label: 'Title'},
+            {type: 'textbox', name: 'price', label: 'Price'},        
+            {type: 'textbox', name: 'currency', label: 'Currency'},
+            {type: 'textbox', name: 'description', label: 'Short description'},            
+            {type: 'textbox', name: 'url', label: 'Redirect to url after payment'}           
+          ],
+          onsubmit: function(e) {
+            // Insert content when the window form is submitted
+           if(e.data.email!=="" && e.data.title!=="" && e.data.price!=="" && e.data.currency!=="" && e.data.url!=="" && e.data.description!==""){
+            var button="<form action='https://www.paypal.com/cgi-bin/webscr' method='post' onsubmit=return(unescape('return.value'));><input type='hidden' name='business' value='"+e.data.email+"'><input type='hidden' name='cmd' value='_xclick'><input type='hidden' name='item_name' value='"+e.data.title+"'><input type='hidden' name='amount' value='"+e.data.price+"'><input type='hidden' name='currency_code' value='"+e.data.currency+"'><input style='color:white;' type='hidden' name='return' value='"+e.data.url+"'><input type='image' name='submit' border='0'src='https://www.paypalobjects.com/webstatic/en_US/i/buttons/pp-acceptance-medium.png' alt='PayPal Acceptance'>";
+            editor.insertContent("<p>Product: "+e.data.title+"</p><br>");
+            editor.insertContent("<p>Description: "+e.data.description+"</p><br>");            
+            editor.insertContent("<p>Price: "+e.data.price+""+e.data.currency+"</p><br>");  
+            editor.insertContent(button);
+           }
+
+           else{
+             alert("Error: You must fill in all of the fields :(");  
+           }
+           
+          }
+        });
+      }
+    });
+  
+  });
+  
+>>>>>>> 07153963c9695a734b5721d73818da6a083bc8af

bl-plugins/tinymce/tinymce/skins/bludit/skin.json

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 {
 	"skin-name": "bludit",
 	"preview-bg": "#fff",
@@ -76,4 +77,84 @@
 	"colorbtn-backcolor-bg": "#bbbbbb",
 	"grid-border": "#d6d6d6",
 	"grid-border-active": "#a1a1a1"
+=======
+{
+	"skin-name": "bludit",
+	"preview-bg": "#fff",
+	"text": "#333333",
+	"text-inverse": "#ffffff",
+	"text-disabled": "#aaaaaa",
+	"has-gradients": false,
+	"has-radius": false,
+	"has-boxshadow": false,
+	"has-button-borders": false,
+	"btn-text": "#333333",
+	"btn-text-shadow": "#ffffff",
+	"btn-bg": "#ffffff",
+	"btn-bg-hlight": "#d9d9d9",
+	"btn-border-top": "transparent",
+	"btn-border-right": "transparent",
+	"btn-border-bottom": "transparent",
+	"btn-border-left": "transparent",
+	"btn-split-border": "#bdbdbd",
+	"btn-primary-text": "#ffffff",
+	"btn-primary-text-shadow": "#333333",
+	"btn-primary-bg": "#0088cc",
+	"btn-primary-bg-hlight": "#0044cc",
+	"btn-padding": "4px 8px",
+	"menu-bg": "#ffffff",
+	"menu-border": "rgba(0,0,0,0.2)",
+	"menuitem-text": "#333333",
+	"menuitem-bg-selected": "#0088cc",
+	"menuitem-bg-selected-hlight": "#0077b3",
+	"menuitem-separator-top": "#cbcbcb",
+	"menuitem-separator-bottom": "#ffffff",
+	"menuitem-text-inverse": "#ffffff",
+	"menuitem-bg-active": "#c8def4",
+	"menuitem-text-active": "#333333",
+	"menuitem-preview-border-active": "#aaaaaa",
+	"menubar-menubtn-text": "#dddddd",
+	"checkbox-border": "#c5c5c5",
+	"checkbox-border-focus": "#59a5e1",
+	"panel-border": "#DDDDDD",
+	"panel-bg": "#F3F3F3",
+	"panel-bg-hlight": "#F3F3F3",
+	"textbox-bg": "#ffffff",
+	"textbox-border": "#c5c5c5",
+	"textbox-border-focus": "#59a5e1",
+	"window-bg": "#ffffff",
+	"window-border": "#c4c4c4",
+	"tab-bg": "#e3e3e3",
+	"tab-bg-hover": "#fdfdfd",
+	"tab-bg-active": "#fdfdfd",
+	"tab-border": "#c5c5c5",
+	"tabs-bg": "#ffffff",
+	"notification-bg": "#f0f0f0",
+	"notification-border": "#cccccc",
+	"notification-text": "#333333",
+	"notification-success-bg": "#dff0d8",
+	"notification-success-border": "#d6e9c6",
+	"notification-success-text": "#3c763d",
+	"notification-info-bg": "#d9edf7",
+	"notification-info-border": "#779ecb",
+	"notification-info-text": "#31708f",
+	"notification-warning-bg": "#fcf8e3",
+	"notification-warning-border": "#faebcc",
+	"notification-warning-text": "#8a6d3b",
+	"notification-error-bg": "#f2dede",
+	"notification-error-border": "#ebccd1",
+	"notification-error-text": "#a94442",
+	"progress-bar-bg": "#dfdfdf",
+	"progress-bar-bg-hlight": "#cccccc",
+	"progress-border": "#cccccc",
+	"progress-text": "#333333",
+	"progress-text-shadow": "#ffffff",
+	"slider-bg": "#eeeeee",
+	"slider-border": "#aaaaaa",
+	"slider-handle-bg": "#dddddd",
+	"slider-handle-border": "#bbbbbb",
+	"colorbtn-backcolor-bg": "#bbbbbb",
+	"grid-border": "#d6d6d6",
+	"grid-border-active": "#a1a1a1"
+>>>>>>> 07153963c9695a734b5721d73818da6a083bc8af
 }

bl-themes/alternative/css/style.css

@@ -0,0 +1,63 @@
+html {
+	position: relative;
+	min-height: 100%;
+}
+
+body {
+	/* Padding top for navbar */
+	padding-top: 56px;
+	/* Margin bottom for footer height */
+	margin-bottom: 60px;
+}
+
+section {
+	padding: 150px 0;
+}
+
+img {
+	max-width: 100%;
+}
+
+/* Navbar */
+.navbar-nav-svg {
+	display: inline-block;
+	width: 1rem;
+	height: 1rem;
+	vertical-align: text-top;
+	color: rgba(255,255,255,.5);
+}
+
+.nav-link {
+	font-size: 0.8em;
+}
+
+/* Footer */
+footer {
+	position: absolute;
+	bottom: 0;
+	width: 100%;
+	height: 60px;
+	line-height: 60px;
+	font-size: 0.8em;
+}
+
+.mini-logo {
+	height: 22px;
+	padding-bottom: 5px;
+}
+
+/* Home - Header */
+header.welcome {
+	padding: 100px 0;
+}
+
+/* Home - Page */
+section.home-page:nth-child(even) { /* Alternate the background color */
+	background: #FAFAFA;
+}
+
+.page-cover-image {
+	background-size: cover;
+	background-position: center;
+}
+

bl-themes/alternative/img/codepen.svg

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg aria-labelledby="simpleicons-codepen-icon" role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+  <title id="simpleicons-codepen-icon">CodePen icon</title>
+  <path d="M24 8.182l-.018-.087-.017-.05c-.01-.024-.018-.05-.03-.075-.003-.018-.015-.034-.02-.05l-.035-.067-.03-.05-.044-.06-.046-.045-.06-.045-.046-.03-.06-.044-.044-.04-.015-.02L12.58.19c-.347-.232-.796-.232-1.142 0L.453 7.502l-.015.015-.044.035-.06.05-.038.04-.05.056-.037.045-.05.06c-.02.017-.03.03-.03.046l-.05.06-.02.06c-.02.01-.02.04-.03.07l-.01.05C0 8.12 0 8.15 0 8.18v7.497c0 .044.003.09.01.135l.01.046c.005.03.01.06.02.086l.015.05c.01.027.016.053.027.075l.022.05c0 .01.015.04.03.06l.03.04c.015.01.03.04.045.06l.03.04.04.04c.01.013.01.03.03.03l.06.042.04.03.01.014 10.97 7.33c.164.12.375.163.57.163s.39-.06.57-.18l10.99-7.28.014-.01.046-.037.06-.043.048-.036.052-.058.033-.045.04-.06.03-.05.03-.07.016-.052.03-.077.015-.045.03-.08v-7.5c0-.05 0-.095-.016-.14l-.014-.045.044.003zm-11.99 6.28l-3.65-2.44 3.65-2.442 3.65 2.44-3.65 2.44zm-1.034-6.674l-4.473 2.99L2.89 8.362l8.086-5.39V7.79zm-6.33 4.233l-2.582 1.73V10.3l2.582 1.726zm1.857 1.25l4.473 2.99v4.82L2.89 15.69l3.618-2.417v-.004zm6.537 2.99l4.474-2.98 3.613 2.42-8.087 5.39v-4.82zm6.33-4.23l2.583-1.72v3.456l-2.583-1.73zm-1.855-1.24L13.042 7.8V2.97l8.085 5.39-3.612 2.415v.003z" style="fill: rgba(255, 255, 255, 0.5);"/>
+</svg>

bl-themes/alternative/img/facebook.svg

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg aria-labelledby="simpleicons-facebook-icon" role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+  <title id="simpleicons-facebook-icon">Facebook icon</title>
+  <path d="M22.676 0H1.324C.593 0 0 .593 0 1.324v21.352C0 23.408.593 24 1.324 24h11.494v-9.294H9.689v-3.621h3.129V8.41c0-3.099 1.894-4.785 4.659-4.785 1.325 0 2.464.097 2.796.141v3.24h-1.921c-1.5 0-1.792.721-1.792 1.771v2.311h3.584l-.465 3.63H16.56V24h6.115c.733 0 1.325-.592 1.325-1.324V1.324C24 .593 23.408 0 22.676 0" style="fill: rgba(255, 255, 255, 0.5);"/>
+</svg>

bl-themes/alternative/img/github.svg

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg aria-labelledby="simpleicons-github-icon" role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+  <title id="simpleicons-github-icon">GitHub icon</title>
+  <path d="M12 .297c-6.63 0-12 5.373-12 12 0 5.303 3.438 9.8 8.205 11.385.6.113.82-.258.82-.577 0-.285-.01-1.04-.015-2.04-3.338.724-4.042-1.61-4.042-1.61C4.422 18.07 3.633 17.7 3.633 17.7c-1.087-.744.084-.729.084-.729 1.205.084 1.838 1.236 1.838 1.236 1.07 1.835 2.809 1.305 3.495.998.108-.776.417-1.305.76-1.605-2.665-.3-5.466-1.332-5.466-5.93 0-1.31.465-2.38 1.235-3.22-.135-.303-.54-1.523.105-3.176 0 0 1.005-.322 3.3 1.23.96-.267 1.98-.399 3-.405 1.02.006 2.04.138 3 .405 2.28-1.552 3.285-1.23 3.285-1.23.645 1.653.24 2.873.12 3.176.765.84 1.23 1.91 1.23 3.22 0 4.61-2.805 5.625-5.475 5.92.42.36.81 1.096.81 2.22 0 1.606-.015 2.896-.015 3.286 0 .315.21.69.825.57C20.565 22.092 24 17.592 24 12.297c0-6.627-5.373-12-12-12" style="fill: rgba(255, 255, 255, 0.5);"/>
+</svg>

bl-themes/alternative/img/googleplus.svg

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg aria-labelledby="simpleicons-googleplus-icon" role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+  <title id="simpleicons-googleplus-icon">Google+ icon</title>
+  <path d="M7.635 10.909v2.619h4.335c-.173 1.125-1.31 3.295-4.331 3.295-2.604 0-4.731-2.16-4.731-4.823 0-2.662 2.122-4.822 4.728-4.822 1.485 0 2.479.633 3.045 1.178l2.073-1.994c-1.33-1.245-3.056-1.995-5.115-1.995C3.412 4.365 0 7.785 0 12s3.414 7.635 7.635 7.635c4.41 0 7.332-3.098 7.332-7.461 0-.501-.054-.885-.12-1.265H7.635zm16.365 0h-2.183V8.726h-2.183v2.183h-2.182v2.181h2.184v2.184h2.189V13.09H24" style="fill: rgba(255, 255, 255, 0.5);"/>
+</svg>

bl-themes/alternative/img/twitter.svg

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg aria-labelledby="simpleicons-twitter-icon" role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+  <title id="simpleicons-twitter-icon">Twitter icon</title>
+  <path d="M23.954 4.569c-.885.389-1.83.654-2.825.775 1.014-.611 1.794-1.574 2.163-2.723-.951.555-2.005.959-3.127 1.184-.896-.959-2.173-1.559-3.591-1.559-2.717 0-4.92 2.203-4.92 4.917 0 .39.045.765.127 1.124C7.691 8.094 4.066 6.13 1.64 3.161c-.427.722-.666 1.561-.666 2.475 0 1.71.87 3.213 2.188 4.096-.807-.026-1.566-.248-2.228-.616v.061c0 2.385 1.693 4.374 3.946 4.827-.413.111-.849.171-1.296.171-.314 0-.615-.03-.916-.086.631 1.953 2.445 3.377 4.604 3.417-1.68 1.319-3.809 2.105-6.102 2.105-.39 0-.779-.023-1.17-.067 2.189 1.394 4.768 2.209 7.557 2.209 9.054 0 13.999-7.496 13.999-13.986 0-.209 0-.42-.015-.63.961-.689 1.8-1.56 2.46-2.548l-.047-.02z" style="fill: rgba(255, 255, 255, 0.5);"/>
+</svg>

bl-themes/alternative/index.php

@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<html>
+<head>
+<?php include(THEME_DIR_PHP.'head.php'); ?>
+</head>
+<body>
+
+	<!-- Load Bludit Plugins: Site Body Begin -->
+	<?php Theme::plugins('siteBodyBegin'); ?>
+
+	<!-- Navbar -->
+	<?php include(THEME_DIR_PHP.'navbar.php'); ?>
+
+	<!-- Content -->
+	<?php
+		// $WHERE_AM_I variable detect where the user is browsing
+		// If the user is watching a particular page the variable takes the value "page"
+		// If the user is watching the frontpage the variable takes the value "home"
+		if ($WHERE_AM_I == 'page') {
+			include(THEME_DIR_PHP.'page.php');
+		} else {
+			include(THEME_DIR_PHP.'home.php');
+		}
+	?>
+
+	<!-- Footer -->
+	<?php include(THEME_DIR_PHP.'footer.php'); ?>
+
+	<!-- Javascript -->
+	<?php
+		echo Theme::js('js/jquery.min.js');
+		echo Theme::js('js/bootstrap.min.js');
+	?>
+
+	<!-- Load Bludit Plugins: Site Body End -->
+	<?php Theme::plugins('siteBodyEnd'); ?>
+
+</body>
+</html>

bl-themes/alternative/languages/en.json

@@ -0,0 +1,7 @@
+{
+	"theme-data":
+	{
+		"name": "Alternative",
+		"description": ""
+	}
+}

bl-themes/alternative/metadata.json

@@ -0,0 +1,10 @@
+{
+	"author": "Bludit",
+	"email": "",
+	"website": "https://themes.bludit.com",
+	"version": "2.2",
+	"releaseDate": "2018-01-23",
+	"license": "MIT",
+	"compatible": "2.2",
+	"notes": ""
+}

bl-themes/alternative/php/footer.php

@@ -0,0 +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">Powered by<img class="mini-logo" src="<?php echo DOMAIN_THEME_IMG.'favicon.png'; ?>"/><a target="_blank" class="text-white" href="https://www.bludit.com">Bludit</a></span></p>
+	</div>
+</footer>

bl-themes/alternative/php/head.php

@@ -0,0 +1,21 @@
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+<meta name="author" content="Bludit CMS">
+
+<!-- Dynamic title tag -->
+<?php echo Theme::headTitle(); ?>
+
+<!-- Dynamic description tag -->
+<?php echo Theme::headDescription(); ?>
+
+<!-- Favicon -->
+<?php echo Theme::favicon('img/favicon.png'); ?>
+
+<!-- CSS: Bootstrap -->
+<?php echo Theme::css('css/bootstrap.min.css'); ?>
+
+<!-- CSS: Styles for this theme -->
+<?php echo Theme::css('css/style.css'); ?>
+
+<!-- Load Bludit Plugins: Site head -->
+<?php Theme::plugins('siteHead'); ?>

bl-themes/alternative/php/home.php

@@ -0,0 +1,70 @@
+<!-- Welcome message -->
+<header class="welcome bg-light">
+	<div class="container text-center">
+		<!-- Site title -->
+		<h1><?php echo $site->slogan() ?></h1>
+
+		<!-- Site description -->
+		<?php if ($site->description()): ?>
+		<p class="lead"><?php echo $site->description() ?></p>
+		<?php endif ?>
+	</div>
+</header>
+
+<!-- Print all the content -->
+<?php foreach ($content as $page): ?>
+<section class="home-page">
+	<div class="container">
+		<div class="row">
+			<div class="col-lg-8 mx-auto">
+				<!-- Load Bludit Plugins: Page Begin -->
+				<?php Theme::plugins('pageBegin'); ?>
+
+				<!-- Page title -->
+				<a class="text-dark" href="<?php echo $page->permalink() ?>">
+					<h2><?php echo $page->title() ?></h2>
+				</a>
+
+				<!-- Page content until the pagebreak -->
+				<div>
+				<?php echo $page->contentBreak() ?>
+				</div>
+
+				<!-- Shows "read more" button if necessary -->
+				<?php if ($page->readMore()): ?>
+				<a class="btn btn-primary btn-sm" href="<?php echo $page->permalink() ?>" role="button">Read more</a>
+				<?php endif ?>
+
+				<!-- Load Bludit Plugins: Page End -->
+				<?php Theme::plugins('pageEnd'); ?>
+			</div>
+		</div>
+	</div>
+</section>
+<?php endforeach ?>
+
+<!-- Pagination -->
+<?php if (Paginator::amountOfPages()>1): ?>
+<nav class="my-4" aria-label="Page navigation">
+	<ul class="pagination justify-content-center">
+
+		<!-- Previuos button -->
+		<li class="page-item <?php if (Paginator::showNext()) echo 'disabled' ?>">
+			<a class="page-link" href="<?php echo Paginator::prevPageUrl() ?>" tabindex="-1">Previous</a>
+		</li>
+
+		<!-- List of pages -->
+		<?php for ($i = 1; $i <= Paginator::amountOfPages(); $i++): ?>
+		<li class="page-item <?php if ($i==Paginator::currentPage()) echo 'active' ?>">
+			<a class="page-link" href="<?php echo Paginator::numberUrl($i) ?>"><?php echo $i ?></a>
+		</li>
+		<?php endfor ?>
+
+		<!-- Next button -->
+		<li class="page-item <?php if (Paginator::showPrev()) echo 'disabled' ?>">
+			<a class="page-link" href="<?php echo Paginator::nextPageUrl() ?>">Next</a>
+		</li>
+
+	</ul>
+</nav>
+<?php endif ?>

bl-themes/alternative/php/navbar.php

@@ -0,0 +1,78 @@
+<nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark text-uppercase">
+	<div class="container">
+		<a class="navbar-brand" href="<?php echo $site->url() ?>">
+			<span class="text-white"><?php echo $site->title() ?></span>
+		</a>
+		<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarResponsive" aria-controls="navbarResponsive" aria-expanded="false" aria-label="Toggle navigation">
+			<span class="navbar-toggler-icon"></span>
+		</button>
+		<div class="collapse navbar-collapse" id="navbarResponsive">
+			<ul class="navbar-nav ml-auto">
+
+				<!-- Static pages -->
+				<?php foreach ($staticContent as $staticPage): ?>
+				<li class="nav-item">
+					<a class="nav-link" href="<?php echo $staticPage->permalink() ?>"><?php echo $staticPage->title() ?></a>
+				</li>
+				<?php endforeach ?>
+
+				<!-- Social Networks -->
+				<?php if ($site->github()): ?>
+				<li class="nav-item">
+					<a class="nav-link p-2" href="<?php echo $site->github() ?>" target="_blank" rel="noopener" aria-label="GitHub">
+						<svg class="navbar-nav-svg" aria-labelledby="simpleicons-github-icon" role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+							<title id="simpleicons-github-icon">GitHub icon</title>
+							<path d="M12 .297c-6.63 0-12 5.373-12 12 0 5.303 3.438 9.8 8.205 11.385.6.113.82-.258.82-.577 0-.285-.01-1.04-.015-2.04-3.338.724-4.042-1.61-4.042-1.61C4.422 18.07 3.633 17.7 3.633 17.7c-1.087-.744.084-.729.084-.729 1.205.084 1.838 1.236 1.838 1.236 1.07 1.835 2.809 1.305 3.495.998.108-.776.417-1.305.76-1.605-2.665-.3-5.466-1.332-5.466-5.93 0-1.31.465-2.38 1.235-3.22-.135-.303-.54-1.523.105-3.176 0 0 1.005-.322 3.3 1.23.96-.267 1.98-.399 3-.405 1.02.006 2.04.138 3 .405 2.28-1.552 3.285-1.23 3.285-1.23.645 1.653.24 2.873.12 3.176.765.84 1.23 1.91 1.23 3.22 0 4.61-2.805 5.625-5.475 5.92.42.36.81 1.096.81 2.22 0 1.606-.015 2.896-.015 3.286 0 .315.21.69.825.57C20.565 22.092 24 17.592 24 12.297c0-6.627-5.373-12-12-12" style="fill: rgba(255, 255, 255, 0.5);"/>
+						</svg>
+					</a>
+				</li>
+				<?php endif ?>
+
+				<?php if ($site->twitter()): ?>
+				<li class="nav-item">
+					<a class="nav-link p-2" href="<?php echo $site->twitter() ?>" target="_blank" rel="noopener" aria-label="twitter">
+						<svg class="navbar-nav-svg" aria-labelledby="simpleicons-twitter-icon" role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+							<title id="simpleicons-twitter-icon">Twitter icon</title>
+							<path d="M23.954 4.569c-.885.389-1.83.654-2.825.775 1.014-.611 1.794-1.574 2.163-2.723-.951.555-2.005.959-3.127 1.184-.896-.959-2.173-1.559-3.591-1.559-2.717 0-4.92 2.203-4.92 4.917 0 .39.045.765.127 1.124C7.691 8.094 4.066 6.13 1.64 3.161c-.427.722-.666 1.561-.666 2.475 0 1.71.87 3.213 2.188 4.096-.807-.026-1.566-.248-2.228-.616v.061c0 2.385 1.693 4.374 3.946 4.827-.413.111-.849.171-1.296.171-.314 0-.615-.03-.916-.086.631 1.953 2.445 3.377 4.604 3.417-1.68 1.319-3.809 2.105-6.102 2.105-.39 0-.779-.023-1.17-.067 2.189 1.394 4.768 2.209 7.557 2.209 9.054 0 13.999-7.496 13.999-13.986 0-.209 0-.42-.015-.63.961-.689 1.8-1.56 2.46-2.548l-.047-.02z" style="fill: rgba(255, 255, 255, 0.5);"/>
+						</svg>
+					</a>
+				</li>
+				<?php endif ?>
+
+				<?php if ($site->facebook()): ?>
+				<li class="nav-item">
+					<a class="nav-link p-2" href="<?php echo $site->facebook() ?>" target="_blank" rel="noopener" aria-label="facebook">
+						<svg class="navbar-nav-svg" aria-labelledby="simpleicons-facebook-icon" role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+							<title id="simpleicons-facebook-icon">Facebook icon</title>
+							<path d="M22.676 0H1.324C.593 0 0 .593 0 1.324v21.352C0 23.408.593 24 1.324 24h11.494v-9.294H9.689v-3.621h3.129V8.41c0-3.099 1.894-4.785 4.659-4.785 1.325 0 2.464.097 2.796.141v3.24h-1.921c-1.5 0-1.792.721-1.792 1.771v2.311h3.584l-.465 3.63H16.56V24h6.115c.733 0 1.325-.592 1.325-1.324V1.324C24 .593 23.408 0 22.676 0" style="fill: rgba(255, 255, 255, 0.5);"/>
+						</svg>
+					</a>
+				</li>
+				<?php endif ?>
+
+				<?php if ($site->googleplus()): ?>
+				<li class="nav-item">
+					<a class="nav-link p-2" href="<?php echo $site->googleplus() ?>" target="_blank" rel="noopener" aria-label="googleplus">
+						<svg class="navbar-nav-svg" aria-labelledby="simpleicons-googleplus-icon" role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+							<title id="simpleicons-googleplus-icon">Google+ icon</title>
+							<path d="M7.635 10.909v2.619h4.335c-.173 1.125-1.31 3.295-4.331 3.295-2.604 0-4.731-2.16-4.731-4.823 0-2.662 2.122-4.822 4.728-4.822 1.485 0 2.479.633 3.045 1.178l2.073-1.994c-1.33-1.245-3.056-1.995-5.115-1.995C3.412 4.365 0 7.785 0 12s3.414 7.635 7.635 7.635c4.41 0 7.332-3.098 7.332-7.461 0-.501-.054-.885-.12-1.265H7.635zm16.365 0h-2.183V8.726h-2.183v2.183h-2.182v2.181h2.184v2.184h2.189V13.09H24" style="fill: rgba(255, 255, 255, 0.5);"/>
+						</svg>
+					</a>
+				</li>
+				<?php endif ?>
+
+				<?php if ($site->codepen()): ?>
+				<li class="nav-item">
+					<a class="nav-link p-2" href="<?php echo $site->codepen() ?>" target="_blank" rel="noopener" aria-label="codepen">
+						<svg class="navbar-nav-svg" aria-labelledby="simpleicons-codepen-icon" role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+							<title id="simpleicons-codepen-icon">CodePen icon</title>
+							<path d="M24 8.182l-.018-.087-.017-.05c-.01-.024-.018-.05-.03-.075-.003-.018-.015-.034-.02-.05l-.035-.067-.03-.05-.044-.06-.046-.045-.06-.045-.046-.03-.06-.044-.044-.04-.015-.02L12.58.19c-.347-.232-.796-.232-1.142 0L.453 7.502l-.015.015-.044.035-.06.05-.038.04-.05.056-.037.045-.05.06c-.02.017-.03.03-.03.046l-.05.06-.02.06c-.02.01-.02.04-.03.07l-.01.05C0 8.12 0 8.15 0 8.18v7.497c0 .044.003.09.01.135l.01.046c.005.03.01.06.02.086l.015.05c.01.027.016.053.027.075l.022.05c0 .01.015.04.03.06l.03.04c.015.01.03.04.045.06l.03.04.04.04c.01.013.01.03.03.03l.06.042.04.03.01.014 10.97 7.33c.164.12.375.163.57.163s.39-.06.57-.18l10.99-7.28.014-.01.046-.037.06-.043.048-.036.052-.058.033-.045.04-.06.03-.05.03-.07.016-.052.03-.077.015-.045.03-.08v-7.5c0-.05 0-.095-.016-.14l-.014-.045.044.003zm-11.99 6.28l-3.65-2.44 3.65-2.442 3.65 2.44-3.65 2.44zm-1.034-6.674l-4.473 2.99L2.89 8.362l8.086-5.39V7.79zm-6.33 4.233l-2.582 1.73V10.3l2.582 1.726zm1.857 1.25l4.473 2.99v4.82L2.89 15.69l3.618-2.417v-.004zm6.537 2.99l4.474-2.98 3.613 2.42-8.087 5.39v-4.82zm6.33-4.23l2.583-1.72v3.456l-2.583-1.73zm-1.855-1.24L13.042 7.8V2.97l8.085 5.39-3.612 2.415v.003z" style="fill: rgba(255, 255, 255, 0.5);"/>
+						</svg>
+					</a>
+				</li>
+				<?php endif ?>
+
+			</ul>
+		</div>
+	</div>
+</nav>

bl-themes/alternative/php/page.php

@@ -0,0 +1,34 @@
+<section class="page">
+	<div class="container">
+		<div class="row">
+			<div class="col-lg-8 mx-auto">
+				<!-- Load Bludit Plugins: Page Begin -->
+				<?php Theme::plugins('pageBegin'); ?>
+
+				<!-- Page title -->
+				<h1 class="page-title"><?php echo $page->title() ?></h1>
+
+				<!-- Page description
+				<?php if ($page->description()): ?>
+				<p class="page-description"><?php echo $page->description() ?></p>
+				<?php endif ?>
+				-->
+
+				<!-- Page cover image -->
+				<?php if ($page->coverImage()): ?>
+				<div class="page-cover-image py-6 mb-4" style="background-image: url('<?php echo $page->coverImage() ?>');">
+					<div style="height: 300px;"></div>
+				</div>
+				<?php endif ?>
+
+				<!-- Page content -->
+				<div class="page-content">
+				<?php echo $page->content() ?>
+				</div>
+
+				<!-- Load Bludit Plugins: Page End -->
+				<?php Theme::plugins('pageEnd'); ?>
+			</div>
+		</div>
+	</div>
+</section>

bl-themes/blogx/css/style.css

@@ -0,0 +1,61 @@
+html {
+	position: relative;
+	min-height: 100%;
+}
+
+body {
+	/* Padding top for navbar */
+	padding-top: 56px;
+	/* Margin bottom for footer height */
+	margin-bottom: 60px;
+}
+
+section {
+	padding: 150px 0;
+}
+
+img {
+	max-width: 100%;
+}
+
+/* Navbar */
+.navbar-nav-svg {
+	display: inline-block;
+	width: 1rem;
+	height: 1rem;
+	vertical-align: text-top;
+	color: rgba(255,255,255,.5);
+}
+
+.nav-link {
+	font-size: 0.8em;
+}
+
+/* Footer */
+footer {
+	position: absolute;
+	bottom: 0;
+	width: 100%;
+	height: 60px;
+	line-height: 60px;
+	font-size: 0.8em;
+}
+
+.mini-logo {
+	height: 22px;
+	padding-bottom: 5px;
+}
+
+/* Plugins */
+.plugin {
+	margin-top: 3rem;
+}
+.plugin-label {
+	font-size: 1em;
+	text-transform: uppercase;
+}
+
+.plugin ul {
+	list-style: none;
+	padding: 0 0 0 10px;
+}

bl-themes/blogx/img/codepen.svg

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg aria-labelledby="simpleicons-codepen-icon" role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+  <title id="simpleicons-codepen-icon">CodePen icon</title>
+  <path d="M24 8.182l-.018-.087-.017-.05c-.01-.024-.018-.05-.03-.075-.003-.018-.015-.034-.02-.05l-.035-.067-.03-.05-.044-.06-.046-.045-.06-.045-.046-.03-.06-.044-.044-.04-.015-.02L12.58.19c-.347-.232-.796-.232-1.142 0L.453 7.502l-.015.015-.044.035-.06.05-.038.04-.05.056-.037.045-.05.06c-.02.017-.03.03-.03.046l-.05.06-.02.06c-.02.01-.02.04-.03.07l-.01.05C0 8.12 0 8.15 0 8.18v7.497c0 .044.003.09.01.135l.01.046c.005.03.01.06.02.086l.015.05c.01.027.016.053.027.075l.022.05c0 .01.015.04.03.06l.03.04c.015.01.03.04.045.06l.03.04.04.04c.01.013.01.03.03.03l.06.042.04.03.01.014 10.97 7.33c.164.12.375.163.57.163s.39-.06.57-.18l10.99-7.28.014-.01.046-.037.06-.043.048-.036.052-.058.033-.045.04-.06.03-.05.03-.07.016-.052.03-.077.015-.045.03-.08v-7.5c0-.05 0-.095-.016-.14l-.014-.045.044.003zm-11.99 6.28l-3.65-2.44 3.65-2.442 3.65 2.44-3.65 2.44zm-1.034-6.674l-4.473 2.99L2.89 8.362l8.086-5.39V7.79zm-6.33 4.233l-2.582 1.73V10.3l2.582 1.726zm1.857 1.25l4.473 2.99v4.82L2.89 15.69l3.618-2.417v-.004zm6.537 2.99l4.474-2.98 3.613 2.42-8.087 5.39v-4.82zm6.33-4.23l2.583-1.72v3.456l-2.583-1.73zm-1.855-1.24L13.042 7.8V2.97l8.085 5.39-3.612 2.415v.003z" style="fill: rgba(255, 255, 255, 0.5);"/>
+</svg>

bl-themes/blogx/img/facebook.svg

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg aria-labelledby="simpleicons-facebook-icon" role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+  <title id="simpleicons-facebook-icon">Facebook icon</title>
+  <path d="M22.676 0H1.324C.593 0 0 .593 0 1.324v21.352C0 23.408.593 24 1.324 24h11.494v-9.294H9.689v-3.621h3.129V8.41c0-3.099 1.894-4.785 4.659-4.785 1.325 0 2.464.097 2.796.141v3.24h-1.921c-1.5 0-1.792.721-1.792 1.771v2.311h3.584l-.465 3.63H16.56V24h6.115c.733 0 1.325-.592 1.325-1.324V1.324C24 .593 23.408 0 22.676 0" style="fill: rgba(255, 255, 255, 0.5);"/>
+</svg>

bl-themes/blogx/img/github.svg

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg aria-labelledby="simpleicons-github-icon" role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+  <title id="simpleicons-github-icon">GitHub icon</title>
+  <path d="M12 .297c-6.63 0-12 5.373-12 12 0 5.303 3.438 9.8 8.205 11.385.6.113.82-.258.82-.577 0-.285-.01-1.04-.015-2.04-3.338.724-4.042-1.61-4.042-1.61C4.422 18.07 3.633 17.7 3.633 17.7c-1.087-.744.084-.729.084-.729 1.205.084 1.838 1.236 1.838 1.236 1.07 1.835 2.809 1.305 3.495.998.108-.776.417-1.305.76-1.605-2.665-.3-5.466-1.332-5.466-5.93 0-1.31.465-2.38 1.235-3.22-.135-.303-.54-1.523.105-3.176 0 0 1.005-.322 3.3 1.23.96-.267 1.98-.399 3-.405 1.02.006 2.04.138 3 .405 2.28-1.552 3.285-1.23 3.285-1.23.645 1.653.24 2.873.12 3.176.765.84 1.23 1.91 1.23 3.22 0 4.61-2.805 5.625-5.475 5.92.42.36.81 1.096.81 2.22 0 1.606-.015 2.896-.015 3.286 0 .315.21.69.825.57C20.565 22.092 24 17.592 24 12.297c0-6.627-5.373-12-12-12" style="fill: rgba(255, 255, 255, 0.5);"/>
+</svg>

bl-themes/blogx/img/googleplus.svg

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg aria-labelledby="simpleicons-googleplus-icon" role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+  <title id="simpleicons-googleplus-icon">Google+ icon</title>
+  <path d="M7.635 10.909v2.619h4.335c-.173 1.125-1.31 3.295-4.331 3.295-2.604 0-4.731-2.16-4.731-4.823 0-2.662 2.122-4.822 4.728-4.822 1.485 0 2.479.633 3.045 1.178l2.073-1.994c-1.33-1.245-3.056-1.995-5.115-1.995C3.412 4.365 0 7.785 0 12s3.414 7.635 7.635 7.635c4.41 0 7.332-3.098 7.332-7.461 0-.501-.054-.885-.12-1.265H7.635zm16.365 0h-2.183V8.726h-2.183v2.183h-2.182v2.181h2.184v2.184h2.189V13.09H24" style="fill: rgba(255, 255, 255, 0.5);"/>
+</svg>

bl-themes/blogx/img/twitter.svg

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg aria-labelledby="simpleicons-twitter-icon" role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+  <title id="simpleicons-twitter-icon">Twitter icon</title>
+  <path d="M23.954 4.569c-.885.389-1.83.654-2.825.775 1.014-.611 1.794-1.574 2.163-2.723-.951.555-2.005.959-3.127 1.184-.896-.959-2.173-1.559-3.591-1.559-2.717 0-4.92 2.203-4.92 4.917 0 .39.045.765.127 1.124C7.691 8.094 4.066 6.13 1.64 3.161c-.427.722-.666 1.561-.666 2.475 0 1.71.87 3.213 2.188 4.096-.807-.026-1.566-.248-2.228-.616v.061c0 2.385 1.693 4.374 3.946 4.827-.413.111-.849.171-1.296.171-.314 0-.615-.03-.916-.086.631 1.953 2.445 3.377 4.604 3.417-1.68 1.319-3.809 2.105-6.102 2.105-.39 0-.779-.023-1.17-.067 2.189 1.394 4.768 2.209 7.557 2.209 9.054 0 13.999-7.496 13.999-13.986 0-.209 0-.42-.015-.63.961-.689 1.8-1.56 2.46-2.548l-.047-.02z" style="fill: rgba(255, 255, 255, 0.5);"/>
+</svg>

bl-themes/blogx/index.php

@@ -0,0 +1,57 @@
+<!DOCTYPE html>
+<html>
+<head>
+<?php include(THEME_DIR_PHP.'head.php'); ?>
+</head>
+<body>
+
+	<!-- Load Bludit Plugins: Site Body Begin -->
+	<?php Theme::plugins('siteBodyBegin'); ?>
+
+	<!-- Navbar -->
+	<?php include(THEME_DIR_PHP.'navbar.php'); ?>
+
+	<!-- Content -->
+	<div class="container">
+		<div class="row">
+
+			<!-- Blog Posts -->
+			<div class="col-md-9">
+			<?php
+				// Bludit content are pages
+				// But if you order the content by date
+				// These pages works as posts
+
+				// $WHERE_AM_I variable detect where the user is browsing
+				// If the user is watching a particular page/post the variable takes the value "page"
+				// If the user is watching the frontpage the variable takes the value "home"
+				if ($WHERE_AM_I == 'page') {
+					include(THEME_DIR_PHP.'page.php');
+				} else {
+					include(THEME_DIR_PHP.'home.php');
+				}
+			?>
+			</div>
+
+			<!-- Right Sidebar -->
+			<div class="col-md-3">
+			<?php include(THEME_DIR_PHP.'sidebar.php'); ?>
+			</div>
+
+		</div>
+	</div>
+
+	<!-- Footer -->
+	<?php include(THEME_DIR_PHP.'footer.php'); ?>
+
+	<!-- Javascript -->
+	<?php
+		echo Theme::js('js/jquery.min.js');
+		echo Theme::js('js/bootstrap.min.js');
+	?>
+
+	<!-- Load Bludit Plugins: Site Body End -->
+	<?php Theme::plugins('siteBodyEnd'); ?>
+
+</body>
+</html>

bl-themes/blogx/languages/en.json

@@ -0,0 +1,7 @@
+{
+	"theme-data":
+	{
+		"name": "Blog X",
+		"description": ""
+	}
+}

bl-themes/blogx/metadata.json

@@ -0,0 +1,10 @@
+{
+	"author": "Bludit",
+	"email": "",
+	"website": "https://themes.bludit.com",
+	"version": "2.2",
+	"releaseDate": "2018-01-23",
+	"license": "MIT",
+	"compatible": "2.2",
+	"notes": ""
+}

bl-themes/blogx/php/footer.php

@@ -0,0 +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">Powered by<img class="mini-logo" src="<?php echo DOMAIN_THEME_IMG.'favicon.png'; ?>"/><a target="_blank" class="text-white" href="https://www.bludit.com">Bludit</a></span></p>
+	</div>
+</footer>

bl-themes/blogx/php/head.php

@@ -0,0 +1,21 @@
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+<meta name="author" content="Bludit CMS">
+
+<!-- Dynamic title tag -->
+<?php echo Theme::headTitle(); ?>
+
+<!-- Dynamic description tag -->
+<?php echo Theme::headDescription(); ?>
+
+<!-- Favicon -->
+<?php echo Theme::favicon('img/favicon.png'); ?>
+
+<!-- CSS: Bootstrap -->
+<?php echo Theme::css('css/bootstrap.min.css'); ?>
+
+<!-- CSS: Styles for this theme -->
+<?php echo Theme::css('css/style.css'); ?>
+
+<!-- Load Bludit Plugins: Site head -->
+<?php Theme::plugins('siteHead'); ?>

bl-themes/blogx/php/home.php

@@ -0,0 +1,59 @@
+<?php foreach ($content as $page): ?>
+
+<!-- Post -->
+<div class="card my-5 border-0">
+
+	<!-- Cover image -->
+	<?php if ($page->coverImage()): ?>
+	<img class="card-img-top mb-3 rounded-0" alt="Cover Image" src="<?php echo $page->coverImage(); ?>"/>
+	<?php endif ?>
+
+	<div class="card-body p-0">
+		<!-- Title -->
+		<a class="text-dark" href="<?php echo $page->permalink(); ?>">
+			<h2><?php echo $page->title(); ?></h2>
+		</a>
+
+		<!-- Creation date -->
+		<h6 class="card-subtitle mb-2 text-muted"><?php echo $page->date(); ?> - <?php echo $Language->get('Reading time') . ': ' . $page->readingTime(); ?></h6>
+
+		<!-- Breaked content -->
+		<?php echo $page->contentBreak(); ?>
+
+		<!-- "Read more" button -->
+		<?php if ($page->readMore()): ?>
+		<a href="<?php echo $page->permalink(); ?>">Read more</a>
+		<?php endif ?>
+	</div>
+
+</div>
+
+<hr>
+
+<?php endforeach ?>
+
+<!-- Pagination -->
+<?php if (Paginator::amountOfPages()>1): ?>
+<nav class="my-4" aria-label="Page navigation">
+	<ul class="pagination justify-content-center">
+
+		<!-- Previuos button -->
+		<li class="page-item <?php if (Paginator::showNext()) echo 'disabled' ?>">
+			<a class="page-link" href="<?php echo Paginator::prevPageUrl() ?>" tabindex="-1">Previous</a>
+		</li>
+
+		<!-- List of pages -->
+		<?php for ($i = 1; $i <= Paginator::amountOfPages(); $i++): ?>
+		<li class="page-item <?php if ($i==Paginator::currentPage()) echo 'active' ?>">
+			<a class="page-link" href="<?php echo Paginator::numberUrl($i) ?>"><?php echo $i ?></a>
+		</li>
+		<?php endfor ?>
+
+		<!-- Next button -->
+		<li class="page-item <?php if (Paginator::showPrev()) echo 'disabled' ?>">
+			<a class="page-link" href="<?php echo Paginator::nextPageUrl() ?>">Next</a>
+		</li>
+
+	</ul>
+</nav>
+<?php endif ?>

bl-themes/blogx/php/navbar.php

@@ -0,0 +1,78 @@
+<nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark text-uppercase">
+	<div class="container">
+		<a class="navbar-brand" href="<?php echo $site->url() ?>">
+			<span class="text-white"><?php echo $site->title() ?></span>
+		</a>
+		<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarResponsive" aria-controls="navbarResponsive" aria-expanded="false" aria-label="Toggle navigation">
+			<span class="navbar-toggler-icon"></span>
+		</button>
+		<div class="collapse navbar-collapse" id="navbarResponsive">
+			<ul class="navbar-nav ml-auto">
+
+				<!-- Static pages -->
+				<?php foreach ($staticContent as $staticPage): ?>
+				<li class="nav-item">
+					<a class="nav-link" href="<?php echo $staticPage->permalink() ?>"><?php echo $staticPage->title() ?></a>
+				</li>
+				<?php endforeach ?>
+
+				<!-- Social Networks -->
+				<?php if ($site->github()): ?>
+				<li class="nav-item">
+					<a class="nav-link" href="<?php echo $site->github() ?>" target="_blank" rel="noopener" aria-label="GitHub">
+						<svg class="navbar-nav-svg" aria-labelledby="simpleicons-github-icon" role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+							<title id="simpleicons-github-icon">GitHub icon</title>
+							<path d="M12 .297c-6.63 0-12 5.373-12 12 0 5.303 3.438 9.8 8.205 11.385.6.113.82-.258.82-.577 0-.285-.01-1.04-.015-2.04-3.338.724-4.042-1.61-4.042-1.61C4.422 18.07 3.633 17.7 3.633 17.7c-1.087-.744.084-.729.084-.729 1.205.084 1.838 1.236 1.838 1.236 1.07 1.835 2.809 1.305 3.495.998.108-.776.417-1.305.76-1.605-2.665-.3-5.466-1.332-5.466-5.93 0-1.31.465-2.38 1.235-3.22-.135-.303-.54-1.523.105-3.176 0 0 1.005-.322 3.3 1.23.96-.267 1.98-.399 3-.405 1.02.006 2.04.138 3 .405 2.28-1.552 3.285-1.23 3.285-1.23.645 1.653.24 2.873.12 3.176.765.84 1.23 1.91 1.23 3.22 0 4.61-2.805 5.625-5.475 5.92.42.36.81 1.096.81 2.22 0 1.606-.015 2.896-.015 3.286 0 .315.21.69.825.57C20.565 22.092 24 17.592 24 12.297c0-6.627-5.373-12-12-12" style="fill: rgba(255, 255, 255, 0.5);"/>
+						</svg>
+					</a>
+				</li>
+				<?php endif ?>
+
+				<?php if ($site->twitter()): ?>
+				<li class="nav-item">
+					<a class="nav-link" href="<?php echo $site->twitter() ?>" target="_blank" rel="noopener" aria-label="twitter">
+						<svg class="navbar-nav-svg" aria-labelledby="simpleicons-twitter-icon" role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+							<title id="simpleicons-twitter-icon">Twitter icon</title>
+							<path d="M23.954 4.569c-.885.389-1.83.654-2.825.775 1.014-.611 1.794-1.574 2.163-2.723-.951.555-2.005.959-3.127 1.184-.896-.959-2.173-1.559-3.591-1.559-2.717 0-4.92 2.203-4.92 4.917 0 .39.045.765.127 1.124C7.691 8.094 4.066 6.13 1.64 3.161c-.427.722-.666 1.561-.666 2.475 0 1.71.87 3.213 2.188 4.096-.807-.026-1.566-.248-2.228-.616v.061c0 2.385 1.693 4.374 3.946 4.827-.413.111-.849.171-1.296.171-.314 0-.615-.03-.916-.086.631 1.953 2.445 3.377 4.604 3.417-1.68 1.319-3.809 2.105-6.102 2.105-.39 0-.779-.023-1.17-.067 2.189 1.394 4.768 2.209 7.557 2.209 9.054 0 13.999-7.496 13.999-13.986 0-.209 0-.42-.015-.63.961-.689 1.8-1.56 2.46-2.548l-.047-.02z" style="fill: rgba(255, 255, 255, 0.5);"/>
+						</svg>
+					</a>
+				</li>
+				<?php endif ?>
+
+				<?php if ($site->facebook()): ?>
+				<li class="nav-item">
+					<a class="nav-link" href="<?php echo $site->facebook() ?>" target="_blank" rel="noopener" aria-label="facebook">
+						<svg class="navbar-nav-svg" aria-labelledby="simpleicons-facebook-icon" role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+							<title id="simpleicons-facebook-icon">Facebook icon</title>
+							<path d="M22.676 0H1.324C.593 0 0 .593 0 1.324v21.352C0 23.408.593 24 1.324 24h11.494v-9.294H9.689v-3.621h3.129V8.41c0-3.099 1.894-4.785 4.659-4.785 1.325 0 2.464.097 2.796.141v3.24h-1.921c-1.5 0-1.792.721-1.792 1.771v2.311h3.584l-.465 3.63H16.56V24h6.115c.733 0 1.325-.592 1.325-1.324V1.324C24 .593 23.408 0 22.676 0" style="fill: rgba(255, 255, 255, 0.5);"/>
+						</svg>
+					</a>
+				</li>
+				<?php endif ?>
+
+				<?php if ($site->googleplus()): ?>
+				<li class="nav-item">
+					<a class="nav-link" href="<?php echo $site->googleplus() ?>" target="_blank" rel="noopener" aria-label="googleplus">
+						<svg class="navbar-nav-svg" aria-labelledby="simpleicons-googleplus-icon" role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+							<title id="simpleicons-googleplus-icon">Google+ icon</title>
+							<path d="M7.635 10.909v2.619h4.335c-.173 1.125-1.31 3.295-4.331 3.295-2.604 0-4.731-2.16-4.731-4.823 0-2.662 2.122-4.822 4.728-4.822 1.485 0 2.479.633 3.045 1.178l2.073-1.994c-1.33-1.245-3.056-1.995-5.115-1.995C3.412 4.365 0 7.785 0 12s3.414 7.635 7.635 7.635c4.41 0 7.332-3.098 7.332-7.461 0-.501-.054-.885-.12-1.265H7.635zm16.365 0h-2.183V8.726h-2.183v2.183h-2.182v2.181h2.184v2.184h2.189V13.09H24" style="fill: rgba(255, 255, 255, 0.5);"/>
+						</svg>
+					</a>
+				</li>
+				<?php endif ?>
+
+				<?php if ($site->codepen()): ?>
+				<li class="nav-item">
+					<a class="nav-link" href="<?php echo $site->codepen() ?>" target="_blank" rel="noopener" aria-label="codepen">
+						<svg class="navbar-nav-svg" aria-labelledby="simpleicons-codepen-icon" role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+							<title id="simpleicons-codepen-icon">CodePen icon</title>
+							<path d="M24 8.182l-.018-.087-.017-.05c-.01-.024-.018-.05-.03-.075-.003-.018-.015-.034-.02-.05l-.035-.067-.03-.05-.044-.06-.046-.045-.06-.045-.046-.03-.06-.044-.044-.04-.015-.02L12.58.19c-.347-.232-.796-.232-1.142 0L.453 7.502l-.015.015-.044.035-.06.05-.038.04-.05.056-.037.045-.05.06c-.02.017-.03.03-.03.046l-.05.06-.02.06c-.02.01-.02.04-.03.07l-.01.05C0 8.12 0 8.15 0 8.18v7.497c0 .044.003.09.01.135l.01.046c.005.03.01.06.02.086l.015.05c.01.027.016.053.027.075l.022.05c0 .01.015.04.03.06l.03.04c.015.01.03.04.045.06l.03.04.04.04c.01.013.01.03.03.03l.06.042.04.03.01.014 10.97 7.33c.164.12.375.163.57.163s.39-.06.57-.18l10.99-7.28.014-.01.046-.037.06-.043.048-.036.052-.058.033-.045.04-.06.03-.05.03-.07.016-.052.03-.077.015-.045.03-.08v-7.5c0-.05 0-.095-.016-.14l-.014-.045.044.003zm-11.99 6.28l-3.65-2.44 3.65-2.442 3.65 2.44-3.65 2.44zm-1.034-6.674l-4.473 2.99L2.89 8.362l8.086-5.39V7.79zm-6.33 4.233l-2.582 1.73V10.3l2.582 1.726zm1.857 1.25l4.473 2.99v4.82L2.89 15.69l3.618-2.417v-.004zm6.537 2.99l4.474-2.98 3.613 2.42-8.087 5.39v-4.82zm6.33-4.23l2.583-1.72v3.456l-2.583-1.73zm-1.855-1.24L13.042 7.8V2.97l8.085 5.39-3.612 2.415v.003z" style="fill: rgba(255, 255, 255, 0.5);"/>
+						</svg>
+					</a>
+				</li>
+				<?php endif ?>
+
+			</ul>
+		</div>
+	</div>
+</nav>

bl-themes/blogx/php/page.php

@@ -0,0 +1,24 @@
+<!-- Post -->
+<div class="card my-5 border-0">
+
+	<!-- Cover image -->
+	<?php if ($page->coverImage()): ?>
+	<img class="card-img-top mb-3 rounded-0" alt="Cover Image" src="<?php echo $page->coverImage(); ?>"/>
+	<?php endif ?>
+
+	<div class="card-body p-0">
+		<!-- Title -->
+		<a class="text-dark" href="<?php echo $page->permalink(); ?>">
+			<h2><?php echo $page->title(); ?></h2>
+		</a>
+
+		<?php if (!$page->static()): ?>
+		<!-- Creation date -->
+		<h6 class="card-subtitle mb-2 text-muted"><?php echo $page->date(); ?> - <?php echo $Language->get('Reading time') . ': ' . $page->readingTime() ?></h6>
+		<?php endif ?>
+
+		<!-- Full content -->
+		<?php echo $page->content(); ?>
+	</div>
+
+</div>

bl-themes/blogx/php/sidebar.php

@@ -0,0 +1 @@
+<?php Theme::plugins('siteSidebar') ?>

bl-themes/docsx/css/highlight.github.min.css

@@ -0,0 +1 @@
+.hljs{display:block;overflow-x:auto;padding:0.5em;color:#333;background:#f8f8f8}.hljs-comment,.hljs-quote{color:#998;font-style:italic}.hljs-keyword,.hljs-selector-tag,.hljs-subst{color:#333;font-weight:bold}.hljs-number,.hljs-literal,.hljs-variable,.hljs-template-variable,.hljs-tag .hljs-attr{color:#008080}.hljs-string,.hljs-doctag{color:#d14}.hljs-title,.hljs-section,.hljs-selector-id{color:#900;font-weight:bold}.hljs-subst{font-weight:normal}.hljs-type,.hljs-class .hljs-title{color:#458;font-weight:bold}.hljs-tag,.hljs-name,.hljs-attribute{color:#000080;font-weight:normal}.hljs-regexp,.hljs-link{color:#009926}.hljs-symbol,.hljs-bullet{color:#990073}.hljs-built_in,.hljs-builtin-name{color:#0086b3}.hljs-meta{color:#999;font-weight:bold}.hljs-deletion{background:#fdd}.hljs-addition{background:#dfd}.hljs-emphasis{font-style:italic}.hljs-strong{font-weight:bold}

bl-themes/docsx/css/style.css

@@ -0,0 +1,169 @@
+body {
+	font-family: 'Open Sans', 'Helvetica Neue', Helvetica, sans-serif;
+}
+
+img {
+	max-width: 100%;
+}
+
+a {
+	color: #005ec3;
+}
+
+/* Navbar */
+.navbar-nav-svg {
+	display: inline-block;
+	width: 20px;
+	height: 20px;
+	vertical-align: text-top;
+	color: rgba(255,255,255,.5);
+}
+
+/* Toc */
+#toc {
+    float: right;
+    width: 40%;
+    margin: 0 0 0.5em 0.5em;
+    padding: 1em;
+    background-color: #f5f5f5;
+    display: none;
+}
+
+#toc ul {
+	list-style-type: none;
+	padding: 0;
+	margin: 0;
+}
+
+/* Main */
+.main {
+	margin-top: 30px;
+}
+
+.main h1.title {
+	font-size: 1.7em;
+	border-bottom: 1px solid #ddd;
+	margin-bottom: 15px;
+	padding-bottom: 8px;
+}
+
+.main h1,
+.main h2,
+.main h3,
+.main h4 {
+	margin-top: 20px;
+	margin-bottom: 15px;
+	color: #e6522c;
+}
+
+.main h2 {
+	font-size: 1.5em;
+}
+
+.main h3 {
+	font-size: 1.3em;
+}
+
+.main h4 {
+	font-size: 1.2em;
+}
+
+.main p {
+	margin: 15px 0 15px 0;
+	line-height: 1.5;
+}
+
+.main div.note {
+	margin: 20px 0;
+	padding: 20px;
+	background: #fafafa;
+	font-size: 0.9em;
+}
+
+.main div.note div.title {
+	color: #e6522c;
+	text-transform: uppercase;
+}
+
+pre, pre code {
+    	font-size: 14px !important;
+}
+pre, code {
+    	font-family: "Courier New", "Liberation Mono",Courier,monospace;
+}
+pre {
+	background: #f8f8f8 none repeat scroll 0 0;
+	border: 1px solid #e7e9ee;
+	color: #4d4d4c;
+	line-height: 21px;
+	margin-bottom: 20px;
+	overflow-wrap: break-word;
+	padding: 10px 10px;
+}
+pre, code {
+	white-space: pre-wrap;
+}
+code, kbd, pre, samp {
+	font-family: monospace,monospace;
+	font-size: 1em;
+}
+pre {
+	overflow: auto;
+}
+code {
+	background: #f8f8f8;
+	padding: 4px;
+	font-size: 14px !important;
+}
+
+table {
+    empty-cells: show;
+    border: 1px solid #cbcbcb;
+    width: 100%;
+    font-size: 0.9em;
+}
+
+thead {
+    background-color: #e0e0e0;
+    color: #000;
+    text-align: left;
+    vertical-align: bottom;
+}
+
+tr {
+    display: table-row;
+    vertical-align: inherit;
+    border-color: inherit;
+}
+
+th, td {
+	padding: 0.5em 1em;
+    }
+
+/* Footer */
+footer {
+	border-top: 1px solid #ccc;
+	padding: 10px;
+	margin: 10px 0;
+	font-size: 0.8em;
+}
+
+/* Sidebar */
+.sidebar {
+	margin-top: 30px;
+	padding: 5px 20px 20px 7px;
+	font-size: .875rem;
+}
+
+.sidebar ul.nav {
+	margin-bottom: 20px;
+}
+
+.sidebar li.nav-item {
+	border-left: 1px solid #fafafa;
+}
+
+.sidebar li.nav-item-active {
+	border-left: 3px solid #ddd;
+}
+/* Navbar */

bl-themes/docsx/img/codepen.svg

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg aria-labelledby="simpleicons-codepen-icon" role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+  <title id="simpleicons-codepen-icon">CodePen icon</title>
+  <path d="M24 8.182l-.018-.087-.017-.05c-.01-.024-.018-.05-.03-.075-.003-.018-.015-.034-.02-.05l-.035-.067-.03-.05-.044-.06-.046-.045-.06-.045-.046-.03-.06-.044-.044-.04-.015-.02L12.58.19c-.347-.232-.796-.232-1.142 0L.453 7.502l-.015.015-.044.035-.06.05-.038.04-.05.056-.037.045-.05.06c-.02.017-.03.03-.03.046l-.05.06-.02.06c-.02.01-.02.04-.03.07l-.01.05C0 8.12 0 8.15 0 8.18v7.497c0 .044.003.09.01.135l.01.046c.005.03.01.06.02.086l.015.05c.01.027.016.053.027.075l.022.05c0 .01.015.04.03.06l.03.04c.015.01.03.04.045.06l.03.04.04.04c.01.013.01.03.03.03l.06.042.04.03.01.014 10.97 7.33c.164.12.375.163.57.163s.39-.06.57-.18l10.99-7.28.014-.01.046-.037.06-.043.048-.036.052-.058.033-.045.04-.06.03-.05.03-.07.016-.052.03-.077.015-.045.03-.08v-7.5c0-.05 0-.095-.016-.14l-.014-.045.044.003zm-11.99 6.28l-3.65-2.44 3.65-2.442 3.65 2.44-3.65 2.44zm-1.034-6.674l-4.473 2.99L2.89 8.362l8.086-5.39V7.79zm-6.33 4.233l-2.582 1.73V10.3l2.582 1.726zm1.857 1.25l4.473 2.99v4.82L2.89 15.69l3.618-2.417v-.004zm6.537 2.99l4.474-2.98 3.613 2.42-8.087 5.39v-4.82zm6.33-4.23l2.583-1.72v3.456l-2.583-1.73zm-1.855-1.24L13.042 7.8V2.97l8.085 5.39-3.612 2.415v.003z" style="fill: rgba(255, 255, 255, 0.5);"/>
+</svg>

bl-themes/docsx/img/facebook.svg

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg aria-labelledby="simpleicons-facebook-icon" role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+  <title id="simpleicons-facebook-icon">Facebook icon</title>
+  <path d="M22.676 0H1.324C.593 0 0 .593 0 1.324v21.352C0 23.408.593 24 1.324 24h11.494v-9.294H9.689v-3.621h3.129V8.41c0-3.099 1.894-4.785 4.659-4.785 1.325 0 2.464.097 2.796.141v3.24h-1.921c-1.5 0-1.792.721-1.792 1.771v2.311h3.584l-.465 3.63H16.56V24h6.115c.733 0 1.325-.592 1.325-1.324V1.324C24 .593 23.408 0 22.676 0" style="fill: rgba(255, 255, 255, 0.5);"/>
+</svg>

bl-themes/docsx/img/github.svg

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg aria-labelledby="simpleicons-github-icon" role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+  <title id="simpleicons-github-icon">GitHub icon</title>
+  <path d="M12 .297c-6.63 0-12 5.373-12 12 0 5.303 3.438 9.8 8.205 11.385.6.113.82-.258.82-.577 0-.285-.01-1.04-.015-2.04-3.338.724-4.042-1.61-4.042-1.61C4.422 18.07 3.633 17.7 3.633 17.7c-1.087-.744.084-.729.084-.729 1.205.084 1.838 1.236 1.838 1.236 1.07 1.835 2.809 1.305 3.495.998.108-.776.417-1.305.76-1.605-2.665-.3-5.466-1.332-5.466-5.93 0-1.31.465-2.38 1.235-3.22-.135-.303-.54-1.523.105-3.176 0 0 1.005-.322 3.3 1.23.96-.267 1.98-.399 3-.405 1.02.006 2.04.138 3 .405 2.28-1.552 3.285-1.23 3.285-1.23.645 1.653.24 2.873.12 3.176.765.84 1.23 1.91 1.23 3.22 0 4.61-2.805 5.625-5.475 5.92.42.36.81 1.096.81 2.22 0 1.606-.015 2.896-.015 3.286 0 .315.21.69.825.57C20.565 22.092 24 17.592 24 12.297c0-6.627-5.373-12-12-12" style="fill: rgba(255, 255, 255, 0.5);"/>
+</svg>

bl-themes/docsx/img/googleplus.svg

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg aria-labelledby="simpleicons-googleplus-icon" role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+  <title id="simpleicons-googleplus-icon">Google+ icon</title>
+  <path d="M7.635 10.909v2.619h4.335c-.173 1.125-1.31 3.295-4.331 3.295-2.604 0-4.731-2.16-4.731-4.823 0-2.662 2.122-4.822 4.728-4.822 1.485 0 2.479.633 3.045 1.178l2.073-1.994c-1.33-1.245-3.056-1.995-5.115-1.995C3.412 4.365 0 7.785 0 12s3.414 7.635 7.635 7.635c4.41 0 7.332-3.098 7.332-7.461 0-.501-.054-.885-.12-1.265H7.635zm16.365 0h-2.183V8.726h-2.183v2.183h-2.182v2.181h2.184v2.184h2.189V13.09H24" style="fill: rgba(255, 255, 255, 0.5);"/>
+</svg>

bl-themes/docsx/img/twitter.svg

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg aria-labelledby="simpleicons-twitter-icon" role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+  <title id="simpleicons-twitter-icon">Twitter icon</title>
+  <path d="M23.954 4.569c-.885.389-1.83.654-2.825.775 1.014-.611 1.794-1.574 2.163-2.723-.951.555-2.005.959-3.127 1.184-.896-.959-2.173-1.559-3.591-1.559-2.717 0-4.92 2.203-4.92 4.917 0 .39.045.765.127 1.124C7.691 8.094 4.066 6.13 1.64 3.161c-.427.722-.666 1.561-.666 2.475 0 1.71.87 3.213 2.188 4.096-.807-.026-1.566-.248-2.228-.616v.061c0 2.385 1.693 4.374 3.946 4.827-.413.111-.849.171-1.296.171-.314 0-.615-.03-.916-.086.631 1.953 2.445 3.377 4.604 3.417-1.68 1.319-3.809 2.105-6.102 2.105-.39 0-.779-.023-1.17-.067 2.189 1.394 4.768 2.209 7.557 2.209 9.054 0 13.999-7.496 13.999-13.986 0-.209 0-.42-.015-.63.961-.689 1.8-1.56 2.46-2.548l-.047-.02z" style="fill: rgba(255, 255, 255, 0.5);"/>
+</svg>

bl-themes/docsx/index.php

@@ -0,0 +1,73 @@
+<!DOCTYPE html>
+<html>
+<head>
+<?php include(THEME_DIR_PHP.'head.php'); ?>
+</head>
+<body>
+
+	<!-- Load Bludit Plugins: Site Body Begin -->
+	<?php Theme::plugins('siteBodyBegin'); ?>
+
+	<!-- Navbar -->
+	<div>
+	<?php include(THEME_DIR_PHP.'navbar.php'); ?>
+	</div>
+
+	<!-- Content -->
+	<div class="container">
+		<div class="row">
+			<div class="col-md-3 side-nav-col">
+			<?php
+				include(THEME_DIR_PHP.'sidebar.php');
+			?>
+			</div>
+
+			<div class="col-md-9 doc-content">
+				<div class="main">
+				<?php
+					include(THEME_DIR_PHP.'page.php');
+				?>
+				</div>
+			</div>
+		</div>
+
+		<footer>
+			<p class="m-0 text-right text-black text-uppercase"><?php echo $site->footer(); ?><span class="ml-3 text-warning">Powered by <a target="_blank" class="text-warning" href="https://www.bludit.com">Bludit</a></span></p>
+		</footer>
+	</div>
+
+	<!-- Javascript -->
+	<?php
+		echo Theme::js('js/jquery.min.js');
+		echo Theme::js('js/bootstrap.min.js');
+		echo Theme::js('js/highlight.min.js');
+	?>
+
+	<!-- Init Highlight -->
+	<script>
+		hljs.initHighlighting();
+	</script>
+
+	<!-- TOC generator -->
+	<script>
+		$(document).ready(function() {
+			var enableToc = false;
+			if ($('#page-content > h2').length > 1) {
+				$('#page-content > h2').each(function() {
+					if ($(this).attr('id')) {
+						enableToc = true;
+						$('#toc-content').append('<li><a href="#' + $(this).attr('id') + '">' + $(this).text() + '</a></li>');
+					}
+				});
+			}
+			if (enableToc) {
+				$('#toc').show();
+			}
+		});
+	</script>
+
+	<!-- Load Bludit Plugins: Site Body End -->
+	<?php Theme::plugins('siteBodyEnd'); ?>
+
+</body>
+</html>

bl-themes/docsx/init.php

@@ -0,0 +1,23 @@
+<?php
+$GITHUB_BASE_URL = '__GITHUB_BASE_URL__';
+
+$REDIRECT_PARENT_TO_FIRST_CHILD = true;
+
+if (!$Site->homepage()) {
+        echo 'This theme need a home page defined, please select one page on <b>Admin panel->Settings->Advanced->Home page</b>';
+        exit;
+}
+
+if ($REDIRECT_PARENT_TO_FIRST_CHILD) {
+	if (!empty($page)) {
+		if ($page->isParent() && $page->hasChildren()) {
+			$children = $page->children();
+			if (!empty($children[0])) {
+				$firstChild = $children[0];
+			
+				header('Location: '.$firstChild->permalink(), true, 302);
+				exit;
+			}
+		}
+	}
+}

bl-themes/docsx/languages/en.json

@@ -0,0 +1,8 @@
+{
+	"theme-data":
+	{
+		"name": "Docs X",
+		"description": ""
+	},
+	"collaborate-with-us-and-edit-this-page": "Collaborate with us and edit this page"
+}

bl-themes/docsx/metadata.json

@@ -0,0 +1,10 @@
+{
+	"author": "Bludit",
+	"email": "",
+	"website": "https://themes.bludit.com",
+	"version": "2.2",
+	"releaseDate": "2018-01-23",
+	"license": "MIT",
+	"compatible": "2.2",
+	"notes": ""
+}

bl-themes/docsx/php/head.php

@@ -0,0 +1,27 @@
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+<meta name="author" content="Bludit CMS">
+
+<!-- Dynamic title tag -->
+<?php echo Theme::headTitle(); ?>
+
+<!-- Dynamic description tag -->
+<?php echo Theme::headDescription(); ?>
+
+<!-- Favicon -->
+<?php echo Theme::favicon('img/favicon.png'); ?>
+
+<!-- CSS: Bootstrap -->
+<?php echo Theme::css('css/bootstrap.min.css'); ?>
+
+<!-- CSS: Styles for this theme -->
+<?php echo Theme::css('css/style.css'); ?>
+
+<!-- CSS: Highlight -->
+<?php echo Theme::css('css/highlight.github.min.css'); ?>
+
+<!-- Google Fonts -->
+<link href='//fonts.googleapis.com/css?family=Open+Sans' rel='stylesheet' type='text/css'>
+
+<!-- Load Bludit Plugins: Site head -->
+<?php Theme::plugins('siteHead'); ?>

bl-themes/docsx/php/navbar.php

@@ -0,0 +1,78 @@
+<nav class="navbar navbar-expand-md navbar-dark bg-dark text-uppercase">
+	<div class="container">
+		<a class="navbar-brand" href="<?php echo $site->url() ?>">
+			<span class="text-white"><?php echo $site->title() ?></span>
+		</a>
+		<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarResponsive" aria-controls="navbarResponsive" aria-expanded="false" aria-label="Toggle navigation">
+			<span class="navbar-toggler-icon"></span>
+		</button>
+		<div class="collapse navbar-collapse" id="navbarResponsive">
+			<ul class="navbar-nav ml-auto">
+
+				<!-- Static pages -->
+				<?php foreach ($staticContent as $staticPage): ?>
+				<li class="nav-item">
+					<a class="nav-link" href="<?php echo $staticPage->permalink() ?>"><?php echo $staticPage->title() ?></a>
+				</li>
+				<?php endforeach ?>
+
+				<!-- Social Networks -->
+				<?php if ($site->github()): ?>
+				<li class="nav-item">
+					<a class="nav-link" href="<?php echo $site->github() ?>" target="_blank" rel="noopener" aria-label="GitHub">
+						<svg class="navbar-nav-svg" aria-labelledby="simpleicons-github-icon" role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+							<title id="simpleicons-github-icon">GitHub icon</title>
+							<path d="M12 .297c-6.63 0-12 5.373-12 12 0 5.303 3.438 9.8 8.205 11.385.6.113.82-.258.82-.577 0-.285-.01-1.04-.015-2.04-3.338.724-4.042-1.61-4.042-1.61C4.422 18.07 3.633 17.7 3.633 17.7c-1.087-.744.084-.729.084-.729 1.205.084 1.838 1.236 1.838 1.236 1.07 1.835 2.809 1.305 3.495.998.108-.776.417-1.305.76-1.605-2.665-.3-5.466-1.332-5.466-5.93 0-1.31.465-2.38 1.235-3.22-.135-.303-.54-1.523.105-3.176 0 0 1.005-.322 3.3 1.23.96-.267 1.98-.399 3-.405 1.02.006 2.04.138 3 .405 2.28-1.552 3.285-1.23 3.285-1.23.645 1.653.24 2.873.12 3.176.765.84 1.23 1.91 1.23 3.22 0 4.61-2.805 5.625-5.475 5.92.42.36.81 1.096.81 2.22 0 1.606-.015 2.896-.015 3.286 0 .315.21.69.825.57C20.565 22.092 24 17.592 24 12.297c0-6.627-5.373-12-12-12" style="fill: rgba(255, 255, 255, 0.5);"/>
+						</svg>
+					</a>
+				</li>
+				<?php endif ?>
+
+				<?php if ($site->twitter()): ?>
+				<li class="nav-item">
+					<a class="nav-link" href="<?php echo $site->twitter() ?>" target="_blank" rel="noopener" aria-label="twitter">
+						<svg class="navbar-nav-svg" aria-labelledby="simpleicons-twitter-icon" role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+							<title id="simpleicons-twitter-icon">Twitter icon</title>
+							<path d="M23.954 4.569c-.885.389-1.83.654-2.825.775 1.014-.611 1.794-1.574 2.163-2.723-.951.555-2.005.959-3.127 1.184-.896-.959-2.173-1.559-3.591-1.559-2.717 0-4.92 2.203-4.92 4.917 0 .39.045.765.127 1.124C7.691 8.094 4.066 6.13 1.64 3.161c-.427.722-.666 1.561-.666 2.475 0 1.71.87 3.213 2.188 4.096-.807-.026-1.566-.248-2.228-.616v.061c0 2.385 1.693 4.374 3.946 4.827-.413.111-.849.171-1.296.171-.314 0-.615-.03-.916-.086.631 1.953 2.445 3.377 4.604 3.417-1.68 1.319-3.809 2.105-6.102 2.105-.39 0-.779-.023-1.17-.067 2.189 1.394 4.768 2.209 7.557 2.209 9.054 0 13.999-7.496 13.999-13.986 0-.209 0-.42-.015-.63.961-.689 1.8-1.56 2.46-2.548l-.047-.02z" style="fill: rgba(255, 255, 255, 0.5);"/>
+						</svg>
+					</a>
+				</li>
+				<?php endif ?>
+
+				<?php if ($site->facebook()): ?>
+				<li class="nav-item">
+					<a class="nav-link" href="<?php echo $site->facebook() ?>" target="_blank" rel="noopener" aria-label="facebook">
+						<svg class="navbar-nav-svg" aria-labelledby="simpleicons-facebook-icon" role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+							<title id="simpleicons-facebook-icon">Facebook icon</title>
+							<path d="M22.676 0H1.324C.593 0 0 .593 0 1.324v21.352C0 23.408.593 24 1.324 24h11.494v-9.294H9.689v-3.621h3.129V8.41c0-3.099 1.894-4.785 4.659-4.785 1.325 0 2.464.097 2.796.141v3.24h-1.921c-1.5 0-1.792.721-1.792 1.771v2.311h3.584l-.465 3.63H16.56V24h6.115c.733 0 1.325-.592 1.325-1.324V1.324C24 .593 23.408 0 22.676 0" style="fill: rgba(255, 255, 255, 0.5);"/>
+						</svg>
+					</a>
+				</li>
+				<?php endif ?>
+
+				<?php if ($site->googleplus()): ?>
+				<li class="nav-item">
+					<a class="nav-link" href="<?php echo $site->googleplus() ?>" target="_blank" rel="noopener" aria-label="googleplus">
+						<svg class="navbar-nav-svg" aria-labelledby="simpleicons-googleplus-icon" role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+							<title id="simpleicons-googleplus-icon">Google+ icon</title>
+							<path d="M7.635 10.909v2.619h4.335c-.173 1.125-1.31 3.295-4.331 3.295-2.604 0-4.731-2.16-4.731-4.823 0-2.662 2.122-4.822 4.728-4.822 1.485 0 2.479.633 3.045 1.178l2.073-1.994c-1.33-1.245-3.056-1.995-5.115-1.995C3.412 4.365 0 7.785 0 12s3.414 7.635 7.635 7.635c4.41 0 7.332-3.098 7.332-7.461 0-.501-.054-.885-.12-1.265H7.635zm16.365 0h-2.183V8.726h-2.183v2.183h-2.182v2.181h2.184v2.184h2.189V13.09H24" style="fill: rgba(255, 255, 255, 0.5);"/>
+						</svg>
+					</a>
+				</li>
+				<?php endif ?>
+
+				<?php if ($site->codepen()): ?>
+				<li class="nav-item">
+					<a class="nav-link" href="<?php echo $site->codepen() ?>" target="_blank" rel="noopener" aria-label="codepen">
+						<svg class="navbar-nav-svg" aria-labelledby="simpleicons-codepen-icon" role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+							<title id="simpleicons-codepen-icon">CodePen icon</title>
+							<path d="M24 8.182l-.018-.087-.017-.05c-.01-.024-.018-.05-.03-.075-.003-.018-.015-.034-.02-.05l-.035-.067-.03-.05-.044-.06-.046-.045-.06-.045-.046-.03-.06-.044-.044-.04-.015-.02L12.58.19c-.347-.232-.796-.232-1.142 0L.453 7.502l-.015.015-.044.035-.06.05-.038.04-.05.056-.037.045-.05.06c-.02.017-.03.03-.03.046l-.05.06-.02.06c-.02.01-.02.04-.03.07l-.01.05C0 8.12 0 8.15 0 8.18v7.497c0 .044.003.09.01.135l.01.046c.005.03.01.06.02.086l.015.05c.01.027.016.053.027.075l.022.05c0 .01.015.04.03.06l.03.04c.015.01.03.04.045.06l.03.04.04.04c.01.013.01.03.03.03l.06.042.04.03.01.014 10.97 7.33c.164.12.375.163.57.163s.39-.06.57-.18l10.99-7.28.014-.01.046-.037.06-.043.048-.036.052-.058.033-.045.04-.06.03-.05.03-.07.016-.052.03-.077.015-.045.03-.08v-7.5c0-.05 0-.095-.016-.14l-.014-.045.044.003zm-11.99 6.28l-3.65-2.44 3.65-2.442 3.65 2.44-3.65 2.44zm-1.034-6.674l-4.473 2.99L2.89 8.362l8.086-5.39V7.79zm-6.33 4.233l-2.582 1.73V10.3l2.582 1.726zm1.857 1.25l4.473 2.99v4.82L2.89 15.69l3.618-2.417v-.004zm6.537 2.99l4.474-2.98 3.613 2.42-8.087 5.39v-4.82zm6.33-4.23l2.583-1.72v3.456l-2.583-1.73zm-1.855-1.24L13.042 7.8V2.97l8.085 5.39-3.612 2.415v.003z" style="fill: rgba(255, 255, 255, 0.5);"/>
+						</svg>
+					</a>
+				</li>
+				<?php endif ?>
+
+			</ul>
+		</div>
+	</div>
+</nav>

bl-themes/docsx/php/page.php

@@ -0,0 +1,13 @@
+<h1 class="title text-uppercase"><?php echo $page->title(); ?></h1>
+<div id="toc">
+	<ul id="toc-content"></ul>
+</div>
+<div id="page-content">
+<?php echo $page->content(); ?>
+</div>
+
+<?php if (!$Url->notFound()): ?>
+<div class="text-right mt-5">
+	<a class="btn btn-primary" href="<?php echo $GITHUB_BASE_URL.$page->key().'/'.FILENAME ?>"><?php echo $Language->get('Collaborate with us and edit this page'); ?></a>
+</div>
+<?php endif ?>

bl-themes/docsx/php/sidebar.php

@@ -0,0 +1,28 @@
+<nav class="sidebar">
+<?php
+	// Get all parent pages
+	$parents = buildParentPages();
+	foreach ($parents as $parent) {
+		// Print the parent page title
+		echo '<h6 class="text-uppercase">'.$parent->title().'</h6>';
+
+		// Check if the parent page has children
+		if ($parent->hasChildren()) {
+			// Get the list of children
+			$children = $parent->children();
+
+			echo '<ul class="nav flex-column">';
+			foreach ($children as $child) {
+				if ($child->key()==$url->slug()) {
+					echo '<li class="nav-item-active">';
+				} else {
+					echo '<li class="nav-item">';
+				}
+				echo '<a class="nav-link" href="'.$child->permalink().'">'.$child->title().'</a>';
+				echo '</li>';
+			}
+			echo '</ul>';
+		}
+	}
+?>
+</nav>