From 14531416a576a88e9b5cd760f3aed97b85f8d19a Mon Sep 17 00:00:00 2001 From: Awilum Date: Fri, 30 Nov 2012 18:57:57 +0200 Subject: [PATCH 1/4] Plugins: Minify bug #71 - fixed --- plugins/box/backup/backup.admin.php | 5 +++++ plugins/box/backup/backup.plugin.php | 2 -- plugins/box/blocks/blocks.admin.php | 6 +++--- plugins/box/blocks/blocks.plugin.php | 7 ++++++- plugins/box/filesmanager/filesmanager.admin.php | 6 ++++-- plugins/box/information/information.admin.php | 6 ++++-- plugins/box/menu/menu.admin.php | 7 +++---- plugins/box/menu/menu.plugin.php | 7 +++++++ plugins/box/pages/pages.admin.php | 10 +++++----- plugins/box/pages/pages.plugin.php | 6 ++++++ plugins/box/plugins/plugins.admin.php | 3 +++ plugins/box/sitemap/sitemap.plugin.php | 2 +- plugins/box/snippets/snippets.admin.php | 7 +++---- plugins/box/snippets/snippets.plugin.php | 3 +++ plugins/box/system/system.admin.php | 3 +++ plugins/box/themes/themes.admin.php | 5 ++++- plugins/box/themes/themes.plugin.php | 4 +++- plugins/box/users/users.admin.php | 7 +++---- plugins/box/users/users.plugin.php | 2 ++ plugins/markitup/markitup.plugin.php | 4 +++- plugins/sandbox/sandbox.plugin.php | 2 +- 21 files changed, 72 insertions(+), 32 deletions(-) diff --git a/plugins/box/backup/backup.admin.php b/plugins/box/backup/backup.admin.php index 9c37cc4..7c51c69 100755 --- a/plugins/box/backup/backup.admin.php +++ b/plugins/box/backup/backup.admin.php @@ -1,6 +1,11 @@ Date: Fri, 30 Nov 2012 19:15:52 +0200 Subject: [PATCH 2/4] Menus Plugin: bug with categories - fixed --- plugins/box/menu/menu.admin.php | 7 +++++-- plugins/box/menu/views/backend/index.view.php | 4 +++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/plugins/box/menu/menu.admin.php b/plugins/box/menu/menu.admin.php index cb1e67b..ecfd351 100644 --- a/plugins/box/menu/menu.admin.php +++ b/plugins/box/menu/menu.admin.php @@ -120,8 +120,11 @@ $menu_item_category = ''; $menu_item_target = ''; $menu_item_order = ''; - $errors = array(); + $errors = array(); + // Get current category + $menu_item_category = $current_category = (Request::get('category')) ? Request::get('category') : '' ; + // Add new menu item if (Request::post('menu_add_item')) { @@ -131,7 +134,7 @@ if (Request::post('menu_item_name')) $menu_item_name = Request::post('menu_item_name'); else $menu_item_name = ''; if (Request::post('menu_item_link')) $menu_item_link = Request::post('menu_item_link'); else $menu_item_link = ''; - if (Request::post('menu_item_category')) $menu_item_category = Request::post('menu_item_category'); else $menu_item_category = ''; + if (Request::post('menu_item_category')) $menu_item_category = Request::post('menu_item_category'); else $menu_item_category = $current_category; if (Request::post('menu_item_target')) $menu_item_target = Request::post('menu_item_target'); else $menu_item_target = ''; if (Request::post('menu_item_order')) $menu_item_order = Request::post('menu_item_order'); else $menu_item_order = ''; diff --git a/plugins/box/menu/views/backend/index.view.php b/plugins/box/menu/views/backend/index.view.php index 144d0e8..2978929 100644 --- a/plugins/box/menu/views/backend/index.view.php +++ b/plugins/box/menu/views/backend/index.view.php @@ -20,13 +20,15 @@ $items = $menu->select('[category="'.$category.'"]', 'all', null, array('id', 'name', 'link', 'target', 'order', 'category'), 'order', 'ASC'); + $category_to_add = ($category == '') ? '' : '&category='.$category; + ?>

