From 26a3b9898157b79760837d6a66c87a3c91aa9e72 Mon Sep 17 00:00:00 2001 From: vorons Date: Tue, 17 Nov 2015 13:13:00 +0800 Subject: [PATCH 01/22] Update ru_RU.json --- languages/ru_RU.json | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/languages/ru_RU.json b/languages/ru_RU.json index a719a712..ab573183 100644 --- a/languages/ru_RU.json +++ b/languages/ru_RU.json @@ -3,7 +3,7 @@ { "native": "Русский (Россия)", "english-name": "Russian", - "last-update": "2015-11-05", + "last-update": "2015-11-17", "author": "Сергей Ворон", "email": "sergey@voron.pw", "website": "voron.pw" @@ -203,5 +203,15 @@ "images": "Изображения", "upload-image": "Загрузить изображение", "drag-and-drop-or-click-here": "Перетащите или нажмите здесь", - "insert-image": "Вставить изображение" + "insert-image": "Вставить изображение", + "supported-image-file-types": "Поддерживаемые типы файлов изображений", + "date-format": "Формат даты", + "time-format": "Формат времени", + "chat-with-developers-and-users-on-gitter":"Чат с разработчиками и пользователями в [Gitter](https://gitter.im/dignajar/bludit)", + "this-is-a-brief-description-of-yourself-our-your-site":"Это краткое описание о вас или о сайте, чтобы изменить этот текст перейдите в панель управления, настройки, плагины и настройте плагин about.", + "profile-picture": "Изображение профиля", + "the-about-page-is-very-important": "Страница о нас является важным и мощным инструментом для потенциальных клиентов и партнеров. Для тех, кто пришел, кому интересен ваш сайт, страница О нас является первым источником информации.", + "change-this-pages-content-on-the-admin-panel": "Измените содержимое этой страницы в панели управления, Управление, Страницы и нажмите на страницу about.", + "about-your-site-or-yourself": "О Вашем сайте или о вас", + "welcome-to-bludit": "Добро пожаловать в Bludit" } From fae67ba8ff847ec009a28cd32ae8382ce8b12732 Mon Sep 17 00:00:00 2001 From: vorons Date: Tue, 17 Nov 2015 13:30:57 +0800 Subject: [PATCH 02/22] Create ru_RU.json --- plugins/about/languages/ru_RU.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 plugins/about/languages/ru_RU.json diff --git a/plugins/about/languages/ru_RU.json b/plugins/about/languages/ru_RU.json new file mode 100644 index 00000000..ce59dcd1 --- /dev/null +++ b/plugins/about/languages/ru_RU.json @@ -0,0 +1,12 @@ +{ + "plugin-data": + { + "name": "Обо мне", + "description": "Небольшое описание о вашем сайте или о себя.", + "author": "Bludit", + "email": "", + "website": "https://github.com/dignajar/bludit-plugins", + "version": "0.6", + "releaseDate": "2015-11-13" + } +} From 7e2dd63d4c576863a7061857d55ce195b38f7073 Mon Sep 17 00:00:00 2001 From: vorons Date: Tue, 17 Nov 2015 13:38:49 +0800 Subject: [PATCH 03/22] Create ru_RU.json --- plugins/disqus/languages/ru_RU.json | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 plugins/disqus/languages/ru_RU.json diff --git a/plugins/disqus/languages/ru_RU.json b/plugins/disqus/languages/ru_RU.json new file mode 100644 index 00000000..5f135bcb --- /dev/null +++ b/plugins/disqus/languages/ru_RU.json @@ -0,0 +1,16 @@ +{ + "plugin-data": + { + "name": "Комментарии Disqus", + "description": "Disqus это сервис комментариев для сайтов и блогов. Необходимо быть зарегистрированным на Disqus.com перед использованием плагина.", + "author": "Bludit", + "email": "", + "website": "https://github.com/dignajar/bludit-plugins", + "version": "0.6", + "releaseDate": "2015-11-13" + }, + "disqus-shortname": "Disqus shortname", + "enable-disqus-on-pages": "Включить Disqus на страницах", + "enable-disqus-on-posts": "Включить Disqus в записях", + "enable-disqus-on-default-home-page": "Включить Disqus на домашней странице" +} From 89641f2b92322b87fe8950f7617ef546af3bb094 Mon Sep 17 00:00:00 2001 From: vorons Date: Tue, 17 Nov 2015 13:44:05 +0800 Subject: [PATCH 04/22] Create ru_RU.json --- plugins/googletools/languages/ru_RU.json | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 plugins/googletools/languages/ru_RU.json diff --git a/plugins/googletools/languages/ru_RU.json b/plugins/googletools/languages/ru_RU.json new file mode 100644 index 00000000..318cace8 --- /dev/null +++ b/plugins/googletools/languages/ru_RU.json @@ -0,0 +1,16 @@ +{ + "plugin-data": + { + "name": "Google Tools", + "description": "Этот плагин генерирует мета теги для проверки вашего сайта в Google Webmasters Tools и код JavaScript для отслеживания вашего сайта в Google Analytics.", + "author": "Bludit", + "email": "", + "website": "https://github.com/dignajar/bludit-plugins", + "version": "0.6", + "releaseDate": "2015-11-13" + }, + "google-webmasters-tools": "Google Webmasters tools", + "google-analytics-tracking-id": "Google Analytics Tracking ID", + "complete-this-field-with-the-google-site-verification": "Заполните это поле для проверки владельца сайта.", + "complete-this-field-with-the-tracking-id": "Заполните это поле с Tracking ID чтобы сгенерировать код Javascript для отслеживания в Google Analytics." +} From 6b42a53420fd62d26daa3150d037744fb8d7943e Mon Sep 17 00:00:00 2001 From: vorons Date: Tue, 17 Nov 2015 13:46:13 +0800 Subject: [PATCH 05/22] Create ru_RU.json --- plugins/maintancemode/languages/ru_RU.json | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 plugins/maintancemode/languages/ru_RU.json diff --git a/plugins/maintancemode/languages/ru_RU.json b/plugins/maintancemode/languages/ru_RU.json new file mode 100644 index 00000000..e770d1bf --- /dev/null +++ b/plugins/maintancemode/languages/ru_RU.json @@ -0,0 +1,15 @@ +{ + "plugin-data": + { + "name": "Режим обслуживания", + "description": "Установите ваш сайт в режим обслуживания, вы можете получить доступ к панели управления.", + "author": "Bludit", + "email": "", + "website": "https://github.com/dignajar/bludit-plugins", + "version": "0.6", + "releaseDate": "2015-11-13" + }, + + "enable-maintence-mode": "Включить режим обслуживания", + "message": "Сообщение" +} From f34a93954494d85d0315e35aa81f502b2c25a7c6 Mon Sep 17 00:00:00 2001 From: vorons Date: Tue, 17 Nov 2015 13:48:50 +0800 Subject: [PATCH 06/22] Create ru_RU.json --- plugins/opengraph/languages/ru_RU.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 plugins/opengraph/languages/ru_RU.json diff --git a/plugins/opengraph/languages/ru_RU.json b/plugins/opengraph/languages/ru_RU.json new file mode 100644 index 00000000..a91f458c --- /dev/null +++ b/plugins/opengraph/languages/ru_RU.json @@ -0,0 +1,12 @@ +{ + "plugin-data": + { + "name": "Open Graph", + "description": "Протокол Open Graph дает возможность связывать свой контент с социальными сетями.", + "author": "Bludit", + "email": "", + "website": "https://github.com/dignajar/bludit-plugins", + "version": "0.6", + "releaseDate": "2015-11-13" + } +} From 9c8f595a660c4a6895c84ca790d220ed3fbb252d Mon Sep 17 00:00:00 2001 From: vorons Date: Tue, 17 Nov 2015 13:52:00 +0800 Subject: [PATCH 07/22] Create ru_RU.json --- plugins/pages/languages/ru_RU.json | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 plugins/pages/languages/ru_RU.json diff --git a/plugins/pages/languages/ru_RU.json b/plugins/pages/languages/ru_RU.json new file mode 100644 index 00000000..d235fd4c --- /dev/null +++ b/plugins/pages/languages/ru_RU.json @@ -0,0 +1,15 @@ +{ + "plugin-data": + { + "name": "Список страниц", + "description": "Показывает упорядоченый список страниц.", + "author": "Bludit", + "email": "", + "website": "https://github.com/dignajar/bludit-plugins", + "version": "0.6", + "releaseDate": "2015-11-13" + }, + + "home": "Главная", + "show-home-link": "Показывать ссылку на главную" +} From 8f84a21b1049630285baea5e27953d091328544c Mon Sep 17 00:00:00 2001 From: vorons Date: Tue, 17 Nov 2015 13:54:40 +0800 Subject: [PATCH 08/22] Create ru_RU.json --- plugins/simplemde/languages/ru_RU.json | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 plugins/simplemde/languages/ru_RU.json diff --git a/plugins/simplemde/languages/ru_RU.json b/plugins/simplemde/languages/ru_RU.json new file mode 100644 index 00000000..e5722d5f --- /dev/null +++ b/plugins/simplemde/languages/ru_RU.json @@ -0,0 +1,14 @@ +{ + "plugin-data": + { + "name": "SimpleMDE", + "description": "Простой, красивый, и встраиваемый JavaScript редактор markdown автора @WesCossick. Адаптировано Diego Najar для Bludit.", + "author": "NextStepWebs", + "email": "", + "website": "https://github.com/NextStepWebs/simplemde-markdown-editor", + "version": "1.8.1", + "releaseDate": "2015-11-13" + }, + "toolbar": "Панель инструментов", + "tab-size": "Размер панели" +} From 973012a070b7f8fd1174ec74fb0e3724282bd397 Mon Sep 17 00:00:00 2001 From: vorons Date: Tue, 17 Nov 2015 13:55:34 +0800 Subject: [PATCH 09/22] Create ru_RU.json --- plugins/tags/languages/ru_RU.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 plugins/tags/languages/ru_RU.json diff --git a/plugins/tags/languages/ru_RU.json b/plugins/tags/languages/ru_RU.json new file mode 100644 index 00000000..f7f33114 --- /dev/null +++ b/plugins/tags/languages/ru_RU.json @@ -0,0 +1,12 @@ +{ + "plugin-data": + { + "name": "Список тегов", + "description": "Показывает все теги.", + "author": "Bludit", + "email": "", + "website": "https://github.com/dignajar/bludit-plugins", + "version": "0.6", + "releaseDate": "2015-11-13" + } +} From 1682b35e1f4e1d03ee56b3d69c428d4078e0e99a Mon Sep 17 00:00:00 2001 From: vorons Date: Thu, 19 Nov 2015 09:38:08 +0800 Subject: [PATCH 10/22] Update ru_RU.json --- plugins/tags/languages/ru_RU.json | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/plugins/tags/languages/ru_RU.json b/plugins/tags/languages/ru_RU.json index f7f33114..a2700693 100644 --- a/plugins/tags/languages/ru_RU.json +++ b/plugins/tags/languages/ru_RU.json @@ -2,11 +2,6 @@ "plugin-data": { "name": "Список тегов", - "description": "Показывает все теги.", - "author": "Bludit", - "email": "", - "website": "https://github.com/dignajar/bludit-plugins", - "version": "0.6", - "releaseDate": "2015-11-13" + "description": "Показывает все теги." } } From 8edff3f293788559ccb2ad5fa6097f7f148305e8 Mon Sep 17 00:00:00 2001 From: vorons Date: Thu, 19 Nov 2015 09:39:03 +0800 Subject: [PATCH 11/22] Update ru_RU.json --- plugins/simplemde/languages/ru_RU.json | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/plugins/simplemde/languages/ru_RU.json b/plugins/simplemde/languages/ru_RU.json index e5722d5f..23732e69 100644 --- a/plugins/simplemde/languages/ru_RU.json +++ b/plugins/simplemde/languages/ru_RU.json @@ -2,12 +2,7 @@ "plugin-data": { "name": "SimpleMDE", - "description": "Простой, красивый, и встраиваемый JavaScript редактор markdown автора @WesCossick. Адаптировано Diego Najar для Bludit.", - "author": "NextStepWebs", - "email": "", - "website": "https://github.com/NextStepWebs/simplemde-markdown-editor", - "version": "1.8.1", - "releaseDate": "2015-11-13" + "description": "Простой, красивый, и встраиваемый JavaScript редактор markdown автора @WesCossick. Адаптировано Diego Najar для Bludit." }, "toolbar": "Панель инструментов", "tab-size": "Размер панели" From 3654aafb0a1f67159e8baafe309ef0a4dd5f7d2a Mon Sep 17 00:00:00 2001 From: vorons Date: Thu, 19 Nov 2015 09:39:21 +0800 Subject: [PATCH 12/22] Update ru_RU.json --- plugins/pages/languages/ru_RU.json | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/plugins/pages/languages/ru_RU.json b/plugins/pages/languages/ru_RU.json index d235fd4c..e67cbf4d 100644 --- a/plugins/pages/languages/ru_RU.json +++ b/plugins/pages/languages/ru_RU.json @@ -2,12 +2,7 @@ "plugin-data": { "name": "Список страниц", - "description": "Показывает упорядоченый список страниц.", - "author": "Bludit", - "email": "", - "website": "https://github.com/dignajar/bludit-plugins", - "version": "0.6", - "releaseDate": "2015-11-13" + "description": "Показывает упорядоченый список страниц." }, "home": "Главная", From 17fd5a734b6fded664851ede50e1f8ae8e7b5088 Mon Sep 17 00:00:00 2001 From: vorons Date: Thu, 19 Nov 2015 09:39:38 +0800 Subject: [PATCH 13/22] Update ru_RU.json --- plugins/opengraph/languages/ru_RU.json | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/plugins/opengraph/languages/ru_RU.json b/plugins/opengraph/languages/ru_RU.json index a91f458c..f88f1371 100644 --- a/plugins/opengraph/languages/ru_RU.json +++ b/plugins/opengraph/languages/ru_RU.json @@ -2,11 +2,6 @@ "plugin-data": { "name": "Open Graph", - "description": "Протокол Open Graph дает возможность связывать свой контент с социальными сетями.", - "author": "Bludit", - "email": "", - "website": "https://github.com/dignajar/bludit-plugins", - "version": "0.6", - "releaseDate": "2015-11-13" + "description": "Протокол Open Graph дает возможность связывать свой контент с социальными сетями." } } From 0fb4ad26d14363d648268e721ac6d77e44081b46 Mon Sep 17 00:00:00 2001 From: vorons Date: Thu, 19 Nov 2015 09:39:57 +0800 Subject: [PATCH 14/22] Update ru_RU.json --- plugins/maintancemode/languages/ru_RU.json | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/plugins/maintancemode/languages/ru_RU.json b/plugins/maintancemode/languages/ru_RU.json index e770d1bf..6ca2d932 100644 --- a/plugins/maintancemode/languages/ru_RU.json +++ b/plugins/maintancemode/languages/ru_RU.json @@ -2,12 +2,7 @@ "plugin-data": { "name": "Режим обслуживания", - "description": "Установите ваш сайт в режим обслуживания, вы можете получить доступ к панели управления.", - "author": "Bludit", - "email": "", - "website": "https://github.com/dignajar/bludit-plugins", - "version": "0.6", - "releaseDate": "2015-11-13" + "description": "Установите ваш сайт в режим обслуживания, вы можете получить доступ к панели управления." }, "enable-maintence-mode": "Включить режим обслуживания", From 81e0303bad9cf802f8354d4203f6107bbdffc705 Mon Sep 17 00:00:00 2001 From: vorons Date: Thu, 19 Nov 2015 09:40:41 +0800 Subject: [PATCH 15/22] Update ru_RU.json --- plugins/googletools/languages/ru_RU.json | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/plugins/googletools/languages/ru_RU.json b/plugins/googletools/languages/ru_RU.json index 318cace8..ea455cb9 100644 --- a/plugins/googletools/languages/ru_RU.json +++ b/plugins/googletools/languages/ru_RU.json @@ -2,12 +2,7 @@ "plugin-data": { "name": "Google Tools", - "description": "Этот плагин генерирует мета теги для проверки вашего сайта в Google Webmasters Tools и код JavaScript для отслеживания вашего сайта в Google Analytics.", - "author": "Bludit", - "email": "", - "website": "https://github.com/dignajar/bludit-plugins", - "version": "0.6", - "releaseDate": "2015-11-13" + "description": "Этот плагин генерирует мета теги для проверки вашего сайта в Google Webmasters Tools и код JavaScript для отслеживания вашего сайта в Google Analytics." }, "google-webmasters-tools": "Google Webmasters tools", "google-analytics-tracking-id": "Google Analytics Tracking ID", From 9f25eede4e7ac7d0b7c83aa2cf869b4437e8d179 Mon Sep 17 00:00:00 2001 From: vorons Date: Thu, 19 Nov 2015 09:41:00 +0800 Subject: [PATCH 16/22] Update ru_RU.json --- plugins/disqus/languages/ru_RU.json | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/plugins/disqus/languages/ru_RU.json b/plugins/disqus/languages/ru_RU.json index 5f135bcb..2dd66f3b 100644 --- a/plugins/disqus/languages/ru_RU.json +++ b/plugins/disqus/languages/ru_RU.json @@ -2,12 +2,7 @@ "plugin-data": { "name": "Комментарии Disqus", - "description": "Disqus это сервис комментариев для сайтов и блогов. Необходимо быть зарегистрированным на Disqus.com перед использованием плагина.", - "author": "Bludit", - "email": "", - "website": "https://github.com/dignajar/bludit-plugins", - "version": "0.6", - "releaseDate": "2015-11-13" + "description": "Disqus это сервис комментариев для сайтов и блогов. Необходимо быть зарегистрированным на Disqus.com перед использованием плагина." }, "disqus-shortname": "Disqus shortname", "enable-disqus-on-pages": "Включить Disqus на страницах", From 19c2b2cc21b30d4f1cde045886fc8fbd45354e3e Mon Sep 17 00:00:00 2001 From: vorons Date: Thu, 19 Nov 2015 09:41:20 +0800 Subject: [PATCH 17/22] Update ru_RU.json --- plugins/about/languages/ru_RU.json | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/plugins/about/languages/ru_RU.json b/plugins/about/languages/ru_RU.json index ce59dcd1..ffad37c9 100644 --- a/plugins/about/languages/ru_RU.json +++ b/plugins/about/languages/ru_RU.json @@ -2,11 +2,6 @@ "plugin-data": { "name": "Обо мне", - "description": "Небольшое описание о вашем сайте или о себя.", - "author": "Bludit", - "email": "", - "website": "https://github.com/dignajar/bludit-plugins", - "version": "0.6", - "releaseDate": "2015-11-13" + "description": "Небольшое описание о вашем сайте или о себя." } } From 84f7cda00d07df078d0749e1790b93cdb121d344 Mon Sep 17 00:00:00 2001 From: Ethan Chen Date: Sat, 21 Nov 2015 11:08:48 +0800 Subject: [PATCH 18/22] Update zh_TW Update zh_TW --- languages/zh_TW.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/languages/zh_TW.json b/languages/zh_TW.json index 86df91d4..b2ec9b50 100644 --- a/languages/zh_TW.json +++ b/languages/zh_TW.json @@ -3,7 +3,7 @@ { "native": "Traditional Chinese (Taiwan)", "english-name": "Traditional Chinese", - "last-update": "2015-11-10", + "last-update": "2015-11-21", "author": "Ethan Chen", "email": "ethan42411@gmail.com", "website": "http://single4.ml" @@ -203,5 +203,14 @@ "upload-image": "上傳圖片", "drag-and-drop-or-click-here": "拖曳您的圖片到這裡或是點選這裡選擇圖片", "insert-image": "插入圖片", - "supported-image-file-types": "可以上傳的檔案格式" + "supported-image-file-types": "可以上傳的檔案格式", + "date-format": "日期格式", + "time-format": "時間格式", + "chat-with-developers-and-users-on-gitter":"與開發者或使用者聊聊天吧~ [Gitter](https://gitter.im/dignajar/bludit)", + "this-is-a-brief-description-of-yourself-our-your-site":"這是關於您的自己或是網站的簡短介紹，如果想要修改介紹，請至管理介面/設定/延伸模組，設定"關於"這個延伸模組。", + "profile-picture": "大頭貼", + "the-about-page-is-very-important": "這個關於頁面是對於使用者與合作夥伴非常重要、非常有用的工具。對於那些不了解您網站內容的人，您的關於頁面將會是他們第一個閱讀的頁面。", + "change-this-pages-content-on-the-admin-panel": "在管理介面中更改此頁面的內容，管理/頁面，接著點選關於頁面。", + "about-your-site-or-yourself": "關於您的網站或是您自己", + "welcome-to-bludit": "歡迎使用Bludit" } From 98fb8fba7a3736e8b4eacb6467560cc777a6d3a5 Mon Sep 17 00:00:00 2001 From: Ethan Chen Date: Sat, 21 Nov 2015 11:09:37 +0800 Subject: [PATCH 19/22] Update zh_TW Update zh_TW --- languages/zh_TW.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/languages/zh_TW.json b/languages/zh_TW.json index b2ec9b50..2a6e0526 100644 --- a/languages/zh_TW.json +++ b/languages/zh_TW.json @@ -207,7 +207,7 @@ "date-format": "日期格式", "time-format": "時間格式", "chat-with-developers-and-users-on-gitter":"與開發者或使用者聊聊天吧~ [Gitter](https://gitter.im/dignajar/bludit)", - "this-is-a-brief-description-of-yourself-our-your-site":"這是關於您的自己或是網站的簡短介紹，如果想要修改介紹，請至管理介面/設定/延伸模組，設定"關於"這個延伸模組。", + "this-is-a-brief-description-of-yourself-our-your-site":"這是關於您的自己或是網站的簡短介紹，如果想要修改介紹，請至管理介面/設定/延伸模組，設定一個名為關於的延伸模組。", "profile-picture": "大頭貼", "the-about-page-is-very-important": "這個關於頁面是對於使用者與合作夥伴非常重要、非常有用的工具。對於那些不了解您網站內容的人，您的關於頁面將會是他們第一個閱讀的頁面。", "change-this-pages-content-on-the-admin-panel": "在管理介面中更改此頁面的內容，管理/頁面，接著點選關於頁面。", From 3b6aac5ec2fad5fe1327a1b1b4bd40c7c66f180c Mon Sep 17 00:00:00 2001 From: dignajar Date: Sat, 21 Nov 2015 12:11:35 -0300 Subject: [PATCH 20/22] Bug fixed - Page position --- kernel/boot/rules/70.pages.php | 38 ++++++++++++++-------------------- 1 file changed, 15 insertions(+), 23 deletions(-) diff --git a/kernel/boot/rules/70.pages.php b/kernel/boot/rules/70.pages.php index 50d93add..1f232d2e 100644 --- a/kernel/boot/rules/70.pages.php +++ b/kernel/boot/rules/70.pages.php @@ -14,7 +14,7 @@ $pagesParents = array(NO_PARENT_CHAR=>array()); // Functions // ============================================================================ -function orderChildren($a, $b) +function sortPages($a, $b) { if ($a->position() == $b->position()) { return 0; @@ -23,10 +23,6 @@ function orderChildren($a, $b) return ($a->position() < $b->position()) ? -1 : 1; } -function orderParent($array, $values, $offset) { - return ( array_slice($array, 0, $offset, true) + $values + array_slice($array, $offset, NULL, true) ); -} - function build_page($key) { global $dbPages; @@ -110,31 +106,27 @@ function build_all_pages() } } - // ======== Sort pages ======== + // --- SORT PAGES --- - $tmpNoParents = $pagesParents[NO_PARENT_CHAR]; + // Sort parents. + $parents = $pagesParents[NO_PARENT_CHAR]; + uasort($parents, 'sortPages'); + + // Sort children. unset($pagesParents[NO_PARENT_CHAR]); - - // Sort children + $children = $pagesParents; $tmpPageWithParent = array(); - foreach($pagesParents as $parentKey=>$childrenPages) + foreach($children as $parentKey=>$childrenPages) { - $tmpPageWithParent[$parentKey] = $childrenPages; - uasort($tmpPageWithParent[$parentKey], 'orderChildren'); - } - - // Sort parents - $tmp = array(); - foreach($tmpNoParents as $parentKey=>$childrenPages) - { - // DEBUG: Workaround, Esto es un bug, cuando se usa el Cli mode - // DEBUG: Se genera un padre sin index.txt y adentro hay un hijo - if(isset($pages[$parentKey])) { - $tmp = orderParent($tmp, array($parentKey=>$childrenPages), $pages[$parentKey]->position()); + // If the child doesn't have a valid parent, then doesn't included them. + if(isset($pages[$parentKey])) + { + $tmpPageWithParent[$parentKey] = $childrenPages; + uasort($tmpPageWithParent[$parentKey], 'sortPages'); } } - $pagesParents = array(NO_PARENT_CHAR=>$tmp) + $tmpPageWithParent; + $pagesParents = array(NO_PARENT_CHAR=>$parents) + $tmpPageWithParent; } // ============================================================================ From 14c38a9602b0897a5abbf346d16ebecea0ce7a9f Mon Sep 17 00:00:00 2001 From: dignajar Date: Sat, 21 Nov 2015 12:31:35 -0300 Subject: [PATCH 21/22] Minor changes on dashboard --- kernel/admin/themes/default/css/default.css | 14 +++++++++----- kernel/admin/themes/default/index.php | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/kernel/admin/themes/default/css/default.css b/kernel/admin/themes/default/css/default.css index 6bf90eff..3ee8e7f4 100644 --- a/kernel/admin/themes/default/css/default.css +++ b/kernel/admin/themes/default/css/default.css @@ -66,12 +66,16 @@ a { color: #2672ec; } -a.bludit-logo { +li.bludit-logo { color: #848484 !important; -} - -a.bludit-logo:hover { - background: none !important; + height: 70px; + padding: 15px; + display: block; + font-size: 14px; + font-weight: 400; + height: 35px; + line-height: 40px; + text-shadow: 0 1px 0 #fff; } .uk-panel-box { diff --git a/kernel/admin/themes/default/index.php b/kernel/admin/themes/default/index.php index c5f03ba4..cc25f4ad 100644 --- a/kernel/admin/themes/default/index.php +++ b/kernel/admin/themes/default/index.php @@ -57,7 +57,7 @@ $(document).ready(function() {
    -
    • +
  • > p('Dashboard') ?>
  • > p('New post') ?>
  • > p('New page') ?>
    • From ca9cde4eff40a5bc0bef24e3d142216d97ccb840 Mon Sep 17 00:00:00 2001 From: dignajar Date: Sat, 21 Nov 2015 19:32:39 -0300 Subject: [PATCH 22/22] Permission files --- languages/fr_FR.json | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 languages/fr_FR.json diff --git a/languages/fr_FR.json b/languages/fr_FR.json old mode 100755 new mode 100644