Improved custom single listing page (sovware#1187)

ethanclevenger91 · Sep 11, 2022 · 875c5f3 · 875c5f3
1 parent 32f9047
commit 875c5f3
Show file tree

Hide file tree

Showing 9 changed files with 87 additions and 13 deletions.
diff --git a/assets/css/all-listings.css b/assets/css/all-listings.css
diff --git a/assets/css/all-listings.rtl.css b/assets/css/all-listings.rtl.css
@@ -11723,6 +11723,18 @@ input.directorist-toggle-input:checked + .directorist-toggle-input-label span.di
   color: #fff;
 }
 
+.directorist-single-dummy-shortcode {
+  width: 100%;
+  background-color: #556166;
+  color: #fff;
+  margin: 10px 0;
+  text-align: center;
+  padding: 40px 10px;
+  font-weight: 700;
+  font-size: 16px;
+  line-height: 1.2;
+}
+
 .directorist-signle-listing-top {
   margin-bottom: 15px;
 }

diff --git a/assets/css/public-main.css b/assets/css/public-main.css
diff --git a/assets/css/public-main.rtl.css b/assets/css/public-main.rtl.css
@@ -11723,6 +11723,18 @@ input.directorist-toggle-input:checked + .directorist-toggle-input-label span.di
   color: #fff;
 }
 
+.directorist-single-dummy-shortcode {
+  width: 100%;
+  background-color: #556166;
+  color: #fff;
+  margin: 10px 0;
+  text-align: center;
+  padding: 40px 10px;
+  font-weight: 700;
+  font-size: 16px;
+  line-height: 1.2;
+}
+
 .directorist-signle-listing-top {
   margin-bottom: 15px;
 }

diff --git a/assets/js/admin-main.js b/assets/js/admin-main.js
diff --git a/assets/src/scss/component/listing-details/_general.scss b/assets/src/scss/component/listing-details/_general.scss
@@ -174,4 +174,16 @@
             }
         }
     }
-}
+}
+
+.directorist-single-dummy-shortcode {
+    width: 100%;
+    background-color: #556166;
+    color: #fff;
+    margin: 10px 0;
+    text-align: center;
+    padding: 40px 10px;
+    font-weight: 700;
+    font-size: 16px;
+    line-height: 1.2;
+  }
diff --git a/includes/class-helper.php b/includes/class-helper.php
@@ -537,9 +537,23 @@ public static function featured_badge_text() {
 		return get_directorist_option('feature_badge_text', 'Featured');
 	}
 
+	public static function single_listing_dummy_shortcode( $shortcode, $atts = [] ) {
+		$atts_string = '';
+
+		if ( $atts ) {
+			foreach ( $atts as $key => $value ) {
+				$atts_string .= sprintf( ' %s="%s"', $key, $value );
+			}
+		}
+
+		return sprintf( '<div class="directorist-single-dummy-shortcode">%s%s</div>', $shortcode, $atts_string );
+	}
+
 	/**
 	 * Get a list of directories that has custom single listing page enabled and set.
 	 *
+	 * @todo remove this unused method
+	 *
 	 * @param  int|null $page_id Optional page id.
 	 *
 	 * @return array

diff --git a/includes/classes/class-shortcode.php b/includes/classes/class-shortcode.php
@@ -75,11 +75,11 @@ public function __construct() {
 		return self::$instance;
 	}
 
-	// single_listings_header
 	public function single_listings_header( $atts ) {
 
+		// Render dummy shortcode content when user isn't in single listing page
 		if ( !is_singular( ATBDP_POST_TYPE ) ) {
-			return '';
+			return Helper::single_listing_dummy_shortcode( 'directorist_single_listings_header', $atts );
 		}
 
 		$listing_id = ( isset( $atts['post_id'] ) && is_numeric( $atts['post_id'] ) ) ? ( int ) esc_attr( $atts['post_id'] ) : 0;
@@ -107,6 +107,12 @@ public function single_listings_header( $atts ) {
 	}
 
 	public function single_listing_section( $atts = array() ) {
+
+		// Render dummy shortcode content when user isn't in single listing page
+		if ( !is_singular( ATBDP_POST_TYPE ) ) {
+			return Helper::single_listing_dummy_shortcode( 'directorist_single_listing_section', $atts );
+		}
+
 		$listing_id = ( isset( $atts['post_id'] ) && is_numeric( $atts['post_id'] ) ) ? ( int ) esc_attr( $atts['post_id'] ) : 0;
 
 		if ( ! $listing_id ) {

diff --git a/includes/classes/class-template-hooks.php b/includes/classes/class-template-hooks.php
@@ -87,12 +87,6 @@ public static function single_content( $content ) {
 			return Helper::get_template_contents( 'single-contents' );
 		}
 
-		$directory_types = Helper::get_directory_types_with_custom_single_page( get_the_ID() );
-		if ( get_post_type() === 'page' && ! empty( $directory_types ) ) {
-			$directory_names = wp_list_pluck( $directory_types, 'name' );
-			return sprintf( __( '<p style="text-align:center" class="directorist-alert directorist-alert-info">This page is currently selected as single Listing details page for %s directory.</p>', 'directorist' ) , implode( ', ', $directory_names ) );
-		}
-
 		return $content;
 	}