Skip to content

Commit

Permalink
roll out updates
Browse files Browse the repository at this point in the history
  • Loading branch information
Evan Herman committed Jan 30, 2016
1 parent 98a3f28 commit 32d33fb
Show file tree
Hide file tree
Showing 4 changed files with 59 additions and 18 deletions.
14 changes: 13 additions & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Timeline Express v1.1.7.2
Timeline Express v1.1.7.7
================

Timeline express allows you to create a vertical animated and responsive timeline of posts , without writing a single line of code. Sweet!
Expand Down Expand Up @@ -289,6 +289,18 @@ Have an idea for a future release feature? I love hearing about new ideas! You c


### Changelog
###### 1.1.7.7 - January 30th, 2016
* Wrapped single announcement template date in `timeline_express_custom_date_format` filter to allow users to alter that, as well as the date in the timeline.

###### 1.1.7.6 - October 2nd, 2015
* Fixed issue with timeline icons not saving properly, and returning empty on the front end.

###### 1.1.7.5 - September 28th, 2015
* Fixed incorrect name for default icon dropdown.

###### 1.1.7.4 - September 18th, 2015
* Fixed adding custom fields and using an image as an icon (https://gist.github.com/EvanHerman/6bbc8de82f34b4cb3c5c#comments)

###### 1.1.7.3 - July 15th, 2015
* Remove duplicate date picker fields on announcements

Expand Down
36 changes: 25 additions & 11 deletions classes/class.timeline-express.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -237,9 +237,9 @@ function cmb2_render_callback_te_bootstrap_dropdown( $field, $escaped_value, $ob
* save our custom date time stamp
* since @v1.1.5
*/
function cmb2_validate_te_bootstrap_dropdown_callback( $override_value, $new ) {
if( isset( $new ) && $new != '' ){
return 'fa-'.trim($new);
function cmb2_validate_te_bootstrap_dropdown_callback( $override_value, $value ) {
if( isset( $value ) && $value != '' ){
return 'fa-'.trim($value);
}
return '-1';
}
Expand Down Expand Up @@ -589,11 +589,15 @@ public function cmb_timeline_announcement_metaboxes() {
$custom_fields = apply_filters( 'timeline_express_custom_fields', $custom_field );
$i = 0;
// first, check if any custom fields are defined...
if( !empty( $custom_fields ) ) {
if( ! empty( $custom_fields ) ) {
foreach( $custom_fields as $user_defined_field ) {
if( $custom_fields[$i]['name'] != '' ) {
$field_array[] = $custom_fields[$i];
}
// Email text field
$announcement_metabox->add_field( array(
'name' => $custom_fields[$i]['name'],
'desc' => $custom_fields[$i]['desc'],
'id' => $custom_fields[$i]['id'],
'type' => $custom_fields[$i]['type'],
) );
$i++;
}
}
Expand Down Expand Up @@ -829,14 +833,14 @@ function timeline_express_single_page_filter_the_content( $content ) {
$announcement_header_image = wp_get_attachment_image_src( $announcement_image_id[0] , 'timeline-express-announcement-header');
$custom_content .= '<img class="announcement-banner-image" src="' . esc_url ( $announcement_header_image[0] ) . '" alt="' . get_the_title( $post->ID ) . '">';
}
$custom_content .= '<strong class="timeline-express-single-page-announcement-date">' . __( 'Announcement Date' , 'timeline-express' ) . ' : ' . date( 'M j , Y' , $announcement_date ) . '</strong>';
$custom_content .= '<strong class="timeline-express-single-page-announcement-date">' . __( 'Announcement Date' , 'timeline-express' ) . ' : ' . date_i18n( apply_filters( 'timeline_express_custom_date_format' , get_option( 'date_format' ) ) , $announcement_date ) . '</strong>';
$custom_content .= $content;
if ( $referer != '' ) {
$custom_content .= '<a href="' . $referer . '" class="return-to-timeline"><i class="fa fa-chevron-left"></i> ' . __( 'Back' , 'timeline-express' ) . '</a>';
}
return $custom_content;
} else {
$custom_content = '<strong class="timeline-express-single-page-announcement-date">' . __( 'Announcement Date' , 'timeline-express' ) . ' : ' . date( 'M j , Y' , $announcement_date ) . '</strong>';
$custom_content = '<strong class="timeline-express-single-page-announcement-date">' . __( 'Announcement Date' , 'timeline-express' ) . ' : ' . date_i18n( apply_filters( 'timeline_express_custom_date_format' , get_option( 'date_format' ) ) , $announcement_date ) . '</strong>';
$custom_content .= $content;
if ( $referer != '' ) {
$custom_content .= '<a href="' . $referer . '" class="return-to-timeline"><i class="fa fa-chevron-left"></i> ' . __( 'Back' , 'timeline-express' ) . '</a>';
Expand Down Expand Up @@ -1339,9 +1343,19 @@ public function timeline_express_build_bootstrap_dropdown( $field, $meta ) {
.dropdown-toggle { background: transparent !important; border: 1px solid rgb(201, 201, 201) !important; }
.dropdown-toggle .caret { border-top-color: #333 !important; }
.ui-datepicker-prev:hover, .ui-datepicker-next:hover { cursor: pointer; }
</style>
</style>

<?php
// check which page were on, set name appropriately
if( isset( $field->args['id'] ) ) {
$field_name = $field->args['id'];
} else {
$field_name = 'default-announcement-icon';
}
?>

<!-- start the font awesome icon select -->
<select class="selectpicker" name="<?php echo $field->args['id']; ?>" id="<?php echo $field->args['id']; ?>">
<select class="selectpicker" name="<?php echo $field_name; ?>" id="default-announcement-icon>">

<?php
/* sort the bootstrap icons alphabetically */
Expand Down
23 changes: 19 additions & 4 deletions readme.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ Contributors: eherman24
Donate link: http://www.evan-herman.com/contact/?contact-reason=I%20want%20to%20make%20a%20donation%20for%20all%20your%20hard%20work
Tags: vertical, timeline, animated, css3, animations, evan, herman, evan herman, easy, time, line, font awesome, font, awesome, announcements, notifications, simple, events, calendar, scroll, triggered, scrolling, animated, fade, in, fade in
Requires at least: 3.9
Tested up to: 4.3
Stable tag: 1.1.7.3
Tested up to: 4.4.1
Stable tag: 1.1.7.7
License: GPLv2 or later

Timeline express allows you to create a beautiful vertical animated and responsive timeline of posts , without writing a single line of code. Sweet!
Expand Down Expand Up @@ -66,6 +66,8 @@ Looking for some advancedd documentation? Check out the <a href="https://wordpre
<br />
<strong>While the plugins I develop are free, maintaining and supporting them is hard work. If you find this plugin useful, or it helps in anyway, please consider making a <a href="http://www.evan-herman.com/contact/?contact-reason=I%20want%20to%20make%20a%20donation%20for%20all%20your%20hard%20work">donation</a> for its continued development.</strong>

<em>This plugin was originally inspired by the great folks at <a href="http://codyhouse.co/gem/vertical-timeline/">CodyHouse.io</a>.</em>

== Installation ==

1. Download the plugin .zip file
Expand All @@ -81,7 +83,7 @@ Looking for some advancedd documentation? Check out the <a href="https://wordpre

= Is there some demo I can checkout? I want to see how the plugin appears on the front end of a WordPress site before I install it. =

You can check out the demo we've setup for users displaying two seperate timelines with filtering enabled.
You can check out the demo we've set up for users displaying two separate timelines with filtering enabled.

<a href="http://www.evan-herman.com/wordpress/plugins/timeline-express-demo/" title="View the demo">View the Timeline Express Demo</a>

Expand Down Expand Up @@ -339,6 +341,18 @@ add_filter( 'timeline_express_custom_template' , 'custom_timeline_express_templa

== Changelog ==

= 1.1.7.7 - January 30th, 2016 =
* Wrapped single announcement template date in `timeline_express_custom_date_format` filter to allow users to alter that, as well as the date in the timeline.

= 1.1.7.6 - October 2nd, 2015 =
* Fixed issue with timeline icons not saving properly, and returning empty on the front end.

= 1.1.7.5 - September 28th, 2015 =
* Fixed incorrect name for default icon dropdown.

= 1.1.7.4 - September 18th, 2015 =
* Fixed adding custom fields and using an image as an icon (https://gist.github.com/EvanHerman/6bbc8de82f34b4cb3c5c#comments)

= 1.1.7.3 - July 15th, 2015 =
* Remove duplicate date picker fields on announcements

Expand Down Expand Up @@ -509,4 +523,5 @@ add_filter( 'timeline_express_custom_template' , 'custom_timeline_express_templa

== Upgrade Notice ==

* Remove duplicate date picker fields on announcements
= 1.1.7.7 - January 30th, 2016 =
* Wrapped single announcement template date in `timeline_express_custom_date_format` filter to allow users to alter that, as well as the date in the timeline.
4 changes: 2 additions & 2 deletions timeline-express.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
Plugin Name: Timeline Express
Plugin URI: http://www.evan-herman.com
Description: Create a beautiful vertical, CSS3 animated and responsive timeline in minutes flat without writing code.
Version: 1.1.7.3
Version: 1.1.7.7
Author: Evan Herman
Author URI: http://www.evan-herman.com
License: GPL2
Expand All @@ -28,7 +28,7 @@
#_________________________________________________ CONSTANTS
/** Configuration **/
if(!defined('TIMELINE_EXPRESS_VERSION_CURRENT')) define('TIMELINE_EXPRESS_VERSION_CURRENT', '1.1.7.3');
if(!defined('TIMELINE_EXPRESS_VERSION_CURRENT')) define('TIMELINE_EXPRESS_VERSION_CURRENT', '1.1.7.7');
if(!defined('TIMELINE_EXPRESS_PATH')) define('TIMELINE_EXPRESS_PATH', plugin_dir_path( __FILE__ ));
if(!defined('TIMELINE_EXPRESS_URL')) define('TIMELINE_EXPRESS_URL', plugins_url('timeline-express/'));
if(!defined('TIMELINE_EXPRESS_URL_WP')) define('TIMELINE_EXPRESS_URL_WP', get_bloginfo('url'));
Expand Down

0 comments on commit 32d33fb

Please sign in to comment.