Changeset 638974

Timestamp:

12/14/2012 04:12:38 AM (13 years ago)

Author:

Gecka

Message:

Version 7.0-beta3

Location:

gecka-submenu/trunk

Files:

• css/admin-nav-menu-edit.css (modified) (1 diff)
• gecka-submenu.class.php (modified) (9 diffs)
• gecka-submenu.php (modified) (5 diffs)
• index.php (added)
• javascripts/widget-custom-menu.js (modified) (1 diff)
• languages/gecka-submenu-fr_FR.mo (modified) (previous)
• languages/gecka-submenu-fr_FR.po (modified) (3 diffs)
• languages/gecka-submenu.pot (modified) (2 diffs)
• models/NavMenuHacks.php (modified) (5 diffs)
• models/Shortcodes.php (modified) (2 diffs)
• models/Submenu.php (modified) (14 diffs)
• readme.txt (modified) (5 diffs)
• screenshot-1.png (modified) (previous)
• screenshot-2.png (modified) (previous)
• views/Nav-Menu-Fields.php (modified) (1 diff)
• widgets/Custom-menu.php (modified) (8 diffs)

gecka-submenu/trunk/css/admin-nav-menu-edit.css

@@ -1 @@
-.edit-menu-item-autopopulate label {
-
-    font-size: 110%;
-    font-weight: bold;
-
-}
-
-.edit-menu-item-autopopulate-options {
-
-margin-right: 7px;
-
-}
-
-.gsm_posts_options, .gsm_taxonomies_options {
-    margin-top: 2px;
-    display: block;
-
-}
-
-.gsm_posts_options span.description-thin, .gsm_taxonomies_options  span.description-thin{
-
-    display: block;
-    width: 180px;
-}
-
-.gsm-autopopulate-posttype {
-
-    font-size: 12px;   
-
-}
-
-.gsm-title {display: block; border-bottom: 1px solid #DFDFDF;}
+.edit-menu-item-autopopulate label{font-size:110%;font-weight:bold}.edit-menu-item-autopopulate-options{margin-right:7px}.gsm_posts_options,.gsm_taxonomies_options{margin-top:2px;display:block}.gsm_posts_options span.description-thin,.gsm_taxonomies_options span.description-thin{display:block;width:180px}.gsm-autopopulate-posttype{font-size:12px}.gsm-title{display:block;border-bottom:1px solid #dfdfdf}

gecka-submenu/trunk/gecka-submenu.class.php

@@ -3 +3 @@
 /**
  * Main Plugin class
- * @author lox
+ * @author Gecka
  *
  */
@@ -17 +17 @@
         load_plugin_textdomain(self::Domain, false, dirname( plugin_basename( __FILE__ ) ) . '/languages');
         
-        $this->Options = get_option( self::Domain . '_settings');
-        
         add_action('init', array($this, 'init') );
-        
+
+        // pro upgrade notice
+        add_action('current_screen', array($this, 'pro_notice') );
+        add_action('wp_ajax_gecka_submenu_dismiss_notice', array($this, 'dismiss_notice'));
+
         // load widgets
         add_action('widgets_init', array($this, 'widgetsInit') );
@@ -27 +29 @@
         add_filter('wp_get_nav_menu_items', array($this, 'wp_get_nav_menu_items' ), 15, 3);
         
-        // filter to show the description of menu items if asked
-        add_filter('walker_nav_menu_start_el', array($this, 'walker_nav_menu_start_el'), 10, 4);
-    
+        // filter to use our custom nav menu walker
+        add_filter('wp_nav_menu_args', array($this, 'wp_nav_menu_args'));
+        add_filter('wp_page_menu_args', array($this, 'wp_page_menu_args'));
+        
+        // filter to add thumbnail to menu item
+        add_filter('nav_menu_item_before', array($this, 'nav_menu_item_before'), 10, 5);
+        
+        // filters to add description to menu item
+        add_filter('nav_menu_item_after', array($this, 'nav_menu_item_after'), 10, 4);
+        add_filter('nav_menu_item_link_after', array($this, 'nav_menu_item_link_after'), 10, 4);
+        
         if( !is_admin() )  {
             require_once  GKSM_PATH . '/models/Shortcodes.php';
             new Gecka_Submenu_Shortcodes();
-        }
-        else {
-        
-            if( get_option( self::Domain . '-pro-notice', '0') == 1 )
-            add_action('admin_notices', array( $this, 'admin_notices') );
-            add_action('wp_ajax_gecka_submenu_dismiss_notice', array($this, 'dismiss_notice'));
-            add_action('admin_head', array($this, 'dismiss_notice_js') );
-
         }
         
@@ -46 +48 @@
         require_once  GKSM_PATH . '/models/NavMenuHacks.php';
         new Gecka_Submenu_NavMenuHacks();
+        
+        // Licence API
+        // require_once  GKSM_PATH . '/models/Pro.php';
+        // new Gecka_plugin_Pro(plugin_basename(dirname(__FILE__) . '/gecka-submenu.php'), GKSM_VERSION);
+    
     }
     
@@ -53 +60 @@
         remove_filter( 'wp_page_menu_args', 'twentyten_page_menu_args' );
     }
+    
+
     
     /**
@@ -109 +118 @@
     }
     
+    public function wp_nav_menu_args ($args) {
+        
+        if($args['walker'] === '') $args['walker'] = new Gecka_Walker_Nav_Menu;
+        return $args;
+        
+    }   
+
     /**
-     * Filter to show nav-menu items description
-     *       
-     * @param $item_output
-     * @param $item
-     * @param $depth
-     * @param $args
-     * @return $item_output
+     * If fallback to wp_page_menu, we unset our walker has it seems incompatible, and not needed
+     * @param array $args
+     * @return array
      */
-    public function walker_nav_menu_start_el ($item_output, $item, $depth, $args) {
-
-        $after_link = '';
-
-        if(isset($args->show_description) && $args->show_description) {
-            $after_link = !empty( $item->description ) ? '<span class="description">'    . esc_html( $item->description) .'</span>' : '';
-        }
-        
-        $after_link = apply_filters('nav_menu_item_after_link', $after_link, $item, $args, $depth);
-            
-        if($args->show_description == 'into_link') $after_link = $after_link . '</a>';
-        else $after_link = '</a>' . $after_link;
-            
-        $item_output = str_replace('</a>', $after_link, $item_output);
-        
-        
-        $before_link = '';
-        if(isset($args->thumbnail) && $args->thumbnail) {
+    public function wp_page_menu_args ($args) {
+    
+        if($args['walker'] instanceof Walker_Nav_Menu) $args['walker'] = '';
+        return $args;
+    
+    }
+    
+    public function nav_menu_item_before ($content, $item, $depth, $args, $link_attributes) {
+        
+        if(isset($args->thumbnail) && $args->thumbnail) {
           
             $size = $args->thumbnail;
             if( strpos($size, ',') ) $size = explode(',',$size);
         
-            $before_link = get_the_post_thumbnail( $item->object_id, $size );
+            $content  .= "<a $link_attributes>" . get_the_post_thumbnail( $item->object_id, $size ) . "</a>";
             
         }
-        
-        $before_link = apply_filters('nav_menu_item_before_link', $before_link, $item, $args, $depth);
-       
-        $item_output = str_replace('<a', $before_link.'<a', $item_output);
-        
-        return $item_output;
-    }
-    
+        return $content;
+    }
+    
+    public function nav_menu_item_after ($content, $item, $depth, $args) {
+        
+        if( isset($args->show_description) && $args->show_description && $args->show_description !== 'into_link') {
+            $description = !empty( $item->description ) ? '<span class="description">'    . esc_html( $item->description) .'</span>' : '';
+            
+            $content .= $description;
+        }
+        return $content;
+        
+    }
+    
+    public function nav_menu_item_link_after ($content, $item, $depth, $args) {
+        if( isset($args->show_description) && $args->show_description && $args->show_description === 'into_link') {
+            $description = !empty( $item->description ) ? '<span class="description">'    . esc_html( $item->description) .'</span>' : '';
+            
+            $content .= $description;
+        }
+        return $content;
+    }
+
+    public function pro_notice ($screen) {
+
+        if( ! in_array($screen->base, array('nav-menus', 'plugins')) ) return;
+
+        if( get_option( 'gecka-submenu-pro-notice', '1') === '0' ) return;
+
+        add_action('admin_notices', array( $this, 'admin_notices') );
+
+        wp_enqueue_script('jquery');
+        add_action('admin_head', array($this, 'dismiss_notice_js') );
+    }
+
     function admin_notices() {
-    
         echo '<div class="updated" id="gecka_submenu_notice"><div style="float: right; margin-top: 3px"><a href="#" onclick="gecka_submenu_dismiss_notice(); return false;">Dismiss</a></div>';
         echo '<p>' . __('You are using Gecka Submenu.', self::Domain ) . ' '. __('<a href="http://www.gecka-apps.com" target="_blank">Discover the pro version</a> to get the most out of the Wordpress menu system.', self::Domain ). "</p></div>";
@@ -158 +188 @@
     
     function dismiss_notice () {
-    
         update_option( 'gecka-submenu-pro-notice', '0');
         die();
-        
-    }
+    }
+    
     function dismiss_notice_js () {
         ?>
@@ -183 +212 @@
 
     }
+}
+
+/**
+ * Custom nav menu walker
+ * This nav menu walker adds 4 filters to allow to fully customize the menu items output
+ * @author Gecka
+ *
+ */
+class Gecka_Walker_Nav_Menu extends Walker_Nav_Menu {
+    
+    /**
+     * @see Walker::start_el()
+     * @since 3.0.0
+     *
+     * @param string $output Passed by reference. Used to append additional content.
+     * @param object $item Menu item data object.
+     * @param int $depth Depth of menu item. Used for padding.
+     * @param int $current_page Menu item ID.
+     * @param object $args
+     */
+    function start_el(&$output, $item, $depth, $args) {
+        global $wp_query;
+        $indent = ( $depth ) ? str_repeat( "\t", $depth ) : '';
+
+        $class_names = $value = '';
+
+        $classes = empty( $item->classes ) ? array() : (array) $item->classes;
+        $classes[] = 'menu-item-' . $item->ID;
+
+        $class_names = join( ' ', apply_filters( 'nav_menu_css_class', array_filter( $classes ), $item, $args ) );
+        $class_names = ' class="' . esc_attr( $class_names ) . '"';
+
+        $id = apply_filters( 'nav_menu_item_id', 'menu-item-'. $item->ID, $item, $args );
+        $id = strlen( $id ) ? ' id="' . esc_attr( $id ) . '"' : '';
+
+        $output .= $indent . '<li' . $id . $value . $class_names .'>';
+
+        $attributes  = ! empty( $item->attr_title ) ? ' title="'  . esc_attr( $item->attr_title ) .'"' : '';
+        $attributes .= ! empty( $item->target )     ? ' target="' . esc_attr( $item->target     ) .'"' : '';
+        $attributes .= ! empty( $item->xfn )        ? ' rel="'    . esc_attr( $item->xfn        ) .'"' : '';
+        $attributes .= ! empty( $item->url )        ? ' href="'   . esc_attr( $item->url        ) .'"' : '';
+
+        $item_output = apply_filters( 'nav_menu_item_before', $args->before, $item, $depth, $args, $attributes );
+        $item_output .= '<a'. $attributes .'>';
+        $item_output .= apply_filters( 'nav_menu_item_link_before', $args->link_before, $item, $depth, $args );
+        $item_output .= apply_filters( 'the_title', $item->title, $item->ID );
+        $item_output .= apply_filters( 'nav_menu_item_link_after', $args->link_after, $item, $depth, $args );
+        $item_output .= '</a>';
+        $item_output .= apply_filters( 'nav_menu_item_after', $args->after, $item, $depth, $args, $attributes );
+
+        $output .= apply_filters( 'walker_nav_menu_start_el', $item_output, $item, $depth, $args );
+    }
 }
 
