From bc7e0cf4581ffd3856ab0579a5c89875078af339 Mon Sep 17 00:00:00 2001 From: Hoang Huu Date: Sat, 28 Sep 2019 10:43:09 +0700 Subject: [PATCH] Update shortcodes. --- inc/property/class-opalestate-shortcodes.php | 113 ++++++++++--------- templates/shortcodes/properties.php | 24 ++++ 2 files changed, 86 insertions(+), 51 deletions(-) create mode 100755 templates/shortcodes/properties.php diff --git a/inc/property/class-opalestate-shortcodes.php b/inc/property/class-opalestate-shortcodes.php index 352b5cfe..ae589f77 100755 --- a/inc/property/class-opalestate-shortcodes.php +++ b/inc/property/class-opalestate-shortcodes.php @@ -1,4 +1,4 @@ -shortcodes = array( + $this->shortcodes = [ - 'search_properties_result' => array( 'code' => 'search_properties_result', 'label' => esc_html__( 'Search Properties Result', 'opalestate-pro' ) ), - 'search_properties' => array( 'code' => 'search_properties', 'label' => esc_html__( 'Search Properties', 'opalestate-pro' ) ), - 'search_properties_v' => array( 'code' => 'search_properties_v', 'label' => esc_html__( 'Search Properties Vertical', 'opalestate-pro' ) ), - - 'search_map_properties' => array( 'code' => 'search_map_properties', 'label' => esc_html__( 'Search Map Properties', 'opalestate-pro' ) ), - 'ajax_map_search' => array( 'code' => 'ajax_map_search', 'label' => esc_html__( 'Ajax Search Map Properties', 'opalestate-pro' ) ), - 'ajax_map_quick_search' => array( 'code' => 'ajax_map_quick_search', 'label' => esc_html__( 'Ajax Search Map Properties', 'opalestate-pro' ) ), - 'register_form' => array( 'code' => 'register_form', 'label' => esc_html__( 'Register User Form', 'opalestate-pro' ) ), - 'login_form' => array( 'code' => 'login_form', 'label' => esc_html__( 'Login Form', 'opalestate-pro' ) ), - ); + 'search_properties_form' => [ 'code' => 'search_properties_form', 'label' => esc_html__( 'Search Properties Form', 'opalestate-pro' ) ], + 'properties' => [ 'code' => 'properties', 'label' => esc_html__( 'Properties', 'opalestate-pro' ) ], + 'search_properties_result' => [ 'code' => 'search_properties_result', 'label' => esc_html__( 'Search Properties Result', 'opalestate-pro' ) ], + 'search_properties' => [ 'code' => 'search_properties', 'label' => esc_html__( 'Search Properties', 'opalestate-pro' ) ], + 'search_properties_v' => [ 'code' => 'search_properties_v', 'label' => esc_html__( 'Search Properties Vertical', 'opalestate-pro' ) ], - foreach( $this->shortcodes as $shortcode ){ - add_shortcode( 'opalestate_'.$shortcode['code'] , array( $this, $shortcode['code'] ) ); - } + 'search_map_properties' => [ 'code' => 'search_map_properties', 'label' => esc_html__( 'Search Map Properties', 'opalestate-pro' ) ], + 'ajax_map_search' => [ 'code' => 'ajax_map_search', 'label' => esc_html__( 'Ajax Search Map Properties', 'opalestate-pro' ) ], + 'ajax_map_quick_search' => [ 'code' => 'ajax_map_quick_search', 'label' => esc_html__( 'Ajax Search Map Properties', 'opalestate-pro' ) ], + 'register_form' => [ 'code' => 'register_form', 'label' => esc_html__( 'Register User Form', 'opalestate-pro' ) ], + 'login_form' => [ 'code' => 'login_form', 'label' => esc_html__( 'Login Form', 'opalestate-pro' ) ], + ]; - if( is_admin() ){ - add_action( 'media_buttons', array( $this, 'shortcode_button' ) ); - } + foreach ( $this->shortcodes as $shortcode ) { + add_shortcode( 'opalestate_' . $shortcode['code'], [ $this, $shortcode['code'] ] ); + } + + if ( is_admin() ) { + add_action( 'media_buttons', [ $this, 'shortcode_button' ] ); + } } - public function shortcode_button(){ - + public function shortcode_button() { + } - public function search_properties_result(){ + public function search_properties_form() { + return opalestate_load_template_path( 'search-box/collapse-advanced' ); + } + + public function properties() { + return opalestate_load_template_path( 'shortcodes/properties' ); + } + + public function search_properties_result() { return opalestate_load_template_path( 'shortcodes/search-properties-result' ); } - - /** * Display all properties follow user when logined */ - public function agent_property(){ + public function agent_property() { return opalestate_load_template_path( 'shortcodes/agent-property-listing' ); } /** * Render search property page with horizontal form and map */ - public function search_properties(){ - return opalestate_load_template_path( 'shortcodes/search-properties', array( 'loop' => '') ); + public function search_properties() { + return opalestate_load_template_path( 'shortcodes/search-properties', [ 'loop' => '' ] ); } /** * Render search property page with vertical form and map */ - public function search_properties_v(){ - return opalestate_load_template_path( 'shortcodes/search-properties-v', array( 'loop' => '') ); + public function search_properties_v() { + return opalestate_load_template_path( 'shortcodes/search-properties-v', [ 'loop' => '' ] ); } - public function search_map_properties(){ - return opalestate_load_template_path( 'shortcodes/search-map-properties', array( 'loop' => '') ); + public function search_map_properties() { + return opalestate_load_template_path( 'shortcodes/search-map-properties', [ 'loop' => '' ] ); } - public function ajax_map_search(){ - wp_enqueue_script( 'sticky-kit', OPALESTATE_PLUGIN_URL . 'assets/js/jquery.sticky-kit.min.js' ); - return opalestate_load_template_path( 'shortcodes/ajax-map-search', array( 'loop' => '') ); + public function ajax_map_search() { + wp_enqueue_script( 'sticky-kit', OPALESTATE_PLUGIN_URL . 'assets/js/jquery.sticky-kit.min.js' ); + + return opalestate_load_template_path( 'shortcodes/ajax-map-search', [ 'loop' => '' ] ); } - public function ajax_map_quick_search(){ - return opalestate_load_template_path( 'shortcodes/ajax-map-quick-search', array( 'loop' => '') ); + public function ajax_map_quick_search() { + return opalestate_load_template_path( 'shortcodes/ajax-map-quick-search', [ 'loop' => '' ] ); } /* register form show up */ - public function register_form( $atts = array() ) { - $atts = shortcode_atts( array( - 'message' => '', - 'redirect' => '', - 'hide_title' => false - ), $atts ); + public function register_form( $atts = [] ) { + $atts = shortcode_atts( [ + 'message' => '', + 'redirect' => '', + 'hide_title' => false, + ], $atts ); + return opalestate_load_template_path( 'user/register-form', $atts ); } /* sign in show up */ - public function login_form( $atts = array() ) { - $atts = shortcode_atts( array( - 'message' => '', - 'redirect' => '', - 'hide_title' => false - ), $atts ); + public function login_form( $atts = [] ) { + $atts = shortcode_atts( [ + 'message' => '', + 'redirect' => '', + 'hide_title' => false, + ], $atts ); + return opalestate_load_template_path( 'user/login-form', $atts ); } diff --git a/templates/shortcodes/properties.php b/templates/shortcodes/properties.php new file mode 100755 index 00000000..635a16a5 --- /dev/null +++ b/templates/shortcodes/properties.php @@ -0,0 +1,24 @@ + -1, +]; + +$query = Opalestate_Query::get_property_query( $args ); + +$class = 'column-item'; +?> + +
+ + have_posts() ): ?> + have_posts() ) : $query->the_post(); ?> +
+ +
+ + + + +
+