';
+
+echo '';
+?>
+
+
\ No newline at end of file
diff --git a/bl-kernel/admin/views/plugins.php b/bl-kernel/admin/views/plugins.php
index 57bb10ef..c032b709 100644
--- a/bl-kernel/admin/views/plugins.php
+++ b/bl-kernel/admin/views/plugins.php
@@ -2,6 +2,11 @@
HTML::title(array('title'=>$L->g('Plugins'), 'icon'=>'puzzle-piece'));
+<<<<<<< HEAD
+=======
+echo ' '.$L->g('Change the position of the plugins').'';
+
+>>>>>>> 07153963c9695a734b5721d73818da6a083bc8af
echo '
diff --git a/bl-kernel/boot/init.php b/bl-kernel/boot/init.php
index 4767c7c0..75e6ab77 100644
--- a/bl-kernel/boot/init.php
+++ b/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');
diff --git a/bl-kernel/boot/rules/69.pages.php b/bl-kernel/boot/rules/69.pages.php
index f9d50445..4dfa2499 100644
--- a/bl-kernel/boot/rules/69.pages.php
+++ b/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();
}
diff --git a/bl-kernel/boot/variables.php b/bl-kernel/boot/variables.php
index 2c6eb747..cdc1f065 100644
--- a/bl-kernel/boot/variables.php
+++ b/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');
diff --git a/bl-kernel/functions.php b/bl-kernel/functions.php
index e52b2865..14c1d04b 100644
--- a/bl-kernel/functions.php
+++ b/bl-kernel/functions.php
@@ -1,6 +1,10 @@
>>>>>> 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;
diff --git a/bl-kernel/helpers/paginator.class.php b/bl-kernel/helpers/paginator.class.php
index 87893e32..3e3275f1 100644
--- a/bl-kernel/helpers/paginator.class.php
+++ b/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');
diff --git a/bl-kernel/page.class.php b/bl-kernel/page.class.php
index 481154b9..192b38e2 100644
--- a/bl-kernel/page.class.php
+++ b/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
}
}
diff --git a/bl-languages/es.json b/bl-languages/es.json
index 53d43afa..c29607d8 100644
--- a/bl-languages/es.json
+++ b/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
diff --git a/bl-languages/lt_LT.json b/bl-languages/lt_LT.json
index 0fa34ba3..c41887da 100644
--- a/bl-languages/lt_LT.json
+++ b/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į. < 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
diff --git a/bl-languages/ru_RU.json b/bl-languages/ru_RU.json
index 2b3bd9a4..da699525 100644
--- a/bl-languages/ru_RU.json
+++ b/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
}
diff --git a/bl-languages/tr_TR.json b/bl-languages/tr_TR.json
index 28aacfdd..1d013ba8 100644
--- a/bl-languages/tr_TR.json
+++ b/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",
diff --git a/bl-languages/uk_UA.json b/bl-languages/uk_UA.json
index 12c3a1ef..24e38ebb 100644
--- a/bl-languages/uk_UA.json
+++ b/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
}
diff --git a/bl-plugins/api/languages/tr_TR.json b/bl-plugins/api/languages/tr_TR.json
new file mode 100644
index 00000000..caa9f12b
--- /dev/null
+++ b/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. Bu eklenti hakkında daha fazla bilgi için API Tanıtımı (ingilizce)."
+ },
+ "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."
+}
diff --git a/bl-plugins/api/plugin.php b/bl-plugins/api/plugin.php
index 6ac88825..78584aaf 100644
--- a/bl-plugins/api/plugin.php
+++ b/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);
diff --git a/bl-plugins/backup/languages/en.json b/bl-plugins/backup/languages/en.json
index 2ed99d90..020bdf78 100644
--- a/bl-plugins/backup/languages/en.json
+++ b/bl-plugins/backup/languages/en.json
@@ -3,5 +3,13 @@
{
"name": "Backup",
"description": "The simple way to backup your Bludit."
+<<<<<<< HEAD
}
-}
\ No newline at end of file
+}
+=======
+ },
+ "create-backup": "Create Backup",
+ "download": "Download",
+ "restore-backup": "Restore Backup"
+}
+>>>>>>> 07153963c9695a734b5721d73818da6a083bc8af
diff --git a/bl-plugins/backup/languages/tr_TR.json b/bl-plugins/backup/languages/tr_TR.json
new file mode 100644
index 00000000..75172ec1
--- /dev/null
+++ b/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"
+}
diff --git a/bl-plugins/backup/plugin.php b/bl-plugins/backup/plugin.php
index 21fd2dba..28e886cc 100644
--- a/bl-plugins/backup/plugin.php
+++ b/bl-plugins/backup/plugin.php
@@ -66,7 +66,11 @@ class pluginBackup extends Plugin {
}
$html = '
';
$html .= '';
}
@@ -122,4 +131,8 @@ class pluginBackup extends Plugin {
return Filesystem::copyRecursive($tmp, PATH_CONTENT);
}
-}
\ No newline at end of file
+<<<<<<< HEAD
+}
+=======
+}
+>>>>>>> 07153963c9695a734b5721d73818da6a083bc8af
diff --git a/bl-plugins/disqus/languages/tr_TR.json b/bl-plugins/disqus/languages/tr_TR.json
index 6cf47766..e956740b 100644
--- a/bl-plugins/disqus/languages/tr_TR.json
+++ b/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",
diff --git a/bl-plugins/google/plugin.php b/bl-plugins/google/plugin.php
index c1ab3ae9..4cb520cd 100644
--- a/bl-plugins/google/plugin.php
+++ b/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.''.PHP_EOL;
$html .= ''.PHP_EOL;
}
// Google Tag Manager
+<<<<<<< HEAD
if( $this->getValue('google-tag-manager') ) {
+=======
+ if ($this->getValue('google-tag-manager')) {
+>>>>>>> 07153963c9695a734b5721d73818da6a083bc8af
$html .= PHP_EOL."".PHP_EOL;
$html .= "
@@ -78,6 +90,7 @@ class pluginGoogle extends Plugin {
public function siteBodyBegin()
{
+<<<<<<< HEAD
// Google Tag Manager
if ($this->getValue('google-tag-manager')) {
$html = ''.PHP_EOL;
@@ -88,4 +101,17 @@ class pluginGoogle extends Plugin {
return false;
}
+=======
+ $html = '';
+
+ // Google Tag Manager
+ if ($this->getValue('google-tag-manager')) {
+ $html .= ''.PHP_EOL;
+ $html .= ''.PHP_EOL;
+ $html .= ''.PHP_EOL;
+ }
+
+ return $html;
+ }
+>>>>>>> 07153963c9695a734b5721d73818da6a083bc8af
}
diff --git a/bl-plugins/html-code/languages/de_CH.json b/bl-plugins/html-code/languages/de_CH.json
index 81c3ba26..85a45ffd 100644
--- a/bl-plugins/html-code/languages/de_CH.json
+++ b/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 <head> </head> des Themes einfügen,
+=======
+ "insert-code-in-the-theme-inside-the-tag-head": "Code in den Bereich <head> </head> 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."
}
diff --git a/bl-plugins/html-code/languages/de_DE.json b/bl-plugins/html-code/languages/de_DE.json
index 81c3ba26..85a45ffd 100644
--- a/bl-plugins/html-code/languages/de_DE.json
+++ b/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 <head> </head> des Themes einfügen,
+=======
+ "insert-code-in-the-theme-inside-the-tag-head": "Code in den Bereich <head> </head> 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."
}
diff --git a/bl-plugins/navigation/languages/de_CH.json b/bl-plugins/navigation/languages/de_CH.json
new file mode 100644
index 00000000..5408b7f4
--- /dev/null
+++ b/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"
+}
diff --git a/bl-plugins/navigation/languages/de_DE.json b/bl-plugins/navigation/languages/de_DE.json
new file mode 100644
index 00000000..5408b7f4
--- /dev/null
+++ b/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"
+}
diff --git a/bl-plugins/navigation/languages/en.json b/bl-plugins/navigation/languages/en.json
new file mode 100644
index 00000000..580bd515
--- /dev/null
+++ b/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. 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"
+}
diff --git a/bl-plugins/navigation/languages/es.json b/bl-plugins/navigation/languages/es.json
new file mode 100644
index 00000000..6a406c88
--- /dev/null
+++ b/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. 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"
+}
diff --git a/bl-plugins/navigation/languages/fr_FR.json b/bl-plugins/navigation/languages/fr_FR.json
new file mode 100644
index 00000000..32f94bc5
--- /dev/null
+++ b/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. 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"
+}
diff --git a/bl-plugins/navigation/languages/ru_RU.json b/bl-plugins/navigation/languages/ru_RU.json
new file mode 100644
index 00000000..8bbe58f2
--- /dev/null
+++ b/bl-plugins/navigation/languages/ru_RU.json
@@ -0,0 +1,10 @@
+{
+ "plugin-data":
+ {
+ "name": "Последний контент",
+ "description": "Список последнего содержимого, вы можете задать количество позиций. Порядок отображения содержимого задаётся в расширенных настройках Bludit."
+ },
+ "home-link": "Ссылка на главную страницу",
+ "show-the-home-link-on-the-sidebar": "Показывать ссылку на главную страницу на боковой панели",
+ "amount-of-items": "Количество позиций"
+}
diff --git a/bl-plugins/navigation/metadata.json b/bl-plugins/navigation/metadata.json
new file mode 100644
index 00000000..48d6c186
--- /dev/null
+++ b/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": ""
+}
\ No newline at end of file
diff --git a/bl-plugins/navigation/plugin.php b/bl-plugins/navigation/plugin.php
new file mode 100644
index 00000000..899dc7f6
--- /dev/null
+++ b/bl-plugins/navigation/plugin.php
@@ -0,0 +1,125 @@
+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 = '
';
+ $html .= '';
+ $html .= '';
+ $html .= ''.$Language->get('This title is almost always used in the sidebar of the site').'';
+ $html .= '
';
+
+ $html .= '
';
+ $html .= '';
+ $html .= '';
+ $html .= ''.$Language->get('Show the home link on the sidebar').'';
+ $html .= '
';
+
+ $html .= '
';
+ $html .= '';
+ $html .= '';
+ $html .= '
';
+
+ 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 = '
';
+
+ // Print the label if not empty
+ $label = $this->getValue('label');
+ if (!empty($label)) {
+ $html .= '
+
+
+License
+-------
+Bludit is open source software licensed under the [MIT license](https://tldrlegal.com/license/mit-license).
diff --git a/bl-kernel/abstract/plugin.class.php b/bl-kernel/abstract/plugin.class.php
index 66d80d0a..24bc64bc 100644
--- a/bl-kernel/abstract/plugin.class.php
+++ b/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)
diff --git a/bl-kernel/admin/controllers/plugins-position.php b/bl-kernel/admin/controllers/plugins-position.php
new file mode 100644
index 00000000..cad0096c
--- /dev/null
+++ b/bl-kernel/admin/controllers/plugins-position.php
@@ -0,0 +1,32 @@
+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');
\ No newline at end of file
diff --git a/bl-kernel/admin/controllers/settings-advanced.php b/bl-kernel/admin/controllers/settings-advanced.php
index f789a6a5..a6c9c520 100644
--- a/bl-kernel/admin/controllers/settings-advanced.php
+++ b/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) {
diff --git a/bl-kernel/admin/themes/default/css/default.css b/bl-kernel/admin/themes/default/css/default.css
index 5e9d4b28..187752ed 100644
--- a/bl-kernel/admin/themes/default/css/default.css
+++ b/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 ----------- */
diff --git a/bl-kernel/admin/themes/default/css/uikit/sortable.min.css b/bl-kernel/admin/themes/default/css/uikit/sortable.min.css
new file mode 100755
index 00000000..fae82eb7
--- /dev/null
+++ b/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}
\ No newline at end of file
diff --git a/bl-kernel/admin/themes/default/index.php b/bl-kernel/admin/themes/default/index.php
index 664e4888..b5fc8b2a 100644
--- a/bl-kernel/admin/themes/default/index.php
+++ b/bl-kernel/admin/themes/default/index.php
@@ -16,6 +16,10 @@
+<<<<<<< HEAD
+=======
+
+>>>>>>> 07153963c9695a734b5721d73818da6a083bc8af
@@ -24,6 +28,10 @@
+<<<<<<< HEAD
+=======
+
+>>>>>>> 07153963c9695a734b5721d73818da6a083bc8af
diff --git a/bl-kernel/admin/themes/default/js/uikit/sortable.min.js b/bl-kernel/admin/themes/default/js/uikit/sortable.min.js
new file mode 100755
index 00000000..e083d2d8
--- /dev/null
+++ b/bl-kernel/admin/themes/default/js/uikit/sortable.min.js
@@ -0,0 +1,2 @@
+/*! UIkit 2.27.5 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
+!function(t){var e;window.UIkit2&&(e=t(UIkit2)),"function"==typeof define&&define.amd&&define("uikit-sortable",["uikit"],function(){return e||t(UIkit2)})}(function(t){"use strict";function e(e){e=t.$(e);do{if(e.data("sortable"))return e;e=t.$(e).parent()}while(e.length);return e}function o(t,e){var o=t.parentNode;if(e.parentNode!=o)return!1;for(var n=t.previousSibling;n&&9!==n.nodeType;){if(n===e)return!0;n=n.previousSibling}return!1}function n(t,e){var o=e;if(o==t)return null;for(;o;){if(o.parentNode===t)return o;if(o=o.parentNode,!o||!o.ownerDocument||11===o.nodeType)break}return null}function a(t){t.stopPropagation&&t.stopPropagation(),t.preventDefault&&t.preventDefault(),t.returnValue=!1}var s,r,i,l,d,h,u,p,c,f,g,m="ontouchstart"in window||"MSGesture"in window||window.DocumentTouch&&document instanceof DocumentTouch,v=m?"MSGesture"in window||window.PointerEvent?"pointerdown":"touchstart":"mousedown",b=m?"MSGesture"in window||window.PointerEvent?"pointermove":"touchmove":"mousemove",C=m?"MSGesture"in window||window.PointerEvent?"pointerup":"touchend":"mouseup";return t.component("sortable",{defaults:{animation:150,threshold:10,childClass:"uk-sortable-item",placeholderClass:"uk-sortable-placeholder",overClass:"uk-sortable-over",draggingClass:"uk-sortable-dragged",dragMovingClass:"uk-sortable-moving",baseClass:"uk-sortable",noDragClass:"uk-sortable-nodrag",emptyClass:"uk-sortable-empty",dragCustomClass:"",handleClass:!1,group:!1,stop:function(){},start:function(){},change:function(){}},boot:function(){t.ready(function(e){t.$("[data-uk-sortable]",e).each(function(){var e=t.$(this);e.data("sortable")||t.sortable(e,t.Utils.options(e.attr("data-uk-sortable")))})}),t.$html.on(b,function(e){if(u){var o=e.originalEvent.targetTouches?e.originalEvent.targetTouches[0]:e;(Math.abs(o.pageX-u.pos.x)>u.threshold||Math.abs(o.pageY-u.pos.y)>u.threshold)&&u.apply(o)}if(s){d||(d=!0,s.show(),s.$current.addClass(s.$sortable.options.placeholderClass),s.$sortable.element.children().addClass(s.$sortable.options.childClass),t.$html.addClass(s.$sortable.options.dragMovingClass));var n=s.data("mouse-offset"),a=e.originalEvent.touches&&e.originalEvent.touches[0]||e.originalEvent,r=parseInt(a.pageX,10)+n.left,i=parseInt(a.pageY,10)+n.top;if(s.css({left:r,top:i}),i+s.height()/3>document.body.offsetHeight)return;i