@@ -231 +312 @@
     }
 }
+

gecka-submenu/trunk/gecka-submenu.php

@@ -4 +4 @@
 Plugin URI: http://gecka-apps.com/wordpress-plugins/geka-submenu/
 Description: Enhances the worpdress nav menu system, autopopulate with children pages
-Version: 0.6
+Version: 0.7-beta3
 Author: Gecka Apps
 Author URI: http://gecka-apps.com
@@ -10 +10 @@
 */
 
-/* Copyright 2010  Gecka SARL (email: [email protected]). All rights reserved
+/* Copyright 2010-2012  Gecka SARL (email: [email protected]). All rights reserved
 
     This program is free software; you can redistribute it and/or modify
@@ -26 +26 @@
 */
 
-// require PHP 5
+define('GKSM_PATH' , WP_PLUGIN_DIR . "/" . plugin_basename(dirname(__FILE__)) );
+define('GKSM_URL'  , WP_PLUGIN_URL . "/" . plugin_basename(dirname(__FILE__)) );
+
+define('GKSM_VERSION', '0.7-beta3');
+
+// requires PHP 5
 function gksm_activation_check(){
     if (version_compare(PHP_VERSION, '5.0.0', '<')) {
@@ -32 +37 @@
         wp_die("Sorry, Gecka Submenu requires PHP 5 or higher. Ask your host how to enable PHP 5 as the default on your servers.");
     }
-    update_option( 'gecka-submenu-pro-notice', '1');
+    update_option( 'gecka-submenu-pro-notice', '1');
 }
 register_activation_hook(__FILE__, 'gksm_activation_check');
 
-define('GKSM_PATH' , WP_PLUGIN_DIR . "/" . plugin_basename(dirname(__FILE__)) );
-define('GKSM_URL'  , WP_PLUGIN_URL . "/" . plugin_basename(dirname(__FILE__)) );
-
-//needed global vars for widget usage
+// needed global vars for widget usage (hugly hack...)
 $GKSM_ID = $GKSM_MENUID = null;
 
 require GKSM_PATH . '/gecka-submenu.class.php';
 
-// Instantiate the class
 if (class_exists('Gecka_Submenu')) {
     if (!isset($GkSm)) {
@@ -50 +51 @@
         include GKSM_PATH . '/models/Submenu.php';
         $GkSm = new Gecka_Submenu();
-        
+    
     }
 }

gecka-submenu/trunk/javascripts/widget-custom-menu.js

@@ -1 @@
-(function($) {
-
-    gksm_widget_update_select = function (elem, target) {
-
-        var data = { action: 'gksm_update',
-                     ID: elem.value,
-                     _ajax_nonce: gksm_widget.custom_menu_nonce
-                    };
-                
-        // since 2.8 ajaxurl is always defined in the admin header and points to admin-ajax.php
-        $.post(ajaxurl, data, function(response) {
-            $(target).html(response);
-        });
-    };
-
-
-})(jQuery);
+(function(a){gksm_widget_update_select=function(b,d){var c={action:"gksm_update",ID:b.value,_ajax_nonce:gksm_widget.custom_menu_nonce};a.post(ajaxurl,c,function(e){a(d).html(e)})}})(jQuery);

gecka-submenu/trunk/languages/gecka-submenu-fr_FR.po

@@ -3 +3 @@
 "Project-Id-Version: Gecka Sub-Menu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-10 15:30+1100\n"
+"POT-Creation-Date: 2012-12-14 14:54+1100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Laurent Dinclaux <[email protected]>\n"
 "Language-Team: Gecka <[email protected]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "X-Poedit-KeywordsList: __;_e\n"
 "X-Poedit-Basepath: .\n"
@@ -16 +16 @@
 "X-Poedit-SearchPath-0: ..\n"
 
-#: ../gecka-submenu.class.php:153
+#: ../gecka-submenu.class.php:186
 msgid "You are using Gecka Submenu."
 msgstr "Vous utilisez Gecka Submenu."
 
-#: ../gecka-submenu.class.php:153
+#: ../gecka-submenu.class.php:186
 msgid "<a href=\"http://www.gecka-apps.com\" target=\"_blank\">Discover the pro version</a> to get the most out of the Wordpress menu system."
 msgstr "<a href=\"http://www.gecka-apps.com\" target=\"_blank\">Découvrez la version pro</a> pour obtenir le maximum du système de menus de Wordpress."
@@ -28 +28 @@
 msgstr "Afficher les sous pages automatiquement"
 
-#: ../models/NavMenuHacks.php:288
-#, php-format
-msgid "%s (Pending)"
-msgstr ""
-
-#: ../models/NavMenuHacks.php:327
-#: ../models/NavMenuHacks.php:329
-msgid "Edit Menu Item"
-msgstr ""
-
-#: ../models/NavMenuHacks.php:338
-msgid "URL"
-msgstr ""
-
-#: ../models/NavMenuHacks.php:345
-msgid "Navigation Label"
-msgstr ""
-
-#: ../models/NavMenuHacks.php:351
-msgid "Title Attribute"
-msgstr ""
-
-#: ../models/NavMenuHacks.php:357
-msgid "Link Target"
-msgstr ""
-
-#: ../models/NavMenuHacks.php:359
-msgid "Same window or tab"
-msgstr ""
-
-#: ../models/NavMenuHacks.php:360
-msgid "New window or tab"
-msgstr ""
-
-#: ../models/NavMenuHacks.php:366
-msgid "CSS Classes (optional)"
-msgstr ""
-
-#: ../models/NavMenuHacks.php:372
-msgid "Link Relationship (XFN)"
-msgstr ""
-
-#: ../models/NavMenuHacks.php:378
-msgid "Description"
-msgstr ""
-
-#: ../models/NavMenuHacks.php:380
-msgid "The description will be displayed in the menu if the current theme supports it."
-msgstr ""
-
-#: ../models/NavMenuHacks.php:389
-#, php-format
-msgid "Original: %s"
-msgstr ""
-
-#: ../models/NavMenuHacks.php:402
-msgid "Remove"
-msgstr ""
-
-#: ../models/NavMenuHacks.php:403
-msgid "Cancel"
-msgstr ""
-
-#: ../widgets/Custom-menu.php:12
+#: ../widgets/Custom-menu.php:14
 msgid "Use this widget to add one of your custom menus as a widget."
-msgstr ""
-
-#: ../widgets/Custom-menu.php:13
+msgstr "Utilisez ce widget pour ajouter l’un de vos menus en tant que widget. "
+
+#: ../widgets/Custom-menu.php:16
 msgid "Custom Menu"
-msgstr ""
-
-#: ../widgets/Custom-menu.php:13
+msgstr "Menu personnalisé"
+
+#: ../widgets/Custom-menu.php:16
 msgid "[advanced]"
 msgstr "[avancé]"
 
-#: ../widgets/Custom-menu.php:76
+#: ../widgets/Custom-menu.php:86
 #, php-format
 msgid "No menus have been created yet. <a href=\"%s\">Create some</a>."
 msgstr "Aucun menu n'a encore été créét. <a href=\"%s\">An créer un</a>."
 
