From 7f6f8be62eed8e74ff7f892a26eda16189277983 Mon Sep 17 00:00:00 2001 From: vorons Date: Sun, 14 Feb 2016 00:01:55 +0800 Subject: [PATCH 01/35] Update ru_RU.json --- bl-languages/ru_RU.json | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/bl-languages/ru_RU.json b/bl-languages/ru_RU.json index 6759c085..1e1ddbbb 100644 --- a/bl-languages/ru_RU.json +++ b/bl-languages/ru_RU.json @@ -223,9 +223,21 @@ "cover-image": "Обложка", "blog": "Блог", "more-images": "Еще изображения", - "double-click-on-the-image-to-add-it": "Дважды щелкните по изображению, чтобы добавить его.", + "click-here-to-cancel": "Нажмите здесь, чтобы отменить.", "type-the-tag-and-press-enter": "Введите тег и нажмите клавишу Enter.", + "add": "Добавить", "manage-your-bludit-from-the-admin-panel": "Управляйте Bludit из [панели управления]({{ADMIN_AREA_LINK}})", - "there-are-no-images":"Изображений нет" + "there-are-no-images":"Изображений нет", + + "click-on-the-image-for-options": "Нажмите на изображение для выбора опций.", + "set-as-cover-image": "Установить как обложку", + "delete-image": "Удалить изображение", + "image-description": "Описание изображения", + + "social-networks": "Социальные сети", + "twitter-username": "Имя пользователя в Twitter", + "facebook-username": "Имя пользователя в Facebook", + "google-username": "Имя пользователя в Google", + "instagram-username": "Имя пользователя в Instagram" } From 9d12e07adf2bdb8fc07fd4bb258956d4595be84f Mon Sep 17 00:00:00 2001 From: dignajar Date: Sat, 13 Feb 2016 21:15:19 -0300 Subject: [PATCH 02/35] Updates --- .../admin/themes/default/css/default.css | 9 +++++ .../default/css/jquery.auto-complete.css | 9 ----- bl-kernel/admin/themes/default/index.php | 6 +-- bl-kernel/admin/themes/default/init.php | 2 +- .../default/js/jquery.auto-complete.min.js | 3 -- bl-kernel/admin/views/edit-user.php | 26 ++++++------ bl-kernel/admin/views/settings-general.php | 40 ++++++++++++++++++- bl-kernel/dbsite.class.php | 26 +++++++++++- bl-kernel/dbusers.class.php | 8 ++-- bl-kernel/js/bludit-tags.js | 11 ++++- bl-kernel/user.class.php | 16 ++++---- bl-languages/en_US.json | 8 +--- bl-themes/blogme/metadata.json | 6 +-- bl-themes/future-imperfect/metadata.json | 8 ++-- bl-themes/pure/metadata.json | 6 +-- 15 files changed, 123 insertions(+), 61 deletions(-) delete mode 100644 bl-kernel/admin/themes/default/css/jquery.auto-complete.css delete mode 100644 bl-kernel/admin/themes/default/js/jquery.auto-complete.min.js diff --git a/bl-kernel/admin/themes/default/css/default.css b/bl-kernel/admin/themes/default/css/default.css index b9cfd13c..065414f8 100644 --- a/bl-kernel/admin/themes/default/css/default.css +++ b/bl-kernel/admin/themes/default/css/default.css @@ -118,6 +118,15 @@ li.bludit-logo { /* ----------- BLUDIT ----------- */ +body { + overflow-y: scroll; +} + +.bludit-navbar { + border-radius: 0 !important; + box-shadow: 1px 1px 1px rgba(50, 50, 50, 0.37); +} + #logo { background: #f4f4f4; padding:20px 0; diff --git a/bl-kernel/admin/themes/default/css/jquery.auto-complete.css b/bl-kernel/admin/themes/default/css/jquery.auto-complete.css deleted file mode 100644 index 4261b1d0..00000000 --- a/bl-kernel/admin/themes/default/css/jquery.auto-complete.css +++ /dev/null @@ -1,9 +0,0 @@ -.autocomplete-suggestions { - text-align: left; cursor: default; border: 1px solid #ccc; border-top: 0; background: #fff; box-shadow: -1px 1px 3px rgba(0,0,0,.1); - - /* core styles should not be changed */ - position: absolute; display: none; z-index: 9999; max-height: 254px; overflow: hidden; overflow-y: auto; box-sizing: border-box; -} -.autocomplete-suggestion { position: relative; padding: 0 .6em; line-height: 23px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; font-size: 1.02em; color: #333; } -.autocomplete-suggestion b { font-weight: normal; color: #1f8dd6; } -.autocomplete-suggestion.selected { background: #f0f0f0; } diff --git a/bl-kernel/admin/themes/default/index.php b/bl-kernel/admin/themes/default/index.php index d90c144e..ff233a77 100644 --- a/bl-kernel/admin/themes/default/index.php +++ b/bl-kernel/admin/themes/default/index.php @@ -20,14 +20,12 @@ - - @@ -56,7 +54,7 @@ $(document).ready(function() { -