WordPress.org
Get WordPress

Plugin Directory

Changeset 2544882


Ignore:
Timestamp:
06/09/2021 08:41:38 AM (5 years ago)
Author:
re_enter_rupok
Message:

Version 1.8.1

Location:
betterdocs
Files:
177 added
15 edited

Legend:

Unmodified
Added
Removed

  • betterdocs/trunk/README.txt

    r2539709 r2544882  
    55Requires at least: 4.0
    66Tested up to: 5.7.2
    7 Stable tag: 1.8.0
     7Stable tag: 1.8.1
    88License: GPLv3 or later
    99License URI: http://www.gnu.org/licenses/gpl-3.0.html
    1010
    11 A better Documentation and Knowledgebase plugin for WordPress. Create better Docs, Knowledge Base and Wiki and manage them in a beutiful modern drag and drop UI.
     11A better Documentation and Knowledgebase plugin for WordPress. Create better Docs, Knowledge Base and Wiki and manage them in a beautiful modern drag and drop UI.
    1212
    1313== Description ==
    … …  
    157157
    158158== Changelog ==
     159
     160= 1.8.1 - 09/06/2021 =
     161- Fixed: Sub-Categories not showing if nested Sub-Category option is disabled
     162- Fixed: Terms count not working properly if nested subcategory is disabled for Category Grid shortcode
     163- Few minor bug fix and improvements
     164
    159165
    160166= 1.8.0 - 30/05/2021 =

  • betterdocs/trunk/admin/assets/js/customizer.js

    r2522453 r2544882  
    248248    wp.customize( 'betterdocs_doc_page_item_counter_size', function( value ) {
    249249        value.bind( function( to ) {
    250             $( '.betterdocs-categories-wrap.single-kb .docs-cat-title-inner span' ).css( 'width', to + 'px' );
    251             $( '.betterdocs-categories-wrap.single-kb .docs-cat-title-inner span' ).css( 'height', to + 'px' );
     250            $( '.betterdocs-categories-wrap.single-kb .docs-cat-title-inner .docs-item-count span' ).css( 'width', to + 'px' );
     251            $( '.betterdocs-categories-wrap.single-kb .docs-cat-title-inner .docs-item-count span' ).css( 'height', to + 'px' );
    252252        } );
    253253    });

  • betterdocs/trunk/admin/customizer/output-css.php

    r2536006 r2544882  
    219219            border-color: <?php echo $output['betterdocs_doc_page_cat_title_border_color'] ?>;
    220220        }
    221         .docs-cat-title-inner span {
     221        .docs-cat-title-inner .docs-item-count span {
    222222            color: <?php echo $output['betterdocs_doc_page_item_count_color'] ?>;
    223223            font-size: <?php echo $output['betterdocs_doc_page_item_count_font_size'] ?>px;

  • betterdocs/trunk/admin/includes/class-betterdocs-notice.php

    r2514094 r2544882  
    959959
    960960    $notice->classes( 'update_10kuser', 'notice is-dismissible' );
    961     $notice->message( 'update_10kuser', '<p>'. __( 'Join us to celebrate <a href="https://wpdeveloper.net/betterdocs-knowledge-base-plugin-10k/" target="_blank">10,000+ happy users</a> of BetterDocs & get exclusive <strong>40% OFF</strong> with coupon code <em><strong>‘BD10K’</strong></em> while upgrading to PRO. <a class="button button-small" href="https://betterdocs.co/#pricing" target="_blank">Grab the Offer</a> ', $notice->text_domain ) .'</p>' );
     961    $notice->message( 'update_10kuser', '<p>'. __( 'Join us to celebrate 20,000+ happy users of BetterDocs & get exclusive <strong>30% OFF</strong> with coupon code <em><strong>‘BD30’</strong></em> while upgrading to PRO. <a class="button button-small" href="https://betterdocs.co/get/betterdocs-20k" target="_blank">Upgrade to PRO</a> ', $notice->text_domain ) .'</p>' );
    962962
    963963    /**
    … …  
    974974    $notice->options_args = array(
    975975        'notice_will_show' => [
    976             'opt_in' => $notice->timestamp,
    977             'update_10kuser' => $notice->makeTime( $notice->timestamp, '4 Day' ), // after 4 days
     976//            'opt_in' => $notice->timestamp,
     977            'update_10kuser' => $notice->timestamp, // after 4 days
     978//            'update_10kuser' => $notice->makeTime( $notice->timestamp, '4 Day' ), // after 4 days
    978979            'review' => $notice->makeTime( $notice->timestamp, '7 Day' ), // after 4 days
    979980        ]

  • betterdocs/trunk/betterdocs.php

    r2539709 r2544882  
    55 * Plugin URI:        https://betterdocs.co/
    66 * Description:       Create stunning Knowledge base for your WordPress website and reduce support pressure with the help of BetterDocs. Get access to amazing templates and create fully customizable KB within minutes.
    7  * Version:           1.8.0
     7 * Version:           1.8.1
    88 * Author:            WPDeveloper
    99 * Author URI:        https://wpdeveloper.net
    … …  
    1919}
    2020
    21 define('BETTERDOCS_VERSION', '1.8.0');
     21define('BETTERDOCS_VERSION', '1.8.1');
    2222define('BETTERDOCS_DIR_PATH', plugin_dir_path(__FILE__));
    2323define('BETTERDOCS_URL', plugin_dir_url(__FILE__));

  • betterdocs/trunk/includes/class-betterdocs-helpers.php

    r2539709 r2544882  
    364364    }
    365365
    366     public static function taxonomy_object($multiple_kb, $terms, $kb_slug='')
     366    public static function taxonomy_object($multiple_kb, $terms, $kb_slug='', $nested_subcategory=false)
    367367    {
    368368        global $wp_query;
    … …  
    370370            'hide_empty' => true,
    371371            'taxonomy' => 'doc_category',
    372             'orderby' => 'name',
    373             'parent' => 0
    374         );
     372            'orderby' => 'name'
     373        );
     374
     375        if ($nested_subcategory == true) {
     376            $terms_object['parent'] = 0;
     377        }
    375378
    376379        if ($wp_query->query === NULL || (isset($wp_query->query['post_type']) && $wp_query->query['post_type'] != 'docs')) {

  • betterdocs/trunk/includes/elementor/Template/Category-Box/Layout_2.php

    r2514094 r2544882  
    2828
    2929if ($settings['show_count']) {
    30     $get_term_count = betterdocs_get_postcount($term->count, $term->term_id);
    31     $term_count = apply_filters('betterdocs_postcount', $get_term_count, $default_multiple_kb, $term->term_id, $term->slug, $term->count);
    3230    printf('<div class="el-betterdocs-cb-cat-count__layout-2"><span class="count-inner__layout-2">%s</span></div>', $term_count);
    3331}

  • betterdocs/trunk/includes/elementor/Template/Category-Box/Layout_Default.php

    r2514094 r2544882  
    2828
    2929    if ($settings['show_count']) {
    30         $get_term_count = betterdocs_get_postcount($term->count, $term->term_id);
    31         $term_count = apply_filters('betterdocs_postcount', $get_term_count, $default_multiple_kb, $term->term_id, $term->slug, $term->count);
    3230        if($term_count == 1) {
    3331            printf('<div class="el-betterdocs-cb-cat-count"><span class="count-prefix">%s</span>%s<span class="count-suffix">%s</span></div>', $settings['count_prefix'], $term_count, $settings['count_suffix_singular']);

  • betterdocs/trunk/includes/elementor/Template/Category-Grid/Layout_2.php

    r2514094 r2544882  
    1212            echo '<div class="el-betterdocs-cg-header">';
    1313            if ($settings['show_count']) {
    14                 $get_term_count = betterdocs_get_postcount($term->count, $term->term_id);
    15                 $term_count = apply_filters('betterdocs_postcount', $get_term_count, $default_multiple_kb, $term->term_id, $term->slug, $term->count);
    1614                echo '<div class="el-betterdocs-item-count" data-content="' . $term_count . '"></div>';
    1715            }

  • betterdocs/trunk/includes/elementor/Template/Category-Grid/Layout_Default.php

    r2514094 r2544882  
    2626                    }
    2727                    if ($settings['show_count']) {
    28                         $get_term_count = betterdocs_get_postcount($term->count, $term->term_id);
    29                         $term_count = apply_filters('betterdocs_postcount', $get_term_count, $default_multiple_kb, $term->term_id, $term->slug, $term->count);
    3028                        echo '<div class="el-betterdocs-item-count">' . $term_count . '</div>';
    3129                    }

  • betterdocs/trunk/includes/elementor/class-betterdocs-elementor.php

    r2539709 r2544882  
    599599                    'label_off' => __('No', 'betterdocs'),
    600600                    'return_value' => 'true',
    601                     'default' => '',
     601                    'default' => false,
    602602                ]
    603603            );
    … …  
    612612                        'nested_subcategory'   => 'true'
    613613                    ]
     614                ]
     615            );
     616        }
     617
     618        if ($wb->get_name() === 'betterdocs-category-box') {
     619            $wb->add_control(
     620                'nested_subcategory',
     621                [
     622                    'label' => __('Nested Subcategory', 'betterdocs'),
     623                    'type' => Controls_Manager::SWITCHER,
     624                    'label_on' => __('Yes', 'betterdocs'),
     625                    'label_off' => __('No', 'betterdocs'),
     626                    'return_value' => 'true',
     627                    'default' => false,
    614628                ]
    615629            );

  • betterdocs/trunk/includes/elementor/widgets/betterdocs-elementor-category-box.php

    r2502727 r2544882  
    10241024            'offset'   => $settings['offset'],
    10251025            'number'   => $settings['box_per_page'],
    1026             'parent' => 0
    1027         );
     1026        );
     1027
     1028        if ($settings['nested_subcategory'] == true) {
     1029            $terms_object['parent'] = 0;
     1030        }
    10281031
    10291032        if ($settings['include'])
    … …  
    10401043        $default_multiple_kb = BetterDocs_Elementor::get_betterdocs_multiple_kb_status();
    10411044
    1042         if ($settings['layout_template'] == 'Layout_2') 
     1045        if ($settings['layout_template'] == 'Layout_2')
    10431046        {
    10441047            $settings['layout_template'] = 'layout-2';
    … …  
    10791082                        $term_slug = $term->slug;
    10801083                        $count = $term->count;
    1081                         $get_term_count = betterdocs_get_postcount($count, $term_id);
    1082                         $term_count = apply_filters('betterdocs_postcount', $get_term_count, $default_multiple_kb, $term_id, $term_slug, $count);
     1084                        $get_term_count = betterdocs_get_postcount($count, $term_id, $settings['nested_subcategory']);
     1085                        $term_count = apply_filters('betterdocs_postcount', $get_term_count, $default_multiple_kb, $term_id, $term_slug, $count, $settings['nested_subcategory']);
    10831086                        if ($term_count > 0) {
    10841087                            $html .= BetterDocs_Elementor::include_with_variable($this->get_template($settings['layout_template']), ['term' => $term, 'term_count' => $term_count, 'settings' => $settings, 'default_multiple_kb' => $default_multiple_kb]);
    … …  
    11101113                        $term_slug = $term->slug;
    11111114                        $count = $term->count;
    1112                         $get_term_count = betterdocs_get_postcount($count, $term_id);
    1113                         $term_count = apply_filters('betterdocs_postcount', $get_term_count, $default_multiple_kb, $term_id, $term_slug, $count);
     1115                        $get_term_count = betterdocs_get_postcount($count, $term_id, $settings['nested_subcategory']);
     1116                        $term_count = apply_filters('betterdocs_postcount', $get_term_count, $default_multiple_kb, $term_id, $term_slug, $count, $settings['nested_subcategory']);
    11141117                        if ($term_count > 0) {
    11151118                            $html .= BetterDocs_Elementor::include_with_variable($this->get_template($settings['layout_template']), ['term' => $term, 'term_count' => $term_count, 'settings' => $settings, 'default_multiple_kb' => $default_multiple_kb]);

  • betterdocs/trunk/includes/elementor/widgets/betterdocs-elementor-category-grid.php

    r2539709 r2544882  
    15531553            'order' => $settings['order'],
    15541554            'offset'    => $settings['offset'],
    1555             'number'    => $settings['grid_per_page'],
    1556             'parent' => 0
    1557         );
     1555            'number'    => $settings['grid_per_page']
     1556        );
     1557
     1558        if ($settings['nested_subcategory'] == true) {
     1559            $terms_object['parent'] = 0;
     1560        }
    15581561
    15591562        if($settings['orderby'] != 'betterdocs_order') {
    … …  
    15991602                $html .= '<div '.$this->get_render_attribute_string('bd_category_grid_inner').' data-column="'.$settings['grid_column'].'" data-column-space="'.$settings['grid_space'].'">';
    16001603                if (file_exists($this->get_template($settings['layout_template']))) {
    1601                     if($taxonomy_objects && ! is_wp_error( $taxonomy_objects )) {
     1604                    if ($taxonomy_objects && ! is_wp_error( $taxonomy_objects )) {
    16021605                        foreach($taxonomy_objects as $term) {
    16031606                            $term_id = $term->term_id;
    16041607                            $term_slug = $term->slug;
    16051608                            $count = $term->count;
    1606                             $get_term_count = betterdocs_get_postcount($count, $term_id);
    1607                             $term_count = apply_filters('betterdocs_postcount', $get_term_count, $default_multiple_kb, $term_id, $term_slug, $count);
     1609                            $get_term_count = betterdocs_get_postcount($count, $term_id, $settings['nested_subcategory']);
     1610                            $term_count = apply_filters('betterdocs_postcount', $get_term_count, $default_multiple_kb, $term_id, $term_slug, $count, $settings['nested_subcategory']);
    16081611                            if ($term_count > 0) {
    16091612                                $html .= BetterDocs_Elementor::include_with_variable($this->get_template($settings['layout_template']), ['term' => $term, 'term_count' => $term_count, 'settings' => $settings, 'default_multiple_kb' => $default_multiple_kb]);
    … …  
    16411644                            $term_slug = $term->slug;
    16421645                            $count = $term->count;
    1643                             $get_term_count = betterdocs_get_postcount($count, $term_id);
    1644                             $term_count = apply_filters('betterdocs_postcount', $get_term_count, $default_multiple_kb, $term_id, $term_slug, $count);
     1646                            $get_term_count = betterdocs_get_postcount($count, $term_id, $settings['nested_subcategory']);
     1647                            $term_count = apply_filters('betterdocs_postcount', $get_term_count, $default_multiple_kb, $term_id, $term_slug, $count, $settings['nested_subcategory']);
    16451648                            if ($term_count > 0) {
    16461649                                $html .= BetterDocs_Elementor::include_with_variable($this->get_template($settings['layout_template']), ['term' => $term, 'term_count' => $term_count, 'settings' => $settings, 'default_multiple_kb' => $default_multiple_kb]);

  • betterdocs/trunk/public/betterdocs-shortcodes.php

    r2539709 r2544882  
    1414 * Get terms post count including child terms
    1515 */
    16 function betterdocs_get_postcount($term_count = 0, $term_id)
     16function betterdocs_get_postcount($term_count=0, $term_id, $nested_subcategory=false)
    1717{
     18    if ($nested_subcategory==false) {
     19        return $term_count;
     20    }
     21
    1822    $taxonomy = 'doc_category';
     23
    1924    $args = array(
    20         'child_of' => $term_id,
     25        'child_of' => $term_id
    2126    );
     27
    2228    $tax_terms = get_terms($taxonomy, $args);
    2329
    … …  
    7682        $atts
    7783    );
    78 
    79     $taxonomy_objects = BetterDocs_Helper::taxonomy_object($get_args['multiple_knowledge_base'], $get_args['terms'], $get_args['kb_slug']);
     84    $nested_subcategory = ($nested_subcategory == 1 && $get_args['nested_subcategory'] == '') || ($get_args['nested_subcategory'] == true && $get_args['nested_subcategory'] != "false");
     85    $masonry = ($masonry_layout == 1 && $get_args['masonry'] == '') || ($get_args['masonry'] == true && $get_args['masonry'] != "false");
     86    $taxonomy_objects = BetterDocs_Helper::taxonomy_object($get_args['multiple_knowledge_base'], $get_args['terms'], $get_args['kb_slug'], $nested_subcategory);
    8087    if ($taxonomy_objects && !is_wp_error($taxonomy_objects)) {
    8188        $class = ['betterdocs-categories-wrap category-grid white-bg'];
    … …  
    8390            if ($get_args['sidebar_list'] == true) {
    8491                $class[] = 'layout-flex';
    85             } elseif (isset($get_args['masonry']) && $get_args['masonry'] == true && $get_args['masonry'] != "false") {
    86                 wp_enqueue_script('masonry');
    87                 $class[] = 'layout-masonry';
    88             } elseif ($masonry_layout == 1 && $nested_subcategory != 1 && $get_args['masonry'] != "false") {
     92            } elseif ($masonry == true) {
    8993                wp_enqueue_script('masonry');
    9094                $class[] = 'layout-masonry';
    … …  
    127131                $term_slug = $term->slug;
    128132                $count = $term->count;
    129                 $get_term_count = betterdocs_get_postcount($count, $term_id);
    130                 $term_count = apply_filters('betterdocs_postcount', $get_term_count, $get_args['multiple_knowledge_base'], $term_id, $term_slug, $count);
     133                $get_term_count = betterdocs_get_postcount($count, $term_id, $nested_subcategory);
     134                $term_count = apply_filters('betterdocs_postcount', $get_term_count, $get_args['multiple_knowledge_base'], $term_id, $term_slug, $count, $nested_subcategory);
    131135                // $term_count = BetterDocs_Helper::get_postcount($term, $get_args['multiple_knowledge_base']);
    132136
    … …  
    199203
    200204                            // Sub category query
    201                             if (($nested_subcategory == 1 || $get_args['nested_subcategory'] == true) && $get_args['nested_subcategory'] != "false") {
     205                            if ($nested_subcategory == true) {
    202206                                nested_category_list(
    203207                                    $term_id,
    … …  
    265269        </div>';
    266270        }
    267         if (
    268             ($masonry_layout == 1 && $nested_subcategory != 1 && $get_args['masonry'] != "false")
    269             || (isset($get_args['masonry']) && $get_args['masonry'] == true && $get_args['masonry'] != "false")
    270         ) {
     271        if ($masonry == true ) {
    271272            $output = betterdocs_generate_output();
    272273            echo '<script>
    … …  
    361362        );
    362363
    363         $taxonomy_objects = BetterDocs_Helper::taxonomy_object($get_args['multiple_knowledge_base'], $get_args['terms'], $get_args['kb_slug']);
     364        $nested_subcategory = ($nested_subcategory == 1 && $get_args['nested_subcategory'] == '') || ($get_args['nested_subcategory'] == true && $get_args['nested_subcategory'] != "false");
     365        $taxonomy_objects = BetterDocs_Helper::taxonomy_object($get_args['multiple_knowledge_base'], $get_args['terms'], $get_args['kb_slug'], $nested_subcategory);
    364366
    365367        if ($taxonomy_objects && !is_wp_error($taxonomy_objects)) : ?>
    … …  
    392394                $term_slug = $term->slug;
    393395                $count = $term->count;
    394                 $get_term_count = betterdocs_get_postcount($count, $term_id);
    395                 $term_count = apply_filters('betterdocs_postcount', $get_term_count, $get_args['multiple_knowledge_base'], $term_id, $term_slug, $count);
     396                $get_term_count = betterdocs_get_postcount($count, $term_id, $nested_subcategory);
     397                $term_count = apply_filters('betterdocs_postcount', $get_term_count, $get_args['multiple_knowledge_base'], $term_id, $term_slug, $count, $nested_subcategory);
    396398                if ($term_count > 0) {
    397399                    // set active category class in single page
    … …  
    475477        $count_text_singular = BetterDocs_DB::get_settings('count_text_singular');
    476478        $count_text = BetterDocs_DB::get_settings('count_text');
     479        $nested_subcategory = BetterDocs_DB::get_settings('nested_subcategory');
    477480        $get_args = shortcode_atts(
    478481            array(
    … …  
    490493        );
    491494
    492         $taxonomy_objects = BetterDocs_Helper::taxonomy_object($get_args['multiple_knowledge_base'], $get_args['terms'], $get_args['kb_slug']);
     495        $nested_subcategory = ($nested_subcategory == 1 && $get_args['nested_subcategory'] == '') || ($get_args['nested_subcategory'] == true && $get_args['nested_subcategory'] != "false");
     496        $taxonomy_objects = BetterDocs_Helper::taxonomy_object($get_args['multiple_knowledge_base'], $get_args['terms'], $get_args['kb_slug'], $nested_subcategory);
    493497
    494498        if ($taxonomy_objects && !is_wp_error($taxonomy_objects)) :
    … …  
    505509                $class[] = 'single-kb';
    506510            }
    507             ?>
    508             <div class="<?php echo implode(' ', $class) ?>">
    509                 <?php
     511
     512            echo '<div class="'.implode(' ', $class).'">';
    510513                // display category grid by order
    511514                foreach ($taxonomy_objects as $term) {
    512515                    $term_id = $term->term_id;
    513                     if ($term->count != 0) {
    514 
     516                    $term_slug = $term->slug;
     517                    $count = $term->count;
     518                    $get_term_count = betterdocs_get_postcount($count, $term_id, $nested_subcategory);
     519                    $term_count = apply_filters('betterdocs_postcount', $get_term_count, $get_args['multiple_knowledge_base'], $term_id, $term_slug, $count, $nested_subcategory);
     520                    if ($term_count > 0) {
    515521                    // set active category class in single page
    516522                    $wrap_class = 'docs-single-cat-wrap';
    517 
    518523                    $term_permalink = BetterDocs_Helper::term_permalink('doc_category', $term->slug);
    519                     ?>
    520                     <a href="<?php echo esc_url($term_permalink) ?>" class="<?php echo esc_attr($wrap_class) ?>">
    521                         <?php
     524                    echo '<a href="'.esc_url($term_permalink).'" class="'.esc_attr($wrap_class).'">';
    522525                        $cat_icon_id = get_term_meta($term_id, 'doc_category_image-id', true);
    523526                        if ($cat_icon_id) {
    … …  
    533536                        if ($post_count == 1) {
    534537                            if ($term->count == 1) {
    535                                 echo wp_sprintf('<span>%s %s</span>', $term->count, ($count_text_singular) ? $count_text_singular : __('article', 'betterdocs'));
     538                                echo wp_sprintf('<span>%s %s</span>', $term_count, ($count_text_singular) ? $count_text_singular : __('article', 'betterdocs'));
    536539                            } else {
    537                                 echo wp_sprintf('<span>%s %s</span>', $term->count, ($count_text) ? $count_text : __('articles', 'betterdocs'));
     540                                echo wp_sprintf('<span>%s %s</span>', $term_count, ($count_text) ? $count_text : __('articles', 'betterdocs'));
    538541                            }
    539542                        }
    540                         ?>
    541                     </a>
    542                 <?php
     543                    echo '</a>';
    543544                    }
    544545                }
    545             ?>
    546             </div>
    547     <?php
     546            echo '</div>';
    548547        endif;
    549548        return ob_get_clean();
    … …  
    615614{
    616615    $search_input = isset($_POST['search_input']) ? sanitize_text_field($_POST['search_input']) : '';
    617     $kb_slug = isset($_POST['kb_slug']) ? sanitize_text_field($_POST['kb_slug']) : '';
    618616    $args = array(
    619617        'post_type'      => 'docs',
    … …  
    629627    if ($loop->have_posts()) :
    630628        while ($loop->have_posts()) : $loop->the_post();
    631             $imagematcha = preg_match_all('/<img.+src=[\'"]([^\'"]+)[\'"].*>/i', get_the_content(), $matches);
     629            preg_match_all('/<img.+src=[\'"]([^\'"]+)[\'"].*>/i', get_the_content(), $matches);
    632630
    633631            if ($matches[1]) {

  • betterdocs/trunk/public/css/betterdocs-public.css

    r2539709 r2544882  
    284284  align-items: center;
    285285  line-height: 1;
     286}
     287.docs-cat-title-inner .docs-item-count span {
     288  color: #fff;
    286289}
    287290.betterdocs-categories-wrap li,
Note: See TracChangeset for help on using the changeset viewer.