From b6d4ddaebd17e404d3e7789677a93f4ae0ffcc15 Mon Sep 17 00:00:00 2001
From: Diego Najar <dignajar@gmail.com>
Date: Sat, 12 Aug 2017 20:54:35 +0200
Subject: [PATCH] Fixing labels

---
 bl-kernel/admin/views/edit-page.php         |  2 +-
 bl-kernel/admin/views/edit-user.php         | 14 +++++++-------
 bl-kernel/admin/views/new-page.php          |  4 ++--
 bl-kernel/admin/views/settings-advanced.php |  2 +-
 bl-themes/editorial/index.php               |  4 ++++
 5 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/bl-kernel/admin/views/edit-page.php b/bl-kernel/admin/views/edit-page.php
index c8a3de75..bab3b7ec 100644
--- a/bl-kernel/admin/views/edit-page.php
+++ b/bl-kernel/admin/views/edit-page.php
@@ -154,7 +154,7 @@ echo '<div class="bl-publish-sidebar uk-width-2-10">';
 		'name'=>'date',
 		'value'=>$page->dateRaw(),
 		'class'=>'uk-width-1-1 uk-form-medium',
-		'tip'=>$L->g('To schedule the post just select the date and time'),
+		'tip'=>$L->g('To schedule the page just select the date and time'),
 		'label'=>$L->g('Date')
 	));
 
diff --git a/bl-kernel/admin/views/edit-user.php b/bl-kernel/admin/views/edit-user.php
index fe7e7d5e..f43ab164 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('email-will-not-be-publicly-displayed')
+		'tip'=>$L->g('Recommended for recovery password and notifications.')
 	));
 
 	HTML::legend(array('value'=>$L->g('Social networks links')));
@@ -121,7 +121,7 @@ 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, do not share this token.')
+		'tip'=>$L->g('This token is similar to your password, you should not share it.')
 	));
 
 	HTML::legend(array('value'=>$L->g('Status')));
@@ -132,7 +132,7 @@ if($Login->role()==='admin') {
 		'value'=>$User->enabled()?$L->g('Enabled'):$L->g('Disabled'),
 		'class'=>'uk-width-1-2 uk-form-medium',
 		'disabled'=>true,
-		'tip'=>$User->enabled()?'':$L->g('To enable the user you have to set a new password')
+		'tip'=>$User->enabled()?'':$L->g('To enable the user you must set a new password.')
 	));
 
 if( $User->enabled() ) {
@@ -149,7 +149,7 @@ if( ($Login->role()==='admin') && ($User->username()!='admin') ) {
 
 	echo '<div class="uk-form-row">
 		<div class="uk-form-controls">
-		<button type="submit" id="jsdelete-user-associate" class="delete-button" name="delete-user-associate"><i class="uk-icon-ban"></i> '.$L->g('Delete the user and associate its posts to admin user').'</button>
+		<button type="submit" id="jsdelete-user-associate" class="delete-button" name="delete-user-associate"><i class="uk-icon-ban"></i> '.$L->g('Delete the user and associate its pages to admin user').'</button>
 		<button type="submit" id="jsdelete-user-all" class="delete-button" name="delete-user-all"><i class="uk-icon-ban"></i> '.$L->g('Delete the user and all its posts').'</button>
 		</div>
 	</div>';
@@ -174,19 +174,19 @@ echo '</div>';
 $(document).ready(function() {
 
 	$("#jsdelete-user-associate").click(function() {
-		if(confirm("<?php $Language->p('confirm-delete-this-action-cannot-be-undone') ?>")==false) {
+		if(confirm("<?php $Language->p('Confirm delete this action cannot be undone') ?>")==false) {
 			return false;
 		}
 	});
 
 	$("#jsdelete-user-all").click(function() {
-		if(confirm("<?php $Language->p('confirm-delete-this-action-cannot-be-undone') ?>")==false) {
+		if(confirm("<?php $Language->p('Confirm delete this action cannot be undone') ?>")==false) {
 			return false;
 		}
 	});
 
 	$("#jsdisable-user").click(function() {
-		if(confirm("<?php $Language->p('do-you-want-to-disable-the-user') ?>")==false) {
+		if(confirm("<?php $Language->p('Do you want to disable the user') ?>")==false) {
 			return false;
 		}
 	});
diff --git a/bl-kernel/admin/views/new-page.php b/bl-kernel/admin/views/new-page.php
index cc0a72f9..51ac05f5 100644
--- a/bl-kernel/admin/views/new-page.php
+++ b/bl-kernel/admin/views/new-page.php
@@ -132,7 +132,7 @@ echo '<div class="bl-publish-sidebar uk-width-2-10">';
 		'name'=>'date',
 		'value'=>Date::current(DB_DATE_FORMAT),
 		'class'=>'uk-width-1-1 uk-form-medium',
-		'tip'=>$L->g('To schedule the post just select the date and time'),
+		'tip'=>$L->g('To schedule the page just select the date and time'),
 		'label'=>$L->g('Date')
 	));
 
@@ -177,7 +177,7 @@ echo '<div class="bl-publish-sidebar uk-width-2-10">';
 		'name'=>'slug',
 		'value'=>'',
 		'class'=>'uk-width-1-1 uk-form-medium',
-		'tip'=>$L->g('you-can-modify-the-url-which-identifies'),
+		'tip'=>$L->g('You can modify the URL which identifies a page...'),
 		'label'=>$L->g('Friendly URL')
 	));
 
diff --git a/bl-kernel/admin/views/settings-advanced.php b/bl-kernel/admin/views/settings-advanced.php
index 654710c6..23cf6fd5 100644
--- a/bl-kernel/admin/views/settings-advanced.php
+++ b/bl-kernel/admin/views/settings-advanced.php
@@ -48,7 +48,7 @@ HTML::formOpen(array('class'=>'uk-form-horizontal'));
 		'options'=>array('date'=>'Date','position'=>'Position'),
 		'selected'=>$Site->orderBy(),
 		'class'=>'uk-width-1-3 uk-form-medium',
-		'tip'=>$L->g('Order the content by date to create a Blog or order the content by position to create a Website')
+		'tip'=>$L->g('Order the content by date to build a Blog or order the content by position to build a Website.')
 	));
 
 	HTML::legend(array('value'=>$L->g('Email account settings')));
diff --git a/bl-themes/editorial/index.php b/bl-themes/editorial/index.php
index 06cc2ab2..a7a2d3db 100644
--- a/bl-themes/editorial/index.php
+++ b/bl-themes/editorial/index.php
@@ -9,6 +9,8 @@
 </head>
 <body>
 
+<?php Theme::plugins('siteBodyBegin') ?>
+
 <!-- Wrapper -->
 <div id="wrapper">
 
@@ -69,5 +71,7 @@
 	echo Theme::javascript('assets/js/main.js');
 ?>
 
+<?php Theme::plugins('siteBodyEnd') ?>
+
 </body>
 </html>
\ No newline at end of file