1.9.5

hyunsupul · Oct 26, 2016 · 9fbc77e · 9fbc77e
1 parent d54a3f6
commit 9fbc77e
Show file tree

Hide file tree

Showing 11 changed files with 784 additions and 505 deletions.
diff --git a/README.txt b/README.txt
@@ -1,12 +1,12 @@
 === Aesop Story Engine ===
 Contributors: nphaskins, etcio, michaelbeil, hyunster, peiche
-Author URI:  http://nickhaskins.com
+Author URI:  http://aesopstoryengine.com
 Plugin URI: http://aesopstoryengine.com
 Donate link: http://aesopstoryengine.com/donate
 Tags: aesop, story, business, education, parallax, interactive, shortcode, gallery, grid gallery, thumbnail gallery,
 Requires at least: 3.8
 Tested up to: 4.6.1
-Stable tag: 1.9.3
+Stable tag: 1.9.5
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -168,6 +168,15 @@ Full documentation can be found here: [http://aesopstoryengine.com/developers](h
 * Initial Release
 
 == Changelog ==
+= 1.9.5 =
+* NEW Image, Video, Chapter components have new option : Overlay Content. You can use HTML tags, like the overlay content for Hero Gallery and Parallax.
+* NEW Hero Gallery has an option to add navigation controls.
+
+= 1.9.4 =
+* NEW Image, Quote, Chapter and Video components have new option : Reveal Effect (Animation)
+* FIX Collection Component style fixes. Also added "Loading" text
+* Update POT file updated
+
 = 1.9.3 =
 * NEW Collection Component has an option to add "Load More" using AJAX
 * NEW Collection item adds "aesop-has-image" class if the post has featured image. (An improvement for styling customization.)

diff --git a/admin/includes/available.php b/admin/includes/available.php
@@ -46,20 +46,20 @@ function aesop_shortcodes( $shortcode = null ) {
 					'align'    => array(
 						'type'  => 'select',
 						'values'  => array(
+							array(
+								'value' => 'center',
+								'name' => __( 'Center', 'aesop-core' ),
+							),
 							array(
 								'value' => 'left',
 								'name' => __( 'Left', 'aesop-core' ),
 							),
 							array(
 								'value' => 'right',
 								'name' => __( 'Right', 'aesop-core' ),
-							),
-							array(
-								'value' => 'center',
-								'name' => __( 'Center', 'aesop-core' ),
 							)
 						),
-						'default'  => 'left',
+						'default'  => 'center',
 						'desc'   => __( 'Image Alignment', 'aesop-core' ),
 						'tip'  => __( 'How should the image be aligned? If using a caption, the caption will automatically align with this option.', 'aesop-core' )
 					),
@@ -104,7 +104,13 @@ function aesop_shortcodes( $shortcode = null ) {
 						'default'  => 'left',
 						'desc'   => __( 'Caption Position', 'aesop-core' ),
 						'tip'  => __( 'Use this to override the alignment as inherited from the image.', 'aesop-core' )
-					)
+					),
+					'overlay_content'     => array(
+						'type'  => 'text_area',
+						'default'  => '',
+						'desc'   => __( 'Overlay Content', 'aesop-core' ),
+						'tip'  => __( 'Text or HTML content to be overlayed. You can use tags like H2, H3 etc.', 'aesop-core' )
+					),
 
 				),
 				'desc'     => __( 'Creates an image component with caption, alignment, and lightbox options.', 'aesop-core' )
@@ -522,14 +528,20 @@ function aesop_shortcodes( $shortcode = null ) {
 						'type'  => 'color',
 						'default'  => '#888888',
 						'desc'   => __( 'Background Color', 'aesop-core' ),
-						'tip'  => __( 'Select a color for the background. Used only if the Background Type is set to Solid Color', 'aesop-core' )
+						'tip'  => __( 'Select a color for the background. Used ONLY IF the Background Type is set to Solid Color', 'aesop-core' )
 					),
 					'minheight'    => array(
 						'type'  => 'text_small',
-						'default'  => '260px',
+						'default'  => '',
 						'desc'   => __( 'Minimum Height', 'aesop-core' ),
 						'tip'  => __( 'You can enter the minimum height in number of pixels like <code>300px</code>.', 'aesop-core' )
 					),
+					'overlay_content'     => array(
+						'type'  => 'text_area',
+						'default'  => '',
+						'desc'   => __( 'Overlay Content', 'aesop-core' ),
+						'tip'  => __( 'Text or HTML content to be displayed. You can use tags like H2, H3 etc. Important: If set, it will not show title and subtitle. The chapter menu will still use what you put in for Title.', 'aesop-core' )
+					),
 				),
 				'desc'     => __( 'Creates the scroll to point, as a chapter heading.', 'aesop-core' )
 			),
@@ -874,6 +886,12 @@ function aesop_shortcodes( $shortcode = null ) {
 						'desc'   => __( 'Caption', 'aesop-core' ),
 						'tip'  => __( 'Optionally display a caption below the video.', 'aesop-core' )
 					),
