Merge pull request #17 from EvanHerman/development

Merge v1.2.6 development branch into master

Gruntfile.js

@@ -85,7 +85,6 @@ module.exports = function(grunt) {
 	      files: {
 	        src: [
 						'lib/public/css/min/timeline-express.min.css',
-						'lib/public/css/min/timeline-express-single-page.min.css',
 						'lib/admin/css/min/timeline-express-admin.min.css',
 						'lib/public/js/min/timeline-express.min.js',
 						'lib/admin/js/min/timeline-express-tinymce.min.js',
@@ -106,10 +105,18 @@ module.exports = function(grunt) {
             src: ['lib/public/partials/timeline-express-container.php'],
             dest: 'templates/',
             filter: 'isFile'
-          }, {
+          },
+					{
+            expand: true,
+            flatten: true,
+            src: ['lib/public/partials/single-timeline-express-content.php'],
+            dest: 'templates/',
+            filter: 'isFile'
+          },
+					{
             expand: true,
             flatten: true,
-            src: ['lib/public/partials/single.timeline-express.php'],
+            src: ['lib/public/partials/single-timeline-express.php'],
             dest: 'templates/',
             filter: 'isFile'
           },

README.md

@@ -4,7 +4,7 @@
 [![Build Status](https://scrutinizer-ci.com/g/EvanHerman/Timeline-Express/badges/build.png?b=Refactor---v1.2)](https://scrutinizer-ci.com/g/EvanHerman/Timeline-Express/build-status/Refactor---v1.2)
 [![Project Stats](https://www.openhub.net/p/timeline-express/widgets/project_thin_badge.gif)](https://www.openhub.net/p/timeline-express)
 
-# Timeline Express - v1.2.5
+# Timeline Express - v1.2.6
 This repository is a re-factor of the original code base.
 
 [![WordPress plugin](https://img.shields.io/wordpress/plugin/v/timeline-express.svg?style=flat-square)](https://wordpress.org/plugins/timeline-express/)
@@ -25,9 +25,9 @@ Copy over `templates/timeline-express-container.php` into your theme root, in a
 ### Custom Single Announcement Template
 In version 1.2 users can now customize the single announcement template for each announcement on the timeline.
 
-Copy over `templates/single.timeline-express.php` into your theme root, in a `timeline-express` directory (`wp-content/themes/theme_name/timeline-express/single.timeline-express.php`), and start customizing.
+Copy over `templates/single-timeline-express.php` into your theme root, in a `timeline-express` directory (`wp-content/themes/theme_name/timeline-express/single-timeline-express.php`), and start customizing.
 
-Note: Out of the box, Timeline Express looks for a single.php template inside of your theme root. If one is not found, it will check for a page.php template. Additionally, you can create a template named `single-announcement-template.php` inside of a `timeline-express` directory in your theme root (`wp-content/themes/theme_name/timeline-express/single-announcement-template.php`) for full customization of the page template loaded.
+Or to quickly and easily get the timeline announcements to look the same as your current theme, you can duplicate your existing 'single.php' template file, place it in a 'timeline-express' directory in your theme root, and replace `get_template_part();` or `the_content();` with the following Timeline Express helper function `timeline_express_content();`. Once added you can save the file, and you're all set.
 
 ### Years Instead of Icons
 Many users have asked for the ability to display the year instead of displaying the Font Awesome icons. With version 1.2, we've built in support to allow users to quickly swap out the icons for the year by dropping a single line of code into the **functions.php** file of the active theme.

constants.php

@@ -14,7 +14,7 @@
  * Define the current version of Timeline Express
  */
 if ( ! defined( 'TIMELINE_EXPRESS_VERSION_CURRENT' ) ) {
-	define( 'TIMELINE_EXPRESS_VERSION_CURRENT', '1.2.5' );
+	define( 'TIMELINE_EXPRESS_VERSION_CURRENT', '1.2.6' );
 }
 
 /**

lib/admin/js/min/timeline-express-tinymce.min.js

@@ -2,7 +2,7 @@
  * @Plugin Timeline Express
  * @Author Code Parrots
  * @Site http://www.wp-timelineexpress.com
- * @Version 1.2.5
- * @Build 05-17-2016
+ * @Version 1.2.6
+ * @Build 05-18-2016
  */
 !function(){tinymce.PluginManager.add("timeline_express",function(a,b){function c(){this.disabled(!this.disabled()),a.insertContent("[timeline-express]")}a.on("keyup",function(){a.getContent().indexOf("[timeline-express]")>-1?a.controlManager.setDisabled("timeline_express_shortcode_button",!0):a.controlManager.setDisabled("timeline_express_shortcode_button",!1)}),a.addButton("timeline_express_shortcode_button",{title:"Timeline Express Shortcode",text:!1,image:b+"/../../images/timeline-express-menu-icon.png",onclick:c}),a.onSetContent.add(function(a,b){a.getContent().indexOf("[timeline-express]")>-1&&a.controlManager.setDisabled("timeline_express_shortcode_button",!0)})})}();

lib/classes/class.timeline-express-initialize.php

@@ -98,12 +98,12 @@ public function generate_timeline_express( $timeline_express_options, $atts ) {
 			while ( $announcement_query->have_posts() ) {
 				$announcement_query->the_post();
 				get_timeline_express_template( 'timeline-container' );
+				// reset the post data
+				wp_reset_postdata();
 			}
 			?>
 			</section>
 			<?php
-			// reset the post data
-			wp_reset_postdata();
 			// Action hook after timeline
 			do_action( 'timeline-express-after-timeline', $atts, self::timeline_express_query_args( $compare_sign, $atts['order'], $atts ), $announcement_query->found_posts );
 		} else {