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'; /** 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 @@ '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/filesmanager.admin.php b/plugins/box/filesmanager/filesmanager.admin.php index 817b24c..c20ae51 100755 --- a/plugins/box/filesmanager/filesmanager.admin.php +++ b/plugins/box/filesmanager/filesmanager.admin.php @@ -1,9 +1,11 @@ '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/information.admin.php b/plugins/box/information/information.admin.php index 1f6881b..a2a8018 100644 --- a/plugins/box/information/information.admin.php +++ b/plugins/box/information/information.admin.php @@ -1,9 +1,11 @@ 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/menu/menu.admin.php b/plugins/box/menu/menu.admin.php index ac97225..ecfd351 100644 --- a/plugins/box/menu/menu.admin.php +++ b/plugins/box/menu/menu.admin.php @@ -3,10 +3,9 @@ // Add plugin navigation link Navigation::add(__('Menu', 'menu'), 'content', 'menu', 4); - // Add Plugin Javascript - Javascript::add('plugins/box/menu/js/menu.js', 'backend'); - - + /** + * Menu Admin Class + */ class MenuAdmin extends Backend { @@ -121,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')) { @@ -132,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/menu.plugin.php b/plugins/box/menu/menu.plugin.php index 335bb18..f7db6c0 100644 --- a/plugins/box/menu/menu.plugin.php +++ b/plugins/box/menu/menu.plugin.php @@ -31,6 +31,13 @@ } + // Add Plugin Javascript + Javascript::add('plugins/box/menu/js/menu.js', 'backend'); + + + /** + * Menu Class + */ class Menu { 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')) ); ?>

diff --git a/plugins/box/pages/pages.admin.php b/plugins/box/pages/pages.admin.php index 83ffc1d..7612a8e 100755 --- a/plugins/box/pages/pages.admin.php +++ b/plugins/box/pages/pages.admin.php @@ -1,14 +1,14 @@ '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/themes/themes.admin.php b/plugins/box/themes/themes.admin.php index 17c8cd4..564102f 100755 --- a/plugins/box/themes/themes.admin.php +++ b/plugins/box/themes/themes.admin.php @@ -1,8 +1,11 @@ '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', diff --git a/plugins/box/users/users.admin.php b/plugins/box/users/users.admin.php index fe5f73b..c7217d4 100755 --- a/plugins/box/users/users.admin.php +++ b/plugins/box/users/users.admin.php @@ -12,10 +12,9 @@ // Add plugin navigation link Navigation::add(__('Users', 'users'), 'system', 'users', 2); - // Add Plugin Javascript - Javascript::add('plugins/box/users/js/users.js', 'backend'); - - + /** + * Users Admin Class + */ class UsersAdmin extends Backend { /** diff --git a/plugins/box/users/users.plugin.php b/plugins/box/users/users.plugin.php index daf9f9e..5064c41 100644 --- a/plugins/box/users/users.plugin.php +++ b/plugins/box/users/users.plugin.php @@ -25,6 +25,8 @@ // Include Users Admin Plugin::Admin('users', 'box'); + // Add Plugin Javascript + Javascript::add('plugins/box/users/js/users.js', 'backend'); /** * Users class diff --git a/plugins/markitup/markitup.plugin.php b/plugins/markitup/markitup.plugin.php index ea3322b..aeb7763 100644 --- a/plugins/markitup/markitup.plugin.php +++ b/plugins/markitup/markitup.plugin.php @@ -24,7 +24,9 @@ // Add hooks Action::add('admin_header', 'MarkItUp::headers'); - + /** + * MarkItUp Class + */ class MarkItUp { diff --git a/plugins/sandbox/sandbox.plugin.php b/plugins/sandbox/sandbox.plugin.php index 17745e3..d2a8f6f 100644 --- a/plugins/sandbox/sandbox.plugin.php +++ b/plugins/sandbox/sandbox.plugin.php @@ -31,7 +31,7 @@ /** - * Sandbox simple class + * Sandbox class */ class Sandbox extends Frontend {