From 46970a987ddf187c2b4aae39a3febede663edb93 Mon Sep 17 00:00:00 2001 From: Dipchikov Date: Fri, 6 Nov 2015 14:28:05 +0200 Subject: [PATCH 01/29] Bulgarien stranslate Version 1 --- languages/bg_BG.json | 206 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 206 insertions(+) create mode 100644 languages/bg_BG.json diff --git a/languages/bg_BG.json b/languages/bg_BG.json new file mode 100644 index 00000000..bd21daf4 --- /dev/null +++ b/languages/bg_BG.json @@ -0,0 +1,206 @@ +{ + "language-data": + { + "native": "Български (България)", + "english-name": "Bulgarian", + "last-update": "2015-11-06", + "author": "Христо Дипчиков", + "email": "", + "website": "www.hristodipchikov.tk" + }, + + "username": "Потребителско име", + "password": "Парола", + "confirm-password": "Повтори паролата", + "editor": "Редактор", + "dashboard": "Администраторски панел", + "role": "Потребител", + "post": "Публикация", + "posts": "Публикаций", + "users": "Потребители", + "administrator": "Администратор", + "add": "Добави", + "cancel": "Откажи", + "content": "Съдържание", + "title": "Заглавие", + "no-parent": "Самостоятелна страница", + "edit-page": "Редактиране на страницата", + "edit-post": "Редактиране на публикацията", + "add-a-new-user": "Добавяне на нов потребител", + "parent": "Избор на основна страница", + "friendly-url": "Friendly URL", + "description": "Описание", + "posted-by": "Публикувано от", + "tags": "Етикети", + "position": "Позиция", + "save": "Запази", + "draft": "Чернова", + "delete": "Изтриване", + "registered": "Препоръчано", + "Notifications": "Известия", + "profile": "Профил", + "email": "Имейл адрес", + "settings": "Настройки", + "general": "Общи настройки", + "advanced": "Разширени настройки", + "regional": "Регионални настройки", + "about": "Относно", + "login": "Вход", + "logout": "Изход", + "manage": "Управление", + "themes": "Теми", + "prev-page": "Предишна страница", + "next-page": "Следваща страница", + "configure-plugin": "Конфигуриране", + "confirm-delete-this-action-cannot-be-undone": "Ако потвърдете изтриванер, действието не може да бъде отменено.", + "site-title": "Заглавие на сайта", + "site-slogan": "Ключови думи / Етикети", + "site-description": "Описание на сайта", + "footer-text": "Текст долната част на страницата.", + "posts-per-page": "Брой публикации на страница", + "site-url": "Адрес, на който блога е ще бъде намиран", + "writting-settings": "Запиши настройките", + "url-filters": "URL филтри", + "page": "Страница", + "pages": "Страници", + "home": "Начало", + "welcome-back": "Добре дошли!", + "language": "Език", + "website": "Сайт", + "timezone": "Часова зона", + "locale": "Местоположение", + "new-post": "Нова публикация", + "html-and-markdown-code-supported": "Поддръжан код HTML и Markdown ", + "new-page": "Нова страница", + "manage-posts": "Управление на публикациите", + "published-date": "Дата на побликуване", + "modified-date": "Промяна на дата", + "empty-title": "Без заглавие", + "plugins": "Плъгини", + "install-plugin": "Добави", + "uninstall-plugin": "Премахни", + "new-password": "Нова парола", + "edit-user": "Промяна на потребител", + "publish-now": "Пуликувай", + "first-name": "Име", + "last-name": "Фамилия", + "bludit-version": "Bludit version", + "powered-by": "Създадено от", + "recent-posts": "Последни публикации", + "manage-pages": "Управление на страниците", + "advanced-options": "Разширени настройки", + "user-deleted": "Изтриване на потребител", + "page-added-successfully": "Страницата е добавена успешно", + "post-added-successfully": "Публикацията е добавена успешно", + "the-post-has-been-deleted-successfully": "Публикацията беше премахната успешно", + "the-page-has-been-deleted-successfully": "Страницата беше премахната успешно", + "username-or-password-incorrect": "Грешна парола или потребител", + "database-regenerated": "Възстановяване на база данни", + "the-changes-have-been-saved": "Промените са запазени", + "enable-more-features-at": "Активиране на повече функции в", + "username-already-exists": "Вече съществува такъв потребител", + "username-field-is-empty": "Полето за потребител е празно", + "the-password-and-confirmation-password-do-not-match":"Няма съвпадение между парала и потвърждение", + "user-has-been-added-successfully": "Потребителя беше добавен успешно", + "you-do-not-have-sufficient-permissions": "Вие нямате права за достъп до тази страница, моля свържете се с администратора.", + "settings-advanced-writting-settings": "Настройки->Разширени настройки->Записване на настройки", + "new-posts-and-pages-synchronized": "Новите публикации и страници са синхронизирани.", + "you-can-choose-the-users-privilege": "Можете да зададете правомощия на потребителя. Редактора може само да напише страници и мнения.", + "email-will-not-be-publicly-displayed": "Имейл адрес няма да бъде показван.Ще се използва за възстановяване парола и уведомления.", + "use-this-field-to-name-your-site": "Използвайте това поле за име на вашия сайт, той ще се появи в горната част на всяка страница на вашия сайт.", + "use-this-field-to-add-a-catchy-phrase": "Използвайте това поле, за да добавите ключови думи и изрази за вашия сайт.", + "you-can-add-a-site-description-to-provide": "Можете да добавите кратко описание или биография на сайта.", + "you-can-add-a-small-text-on-the-bottom": "Можете да добавите кратък текст в долната част на всяка страница. Например: авторско право, собственик, дати и т.н..", + "number-of-posts-to-show-per-page": "Изберете желаният брой публикации на страница.", + "the-url-of-your-site": "Абсолютен адрес на вашия блог. Пример http://www.domain.com/directory/.", + "add-or-edit-description-tags-or": "Добавяне или редактиране на описание, eтикети или модифициране URL.", + "select-your-sites-language": "Изберете системен език.", + "select-a-timezone-for-a-correct": "Изберете часова зона за правилтото показване на дата / час.", + "you-can-use-this-field-to-define-a-set-of": "Можете да използвате това поле, за набор на параметри, свързани с език, страната и специални преференции.", + "you-can-modify-the-url-which-identifies":"Можете да промените адреса, на дадената страница или публикация, ключови думи. Но не повече от 150 символа.", + "this-field-can-help-describe-the-content": " В това поле може да опишете съдържанието с няколко думи. Но не повече от 150 символа.", + "write-the-tags-separeted-by-comma": "Добавянето на етикети става чрез добавянето на запетая. Например: TAG1, tag2, tag3", + "delete-the-user-and-all-its-posts":"Изтриване на потребителя и всички негови публикации.", + "delete-the-user-and-associate-its-posts-to-admin-user": "Изтриване на потребителя, без изтриване на неговите публикации.", + "read-more": "Вижте повече...", + "show-blog": "Покажи блога", + "default-home-page": "Задай начална страница по подразбиране", + "version": "Версия", + "there-are-no-drafts": "Не са открити чернови.", + "create-a-new-article-for-your-blog":"Създайте на нова публикация във вашия блог.", + "create-a-new-page-for-your-website":"Създайте на нова страница във вашия уеб сайт.", + "invite-a-friend-to-collaborate-on-your-website":"Добави приятел, който да помага за развитието вашият сайт.", + "change-your-language-and-region-settings":"Избор на параметри, свързани с език, страната и местоположение.", + "language-and-timezone":"Език и часова зона", + "author": "Автор", + "start-here": "Начало", + "install-theme": "Качи тема", + "first-post": "Първа публикация", + "congratulations-you-have-successfully-installed-your-bludit": "Поздравления вие успешно инсталирахте вашият **Bludit**", + "whats-next": "Какво следва?", + "manage-your-bludit-from-the-admin-panel": "Управлявайте вашият Bludit от [Администраторският панел](./admin/)", + "follow-bludit-on": "Follow Bludit on", + "visit-the-support-forum": "Visit the [forum](http://forum.bludit.com) for support", + "read-the-documentation-for-more-information": "Прочети [документацията](http://docs.bludit.com) за повече информация", + "share-with-your-friends-and-enjoy": "Споделете с приятелите си", + "the-page-has-not-been-found": "Страницата не е намерена.", + "error": "Грешна", + "bludit-installer": "Bludit Installer", + "welcome-to-the-bludit-installer": "Welcome to the Bludit installer", + "complete-the-form-choose-a-password-for-the-username-admin": "Попълнете формуляра, или парола за потребителското име « admin »", + "password-visible-field": "Парола във видимото поле!", + "install": "Инсталиране", + "choose-your-language": "Изберете вашият език", + "next": "Напред", + "the-password-field-is-empty": "Полето за парола е празно", + "your-email-address-is-invalid":"Вашият имейл адрес е невалиден.", + "proceed-anyway": "Продължете така или иначе!", + "drafts":"Чернови", + "ip-address-has-been-blocked": "IP адрес е блокиран.", + "try-again-in-a-few-minutes": "Опитайте отново след няколко минути.", + "date": "Дата", + "you-can-schedule-the-post-just-select-the-date-and-time": "Можете да планирате запис, просто като изберете дата и час.", + "scheduled": "Планирано", + "publish": "Публикувай", + "please-check-your-theme-configuration": "Моля, проверете конфигурацията на вашата тема.", + "plugin-label": "Plugin етикет", + "enabled": "Разреши", + "disabled": "Забрани", + "cli-mode": "Режим CLI", + "command-line-mode": "Режим на команден ред", + "enable-the-command-line-mode-if-you-add-edit": "Смени с режим на командния ред, ако добавяте, променяте или изтривате постове и страници от файловата система", + "configure": "Конфигориране", + "uninstall": "Премахване", + "change-password": "Промяна на парола", + "to-schedule-the-post-just-select-the-date-and-time": "За да планирате поста, просто изберете датата и часа.", + "write-the-tags-separated-by-commas": "Напиши етикети, разделени със запетая.", + "status": "Статус", + "published": "Пубиликуван", + "scheduled-posts": "Планирани постове", + "statistics": "Статистика", + "name": "Име", + "email-account-settings":"Настройки на имейл акаунт", + "sender-email": "Имейл на изпращача", + "emails-will-be-sent-from-this-address":"Имейлите ще бъдат изпратени от този адрес.", + "bludit-login-access-code": "BLUDIT - Код за достъп", + "check-your-inbox-for-your-login-access-code":"Проверете вашата пощенска кутия за вашия код за достъп", + "there-was-a-problem-sending-the-email":"Възникна проблем при изпращането на имейла", + "back-to-login-form": "Връщане вкъм входящата форма", + "send-me-a-login-access-code": "Изпрати ми кода за достъп", + "get-login-access-code": "Вземете кода за достъп", + "email-notification-login-access-code": "

Това е уведомление от вашия сайт {{WEBSITE_NAME}}

Вашият код за достъп , последвайте следващата връзката:

{{LINK}}

", + "there-are-no-scheduled-posts": "Не са открити публикации.", + "show-password": "Покажи паролата", + "edit-or-remove-your=pages": "Промяна или премахване на страници.", + "edit-or-remove-your-blogs-posts": "Промяна или премахване на статии от блога ви.", + "general-settings": "Основни настройки", + "advanced-settings": "Разширени настройки", + "manage-users": "Управление на потребители", + "view-and-edit-your-profile": "Преглед и редактиране на профила ви.", + + "password-must-be-at-least-6-characters-long": "Паролата трябва да е с дължина най-малко 6 символа", + "images": "Снимки", + "upload-image": "Прикачи снимка", + "drag-and-drop-or-click-here": "Влачите и пускате или натиснете тук", + "insert-image": "Вмъкни снимка" +} From ae7aecff304556fc44404190d93d692d6517a22b Mon Sep 17 00:00:00 2001 From: Dipchikov Date: Tue, 10 Nov 2015 14:19:33 +0200 Subject: [PATCH 02/29] Bulgarian translate Update 6 --- languages/bg_BG.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/languages/bg_BG.json b/languages/bg_BG.json index ddc25448..2767658b 100644 --- a/languages/bg_BG.json +++ b/languages/bg_BG.json @@ -70,7 +70,7 @@ "timezone": "Часова зона", "locale": "Местоположение", "new-post": "Нова публикация", - "html-and-markdown-code-supported": "Поддръжан код HTML и Markdown ", + "html-and-markdown-code-supported": "Поддръжан код HTML и Markdown ", "new-page": "Нова страница", "manage-posts": "Управление на публикациите", "published-date": "Дата на побликуване", @@ -116,8 +116,8 @@ "add-or-edit-description-tags-or": "Добавяне или редактиране на описание, eтикети или модифициране URL.", "select-your-sites-language": "Изберете системен език.", "select-a-timezone-for-a-correct": "Изберете часова зона за правилтото показване на дата / час.", - "you-can-use-this-field-to-define-a-set-of": "Можете да използвате това поле, за набор на параметри, свързани с език, страната и специални преференции.", - "you-can-modify-the-url-which-identifies":"Можете да промените адреса, на дадената страница или публикация използвайки ключови думи, но с обща дължина не повече от 150 символа.", + "you-can-use-this-field-to-define-a-set-of": "Можете да използвате това поле за избар на параметри свързани с езика, страната и специални преференции.", + "you-can-modify-the-url-which-identifies":"Можете да промените URL адреса , който идентифицира страницата или публикацията използвайки ключови думи, но с обща дължина не повече от 150 символа.", "this-field-can-help-describe-the-content": " В това поле може да опишете съдържанието с няколко думи, но с обща дължина не повече от 150 символа.", "write-the-tags-separeted-by-comma": "Добавянето на етикети става чрез добавянето на запетая. Например: TAG1, tag2, tag3", "delete-the-user-and-all-its-posts":"Изтриване на потребителя и всички негови публикации.", @@ -172,7 +172,7 @@ "configure": "Конфигориране", "uninstall": "Премахване", "change-password": "Промяна на парола:", - "to-schedule-the-post-just-select-the-date-and-time": "За да планирате поста, просто изберете датата и часа.", + "to-schedule-the-post-just-select-the-date-and-time": "За да планирате поста, просто изберете дата и час.", "write-the-tags-separated-by-commas": "Напишете етикети, разделени със запетая.", "status": "Статус", "published": "Пубиликуван", From d3741ee7736c2bb202d91273ff5726093d908a34 Mon Sep 17 00:00:00 2001 From: dignajar Date: Tue, 10 Nov 2015 19:47:21 -0300 Subject: [PATCH 03/29] Minor changes --- admin/themes/default/css/default.css | 9 +++- languages/fr_FR.json | 0 plugins/about/languages/en_US.json | 12 +++++ plugins/about/plugin.php | 73 ++++++++++++++++++++++++++++ 4 files changed, 93 insertions(+), 1 deletion(-) mode change 100755 => 100644 languages/fr_FR.json create mode 100644 plugins/about/languages/en_US.json create mode 100644 plugins/about/plugin.php diff --git a/admin/themes/default/css/default.css b/admin/themes/default/css/default.css index 7ab788c0..4c58ae51 100644 --- a/admin/themes/default/css/default.css +++ b/admin/themes/default/css/default.css @@ -236,9 +236,16 @@ div.plugin-links > span.separator { color: #AAAAAA; } +#jsformplugin textarea { + min-width: 400px; + width: 60%; + min-height: 100px; +} + #jsformplugin input[type=text] { min-width: 400px; width: 60%; + height: 37px; } #jsformplugin input[type="checkbox"] { @@ -249,6 +256,6 @@ div.plugin-links > span.separator { #jsformplugin label.forCheckbox { margin-left: 3px; - margin-bottom: 10px; + margin-bottom: 0px !important; display: inline-block; } diff --git a/languages/fr_FR.json b/languages/fr_FR.json old mode 100755 new mode 100644 diff --git a/plugins/about/languages/en_US.json b/plugins/about/languages/en_US.json new file mode 100644 index 00000000..cbab48ef --- /dev/null +++ b/plugins/about/languages/en_US.json @@ -0,0 +1,12 @@ +{ + "plugin-data": + { + "name": "About", + "description": "Little description about your site or your self.", + "author": "Bludit", + "email": "", + "website": "https://github.com/dignajar/bludit-plugins", + "version": "0.6", + "releaseDate": "2015-11-10" + } +} \ No newline at end of file diff --git a/plugins/about/plugin.php b/plugins/about/plugin.php new file mode 100644 index 00000000..0924fb50 --- /dev/null +++ b/plugins/about/plugin.php @@ -0,0 +1,73 @@ +dbFields = array( + 'label'=>'About', + 'text'=>'', + 'facebook'=>'', + 'twitter'=>'', + 'instagram'=>'', + 'googleplus'=>'' + ); + } + + public function form() + { + global $Language; + + $html = '
'; + $html .= ''; + $html .= ''; + $html .= '
'; + + $html .= '
'; + $html .= ''; + $html .= ''; + $html .= '
'; + + $html .= 'Social networks'; + + $html .= '
'; + $html .= ''; + $html .= ''; + $html .= '
'; + + $html .= '
'; + $html .= ''; + $html .= ''; + $html .= '
'; + + $html .= '
'; + $html .= ''; + $html .= ''; + $html .= '
'; + + $html .= '
'; + $html .= ''; + $html .= ''; + $html .= '
'; + + return $html; + } + + public function siteSidebar() + { + global $Language; + global $dbTags; + global $Url; + + $filter = $Url->filters('tag'); + + $html = '
'; + $html .= '

'.$this->getDbField('label').'

'; + $html .= '
'; + $html .= $this->getDbField('text'); + $html .= '
'; + $html .= '
'; + + return $html; + } +} \ No newline at end of file From a397c2ac19dea86bec911cf00a05ef592c87da4d Mon Sep 17 00:00:00 2001 From: dignajar Date: Wed, 11 Nov 2015 18:13:32 -0300 Subject: [PATCH 04/29] Minor changes --- plugins/about/plugin.php | 28 +--------------------------- themes/pure/php/head.php | 7 +++++-- themes/pure/php/home.php | 2 +- themes/pure/php/post.php | 2 +- 4 files changed, 8 insertions(+), 31 deletions(-) diff --git a/plugins/about/plugin.php b/plugins/about/plugin.php index 0924fb50..9e30b80f 100644 --- a/plugins/about/plugin.php +++ b/plugins/about/plugin.php @@ -6,11 +6,7 @@ class pluginAbout extends Plugin { { $this->dbFields = array( 'label'=>'About', - 'text'=>'', - 'facebook'=>'', - 'twitter'=>'', - 'instagram'=>'', - 'googleplus'=>'' + 'text'=>'' ); } @@ -28,28 +24,6 @@ class pluginAbout extends Plugin { $html .= ''; $html .= ''; - $html .= 'Social networks'; - - $html .= '
'; - $html .= ''; - $html .= ''; - $html .= '
'; - - $html .= '
'; - $html .= ''; - $html .= ''; - $html .= '
'; - - $html .= '
'; - $html .= ''; - $html .= ''; - $html .= '
'; - - $html .= '
'; - $html .= ''; - $html .= ''; - $html .= '
'; - return $html; } diff --git a/themes/pure/php/head.php b/themes/pure/php/head.php index 43d6a590..68824463 100644 --- a/themes/pure/php/head.php +++ b/themes/pure/php/head.php @@ -1,7 +1,5 @@ - - <?php echo $Site->title() ?> if( $Url->whereAmI()=='post' ) { Theme::keywords( $Post->tags() ); + Theme::description( $Post->description() ); } elseif( $Url->whereAmI()=='page' ) { Theme::keywords( $Page->tags() ); + Theme::description( $Page->description() ); + } + else { + Theme::description( $Site->description() ); } ?> diff --git a/themes/pure/php/home.php b/themes/pure/php/home.php index 89812dd3..d0bc82cf 100644 --- a/themes/pure/php/home.php +++ b/themes/pure/php/home.php @@ -23,7 +23,7 @@ echo $Language->get('Posted By').' '; if( Text::isNotEmpty($Post->authorFirstName()) && Text::isNotEmpty($Post->authorLastName()) ) { - echo $Post->authorFirstName().', '.$Post->authorLastName(); + echo $Post->authorFirstName().' '.$Post->authorLastName(); } else { echo $Post->username(); diff --git a/themes/pure/php/post.php b/themes/pure/php/post.php index d4f4436f..4f1c2011 100644 --- a/themes/pure/php/post.php +++ b/themes/pure/php/post.php @@ -21,7 +21,7 @@ echo $Language->get('Posted By').' '; if( Text::isNotEmpty($Post->authorFirstName()) && Text::isNotEmpty($Post->authorLastName()) ) { - echo $Post->authorFirstName().', '.$Post->authorLastName(); + echo $Post->authorFirstName().' '.$Post->authorLastName(); } else { echo $Post->username(); From 6edd56ec39ce3654d669534855979aa2adbba15a Mon Sep 17 00:00:00 2001 From: dignajar Date: Thu, 12 Nov 2015 22:25:59 -0300 Subject: [PATCH 05/29] Page date --- kernel/dbpages.class.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/kernel/dbpages.class.php b/kernel/dbpages.class.php index 410553ad..9cf55dd1 100644 --- a/kernel/dbpages.class.php +++ b/kernel/dbpages.class.php @@ -11,7 +11,7 @@ class dbPages extends dbJSON 'username'=> array('inFile'=>false, 'value'=>''), 'tags'=> array('inFile'=>false, 'value'=>array()), 'status'=> array('inFile'=>false, 'value'=>'draft'), - 'date'=> array('inFile'=>false, 'value'=>0), + 'date'=> array('inFile'=>false, 'value'=>''), 'position'=> array('inFile'=>false, 'value'=>0) ); @@ -34,9 +34,7 @@ class dbPages extends dbJSON } // Current date. - if(empty($args['date'])) { - $args['date'] = Date::current(DB_DATE_FORMAT); - } + $args['date'] = Date::current(DB_DATE_FORMAT); // Verify arguments with the database fields. foreach($this->dbFields as $field=>$options) From c7095e37f9c3de9946f86de3fbfcbf9abe126348 Mon Sep 17 00:00:00 2001 From: dignajar Date: Fri, 13 Nov 2015 01:02:20 -0300 Subject: [PATCH 06/29] Plugins updated --- plugins/about/languages/en_US.json | 4 ++-- plugins/disqus/languages/de_DE.json | 2 +- plugins/disqus/languages/en_US.json | 4 ++-- plugins/disqus/languages/pl_PL.json | 7 +------ plugins/googletools/languages/de_DE.json | 9 ++------- plugins/googletools/languages/en_US.json | 4 ++-- plugins/googletools/languages/pl_PL.json | 7 +------ plugins/maintancemode/languages/en_US.json | 4 ++-- plugins/maintancemode/languages/pl_PL.json | 7 +------ plugins/opengraph/languages/en_US.json | 4 ++-- plugins/opengraph/languages/pl_PL.json | 7 +------ plugins/opengraph/languages/zh_TW.json | 2 +- plugins/pages/languages/de_DE.json | 2 +- plugins/pages/languages/en_US.json | 8 ++++---- plugins/pages/languages/fr_FR.json | 4 ++-- plugins/pages/languages/pl_PL.json | 11 +++-------- plugins/pages/languages/zh_TW.json | 4 ++-- plugins/simplemde/languages/de_DE.json | 2 +- plugins/simplemde/languages/en_US.json | 4 ++-- plugins/simplemde/languages/pl_PL.json | 7 +------ plugins/tags/languages/de_DE.json | 2 +- plugins/tags/languages/en_US.json | 4 ++-- plugins/tags/languages/pl_PL.json | 7 +------ 23 files changed, 38 insertions(+), 78 deletions(-) diff --git a/plugins/about/languages/en_US.json b/plugins/about/languages/en_US.json index cbab48ef..f058c1fd 100644 --- a/plugins/about/languages/en_US.json +++ b/plugins/about/languages/en_US.json @@ -2,11 +2,11 @@ "plugin-data": { "name": "About", - "description": "Little description about your site or your self.", + "description": "Little description about your site or yourself.", "author": "Bludit", "email": "", "website": "https://github.com/dignajar/bludit-plugins", "version": "0.6", - "releaseDate": "2015-11-10" + "releaseDate": "2015-11-13" } } \ No newline at end of file diff --git a/plugins/disqus/languages/de_DE.json b/plugins/disqus/languages/de_DE.json index 8c5a30d8..5b5f0747 100644 --- a/plugins/disqus/languages/de_DE.json +++ b/plugins/disqus/languages/de_DE.json @@ -8,4 +8,4 @@ "enable-disqus-on-pages": "Disqus auf Seiten verwenden", "enable-disqus-on-posts": "Disqus bei Beiträgen verwenden", "enable-disqus-on-default-home-page": "Disqus auf der Hauptseite verwenden" -} +} \ No newline at end of file diff --git a/plugins/disqus/languages/en_US.json b/plugins/disqus/languages/en_US.json index 2309f4b4..e53d65d6 100644 --- a/plugins/disqus/languages/en_US.json +++ b/plugins/disqus/languages/en_US.json @@ -6,8 +6,8 @@ "author": "Bludit", "email": "", "website": "https://github.com/dignajar/bludit-plugins", - "version": "0.3", - "releaseDate": "2015-10-02" + "version": "0.6", + "releaseDate": "2015-11-13" }, "disqus-shortname": "Disqus shortname", "enable-disqus-on-pages": "Enable Disqus on pages", diff --git a/plugins/disqus/languages/pl_PL.json b/plugins/disqus/languages/pl_PL.json index 6b8e58ba..13fb0fad 100644 --- a/plugins/disqus/languages/pl_PL.json +++ b/plugins/disqus/languages/pl_PL.json @@ -2,12 +2,7 @@ "plugin-data": { "name": "System komentarzy - Disqus", - "description": "System komentarzy Disqus przechowuje komentarze dla serwisów internetowych. Korzystanie z tej wtyczki wymaga rejestracji w serwisie disqus.com.", - "author": "Bludit", - "email": "", - "website": "https://github.com/dignajar/bludit-plugins", - "version": "0.3", - "releaseDate": "2015-10-02" + "description": "System komentarzy Disqus przechowuje komentarze dla serwisów internetowych. Korzystanie z tej wtyczki wymaga rejestracji w serwisie disqus.com." }, "disqus-shortname": "Nazwa użytkownika Disqus", "enable-disqus-on-pages": "Włącz Disqus na wszystkich stronach", diff --git a/plugins/googletools/languages/de_DE.json b/plugins/googletools/languages/de_DE.json index b9abb81d..8b3abce9 100644 --- a/plugins/googletools/languages/de_DE.json +++ b/plugins/googletools/languages/de_DE.json @@ -2,15 +2,10 @@ "plugin-data": { "name": "Google-Tools", - "description": "Dieses Plugin erzeugt den Meta-Tag, um deine Website mit den Google Webmasters Tools zu verbinden, und den Code für das JavaScript, der benötigt wird, um Google Analytics verwenden zu können.", - "author": "Bludit", - "email": "", - "website": "https://github.com/dignajar/bludit-plugins", - "version": "0.3", - "releaseDate": "2015-10-02" + "description": "Dieses Plugin erzeugt den Meta-Tag, um deine Website mit den Google Webmasters Tools zu verbinden, und den Code für das JavaScript, der benötigt wird, um Google Analytics verwenden zu können." }, "google-webmasters-tools": "Google Webmasters Tools", "google-analytics-tracking-id": "Google Analytics ID", "complete-this-field-with-the-google-site-verification": "Gib hier den Google Analytics-Tracking-Code ein, um zu bestätigen, dass die Website Dir gehört.", "complete-this-field-with-the-tracking-id": "Gib hier die Tracking ID ein." -} +} \ No newline at end of file diff --git a/plugins/googletools/languages/en_US.json b/plugins/googletools/languages/en_US.json index 2829cb21..0697e6e0 100644 --- a/plugins/googletools/languages/en_US.json +++ b/plugins/googletools/languages/en_US.json @@ -6,8 +6,8 @@ "author": "Bludit", "email": "", "website": "https://github.com/dignajar/bludit-plugins", - "version": "0.3", - "releaseDate": "2015-10-02" + "version": "0.6", + "releaseDate": "2015-11-13" }, "google-webmasters-tools": "Google Webmasters tools", "google-analytics-tracking-id": "Google Analytics Tracking ID", diff --git a/plugins/googletools/languages/pl_PL.json b/plugins/googletools/languages/pl_PL.json index 1124e2f5..a20abd2c 100644 --- a/plugins/googletools/languages/pl_PL.json +++ b/plugins/googletools/languages/pl_PL.json @@ -2,12 +2,7 @@ "plugin-data": { "name": "Narzędzia Google", - "description": "Wtyczka ta generuje kod metatagów pozwalający zweryfikować stronę z serwisem Narzędzia Google Dla Webmasterów oraz wygenerować kod JavaScript monitorujący ruch z usługą Google Analytics.", - "author": "Bludit", - "email": "", - "website": "https://github.com/dignajar/bludit-plugins", - "version": "0.3", - "releaseDate": "2015-10-02" + "description": "Wtyczka ta generuje kod metatagów pozwalający zweryfikować stronę z serwisem Narzędzia Google Dla Webmasterów oraz wygenerować kod JavaScript monitorujący ruch z usługą Google Analytics." }, "google-webmasters-tools": "Google Webmasters tools", "google-analytics-tracking-id": "Google Analytics Tracking ID", diff --git a/plugins/maintancemode/languages/en_US.json b/plugins/maintancemode/languages/en_US.json index cc1eb966..3bb095f6 100644 --- a/plugins/maintancemode/languages/en_US.json +++ b/plugins/maintancemode/languages/en_US.json @@ -6,8 +6,8 @@ "author": "Bludit", "email": "", "website": "https://github.com/dignajar/bludit-plugins", - "version": "0.3", - "releaseDate": "2015-10-02" + "version": "0.6", + "releaseDate": "2015-11-13" }, "enable-maintence-mode": "Enable maintence mode", diff --git a/plugins/maintancemode/languages/pl_PL.json b/plugins/maintancemode/languages/pl_PL.json index 441715d3..4472a53d 100644 --- a/plugins/maintancemode/languages/pl_PL.json +++ b/plugins/maintancemode/languages/pl_PL.json @@ -2,12 +2,7 @@ "plugin-data": { "name": "Tryb konserwacji", - "description": "Przełącz stronę w tryb konwersacji (wówczas działać będzie tylko kokpit).", - "author": "Bludit", - "email": "", - "website": "https://github.com/dignajar/bludit-plugins", - "version": "0.3", - "releaseDate": "2015-10-02" + "description": "Przełącz stronę w tryb konwersacji (wówczas działać będzie tylko kokpit)." }, "enable-maintence-mode": "Włącz tryb konwersacji", diff --git a/plugins/opengraph/languages/en_US.json b/plugins/opengraph/languages/en_US.json index e77e4055..56690f5a 100644 --- a/plugins/opengraph/languages/en_US.json +++ b/plugins/opengraph/languages/en_US.json @@ -6,7 +6,7 @@ "author": "Bludit", "email": "", "website": "https://github.com/dignajar/bludit-plugins", - "version": "0.3", - "releaseDate": "2015-10-02" + "version": "0.6", + "releaseDate": "2015-11-13" } } \ No newline at end of file diff --git a/plugins/opengraph/languages/pl_PL.json b/plugins/opengraph/languages/pl_PL.json index c34a49cb..41b92e0a 100644 --- a/plugins/opengraph/languages/pl_PL.json +++ b/plugins/opengraph/languages/pl_PL.json @@ -2,11 +2,6 @@ "plugin-data": { "name": "Open Graph", - "description": "Protokół Open Graph zezwala stronie na stosowanie meta tagów używanych w serwisach społecznościowych.", - "author": "Bludit", - "email": "", - "website": "https://github.com/dignajar/bludit-plugins", - "version": "0.3", - "releaseDate": "2015-10-02" + "description": "Protokół Open Graph zezwala stronie na stosowanie meta tagów używanych w serwisach społecznościowych." } } \ No newline at end of file diff --git a/plugins/opengraph/languages/zh_TW.json b/plugins/opengraph/languages/zh_TW.json index 18122e8b..0a59b71d 100644 --- a/plugins/opengraph/languages/zh_TW.json +++ b/plugins/opengraph/languages/zh_TW.json @@ -4,4 +4,4 @@ "name": "開放社交關係圖", "description": "開放社交關係圖協定可以讓任何網頁變成豐富的物件" } -} +} \ No newline at end of file diff --git a/plugins/pages/languages/de_DE.json b/plugins/pages/languages/de_DE.json index c6695ed0..5e5930b6 100644 --- a/plugins/pages/languages/de_DE.json +++ b/plugins/pages/languages/de_DE.json @@ -7,4 +7,4 @@ "home": "Hauptseite", "show-home-link": "Hauptseite zeigen" -} +} \ No newline at end of file diff --git a/plugins/pages/languages/en_US.json b/plugins/pages/languages/en_US.json index 76669570..caf9858c 100644 --- a/plugins/pages/languages/en_US.json +++ b/plugins/pages/languages/en_US.json @@ -6,10 +6,10 @@ "author": "Bludit", "email": "", "website": "https://github.com/dignajar/bludit-plugins", - "version": "0.3", - "releaseDate": "2015-10-02" + "version": "0.6", + "releaseDate": "2015-11-13" }, - "home": "Home", - "show-home-link": "Show home link" + "home": "Home", + "show-home-link": "Show home link" } \ No newline at end of file diff --git a/plugins/pages/languages/fr_FR.json b/plugins/pages/languages/fr_FR.json index e74fe901..3efb4769 100644 --- a/plugins/pages/languages/fr_FR.json +++ b/plugins/pages/languages/fr_FR.json @@ -5,6 +5,6 @@ "description": "Constitue un menu avec les liens des pages dans la colonne du thème." }, - "home": "Accueil", - "show-home-link": "Afficher le lien de la page d’accueil" + "home": "Accueil", + "show-home-link": "Afficher le lien de la page d’accueil" } \ No newline at end of file diff --git a/plugins/pages/languages/pl_PL.json b/plugins/pages/languages/pl_PL.json index 1473cf84..74a469af 100644 --- a/plugins/pages/languages/pl_PL.json +++ b/plugins/pages/languages/pl_PL.json @@ -2,14 +2,9 @@ "plugin-data": { "name": "Lista stron", - "description": "Wyświetla listę stron znajdujących się w witrynie.", - "author": "Bludit", - "email": "", - "website": "https://github.com/dignajar/bludit-plugins", - "version": "0.3", - "releaseDate": "2015-10-02" + "description": "Wyświetla listę stron znajdujących się w witrynie." }, - "home": "Strona główna", - "show-home-link": "Pokaż odnośnik do strony głównek" + "home": "Strona główna", + "show-home-link": "Pokaż odnośnik do strony głównek" } \ No newline at end of file diff --git a/plugins/pages/languages/zh_TW.json b/plugins/pages/languages/zh_TW.json index 7ee59e60..e5a6ccb2 100644 --- a/plugins/pages/languages/zh_TW.json +++ b/plugins/pages/languages/zh_TW.json @@ -5,6 +5,6 @@ "description": "顯示所有頁面的列表" }, - "home": "首頁", - "show-home-link": "顯示首頁連結" + "home": "首頁", + "show-home-link": "顯示首頁連結" } \ No newline at end of file diff --git a/plugins/simplemde/languages/de_DE.json b/plugins/simplemde/languages/de_DE.json index 1f9261cf..2249bd5c 100644 --- a/plugins/simplemde/languages/de_DE.json +++ b/plugins/simplemde/languages/de_DE.json @@ -6,4 +6,4 @@ }, "toolbar": "Werkzeugleiste", "tab-size": "Abstände der Tabstopps" -} +} \ No newline at end of file diff --git a/plugins/simplemde/languages/en_US.json b/plugins/simplemde/languages/en_US.json index 55f8be9a..9425cf5c 100644 --- a/plugins/simplemde/languages/en_US.json +++ b/plugins/simplemde/languages/en_US.json @@ -6,8 +6,8 @@ "author": "NextStepWebs", "email": "", "website": "https://github.com/NextStepWebs/simplemde-markdown-editor", - "version": "1.8.0", - "releaseDate": "2015-10-29" + "version": "1.8.1", + "releaseDate": "2015-11-13" }, "toolbar": "Toolbar", "tab-size": "Tab size" diff --git a/plugins/simplemde/languages/pl_PL.json b/plugins/simplemde/languages/pl_PL.json index 2c1e492c..020c49fe 100644 --- a/plugins/simplemde/languages/pl_PL.json +++ b/plugins/simplemde/languages/pl_PL.json @@ -2,12 +2,7 @@ "plugin-data": { "name": "Edytor SimpleMDE", - "description": "Prosty, piękny i osadzony w JavaScript edytor markdown stworzony przez @WesCossick. Na potrzeby Bludit dostosowany przez Diego Najara.", - "author": "NextStepWebs", - "email": "", - "website": "https://github.com/NextStepWebs/simplemde-markdown-editor", - "version": "1.7.4", - "releaseDate": "2015-10-02" + "description": "Prosty, piękny i osadzony w JavaScript edytor markdown stworzony przez @WesCossick. Na potrzeby Bludit dostosowany przez Diego Najar." }, "toolbar": "Pasek narzędzi", "tab-size": "Rozmiar wcięcia" diff --git a/plugins/tags/languages/de_DE.json b/plugins/tags/languages/de_DE.json index 5149f12d..86bcf65d 100644 --- a/plugins/tags/languages/de_DE.json +++ b/plugins/tags/languages/de_DE.json @@ -4,4 +4,4 @@ "name": "Anzeige aller Schlagwörter", "description": "Anzeige aller Schlagwörter in der Seitenleiste (bei Themes mit Seitenleiste)." } -} +} \ No newline at end of file diff --git a/plugins/tags/languages/en_US.json b/plugins/tags/languages/en_US.json index 8b0e9b09..50beff32 100644 --- a/plugins/tags/languages/en_US.json +++ b/plugins/tags/languages/en_US.json @@ -6,7 +6,7 @@ "author": "Bludit", "email": "", "website": "https://github.com/dignajar/bludit-plugins", - "version": "0.3", - "releaseDate": "2015-10-02" + "version": "0.6", + "releaseDate": "2015-11-13" } } \ No newline at end of file diff --git a/plugins/tags/languages/pl_PL.json b/plugins/tags/languages/pl_PL.json index 604d1c54..ae5f30ad 100644 --- a/plugins/tags/languages/pl_PL.json +++ b/plugins/tags/languages/pl_PL.json @@ -2,11 +2,6 @@ "plugin-data": { "name": "Lista tagów", - "description": "Wyświetla wszystkie tagi w postaci listy.", - "author": "Bludit", - "email": "", - "website": "https://github.com/dignajar/bludit-plugins", - "version": "0.3", - "releaseDate": "2015-10-02" + "description": "Wyświetla wszystkie tagi w postaci listy." } } \ No newline at end of file From 47a27d7103d88c5994cc75dcb5887c78a2e7c71e Mon Sep 17 00:00:00 2001 From: Edi Date: Fri, 13 Nov 2015 20:43:35 +0100 Subject: [PATCH 07/29] Small modifications --- languages/de_DE.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/languages/de_DE.json b/languages/de_DE.json index df4ef2a8..00978021 100644 --- a/languages/de_DE.json +++ b/languages/de_DE.json @@ -3,7 +3,7 @@ { "native": "Deutsch (Deutschland)", "english-name": "German", - "last-update": "2015-11-10", + "last-update": "2015-11-13", "author": "Edi Goetschel", "email": "egoetschel@clickwork.ch", "website": "http://www.clickwork.ch" @@ -193,8 +193,8 @@ "show-password": "Passwort zeigen", "edit-or-remove-your=pages": "Seiten bearbeiten oder löschen.", "edit-or-remove-your-blogs-posts": "Beiträge bearbeiten oder löschen.", - "general-settings": "Allgemeine Einnstellungen", - "advanced-settings": "Erweiterte Einnstellungen", + "general-settings": "Allgemein", + "advanced-settings": "Erweitert", "manage-users": "Benutzerverwaltung", "view-and-edit-your-profile": "Profil anschauen und bearbeiten.", "password-must-be-at-least-6-characters-long": "Das Passwort muss mindestens 6 Zeichen lang sein", From ccd0977ea6ac03075fcc2ff11bbcf05d9657e048 Mon Sep 17 00:00:00 2001 From: dignajar Date: Fri, 13 Nov 2015 20:03:51 -0300 Subject: [PATCH 08/29] Fixes for relative paths for Windows Web Servers --- kernel/boot/init.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/boot/init.php b/kernel/boot/init.php index e9471d91..8bb47f1f 100644 --- a/kernel/boot/init.php +++ b/kernel/boot/init.php @@ -173,7 +173,7 @@ define('HTML_PATH_PLUGINS', HTML_PATH_ROOT.'plugins/'); define('JQUERY', HTML_PATH_ADMIN_THEME_JS.'jquery.min.js'); // PHP paths with dependency -define('PATH_THEME', PATH_ROOT.'themes/'.$Site->theme().'/'); +define('PATH_THEME', PATH_ROOT.'themes'.DS.$Site->theme().DS); define('PATH_THEME_PHP', PATH_THEME.'php'.DS); define('PATH_THEME_CSS', PATH_THEME.'css'.DS); define('PATH_THEME_JS', PATH_THEME.'js'.DS); From 16651cf8f752d9f5b3bf87a0edfc265afaf19e32 Mon Sep 17 00:00:00 2001 From: dignajar Date: Fri, 13 Nov 2015 20:41:30 -0300 Subject: [PATCH 09/29] Fixes for relative paths for Windows Web Servers --- kernel/boot/init.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kernel/boot/init.php b/kernel/boot/init.php index 8bb47f1f..ccef230e 100644 --- a/kernel/boot/init.php +++ b/kernel/boot/init.php @@ -147,13 +147,16 @@ $Parsedown = new Parsedown(); $Security = new Security(); // HTML PATHs -//$base = (dirname(getenv('SCRIPT_NAME'))==DS)?'/':dirname(getenv('SCRIPT_NAME')).'/'; $base = empty( $_SERVER['SCRIPT_NAME'] ) ? $_SERVER['PHP_SELF'] : $_SERVER['SCRIPT_NAME']; $base = dirname($base); if($base!=DS) { $base = $base.'/'; } +else { + // Workaround for Windows Web Servers + $base = '/'; +} define('HTML_PATH_ROOT', $base); From 9d16a4b754ff0659ff57dccd23c2d2ba1b5a01d8 Mon Sep 17 00:00:00 2001 From: dignajar Date: Sat, 14 Nov 2015 13:47:26 -0300 Subject: [PATCH 10/29] Date format for posts and plugin pages bug fixes --- admin/views/manage-posts.php | 2 +- admin/views/settings-regional.php | 7 + kernel/abstract/dbjson.class.php | 9 ++ kernel/boot/init.php | 3 +- kernel/boot/rules/70.posts.php | 7 + kernel/dbsite.class.php | 59 +++++--- kernel/helpers/image.class.php | 232 ++++++++++++++++++++++++++++++ kernel/post.class.php | 8 +- languages/en_US.json | 4 +- plugins/pages/plugin.php | 36 +++-- themes/pure/languages/de_DE.json | 9 +- themes/pure/languages/en_US.json | 6 +- 12 files changed, 332 insertions(+), 50 deletions(-) create mode 100644 kernel/helpers/image.class.php diff --git a/admin/views/manage-posts.php b/admin/views/manage-posts.php index 3903eefc..01cf6c7b 100644 --- a/admin/views/manage-posts.php +++ b/admin/views/manage-posts.php @@ -26,7 +26,7 @@ echo ' echo ''; echo ''.($status?''.$status.'':'').($Post->title()?$Post->title():''.$Language->g('Empty title').' ').''; - echo ''.$Post->date().''; + echo ''.$Post->dateRaw().''; echo ''.$Url->filters('post').'/'.$Post->key().''; echo ''; } diff --git a/admin/views/settings-regional.php b/admin/views/settings-regional.php index d06bb019..bb84a0a3 100644 --- a/admin/views/settings-regional.php +++ b/admin/views/settings-regional.php @@ -35,6 +35,13 @@ HTML::formOpen(array('class'=>'uk-form-horizontal')); 'tip'=>$L->g('you-can-use-this-field-to-define-a-set-off') )); + HTML::formInputText(array( + 'name'=>'dateFormat', + 'label'=>$L->g('Date format'), + 'value'=>$Site->dateFormat(), + 'class'=>'uk-width-1-2 uk-form-medium' + )); + echo '
diff --git a/kernel/abstract/dbjson.class.php b/kernel/abstract/dbjson.class.php index a792164d..ccd3fa80 100644 --- a/kernel/abstract/dbjson.class.php +++ b/kernel/abstract/dbjson.class.php @@ -58,6 +58,15 @@ class dbJSON return count($this->db); } + public function getField($field) + { + if(isset($this->db[$field])) { + return $this->db[$field]; + } + + return $this->dbFields[$field]['value']; + } + // Save the JSON file. public function save() { diff --git a/kernel/boot/init.php b/kernel/boot/init.php index ccef230e..291acba0 100644 --- a/kernel/boot/init.php +++ b/kernel/boot/init.php @@ -75,7 +75,7 @@ define('CLI_STATUS', 'published'); // Database format date define('DB_DATE_FORMAT', 'Y-m-d H:i'); -// Database format date +// Date format for Dashboard schedule posts define('SCHEDULED_DATE_FORMAT', 'd M - h:i a'); // Token time to live for login via email. The offset is defined by http://php.net/manual/en/datetime.modify.php @@ -128,6 +128,7 @@ include(PATH_HELPERS.'email.class.php'); include(PATH_HELPERS.'filesystem.class.php'); include(PATH_HELPERS.'alert.class.php'); include(PATH_HELPERS.'paginator.class.php'); +include(PATH_HELPERS.'image.class.php'); // Session Session::start(); diff --git a/kernel/boot/rules/70.posts.php b/kernel/boot/rules/70.posts.php index 62f6ff9e..2294d624 100644 --- a/kernel/boot/rules/70.posts.php +++ b/kernel/boot/rules/70.posts.php @@ -68,6 +68,13 @@ function buildPost($key) $Post->setField('breakContent', $explode[0], true); $Post->setField('readMore', !empty($explode[1]), true); + // Date format + $postDate = $Post->date(); + $Post->setField('dateRaw', $postDate, true); + + $postDateFormated = $Post->dateRaw( $Site->dateFormat() ); + $Post->setField('date', $postDateFormated, true); + // Parse username for the post. if( $dbUsers->userExists( $Post->username() ) ) { diff --git a/kernel/dbsite.class.php b/kernel/dbsite.class.php index b1058d9a..7a000448 100644 --- a/kernel/dbsite.class.php +++ b/kernel/dbsite.class.php @@ -2,7 +2,7 @@ class dbSite extends dbJSON { - private $dbFields = array( + public $dbFields = array( 'title'=> array('inFile'=>false, 'value'=>'I am Guybrush Threepwood, mighty developer'), 'slogan'=> array('inFile'=>false, 'value'=>''), 'description'=> array('inFile'=>false, 'value'=>''), @@ -19,7 +19,9 @@ class dbSite extends dbJSON 'uriTag'=> array('inFile'=>false, 'value'=>'/tag/'), 'url'=> array('inFile'=>false, 'value'=>''), 'cliMode'=> array('inFile'=>false, 'value'=>true), - 'emailFrom'=> array('inFile'=>false, 'value'=>'') + 'emailFrom'=> array('inFile'=>false, 'value'=>''), + 'dateFormat'=> array('inFile'=>false, 'value'=>'F j, Y'), + 'timeFormat'=> array('inFile'=>false, 'value'=>'g:i a') ); function __construct() @@ -61,9 +63,9 @@ class dbSite extends dbJSON public function uriFilters($filter='') { $filters['admin'] = '/admin/'; - $filters['post'] = $this->db['uriPost']; - $filters['page'] = $this->db['uriPage']; - $filters['tag'] = $this->db['uriTag']; + $filters['post'] = $this->getField('uriPost'); + $filters['page'] = $this->getField('uriPage'); + $filters['tag'] = $this->getField('uriTag'); if(empty($filter)) { return $filters; @@ -74,70 +76,83 @@ class dbSite extends dbJSON public function urlPost() { - return $this->url().ltrim($this->db['uriPost'], '/'); + $filter = $this->getField('uriPost'); + return $this->url().ltrim($filter, '/'); } public function urlPage() { - return $this->url().ltrim($this->db['uriPage'], '/'); + $filter = $this->getField('uriPage'); + return $this->url().ltrim($filter, '/'); } public function urlTag() { - return $this->url().ltrim($this->db['uriTag'], '/'); + $filter = $this->getField('uriTag'); + return $this->url().ltrim($filter, '/'); } // Returns the site title. public function title() { - return $this->db['title']; + return $this->getField('title'); } public function emailFrom() { - return $this->db['emailFrom']; + return $this->getField('emailFrom'); + } + + public function dateFormat() + { + return $this->getField('dateFormat'); + } + + public function timeFormat() + { + return $this->getField('timeFormat'); } // Returns the site slogan. public function slogan() { - return $this->db['slogan']; + return $this->getField('slogan'); } // Returns the site description. public function description() { - return $this->db['description']; + return $this->getField('description'); } // Returns the site theme name. public function theme() { - return $this->db['theme']; + return $this->getField('theme'); } // Returns the admin theme name. public function adminTheme() { - return $this->db['adminTheme']; + return $this->getField('adminTheme'); } // Returns the footer text. public function footer() { - return $this->db['footer']; + return $this->getField('footer'); } // Returns the url site. public function url() { - return $this->db['url']; + return $this->getField('url'); } // Returns TRUE if the cli mode is enabled, otherwise FALSE. public function cliMode() { - return $this->db['cliMode']; + return $this->getField('cliMode'); } // Returns the relative home link @@ -149,25 +164,25 @@ class dbSite extends dbJSON // Returns the timezone. public function timezone() { - return $this->db['timezone']; + return $this->getField('timezone'); } // Returns posts per page. public function postsPerPage() { - return $this->db['postsperpage']; + return $this->getField('postsperpage'); } // Returns the current language. public function language() { - return $this->db['language']; + return $this->getField('language'); } // Returns the current locale. public function locale() { - return $this->db['locale']; + return $this->getField('locale'); } // Returns the current language in short format. @@ -183,7 +198,7 @@ class dbSite extends dbJSON // Returns the current homepage. public function homepage() { - return $this->db['homepage']; + return $this->getField('homepage'); } // Set the locale. diff --git a/kernel/helpers/image.class.php b/kernel/helpers/image.class.php new file mode 100644 index 00000000..1ee2453e --- /dev/null +++ b/kernel/helpers/image.class.php @@ -0,0 +1,232 @@ +image = $this->openImage($fileName); + + // *** Get width and height + $this->width = imagesx($this->image); + $this->height = imagesy($this->image); + + $this->resizeImage($newWidth, $newHeight, $option); + } + + public function saveImage($savePath, $imageQuality="100", $force_jpg=false) + { + $extension = strtolower(pathinfo($savePath, PATHINFO_EXTENSION)); + + // Remove the extension + $filename = substr($savePath, 0,strrpos($savePath,'.')); + + $path_complete = $filename.'.'.$extension; + + if($force_jpg) + { + imagejpeg($this->imageResized, $filename.'.jpg', $imageQuality); + } + else + { + switch($extension) + { + case 'jpg': + case 'jpeg': + if (imagetypes() & IMG_JPG) { + imagejpeg($this->imageResized, $path_complete, $imageQuality); + } + break; + + case 'gif': + if (imagetypes() & IMG_GIF) { + imagegif($this->imageResized, $path_complete); + } + break; + + case 'png': + // *** Scale quality from 0-100 to 0-9 + $scaleQuality = round(($imageQuality/100) * 9); + + // *** Invert quality setting as 0 is best, not 9 + $invertScaleQuality = 9 - $scaleQuality; + + if (imagetypes() & IMG_PNG) { + imagepng($this->imageResized, $path_complete, $invertScaleQuality); + } + break; + + default: + // *** No extension - No save. + break; + } + } + + imagedestroy($this->imageResized); + } + + private function openImage($file) + { + // *** Get extension + $extension = strtolower(strrchr($file, '.')); + + switch($extension) + { + case '.jpg': + case '.jpeg': + $img = imagecreatefromjpeg($file); + break; + case '.gif': + $img = imagecreatefromgif($file); + break; + case '.png': + $img = imagecreatefrompng($file); + break; + default: + $img = false; + break; + } + return $img; + } + + private function resizeImage($newWidth, $newHeight, $option) + { + // *** Get optimal width and height - based on $option + $optionArray = $this->getDimensions($newWidth, $newHeight, $option); + + $optimalWidth = $optionArray['optimalWidth']; + $optimalHeight = $optionArray['optimalHeight']; + + + // *** Resample - create image canvas of x, y size + $this->imageResized = imagecreatetruecolor($optimalWidth, $optimalHeight); + imagecopyresampled($this->imageResized, $this->image, 0, 0, 0, 0, $optimalWidth, $optimalHeight, $this->width, $this->height); + + + // *** if option is 'crop', then crop too + if ($option == 'crop') { + $this->crop($optimalWidth, $optimalHeight, $newWidth, $newHeight); + } + } + + private function getDimensions($newWidth, $newHeight, $option) + { + + if( ($this->width < $newWidth) and ($this->height < $newHeight) ) + { + return array('optimalWidth' => $this->width, 'optimalHeight' => $this->height); + } + + switch ($option) + { + case 'exact': + $optimalWidth = $newWidth; + $optimalHeight= $newHeight; + break; + case 'portrait': + $optimalWidth = $this->getSizeByFixedHeight($newHeight); + $optimalHeight= $newHeight; + break; + case 'landscape': + $optimalWidth = $newWidth; + $optimalHeight= $this->getSizeByFixedWidth($newWidth); + break; + case 'auto': + $optionArray = $this->getSizeByAuto($newWidth, $newHeight); + $optimalWidth = $optionArray['optimalWidth']; + $optimalHeight = $optionArray['optimalHeight']; + break; + case 'crop': + $optionArray = $this->getOptimalCrop($newWidth, $newHeight); + $optimalWidth = $optionArray['optimalWidth']; + $optimalHeight = $optionArray['optimalHeight']; + break; + } + + return array('optimalWidth' => $optimalWidth, 'optimalHeight' => $optimalHeight); + } + + private function getSizeByFixedHeight($newHeight) + { + $ratio = $this->width / $this->height; + $newWidth = $newHeight * $ratio; + return $newWidth; + } + + private function getSizeByFixedWidth($newWidth) + { + $ratio = $this->height / $this->width; + $newHeight = $newWidth * $ratio; + return $newHeight; + } + + private function getSizeByAuto($newWidth, $newHeight) + { + if ($this->height < $this->width) + // *** Image to be resized is wider (landscape) + { + $optimalWidth = $newWidth; + $optimalHeight= $this->getSizeByFixedWidth($newWidth); + } + elseif ($this->height > $this->width) + // *** Image to be resized is taller (portrait) + { + $optimalWidth = $this->getSizeByFixedHeight($newHeight); + $optimalHeight= $newHeight; + } + else + // *** Image to be resizerd is a square + { + if ($newHeight < $newWidth) { + $optimalWidth = $newWidth; + $optimalHeight= $this->getSizeByFixedWidth($newWidth); + } else if ($newHeight > $newWidth) { + $optimalWidth = $this->getSizeByFixedHeight($newHeight); + $optimalHeight= $newHeight; + } else { + // *** Sqaure being resized to a square + $optimalWidth = $newWidth; + $optimalHeight= $newHeight; + } + } + + return array('optimalWidth' => $optimalWidth, 'optimalHeight' => $optimalHeight); + } + + private function getOptimalCrop($newWidth, $newHeight) + { + + $heightRatio = $this->height / $newHeight; + $widthRatio = $this->width / $newWidth; + + if ($heightRatio < $widthRatio) { + $optimalRatio = $heightRatio; + } else { + $optimalRatio = $widthRatio; + } + + $optimalHeight = $this->height / $optimalRatio; + $optimalWidth = $this->width / $optimalRatio; + + return array('optimalWidth' => $optimalWidth, 'optimalHeight' => $optimalHeight); + } + + private function crop($optimalWidth, $optimalHeight, $newWidth, $newHeight) + { + // *** Find center - this will be used for the crop + $cropStartX = ( $optimalWidth / 2) - ( $newWidth /2 ); + $cropStartY = ( $optimalHeight/ 2) - ( $newHeight/2 ); + + $crop = $this->imageResized; + //imagedestroy($this->imageResized); + + // *** Now crop from center to exact requested size + $this->imageResized = imagecreatetruecolor($newWidth , $newHeight); + imagecopyresampled($this->imageResized, $crop , 0, 0, $cropStartX, $cropStartY, $newWidth, $newHeight , $newWidth, $newHeight); + } +} diff --git a/kernel/post.class.php b/kernel/post.class.php index f2eb18eb..3abed452 100644 --- a/kernel/post.class.php +++ b/kernel/post.class.php @@ -101,7 +101,13 @@ class Post extends fileContent // Returns the post date according to locale settings and format settings. public function date($format=false) { - $date = $this->getField('date'); + return $this->getField('date'); + } + + // Returns the post date according to locale settings and format as database stored. + public function dateRaw($format=false) + { + $date = $this->getField('dateRaw'); if($format) { return Date::format($date, DB_DATE_FORMAT, $format); diff --git a/languages/en_US.json b/languages/en_US.json index e308c6f4..4334f55c 100644 --- a/languages/en_US.json +++ b/languages/en_US.json @@ -204,5 +204,7 @@ "upload-image": "Upload image", "drag-and-drop-or-click-here": "Drag and drop or click here", "insert-image": "Insert image", - "supported-image-file-types": "Supported image file types" + "supported-image-file-types": "Supported image file types", + "date-format": "Date format", + "time-format": "Time format" } \ No newline at end of file diff --git a/plugins/pages/plugin.php b/plugins/pages/plugin.php index c75636f8..324d5bda 100644 --- a/plugins/pages/plugin.php +++ b/plugins/pages/plugin.php @@ -54,24 +54,32 @@ class pluginPages extends Plugin { $parents = $pagesParents[NO_PARENT_CHAR]; foreach($parents as $parent) { - // Print the parent - $html .= '
  • '; - $html .= ''.$parent->title().''; - - // Check if the parent has children - if(isset($pagesParents[$parent->key()])) + // Check if the parent is published + if( $parent->published() ) { - $children = $pagesParents[$parent->key()]; + // Print the parent + $html .= '
  • '; + $html .= ''.$parent->title().''; - // Print children - $html .= '
      '; - foreach($children as $child) + // Check if the parent has children + if(isset($pagesParents[$parent->key()])) { - $html .= '
    • '; - $html .= ''.$child->title().''; - $html .= '
      • '; + $children = $pagesParents[$parent->key()]; + + // Print children + $html .= '
        '; + foreach($children as $child) + { + // Check if the child is published + if( $child->published() ) + { + $html .= '
      • '; + $html .= ''.$child->title().''; + $html .= '
        • '; + } + } + $html .= '
      '; } - $html .= '
    '; } } diff --git a/themes/pure/languages/de_DE.json b/themes/pure/languages/de_DE.json index aab4edba..00255464 100644 --- a/themes/pure/languages/de_DE.json +++ b/themes/pure/languages/de_DE.json @@ -2,11 +2,6 @@ "theme-data": { "name": "Pure", - "description": "Einfaches und übersichtliches Theme unter Verwendung des Frameworks Pure.css. Website: http://purecss.io.", - "author": "Bludit", - "email": "", - "website": "https://github.com/dignajar/bludit-themes", - "version": "0.3", - "releaseDate": "2015-10-02" + "description": "Einfaches und übersichtliches Theme unter Verwendung des Frameworks Pure.css." } -} +} \ No newline at end of file diff --git a/themes/pure/languages/en_US.json b/themes/pure/languages/en_US.json index 2a4c3e20..8d996c17 100644 --- a/themes/pure/languages/en_US.json +++ b/themes/pure/languages/en_US.json @@ -2,11 +2,11 @@ "theme-data": { "name": "Pure", - "description": "Simple and clean theme, based on the framework Pure.css. Website: http://purecss.io", + "description": "Simple and clean theme, based on the framework Pure.css.", "author": "Bludit", "email": "", "website": "https://github.com/dignajar/bludit-themes", - "version": "0.3", - "releaseDate": "2015-10-02" + "version": "0.6", + "releaseDate": "2015-11-13" } } \ No newline at end of file From f3607826ef6f75af7fe7f9f28b3ee46e1fa55f6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20K?= Date: Sun, 15 Nov 2015 10:11:31 +0100 Subject: [PATCH 11/29] French update --- languages/fr_FR.json | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) mode change 100644 => 100755 languages/fr_FR.json diff --git a/languages/fr_FR.json b/languages/fr_FR.json old mode 100644 new mode 100755 index 5eb05848..8c1bc7a4 --- a/languages/fr_FR.json +++ b/languages/fr_FR.json @@ -3,7 +3,7 @@ { "native": "Français (France)", "english-name": "French", - "last-update": "2015-11-08", + "last-update": "2015-11-15", "author": "Frédéric K.", "email": "stradfred@gmail.com", "website": "" @@ -169,6 +169,7 @@ "cli-mode": "Mode Cli", "command-line-mode": "Mode ligne de commande", "enable-the-command-line-mode-if-you-add-edit": "Activer le mode ligne de commande si vous créez, modifiez ou supprimez des articles ou des pages du système de fichiers.", + "configure": "Configuration", "uninstall": "Désinstaller", "change-password": "Modifier le mot de passe", @@ -202,6 +203,8 @@ "images": "Images", "upload-image": "Envoyer une image", "drag-and-drop-or-click-here": "Glissez et déposez ou cliquez ici", - "insert-image": "Insérer l’image sélectionnée" - + "insert-image": "Insérer l’image sélectionnée", + "supported-image-file-types": "Extensions des images prises en charge", + "date-format": "Format de la Date", + "time-format": "Format de l’heure" } \ No newline at end of file From f3bf006b9038e23dfe174a0d941481d8453b53a8 Mon Sep 17 00:00:00 2001 From: dignajar Date: Sun, 15 Nov 2015 18:37:34 -0300 Subject: [PATCH 12/29] Support for PHP Built-in in web server --- admin/README.md | 7 -- install.php | 2 +- {admin => kernel/admin}/controllers/about.php | 0 .../admin}/controllers/add-user.php | 0 .../admin}/controllers/configure-plugin.php | 0 .../admin}/controllers/dashboard.php | 0 .../admin}/controllers/edit-page.php | 0 .../admin}/controllers/edit-post.php | 0 .../admin}/controllers/edit-user.php | 0 .../admin}/controllers/install-plugin.php | 0 .../admin}/controllers/install-theme.php | 0 .../admin}/controllers/login-email.php | 0 {admin => kernel/admin}/controllers/login.php | 0 .../admin}/controllers/logout.php | 0 .../admin}/controllers/new-page.php | 0 .../admin}/controllers/new-post.php | 0 .../admin}/controllers/plugins.php | 0 .../admin}/controllers/settings-advanced.php | 0 .../admin}/controllers/settings-general.php | 0 .../admin}/controllers/settings-regional.php | 0 .../admin}/controllers/settings.php | 0 .../admin}/controllers/themes.php | 0 .../admin}/controllers/uninstall-plugin.php | 0 .../admin}/controllers/user-password.php | 0 {admin => kernel/admin}/controllers/users.php | 0 .../admin}/themes/default/css/default.css | 4 ++ .../themes/default/css/form-file.min.css | 0 .../admin}/themes/default/css/installer.css | 0 .../default/css/jquery.datetimepicker.css | 0 .../admin}/themes/default/css/login.css | 0 .../themes/default/css/placeholder.min.css | 0 .../themes/default/css/progress.min.css | 0 .../default/css/uikit.almost-flat.min.css | 0 .../admin}/themes/default/css/upload.min.css | 0 .../themes/default/fonts/FontAwesome.otf | Bin .../default/fonts/fontawesome-webfont.eot | Bin .../default/fonts/fontawesome-webfont.ttf | Bin .../default/fonts/fontawesome-webfont.woff | Bin .../default/fonts/fontawesome-webfont.woff2 | Bin .../admin}/themes/default/img/favicon.png | Bin .../admin}/themes/default/index.php | 0 .../admin}/themes/default/init.php | 60 ++++++++++++++++++ .../default/js/jquery.datetimepicker.js | 0 .../admin}/themes/default/js/jquery.min.js | 0 .../admin}/themes/default/js/uikit.min.js | 0 .../admin}/themes/default/js/upload.min.js | 0 .../admin}/themes/default/login.php | 0 {admin => kernel/admin}/views/about.php | 0 {admin => kernel/admin}/views/add-user.php | 0 .../admin}/views/configure-plugin.php | 0 {admin => kernel/admin}/views/dashboard.php | 0 {admin => kernel/admin}/views/edit-page.php | 0 {admin => kernel/admin}/views/edit-post.php | 0 {admin => kernel/admin}/views/edit-user.php | 10 +++ {admin => kernel/admin}/views/login-email.php | 2 +- {admin => kernel/admin}/views/login.php | 2 +- .../admin}/views/manage-pages.php | 0 .../admin}/views/manage-posts.php | 0 {admin => kernel/admin}/views/new-page.php | 0 {admin => kernel/admin}/views/new-post.php | 0 {admin => kernel/admin}/views/plugins.php | 0 .../admin}/views/settings-advanced.php | 0 .../admin}/views/settings-general.php | 0 .../admin}/views/settings-regional.php | 0 {admin => kernel/admin}/views/themes.php | 0 .../admin}/views/user-password.php | 0 {admin => kernel/admin}/views/users.php | 0 kernel/ajax/uploader.php | 20 ++++-- kernel/boot/init.php | 10 ++- 69 files changed, 100 insertions(+), 17 deletions(-) delete mode 100644 admin/README.md rename {admin => kernel/admin}/controllers/about.php (100%) rename {admin => kernel/admin}/controllers/add-user.php (100%) rename {admin => kernel/admin}/controllers/configure-plugin.php (100%) rename {admin => kernel/admin}/controllers/dashboard.php (100%) rename {admin => kernel/admin}/controllers/edit-page.php (100%) rename {admin => kernel/admin}/controllers/edit-post.php (100%) rename {admin => kernel/admin}/controllers/edit-user.php (100%) rename {admin => kernel/admin}/controllers/install-plugin.php (100%) rename {admin => kernel/admin}/controllers/install-theme.php (100%) rename {admin => kernel/admin}/controllers/login-email.php (100%) rename {admin => kernel/admin}/controllers/login.php (100%) rename {admin => kernel/admin}/controllers/logout.php (100%) rename {admin => kernel/admin}/controllers/new-page.php (100%) rename {admin => kernel/admin}/controllers/new-post.php (100%) rename {admin => kernel/admin}/controllers/plugins.php (100%) rename {admin => kernel/admin}/controllers/settings-advanced.php (100%) rename {admin => kernel/admin}/controllers/settings-general.php (100%) rename {admin => kernel/admin}/controllers/settings-regional.php (100%) rename {admin => kernel/admin}/controllers/settings.php (100%) rename {admin => kernel/admin}/controllers/themes.php (100%) rename {admin => kernel/admin}/controllers/uninstall-plugin.php (100%) rename {admin => kernel/admin}/controllers/user-password.php (100%) rename {admin => kernel/admin}/controllers/users.php (100%) rename {admin => kernel/admin}/themes/default/css/default.css (98%) rename {admin => kernel/admin}/themes/default/css/form-file.min.css (100%) rename {admin => kernel/admin}/themes/default/css/installer.css (100%) rename {admin => kernel/admin}/themes/default/css/jquery.datetimepicker.css (100%) rename {admin => kernel/admin}/themes/default/css/login.css (100%) rename {admin => kernel/admin}/themes/default/css/placeholder.min.css (100%) rename {admin => kernel/admin}/themes/default/css/progress.min.css (100%) rename {admin => kernel/admin}/themes/default/css/uikit.almost-flat.min.css (100%) rename {admin => kernel/admin}/themes/default/css/upload.min.css (100%) rename {admin => kernel/admin}/themes/default/fonts/FontAwesome.otf (100%) rename {admin => kernel/admin}/themes/default/fonts/fontawesome-webfont.eot (100%) rename {admin => kernel/admin}/themes/default/fonts/fontawesome-webfont.ttf (100%) rename {admin => kernel/admin}/themes/default/fonts/fontawesome-webfont.woff (100%) rename {admin => kernel/admin}/themes/default/fonts/fontawesome-webfont.woff2 (100%) rename {admin => kernel/admin}/themes/default/img/favicon.png (100%) rename {admin => kernel/admin}/themes/default/index.php (100%) rename {admin => kernel/admin}/themes/default/init.php (78%) rename {admin => kernel/admin}/themes/default/js/jquery.datetimepicker.js (100%) rename {admin => kernel/admin}/themes/default/js/jquery.min.js (100%) rename {admin => kernel/admin}/themes/default/js/uikit.min.js (100%) rename {admin => kernel/admin}/themes/default/js/upload.min.js (100%) rename {admin => kernel/admin}/themes/default/login.php (100%) rename {admin => kernel/admin}/views/about.php (100%) rename {admin => kernel/admin}/views/add-user.php (100%) rename {admin => kernel/admin}/views/configure-plugin.php (100%) rename {admin => kernel/admin}/views/dashboard.php (100%) rename {admin => kernel/admin}/views/edit-page.php (100%) rename {admin => kernel/admin}/views/edit-post.php (100%) rename {admin => kernel/admin}/views/edit-user.php (88%) rename {admin => kernel/admin}/views/login-email.php (81%) rename {admin => kernel/admin}/views/login.php (83%) rename {admin => kernel/admin}/views/manage-pages.php (100%) rename {admin => kernel/admin}/views/manage-posts.php (100%) rename {admin => kernel/admin}/views/new-page.php (100%) rename {admin => kernel/admin}/views/new-post.php (100%) rename {admin => kernel/admin}/views/plugins.php (100%) rename {admin => kernel/admin}/views/settings-advanced.php (100%) rename {admin => kernel/admin}/views/settings-general.php (100%) rename {admin => kernel/admin}/views/settings-regional.php (100%) rename {admin => kernel/admin}/views/themes.php (100%) rename {admin => kernel/admin}/views/user-password.php (100%) rename {admin => kernel/admin}/views/users.php (100%) diff --git a/admin/README.md b/admin/README.md deleted file mode 100644 index 46ec6cbf..00000000 --- a/admin/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# Bludit - -If you are reading this, you must enable rewrite module. - -Documentation: -- http://docs.bludit.com/en/getting-started/requirements -- http://docs.bludit.com/en/troubleshooting/browser-returns-not-found \ No newline at end of file diff --git a/install.php b/install.php index f2bc046d..b08d9e3d 100644 --- a/install.php +++ b/install.php @@ -469,7 +469,7 @@ if( $_SERVER['REQUEST_METHOD'] == 'POST' ) - + diff --git a/admin/controllers/about.php b/kernel/admin/controllers/about.php similarity index 100% rename from admin/controllers/about.php rename to kernel/admin/controllers/about.php diff --git a/admin/controllers/add-user.php b/kernel/admin/controllers/add-user.php similarity index 100% rename from admin/controllers/add-user.php rename to kernel/admin/controllers/add-user.php diff --git a/admin/controllers/configure-plugin.php b/kernel/admin/controllers/configure-plugin.php similarity index 100% rename from admin/controllers/configure-plugin.php rename to kernel/admin/controllers/configure-plugin.php diff --git a/admin/controllers/dashboard.php b/kernel/admin/controllers/dashboard.php similarity index 100% rename from admin/controllers/dashboard.php rename to kernel/admin/controllers/dashboard.php diff --git a/admin/controllers/edit-page.php b/kernel/admin/controllers/edit-page.php similarity index 100% rename from admin/controllers/edit-page.php rename to kernel/admin/controllers/edit-page.php diff --git a/admin/controllers/edit-post.php b/kernel/admin/controllers/edit-post.php similarity index 100% rename from admin/controllers/edit-post.php rename to kernel/admin/controllers/edit-post.php diff --git a/admin/controllers/edit-user.php b/kernel/admin/controllers/edit-user.php similarity index 100% rename from admin/controllers/edit-user.php rename to kernel/admin/controllers/edit-user.php diff --git a/admin/controllers/install-plugin.php b/kernel/admin/controllers/install-plugin.php similarity index 100% rename from admin/controllers/install-plugin.php rename to kernel/admin/controllers/install-plugin.php diff --git a/admin/controllers/install-theme.php b/kernel/admin/controllers/install-theme.php similarity index 100% rename from admin/controllers/install-theme.php rename to kernel/admin/controllers/install-theme.php diff --git a/admin/controllers/login-email.php b/kernel/admin/controllers/login-email.php similarity index 100% rename from admin/controllers/login-email.php rename to kernel/admin/controllers/login-email.php diff --git a/admin/controllers/login.php b/kernel/admin/controllers/login.php similarity index 100% rename from admin/controllers/login.php rename to kernel/admin/controllers/login.php diff --git a/admin/controllers/logout.php b/kernel/admin/controllers/logout.php similarity index 100% rename from admin/controllers/logout.php rename to kernel/admin/controllers/logout.php diff --git a/admin/controllers/new-page.php b/kernel/admin/controllers/new-page.php similarity index 100% rename from admin/controllers/new-page.php rename to kernel/admin/controllers/new-page.php diff --git a/admin/controllers/new-post.php b/kernel/admin/controllers/new-post.php similarity index 100% rename from admin/controllers/new-post.php rename to kernel/admin/controllers/new-post.php diff --git a/admin/controllers/plugins.php b/kernel/admin/controllers/plugins.php similarity index 100% rename from admin/controllers/plugins.php rename to kernel/admin/controllers/plugins.php diff --git a/admin/controllers/settings-advanced.php b/kernel/admin/controllers/settings-advanced.php similarity index 100% rename from admin/controllers/settings-advanced.php rename to kernel/admin/controllers/settings-advanced.php diff --git a/admin/controllers/settings-general.php b/kernel/admin/controllers/settings-general.php similarity index 100% rename from admin/controllers/settings-general.php rename to kernel/admin/controllers/settings-general.php diff --git a/admin/controllers/settings-regional.php b/kernel/admin/controllers/settings-regional.php similarity index 100% rename from admin/controllers/settings-regional.php rename to kernel/admin/controllers/settings-regional.php diff --git a/admin/controllers/settings.php b/kernel/admin/controllers/settings.php similarity index 100% rename from admin/controllers/settings.php rename to kernel/admin/controllers/settings.php diff --git a/admin/controllers/themes.php b/kernel/admin/controllers/themes.php similarity index 100% rename from admin/controllers/themes.php rename to kernel/admin/controllers/themes.php diff --git a/admin/controllers/uninstall-plugin.php b/kernel/admin/controllers/uninstall-plugin.php similarity index 100% rename from admin/controllers/uninstall-plugin.php rename to kernel/admin/controllers/uninstall-plugin.php diff --git a/admin/controllers/user-password.php b/kernel/admin/controllers/user-password.php similarity index 100% rename from admin/controllers/user-password.php rename to kernel/admin/controllers/user-password.php diff --git a/admin/controllers/users.php b/kernel/admin/controllers/users.php similarity index 100% rename from admin/controllers/users.php rename to kernel/admin/controllers/users.php diff --git a/admin/themes/default/css/default.css b/kernel/admin/themes/default/css/default.css similarity index 98% rename from admin/themes/default/css/default.css rename to kernel/admin/themes/default/css/default.css index 4c58ae51..6bf90eff 100644 --- a/admin/themes/default/css/default.css +++ b/kernel/admin/themes/default/css/default.css @@ -26,6 +26,10 @@ background: #1F5FC4; } +.uk-form legend { + width: 70% !important; +} + .uk-navbar-nav > li > a { border: none; height: 70px; diff --git a/admin/themes/default/css/form-file.min.css b/kernel/admin/themes/default/css/form-file.min.css similarity index 100% rename from admin/themes/default/css/form-file.min.css rename to kernel/admin/themes/default/css/form-file.min.css diff --git a/admin/themes/default/css/installer.css b/kernel/admin/themes/default/css/installer.css similarity index 100% rename from admin/themes/default/css/installer.css rename to kernel/admin/themes/default/css/installer.css diff --git a/admin/themes/default/css/jquery.datetimepicker.css b/kernel/admin/themes/default/css/jquery.datetimepicker.css similarity index 100% rename from admin/themes/default/css/jquery.datetimepicker.css rename to kernel/admin/themes/default/css/jquery.datetimepicker.css diff --git a/admin/themes/default/css/login.css b/kernel/admin/themes/default/css/login.css similarity index 100% rename from admin/themes/default/css/login.css rename to kernel/admin/themes/default/css/login.css diff --git a/admin/themes/default/css/placeholder.min.css b/kernel/admin/themes/default/css/placeholder.min.css similarity index 100% rename from admin/themes/default/css/placeholder.min.css rename to kernel/admin/themes/default/css/placeholder.min.css diff --git a/admin/themes/default/css/progress.min.css b/kernel/admin/themes/default/css/progress.min.css similarity index 100% rename from admin/themes/default/css/progress.min.css rename to kernel/admin/themes/default/css/progress.min.css diff --git a/admin/themes/default/css/uikit.almost-flat.min.css b/kernel/admin/themes/default/css/uikit.almost-flat.min.css similarity index 100% rename from admin/themes/default/css/uikit.almost-flat.min.css rename to kernel/admin/themes/default/css/uikit.almost-flat.min.css diff --git a/admin/themes/default/css/upload.min.css b/kernel/admin/themes/default/css/upload.min.css similarity index 100% rename from admin/themes/default/css/upload.min.css rename to kernel/admin/themes/default/css/upload.min.css diff --git a/admin/themes/default/fonts/FontAwesome.otf b/kernel/admin/themes/default/fonts/FontAwesome.otf similarity index 100% rename from admin/themes/default/fonts/FontAwesome.otf rename to kernel/admin/themes/default/fonts/FontAwesome.otf diff --git a/admin/themes/default/fonts/fontawesome-webfont.eot b/kernel/admin/themes/default/fonts/fontawesome-webfont.eot similarity index 100% rename from admin/themes/default/fonts/fontawesome-webfont.eot rename to kernel/admin/themes/default/fonts/fontawesome-webfont.eot diff --git a/admin/themes/default/fonts/fontawesome-webfont.ttf b/kernel/admin/themes/default/fonts/fontawesome-webfont.ttf similarity index 100% rename from admin/themes/default/fonts/fontawesome-webfont.ttf rename to kernel/admin/themes/default/fonts/fontawesome-webfont.ttf diff --git a/admin/themes/default/fonts/fontawesome-webfont.woff b/kernel/admin/themes/default/fonts/fontawesome-webfont.woff similarity index 100% rename from admin/themes/default/fonts/fontawesome-webfont.woff rename to kernel/admin/themes/default/fonts/fontawesome-webfont.woff diff --git a/admin/themes/default/fonts/fontawesome-webfont.woff2 b/kernel/admin/themes/default/fonts/fontawesome-webfont.woff2 similarity index 100% rename from admin/themes/default/fonts/fontawesome-webfont.woff2 rename to kernel/admin/themes/default/fonts/fontawesome-webfont.woff2 diff --git a/admin/themes/default/img/favicon.png b/kernel/admin/themes/default/img/favicon.png similarity index 100% rename from admin/themes/default/img/favicon.png rename to kernel/admin/themes/default/img/favicon.png diff --git a/admin/themes/default/index.php b/kernel/admin/themes/default/index.php similarity index 100% rename from admin/themes/default/index.php rename to kernel/admin/themes/default/index.php diff --git a/admin/themes/default/init.php b/kernel/admin/themes/default/init.php similarity index 78% rename from admin/themes/default/init.php rename to kernel/admin/themes/default/init.php index 1f3db143..af9bff04 100644 --- a/admin/themes/default/init.php +++ b/kernel/admin/themes/default/init.php @@ -207,4 +207,64 @@ class HTML { echo $html; } + public static function profileUploader($username) + { + global $L; + + $html = ' +
    +
    0%
    +
    + +
    + '.$L->g('Upload Image').' +
    + '; + + $html .= ' + '; + + echo $html; + } + } \ No newline at end of file diff --git a/admin/themes/default/js/jquery.datetimepicker.js b/kernel/admin/themes/default/js/jquery.datetimepicker.js similarity index 100% rename from admin/themes/default/js/jquery.datetimepicker.js rename to kernel/admin/themes/default/js/jquery.datetimepicker.js diff --git a/admin/themes/default/js/jquery.min.js b/kernel/admin/themes/default/js/jquery.min.js similarity index 100% rename from admin/themes/default/js/jquery.min.js rename to kernel/admin/themes/default/js/jquery.min.js diff --git a/admin/themes/default/js/uikit.min.js b/kernel/admin/themes/default/js/uikit.min.js similarity index 100% rename from admin/themes/default/js/uikit.min.js rename to kernel/admin/themes/default/js/uikit.min.js diff --git a/admin/themes/default/js/upload.min.js b/kernel/admin/themes/default/js/upload.min.js similarity index 100% rename from admin/themes/default/js/upload.min.js rename to kernel/admin/themes/default/js/upload.min.js diff --git a/admin/themes/default/login.php b/kernel/admin/themes/default/login.php similarity index 100% rename from admin/themes/default/login.php rename to kernel/admin/themes/default/login.php diff --git a/admin/views/about.php b/kernel/admin/views/about.php similarity index 100% rename from admin/views/about.php rename to kernel/admin/views/about.php diff --git a/admin/views/add-user.php b/kernel/admin/views/add-user.php similarity index 100% rename from admin/views/add-user.php rename to kernel/admin/views/add-user.php diff --git a/admin/views/configure-plugin.php b/kernel/admin/views/configure-plugin.php similarity index 100% rename from admin/views/configure-plugin.php rename to kernel/admin/views/configure-plugin.php diff --git a/admin/views/dashboard.php b/kernel/admin/views/dashboard.php similarity index 100% rename from admin/views/dashboard.php rename to kernel/admin/views/dashboard.php diff --git a/admin/views/edit-page.php b/kernel/admin/views/edit-page.php similarity index 100% rename from admin/views/edit-page.php rename to kernel/admin/views/edit-page.php diff --git a/admin/views/edit-post.php b/kernel/admin/views/edit-post.php similarity index 100% rename from admin/views/edit-post.php rename to kernel/admin/views/edit-post.php diff --git a/admin/views/edit-user.php b/kernel/admin/views/edit-user.php similarity index 88% rename from admin/views/edit-user.php rename to kernel/admin/views/edit-user.php index bb336c46..1b9f4f07 100644 --- a/admin/views/edit-user.php +++ b/kernel/admin/views/edit-user.php @@ -2,6 +2,9 @@ HTML::title(array('title'=>$L->g('Edit user'), 'icon'=>'user')); +echo '
    '; +echo '
    '; + HTML::formOpen(array('id'=>'edit-user-profile-form','class'=>'uk-form-horizontal')); // Security token @@ -92,6 +95,13 @@ if( ($Login->role()==='admin') && ($_user['username']!='admin') ) { HTML::formClose(); +echo '
    '; +echo '
    '; +echo 'profile picture'; +HTML::profileUploader($_user['username']); +echo '
    '; +echo '
    '; + ?>