-#: ../widgets/Custom-menu.php:82
+#: ../widgets/Custom-menu.php:92
 msgid "Title:"
 msgstr "Titre:"
 
-#: ../widgets/Custom-menu.php:87
+#: ../widgets/Custom-menu.php:97
 msgid "Use top parent item title"
 msgstr "Utiliser le titre du parent le plus haut"
 
-#: ../widgets/Custom-menu.php:90
+#: ../widgets/Custom-menu.php:100
 msgid "Select Menu:"
 msgstr "Sélectionnez un menu:"
 
-#: ../widgets/Custom-menu.php:93
+#: ../widgets/Custom-menu.php:103
 msgid "Select"
 msgstr "Sélectionnez"
 
-#: ../widgets/Custom-menu.php:104
+#: ../widgets/Custom-menu.php:114
 msgid "Start menu from:"
 msgstr "Commencer le menu à partir"
 
-#: ../widgets/Custom-menu.php:107
+#: ../widgets/Custom-menu.php:117
 msgid "Click save first"
 msgstr "Veuillez d'abord sauvegarder"
 
-#: ../widgets/Custom-menu.php:113
+#: ../widgets/Custom-menu.php:123
 msgid "Depth:"
 msgstr "Profondeur:"
 
-#: ../widgets/Custom-menu.php:119
+#: ../widgets/Custom-menu.php:129
 msgid "Show parent item"
 msgstr "Afficher l'élément parent"
 
-#: ../widgets/Custom-menu.php:122
+#: ../widgets/Custom-menu.php:131
 msgid "Show description"
 msgstr "Afficher la description"
 
-#: ../widgets/Custom-menu.php:141
-#: ../widgets/Custom-menu.php:150
+#: ../widgets/Custom-menu.php:133
+msgid "No"
+msgstr "Non"
+
+#: ../widgets/Custom-menu.php:134
+msgid "Into link element"
+msgstr ""
+
+#: ../widgets/Custom-menu.php:135
+msgid "Into li element"
+msgstr ""
+
+#: ../widgets/Custom-menu.php:138
+msgid "Class:"
+msgstr ""
+
+#: ../widgets/Custom-menu.php:162
+#: ../widgets/Custom-menu.php:171
 msgid "First select a nav menu"
 msgstr "Sélectionnez d'abord un menu"
 
-#: ../widgets/Custom-menu.php:157
+#: ../widgets/Custom-menu.php:178
 msgid "Error: Unknow menu."
 msgstr "Erreur: menu inconnu."
 
-#: ../widgets/Custom-menu.php:163
+#: ../widgets/Custom-menu.php:184
 msgid "Nav menu root"
 msgstr "Racine du menu"
 
-#: ../widgets/Custom-menu.php:164
+#: ../widgets/Custom-menu.php:185
 msgid "Current page"
 msgstr "Page actuelle"
 
+#: ../widgets/Custom-menu.php:186
+msgid "Current page's top parent"
+msgstr "Le parent le plus haut"
+
+#: ../models/Nav-Menu-Edit-Walker.php:65
+#: ../models/Nav-Menu-Edit-Walker.php:252
+#, php-format
+msgid "%s (Pending)"
+msgstr ""
+
+#: ../models/Nav-Menu-Edit-Walker.php:104
+#: ../models/Nav-Menu-Edit-Walker.php:106
+#: ../models/Nav-Menu-Edit-Walker.php:293
+msgid "Edit Menu Item"
+msgstr ""
+
+#: ../models/Nav-Menu-Edit-Walker.php:115
+#: ../models/Nav-Menu-Edit-Walker.php:302
+msgid "URL"
+msgstr ""
+
+#: ../models/Nav-Menu-Edit-Walker.php:122
+#: ../models/Nav-Menu-Edit-Walker.php:309
+msgid "Navigation Label"
+msgstr ""
+
+#: ../models/Nav-Menu-Edit-Walker.php:128
+#: ../models/Nav-Menu-Edit-Walker.php:315
+msgid "Title Attribute"
+msgstr ""
+
+#: ../models/Nav-Menu-Edit-Walker.php:134
+msgid "Link Target"
+msgstr ""
+
+#: ../models/Nav-Menu-Edit-Walker.php:136
+msgid "Same window or tab"
+msgstr ""
+
+#: ../models/Nav-Menu-Edit-Walker.php:137
+msgid "New window or tab"
+msgstr ""
+
+#: ../models/Nav-Menu-Edit-Walker.php:143
+#: ../models/Nav-Menu-Edit-Walker.php:327
+msgid "CSS Classes (optional)"
+msgstr ""
+
+#: ../models/Nav-Menu-Edit-Walker.php:149
+#: ../models/Nav-Menu-Edit-Walker.php:333
+msgid "Link Relationship (XFN)"
+msgstr ""
+
+#: ../models/Nav-Menu-Edit-Walker.php:155
+#: ../models/Nav-Menu-Edit-Walker.php:339
+msgid "Description"
+msgstr ""
+
+#: ../models/Nav-Menu-Edit-Walker.php:157
+#: ../models/Nav-Menu-Edit-Walker.php:341
+msgid "The description will be displayed in the menu if the current theme supports it."
+msgstr ""
+
+#: ../models/Nav-Menu-Edit-Walker.php:166
+#: ../models/Nav-Menu-Edit-Walker.php:350
+#, php-format
+msgid "Original: %s"
+msgstr ""
+
+#: ../models/Nav-Menu-Edit-Walker.php:179
+#: ../models/Nav-Menu-Edit-Walker.php:363
+msgid "Remove"
+msgstr ""
+
+#: ../models/Nav-Menu-Edit-Walker.php:180
+#: ../models/Nav-Menu-Edit-Walker.php:364
+msgid "Cancel"
+msgstr ""
+
+#: ../models/Nav-Menu-Edit-Walker.php:248
+#, php-format
+msgid "%s (Invalid)"
+msgstr ""
+
+#: ../models/Nav-Menu-Edit-Walker.php:322
+msgid "Open link in a new window/tab"
+msgstr ""
+

gecka-submenu/trunk/languages/gecka-submenu.pot

@@ -3 +3 @@
 "Project-Id-Version: Gecka Sub-Menu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-10 15:30+1100\n"
+"POT-Creation-Date: 2012-12-14 14:54+1100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Laurent Dinclaux <[email protected]>\n"
 "Language-Team: Gecka <[email protected]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "X-Poedit-KeywordsList: __;_e\n"
 "X-Poedit-Basepath: .\n"
 "X-Poedit-SearchPath-0: ..\n"
 
-#: ../gecka-submenu.class.php:153
+#: ../gecka-submenu.class.php:186
 msgid "You are using Gecka Submenu."
 msgstr ""
 
-#: ../gecka-submenu.class.php:153
+#: ../gecka-submenu.class.php:186
 msgid "<a href=\"http://www.gecka-apps.com\" target=\"_blank\">Discover the pro version</a> to get the most out of the Wordpress menu system."
 msgstr ""
@@ -27 +27 @@
 msgstr ""
 
-#: ../models/NavMenuHacks.php:288
+#: ../widgets/Custom-menu.php:14
+msgid "Use this widget to add one of your custom menus as a widget."
+msgstr ""
+
+#: ../widgets/Custom-menu.php:16
+msgid "Custom Menu"
+msgstr ""
+
+#: ../widgets/Custom-menu.php:16
+msgid "[advanced]"
+msgstr ""
+
+#: ../widgets/Custom-menu.php:86
+#, php-format
+msgid "No menus have been created yet. <a href=\"%s\">Create some</a>."
+msgstr ""
+
+#: ../widgets/Custom-menu.php:92
+msgid "Title:"
+msgstr ""
+
+#: ../widgets/Custom-menu.php:97
+msgid "Use top parent item title"
+msgstr ""
+
+#: ../widgets/Custom-menu.php:100
+msgid "Select Menu:"
+msgstr ""
+
+#: ../widgets/Custom-menu.php:103
+msgid "Select"
+msgstr ""
+
+#: ../widgets/Custom-menu.php:114
+msgid "Start menu from:"
+msgstr ""
+
+#: ../widgets/Custom-menu.php:117
+msgid "Click save first"
+msgstr ""
+
+#: ../widgets/Custom-menu.php:123
+msgid "Depth:"
+msgstr ""
+
+#: ../widgets/Custom-menu.php:129
+msgid "Show parent item"
+msgstr ""
+
+#: ../widgets/Custom-menu.php:131
+msgid "Show description"
+msgstr ""
+
+#: ../widgets/Custom-menu.php:133
+msgid "No"
+msgstr ""
+
+#: ../widgets/Custom-menu.php:134
+msgid "Into link element"
+msgstr ""
+
+#: ../widgets/Custom-menu.php:135
+msgid "Into li element"
+msgstr ""
+
+#: ../widgets/Custom-menu.php:138
+msgid "Class:"
+msgstr ""
+
+#: ../widgets/Custom-menu.php:162
+#: ../widgets/Custom-menu.php:171
+msgid "First select a nav menu"
+msgstr ""
+
+#: ../widgets/Custom-menu.php:178
+msgid "Error: Unknow menu."
+msgstr ""
+
+#: ../widgets/Custom-menu.php:184
+msgid "Nav menu root"
+msgstr ""
+
+#: ../widgets/Custom-menu.php:185
+msgid "Current page"
+msgstr ""
+
+#: ../widgets/Custom-menu.php:186
+msgid "Current page's top parent"
+msgstr ""
+
+#: ../models/Nav-Menu-Edit-Walker.php:65
+#: ../models/Nav-Menu-Edit-Walker.php:252
 #, php-format
 msgid "%s (Pending)"
 msgstr ""
 
