Merge pull request #77 from EnigmaWeb/development-local

EnigmaWeb · EnigmaWeb · commit 70fafd4e6aa9 · 2016-04-08T18:42:02.000+08:00
Version 1.1.2
diff --git a/readme.txt b/readme.txt
@@ -3,7 +3,7 @@ Contributors: EnigmaWeb, helgatheviking, Base29, macbookandrew
 Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=CEJ9HFWJ94BG4
 Tags: WP Knowledgebase, knowledgebase, knowledge base, faqs, wiki
 Requires at least: 2.7
-Tested up to: 4.4.1
+Tested up to: 4.5
 Stable tag: trunk
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -127,6 +127,20 @@ If you've tried all the obvious stuff and it's still not working please request
 4. Available widgets
 
 == Changelog ==
+
+= 1.1.2 =
+* fixed count issue on parent category
+* fixed page title issue - it will now reflect page name rather than being stuck on "knowledgebase"
+* fixed pluralization if there is only one article
+* register stylesheet and JS and call only on KBE pages 
+* only eneque and load search inline script if search is enabled
+* move some scripts to footer for better performance
+* only print inline styles if color is defined
+* add admin notice if theme contains customized templates
+* optimize images
+* use get_stylesheet_directory instead of replacing built-in constant
+* fixed a few typos
+
 = 1.1.1 =
 * fixed error warnings
 * 'parent' => 0 removed from the terms array to fix reorder of subcategories
@@ -195,67 +209,46 @@ If you've tried all the obvious stuff and it's still not working please request
 
 == Upgrade Notice ==
 
+= 1.1.2 =
+This upgrade fixes a lot of small long running issues and optimises performance.  All users are encouraged to upgrade.
+
+A big thank you to macbookandrew for his contributions to this release.
+
 = 1.1.1 =
-* fixed error warnings
-* 'parent' => 0 removed from the terms array to fix reorder of subcategories
-* Registered support for 'author'
+This is a minor release addressing a few small bugs and enhancements.
 
 = 1.1 =
-* renames index.php to wp-knowledgebase.php
-* no longer automatically copies template files to theme folder
-* no longer deletes kbe template folder from theme
-* fixes template redirect issue
-* fixes search template issue
-* uninstall.php is called automatically as of WP2.7
-* no longer silences error_reporting
-* no need to flush_rewrite_rules() 3 times
-* updates widget registration
-* adds optional custom headers/footers
-* fix for undefined $i variable
-* fixes conditional loading of scripts/styles
-* sanitizes merge options
-* some minor css fixes
+This is a major release which focuses on the plugin's templating system and overall code improvements. Upgrade carefully and please read new FAQ info and description regarding the templating.
+
+A big thank you to helgatheviking for her contributions to this release.
+
 
 = 1.0.9 =
-* Replace TEMPLATEPATH with STYLESHEETPATH.
-* Replace get_template_directory_uri() with get_stylesheet_directory_uri().
+Minor release, but fixes an important stylesheet issue. Upgrade immediately.
 
 = 1.0.8 =
-* Added strip_tags() function for excerpt for the search results.
-* Query corrected for getting KBE title and fixing the activation error.
+Minor release.
 
 = 1.0.7 =
-* CSS file path corrected.
+Patch only.
 
 = 1.0.6 =
-* Update query corrected on order.
+Patch only.
 
 = 1.0.5 =
-* Issue with child theme fixed.
-* Function corrected for copying plugin template files in to active theme folder
+Important fixes to templating and css. Upgrade immediately.
 
 = 1.0.4 =
-* Breadcrumbs text issue fixed.
-* Added support for Sub-Categories.
-* Added support for child theme.
-* Added support for multi site.
-* Some Code Correction.
-* Added support for revisions.
-* Languages added
+Major release.
 
 = 1.0.3 =
-* Minor CSS Changes.
-* Breadcrumbs link issue fixed.
-* Truncate function removed from the titles 
-* Function corrected for loading plugin text domain
+Minor release, fixing a number of irritating problems. Encouraged to upgrade.
 
 = 1.0.2 =
