Changeset 1735786

Timestamp:

09/25/2017 07:51:53 PM (9 years ago)

Author:

Studiofreya

Message:

ver 2.4

Location:

sf-bootstrap-menu/trunk

Files:

• readme.txt (modified) (1 diff)
• sf-menu-widget.php (modified) (5 diffs)
• sf-menu.php (modified) (1 diff)

sf-bootstrap-menu/trunk/readme.txt

@@ -3 +3 @@
 Tags: child, pages, hierarchical, menu, sidebar, horizontal, top, bootstrap, responsive, list
 Requires at least: 3.8
-Tested up to: 4.7.5
+Tested up to: 4.8.2
 Stable tag: trunk
 

sf-bootstrap-menu/trunk/sf-menu-widget.php

@@ -11 +11 @@
             'alignment'         => '1',
             'show_root'         => true,
+            'show_root_only'    => false,
             'expanded'          => false,
             'child_of'          => '',
@@ -56 +57 @@
     if (!empty($my_includes)) {   
         foreach($my_includes as $parent) {
-            if (isset($args['show_root']) && $args['show_root'] == 'yes') {
+            if ((isset($args['show_root']) && $args['show_root'] == 'yes') 
+                || (isset($args['show_root_only']) && $args['show_root_only'] == 'yes')){
                 array_push($pageids, $parent);
             }
             
-            $args_child=array(
-                'post_type'   => 'page',
-                'post_parent' => $parent,
-                'orderby'     => 'menu_order',
-                'order'   => 'ASC',
-            );
-            $child_pages = new WP_Query( $args_child );
-            
-            while ( $child_pages->have_posts() ) {
-                $child_pages->the_post();
-                $r = get_the_ID();
-                //echo "pp: $r, ";
-                array_push($pageids, $r);
+            if(!isset($args['show_root_only']) || $args['show_root_only'] == 'no') {
+                $args_child=array(
+                    'post_type'   => 'page',
+                    'post_parent' => $parent,
+                    'orderby'     => 'menu_order',
+                    'order'   => 'ASC',
+                );
+                $child_pages = new WP_Query( $args_child );
+                
+                while ( $child_pages->have_posts() ) {
+                    $child_pages->the_post();
+                    $r = get_the_ID();
+                    //echo "pp: $r, ";
+                    array_push($pageids, $r);
+                }
             }
             
@@ -189 +193 @@
         foreach($my_includes as $parent) {
         
-            if (isset($args['show_root']) && $args['show_root'] == 'yes') {
+            if ((isset($args['show_root']) && $args['show_root'] == 'yes')
+                || (isset($args['show_root_only']) && $args['show_root_only'] == 'yes')){
                 array_push($pageids, $parent);
             }
             
-            $args_child=array(
-                'child_of' => $parent
-            );
-            $pages = get_pages($args_child);
-            
-            foreach ($pages as $page) {
-                array_push($pageids, $page->ID);
+            if(!isset($args['show_root_only']) || $args['show_root_only'] == 'no') {
+                $args_child=array(
+                    'child_of' => $parent
+                );
+                $pages = get_pages($args_child);
+                
+                foreach ($pages as $page) {
+                    array_push($pageids, $page->ID);
+                }
             }
         }
@@ -309 +316 @@
                         'desc' => __("List of root page IDs to show", $tdom)),
             'show_root' => array('title' => __("Show top-level pages:", $tdom),
+                          'type' => 'checkbox'),
+            'show_root_only' => array('title' => __("Show top-level pages only:", $tdom),
                           'type' => 'checkbox'),
             'expanded' => array('title' => __("Always expanded:", $tdom),
@@ -388 +397 @@
     
     if(!is_writable($path)) {
-        $instance['error'] = "Could not save dynamic css file. Required plugin path ($path) is not writable. We need it to store dynamic CSS file.";
+        $instance['error'] = "Could not save dynamic css file. Required plugin path ($path) is not writable. We need it to store the dynamic CSS file.";
     }
     

sf-bootstrap-menu/trunk/sf-menu.php

@@ -4 +4 @@
  * Plugin URI: https://studiofreya.com/sf-bootstrap-menu
  * Description: Responsive menu for child pages with Bootstrap 3.0
- * Version: 2.3
+ * Version: 2.4
  * Author: Studiofreya AS
  * Author URI: https://studiofreya.com