-#: ../models/NavMenuHacks.php:327
-#: ../models/NavMenuHacks.php:329
+#: ../models/Nav-Menu-Edit-Walker.php:104
+#: ../models/Nav-Menu-Edit-Walker.php:106
+#: ../models/Nav-Menu-Edit-Walker.php:293
 msgid "Edit Menu Item"
 msgstr ""
 
-#: ../models/NavMenuHacks.php:338
+#: ../models/Nav-Menu-Edit-Walker.php:115
+#: ../models/Nav-Menu-Edit-Walker.php:302
 msgid "URL"
 msgstr ""
 
-#: ../models/NavMenuHacks.php:345
+#: ../models/Nav-Menu-Edit-Walker.php:122
+#: ../models/Nav-Menu-Edit-Walker.php:309
 msgid "Navigation Label"
 msgstr ""
 
-#: ../models/NavMenuHacks.php:351
+#: ../models/Nav-Menu-Edit-Walker.php:128
+#: ../models/Nav-Menu-Edit-Walker.php:315
 msgid "Title Attribute"
 msgstr ""
 
-#: ../models/NavMenuHacks.php:357
+#: ../models/Nav-Menu-Edit-Walker.php:134
 msgid "Link Target"
 msgstr ""
 
-#: ../models/NavMenuHacks.php:359
+#: ../models/Nav-Menu-Edit-Walker.php:136
 msgid "Same window or tab"
 msgstr ""
 
-#: ../models/NavMenuHacks.php:360
+#: ../models/Nav-Menu-Edit-Walker.php:137
 msgid "New window or tab"
 msgstr ""
 
-#: ../models/NavMenuHacks.php:366
+#: ../models/Nav-Menu-Edit-Walker.php:143
+#: ../models/Nav-Menu-Edit-Walker.php:327
 msgid "CSS Classes (optional)"
 msgstr ""
 
-#: ../models/NavMenuHacks.php:372
+#: ../models/Nav-Menu-Edit-Walker.php:149
+#: ../models/Nav-Menu-Edit-Walker.php:333
 msgid "Link Relationship (XFN)"
 msgstr ""
 
-#: ../models/NavMenuHacks.php:378
+#: ../models/Nav-Menu-Edit-Walker.php:155
+#: ../models/Nav-Menu-Edit-Walker.php:339
 msgid "Description"
 msgstr ""
 
-#: ../models/NavMenuHacks.php:380
+#: ../models/Nav-Menu-Edit-Walker.php:157
+#: ../models/Nav-Menu-Edit-Walker.php:341
 msgid "The description will be displayed in the menu if the current theme supports it."
 msgstr ""
 
-#: ../models/NavMenuHacks.php:389
+#: ../models/Nav-Menu-Edit-Walker.php:166
+#: ../models/Nav-Menu-Edit-Walker.php:350
 #, php-format
 msgid "Original: %s"
 msgstr ""
 
-#: ../models/NavMenuHacks.php:402
+#: ../models/Nav-Menu-Edit-Walker.php:179
+#: ../models/Nav-Menu-Edit-Walker.php:363
 msgid "Remove"
 msgstr ""
 
-#: ../models/NavMenuHacks.php:403
+#: ../models/Nav-Menu-Edit-Walker.php:180
+#: ../models/Nav-Menu-Edit-Walker.php:364
 msgid "Cancel"
 msgstr ""
 
-#: ../widgets/Custom-menu.php:12
-msgid "Use this widget to add one of your custom menus as a widget."
-msgstr ""
-
-#: ../widgets/Custom-menu.php:13
-msgid "Custom Menu"
-msgstr ""
-
-#: ../widgets/Custom-menu.php:13
-msgid "[advanced]"
-msgstr ""
-
-#: ../widgets/Custom-menu.php:76
-#, php-format
-msgid "No menus have been created yet. <a href=\"%s\">Create some</a>."
-msgstr ""
-
-#: ../widgets/Custom-menu.php:82
-msgid "Title:"
-msgstr ""
-
-#: ../widgets/Custom-menu.php:87
-msgid "Use top parent item title"
-msgstr ""
-
-#: ../widgets/Custom-menu.php:90
-msgid "Select Menu:"
-msgstr ""
-
-#: ../widgets/Custom-menu.php:93
-msgid "Select"
-msgstr ""
-
-#: ../widgets/Custom-menu.php:104
-msgid "Start menu from:"
-msgstr ""
-
-#: ../widgets/Custom-menu.php:107
-msgid "Click save first"
-msgstr ""
-
-#: ../widgets/Custom-menu.php:113
-msgid "Depth:"
-msgstr ""
-
-#: ../widgets/Custom-menu.php:119
-msgid "Show parent item"
-msgstr ""
-
-#: ../widgets/Custom-menu.php:122
-msgid "Show description"
-msgstr ""
-
-#: ../widgets/Custom-menu.php:141
-#: ../widgets/Custom-menu.php:150
-msgid "First select a nav menu"
-msgstr ""
-
-#: ../widgets/Custom-menu.php:157
-msgid "Error: Unknow menu."
-msgstr ""
-
-#: ../widgets/Custom-menu.php:163
-msgid "Nav menu root"
-msgstr ""
-
-#: ../widgets/Custom-menu.php:164
-msgid "Current page"
-msgstr ""
-
+#: ../models/Nav-Menu-Edit-Walker.php:248
+#, php-format
+msgid "%s (Invalid)"
+msgstr ""
+
+#: ../models/Nav-Menu-Edit-Walker.php:322
+msgid "Open link in a new window/tab"
+msgstr ""
+

gecka-submenu/trunk/models/NavMenuHacks.php

@@ -6 +6 @@
 
         if(is_admin() ) {
-        
-            /* use custom walker */     
+
+            /* use custom walker */
             add_filter( 'wp_edit_nav_menu_walker', array($this, 'custom_walker') );
-            
+
             /* add custom field */
             add_action('wp_nav_menu_item_custom_fields', array($this, 'wp_nav_menu_item_custom_fields'),10,4  );
-            
+
             /* save custom field */
             add_action('wp_update_nav_menu_item', array($this, 'wp_update_nav_menu_item'),10,3  );
-            
-            /* css */
+
+            /* load custom css */
             add_action('admin_init', array($this, 'register_scripts'));
             add_action( "admin_print_styles-nav-menus.php", array($this, 'admin_print_styles') );
-        
-        }
+
+        }
+
         add_filter( 'wp_get_nav_menu_items', array($this, 'wp_get_nav_menu_items'),10,3 );
-            
+
         /* set up nav menu item with custom properties */
         add_filter( 'wp_setup_nav_menu_item', array($this, 'wp_setup_nav_menu_item') );
-    
+
         /* customize menu display */
         add_filter( 'walker_nav_menu_start_el', array($this, 'walker_nav_menu_start_el'), 10,4 );
-         
-    }
-    
+
+    }
     function wp_get_nav_menu_items ($items, $menu, $args) {
-    
-        if( is_admin() && $GLOBALS['pagenow'] == 'nav-menus.php' ) return $items;
-    
-            $order = sizeof($items)+1;
-    
-            foreach($items as $item) {
-            
-                if($item->autopopulate !== '1') continue;
-                
-                switch ($item->autopopulate_type) {
-                
-                    case 'subpages':
-                        
-                        $pages = get_pages( apply_filters('gecka-submenu-get_pages', array('child_of' => $item->object_id, 'sort_column' => 'menu_order, post_title')) );
-                        
-                        $this->setup_posts ('post', &$item, &$pages, &$items, &$order);
-                        
-                        break;
-                    
-                }
-            
-            }
+
+        //we don't autopopulate in the nav menu edit screen in wp-admin
+        if (is_admin () && $GLOBALS ['pagenow'] == 'nav-menus.php')
+            return $items;
+
+        $order = sizeof ( $items ) + 1;
+
+        foreach ( $items as $item ) {
+
+            if ($item->autopopulate !== '1')
+                continue;
+
+            switch ($item->autopopulate_type) {
+
+                case 'subpages' :
+
+                    $pages = get_pages ( apply_filters ( 'gecka-submenu-get_pages', array ('child_of' => $item->object_id, 'sort_column' => 'menu_order, post_title', 'post_type'=> isset($item->object) ? $item->object : 'page' ) ) );
+
+                    $this->setup_posts ( 'post', &$item, &$pages, &$items, &$order );
+
+                    break;
+            }
+
+        }
         return $items;
     }
-    
-    function setup_posts ($type, &$item, &$posts, &$items, &$order) {
-        
+
+    function setup_posts ($type, &$item, &$posts, &$items, &$order, $child_of=0) {
+
         $_ids = $this->get_ids($type, $order, $posts);
-        
+
         foreach($posts as $key=>$post) {
-            
+
             $id = isset($post->ID) ? $post->ID : $post->term_id;
-                            
+
             $parent_id = $item->ID;
-                            
+
             if( isset($post->post_parent) && $post->post_parent && $post->post_parent != $item->object_id ) {
-               $parent_id = $_ids[$post->post_parent];
-            }
-            
-            if( isset($post->parent) && $post->parent && $post->parent != $item->object_id ) {
-               $parent_id = $_ids[$post->parent];
-            }
-            
-            $items[] = $this->menu_item_from_post($post, $_ids[$id], $parent_id, $order);
-            
+                $parent_id = $_ids[$post->post_parent];
+            }
+
+            if( isset($post->parent) && $post->parent && $post->parent != $item->object_id && $post->parent!=$child_of ) {
+                $parent_id = $_ids[$post->parent];
+            }
+
+            if(isset($post->term_id)) $items[] = $this->menu_item_from_tax($post, $_ids[$id], $parent_id, $order);
+            else $items[] = $this->menu_item_from_post($post, $_ids[$id], $parent_id, $order);
+
             $order++;
-                            
-        }
-                       
+
+        }
+
         return $posts;
