Merge remote-tracking branch 'origin/dev'

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

monstra/engine/core.php

@@ -45,7 +45,7 @@
         /**
     	 * The version of Monstra
     	 */
-    	const VERSION = '2.1.0';
+    	const VERSION = '2.1.1';
 
 
         /**

plugins/box/backup/backup.admin.php

@@ -1,6 +1,11 @@
 <?php
 
+    // Add plugin navigation link
+    Navigation::add(__('Backups', 'backup'), 'system', 'backup', 3);
 
+    /**
+     * Backup Admin Class
+     */
     class BackupAdmin extends Backend {
 
 

plugins/box/backup/backup.plugin.php

@@ -26,8 +26,6 @@
 
     if (Session::exists('user_role') && in_array(Session::get('user_role'), array('admin'))) {
 
-        Navigation::add(__('Backups', 'backup'), 'system', 'backup', 3);
-
         // Include Backup Admin
         Plugin::admin('backup', 'box');
       

plugins/box/blocks/blocks.admin.php

@@ -3,9 +3,9 @@
     // Add plugin navigation link
     Navigation::add(__('Blocks', 'blocks'), 'content', 'blocks', 2);
 
-    // Add Plugin Javascript
+    /**
-    Javascript::add('plugins/box/blocks/js/blocks.js', 'backend');
+     * Blocks Admin Class
-
+     */
     class BlocksAdmin extends Backend {
 
 

plugins/box/blocks/blocks.plugin.php

@@ -30,10 +30,15 @@
 
     }
 
+    // Add Plugin Javascript
+    Javascript::add('plugins/box/blocks/js/blocks.js', 'backend');
+
     // Add shortcode {block get="blockname"}
     Shortcode::add('block', 'Block::_content');      
     
-
+    /**
+     * Block Class
+     */
     class Block {
 
 

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',

plugins/box/filesmanager/filesmanager.admin.php

@@ -1,9 +1,11 @@
 <?php
 
-
+    // Add plugin navigation link
     Navigation::add(__('Files', 'filesmanager'), 'content', 'filesmanager', 3);
 
-    
+    /**
+     * Filesmanager Admin Class
+     */
     class FilesmanagerAdmin extends Backend {
         
         /**

plugins/box/filesmanager/languages/it.lang.php

@@ -8,8 +8,8 @@
             'Actions' => 'Azioni',
             'Delete' => 'Elimina',
             'Upload' => 'Carica',
-            'directory' => 'directory',
+            'directory' => 'cartella',
-            'Delete directory: :dir' => 'Elimina directory: :dir',
+            'Delete directory: :dir' => 'Elimina cartella: :dir',
             'Delete file: :file' => 'Elimina file :file',
             'Extension' => 'Estensione',
             'Size' => 'Dimensione',

plugins/box/information/information.admin.php

@@ -1,9 +1,11 @@
 <?php
 
-
+    // Add plugin navigation link
     Navigation::add(__('Information', 'information'), 'system', 'information', 5);
 
-    
+    /**
+     * Information Admin Class
+     */
     class InformationAdmin extends Backend {
 
 

plugins/box/information/languages/it.lang.php

@@ -2,7 +2,7 @@
 
     return array(
         'information' => array(
-            'Information' => 'Informazione',
+            'Information' => 'Informazioni',
             'Debugging' => 'Debugging',
             'Name' => 'Nome',
             'Value' => 'Valore',

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 {
 
 
@@ -123,6 +122,9 @@
                         $menu_item_order = '';
                         $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 = '';
 

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 {
         
 

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;
+
 ?>
 
 <h3><?php echo __('Category', 'menu'); ?>: <?php echo ($category == '') ? 'default' : $category; ?></h3>
 <br />   
 <?php
     echo (
-            Html::anchor(__('Create new item', 'menu'), 'index.php?id=menu&action=add', array('title' => __('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')) 
         ); 
 ?>
 <br /><br />

plugins/box/pages/pages.admin.php

@@ -1,14 +1,14 @@
 <?php
 
+    // Add plugin navigation link
     Navigation::add(__('Pages', 'pages'), 'content', 'pages', 1);
     
-
+    // Add action on admin_pre_render hook
     Action::add('admin_pre_render','PagesAdmin::_pageExpandAjax');
 
-    // Add Plugin Javascript
+    /**
-    Javascript::add('plugins/box/pages/js/pages.js', 'backend');
+     * Pages Admin Class
-
+     */
-
     class PagesAdmin extends Backend {
 
 

plugins/box/pages/pages.plugin.php

@@ -32,6 +32,12 @@
     }
 
 
+    // Add Plugin Javascript
+    Javascript::add('plugins/box/pages/js/pages.js', 'backend');
+
+    /**
+     * Pages Class
+     */
     class Pages extends Frontend { 
 
 

plugins/box/plugins/plugins.admin.php

@@ -3,6 +3,9 @@
     // Add plugin navigation link
     Navigation::add(__('Plugins', 'plugins'), 'extends', 'plugins', 1);
 
+    /**
+     * Plugins Admin
+     */
     class PluginsAdmin extends Backend {
 
         /**

plugins/box/sitemap/sitemap.plugin.php

@@ -30,7 +30,7 @@
 
 
     /**
-     * Sitemap 
+     * Sitemap class
      */
     class Sitemap extends Frontend {
 

plugins/box/snippets/snippets.admin.php

@@ -3,10 +3,9 @@
     // Add plugin navigation link
     Navigation::add(__('Snippets', 'snippets'), 'extends', 'snippets', 3);
 
-    // Add Plugin Javascript
+    /**
-    Javascript::add('plugins/box/snippets/js/snippets.js', 'backend');
+     * Snippets Admin Class
-
+     */
-
     class SnippetsAdmin extends Backend {
 
         /**

plugins/box/snippets/snippets.plugin.php

@@ -30,6 +30,9 @@
 
     }
 
+    // Add Plugin Javascript
+    Javascript::add('plugins/box/snippets/js/snippets.js', 'backend');
+
     // Add shortcode {snippet}
     Shortcode::add('snippet', 'Snippet::_content');      
     

plugins/box/system/system.admin.php

@@ -25,6 +25,9 @@
         '); 
     }
 
+    /**
+     * System Admin
+     */
     class SystemAdmin extends Backend {
         
         

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 template already exists' => 'Tale modello già esistente',
-            'This chunk already exists' => 'Questo chunk già esistente',
+            'This chunk already exists' => 'Tale chunk già esistente',
-            'This styles already exist' => 'Questi stili già esistenti',
+            'This styles already exist' => 'Tale stili già esistenti',
             'Components templates' => 'Modello dei componenti',
             'Your changes to the chunk <i>:name</i> have been saved.' => 'Le modifiche al chunk <i>:name</i> sono state salvate',
             'Your changes to the styles <i>:name</i> have been saved.' => 'Le modifiche ai stili <i>:name</i> sono state salvate',

plugins/box/themes/themes.admin.php

@@ -1,8 +1,11 @@
 <?php
 
+    // Add plugin navigation link
     Navigation::add(__('Themes', 'themes'), 'extends', 'themes', 2);
 
-
+    /**
+     * Themes Admin Class
+     */
     class ThemesAdmin extends Backend {
 
 

plugins/box/themes/themes.plugin.php

@@ -30,7 +30,9 @@
 
     }
 
-
+    /**
+     * Themes Class
+     */
     class Themes {
         
 

plugins/box/users/languages/it.lang.php

@@ -18,8 +18,8 @@
             'Register new user' => 'Crea un account',
             'Delete user: :user' => 'Elimina utente: :user',
             'User <i>:user</i> have been deleted.' => 'Utente <i>:user</i> è stato eliminato.',
-            'This user already exists' => 'Questo utente è già esistente',
+            'This user already exists' => 'Tale utente è già esistente',
-            'This email already exists' => 'Questa email è 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',

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 {
 
         /**

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

plugins/markitup/markitup.plugin.php

@@ -24,7 +24,9 @@
     // Add hooks  
     Action::add('admin_header', 'MarkItUp::headers');
 
-
+    /**
+     * MarkItUp Class
+     */
     class MarkItUp {
                 
 

plugins/sandbox/sandbox.plugin.php

@@ -31,7 +31,7 @@
 
 
     /**
-     * Sandbox simple class
+     * Sandbox class
      */
     class Sandbox extends Frontend {