+					'overlay_content'     => array(
+						'type'  => 'text_area',
+						'default'  => '',
+						'desc'   => __( 'Overlay Content', 'aesop-core' ),
+						'tip'  => __( 'Text or HTML content to be overlayed. You can use tags like H2, H3 etc.', 'aesop-core' )
+					),
 					'hosted'   => array(
 						'type'  => 'media_upload',
 						'default'  => '',

diff --git a/admin/includes/components/component-gallery.php b/admin/includes/components/component-gallery.php
@@ -250,6 +250,7 @@ public function render_options_box( $post ) {
 		$hero_trans  = $hero_trans ? $hero_trans: $thumb_trans;
 		$hero_speed  = get_post_meta( $id, 'aesop_hero_gallery_transition_speed', true );
 		$hero_speed  = $hero_trans ? $hero_speed: $thumb_speed;
+		$hero_enable_nav  = get_post_meta( $id, 'aesop_hero_gallery_enable_nav', true );
 
 ?>
 		<div class="ase-gallery-opts--global">
@@ -347,6 +348,10 @@ public function render_options_box( $post ) {
 				<p class="aesop-gallery-opts--desc"><?php _e( 'Content displayed within the Hero gallery. You can use HTML tags with classes and styles.', 'aesop-core' );?></p>
 				<textarea name="aesop_hero_gallery_content"><?php echo $hero_content; ?></textarea>
 			</div>
+			<div class="ase-gallery-opts--single">
+				<input type="checkbox" name="aesop_hero_gallery_enable_nav" <?php if ( $hero_enable_nav == true ) { ?>checked="checked"<?php } ?>>
+				<label for="aesop_hero_gallery_enable_nav"><?php _e( 'Enable Navigation Controls', 'aesop-core' );?></label>
+			</div>
 		</div>
 		<?php
 
@@ -399,6 +404,7 @@ public function save_gallery_box( $post_id, $post ) {
 		$hero_width_to_height_ratio = isset( $_POST['aesop_hero_gallery_height'] ) ? $_POST['aesop_hero_gallery_height'] : false;
         $hero_speed  = isset( $_POST['aesop_hero_gallery_transition_speed'] ) ? $_POST['aesop_hero_gallery_transition_speed'] : false;
         $hero_trans  = isset( $_POST['aesop_hero_gallery_transition'] ) ? $_POST['aesop_hero_gallery_transition'] : false;
+		$hero_enable_nav   = isset( $_POST['aesop_hero_gallery_enable_nav'] ) ? $_POST['aesop_hero_gallery_enable_nav'] : false;
 
 
 		// safe to proceed
@@ -431,6 +437,7 @@ public function save_gallery_box( $post_id, $post ) {
 		update_post_meta( $post_id, 'aesop_hero_gallery_height',  sanitize_text_field($hero_width_to_height_ratio) );
         update_post_meta( $post_id, 'aesop_hero_gallery_transition_speed', absint( $thumb_speed ) );
         update_post_meta( $post_id, 'aesop_hero_gallery_transition', sanitize_text_field( $hero_trans ) );
+		update_post_meta( $post_id, 'aesop_hero_gallery_enable_nav', sanitize_text_field( $hero_enable_nav ) );
 
 
 	}

diff --git a/aesop-core.php b/aesop-core.php
@@ -7,20 +7,20 @@
  * @author    Nick Haskins <nick@aesopinteractive.com>
  * @license   GPL-2.0+
  * @link      http://aesopinteractive.com
- * @copyright 2016 Hyun Supul
+ * @copyright 2016 Hyun Supul <hyun@aesopinteractive.com>
  *
  * @wordpress-plugin
  *  Plugin Name:       Aesop Story Engine
  *  Plugin URI:        http://aesopstoryengine.com
  *  Description:       Open-sourced suite of components that empower interactive storytelling.
- *  Version:           1.9.4
- *  Author:            Aesopinteractive LLC
+ *  Version:           1.9.5
+ *  Author:            Aesopinteractive 
  *  Author URI:        http://aesopstoryengine.com
  *  Text Domain:       aesop-core
  *  License:           GPL-2.0+
  *  License URI:       http://www.gnu.org/licenses/gpl-2.0.txt
  *  Domain Path:       /languages
- *  GitHub Plugin URI: https://github.com/bearded-avenger/aesop-core
+ *  GitHub Plugin URI: https://github.com/hyunsupul/aesop-core
  *   Github Branch:     dev
  */
 
@@ -30,7 +30,7 @@
 }
 
 // Set some constants
-define( 'AI_CORE_VERSION', '1.9.4' );
+define( 'AI_CORE_VERSION', '1.9.5' );
 define( 'AI_CORE_DIR', plugin_dir_path( __FILE__ ) );
 define( 'AI_CORE_URL', plugins_url( '', __FILE__ ) );
 
@@ -51,6 +51,10 @@
 
 add_action( 'plugins_loaded', array( 'Aesop_Core', 'get_instance' ) );
 
+/* the following lines prevent br and p tags inserted by WordPress into shortcode params */
+remove_filter( 'the_content', 'wpautop' );
+add_filter( 'the_content', 'wpautop' , 12);
+
 /*
  ----------------------------------------------------------------------------*
 * 	Dashboard and Administrative Functionality