-    
-    }
-    
+
+    }
+
     function get_ids ($type, $order, $items) {
-    
+
         $ids = array();
-    
+
         foreach($items as $item) {
-        
+
             $id = $type == 'post' ? $item->ID : $item->term_id;
-        
+
             $ids[$id] = -$order;
-        
+
             $order++;
         }
-        
-        
+
+
         return $ids;
-    
-    }
-    
+
+    }
+
     function menu_item_from_post ($post, $pseudo_id, $parent_id = 0, $order=0) {
-        $_item = is_object($post) ? clone $post : clone get_post($post);
-        
+        $post = get_post($post);
+        $_item = clone $post;
+
         $id = $_item->ID ;
-        
+
         $_item->ID = $_item->db_id =  $pseudo_id ;
         $_item->post_name = '' . $pseudo_id;
@@ -117 +121 @@
         $_item->menu_order = $order;
         $_item->description = $_item->post_excerpt;
-        
+
+
         $object = get_post_type_object( $post->post_type );
-        $_item->object      = $object->name;
-        $_item->type_label  = $object->labels->singular_name;
-        
+        $_item->object      = $object->name;
+        $_item->type_label  = $object->labels->singular_name;
+
         $_item->url = get_permalink( $post->ID );
         $_item->title = $post->post_title;
@@ -128 +133 @@
         $_item->classes = array ( 0 => '');
         $_item->xfn = '';
-                
+
         $_item->db_id =  $pseudo_id;
-        
+
         return $_item;
-    
-    }    
-    
+
+    }
+
     function walker_nav_menu_start_el ( $item_output, $item, $depth, $args) {
- 
-         if( isset($item->autopopulate) && $item->autopopulate =='subpages') {
-            $args = array( 'depth'        => 0,
-                            'child_of'     => $item->object_id,
-                            'echo'         => 0, 'title_li' => '' );
-            
+
+        if( isset($item->autopopulate) && $item->autopopulate =='subpages' ) {
+            $args = array(  'depth'        => 0,
+                            'child_of'     => $item->object_id,
+                            'echo'         => 0, 'title_li' => '' );
+
             //$item_output = $item_output . '<ul class="sub-menu" >' . wp_list_pages($args) . '</ul>';
-           
-        }
-        return $item_output;
-    }
-    
+
+        }
+        return $item_output;
+    }
+
 
     /**
@@ -154 +159 @@
     function wp_setup_nav_menu_item($menu_item) {
         if ( isset( $menu_item->post_type ) ) {
-        
-            if ( 'nav_menu_item' == $menu_item->post_type ) {
-                $menu_item->autopopulate = empty( $menu_item->autopopulate ) ? get_post_meta( $menu_item->ID, '_menu_item_autopopulate', true ) : $menu_item->autopopulate;
-                $menu_item->autopopulate_type = empty( $menu_item->autopopulate_type ) ? get_post_meta( $menu_item->ID, '_menu_item_autopopulate_type', true ) : $menu_item->autopopulate_type;      
-            }
-        }
+
+            if ( 'nav_menu_item' == $menu_item->post_type ) {
+                $menu_item->autopopulate = empty( $menu_item->autopopulate ) ? get_post_meta( $menu_item->ID, '_menu_item_autopopulate', true ) : $menu_item->autopopulate;
+                $menu_item->autopopulate_type = empty( $menu_item->autopopulate_type ) ? get_post_meta( $menu_item->ID, '_menu_item_autopopulate_type', true ) : $menu_item->autopopulate_type;
+            }
+        }
         return $menu_item;
     }
-   
+
 
     /**
      * Saves the new fields
      */
-    function wp_update_nav_menu_item($menu_id, $menu_item_db_id, $args) {
-    
+    function wp_update_nav_menu_item($menu_id, $menu_item_db_id, $args)
+    {
+
         $args['menu-item-autopopulate_type'] = isset( $_POST['menu-item-autopopulate_type'][$menu_item_db_id] ) ? $_POST['menu-item-autopopulate_type'][$menu_item_db_id] : '';
-        
+
         if ( empty( $args['menu-item-autopopulate_type'] ) ) {
-            $args['menu-item-autopopulate_type'] = '';
+            $args['menu-item-autopopulate_type'] = '';
         }
 
         update_post_meta( $menu_item_db_id, '_menu_item_autopopulate_type', $args['menu-item-autopopulate_type'] );
 
-        
+
         if( $args['menu-item-autopopulate_type'] === 'subpages' )  $args['menu-item-autopopulate'] = '1';
         else  $args['menu-item-autopopulate'] = '0';
@@ -183 +189 @@
         update_post_meta( $menu_item_db_id, '_menu_item_autopopulate', $args['menu-item-autopopulate'] );
 
-        
+
         /* old version compatibility */
-          
+
         if(  get_post_meta($menu_item_db_id, '_menu_item_showsub', true) == '1') {
-                
+
             update_post_meta( $menu_item_db_id, '_menu_item_autopopulate_type', 'subpages' );
-            update_post_meta( $menu_item_db_id, '_menu_item_autopopulate', '1' );
-            
+            update_post_meta( $menu_item_db_id, '_menu_item_autopopulate', '1' );
+
 
             delete_post_meta( $menu_item_db_id, '_menu_item_showsub', $args['menu-item-showsub'] );
         }
-       
-    }
-    
-    function register_scripts () {    
-       wp_register_style('gecka-submenu-nav-menu-edit', GKSM_URL . '/css/admin-nav-menu-edit.css' );
-    }
-    
+    }
+
+    function register_scripts () {
+        $suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '.dev' : '';
+        wp_register_style('gecka-submenu-nav-menu-edit', GKSM_URL . "/css/admin-nav-menu-edit$suffix.css", array(), GKSM_VERSION );
+    }
+
     function admin_print_styles () {
         wp_enqueue_style('gecka-submenu-nav-menu-edit');
     }
-    
-    function admin_print_scripts () { }
 
     /**
      * Adds a custom fields
      */
-    function custom_walker($a) {
+    function custom_walker($a)
+    {
+        include 'Nav-Menu-Edit-Walker.php';
         return 'Gecka_Walker_Nav_Menu_Edit';
     }
-    
+
     function wp_nav_menu_item_custom_fields ( $item_id, $item, $depth, $args) {
-        if($item->object === 'page') {
-            include GKSM_PATH . '/views/Nav-Menu-Fields.php';
-        }
-    }
-    
+        include GKSM_PATH . '/views/Nav-Menu-Fields.php';
+    }
+
 }
