From f38f426edfb93d9a77b21af931f3118e0ef1b919 Mon Sep 17 00:00:00 2001 From: Diego Najar Date: Fri, 8 Sep 2017 00:43:53 +0200 Subject: [PATCH] Minor changes on dashboard, update english language --- bl-kernel/admin/views/dashboard.php | 2 +- bl-kernel/admin/views/edit-user.php | 6 +++--- bl-kernel/functions.php | 20 +++++++++++++++++++- bl-languages/en.json | 20 +++++++++++++++++--- 4 files changed, 40 insertions(+), 8 deletions(-) diff --git a/bl-kernel/admin/views/dashboard.php b/bl-kernel/admin/views/dashboard.php index 37821e42..4d100aae 100644 --- a/bl-kernel/admin/views/dashboard.php +++ b/bl-kernel/admin/views/dashboard.php @@ -82,7 +82,7 @@ echo '
  • '; echo $dict; if( !empty($log['notes'])) { - echo ' ('.$log['notes'].')'; + echo ' « '.$log['notes'].' »'; } echo '
    '; echo Date::format($log['date'], DB_DATE_FORMAT, NOTIFICATIONS_DATE_FORMAT); diff --git a/bl-kernel/admin/views/edit-user.php b/bl-kernel/admin/views/edit-user.php index f43ab164..2d6bd600 100644 --- a/bl-kernel/admin/views/edit-user.php +++ b/bl-kernel/admin/views/edit-user.php @@ -70,7 +70,7 @@ if($Login->role()==='admin') { 'label'=>$L->g('Email'), 'value'=>$User->email(), 'class'=>'uk-width-1-2 uk-form-medium', - 'tip'=>$L->g('Recommended for recovery password and notifications.') + 'tip'=>$L->g('Recommended for recovery password and notifications') )); HTML::legend(array('value'=>$L->g('Social networks links'))); @@ -121,14 +121,14 @@ if($Login->role()==='admin') { 'label'=>$L->g('Token'), 'value'=>$User->tokenAuth(), 'class'=>'uk-width-1-2 uk-form-medium', - 'tip'=>$L->g('This token is similar to your password, you should not share it.') + 'tip'=>$L->g('this-token-is-similar-to-your-password-you-should-not-share-it') )); HTML::legend(array('value'=>$L->g('Status'))); HTML::formInputText(array( 'name'=>'status', - 'label'=>$L->g('сurrent status'), + 'label'=>$L->g('Current status'), 'value'=>$User->enabled()?$L->g('Enabled'):$L->g('Disabled'), 'class'=>'uk-width-1-2 uk-form-medium', 'disabled'=>true, diff --git a/bl-kernel/functions.php b/bl-kernel/functions.php index fd4ce913..530f4f75 100644 --- a/bl-kernel/functions.php +++ b/bl-kernel/functions.php @@ -484,7 +484,7 @@ function createUser($args) { if( $dbUsers->add($tmp) ) { // Add to syslog $Syslog->add(array( - 'dictionaryKey'=>'new-user', + 'dictionaryKey'=>'new-user-created', 'notes'=>$tmp['username'] )); @@ -564,4 +564,22 @@ function deleteCategory($categoryKey) { Alert::set($Language->g('The changes have been saved')); return true; +} + +function activateTheme($themeDirectory) { + global $Site; + global $Syslog; + + if (Sanitize::pathFile(PATH_THEMES.$themeDirectory)) { + $Site->set(array('theme'=>$themeDirname)); + + $Syslog->add(array( + 'dictionaryKey'=>'new-theme-configured', + 'notes'=>$themeDirname + )); + + Alert::set( $Language->g('The changes have been saved') ); + return true; + } + return false; } \ No newline at end of file diff --git a/bl-languages/en.json b/bl-languages/en.json index 294a720d..34eebc7d 100644 --- a/bl-languages/en.json +++ b/bl-languages/en.json @@ -153,8 +153,8 @@ "page-not-found-content": "Hey! look like the page doesn't exist.", "page-not-found": "Page not found", "predefined-pages": "Predefined pages", - "returning-page-when-the-page-doesnt-exist": "Returning page when the page doesn't exist, leave blank if you want to returns a default message.", - "returning-page-for-the-main-page": "Returning page for the main page, leave blank if you want to show all the pages on the main page.", + "returning-page-when-the-page-doesnt-exist": "Returning page when the page doesn't exist, leave it blank if you want to returns a default message.", + "returning-page-for-the-main-page": "Returning page for the main page, leave it blank if you want to show all the pages on the main page.", "full-url-of-your-site": "Full URL of your site. Complete with the protocol HTTP or HTTPS (only if you have enabled SSL on your server).", "with-the-locales-you-can-set-the-regional-user-interface": "With the locales, you can set the regional user interface, such as the dates in your language. The locales need to be installed on your system.", "bludit-installer": "Bludit Installer", @@ -174,5 +174,19 @@ "manage-your-bludit-from-the-admin-panel": "Manage your Bludit from the [admin area]({{ADMIN_AREA_LINK}})", "chat-with-developers-and-users-on-gitter":"Chat with developers and users on [Gitter](https://gitter.im/dignajar/bludit)", "this-is-a-brief-description-of-yourself-our-your-site":"This is a brief description of yourself or your site, to change this text go to the admin panel, settings, plugins, and configure the plugin about.", - "read-the-documentation-for-more-information": "Read the [documentation](https://docs.bludit.com) for more information" + "read-the-documentation-for-more-information": "Read the [documentation](https://docs.bludit.com) for more information", + "new-page-created": "New page created", + "new-version-available": "New version available", + "new-category-created": "New category created", + "category-deleted": "Category deleted", + "category-edited": "Category edited", + "new-user-created": "New user created", + "user-edited": "User edited", + "user-deleted": "User deleted", + "recommended-for-recovery-password-and-notifications": "Recommended for recovery password and notifications.", + "authentication-token": "Authentication Token", + "token": "Token", + "current-status": "Current status", + "upload-image": "Upload image", + "this-token-is-similar-to-your-password-you-should-not-share-it": "This token is similar to your password, you should not share it." } \ No newline at end of file