:


__('Create new page', 'menu'), 'class' => 'btn btn-small')) + Html::anchor(__('Create new item', 'menu'), 'index.php?id=menu&action=add'.$category_to_add , array('title' => __('Create new page', 'menu'), 'class' => 'btn btn-small')) ); ?>

From 194ff0774c972e00bf9754ae441cc6b996e4ed3a Mon Sep 17 00:00:00 2001 From: Awilum Date: Fri, 30 Nov 2012 19:25:07 +0200 Subject: [PATCH 3/4] Localization: IT translations fixed. --- plugins/box/blocks/languages/it.lang.php | 2 +- plugins/box/filesmanager/languages/it.lang.php | 4 ++-- plugins/box/information/languages/it.lang.php | 4 ++-- plugins/box/themes/languages/it.lang.php | 8 ++++---- plugins/box/users/languages/it.lang.php | 6 +++--- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/plugins/box/blocks/languages/it.lang.php b/plugins/box/blocks/languages/it.lang.php index 4acb2de..c919cf6 100644 --- a/plugins/box/blocks/languages/it.lang.php +++ b/plugins/box/blocks/languages/it.lang.php @@ -14,7 +14,7 @@ 'Actions' => 'Azioni', 'Save and exit' => 'Salva ed esci', 'Required field' => 'Campo obbligatorio', - 'This block already exists' => 'Tale blocco è già esistente', + 'This block already exists' => 'Tale blocco già esistente', 'This block does not exist' => 'Tale blocco non esiste', 'Delete block: :block' => 'Elimina blocco: :block', 'Block content' => 'Contenuto del blocco', diff --git a/plugins/box/filesmanager/languages/it.lang.php b/plugins/box/filesmanager/languages/it.lang.php index 8d59dab..f4f6073 100644 --- a/plugins/box/filesmanager/languages/it.lang.php +++ b/plugins/box/filesmanager/languages/it.lang.php @@ -8,8 +8,8 @@ 'Actions' => 'Azioni', 'Delete' => 'Elimina', 'Upload' => 'Carica', - 'directory' => 'directory', - 'Delete directory: :dir' => 'Elimina directory: :dir', + 'directory' => 'cartella', + 'Delete directory: :dir' => 'Elimina cartella: :dir', 'Delete file: :file' => 'Elimina file :file', 'Extension' => 'Estensione', 'Size' => 'Dimensione', diff --git a/plugins/box/information/languages/it.lang.php b/plugins/box/information/languages/it.lang.php index 689db73..db1f720 100644 --- a/plugins/box/information/languages/it.lang.php +++ b/plugins/box/information/languages/it.lang.php @@ -2,14 +2,14 @@ return array( 'information' => array( - 'Information' => 'Informazione', + 'Information' => 'Informazioni', 'Debugging' => 'Debugging', 'Name' => 'Nome', 'Value' => 'Valore', 'Security' => 'Sicurezza', 'System' => 'Sistema', 'on' => 'on', - 'off'=> 'off', + 'off'=> 'off', 'Server' => 'Server', 'PHP version' => 'Versione PHP', 'SimpleXML module' => 'Modulo SimpleXML', diff --git a/plugins/box/themes/languages/it.lang.php b/plugins/box/themes/languages/it.lang.php index d936031..353e466 100644 --- a/plugins/box/themes/languages/it.lang.php +++ b/plugins/box/themes/languages/it.lang.php @@ -14,7 +14,7 @@ 'Delete chunk: :name' => 'Elimina chunk: :name', 'Delete styles: :name' => 'Elimina stili: :name', 'Templates' => 'Templates', - 'Clone' => 'Clonare', + 'Clone' => 'Duplica', 'Edit' => 'Modifica', 'Delete' => 'Elimina', 'Actions' => 'Azioni', @@ -34,9 +34,9 @@ 'Admin theme' => 'Tema del backend', 'Current site theme' => 'Tema corrente del sito', 'Current admin theme' => 'Tema corrente del backend', - 'This template already exists' => 'Questo modello già esistente', - 'This chunk already exists' => 'Questo chunk già esistente', - 'This styles already exist' => 'Questi stili già esistenti', + 'This template already exists' => 'Tale modello già esistente', + 'This chunk already exists' => 'Tale chunk già esistente', + 'This styles already exist' => 'Tale stili già esistenti', 'Components templates' => 'Modello dei componenti', 'Your changes to the chunk :name have been saved.' => 'Le modifiche al chunk :name sono state salvate', 'Your changes to the styles :name have been saved.' => 'Le modifiche ai stili :name sono state salvate', diff --git a/plugins/box/users/languages/it.lang.php b/plugins/box/users/languages/it.lang.php index a351b56..50a4267 100644 --- a/plugins/box/users/languages/it.lang.php +++ b/plugins/box/users/languages/it.lang.php @@ -18,8 +18,8 @@ 'Register new user' => 'Crea un account', 'Delete user: :user' => 'Elimina utente: :user', 'User :user have been deleted.' => 'Utente :user è stato eliminato.', - 'This user already exists' => 'Questo utente è già esistente', - 'This email already exists' => 'Questa email è già esistente', + 'This user already exists' => 'Tale utente è già esistente', + 'This email already exists' => 'Tale ta email è già esistente', 'Changes saved' => 'Le modifiche sono state salvate', 'Wrong old password' => 'Vecchia password errata', 'Admin' => 'Amministratore', @@ -54,7 +54,7 @@ 'User registration is closed.' => 'Registrazione utenti è chiusa.', 'Allow user registration' => 'Consenti registrazione utenti.', 'Required field' => 'Campo obbligatorio', - 'This user doesnt exist' => 'Questo utente non esiste', + 'This user doesnt exist' => 'Tale utente non esiste', 'Captcha code is wrong' => 'Codice captcha errato', 'Your login details for :site_name has been sent' => 'I tuoi dati di accesso :site_name sono stati inviati', 'Your new password for :site_name' => 'La tua nuova password per :site_name', From 923685e9b3301cdac57a6b8f4e605e0ab1b804fe Mon Sep 17 00:00:00 2001 From: Awilum Date: Fri, 30 Nov 2012 19:47:13 +0200 Subject: [PATCH 4/4] Monstra 2.1.1 --- changelog.txt | 10 +++++++--- monstra/engine/core.php | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/changelog.txt b/changelog.txt index a6177fb..44f80fe 100755 --- a/changelog.txt +++ b/changelog.txt @@ -1,4 +1,10 @@ -Monstra 2.1.0, xxxx-xx-xx +Monstra 2.1.1, 2012-11-30 +------------------------ +- Plugins: Minify bug #71 - fixed. +- Menu Plugin: bug with categories #70 - fixed. +- Localization: IT translations - fixed. + +Monstra 2.1.0, 2012-11-29 ------------------------ - Localization: PT-BR, UK translations added. - Default theme: hook "theme_header" added. @@ -54,7 +60,6 @@ Monstra 2.1.0, xxxx-xx-xx - Imformation Plugin: config file(defines.php) checking removed. - Box Plugins: general code refactoring. - Monstra 2.0.1, 2012-10-18 ------------------------ - Localization: DE, LT, IT translations added @@ -102,7 +107,6 @@ Monstra 2.0.0, 2012-10-09 - Path updates. - And a lot of general engine improvements. - Monstra 1.3.1, 2012-09-02 ------------------------ - Fix Plugins Output diff --git a/monstra/engine/core.php b/monstra/engine/core.php index 1804fb9..02cc053 100644 --- a/monstra/engine/core.php +++ b/monstra/engine/core.php @@ -45,7 +45,7 @@ /** * The version of Monstra */ - const VERSION = '2.1.0'; + const VERSION = '2.1.1'; /**