diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b20c392 --- /dev/null +++ b/.gitignore @@ -0,0 +1,93 @@ +# Created by .ignore support plugin (hsz.mobi) +### VisualStudioCode template +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json +### Example user template template +### Example user template + +# IntelliJ project files +.idea +*.iml +out +gen### Example user template template +### Example user template + +# IntelliJ project files +.idea +*.iml +out +gen### JetBrains template +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm +# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 + +# User-specific stuff: +.idea/**/workspace.xml +.idea/**/tasks.xml +.idea/dictionaries + +# Sensitive or high-churn files: +.idea/**/dataSources/ +.idea/**/dataSources.ids +.idea/**/dataSources.xml +.idea/**/dataSources.local.xml +.idea/**/sqlDataSources.xml +.idea/**/dynamic.xml +.idea/**/uiDesigner.xml + +# Gradle: +.idea/**/gradle.xml +.idea/**/libraries + +# Mongo Explorer plugin: +.idea/**/mongoSettings.xml + +## File-based project format: +*.iws + +## Plugin-specific files: + +# IntelliJ +/out/ + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties +fabric.properties +### macOS template +*.DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns +.com.apple.timemachine.donotpresent + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk + diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..484438e --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,86 @@ +CHANGELOG +========= + +All notable changes to this project will be documented in this file. + + +### [Unreleased] + - Better translation support + - Add option permalink: no permalink on taxonomy filtering + - Add support meta: support to render and filter postmeta + + + +### 1.2.5 + - Fixed a PHP error when setting defaults for taxonomies - many users did not see this but resulted in unexpected behaviour + - Fixed an error with post date sometimes being undefined for blank searches + - Added argument `empty_search_url` - when a users submits the search form without any search preferences selected they will be redirected to this URL + - Updated argument `add_search_param` - setting to `1` will force add a "?s=" to all urls generated by the plugin - this may help with the loading of search templates in some themes + + +### 1.2.4 + - Fixed a bug created in 1.2.3 when doing an empty search + +### 1.2.3 + - Added arguement `all_items_labels` which allows for support for custom `all_items` labels in taxonomies, categories, post tags and post types when using `select` and `radio` types - the default text displaying "All Categories" for example can now be defined using `all_items_labels` + - Added `show_count` to arguments - this shows how many posts are in a particular term, in brackets after the term name - works only for categories, tags and taxonomies + - Fixed a bug when using when using "all post types" and it displaying no results + - Reverted behaviour from 1.2.2 - no longer force load search template when search is blank - let WP handle it again + - Added argument `add_search_param` - setting it to `1` will force a "?s=" or "&s=" to be added to the url even when the search is blank - in some circumstances this will force load the search template, instead of other WP templates, such as taxonomy or category templates + +### 1.2.2 + - Added support for multi selects - use `multiselect` as the type for your field + - Added support for AND & OR operators when using checkboxes or multiselects - use the `operators` argument with allowed values of `and` & `or` + - Force load search template when search is blank, don't include when search field is not included in shortcode + - Fixed an issue with navigation disappearing when using post_types + +### 1.2.1 + - Version Bump - bad commit + +### 1.2.0 + - WARNING - this update includes some major changes to shortcode construction, do not upgrade until you have read how this will affect your setup - updating should be easy. + - Renamed the `taxonomies` argument to `fields` - `taxonomies` is now no longer appropriate as this list contains field types other than taxonomies - this list now contains taxonomies, `post_type`, `post_date` and `search` - `taxonomies` as an argument is still supported however will be deprecated + - Search box can now be positioned anywhere, simply include `search` in the fields list in the position desired. Upgrading from previous versions will cause you to lose your search box, simply include `search` in the fields list to show it again + - Drop support for `search` argument as no longer relevant - control display of search input by adding it to the `fields` list + - Labels have been completely rewritten - `label` has been renamed to `headings` to avoid confusion with internal taxonomy labels - the `headings` argument now allows for any text to be added and displayed as a heading for each field - this allows for much more flexibility and no longer uses internal taxonomy labels - to hide a label simply leave blank + - Added support for hierarchical taxonomies for all input types - checkbox, radio & select + - Added support for ordering of taxonomies - use `order_by` argument - allowed values are `id`, `name`, `slug`, `count`, `term_group` + - Added support for ordering direction of taxonomies - use `order_dir` argument - allowed values are 'asc' or 'desc' + - Added support to show or hide empty taxonomies - use `hide_empty` argument + - Added support for `search_placeholder` + - Updated `post_date` functionality to work with older versions of WP - can be displayed either as `date` or `daterange` - the `post_date` field uses the HTML 5 input type of `date` - browsers that do not support it will simply show a text box - a tutorial of integrating jquery for graceful degredation is in the works + - Renamed `submitlabel` to `submit_label` - `submitlabel` still works for now. + - Renamed `type` to `types` - `type` still works for now. + - Updated display of checkboxes and radio buttons, inputs are now wrapped in an unordered list which may affect your styling + - Various bug fixes + - Thanks to `bradaric` for help with hierarchical dropdown lists and date input types - https://github.com/bradaric + +### 1.1.3 + - Added support for `post_date` to be displayed either as `date` or `daterange` (WP 3.7+) type. + +### 1.1.2 + - Added support for all public and custom post types (the attachment post type is excluded) - all post types can be user searchable or predfined and hidden from the user. This allows for users to add multiple search widgets to their site which work on specific post types independantly from eachother. + - Added offical updated documentation, created and moved to Search & Filter Docs + +### 1.1.1 + - Fixed: when submitting an empty `search/filter`, `"?s="` now gets appended to the url (an empty search) to force load a results page, previously this was redirecting to the homepage which does not work for many use cases + +### 1.1.0 + - Added support for checkboxes and radio buttons, with the option to control this for each individual taxonomy. + - Added support to show or hide headings for each individual taxonomy. + - Added support to pass a class name through to Search & Filter widgets, this allows styling of different instances of Search & Filter + - Fixed problems with escaping output in search box +Notice: This update will automatically add headings to taxonomy dropdowns, refer to usage and examples on how to disable them. + +### 1.0.3 + - Added some documention & screenshots to plugin page + +### 1.0.2 + - Version bump for WordPress plugins site + +### 1.0.1 + - Updated to use `label->all_items` in taxonomy object for dropdowns before using `label->name` + - Notice: This update may cause some labels to break, ensure you have set up your taxonomy properly including setting `label->all_items` + +### 1.0.0 + - Initial Release diff --git a/README.md b/README.md index 1436505..1b009bf 100644 --- a/README.md +++ b/README.md @@ -15,80 +15,7 @@ You can search by Category, Tag, Custom Taxonomy or any combination of these eas ## Changelog -### 1.2.5 - - Fixed a PHP error when setting defaults for taxonomies - many users did not see this but resulted in unexpected behaviour - - Fixed an error with post date sometimes being undefined for blank searches - - Added argument `empty_search_url` - when a users submits the search form without any search preferences selected they will be redirected to this URL - - Updated argument `add_search_param` - setting to `1` will force add a "?s=" to all urls generated by the plugin - this may help with the loading of search templates in some themes - - -### 1.2.4 - - Fixed a bug created in 1.2.3 when doing an empty search - -### 1.2.3 - - Added arguement `all_items_labels` which allows for support for custom `all_items` labels in taxonomies, categories, post tags and post types when using `select` and `radio` types - the default text displaying "All Categories" for example can now be defined using `all_items_labels` - - Added `show_count` to arguments - this shows how many posts are in a particular term, in brackets after the term name - works only for categories, tags and taxonomies - - Fixed a bug when using when using "all post types" and it displaying no results - - Reverted behaviour from 1.2.2 - no longer force load search template when search is blank - let WP handle it again - - Added argument `add_search_param` - setting it to `1` will force a "?s=" or "&s=" to be added to the url even when the search is blank - in some circumstances this will force load the search template, instead of other WP templates, such as taxonomy or category templates - -### 1.2.2 - - Added support for multi selects - use `multiselect` as the type for your field - - Added support for AND & OR operators when using checkboxes or multiselects - use the `operators` argument with allowed values of `and` & `or` - - Force load search template when search is blank, don't include when search field is not included in shortcode - - Fixed an issue with navigation disappearing when using post_types - -### 1.2.1 - - Version Bump - bad commit - -### 1.2.0 - - WARNING - this update includes some major changes to shortcode construction, do not upgrade until you have read how this will affect your setup - updating should be easy. - - Renamed the `taxonomies` argument to `fields` - `taxonomies` is now no longer appropriate as this list contains field types other than taxonomies - this list now contains taxonomies, `post_type`, `post_date` and `search` - `taxonomies` as an argument is still supported however will be deprecated - - Search box can now be positioned anywhere, simply include `search` in the fields list in the position desired. Upgrading from previous versions will cause you to lose your search box, simply include `search` in the fields list to show it again - - Drop support for `search` argument as no longer relevant - control display of search input by adding it to the `fields` list - - Labels have been completely rewritten - `label` has been renamed to `headings` to avoid confusion with internal taxonomy labels - the `headings` argument now allows for any text to be added and displayed as a heading for each field - this allows for much more flexibility and no longer uses internal taxonomy labels - to hide a label simply leave blank - - Added support for hierarchical taxonomies for all input types - checkbox, radio & select - - Added support for ordering of taxonomies - use `order_by` argument - allowed values are `id`, `name`, `slug`, `count`, `term_group` - - Added support for ordering direction of taxonomies - use `order_dir` argument - allowed values are 'asc' or 'desc' - - Added support to show or hide empty taxonomies - use `hide_empty` argument - - Added support for `search_placeholder` - - Updated `post_date` functionality to work with older versions of WP - can be displayed either as `date` or `daterange` - the `post_date` field uses the HTML 5 input type of `date` - browsers that do not support it will simply show a text box - a tutorial of integrating jquery for graceful degredation is in the works - - Renamed `submitlabel` to `submit_label` - `submitlabel` still works for now. - - Renamed `type` to `types` - `type` still works for now. - - Updated display of checkboxes and radio buttons, inputs are now wrapped in an unordered list which may affect your styling - - Various bug fixes - - Thanks to `bradaric` for help with hierarchical dropdown lists and date input types - https://github.com/bradaric - -### 1.1.3 - - Added support for `post_date` to be displayed either as `date` or `daterange` (WP 3.7+) type. - -### 1.1.2 - - Added support for all public and custom post types (the attachment post type is excluded) - all post types can be user searchable or predfined and hidden from the user. This allows for users to add multiple search widgets to their site which work on specific post types independantly from eachother. - - Added offical updated documentation, created and moved to Search & Filter Docs - -### 1.1.1 - - Fixed: when submitting an empty `search/filter`, `"?s="` now gets appended to the url (an empty search) to force load a results page, previously this was redirecting to the homepage which does not work for many use cases - -### 1.1.0 - - Added support for checkboxes and radio buttons, with the option to control this for each individual taxonomy. - - Added support to show or hide headings for each individual taxonomy. - - Added support to pass a class name through to Search & Filter widgets, this allows styling of different instances of Search & Filter - - Fixed problems with escaping output in search box -Notice: This update will automatically add headings to taxonomy dropdowns, refer to usage and examples on how to disable them. - -### 1.0.3 - - Added some documention & screenshots to plugin page - -### 1.0.2 - - Version bump for WordPress plugins site - -### 1.0.1 - - Updated to use `label->all_items` in taxonomy object for dropdowns before using `label->name` - - Notice: This update may cause some labels to break, ensure you have set up your taxonomy properly including setting `label->all_items` - -### 1.0.0 - - Initial Release - +see [CHANGELOG.md](CHANGELOG.md) ## License - Released under the [GPL v2](http://www.gnu.org/licenses/gpl-2.0.html) License diff --git a/of-admin.php b/of-admin.php index b96b5fa..72ccd1a 100644 --- a/of-admin.php +++ b/of-admin.php @@ -47,7 +47,7 @@ function searchandfilter_settings() echo '
Search & Filter is a simple search and filtering plugin for Wordpress brought to you by Designs & Code.