-* Translation issue fixed
-* Miscellaneous minor fixes
+Minor release.
 
 = 1.0.1 =
-* Function fixed which was assigning template to the page
-* Theme styling issue fixed
+Minor release.
 
 = 1.0 =
-* Initial release
+Initial release
diff --git a/template/archive-kbe_knowledgebase.php b/template/archive-kbe_knowledgebase.php
@@ -1,5 +1,6 @@
 <?php
     get_header('knowledgebase');
+    global $wpdb;
     
     // load the style and script
     wp_enqueue_style ( 'kbe_theme_style' );
@@ -68,13 +69,31 @@
                     $kbe_term_id = $kbe_taxonomy->term_id;
                     $kbe_term_slug = $kbe_taxonomy->slug;
                     $kbe_term_name = $kbe_taxonomy->name;
+                    
+                    $kbe_taxonomy_parent_count = $kbe_taxonomy->count;
+                    
+                    $children = get_term_children($kbe_term_id, KBE_POST_TAXONOMY);
+                    
+                    $kbe_count_sum = $wpdb->get_var("SELECT Sum(count)
+                                                     FROM wp_term_taxonomy
+                                                     WHERE taxonomy = '".KBE_POST_TAXONOMY."'
+                                                     And parent = $kbe_term_id"
+                                                    );
+                    
+                    $kbe_count_sum_parent = '';
+                
+                    if($children) {
+                        $kbe_count_sum_parent = $kbe_count_sum + $kbe_taxonomy_parent_count;
+                    } else {
+                        $kbe_count_sum_parent = $kbe_taxonomy_parent_count;
+                    }
             ?>
                     <div class="kbe_category">
                         <h2>
                             <span class="kbe_count">
                                 <?php
