Minor fixes
This commit is contained in:
Diego Najar
parent
e08d13a9af
commit
c2c25d2bec
|
|
@ -14,7 +14,7 @@ HTML::formOpen(array('class'=>'uk-form-horizontal'));
|
|||
HTML::formSelect(array(
|
||||
'name'=>'itemsPerPage',
|
||||
'label'=>$L->g('Items per page'),
|
||||
'options'=>array('1'=>'1','2'=>'2','3'=>'3','4'=>'4','5'=>'5','6'=>'6','7'=>'7','8'=>'8', '-1'=>$L->g('All pages')),
|
||||
'options'=>array('1'=>'1','2'=>'2','3'=>'3','4'=>'4','5'=>'5','6'=>'6','7'=>'7','8'=>'8', '-1'=>$L->g('All content')),
|
||||
'selected'=>$Site->itemsPerPage(),
|
||||
'class'=>'uk-width-1-3 uk-form-medium',
|
||||
'tip'=>$L->g('Number of items to show per page')
|
||||
|
|
|
|||
|
|
@ -101,9 +101,6 @@ define('PARENT', 'BLUDIT3849abb4cb7abd24c2d8dac17b216f17');
|
|||
// Items per page for admin area
|
||||
define('ITEMS_PER_PAGE_ADMIN', 10);
|
||||
|
||||
// Cli mode, enable or disable
|
||||
define('CLI_MODE', FALSE);
|
||||
|
||||
// Cli mode, status for new pages
|
||||
define('CLI_STATUS', 'published');
|
||||
|
||||
|
|
@ -192,7 +189,6 @@ include(PATH_HELPERS.'paginator.class.php');
|
|||
include(PATH_HELPERS.'image.class.php');
|
||||
include(PATH_HELPERS.'tcp.class.php');
|
||||
|
||||
// Include Bludit PRO
|
||||
if (file_exists(PATH_KERNEL.'bludit.pro.php')) {
|
||||
include(PATH_KERNEL.'bludit.pro.php');
|
||||
}
|
||||
|
|
@ -225,8 +221,7 @@ $base = '';
|
|||
if (!empty($_SERVER['DOCUMENT_ROOT']) && !empty($_SERVER['SCRIPT_NAME']) && empty($base)) {
|
||||
$base = str_replace($_SERVER['DOCUMENT_ROOT'], '', $_SERVER['SCRIPT_NAME']);
|
||||
$base = dirname($base);
|
||||
}
|
||||
elseif( empty($base) ) {
|
||||
} elseif (empty($base)) {
|
||||
$base = empty( $_SERVER['SCRIPT_NAME'] ) ? $_SERVER['PHP_SELF'] : $_SERVER['SCRIPT_NAME'];
|
||||
$base = dirname($base);
|
||||
}
|
||||
|
|
@ -247,23 +242,18 @@ define('HTML_PATH_THEME', HTML_PATH_THEMES.$Site->theme().'/');
|
|||
define('HTML_PATH_THEME_CSS', HTML_PATH_THEME.'css/');
|
||||
define('HTML_PATH_THEME_JS', HTML_PATH_THEME.'js/');
|
||||
define('HTML_PATH_THEME_IMG', HTML_PATH_THEME.'img/');
|
||||
|
||||
define('HTML_PATH_ADMIN_ROOT', HTML_PATH_ROOT.ADMIN_URI_FILTER.'/');
|
||||
define('HTML_PATH_ADMIN_THEME', HTML_PATH_ROOT.'bl-kernel/admin/themes/'.$Site->adminTheme().'/');
|
||||
define('HTML_PATH_ADMIN_THEME_JS', HTML_PATH_ADMIN_THEME.'js/');
|
||||
define('HTML_PATH_ADMIN_THEME_CSS', HTML_PATH_ADMIN_THEME.'css/');
|
||||
define('HTML_PATH_ADMIN_THEME_IMG', HTML_PATH_ADMIN_THEME.'img/');
|
||||
|
||||
define('HTML_PATH_CORE_JS', HTML_PATH_ROOT.'bl-kernel/js/');
|
||||
define('HTML_PATH_CORE_CSS', HTML_PATH_ROOT.'bl-kernel/css/');
|
||||
|
||||
define('HTML_PATH_UPLOADS', HTML_PATH_ROOT.'bl-content/uploads/');
|
||||
define('HTML_PATH_UPLOADS_PROFILES', HTML_PATH_UPLOADS.'profiles/');
|
||||
define('HTML_PATH_UPLOADS_THUMBNAILS', HTML_PATH_UPLOADS.'thumbnails/');
|
||||
define('HTML_PATH_PLUGINS', HTML_PATH_ROOT.'bl-plugins/');
|
||||
|
||||
define('JQUERY', HTML_PATH_ROOT.'bl-kernel/js/jquery.min.js');
|
||||
|
||||
// --- Objects with dependency ---
|
||||
$Language = new dbLanguage( $Site->language() );
|
||||
$Login = new Login( $dbUsers );
|
||||
|
|
|
|||
|
|
@ -82,7 +82,7 @@ if ($dbPages->scheduler()) {
|
|||
|
||||
// Add to syslog
|
||||
$Syslog->add(array(
|
||||
'dictionaryKey'=>'page-published-from-scheduler',
|
||||
'dictionaryKey'=>'content-published-from-scheduler',
|
||||
'notes'=>''
|
||||
));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ class dbLanguage extends dbJSON
|
|||
return $this->db[$key];
|
||||
}
|
||||
|
||||
file_put_contents(DEBUG_FILE, $key.PHP_EOL, FILE_APPEND);
|
||||
//file_put_contents(DEBUG_FILE, $key.PHP_EOL, FILE_APPEND);
|
||||
return $string;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -491,10 +491,9 @@ class dbPages extends dbJSON
|
|||
$text = 'empty';
|
||||
}
|
||||
|
||||
if( empty($parent) ) {
|
||||
if (Text::isEmpty($parent)) {
|
||||
$newKey = Text::cleanUrl($text);
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
$newKey = Text::cleanUrl($parent).'/'.Text::cleanUrl($text);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -54,7 +54,6 @@
|
|||
"plugin-configured": "Plugin configured",
|
||||
"welcome-to-bludit": "Welcome to Bludit",
|
||||
"statistics": "Statistics",
|
||||
"pages": "Pages",
|
||||
"drafts": "Drafts",
|
||||
"title": "Title",
|
||||
"save": "Save",
|
||||
|
|
@ -80,6 +79,7 @@
|
|||
"published": "Published",
|
||||
"draft": "Draft",
|
||||
"empty-title": "Empty title",
|
||||
"empty": "empty",
|
||||
"date": "Date",
|
||||
"external-cover-image": "External cover image",
|
||||
"parent": "Parent",
|
||||
|
|
@ -99,7 +99,7 @@
|
|||
"registered": "Registered",
|
||||
"site-information": "Site information",
|
||||
"site-title": "Site title",
|
||||
"use-this-field-to-name-your-site": "Use this field to name your site, it will appear at the top of every page of your site.",
|
||||
"use-this-field-to-name-your-site": "Use this field to name your site.",
|
||||
"site-slogan": "Site slogan",
|
||||
"use-this-field-to-add-a-catchy-phrase": "Use this field to add a catchy phrase on your site.",
|
||||
"site-description": "Site description",
|
||||
|
|
@ -108,7 +108,6 @@
|
|||
"you-can-add-a-small-text-on-the-bottom": "You can add a small text on the bottom of every page. eg: copyright, owner, dates, etc.",
|
||||
"social-networks-links": "Social networks links",
|
||||
"site-url": "Site URL",
|
||||
"default-home-page": "Default home page",
|
||||
"email-account-settings": "Email account settings",
|
||||
"sender-email": "Sender email",
|
||||
"emails-will-be-sent-from-this-address": "Emails will be sent from this address.",
|
||||
|
|
@ -138,7 +137,6 @@
|
|||
"disable-the-user": "Disable the user",
|
||||
"profile-picture": "Profile picture",
|
||||
"edit-or-delete-your-categories": "Edit or delete your categories",
|
||||
"create-a-new-page-for-your-site": "Create a new page for your site",
|
||||
"create-a-new-category-to-organize-your-content": "Create a new category to organize your content",
|
||||
"confirm-delete-this-action-cannot-be-undone": "Confirm delete, this action cannot be undone.",
|
||||
"do-you-want-to-disable-the-user": "Do you want to disable the user ?",
|
||||
|
|
@ -148,9 +146,6 @@
|
|||
"invite-a-friend-to-collaborate-on-your-site": "Invite a friend to collaborate on your site",
|
||||
"number-of-items-to-show-per-page": "Number of items to show per page.",
|
||||
"website-or-blog": "Website or Blog",
|
||||
"scheduled-pages": "Scheduled pages",
|
||||
"there-are-no-scheduled-pages": "There are no scheduled pages.",
|
||||
"there-are-no-draft-pages": "There are no draft pages.",
|
||||
"order-content-by": "Order content by",
|
||||
"edit-or-delete-content-from-your-site": "Edit or delete content from your site",
|
||||
"order-the-content-by-date-to-build-a-blog": "Order the content by date to build a Blog or order the content by position to build a Website.",
|
||||
|
|
@ -179,7 +174,6 @@
|
|||
"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",
|
||||
"new-page-created": "New page created",
|
||||
"new-version-available": "New version available",
|
||||
"new-category-created": "New category created",
|
||||
"category-deleted": "Category deleted",
|
||||
|
|
@ -200,26 +194,19 @@
|
|||
"password-must-be-at-least-6-characters-long": "Password must be at least 6 characters long",
|
||||
"ip-address-has-been-blocked": "IP address has been blocked",
|
||||
"try-again-in-a-few-minutes": "Try again in a few minutes",
|
||||
"page-published-from-scheduler": "Page published from scheduler",
|
||||
"content-published-from-scheduler": "Content published from scheduler",
|
||||
"installer-page-about-content": "The about page is an important and powerful for potential clients and partners. For those who wonder who is behind the website, your About page is the first source of information.",
|
||||
"blog": "Blog",
|
||||
"complete-all-fields": "Complete all fields",
|
||||
"static": "Static",
|
||||
"manage-pages": "Manage pages",
|
||||
"new-page": "New page",
|
||||
"edit-page": "Edit page",
|
||||
"create-a-new-category-to-organize-your-pages": "Create a new category to organize your pages",
|
||||
"edit-or-delete-pages-from-your-site": "Edit or delete pages from your site",
|
||||
"add-new-page": "Add new page",
|
||||
"about-your-site-or-yourself": "About your site or yourself",
|
||||
"homepage": "Homepage",
|
||||
"disabled": "Disabled",
|
||||
"to-enable-the-user-you-must-set-a-new-password": "To enable the user you must set a new password.",
|
||||
"delete-the-user-and-associate-his-pages-to-admin-user": "Delete the user and associate his pages to admin user",
|
||||
"delete-the-user-and-all-his-pages": "Delete the user and all his pages",
|
||||
"delete-the-user-and-associate-his-content-to-admin-user": "Delete the user and associate his content to admin user",
|
||||
"delete-the-user-and-all-his-content": "Delete the user and all his content",
|
||||
"user-disabled": "User disabled",
|
||||
"user-password-changed": "User password changed",
|
||||
"page-edited": "Page edited",
|
||||
"the-password-and-confirmation-password-do-not-match": "The password and confirmation password do not match",
|
||||
"scheduled-content": "Scheduled content",
|
||||
"there-are-no-scheduled-content": "There are no scheduled content.",
|
||||
|
|
@ -229,19 +216,18 @@
|
|||
"undefined": "Undefined",
|
||||
"create-new-content-for-your-site": "Create new content for your site",
|
||||
"there-are-no-draft-content": "There are no draft content.",
|
||||
"order-the-pages-by-date-to-build-a-blog": "Order the pages by date to build a Blog or order the pages by position to build a Website.",
|
||||
"order-items-by": "Order items by",
|
||||
"all-pages": "All pages",
|
||||
"all-content": "All content",
|
||||
"dynamic": "Dynamic",
|
||||
"type": "Type",
|
||||
"draft-content": "Draft content",
|
||||
"post": "Post",
|
||||
"page": "Page",
|
||||
"default": "Default",
|
||||
"latest-content": "Latest content",
|
||||
"default-message": "Default message",
|
||||
"no-parent": "No parent",
|
||||
"have-you-seen-my-ball": "Have you seen my ball?",
|
||||
"pagebreak": "Page break",
|
||||
"pages": "Pages",
|
||||
"this-plugin-may-not-be-supported-by-this-version-of-bludit": "This plugin may not be supported by this version of Bludit"
|
||||
}
|
||||
|
|
@ -1,6 +1,5 @@
|
|||
{
|
||||
"language-data":
|
||||
{
|
||||
"language-data": {
|
||||
"native": "Español",
|
||||
"english-name": "Spanish",
|
||||
"locale": "es, es_ES, es_AR, es_MX",
|
||||
|
|
@ -10,7 +9,7 @@
|
|||
"website": "https://www.bludit.com"
|
||||
},
|
||||
|
||||
"dashboard": "Panel de administración",
|
||||
"dashboard": "Panel",
|
||||
"manage-users": "Administrar usuarios",
|
||||
"manage-categories": "Manage categories",
|
||||
"general-settings": "Ajustes generales",
|
||||
|
|
@ -43,7 +42,7 @@
|
|||
"new-category": "New category",
|
||||
"you-do-not-have-sufficient-permissions": "No tiene suficientes permisos para acceder a esta página, contacte al administrador.",
|
||||
"add-a-new-user": "Agregar nuevo usuario",
|
||||
"url-associated-with-the-page": "URL associated with the page.",
|
||||
"url-associated-with-the-content": "URL associated with the content.",
|
||||
"language-and-timezone": "Idioma y zona horaria",
|
||||
"change-your-language-and-region-settings": "Cambiar la configuración de idioma y región.",
|
||||
"notifications": "Notifications",
|
||||
|
|
@ -54,7 +53,6 @@
|
|||
"plugin-configured": "Plugin configured",
|
||||
"welcome-to-bludit": "Bienvenido a Bludit",
|
||||
"statistics": "Estadísticas",
|
||||
"pages": "Páginas",
|
||||
"drafts": "Borradores",
|
||||
"title": "Titulo",
|
||||
"save": "Guardar",
|
||||
|
|
@ -93,7 +91,7 @@
|
|||
"username": "Nombre de usuario",
|
||||
"first-name": "Nombre",
|
||||
"last-name": "Apellido",
|
||||
"to-schedule-the-page-select-the-date-and-time": "To schedule the page select the date and time.",
|
||||
"to-schedule-the-content-select-the-date-and-time": "To schedule the content select the date and time, the status has to be set to \"Published\".",
|
||||
"email": "Correo electrónico",
|
||||
"role": "Rol",
|
||||
"registered": "Registrado",
|
||||
|
|
@ -108,7 +106,6 @@
|
|||
"you-can-add-a-small-text-on-the-bottom": "Puede agregar un pequeño texto en el pie de página. ej: copyright, autor, fechas, etc.",
|
||||
"social-networks-links": "Redes sociales enlaces",
|
||||
"site-url": "URL del sitio",
|
||||
"default-home-page": "Página de inicio predeterminada",
|
||||
"email-account-settings": "Configuración de la cuenta de correo electrónico",
|
||||
"sender-email": "Remitente de correo electrónico",
|
||||
"emails-will-be-sent-from-this-address": "Los correo electrónicos seran enviados desde esta direccion.",
|
||||
|
|
@ -138,7 +135,6 @@
|
|||
"disable-the-user": "Deshabilitar usuario",
|
||||
"profile-picture": "Imagen de perfil",
|
||||
"edit-or-delete-your-categories": "Edit or delete your categories",
|
||||
"create-a-new-page-for-your-site": "Create a new page for your site",
|
||||
"create-a-new-category-to-organize-your-content": "Create a new category to organize your content",
|
||||
"confirm-delete-this-action-cannot-be-undone": "Confirmar eliminación, esta operación no se puede deshacer.",
|
||||
"do-you-want-to-disable-the-user": "Quiere deshabilitar el usuario ?",
|
||||
|
|
@ -148,12 +144,9 @@
|
|||
"invite-a-friend-to-collaborate-on-your-site": "Invite a friend to collaborate on your site",
|
||||
"number-of-items-to-show-per-page": "Number of items to show per page.",
|
||||
"website-or-blog": "Website or Blog",
|
||||
"scheduled-pages": "Scheduled pages",
|
||||
"there-are-no-scheduled-pages": "There are no scheduled pages",
|
||||
"there-are-no-draft-pages": "There are no draft pages",
|
||||
"order-content-by": "Order content By",
|
||||
"edit-or-delete-content-from-your-site": "Edit or delete content from your site",
|
||||
"order-the-content-by-position-to-build-a-website": "Order the content by position to build a Website or order the content by date to build a Blog.",
|
||||
"order-the-content-by-date-to-build-a-blog": "Order the content by date to build a Blog or order the content by position to build a Website.",
|
||||
"page-not-found-content": "Hey! look like the page doesn't exist.",
|
||||
"page-not-found": "Page not found",
|
||||
"predefined-pages": "Predefined pages",
|
||||
|
|
@ -179,7 +172,6 @@
|
|||
"chat-with-developers-and-users-on-gitter": "Charla con los desarrolladores y usuarios en [Gitter](https:\/\/gitter.im\/dignajar\/bludit)",
|
||||
"this-is-a-brief-description-of-yourself-our-your-site": "Breve descripción de ti o de tu sitio, para cambiar este texto, vaya al panel de administración, ajustes, complementos, y configurar el complemento Acerca de",
|
||||
"read-the-documentation-for-more-information": "Lea la [documentación](https:\/\/docs.bludit.com) para mas información",
|
||||
"new-page-created": "New page created",
|
||||
"new-version-available": "New version available",
|
||||
"new-category-created": "New category created",
|
||||
"category-deleted": "Category deleted",
|
||||
|
|
@ -200,25 +192,42 @@
|
|||
"password-must-be-at-least-6-characters-long": "La contraseña debe tener al menos 6 carácteres.",
|
||||
"ip-address-has-been-blocked": "La direccion IP fue bloqueada.",
|
||||
"try-again-in-a-few-minutes": "Vuelva a intentar en unos minutos.",
|
||||
"page-published-from-scheduler": "Page published from scheduler",
|
||||
"content-published-from-scheduler": "Content published from scheduler",
|
||||
"installer-page-about-content": "The about page is an important and powerful for potential clients and partners. For those who wonder who is behind the website, your About page is the first source of information.",
|
||||
"blog": "Blog",
|
||||
"complete-all-fields": "Complete all fields",
|
||||
"static": "Static",
|
||||
"manage-pages": "Manage pages",
|
||||
"new-page": "New page",
|
||||
"edit-page": "Edit page",
|
||||
"create-a-new-category-to-organize-your-pages": "Create a new category to organize your pages",
|
||||
"edit-or-delete-pages-from-your-site": "Edit or delete pages from your site",
|
||||
"add-new-page": "Add new page",
|
||||
"this-field-is-used-when-you-order-the-pages-by-position": "This field is used when you order the pages by position.",
|
||||
"about-your-site-or-yourself": "About your site or yourself",
|
||||
"homepage": "Homepage",
|
||||
"disabled": "Disabled",
|
||||
"to-enable-the-user-you-must-set-a-new-password": "To enable the user you must set a new password.",
|
||||
"delete-the-user-and-associate-his-pages-to-admin-user": "Delete the user and associate his pages to admin user",
|
||||
"delete-the-user-and-all-his-pages": "Delete the user and all his pages",
|
||||
"delete-the-user-and-associate-his-content-to-admin-user": "Delete the user and associate his content to admin user",
|
||||
"delete-the-user-and-all-his-content": "Delete the user and all his content",
|
||||
"user-disabled": "User disabled",
|
||||
"user-password-changed": "User password changed",
|
||||
"page-edited": "Page edited"
|
||||
"the-password-and-confirmation-password-do-not-match": "The password and confirmation password do not match",
|
||||
"scheduled-content": "Scheduled content",
|
||||
"there-are-no-scheduled-content": "There are no scheduled content.",
|
||||
"new-content-created": "New content created",
|
||||
"content-edited": "Content edited",
|
||||
"content-deleted": "Contente deleted",
|
||||
"undefined": "Undefined",
|
||||
"create-new-content-for-your-site": "Create new content for your site",
|
||||
"there-are-no-draft-content": "There are no draft content.",
|
||||
"order-items-by": "Order items by",
|
||||
"all-content": "All content",
|
||||
"dynamic": "Dynamic",
|
||||
"type": "Type",
|
||||
"draft-content": "Draft content",
|
||||
"post": "Post",
|
||||
"default": "Default",
|
||||
"latest-content": "Latest content",
|
||||
"default-message": "Default message",
|
||||
"no-parent": "No parent",
|
||||
"have-you-seen-my-ball": "Have you seen my ball?",
|
||||
"pagebreak": "Page break",
|
||||
"pages": "Páginas",
|
||||
"this-plugin-may-not-be-supported-by-this-version-of-bludit": "This plugin may not be supported by this version of Bludit",
|
||||
"next-page": "Next page",
|
||||
"previous-page": "Previous page"
|
||||
}
|
||||
Loading…
Reference in New Issue