-
-/**
- * Create HTML list of nav menu input items.
- *
- * @package WordPress
- * @since 3.0.0
- * @uses Walker_Nav_Menu
- */
-class Gecka_Walker_Nav_Menu_Edit extends Walker_Nav_Menu  {
-    /**
-     * @see Walker_Nav_Menu::start_lvl()
-     * @since 3.0.0
-     *
-     * @param string $output Passed by reference.
-     * @param int $depth Depth of page.
-     */
-    function start_lvl(&$output) {}
-
-    /**
-     * @see Walker_Nav_Menu::end_lvl()
-     * @since 3.0.0
-     *
-     * @param string $output Passed by reference.
-     * @param int $depth Depth of page.
-     */
-    function end_lvl(&$output) {
-    }
-
-    /**
-     * @see Walker::start_el()
-     * @since 3.0.0
-     *
-     * @param string $output Passed by reference. Used to append additional content.
-     * @param object $item Menu item data object.
-     * @param int $depth Depth of menu item. Used for padding.
-     * @param int $current_page Menu item ID.
-     * @param object $args
-     */
-    function start_el(&$output, $item, $depth, $args) 
-    {
-        global $_wp_nav_menu_max_depth;
-        $_wp_nav_menu_max_depth = $depth > $_wp_nav_menu_max_depth ? $depth : $_wp_nav_menu_max_depth;
-
-        $indent = ( $depth ) ? str_repeat( "\t", $depth ) : '';
-
-        ob_start();
-        $item_id = esc_attr( $item->ID );
-        $removed_args = array(
-            'action',
-            'customlink-tab',
-            'edit-menu-item',
-            'menu-item',
-            'page-tab',
-            '_wpnonce',
-        );
-
-        $original_title = '';
-        if ( 'taxonomy' == $item->type ) {
-            $original_title = get_term_field( 'name', $item->object_id, $item->object, 'raw' );
-        } elseif ( 'post_type' == $item->type ) {
-            $original_object = get_post( $item->object_id );
-            $original_title = $original_object->post_title;
-        }
-
-        $classes = array(
-            'menu-item menu-item-depth-' . $depth,
-            'menu-item-' . esc_attr( $item->object ),
-            'menu-item-edit-' . ( ( isset( $_GET['edit-menu-item'] ) && $item_id == $_GET['edit-menu-item'] ) ? 'active' : 'inactive'),
-        );
-
-        $title = $item->title;
-
-        if ( isset( $item->post_status ) && 'draft' == $item->post_status ) {
-            $classes[] = 'pending';
-            /* translators: %s: title of menu item in draft status */
-            $title = sprintf( __('%s (Pending)'), $item->title );
-        }
-
-        $title = empty( $item->label ) ? $title : $item->label;
-
-        ?>
-        <li id="menu-item-<?php echo $item_id; ?>" class="<?php echo implode(' ', $classes ); ?>">
-            <dl class="menu-item-bar">
-                <dt class="menu-item-handle">
-                    <span class="item-title"><?php echo esc_html( $title ); ?></span>
-                    <span class="item-controls">
-                        <span class="item-type"><?php echo esc_html( $item->type_label ); ?></span>
-                        <span class="item-order">
-                            <a href="<?php
-                                echo wp_nonce_url(
-                                    add_query_arg(
-                                        array(
-                                            'action' => 'move-up-menu-item',
-                                            'menu-item' => $item_id,
-                                        ),
-                                        remove_query_arg($removed_args, admin_url( 'nav-menus.php' ) )
-                                    ),
-                                    'move-menu_item'
-                                );
-                            ?>" class="item-move-up"><abbr title="<?php esc_attr_e('Move up'); ?>">&#8593;</abbr></a>
-                            |
-                            <a href="<?php
-                                echo wp_nonce_url(
-                                    add_query_arg(
-                                        array(
-                                            'action' => 'move-down-menu-item',
-                                            'menu-item' => $item_id,
-                                        ),
-                                        remove_query_arg($removed_args, admin_url( 'nav-menus.php' ) )
-                                    ),
-                                    'move-menu_item'
-                                );
-                            ?>" class="item-move-down"><abbr title="<?php esc_attr_e('Move down'); ?>">&#8595;</abbr></a>
-                        </span>
-                        <a class="item-edit" id="edit-<?php echo $item_id; ?>" title="<?php _e('Edit Menu Item'); ?>" href="<?php
-                            echo ( isset( $_GET['edit-menu-item'] ) && $item_id == $_GET['edit-menu-item'] ) ? admin_url( 'nav-menus.php' ) : add_query_arg( 'edit-menu-item', $item_id, remove_query_arg( $removed_args, admin_url( 'nav-menus.php#menu-item-settings-' . $item_id ) ) );
-                        ?>"><?php _e( 'Edit Menu Item' ); ?></a>
-                    </span>
-                </dt>
-            </dl>
-
-            <div class="menu-item-settings" id="menu-item-settings-<?php echo $item_id; ?>">
-                <?php if( 'custom' == $item->type ) : ?>
-                    <p class="field-url description description-wide">
-                        <label for="edit-menu-item-url-<?php echo $item_id; ?>">
-                            <?php _e( 'URL' ); ?><br />
-                            <input type="text" id="edit-menu-item-url-<?php echo $item_id; ?>" class="widefat code edit-menu-item-url" name="menu-item-url[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->url ); ?>" />
-                        </label>
-                    </p>
-                <?php endif; ?>
-                <p class="description description-thin">
-                    <label for="edit-menu-item-title-<?php echo $item_id; ?>">
-                        <?php _e( 'Navigation Label' ); ?><br />
-                        <input type="text" id="edit-menu-item-title-<?php echo $item_id; ?>" class="widefat edit-menu-item-title" name="menu-item-title[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->title ); ?>" />
-                    </label>
-                </p>
-                <p class="description description-thin">
-                    <label for="edit-menu-item-attr-title-<?php echo $item_id; ?>">
-                        <?php _e( 'Title Attribute' ); ?><br />
-                        <input type="text" id="edit-menu-item-attr-title-<?php echo $item_id; ?>" class="widefat edit-menu-item-attr-title" name="menu-item-attr-title[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->post_excerpt ); ?>" />
-                    </label>
-                </p>
-                <p class="field-link-target description description-thin">
-                    <label for="edit-menu-item-target-<?php echo $item_id; ?>">
-                        <?php _e( 'Link Target' ); ?><br />
-                        <select id="edit-menu-item-target-<?php echo $item_id; ?>" class="widefat edit-menu-item-target" name="menu-item-target[<?php echo $item_id; ?>]">
-                            <option value="" <?php selected( $item->target, ''); ?>><?php _e('Same window or tab'); ?></option>
-                            <option value="_blank" <?php selected( $item->target, '_blank'); ?>><?php _e('New window or tab'); ?></option>
-                        </select>
-                    </label>
-                </p>
-                <p class="field-css-classes description description-thin">
-                    <label for="edit-menu-item-classes-<?php echo $item_id; ?>">
-                        <?php _e( 'CSS Classes (optional)' ); ?><br />
-                        <input type="text" id="edit-menu-item-classes-<?php echo $item_id; ?>" class="widefat code edit-menu-item-classes" name="menu-item-classes[<?php echo $item_id; ?>]" value="<?php echo esc_attr( implode(' ', $item->classes ) ); ?>" />
-                    </label>
-                </p>
-                <p class="field-xfn description description-thin">
-                    <label for="edit-menu-item-xfn-<?php echo $item_id; ?>">
-                        <?php _e( 'Link Relationship (XFN)' ); ?><br />
-                        <input type="text" id="edit-menu-item-xfn-<?php echo $item_id; ?>" class="widefat code edit-menu-item-xfn" name="menu-item-xfn[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->xfn ); ?>" />
-                    </label>
-                </p>
-                <p class="field-description description description-wide">
-                    <label for="edit-menu-item-description-<?php echo $item_id; ?>">
-                        <?php _e( 'Description' ); ?><br />
-                        <textarea id="edit-menu-item-description-<?php echo $item_id; ?>" class="widefat edit-menu-item-description" rows="3" cols="20" name="menu-item-description[<?php echo $item_id; ?>]"><?php echo esc_html( $item->description ); ?></textarea>
-                        <span class="description"><?php _e('The description will be displayed in the menu if the current theme supports it.'); ?></span>
-                    </label>
-                </p>
-                <?php
-                do_action('wp_nav_menu_item_custom_fields', $item_id, $item, $depth, $args);
-                ?>
-                <div class="menu-item-actions description-wide submitbox">
-                    <?php if( 'custom' != $item->type ) : ?>
-                        <p class="link-to-original">
-                            <?php printf( __('Original: %s'), '<a href="' . esc_attr( $item->url ) . '">' . esc_html( $original_title ) . '</a>' ); ?>
-                        </p>
-                    <?php endif; ?>
-                    <a class="item-delete submitdelete deletion" id="delete-<?php echo $item_id; ?>" href="<?php
-                    echo wp_nonce_url(
-                        add_query_arg(
-                            array(
-                                'action' => 'delete-menu-item',
-                                'menu-item' => $item_id,
-                            ),
-                            remove_query_arg($removed_args, admin_url( 'nav-menus.php' ) )
-                        ),
-                        'delete-menu_item_' . $item_id
-                    ); ?>"><?php _e('Remove'); ?></a> <span class="meta-sep"> | </span> <a class="item-cancel submitcancel" id="cancel-<?php echo $item_id; ?>" href="<?php echo add_query_arg( array('edit-menu-item' => $item_id, 'cancel' => time()), remove_query_arg( $removed_args, admin_url( 'nav-menus.php' ) ) );
-                        ?>#menu-item-settings-<?php echo $item_id; ?>"><?php _e('Cancel'); ?></a>
-                </div>
-
-                <input class="menu-item-data-db-id" type="hidden" name="menu-item-db-id[<?php echo $item_id; ?>]" value="<?php echo $item_id; ?>" />
-                <input class="menu-item-data-object-id" type="hidden" name="menu-item-object-id[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->object_id ); ?>" />
-                <input class="menu-item-data-object" type="hidden" name="menu-item-object[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->object ); ?>" />
-                <input class="menu-item-data-parent-id" type="hidden" name="menu-item-parent-id[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->menu_item_parent ); ?>" />
-                <input class="menu-item-data-position" type="hidden" name="menu-item-position[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->menu_order ); ?>" />
-                <input class="menu-item-data-type" type="hidden" name="menu-item-type[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->type ); ?>" />
-            </div><!-- .menu-item-settings-->
-            <ul class="menu-item-transport"></ul>
-        <?php
-        $output .= ob_get_clean();
-    }
-}

gecka-submenu/trunk/models/Shortcodes.php

@@ -2 +2 @@
 
 class Gecka_Submenu_Shortcodes {
-
+    
     static $cache = array ();
     
@@ -9 +9 @@
         add_shortcode( 'submenu',   array( $this, 'submenu') );
         add_shortcode( 'menu',  array( $this, 'menu') );
-        add_action( 'gk-menu', array( $this,'gk_menu'), 10, 1 );
+        add_action( 'gk-menu', array( $this, 'gk_menu'), 10, 1 );
                 
     }

gecka-submenu/trunk/models/Submenu.php

@@ -30 +30 @@
                                         'show_description' => false,
                                         'thumbnail' => null,
-                                        'auto_title' => false
                                     
                                     );
@@ -53 +52 @@
     
     public function Get($Options = null) 
-    {       
+    {
+        
         return $this->Build($Options);
     }
@@ -62 +62 @@
     }
     
-    public function Widget($args, $instance) 
-    {
-
-        extract( wp_parse_args($args, $this->DefaultOptions), EXTR_SKIP);
+    public function Widget($widget_args, $instance) 
+    {
+
+        extract( wp_parse_args($widget_args, $this->DefaultOptions), EXTR_SKIP);
         
         $instance['container_class'] = 'submenu-widget';
         $instance['is_gk_submenu'] = 'widget';
+        
+        $args = apply_filters( 'gk_submenu_widget_args', $instance );
         
         $out = $this->Get($instance);
@@ -94 +96 @@
             echo $after_widget;
         }
+        else do_action('gk_submenu_widget_fallback', $widget_args, $args);
     }
     