-                                    echo $kbe_taxonomy->count;
-                                    if ($kbe_taxonomy->count == 1) {
+                                    echo $kbe_count_sum_parent;
+                                    if ($kbe_count_sum_parent == 1) {
                                         _e(' Article','kbe');
                                     } else {
                                         _e(' Articles','kbe');
diff --git a/template/kbe_knowledgebase.php b/template/kbe_knowledgebase.php
@@ -9,7 +9,7 @@
     if( KBE_SEARCH_SETTING == 1 ){
         wp_enqueue_script( 'kbe_live_search' );
     }
-
+    
     // Classes For main content div
     if(KBE_SIDEBAR_HOME == 0) {
         $kbe_content_class = 'class="kbe_content_full"';
@@ -70,13 +70,31 @@
                 $kbe_term_id = $kbe_taxonomy->term_id;
                 $kbe_term_slug = $kbe_taxonomy->slug;
                 $kbe_term_name = $kbe_taxonomy->name;
+                
+                $kbe_taxonomy_parent_count = $kbe_taxonomy->count;
+                    
+                    $children = get_term_children($kbe_term_id, KBE_POST_TAXONOMY);
+                    
+                    $kbe_count_sum = $wpdb->get_var("SELECT Sum(count)
+                                                     FROM wp_term_taxonomy
+                                                     WHERE taxonomy = '".KBE_POST_TAXONOMY."'
+                                                     And parent = $kbe_term_id"
+                                                    );
+                    
+                    $kbe_count_sum_parent = '';
+                
+                    if($children) {
+                        $kbe_count_sum_parent = $kbe_count_sum + $kbe_taxonomy_parent_count;
+                    } else {
+                        $kbe_count_sum_parent = $kbe_taxonomy_parent_count;
+                    }
         ?>
                 <div class="kbe_category">
                     <h2>
                         <span class="kbe_count">
                             <?php
-                                echo $kbe_taxonomy->count;
-                                if ($kbe_taxonomy->count == 1) {
+                                echo $kbe_count_sum_parent;
+                                if ($kbe_count_sum_parent == 1) {
                                     _e(' Article','kbe');
                                 } else {
                                     _e(' Articles','kbe');
@@ -169,6 +187,7 @@
                         'posts_per_page' => KBE_ARTICLE_QTY,
                         'orderby' => 'menu_order',
                         'order' => 'ASC',
+                        'post_parent' => 0,
                         'tax_query' => array(
                             array(
                                 'taxonomy' => KBE_POST_TAXONOMY,
diff --git a/template/kbe_style.css b/template/kbe_style.css
@@ -634,7 +634,7 @@
 }
 
 /*======> responsive layout <======*/
-@media screen and (min-width: 769px) and (max-width: 1024px) {
+@media screen and (min-width: 768px) and (max-width: 1024px) {
     #kbe_content .kbe_leftcol {
         width: 65%;
     }
@@ -649,6 +649,9 @@
         float: left;
         width: 222px;
     }
+    .kbe_content_full {
+        width: 100% !important;
+    }
     .kbe_content_full .kbe_leftcol {
         width: 100% !important;
     }
@@ -673,14 +676,15 @@
     }
     .kbe_content_left {
         float: left;
-        width: 75% !important;
+        width: 64% !important;
         margin-bottom: 30px;
     }
 
     .kbe_content_right {
         float: left;
-        width: 75% !important;
+        width: 64% !important;
         margin-bottom: 30px;
+        margin-right: 36px;
     }
     .kbe_reply {
         width: 80%;
@@ -695,7 +699,7 @@
         font-size: 20px;
     }
 }
-@media screen and (min-width: 641px) and (max-width: 768px) {
+@media screen and (min-width: 641px) and (max-width: 767px) {
     #kbe_content .kbe_leftcol {
         width: 65%;
     }
diff --git a/template/single-kbe_knowledgebase.php b/template/single-kbe_knowledgebase.php
@@ -6,7 +6,7 @@
     if( KBE_SEARCH_SETTING == 1 ){
         wp_enqueue_script( 'kbe_live_search' );
     }
-
+    
     // Classes For main content div
     if(KBE_SIDEBAR_INNER == 0) {
         $kbe_content_class = 'class="kbe_content_full"';
diff --git a/template/taxonomy-kbe_tags.php b/template/taxonomy-kbe_tags.php
@@ -6,7 +6,7 @@
     if( KBE_SEARCH_SETTING == 1 ){
         wp_enqueue_script( 'kbe_live_search' );
     }
-
+    
     // Classes For main content div
     if(KBE_SIDEBAR_INNER == 0) {
         $kbe_content_class = 'class="kbe_content_full"';
diff --git a/template/taxonomy-kbe_taxonomy.php b/template/taxonomy-kbe_taxonomy.php
@@ -6,7 +6,7 @@
     if( KBE_SEARCH_SETTING == 1 ){
         wp_enqueue_script( 'kbe_live_search' );
     }
-
+    
     // Classes For main content div
     if(KBE_SIDEBAR_INNER == 0) {
         $kbe_content_class = 'class="kbe_content_full"';
diff --git a/wp-knowledgebase.php b/wp-knowledgebase.php
@@ -4,12 +4,12 @@
   Plugin URI: http://wordpress.org/plugins/wp-knowledgebase
   Description: Simple and flexible knowledgebase plugin for WordPress
   Author: Enigma Plugins
-  Version: 1.1.1
+  Version: 1.1.2
   Author URI: http://enigmaplugins.com
   Requires at least: 2.7
  */
  
- define( 'KBE_PLUGIN_VERSION', '1.1' );
+ define( 'KBE_PLUGIN_VERSION', '1.1.2' );
 
 //=========> Create language folder
 add_action( 'init', 'kbe_plugin_load_textdomain' );
@@ -316,7 +316,8 @@ function update_asset_enqueueing_notice() {
 
     // check for existence of customized files
     $base = get_stylesheet_directory() . '/wp_knowledgebase/';
-    if ( empty( get_option( 'kbe_asset_enqueueing_notice_dismissed' ) ) && ( file_exists( $base . 'archive-kbe_knowledgebase.php' ) || file_exists( $base . 'kbe_knowledgebase.php' ) || file_exists( $base . 'kbe_search.php' ) || file_exists( $base . 'single-kbe_knowledgebase.php' ) || file_exists( $base . 'taxonomy-kbe_tags.php' ) || file_exists( $base . 'taxonomy-kbe_taxonomy.php' ) ) ) {
+    $notice_dismissed = get_option( 'kbe_asset_enqueueing_notice_dismissed' );
+    if ( ( ! isset( $notice_dismissed ) || '0' === $notice_dismissed ) && ( file_exists( $base . 'archive-kbe_knowledgebase.php' ) || file_exists( $base . 'kbe_knowledgebase.php' ) || file_exists( $base . 'kbe_search.php' ) || file_exists( $base . 'single-kbe_knowledgebase.php' ) || file_exists( $base . 'taxonomy-kbe_tags.php' ) || file_exists( $base . 'taxonomy-kbe_taxonomy.php' ) ) ) {
         printf( '<div class="%1$s"><h2>%2$s</h2><p>%3$s</p><pre><code>%4$s</code></pre></div>', $class, $title, $message, $code );
     }
 }
@@ -506,7 +507,7 @@ function kbe_breadcrumbs(){
     
     $kbe_slug_case = ucwords(strtolower(KBE_PLUGIN_SLUG));
                         
-    $url = "http://" . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
+    $url = $_SERVER['REQUEST_SCHEME'] . '://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
     
     if(strpos($url, 'knowledgebase_category') || strpos($url, 'kbe_taxonomy')){
         $kbe_bc_name = get_queried_object()->name;

Original file line number	Diff line number	Diff line change
`@@ -634,7 +634,7 @@`
`634`	`634`	`}`
`635`	`635`
`636`	`636`	`/======> responsive layout <======/`
`637`		`-@media screen and (min-width: 769px) and (max-width: 1024px) {`
	`637`	`+@media screen and (min-width: 768px) and (max-width: 1024px) {`
`638`	`638`	`#kbe_content .kbe_leftcol {`
`639`	`639`	`width: 65%;`
`640`	`640`	`}`
`@@ -649,6 +649,9 @@`
`649`	`649`	`float: left;`
`650`	`650`	`width: 222px;`
`651`	`651`	`}`
	`652`	`+ .kbe_content_full {`
	`653`	`+ width: 100% !important;`
	`654`	`+ }`
`652`	`655`	`.kbe_content_full .kbe_leftcol {`
`653`	`656`	`width: 100% !important;`
`654`	`657`	`}`
`@@ -673,14 +676,15 @@`
`673`	`676`	`}`
`674`	`677`	`.kbe_content_left {`
`675`	`678`	`float: left;`
`676`		`- width: 75% !important;`
	`679`	`+ width: 64% !important;`
`677`	`680`	`margin-bottom: 30px;`
`678`	`681`	`}`
`679`	`682`
`680`	`683`	`.kbe_content_right {`
`681`	`684`	`float: left;`
`682`		`- width: 75% !important;`
	`685`	`+ width: 64% !important;`
`683`	`686`	`margin-bottom: 30px;`
	`687`	`+ margin-right: 36px;`
`684`	`688`	`}`
`685`	`689`	`.kbe_reply {`
`686`	`690`	`width: 80%;`
`@@ -695,7 +699,7 @@`
`695`	`699`	`font-size: 20px;`
`696`	`700`	`}`
`697`	`701`	`}`
`698`		`-@media screen and (min-width: 641px) and (max-width: 768px) {`
	`702`	`+@media screen and (min-width: 641px) and (max-width: 767px) {`
`699`	`703`	`#kbe_content .kbe_leftcol {`
`700`	`704`	`width: 65%;`
`701`	`705`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`if( KBE_SEARCH_SETTING == 1 ){`
`7`	`7`	`wp_enqueue_script( 'kbe_live_search' );`
`8`	`8`	`}`
`9`		`-`
	`9`	`+`
`10`	`10`	`// Classes For main content div`
`11`	`11`	`if(KBE_SIDEBAR_INNER == 0) {`
`12`	`12`	`$kbe_content_class = 'class="kbe_content_full"';`