It is essentially an advancement of the WordPress search box, adding taxonomy and post type filters to really refine your searches.

- You can search by Category, Tag, Custom Taxonomy, Post Type or any combination of these easily - you can even remove the search box and simply use it as a filtering system for your posts and pages. Taxonomies and Post Types can be displayed as dropdown selects, checkboxes or radio buttons. + You can search by Category, Tag, Custom Taxonomy, Post Type or any combination of these easily - you can even remove the search box and simply use it as a filtering system for your posts and pages. Taxonomies and Post Types can be displayed as dropdown selects, checkboxes, radio buttons or multiselects.
'; echo "

Documentation

"; echo '
@@ -63,7 +63,7 @@ function searchandfilter_settings() This will display a search box, a category dropdown and a tag dropdown. You can use the shortcode within posts/pages and widget areas.

- To use this within a theme file you simple need to call the `do_shortcode` function with the shortcode above within the theme file:
+ To use this within a theme file you simple need to call the `do_shorcode` function with the shortcode above within the theme file:
<?php echo do_shortcode( \'[searchandfilter taxonomies="category,post_tag"]\' ); ?>
'; @@ -161,4 +161,4 @@ function searchandfilter_plugin_action_links($links, $file) return $links; } -?> +?> \ No newline at end of file diff --git a/of-list-table.php b/of-list-table.php index e69eb12..53c019d 100644 --- a/of-list-table.php +++ b/of-list-table.php @@ -199,7 +199,7 @@ function __construct() "ID" => $counter, "name" => "types", "defaultval" => "select", - "options" => "Comma seperated list of any of the types found below:

select
checkbox
radio

+ "options" => "Comma seperated list of any of the types found below:

select
checkbox
radio
multiselect

These types should only be used when the field is `post_date`:

date
daterange", "info" => "The order of values in this comma seperated list needs to match the fields list." ); diff --git a/of-taxonomy-walker.php b/of-taxonomy-walker.php index b2054dc..5addf30 100644 --- a/of-taxonomy-walker.php +++ b/of-taxonomy-walker.php @@ -1,319 +1,319 @@ -term_ids = wp_get_post_terms( $post_id, $taxonomy, 'fields=ids' ); - //var_dump($this->term_ids); - - $this->type = $type; - $this->defaults = $defaults; - } - - function display_element( $element, &$children_elements, $max_depth, $depth=0, $args, &$output ) { - /*$display = false; - - $id = $element->term_id; - - $display = true; - if ( isset( $children_elements[ $id ] ) ) { - // the current term has children - foreach ( $children_elements[ $id ] as $child ) { - if ( in_array( $child->term_id, $this->term_ids ) ) { - // one of the term's children is in the list - $display = true; - // can stop searching now - break; - } - } - } - - if ( $display )*/ - parent::display_element( $element, $children_elements, $max_depth, $depth, $args, $output ); - } - - - function start_el( &$output, $category, $depth = 0, $args = array(), $id = 0 ) - { - - if($this->type=="list") - { - extract($args); - - $cat_name = esc_attr( $category->name ); - $cat_name = apply_filters( 'list_cats', $cat_name, $category ); - $link = 'description) ) - $link .= 'title="' . esc_attr( sprintf(__( 'View all posts filed under %s' ), $cat_name) ) . '"'; - else - $link .= 'title="' . esc_attr( strip_tags( apply_filters( 'category_description', $category->description, $category ) ) ) . '"'; - $link .= '>'; - $link .= $cat_name . ''; - - if ( !empty($feed_image) || !empty($feed) ) { - $link .= ' '; - - if ( empty($feed_image) ) - $link .= '('; - - $link .= ''; - - $link .= ''; - - if ( empty($feed_image) ) - $link .= ')'; - } - - if ( !empty($show_count) ) - $link .= ' (' . intval($category->count) . ')'; - - if ( 'list' == $args['style'] ) { - $output .= "\tterm_id; - if ( !empty($current_category) ) { - $_current_category = get_term( $current_category, $category->taxonomy ); - if ( $category->term_id == $current_category ) - $class .= ' current-cat'; - elseif ( $category->term_id == $_current_category->parent ) - $class .= ' current-cat-parent'; - } - $output .= ' class="' . $class . '"'; - $output .= ">$link\n"; - } else { - $output .= "\t$link
\n"; - } - } - else if(($this->type=="checkbox")||($this->type=="radio")) - { - extract($args); - - $cat_name = esc_attr( $category->name ); - $cat_id = esc_attr( $category->term_id ); - $cat_name = apply_filters( 'list_cats', $cat_name, $category ); - - //check a default has been set - $checked = ""; - if($defaults) - { - $noselected = count($this->defaults); - - if(($noselected>0)&&(is_array($defaults))) - { - foreach($defaults as $defaultid) - { - if($defaultid==$cat_id) - { - $checked = ' checked="checked"'; - } - } - } - } - - $link = ""; - - if ( 'list' == $args['style'] ) { - $output .= "\tterm_id; - if ( !empty($current_category) ) { - $_current_category = get_term( $current_category, $category->taxonomy ); - if ( $category->term_id == $current_category ) - $class .= ' current-cat'; - elseif ( $category->term_id == $_current_category->parent ) - $class .= ' current-cat-parent'; - } - $output .= ' class="' . $class . '"'; - $output .= ">$link\n"; - } else { - $output .= "\t$link
\n"; - } - } - else if($this->type=="multiselect") - { - extract($args); - - $cat_name = esc_attr( $category->name ); - $cat_id = esc_attr( $category->term_id ); - $cat_name = apply_filters( 'list_cats', $cat_name, $category ); - - //check a default has been set - $checked = ""; - if($defaults) - { - $noselected = count($this->defaults); - - if(($noselected>0)&&(is_array($defaults))) - { - foreach($defaults as $defaultid) - { - if($defaultid==$cat_id) - { - $checked = ' selected="selected"'; - } - } - } - } - - - /* Custom depth calculations! :/ */ - if($category->parent == 0) - {//then this has no parent so reset depth - $this->multidepth = 0; - } - else if($category->parent == $this->multilastid) - { - $this->multidepth++; - $this->multilastdepthchange = $this->multilastid; - } - else if($category->parent == $this->multilastdepthchange) - {//then this is also a child with the same parent so don't change depth - - } - else - {//then this has a different parent so must be lower depth - if($this->multidepth>0) - { - $this->multidepth--; - } - } - - $pad = str_repeat(' ', $this->multidepth * 3); - $link = ""; - $output .= "\t$link\n"; - - - $this->multilastid = $cat_id; - - - /* - $pad = str_repeat(' ', $depth * 3); - - $output .= "\t\n";*/ - } - - - } - - function end_el( &$output, $page, $depth = 0, $args = array() ) - { - if($this->type=="list") - { - if ( 'list' != $args['style'] ) - return; - - $output .= "\n"; - } - else if(($this->type=="checkbox")||($this->type=="radio")) - { - if ( 'list' != $args['style'] ) - return; - - $output .= "\n"; - } - else if($this->type=="multiselect") - { - if ( 'list' != $args['style'] ) - return; - - $output .= "\n"; - } - } - - function start_lvl( &$output, $depth = 0, $args = array() ) - { - - if($this->type=="list") - { - if ( 'list' != $args['style'] ) - return; - - $indent = str_repeat("\t", $depth); - $output .= "$indent