@@ -103 +106 @@
         
         $Options = wp_parse_args($Options, $this->DefaultOptions);
+        $Options = apply_filters( 'gk_submenu_args', $Options );
         
         extract($Options);
@@ -128 +132 @@
         
         /* WPML support */
-        if( function_exists('icl_object_id') ) {
-                        
-            global $sitepress;
-                        
-            /* not default language */
-            if(ICL_LANGUAGE_CODE !== $sitepress->get_default_language() ) {
-                $translated_menu_id = icl_object_id($menu, 'nav_menu');
-                $menu = $translated_menu_id ? $translated_menu_id : $menu;
-            }
-        }
-        
-        /* */       
+        if( function_exists('icl_object_id') ) {
+                
+            global $sitepress;
+                
+            /* not default language */
+                
+            if(ICL_LANGUAGE_CODE !== $sitepress->get_default_language() ) {
+                $translated_menu_id = icl_object_id($menu, 'nav_menu');
+                $menu = $translated_menu_id ? $translated_menu_id : $menu;
+            }
+        }
+        /* */
+        
         $menu_items = wp_get_nav_menu_items($menu);
         
         if(is_tax() || is_category()) $_type = 'taxonomy';
         else $_type = 'post_type';
-                
+        
+        
         // current page is top level element
         if( $submenu === 'current' ) {
@@ -150 +156 @@
             $submenu = $this->get_associated_nav_menu_item($wp_query->get_queried_object_id(), &$menu_items, $_type);
         }
+
         // top parent page is the top level element 
         else if( $submenu === 'top' ) {
@@ -155 +162 @@
             global $post, $wp_query;
             
-            if( is_a($post, 'stdClass') && (int)$post->ID ) {
-                if( $submenu = $this->get_top_ancestor ($wp_query->get_queried_object_id(), &$menu_items, $_type) ) 
-                    $submenu = $submenu->ID;
+            if( ( is_a($post, 'stdClass') || is_a($post, 'WP_Post') ) && (int)$post->ID ) {
+                if( $submenu = $this->get_top_ancestor ($wp_query->get_queried_object_id(), &$menu_items, $_type) )
+                    $submenu = $submenu->ID;
             }
             
         }
-                
+        
         // a submenu has been specified
         if( $submenu !== 0 ) {
@@ -172 +179 @@
                 
                 $submenu_item = $this->get_menu_item ($submenu, &$menu_items);
-                
-                
+
                 if( !$submenu_item ) $submenu_item = $this->get_associated_nav_menu_item($submenu, &$menu_items, $type);
                 if(!$submenu_item) return;
@@ -186 +192 @@
             global $GKSM_ID, $GKSM_MENUID;
             $menu_object = wp_get_nav_menu_object($menu);
-            $GKSM_ID = $submenu_id; $GKSM_MENUID = $menu_object->term_id;
+            $GKSM_ID = $submenu_id; $GKSM_MENUID = $menu_object->term_id;
+        
         }
         
@@ -196 +203 @@
             $container_class .= " $container_class-" . $slug ;
         
-        }// gets the nav menu
-        
-        $args =  array( 'container_class' => $container_class,
+        }
+        
+        // gets the nav menu
+        $args =  array(  'container_class' => $container_class,
                          'menu'=> $menu, 
                          'show_description'=> $show_description, 
                          'depth'=>$depth,
                          'is_gk_submenu'=>$is_gk_submenu );
-    
+        
+        if( empty($args['walker']) ) $args['walker'] = new Gecka_Walker_Nav_Menu; 
+
         $out = wp_nav_menu( wp_parse_args($args, $Options) );
         
@@ -212 +222 @@
     }
     
+    /**
+     * Gets the top parent menu item of a given post from a specific menu
+     * @param int $menu menu ID to seach for post
+     * @param int $postID post ID to look for
+     * @return object $Item a menu item object or false
+     */
+    private function get_top_ancestor ($postID, &$menu_items, $type='post_type')  {
+        
+        $Item = $this->get_associated_nav_menu_item($postID, &$menu_items, $type);
+        
+        if(!$Item) return;
+        
+        $Ancestror = $Item;
+        while(1) {
+            if($Item->menu_item_parent) {
+                $Item = $this->get_menu_item($Item->menu_item_parent, &$menu_items);
+                continue;
+            }
+            break;
+        }
+        
+        return $Item;
+    }
+    
     /**
      * Gets a menu item from a list of menu items, avoiding SQL queries
@@ -248 +282 @@
     }
     
-    function get_associated_nav_menu_items( $object_id, &$menu_items, $object_type = 'post_type') {
-
-        $object_id = (int) $object_id;
+    function get_associated_nav_menu_items( $object_id, &$menu_items, $object_type = 'post_type') {
+        $object_id = (int) $object_id;
         $_menu_items = array();
 
@@ -259 +292 @@
             }
         }
+
+        if( !empty($_menu_items) || $object_type !== 'post_type' ) return $_menu_items;
+
+        // no associated 'post_type' menu item found, looking for associated 'taxonomy' menu item
+        return $this->get_associated_nav_menu_terms_items ( $object_id, &$menu_items );;  
+    }
+
+    function get_associated_nav_menu_terms_items ( $object_id, &$menu_items ) {
         
-        if( !empty($_menu_items) || $object_type !== 'post_type' ) return $_menu_items;
-        
-        // no associated 'post_type' menu item found, looking for associated 'taxonomy' menu item
-        return $this->get_associated_nav_menu_terms_items ( $object_id, &$menu_items );
-    
-    }    
-    
-    function get_associated_nav_menu_terms_items ( $object_id, &$menu_items ) {
-        
-        $post = get_post($object_id);
-       
-        if(!$post) return array();
-        
-        $_menu_items    = array();
-        $taxonomies     = get_object_taxonomies($post->post_type);
-        
-        
-        foreach ($taxonomies as $taxonomy) {
-            
-            if( !$terms = get_the_terms( $object_id, $taxonomy ) ) continue;
-            
-            foreach ($terms as $term) {
-                
-                $_menu_items = $this->get_associated_nav_menu_items($term->term_id, &$menu_items, 'taxonomy');
-                if( !empty($_menu_items) ) return $_menu_items;
-                
-            }
-        }
- 
-        return $_menu_items;  
-        
-    }
-    
-    /**
-     * Gets the top parent menu item of a given post from a specific menu
-     * @param int $menu menu ID to seach for post
-     * @param int $postID post ID to look for
-     * @return object $Item a menu item object or false
-     */
-    private function get_top_ancestor ($postID, &$menu_items, $type='post_type')  {
-        
-        $Item = $this->get_associated_nav_menu_item($postID, &$menu_items, $type);
-        
-        if(!$Item) return;
-        
-        $Ancestror = $Item;
-        while(1) {
-            if($Item->menu_item_parent) {
-                $Item = $this->get_menu_item($Item->menu_item_parent, &$menu_items);
-                continue;
-            }
-            break;
-        }
-        
-        return $Item;
+        $post = get_post($object_id);
+    
+        if(!$post) return array();
+        
+        $_menu_items = array();
+        $taxonomies = get_object_taxonomies($post->post_type);
+        
+        foreach ($taxonomies as $taxonomy) {
+        
+            if( !$terms = get_the_terms( $object_id, $taxonomy ) ) continue;
+        
+            foreach ($terms as $term) {
+        
+                $_menu_items = $this->get_associated_nav_menu_items($term->term_id, &$menu_items, 'taxonomy');
+                if( !empty($_menu_items) ) return $_menu_items;
+        
+            }
+        }
+         
+        return $_menu_items;
+
     }
 }
-

gecka-submenu/trunk/readme.txt

@@ -3 +3 @@
 Tags: nav menu, 3.0, submenu, sub-menu, child, child men, subpages, subpage, dynamic menu, dynamic subpages, dynamic submenu
 Requires at least: 3.0
-Tested up to: 3.1
-Stable tag: 0.6
+Tested up to: 3.5
+Stable tag: 0.7-beta3
 Donate link: http://gecka-apps.com/wordpress-plugins/gecka-submenu-pro/
 
@@ -14 +14 @@
 **PHP 5 required. Please be sure to check your PHP version before marking the plugin as broken.**
 
-Submenu enhances the WordPress 3.x navigation system. When you have a website based on WordPress with a lot of pages, but you need a custom menu, it can be tedious to have to add a menu entry for each page created. Submenu just does it automatically.  
-  
+Submenu enhances the WordPress 3.x navigation system. When you have a website based on WordPress with a lot of pages, but you need a custom menu, it can be tedious to have to add a menu entry for each page created. Submenu just does it automatically.
+
 Submenu also allows you to put menus or portion of menus anywhere in your site: sidebar, templates or page contents.
 
-Languages available: english, french  
+Languages available: english, french
 
 **Contribute:** [This plugin is on GitHub](https://github.com/Gecka-Apps/Wordpress_Gecka_Submenu) !
-  
-[Discover the pro version](http://gecka-apps.com/wordpress-plugins/gecka-submenu-pro/ "Discover the pro version") by checking out the [Gecka Submenu Pro video](http://www.youtube.com/watch?v=DHjMfD-k2Mo):  
-  
-http://www.youtube.com/watch?v=DHjMfD-k2Mo  
-  
+
+[Discover the pro version](http://gecka-apps.com/wordpress-plugins/gecka-submenu-pro/ "Discover the pro version") by checking out the [Gecka Submenu Pro video](http://www.youtube.com/watch?v=DHjMfD-k2Mo):
+
+http://www.youtube.com/watch?v=DHjMfD-k2Mo
+
 == Installation ==
 
@@ -43 +43 @@
 == Changelog ==
 
+= 0.7 =
+* performances enhancements
+* better widget with specific class support
+* added a gk_submenu_widget_fallback action to use to display custom content
+  when the widget has no menu entries to display
+* Wordpress 3.5 compatibility
+
 = 0.6 =
 * shortcodes caching
@@ -56 +63 @@
 
 = 0.5.2 =
-
 * corrected readme file  
 * added the start from "Top parent element" option to the widget
 
 = 0.5.1 =
-
 * bug fix
 
@@ -71 +76 @@
 = 0.4.2 =  
 * More fixes  
-* Menu parameter is no more mandatory, gets the lowest ID menu if not set   
-  
-= 0.4.1 =  
-* Fixed bug in submenu builder  
-  
-= 0.4 =  
-* Fixed some notice errors  
-* Experimental functionnality to autopopulate a page menu item with its subpages for WP 3.0 nav menu system  
-  
-= 0.3 =  
-* Added template tag and shortcode support  
-  
-= 0.2 =  
-* Bugs fixes  
-* Localization support (French added).  
-  
-= 0.1 =  
+* Menu parameter is no more mandatory, gets the lowest ID menu if not set  
+
+= 0.4.1 =
+* Fixed bug in submenu builder
+
+= 0.4 =
+* Fixed some notice errors
+* Experimental functionnality to autopopulate a page menu item with its subpages for WP 3.0 nav menu system
+
+= 0.3 =
+* Added template tag and shortcode support
+
+= 0.2 =
+* Bugs fixes
+* Localization support (French added).
+
+= 0.1 =
 * First version.

gecka-submenu/trunk/views/Nav-Menu-Fields.php

@@ -3 +3 @@
                 <p class="edit-menu-item-autopopulate" >
                 <label for="edit-menu-item-autopopulate-<?php echo $item_id; ?>">
-                    <input type="checkbox" id="edit-menu-item-autopopulate_type-<?php echo $item_id; ?>-subpages" class="edit-menu-item-autopopulate_type" name="menu-item-autopopulate_type[<?php echo $item_id; ?>]" value="subpages" <?php echo checked($item->autopopulate_type , 'subpages'); ?> />
+                    <input type="checkbox" id="edit-menu-item-autopopulate-<?php echo $item_id; ?>" class="edit-menu-item-autopopulate_type" name="menu-item-autopopulate_type[<?php echo $item_id; ?>]" value="subpages" <?php echo checked($item->autopopulate_type , 'subpages'); ?> />
                     <?php _e( 'Automaticaly populate with child pages', Gecka_Submenu::Domain ); ?>
                 </label>

gecka-submenu/trunk/widgets/Custom-menu.php

@@ -7 +7 @@
                                         'show_parent'=>0,
                                         'show_description'=>0, 
-                                         );
+                                        'class'=>''
+                                      );
     
     public function GKSM_Widget_Custom_Menu () {
+        
         $widget_ops = array('classname' => 'gksm-custom-menu-widget', 'description' => __('Use this widget to add one of your custom menus as a widget.'));
-        parent::WP_Widget('gksm-custom-menu-widget', __('Custom Menu') . ' ' .  __('[advanced]', Gecka_Submenu::Domain ), $widget_ops);
+        $control_ops = array('width' => 350, 'height' => 350);
+        parent::WP_Widget('gksm-custom-menu-widget', __('Custom Menu') . ' ' .  __('[advanced]', Gecka_Submenu::Domain ), $widget_ops, $control_ops);
         
         // ajax select update
         add_action('wp_ajax_gksm_update', array($this, 'submenuOptionsAjax'));
         
-        // needed javasccript for widget admin      
-        wp_register_script('gecka-submenu-widget-custom-menu', GKSM_URL . '/javascripts/widget-custom-menu.js', 'jquery' );
-        
+        // needed javasccript & css for widget admin      
+        $suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '.dev' : '';
+        
+        wp_register_script('gecka-submenu-widget-custom-menu', GKSM_URL . "/javascripts/widget-custom-menu$suffix.js", array('jquery'), GKSM_VERSION );
+        wp_register_style('gecka-submenu-widget-custom-menu', GKSM_URL . "/css/widget-custom-menu$suffix.css", array(), GKSM_VERSION);
+        
         add_action( "admin_print_scripts-widgets.php", array($this, 'admin_print_scripts') );
         
-        
+        add_filter( 'dynamic_sidebar_params', array($this, 'dynamic_sidebar_params') );
+        
     }
     
@@ -31 +38 @@
                                 )
                         );
-
+        wp_enqueue_style('gecka-submenu-widget-custom-menu');
     }
     
@@ -55 +62 @@
         }
         
-        $instance['depth'] = (int) $new_instance['depth'];
-        
-        $instance['show_description'] = $new_instance['show_description'];
+        $instance['show_description']   = $new_instance['show_description'];
+        $instance['class']              = $new_instance['class'];
+        $instance['depth']              = (int) $new_instance['depth'];
         
         return $instance;
@@ -70 +77 @@
         $submenu   = isset( $instance['submenu'] ) ? $instance['submenu'] : '0';
         $depth     = isset( $instance['depth'] ) ? $instance['depth'] : 0;
-        
+        $class     = isset( $instance['class'] ) ? $instance['class'] : 0;
+
          // Get menus
         $menus = get_terms( 'nav_menu', array( 'hide_empty' => false ) );
@@ -81 +89 @@
    
         ?>
-            
+            <div class="gksm">
             <p><label for="<?php echo $this->get_field_id('title'); ?>"><?php _e( 'Title:' ); ?></label>
             <input class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" type="text" value="<?php echo $title; ?>" />
@@ -113 +121 @@
             </select></p>
             
-            <p><label for="<?php echo $this->get_field_id('depth'); ?>"><?php _e( 'Depth:', Gecka_Submenu::Domain ); ?></label>
+            <p class="description-thin"><label for="<?php echo $this->get_field_id('depth'); ?>"><?php _e( 'Depth:', Gecka_Submenu::Domain ); ?></label>
             <input class="widefat" id="<?php echo $this->get_field_id('depth'); ?>" name="<?php echo $this->get_field_name('depth'); ?>" type="text" value="<?php echo $depth; ?>" />
             </p>
             
-            <p>         
+            <p class="description-thin">         
             <!-- <input class="checkbox" type="checkbox" <?php checked($instance['show_parent'], true) ?> id="<?php echo $this->get_field_id('show_parent'); ?>" name="<?php echo $this->get_field_name('show_parent'); ?>" />
             <label for="<?php echo $this->get_field_id('show_parent'); ?>"><?php _e('Show parent item', Gecka_Submenu::Domain); ?></label><br />
              -->
-            
             <label for="<?php echo $this->get_field_id('show_description'); ?>"><?php _e('Show description', Gecka_Submenu::Domain); ?>:</label><br />
             <select name="<?php echo $this->get_field_name('show_description'); ?>" id="<?php echo $this->get_field_id('show_description'); ?>">
@@ -128 +135 @@
                 <option value="into_li" <?php selected('into_li', $instance['show_description']) ?>><?php _e('Into li element', Gecka_Submenu::Domain); ?></option>
             </select>
-            </p>
+            
+            <p class="description-thin"><label for="<?php echo $this->get_field_id('class'); ?>"><?php _e( 'Class:', Gecka_Submenu::Domain ); ?></label>
+            <input class="widefat" id="<?php echo $this->get_field_id('class'); ?>" name="<?php echo $this->get_field_name('class'); ?>" type="text" value="<?php echo $class; ?>" />
+            </p>
+            
+            <p class="description-thin">         
+            </p>
+            </div>
         
         <?php 
@@ -177 +191 @@
     }
     
-    
+    public function dynamic_sidebar_params($params) {
+        global $wp_registered_sidebars, $wp_registered_widgets;
+    
+        $widget_id = $params[0]['widget_id'];
+        $widget = $wp_registered_widgets[$widget_id];
+    
+        // is our widget
+        if( !empty($widget['callback']) && is_array($widget['callback'])
+                && $widget['callback'][0] instanceof GKSM_Widget_Custom_Menu ) {
+    
+            //get widget instance
+            $instance = $widget['callback'][0]->get_settings();
+    
+            if (! array_key_exists($params[1]['number'], $instance)) {
+                return $params;
+            }
+    
+            $instance = $instance[$params[1]['number']];
+            if( empty($instance['class']) ) return $params;
+    
+            $class = $instance['class'];
+    
+            // from wp-includes/widgets.php
+            $classname_ = '';
+            foreach ( (array) $widget['classname'] as $cn ) {
+                if ( is_string($cn) )
+                    $classname_ .= '_' . $cn;
+                elseif ( is_object($cn) )
+                $classname_ .= '_' . get_class($cn);
+            }
+            $classname_ = ltrim($classname_, '_');
+    
+            // we add our class
+            $classname_ .= ' ' . $class;
+    
+            $before_widget = $wp_registered_sidebars[$params[0]['id']]['before_widget'];
+            $params[0]['before_widget'] = sprintf($before_widget, $widget['id'], $classname_);
+        }
+    
+        return $params;
+    }   
 }