diff --git a/Gruntfile.js b/Gruntfile.js index 5a7e14c..804cb78 100644 --- a/Gruntfile.js +++ b/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' }, diff --git a/README.md b/README.md index 9b87198..76ebcd5 100644 --- a/README.md +++ b/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. diff --git a/constants.php b/constants.php index c6ddd65..87333cd 100644 --- a/constants.php +++ b/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' ); } /** diff --git a/lib/admin/css/min/timeline-express-admin.min.css b/lib/admin/css/min/timeline-express-admin.min.css index f965c06..da12a5e 100644 --- a/lib/admin/css/min/timeline-express-admin.min.css +++ b/lib/admin/css/min/timeline-express-admin.min.css @@ -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 */ body.admin_page_timeline-express-welcome .slides ul li,body.admin_page_timeline-express-welcome .slides ul li h2.promo-text{-webkit-animation-duration:18s;-webkit-animation-timing-function:linear;-webkit-animation-iteration-count:infinite;-webkit-animation-direction:normal;-webkit-animation-play-state:running;-webkit-animation-fill-mode:forwards;-moz-animation-duration:18s;-moz-animation-timing-function:linear;-moz-animation-iteration-count:infinite;-moz-animation-direction:normal;-moz-animation-play-state:running;-moz-animation-fill-mode:forwards}.wp-core-ui .timeline-express-red-button{background-color:#9B2124;background-image:linear-gradient(to bottom,#C5292E,#9B2124);border-color:#9B2124 #9B2124 #8D1F21;box-shadow:inset 0 1px 0 rgba(120,200,230,.5);color:#fff;text-decoration:none;text-shadow:0 1px 0 rgba(0,0,0,.1);margin-left:2em;width:150px;text-align:center}.wp-core-ui .timeline-express-red-button.focus,.wp-core-ui .timeline-express-red-button.hover,.wp-core-ui .timeline-express-red-button:focus,.wp-core-ui .timeline-express-red-button:hover{background-color:#B72629;background-image:linear-gradient(to bottom,#D22E30,#9B2124);border-color:#7F1C1F;box-shadow:inset 0 1px 0 rgba(120,200,230,.6);color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,.3)}.wp-core-ui .timeline-express-red-button.focus,.wp-core-ui .timeline-express-red-button:focus{border-color:#500F0E;box-shadow:inset 0 1px 0 rgba(120,200,230,.6),1px 1px 2px rgba(0,0,0,.4)}.wp-core-ui .timeline-express-red-button.active,.wp-core-ui .timeline-express-red-button.active:focus,.wp-core-ui .timeline-express-red-button.active:hover,.wp-core-ui .timeline-express-red-button:active{background:#7F1C1F;background-image:linear-gradient(to bottom,#9B2124,#B72629);border-color:#601312 #AE2426 #AE2426;color:rgba(255,255,255,.95);box-shadow:inset 0 1px 0 rgba(0,0,0,.1);text-shadow:0 1px 0 rgba(0,0,0,.1)}.wp-core-ui .timeline-express-red-button-disabled,.wp-core-ui .timeline-express-red-button:disabled,.wp-core-ui .timeline-express-red-button[disabled]{color:#E79496!important;background:#BA292B!important;border-color:#7F1C1F!important;box-shadow:none!important;text-shadow:0 -1px 0 rgba(0,0,0,.1)!important;cursor:default}.delete-no:hover,.delete-yes:hover{cursor:pointer}#cmb2-metabox-timeline_express_ads .cmb2-id-announcement-advertisments{padding:0!important}#cmb2-metabox-timeline_express_ads p.description{margin:10px 0!important}#cmb2-metabox-timeline_express_ads a.button-primary{font-size:15px;height:auto;padding:3px;margin:0;width:100%;text-align:center}#timeline_express_ads{background:0 0;box-shadow:none;border:none}#timeline_express_ads .advertisment-link{display:block;width:100%;height:100%}#timeline_express_ads .button-primary,#timeline_express_ads .handlediv,#timeline_express_ads h2,#timeline_express_ads p.description,label[for=help_docs_metabox-hide],label[for=timeline_express_ads-hide],label[for=announcement_metabox-hide]{display:none!important}#timeline_express_ads .cmb-type-te-advert-metabox,#timeline_express_ads div.inside{margin:0;padding:0}div.cmb2-id-announcement-help-docs{padding-top:0!important;padding-bottom:0!important}#timeline-express-icon{background:url(../../images/timeline-express-logo-128.png) no-repeat;display:block;float:left;padding:0 0 0 .5em;height:90px;width:90px;background-size:contain}.wrap #timeline-express-page-header{margin:0}body.te_announcements_page_timeline-express-settings .wrap .postbox.ui-sortable-handle{border-radius:5px}.settings-header{display:inline-block;width:100%;padding-left:0!important}.timeline-express-settings-header{background:0 0;box-shadow:none;border:none}.wrap .nav-tab-wrapper{padding-top:2.5em}.wrap .account-nav-tab{padding-top:0}.random-length-text{opacity:.5}#timeline_express_review_this_plugin_container .fa-paypal{display:block;width:100%;font-size:16px;padding-top:4px;margin:0 auto!important;color:#253b80}.wrap #timeline_express_review_this_plugin_container{padding:.5em;float:right;margin-top:.75em}#timeline_express_review_this_plugin_container{display:inline-block}#timeline_express_review_this_plugin_container a,#timeline_express_review_this_plugin_container a:hover{color:#333}#timeline_express_review_this_plugin_container .timeline_express_header_logo,#timeline_express_review_this_plugin_container div,#timeline_express_review_this_plugin_container span{float:left;margin:0 .5em;text-align:center}#timeline_express_review_this_plugin_container div.dashicons{margin:0 5px}#timeline_express_review_this_plugin_container div.dashicons-plus-alt{display:block;width:100%;margin:0 auto;color:#a3c3b8}.timeline-express-form{margin-bottom:3em}.timeline-express-form th{font-weight:700}.timeline-express-settings-description{padding-bottom:2em!important;color:#A7A7A7;font-style:italic;font-size:10px}td.column-announcement_date .dashicons-arrow-right{line-height:2.9;display:inline-block;color:rgba(227,26,26,.68)}.delete-no:after{content:" no, save my announcements from being deleted. I'll need them again!"}.delete-yes:after{content:" yes, delete all of the announcement posts. they are dead to me."}.wp-picker-holder{position:absolute;z-index:99999999}#no-events-message_ifr{max-height:100px}.wp-list-table .no-items .colspanchange{text-align:center;height:115px;line-height:8;font-style:italic}.no-image-used-text{line-height:4.7}.wp-list-table .announcement_color_box{display:block;height:15px;width:15px;border:1px solid rgba(128,128,128,.22);padding:.5em;text-align:center;border-radius:50%}.wp-list-table .past_announcement{height:30px}.wp-list-table .edit-announcement-icon{font-size:25px!important;display:block}.wp-list-table .dashicon-past-announcement{font-size:30px!important;text-align:left}.wp-list-table img.attachment-timeline-express-thumbnail.size-timeline-express-thumbnail{max-width:180px;width:80%;height:auto}.dashicons-star-filled{color:#FEBE12}#timeline_express_reset_plugin_settings .dashicons-dismiss{float:left;margin-top:.5em;padding:.5em 1em 1em .5em;color:#f15353}body.admin_page_timeline-express-welcome .timeline-express-image{background:-moz-linear-gradient(top,rgba(206,220,231,.7) 0,rgba(89,106,114,.7) 100%);background-image:url(../images/welcome/background.png)}body.admin_page_timeline-express-welcome .timeline-screenshot{padding:1.5em 1.5em 0}body.admin_page_timeline-express-welcome .font-awesome-background{padding-top:3em;margin-top:1.5em;background-image:url(../images/welcome/Font-Awesome-Cheatsheet.png);background-size:cover;height:250px;text-align:center;line-height:8}body.admin_page_timeline-express-welcome .admin-manage-announcements,body.admin_page_timeline-express-welcome .customize-your-timeline,body.admin_page_timeline-express-welcome .intuitive-post-creation{margin-top:1.5em;background-size:contain;background-position:bottom center;background-repeat:no-repeat}body.admin_page_timeline-express-welcome .intuitive-post-creation{padding-top:3em;background-image:url(../images/welcome/intuitive-creation-screen.jpg);height:665px}body.admin_page_timeline-express-welcome .admin-manage-announcements{padding-top:3em;background-image:url(../images/welcome/Manage-Announcements.jpg);height:665px}body.admin_page_timeline-express-welcome .customize-your-timeline{padding-top:4%;background-image:url(../images/welcome/customize-your-timeline.jpg);height:665px}body.admin_page_timeline-express-welcome .slides{height:665px;overflow:hidden;position:relative;width:100%;padding:4% 0}body.admin_page_timeline-express-welcome .slides ul{list-style:none;position:relative}body.admin_page_timeline-express-welcome .slides ul li{width:100%;opacity:0;position:absolute;top:0;-webkit-animation-name:anim_slides;-webkit-animation-delay:0;-moz-animation-name:anim_slides;-moz-animation-delay:0}body.admin_page_timeline-express-welcome .slides ul li:nth-child(2),body.admin_page_timeline-express-welcome .slides ul li:nth-child(2) h2.promo-text{-webkit-animation-delay:6s;-moz-animation-delay:6s}body.admin_page_timeline-express-welcome .slides ul li:nth-child(3),body.admin_page_timeline-express-welcome .slides ul li:nth-child(3) h2.promo-text{-webkit-animation-delay:12s;-moz-animation-delay:12s}body.admin_page_timeline-express-welcome .slides ul li img{display:block}body.admin_page_timeline-express-welcome .slides ul li h2.promo-text{background-color:#000;border-radius:10px;box-shadow:0 0 3px #FFF inset;color:#FFF;font-size:18px;margin:0 auto;padding:10px;position:absolute;top:-35px;width:350px;text-align:center;-webkit-animation-name:anim_titles;-webkit-animation-delay:0;-moz-animation-name:anim_titles;-moz-animation-delay:0}.dashicons-heart{background:linear-gradient(top,#ff8cf7,#e2a5e0);-webkit-background-clip:text;-webkit-text-fill-color:transparent}#timeline-express-support-page-wrap{padding:2em}#timeline-express-support-page-wrap hr{margin:1.5em 0}#timeline-express-support-page-header{display:inline-block;width:100%}#timeline-express-support-page-header img.te-logo{max-width:128px;min-width:90px;width:20%;float:left}#timeline-express-support-page-header .support-subhead{display:block;margin:2em 0 0 1em;float:left;width:44%}#timeline-express-support-page-wrap #timeline_express_license_key{width:25%;min-width:400px}.timeline-express-valid-license{color:rgba(144,214,125,.68)}.purchase-support-license{margin-left:-.5em!important}#support-license-form p.description.license-error{color:rgba(225,47,47,.73)}#support-license-form p.description.license-active{color:rgba(46,102,31,.68)}#support-license-form .license-links a{text-decoration:none}.timeline-express-license-buttons{display:block;width:100%;margin-top:2em}.timeline-express-invalid-license-error{color:rgba(225,47,47,.73)}#premium-support-contact-form{float:left;width:33%;min-width:300px}#premium-support-contact-form form,#premium-support-contact-form form input,#premium-support-contact-form form label,#premium-support-contact-form form textarea{width:100%}#premium-support-contact-form form textarea{resize:vertical}#premium-support-contact-form form input[type=submit],#premium-support-contact-form form label{margin-top:1em;display:block}.license-expiring-soon{font-size:11px;color:#f34b4b;display:block}@media only screen and (max-width:1081px){#timeline_express_license_key{min-width:90%!important;width:90%!important}#premium-support-contact-form form input,#premium-support-contact-form form label,#premium-support-contact-form form textarea{width:100%}#premium-support-contact-form{margin:2em 0 0;float:left;width:100%}#timeline-express-support-page-wrap table.widefat.fixed{max-width:100%!important}#timeline-express-support-page-header .support-subhead{width:auto}#timeline-express-support-page-header .te-logo{min-width:140px!important;float:none!important;display:block;margin:0 auto}#timeline-express-support-page-header .support-subhead h1{line-height:1.2}}.about-wrap .timeline-express-badge{position:absolute;top:0;right:0;color:#999;font-size:14px;text-align:center;margin:5px 0 0;width:150px}.about-wrap .timeline-express-badge .version{display:block;margin:5px auto 0}.about-wrap .feature-section{padding:45px 0}.about-wrap .feature-section p{font-size:15px}.about-wrap .feature-section.two-col .col{vertical-align:top}.about-wrap .feature-section.two-col .col:nth-child(1){width:calc(65% - 4px)}.about-wrap .feature-section.two-col .col:nth-child(2){width:calc(30% - 4px);text-align:center;float:right}.about-wrap .timeline-express-features-button{font-size:14px;height:auto;padding:5px 15px;margin-top:10px}.about-wrap .feature-section .feature-video,.about-wrap .feature-section img{max-width:400px;width:100%}.about-wrap #timeline-express-addons .intro,.about-wrap #timeline-express-addons h1.page-title{display:none}#timeline-express-addons .timeline-express-clear:after,#timeline-express-addons .timeline-express-clear:before{content:" ";display:table}.about-wrap #timeline-express-addons .timeline-express-addon-item{max-width:100%}#timeline-express-addons .timeline-express-clear:after{clear:both}#timeline-express-addons .intro{margin-bottom:30px}.timeline-express-addons-basic-message{border:1px solid #ddd;padding:20px}.timeline-express-addons-basic-message h5{font-size:16px;font-weight:700;margin:0 0 15px}.timeline-express-addons-basic-message p{margin:0}.timeline-express-addons-unlock{margin:35px 0 25px}.timeline-express-addons-unlock h4{font-size:23px;font-weight:400;margin:0 0 6px;line-height:29px}.timeline-express-addons-unlock p{margin:0}.timeline-express-addon-item{background-color:#fff;border:1px solid #ddd;clear:right;min-height:118px;margin:0 0 18px;position:relative}.timeline-express-addon-image{float:left;height:92px;width:92px;border:1px solid #ddd;margin:12px 0 0 12px}.timeline-express-addon-image img{display:block;margin:0 auto;max-width:100%}.timeline-express-addon-text{margin:0 200px 0 126px;padding:22px 0}.timeline-express-addon-text h4{font-size:16px;font-weight:700;margin:0 0 8px}.timeline-express-addon-text p{margin:0}.timeline-express-addon-action{position:absolute;top:0;right:0;width:180px;height:100%;text-align:center;border-left:1px solid #ddd}.timeline-express-addon-action a,.timeline-express-addon-action button{font-size:14px;color:#fff;background-color:#0085ba;border:1px solid #006d98;text-decoration:none;width:130px;margin:40px auto 0;display:block;border-radius:5px;padding:10px 0;cursor:pointer}.timeline-express-addon-action a:hover,.timeline-express-addon-action button:hover{background-color:#006d98}.timeline-express-addon-status-active .timeline-express-addon-action{background-color:#edfaff}.timeline-express-addon-status-inactive .timeline-express-addon-action{background-color:#f5f6f7}.timeline-express-error{color:#b94a48;background-color:#f2dede;padding:8px}.timeline-express-success{color:#468847;background-color:#dff0d8;padding:8px}.timeline-express-addon-item,.timeline-express-addon-item.timeline-express-second{max-width:800px;width:100%;float:none}.timeline-express-addon-action .button-addon-installed,.timeline-express-addon-action .button-addon-installed:hover{opacity:.8;background:#FFB780;border:1px solid #9B6943;color:#333} \ No newline at end of file diff --git a/lib/admin/js/min/timeline-express-admin.min.js b/lib/admin/js/min/timeline-express-admin.min.js index 265c543..56d9203 100644 --- a/lib/admin/js/min/timeline-express-admin.min.js +++ b/lib/admin/js/min/timeline-express-admin.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 changeRandomTrimLengthCheckbox(){var a=jQuery('input[name="excerpt-random-length"]').prop("checked");"1"==a?(jQuery('input[name="excerpt-trim-length"]').fadeOut("fast",function(){jQuery('input[name="excerpt-random-length"]').css("margin-left","0em")}),jQuery("#random-lenth-text-container").removeClass("random-length-text")):(jQuery('input[name="excerpt-random-length"]').css("margin-left",".5em"),jQuery('input[name="excerpt-trim-length"]').fadeIn("fast"),jQuery("#random-lenth-text-container").addClass("random-length-text"))}function toggleDeleteCheckClass(){var a=jQuery('input[name="delete-announcement-posts-on-uninstallation"]').prop("checked");a===!0?(jQuery(".delete-no").addClass("delete-yes"),jQuery(".delete-yes").removeClass("delete-no")):(jQuery(".delete-yes").addClass("delete-no"),jQuery(".delete-no").removeClass("delete-yes"))}function toggle_delete_checkbox(){var a=jQuery('input[name="delete-announcement-posts-on-uninstallation"]').prop("checked");a===!1?(jQuery(".delete-no").addClass("delete-yes"),jQuery(".delete-yes").removeClass("delete-no"),jQuery('input[name="delete-announcement-posts-on-uninstallation"]').attr("checked",!0)):(jQuery(".delete-yes").addClass("delete-no"),jQuery(".delete-no").removeClass("delete-yes"),jQuery('input[name="delete-announcement-posts-on-uninstallation"]').attr("checked",!1))}!function(a){"use strict";function b(a,b){return a.toUpperCase().indexOf(b.toUpperCase())>-1}function c(b){var c=[{re:/[\xC0-\xC6]/g,ch:"A"},{re:/[\xE0-\xE6]/g,ch:"a"},{re:/[\xC8-\xCB]/g,ch:"E"},{re:/[\xE8-\xEB]/g,ch:"e"},{re:/[\xCC-\xCF]/g,ch:"I"},{re:/[\xEC-\xEF]/g,ch:"i"},{re:/[\xD2-\xD6]/g,ch:"O"},{re:/[\xF2-\xF6]/g,ch:"o"},{re:/[\xD9-\xDC]/g,ch:"U"},{re:/[\xF9-\xFC]/g,ch:"u"},{re:/[\xC7-\xE7]/g,ch:"c"},{re:/[\xD1]/g,ch:"N"},{re:/[\xF1]/g,ch:"n"}];return a.each(c,function(){b=b.replace(this.re,this.ch)}),b}function d(a){var b={"&":"&","<":"<",">":">",'"':""","'":"'","`":"`"},c="(?:"+Object.keys(b).join("|")+")",d=new RegExp(c),e=new RegExp(c,"g"),f=null==a?"":""+a;return d.test(f)?f.replace(e,function(a){return b[a]}):f}function e(b,c){var d=arguments,e=b,b=d[0],c=d[1];[].shift.apply(d),"undefined"==typeof b&&(b=e);var g,h=this.each(function(){var e=a(this);if(e.is("select")){var h=e.data("selectpicker"),i="object"==typeof b&&b;if(h){if(i)for(var j in i)i.hasOwnProperty(j)&&(h.options[j]=i[j])}else{var k=a.extend({},f.DEFAULTS,a.fn.selectpicker.defaults||{},e.data(),i);e.data("selectpicker",h=new f(this,k,c))}"string"==typeof b&&(g=h[b]instanceof Function?h[b].apply(h,d):h.options[b])}});return"undefined"!=typeof g?g:h}a.expr[":"].icontains=function(c,d,e){return b(a(c).text(),e[3])},a.expr[":"].aicontains=function(c,d,e){return b(a(c).data("normalizedText")||a(c).text(),e[3])};var f=function(b,c,d){d&&(d.stopPropagation(),d.preventDefault()),this.$element=a(b),this.$newElement=null,this.$button=null,this.$menu=null,this.$lis=null,this.options=c,null===this.options.title&&(this.options.title=this.$element.attr("title")),this.val=f.prototype.val,this.render=f.prototype.render,this.refresh=f.prototype.refresh,this.setStyle=f.prototype.setStyle,this.selectAll=f.prototype.selectAll,this.deselectAll=f.prototype.deselectAll,this.destroy=f.prototype.remove,this.remove=f.prototype.remove,this.show=f.prototype.show,this.hide=f.prototype.hide,this.init()};f.VERSION="1.6.3",f.DEFAULTS={noneSelectedText:"Nothing selected",noneResultsText:"No results match",countSelectedText:function(a,b){return 1==a?"{0} item selected":"{0} items selected"},maxOptionsText:function(a,b){var c=[];return c[0]=1==a?"Limit reached ({n} item max)":"Limit reached ({n} items max)",c[1]=1==b?"Group limit reached ({n} item max)":"Group limit reached ({n} items max)",c},selectAllText:"Select All",deselectAllText:"Deselect All",multipleSeparator:", ",style:"btn-default",size:"auto",title:null,selectedTextFormat:"values",width:!1,container:!1,hideDisabled:!1,showSubtext:!1,showIcon:!0,showContent:!0,dropupAuto:!0,header:!1,liveSearch:!1,actionsBox:!1,iconBase:"fa",tickIcon:"fa-ok",maxOptions:!1,mobile:!1,selectOnTab:!1,dropdownAlignRight:!1,searchAccentInsensitive:!1},f.prototype={constructor:f,init:function(){var b=this,c=this.$element.attr("id");this.$element.hide(),this.multiple=this.$element.prop("multiple"),this.autofocus=this.$element.prop("autofocus"),this.$newElement=this.createView(),this.$element.after(this.$newElement),this.$menu=this.$newElement.find("> .dropdown-menu"),this.$button=this.$newElement.find("> button"),this.$searchbox=this.$newElement.find("input"),this.options.dropdownAlignRight&&this.$menu.addClass("dropdown-menu-right"),"undefined"!=typeof c&&(this.$button.attr("data-id",c),a('label[for="'+c+'"]').click(function(a){a.preventDefault(),b.$button.focus()})),this.checkDisabled(),this.clickListener(),this.options.liveSearch&&this.liveSearchListener(),this.render(),this.liHeight(),this.setStyle(),this.setWidth(),this.options.container&&this.selectPosition(),this.$menu.data("this",this),this.$newElement.data("this",this),this.options.mobile&&this.mobile()},createDropdown:function(){var b=this.multiple?" show-tick":"",c=this.$element.parent().hasClass("input-group")?" input-group-btn":"",d=this.autofocus?" autofocus":"",e=this.$element.parents().hasClass("form-group-lg")?" btn-lg":this.$element.parents().hasClass("form-group-sm")?" btn-sm":"",f=this.options.header?'
'+this.options.header+"
":"",g=this.options.liveSearch?'
':"",h=this.options.actionsBox?'
":"",i='
'+f+g+h+'
';return a(i)},createView:function(){var a=this.createDropdown(),b=this.createLi();return a.find("ul").append(b),a},reloadLi:function(){this.destroyLi();var a=this.createLi();this.$menu.find("ul").append(a)},destroyLi:function(){this.$menu.find("li").remove()},createLi:function(){var b=this,e=[],f=0,g=function(a,b,c){return""+a+""},h=function(a,e,f,g){var h=c(d(a));return''+a+''};return this.$element.find("option").each(function(){var c=a(this),d=c.attr("class")||"",i=c.attr("style"),j=c.data("content")?c.data("content"):c.html(),k="undefined"!=typeof c.data("subtext")?''+c.data("subtext")+"":"",l="undefined"!=typeof c.data("icon")?' ':"",m=c.is(":disabled")||c.parent().is(":disabled"),n=c[0].index;if(""!==l&&m&&(l=""+l+""),c.data("content")||(j=l+''+j+k+""),!b.options.hideDisabled||!m)if(c.parent().is("optgroup")&&c.data("divider")!==!0){if(0===c.index()){f+=1;var o=c.parent().attr("label"),p="undefined"!=typeof c.parent().data("subtext")?''+c.parent().data("subtext")+"":"",q=c.parent().data("icon")?' ':"";o=q+''+o+p+"",0!==n&&e.length>0&&e.push(g("",null,"divider")),e.push(g(o,null,"dropdown-header"))}e.push(g(h(j,"opt "+d,i,f),n))}else c.data("divider")===!0?e.push(g("",n,"divider")):c.data("hidden")===!0?e.push(g(h(j,d,i),n,"hide is-hidden")):e.push(g(h(j,d,i),n))}),this.multiple||0!==this.$element.find("option:selected").length||this.options.title||this.$element.find("option").eq(0).prop("selected",!0).attr("selected","selected"),a(e.join(""))},findLis:function(){return null==this.$lis&&(this.$lis=this.$menu.find("li")),this.$lis},render:function(b){var c=this;b!==!1&&this.$element.find("option").each(function(b){c.setDisabled(b,a(this).is(":disabled")||a(this).parent().is(":disabled")),c.setSelected(b,a(this).is(":selected"))}),this.tabIndex();var e=this.options.hideDisabled?":not([disabled])":"",f=this.$element.find("option:selected"+e).map(function(){var b,d=a(this),e=d.data("icon")&&c.options.showIcon?' ':"";return b=c.options.showSubtext&&d.attr("data-subtext")&&!c.multiple?' '+d.data("subtext")+"":"",d.data("content")&&c.options.showContent?d.data("content"):"undefined"!=typeof d.attr("title")?d.attr("title"):e+d.html()+b}).toArray(),g=this.multiple?f.join(this.options.multipleSeparator):f[0];if(this.multiple&&this.options.selectedTextFormat.indexOf("count")>-1){var h=this.options.selectedTextFormat.split(">");if(h.length>1&&f.length>h[1]||1==h.length&&f.length>=2){e=this.options.hideDisabled?", [disabled]":"";var i=this.$element.find("option").not('[data-divider="true"], [data-hidden="true"]'+e).length,j="function"==typeof this.options.countSelectedText?this.options.countSelectedText(f.length,i):this.options.countSelectedText;g=j.replace("{0}",f.length.toString()).replace("{1}",i.toString())}}this.options.title=this.$element.attr("title"),"static"==this.options.selectedTextFormat&&(g=this.options.title),g||(g="undefined"!=typeof this.options.title?this.options.title:this.options.noneSelectedText),this.$button.attr("title",d(g)),this.$newElement.find(".filter-option").html(g)},setStyle:function(a,b){this.$element.attr("class")&&this.$newElement.addClass(this.$element.attr("class").replace(/selectpicker|mobile-device|validate\[.*\]/gi,""));var c=a?a:this.options.style;"add"==b?this.$button.addClass(c):"remove"==b?this.$button.removeClass(c):(this.$button.removeClass(this.options.style),this.$button.addClass(c))},liHeight:function(){if(this.options.size!==!1){var a=this.$menu.parent().clone().find("> .dropdown-toggle").prop("autofocus",!1).end().appendTo("body"),b=a.addClass("open").find("> .dropdown-menu"),c=b.find("li").not(".divider").not(".dropdown-header").filter(":visible").children("a").outerHeight(),d=this.options.header?b.find(".popover-title").outerHeight():0,e=this.options.liveSearch?b.find(".bs-searchbox").outerHeight():0,f=this.options.actionsBox?b.find(".bs-actionsbox").outerHeight():0;a.remove(),this.$newElement.data("liHeight",c).data("headerHeight",d).data("searchHeight",e).data("actionsHeight",f)}},setSize:function(){this.findLis();var b,c,d,e=this,f=this.$menu,g=f.find(".inner"),h=this.$newElement.outerHeight(),i=this.$newElement.data("liHeight"),j=this.$newElement.data("headerHeight"),k=this.$newElement.data("searchHeight"),l=this.$newElement.data("actionsHeight"),m=this.$lis.filter(".divider").outerHeight(!0),n=parseInt(f.css("padding-top"))+parseInt(f.css("padding-bottom"))+parseInt(f.css("border-top-width"))+parseInt(f.css("border-bottom-width")),o=this.options.hideDisabled?", .disabled":"",p=a(window),q=n+parseInt(f.css("margin-top"))+parseInt(f.css("margin-bottom"))+2,r=function(){c=e.$newElement.offset().top-p.scrollTop(),d=p.height()-c-h};if(r(),this.options.header&&f.css("padding-top",0),"auto"==this.options.size){var s=function(){var a,h=e.$lis.not(".hide");r(),b=d-q,e.options.dropupAuto&&e.$newElement.toggleClass("dropup",c>d&&b-q3?3*i+q-2:0,f.css({"max-height":b+"px",overflow:"hidden","min-height":a+j+k+l+"px"}),g.css({"max-height":b-j-k-l-n+"px","overflow-y":"auto","min-height":Math.max(a-n,0)+"px"})};s(),this.$searchbox.off("input.getSize propertychange.getSize").on("input.getSize propertychange.getSize",s),a(window).off("resize.getSize").on("resize.getSize",s),a(window).off("scroll.getSize").on("scroll.getSize",s)}else if(this.options.size&&"auto"!=this.options.size&&f.find("li"+o).length>this.options.size){var t=this.$lis.not(".divider"+o).find(" > *").slice(0,this.options.size).last().parent().index(),u=this.$lis.slice(0,t+1).filter(".divider").length;b=i*this.options.size+u*m+n,e.options.dropupAuto&&this.$newElement.toggleClass("dropup",c>d&&b .dropdown-menu").css("width"),c=a.css("width","auto").find("> button").css("width");a.remove(),this.$newElement.css("width",Math.max(parseInt(b),parseInt(c))+"px")}else"fit"==this.options.width?(this.$menu.css("min-width",""),this.$newElement.css("width","").addClass("fit-width")):this.options.width?(this.$menu.css("min-width",""),this.$newElement.css("width",this.options.width)):(this.$menu.css("min-width",""),this.$newElement.css("width",""));this.$newElement.hasClass("fit-width")&&"fit"!==this.options.width&&this.$newElement.removeClass("fit-width")},selectPosition:function(){var b,c,d=this,e="
",f=a(e),g=function(a){f.addClass(a.attr("class").replace(/form-control/gi,"")).toggleClass("dropup",a.hasClass("dropup")),b=a.offset(),c=a.hasClass("dropup")?0:a[0].offsetHeight,f.css({top:b.top+c,left:b.left,width:a[0].offsetWidth,position:"absolute"})};this.$newElement.on("click",function(){d.isDisabled()||(g(a(this)),f.appendTo(d.options.container),f.toggleClass("open",!a(this).hasClass("open")),f.append(d.$menu))}),a(window).resize(function(){g(d.$newElement)}),a(window).on("scroll",function(){g(d.$newElement)}),a("html").on("click",function(b){a(b.target).closest(d.$newElement).length<1&&f.removeClass("open")})},setSelected:function(a,b){this.findLis(),this.$lis.filter('[data-original-index="'+a+'"]').toggleClass("selected",b)},setDisabled:function(a,b){this.findLis(),b?this.$lis.filter('[data-original-index="'+a+'"]').addClass("disabled").find("a").attr("href","#").attr("tabindex",-1):this.$lis.filter('[data-original-index="'+a+'"]').removeClass("disabled").find("a").removeAttr("href").attr("tabindex",0)},isDisabled:function(){return this.$element.is(":disabled")},checkDisabled:function(){var a=this;this.isDisabled()?this.$button.addClass("disabled").attr("tabindex",-1):(this.$button.hasClass("disabled")&&this.$button.removeClass("disabled"),-1==this.$button.attr("tabindex")&&(this.$element.data("tabindex")||this.$button.removeAttr("tabindex"))),this.$button.click(function(){return!a.isDisabled()})},tabIndex:function(){this.$element.is("[tabindex]")&&(this.$element.data("tabindex",this.$element.attr("tabindex")),this.$button.attr("tabindex",this.$element.data("tabindex")))},clickListener:function(){var b=this;this.$newElement.on("touchstart.dropdown",".dropdown-menu",function(a){a.stopPropagation()}),this.$newElement.on("click",function(){b.setSize(),b.options.liveSearch||b.multiple||setTimeout(function(){b.$menu.find(".selected a").focus()},10)}),this.$menu.on("click","li a",function(c){var d=a(this),e=d.parent().data("originalIndex"),f=b.$element.val(),g=b.$element.prop("selectedIndex");if(b.multiple&&c.stopPropagation(),c.preventDefault(),!b.isDisabled()&&!d.parent().hasClass("disabled")){var h=b.$element.find("option"),i=h.eq(e),j=i.prop("selected"),k=i.parent("optgroup"),l=b.options.maxOptions,m=k.data("maxOptions")||!1;if(b.multiple){if(i.prop("selected",!j),b.setSelected(e,!j),d.blur(),l!==!1||m!==!1){var n=l
');q[2]&&(r=r.replace("{var}",q[2][l>1?0:1]),s=s.replace("{var}",q[2][m>1?0:1])),i.prop("selected",!1),b.$menu.append(t),l&&n&&(t.append(a("
"+r+"
")),b.$element.trigger("maxReached.bs.select")),m&&o&&(t.append(a("
"+s+"
")),b.$element.trigger("maxReachedGrp.bs.select")),setTimeout(function(){b.setSelected(e,!1)},10),t.delay(750).fadeOut(300,function(){a(this).remove()})}}}else h.prop("selected",!1),i.prop("selected",!0),b.$menu.find(".selected").removeClass("selected"),b.setSelected(e,!0);b.multiple?b.options.liveSearch&&b.$searchbox.focus():b.$button.focus(),(f!=b.$element.val()&&b.multiple||g!=b.$element.prop("selectedIndex")&&!b.multiple)&&b.$element.change()}}),this.$menu.on("click","li.disabled a, .popover-title, .popover-title :not(.close)",function(a){a.target==this&&(a.preventDefault(),a.stopPropagation(),b.options.liveSearch?b.$searchbox.focus():b.$button.focus())}),this.$menu.on("click","li.divider, li.dropdown-header",function(a){a.preventDefault(),a.stopPropagation(),b.options.liveSearch?b.$searchbox.focus():b.$button.focus()}),this.$menu.on("click",".popover-title .close",function(){b.$button.focus()}),this.$searchbox.on("click",function(a){a.stopPropagation()}),this.$menu.on("click",".actions-btn",function(c){b.options.liveSearch?b.$searchbox.focus():b.$button.focus(),c.preventDefault(),c.stopPropagation(),a(this).is(".bs-select-all")?b.selectAll():b.deselectAll(),b.$element.change()}),this.$element.change(function(){b.render(!1)})},liveSearchListener:function(){var b=this,e=a('
  • ');this.$newElement.on("click.dropdown.data-api touchstart.dropdown.data-api",function(){b.$menu.find(".active").removeClass("active"),b.$searchbox.val()&&(b.$searchbox.val(""),b.$lis.not(".is-hidden").removeClass("hide"),e.parent().length&&e.remove()),b.multiple||b.$menu.find(".selected").addClass("active"),setTimeout(function(){b.$searchbox.focus()},10)}),this.$searchbox.on("click.dropdown.data-api focus.dropdown.data-api touchend.dropdown.data-api",function(a){a.stopPropagation()}),this.$searchbox.on("input propertychange",function(){b.$searchbox.val()?(b.options.searchAccentInsensitive?b.$lis.not(".is-hidden").removeClass("hide").find("a").not(":aicontains("+c(b.$searchbox.val())+")").parent().addClass("hide"):b.$lis.not(".is-hidden").removeClass("hide").find("a").not(":icontains("+b.$searchbox.val()+")").parent().addClass("hide"),b.$menu.find("li").filter(":visible:not(.no-results)").length?e.parent().length&&e.remove():(e.parent().length&&e.remove(),e.html(b.options.noneResultsText+' "'+d(b.$searchbox.val())+'"').show(),b.$menu.find("li").last().after(e))):(b.$lis.not(".is-hidden").removeClass("hide"),e.parent().length&&e.remove()),b.$menu.find("li.active").removeClass("active"),b.$menu.find("li").filter(":visible:not(.divider)").eq(0).addClass("active").find("a").focus(),a(this).focus()})},val:function(a){return"undefined"!=typeof a?(this.$element.val(a),this.render(),this.$element):this.$element.val()},selectAll:function(){this.findLis(),this.$lis.not(".divider").not(".disabled").not(".selected").filter(":visible").find("a").click()},deselectAll:function(){this.findLis(),this.$lis.not(".divider").not(".disabled").filter(".selected").filter(":visible").find("a").click()},keydown:function(b){var d,e,f,g,h,i,j,k,l,m=a(this),n=m.is("input")?m.parent().parent():m.parent(),o=n.data("this"),p={32:" ",48:"0",49:"1",50:"2",51:"3",52:"4",53:"5",54:"6",55:"7",56:"8",57:"9",59:";",65:"a",66:"b",67:"c",68:"d",69:"e",70:"f",71:"g",72:"h",73:"i",74:"j",75:"k",76:"l",77:"m",78:"n",79:"o",80:"p",81:"q",82:"r",83:"s",84:"t",85:"u",86:"v",87:"w",88:"x",89:"y",90:"z",96:"0",97:"1",98:"2",99:"3",100:"4",101:"5",102:"6",103:"7",104:"8",105:"9"};if(o.options.liveSearch&&(n=m.parent().parent()),o.options.container&&(n=o.$menu),d=a("[role=menu] li a",n),l=o.$menu.parent().hasClass("open"),!l&&/([0-9]|[A-z])/.test(String.fromCharCode(b.keyCode))&&(o.options.container?o.$newElement.trigger("click"):(o.setSize(),o.$menu.parent().addClass("open"),l=!0),o.$searchbox.focus()),o.options.liveSearch&&(/(^9$|27)/.test(b.keyCode.toString(10))&&l&&0===o.$menu.find(".active").length&&(b.preventDefault(),o.$menu.parent().removeClass("open"),o.$button.focus()),d=a("[role=menu] li:not(.divider):not(.dropdown-header):visible",n),m.val()||/(38|40)/.test(b.keyCode.toString(10))||0===d.filter(".active").length&&(d=o.options.searchAccentInsensitive?o.$newElement.find("li").filter(":aicontains("+c(p[b.keyCode])+")"):o.$newElement.find("li").filter(":icontains("+p[b.keyCode]+")"))),d.length){if(/(38|40)/.test(b.keyCode.toString(10)))e=d.index(d.filter(":focus")),g=d.parent(":not(.disabled):visible").first().index(),h=d.parent(":not(.disabled):visible").last().index(),f=d.eq(e).parent().nextAll(":not(.disabled):visible").eq(0).index(),i=d.eq(e).parent().prevAll(":not(.disabled):visible").eq(0).index(),j=d.eq(f).parent().prevAll(":not(.disabled):visible").eq(0).index(),o.options.liveSearch&&(d.each(function(b){a(this).is(":not(.disabled)")&&a(this).data("index",b)}),e=d.index(d.filter(".active")),g=d.filter(":not(.disabled):visible").first().data("index"),h=d.filter(":not(.disabled):visible").last().data("index"),f=d.eq(e).nextAll(":not(.disabled):visible").eq(0).data("index"),i=d.eq(e).prevAll(":not(.disabled):visible").eq(0).data("index"),j=d.eq(f).prevAll(":not(.disabled):visible").eq(0).data("index")),k=m.data("prevIndex"),38==b.keyCode&&(o.options.liveSearch&&(e-=1),e!=j&&e>i&&(e=i),g>e&&(e=g),e==k&&(e=h)),40==b.keyCode&&(o.options.liveSearch&&(e+=1),-1==e&&(e=0),e!=j&&f>e&&(e=f),e>h&&(e=h),e==k&&(e=g)),m.data("prevIndex",e),o.options.liveSearch?(b.preventDefault(),m.is(".dropdown-toggle")||(d.removeClass("active"),d.eq(e).addClass("active").find("a").focus(),m.focus())):d.eq(e).focus();else if(!m.is("input")){var q,r,s=[];d.each(function(){a(this).parent().is(":not(.disabled)")&&a.trim(a(this).text().toLowerCase()).substring(0,1)==p[b.keyCode]&&s.push(a(this).parent().index())}),q=a(document).data("keycount"),q++,a(document).data("keycount",q),r=a.trim(a(":focus").text().toLowerCase()).substring(0,1),r!=p[b.keyCode]?(q=1,a(document).data("keycount",q)):q>=s.length&&(a(document).data("keycount",0),q>s.length&&(q=1)),d.eq(s[q-1]).focus()}(/(13|32)/.test(b.keyCode.toString(10))||/(^9$)/.test(b.keyCode.toString(10))&&o.options.selectOnTab)&&l&&(/(32)/.test(b.keyCode.toString(10))||b.preventDefault(),o.options.liveSearch?/(32)/.test(b.keyCode.toString(10))||(o.$menu.find(".active a").click(),m.focus()):a(":focus").click(),a(document).data("keycount",0)),(/(^9$|27)/.test(b.keyCode.toString(10))&&l&&(o.multiple||o.options.liveSearch)||/(27)/.test(b.keyCode.toString(10))&&!l)&&(o.$menu.parent().removeClass("open"),o.$button.focus())}},mobile:function(){this.$element.addClass("mobile-device").appendTo(this.$newElement),this.options.container&&this.$menu.hide()},refresh:function(){this.$lis=null,this.reloadLi(),this.render(),this.setWidth(),this.setStyle(),this.checkDisabled(),this.liHeight()},update:function(){this.reloadLi(),this.setWidth(),this.setStyle(),this.checkDisabled(),this.liHeight()},hide:function(){this.$newElement.hide()},show:function(){this.$newElement.show()},remove:function(){this.$newElement.remove(),this.$element.remove()}};var g=a.fn.selectpicker;a.fn.selectpicker=e,a.fn.selectpicker.Constructor=f,a.fn.selectpicker.noConflict=function(){return a.fn.selectpicker=g,this},a(document).data("keycount",0).on("keydown",".bootstrap-select [data-toggle=dropdown], .bootstrap-select [role=menu], .bs-searchbox input",f.prototype.keydown).on("focusin.modal",".bootstrap-select [data-toggle=dropdown], .bootstrap-select [role=menu], .bs-searchbox input",function(a){a.stopPropagation()}),a(window).on("load.bs.select.data-api",function(){a(".selectpicker").each(function(){var b=a(this);e.call(b,b.data())})})}(jQuery),jQuery(document).ready(function(){jQuery(".color-picker-field").length&&(jQuery(".color-picker-field").wpColorPicker(),jQuery(".meta-box-sortables").sortable({disabled:!0}),jQuery(".postbox .hndle").css("cursor","pointer"))}); \ No newline at end of file diff --git a/lib/admin/js/min/timeline-express-tinymce.min.js b/lib/admin/js/min/timeline-express-tinymce.min.js index 164b433..94fb212 100644 --- a/lib/admin/js/min/timeline-express-tinymce.min.js +++ b/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)})})}(); \ No newline at end of file diff --git a/lib/classes/class.timeline-express-initialize.php b/lib/classes/class.timeline-express-initialize.php index ae5a7a7..ed36102 100644 --- a/lib/classes/class.timeline-express-initialize.php +++ b/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(); } ?> found_posts ); } else { diff --git a/lib/classes/class.timeline-express-public.php b/lib/classes/class.timeline-express-public.php index 7ed0773..d9ac64c 100644 --- a/lib/classes/class.timeline-express-public.php +++ b/lib/classes/class.timeline-express-public.php @@ -20,8 +20,7 @@ public function __construct() { /* load a custom page template (override the default) */ add_filter( 'single_template', array( $this, 'timeline_express_announcement_single_page_template' ) ); /* Filter the single announcement content. */ - add_action( 'loop_start', array( $this, 'condition_to_timeline_content' ) ); - add_filter( 'the_content', array( $this, 'timeline_express_single_page_content' ), 0 ); + // add_filter( 'the_content', array( $this, 'timeline_express_single_page_content' ) ); /* Enqueue single announcement template styles */ add_action( 'wp_enqueue_scripts', array( $this, 'timeline_express_single_template_styles' ) ); } @@ -56,18 +55,14 @@ public function process_timeline_express_shortcode( $atts ) { */ public function timeline_express_announcement_single_page_template( $single_template ) { global $post; - if ( ! isset( $post->post_type ) && 'te_announcements' !== $post->post_type ) { + if ( ! isset( $post->post_type ) || 'te_announcements' !== $post->post_type ) { return $single_template; } /* If custom template file exists */ - if ( file_exists( get_stylesheet_directory() . '/timeline-express/single-announcement-template.php' ) ) { - $single_template = get_stylesheet_directory() . '/timeline-express/single-announcement-template.php'; - } else if ( file_exists( get_stylesheet_directory() . 'single.php' ) ) { - /* If single.php exists */ - $single_template = get_stylesheet_directory() . 'single.php'; - } else if ( file_exists( get_stylesheet_directory() . 'page.php' ) ) { - /* If page.php exists */ - $single_template = get_stylesheet_directory() . 'page.php'; + if ( file_exists( get_stylesheet_directory() . '/timeline-express/single-timeline-express.php' ) ) { + $single_template = get_stylesheet_directory() . '/timeline-express/single-timeline-express.php'; + } else { + $single_template = TIMELINE_EXPRESS_PATH . 'lib/public/partials/single-timeline-express.php'; } /** * Return our template, passed through filters @@ -76,22 +71,6 @@ public function timeline_express_announcement_single_page_template( $single_temp return apply_filters( 'timeline_express_single_page_template', apply_filters( 'timeline-express-single-page-template', $single_template ) ); } - /** - * Conditional to check which page is being displayed - * - This allows for the proper template - * - This fixes single templates loading in place of the timeline-container template - * when the timeline is displayed inside of a post. - * @param $query array Query object used as the conditional. - * @return null Filter to use when displaying the content. - * @since 1.2.3 - */ - public function condition_to_timeline_content( $query ) { - global $wp_query; - if ( $query !== $wp_query ) { - remove_filter( 'the_content', array( $this, 'timeline_express_single_page_content' ) ); - } - } - /** * Filter the content, and load our template in it's place. * @param array $the_content The page content to filter. @@ -102,22 +81,16 @@ public function timeline_express_single_page_content( $the_content ) { global $post, $wp_query; $post_id = ( isset( $post->ID ) ) ? $post->ID : ''; // When this is not a single post, or it is and it isn't an announcement, abort - if ( ! is_singular() || 'te_announcements' !== $post->post_type || in_the_loop() || ! is_main_query() ) { + if ( 'te_announcements' !== $post->post_type || ! is_page() ) { return $the_content; } - // setup the post data - the_post(); ob_start(); - /* Store the announcement content from the WYSIWYG editor */ - $announcement_content = $the_content; /* Include the single template */ get_timeline_express_template( 'single-announcement' ); /* Return the output buffering */ $the_content = ob_get_clean(); - // reset the post data - wp_reset_postdata(); /* Return announcement meta & append the announcement content */ - return apply_filters( 'timeline_express_single_content', $the_content . $announcement_content, $post_id ); + return $the_content; } /** diff --git a/lib/helpers.php b/lib/helpers.php index 0cae820..c38c77f 100644 --- a/lib/helpers.php +++ b/lib/helpers.php @@ -278,7 +278,7 @@ function get_timeline_express_template( $template_name = 'timeline-container' ) $file_name = 'timeline-express-container'; break; case 'single-announcement': - $file_name = 'single.timeline-express'; + $file_name = 'single-timeline-express-content'; break; } // check for and load file @@ -289,6 +289,19 @@ function get_timeline_express_template( $template_name = 'timeline-container' ) include( TIMELINE_EXPRESS_PATH . 'lib/public/partials/' . $file_name . '.php' ); } +/** + * Helper function to retreive the timeline express single announcement templates + * This is redundant, but will be easier for our users to use in their themes + */ +function timeline_express_content() { + // check for and load file + if ( file_exists( get_stylesheet_directory() . '/timeline-express/single-timeline-express-content.php' ) ) { + include( get_stylesheet_directory() . '/timeline-express/single-timeline-express-content.php' ); + return; + } + include( TIMELINE_EXPRESS_PATH . 'lib/public/partials/single-timeline-express-content.php' ); +} + /** * Helper function used to clear out the timeline express transients * This is fired when the settings are saved, and when an announcement is updated/published @@ -407,17 +420,6 @@ function timeline_express_get_announcement_date( $post_id ) { return apply_filters( 'timeline_express_frontend_date_filter', date_i18n( apply_filters( 'timeline_express_custom_date_format', get_option( 'date_format' ) ), get_post_meta( $post_id, 'announcement_date', true ) ), get_post_meta( $post_id, 'announcement_date', true ) ); } -/** - * Retreive the timeline express announcement content. - * Note: Cannot be used on the single announcement template. - * @param int $post_id The announcement (post) ID whos content you want to retreive. - * @return array The announcement content, passed through the_content() filter. - */ -function timeline_express_get_announcement_content( $post_id ) { - $announcement_object = get_post( $post_id ); - return ( isset( $announcement_object->post_content ) ) ? $announcement_object->post_content : ''; -} - /** * Get the announcement excerpt * @param int $post_id The announcement (post) ID whos excerpt you want to retreive. diff --git a/lib/public/css/min/timeline-express-single-page.min.css b/lib/public/css/min/timeline-express-single-page.min.css deleted file mode 100644 index 38a4c05..0000000 --- a/lib/public/css/min/timeline-express-single-page.min.css +++ /dev/null @@ -1,8 +0,0 @@ -/* - * @Plugin Timeline Express - * @Author Code Parrots - * @Site http://www.wp-timelineexpress.com - * @Version 1.2.5 - * @Build 05-17-2016 - */ -body.single-te_announcements .timeline-express-single-page-announcement-date{display:block;margin:.5em 0}body.single-te_announcements .timeline-express-single-page-content{margin:.5em 0 1em} diff --git a/lib/public/css/min/timeline-express.min.css b/lib/public/css/min/timeline-express.min.css index 1bc3df0..0c117d5 100644 --- a/lib/public/css/min/timeline-express.min.css +++ b/lib/public/css/min/timeline-express.min.css @@ -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 */ -.cd-container{width:100%;margin:0 auto}.cd-container::after{content:'';display:table;clear:both}.cd-timeline-announcement-image{box-shadow:none!important;width:100%;display:block;margin:1em auto}#cd-timeline{position:relative;padding:2em 0;margin-top:2em;margin-bottom:3em;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";filter:alpha(opacity=0);-moz-opacity:0;-khtml-opacity:0;opacity:0}#cd-timeline::before{content:'';position:absolute;top:0;left:18px;height:100%;width:4px;background:#d7e4ed}.cd-timeline-block:after,.cd-timeline-content:after{content:"";clear:both}.announcement-banner-image{width:100%;margin-bottom:5px;border-radius:3px}.timeline-express-single-page-announcement-date{display:block;margin-bottom:1em}@media only screen and (min-width:822px){#cd-timeline{margin-top:3em;margin-bottom:5.5em}#cd-timeline::before{left:50%;margin-left:-2px}}.cd-timeline-block{margin:25px 0}.cd-timeline-block:after{display:table}.cd-timeline-block:first-child{margin-top:0}.cd-timeline-block:last-child{margin-bottom:0}@media only screen and (min-width:822px){.cd-timeline-block{width:100%;margin:-3.5em 0}.cd-timeline-block:first-child{margin-top:0}.cd-timeline-block:last-child{margin-bottom:0}}.cd-timeline-img{position:absolute;top:-5px;left:-10px;height:55px;width:55px;border-radius:50%;box-shadow:0 0 0 4px #fff,inset 0 2px 0 rgba(0,0,0,.08),0 3px 0 4px rgba(0,0,0,.05)}.cd-timeline-img span.year{display:inline-block;width:100%;height:100%;text-align:center;line-height:55px}.cd-timeline-img img{display:block;position:relative;left:50%;top:50%;margin-left:-12px;margin-top:-12px}.cd-timeline-img.cd-picture{background:#75ce66}.cd-timeline-img.cd-movie{background:#c03b44}.cd-timeline-img.cd-location{background:#f0ca45}@media only screen and (min-width:822px){.cd-timeline-img{width:60px;height:60px;left:50%;margin-left:-30px;-webkit-transform:translateZ(0);-webkit-backface-visibility:hidden}.cd-timeline-img span.year{display:inline-block;width:100%;height:100%;line-height:60px;text-align:center}.cssanimations .cd-timeline-img.is-hidden{visibility:hidden}.cssanimations .cd-timeline-img.bounce-in{visibility:visible;animation:cd-bounce-1 .6s}}@keyframes cd-bounce-1{0%{opacity:0;transform:scale(.5)}60%{opacity:1;transform:scale(1.2)}100%{transform:scale(1)}}.cd-timeline-content{position:relative;margin-left:60px;background:#fff;border-radius:.25em;padding:1em;box-shadow:0 3px 0 #B9C5CD;box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;-ms-box-sizing:border-box}.cd-timeline-content:after{display:table}.cd-timeline-content .timeline-express-read-more-link{position:relative;z-index:9999}.cd-timeline-content .cd-date{float:left;padding:.8em 0;opacity:.7;font-size:12px}.cd-timeline-title-container{display:inline-block;width:100%;float:left}.cd-timeline-title-container+.the-excerpt,.cd-timeline-title-container+img{margin-top:5px}.cd-timeline-content .timeline-date{display:block;margin:5px 0}.cd-timeline-content::before{content:'';position:absolute;top:16px;right:100%;height:0;width:0;border:12px solid transparent}@media only screen and (min-width:768px){.cd-timeline-content h2{margin-top:0;margin-bottom:0}.cd-timeline-content .the-excerpt{position:relative;display:block;float:left;width:100%;z-index:9}.cd-timeline-content .cd-date,.cd-timeline-content .timeline-express-read-more-link{position:relative;z-index:10}}@media only screen and (min-width:822px){.cd-timeline-content{margin-left:0;padding:1.6em;width:42.5%;background:#EFEFEF}.cd-timeline-content::before{top:12px;left:100%;border-color:transparent transparent transparent #EFEFEF}.cd-timeline-content .cd-date{position:absolute;width:100%;left:125%;top:15px}.cd-timeline-block:nth-child(even) .cd-timeline-content{float:right}.cd-timeline-block:nth-child(even) .cd-timeline-content::before{top:12px;left:auto;right:100%;border-color:transparent #EFEFEF transparent transparent}.cd-timeline-block:nth-child(even) .cd-timeline-content .cd-date{left:auto;right:125%;text-align:right}.cssanimations .cd-timeline-content.is-hidden{visibility:hidden}.cssanimations .cd-timeline-content.bounce-in{visibility:visible;animation:cd-bounce-2 .6s}.cssanimations .cd-timeline-block:nth-child(even) .cd-timeline-content.bounce-in{animation:cd-bounce-2-inverse .6s}}@keyframes cd-bounce-2{0%{opacity:0;transform:translateX(-100px)}60%{opacity:1;transform:translateX(20px)}100%{transform:translateX(0)}}@keyframes cd-bounce-2-inverse{0%{opacity:0;transform:translateX(100px)}60%{opacity:1;transform:translateX(-20px)}100%{transform:translateX(0)}}.more-to-come-container{position:relative;background:#EFEFEF;display:block;width:100%;text-align:center}.more-to-come{margin:10em 0 0;padding:1em 0;font-weight:200;color:rgba(100,100,100,.46)}.page article.page{background:0 0!important;box-shadow:none;border:none;-webkit-box-shadow:none}#cd-timeline span.fa{color:#fff;font-size:28px;display:block;text-align:center;margin-top:17px}.cd-timeline-icon-link{color:#fff!important}@media only screen and (max-width:821px){#cd-timeline span.fa{color:#fff;font-size:24px;display:block;text-align:center;margin-top:15px}.cd-timeline-block:nth-child(even) .cd-timeline-content .timeline-express-read-more-link,.cd-timeline-block:nth-child(odd) .cd-timeline-content .timeline-express-read-more-link{position:relative;z-index:10}.cd-timeline-content::before{border:9px solid transparent}}.timeline-width100{width:100%}.timeline-width34{width:34%}.timeline-width30{width:30%}.timeline-date-left{width:100%;float:left!important}body.single-te_announcements .timeline-express-single-page-announcement-date{display:block;margin:.5em 0}body.single-te_announcements .timeline-express-single-page-content{margin:.5em 0 1em}body.single-te_announcements nav.navigation.post-navigation{display:none} \ No newline at end of file +.cd-container{width:100%;margin:0 auto}.cd-container::after{content:'';display:table;clear:both}.cd-timeline-announcement-image{box-shadow:none!important;width:100%;display:block;margin:1em auto}#cd-timeline{position:relative;padding:2em 0;margin-top:2em;margin-bottom:3em;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";filter:alpha(opacity=0);-moz-opacity:0;-khtml-opacity:0;opacity:0}#cd-timeline::before{content:'';position:absolute;top:0;left:18px;height:100%;width:4px;background:#d7e4ed}.cd-timeline-block:after,.cd-timeline-content:after{content:"";clear:both}.announcement-banner-image{width:100%;margin-bottom:5px;border-radius:3px}.timeline-express-single-page-announcement-date{display:block;margin-bottom:1em}@media only screen and (min-width:822px){#cd-timeline{margin-top:3em;margin-bottom:5.5em}#cd-timeline::before{left:50%;margin-left:-2px}}.cd-timeline-block{margin:25px 0}.cd-timeline-block:after{display:table}.cd-timeline-block:first-child{margin-top:0}.cd-timeline-block:last-child{margin-bottom:0}@media only screen and (min-width:822px){.cd-timeline-block{width:100%;margin:-3.5em 0}.cd-timeline-block:first-child{margin-top:0}.cd-timeline-block:last-child{margin-bottom:0}}.cd-timeline-img{position:absolute;top:-5px;left:-10px;height:55px;width:55px;border-radius:50%;box-shadow:0 0 0 4px #fff,inset 0 2px 0 rgba(0,0,0,.08),0 3px 0 4px rgba(0,0,0,.05)}.cd-timeline-img span.year{display:inline-block;width:100%;height:100%;text-align:center;line-height:55px}.cd-timeline-img img{display:block;position:relative;left:50%;top:50%;margin-left:-12px;margin-top:-12px}.cd-timeline-img.cd-picture{background:#75ce66}.cd-timeline-img.cd-movie{background:#c03b44}.cd-timeline-img.cd-location{background:#f0ca45}@media only screen and (min-width:822px){.cd-timeline-img{width:60px;height:60px;left:50%;margin-left:-30px;-webkit-transform:translateZ(0);-webkit-backface-visibility:hidden}.cd-timeline-img span.year{display:inline-block;width:100%;height:100%;line-height:60px;text-align:center}.cssanimations .cd-timeline-img.is-hidden{visibility:hidden}.cssanimations .cd-timeline-img.bounce-in{visibility:visible;animation:cd-bounce-1 .6s}}@keyframes cd-bounce-1{0%{opacity:0;transform:scale(.5)}60%{opacity:1;transform:scale(1.2)}100%{transform:scale(1)}}.cd-timeline-content{position:relative;margin-left:60px;background:#fff;border-radius:.25em;padding:1em;box-shadow:0 3px 0 #B9C5CD;box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;-ms-box-sizing:border-box}.cd-timeline-content:after{display:table}.cd-timeline-content .timeline-express-read-more-link{position:relative;z-index:9999}.cd-timeline-content .cd-date{float:left;padding:.8em 0;opacity:.7;font-size:12px}.cd-timeline-title-container{display:inline-block;width:100%;float:left}.cd-timeline-title-container+.the-excerpt,.cd-timeline-title-container+img{margin-top:5px}.cd-timeline-content .timeline-date{display:block;margin:5px 0}.cd-timeline-content::before{content:'';position:absolute;top:16px;right:100%;height:0;width:0;border:12px solid transparent}@media only screen and (min-width:768px){.cd-timeline-content h2{margin-top:0;margin-bottom:0}.cd-timeline-content .the-excerpt{position:relative;display:block;float:left;width:100%;z-index:9}.cd-timeline-content .cd-date,.cd-timeline-content .timeline-express-read-more-link{position:relative;z-index:10}}@media only screen and (min-width:822px){.cd-timeline-content{margin-left:0;padding:1.6em;width:42.5%;background:#EFEFEF}.cd-timeline-content::before{top:12px;left:100%;border-color:transparent transparent transparent #EFEFEF}.cd-timeline-content .cd-date{position:absolute;width:100%;left:125%;top:15px}.cd-timeline-block:nth-child(even) .cd-timeline-content{float:right}.cd-timeline-block:nth-child(even) .cd-timeline-content::before{top:12px;left:auto;right:100%;border-color:transparent #EFEFEF transparent transparent}.cd-timeline-block:nth-child(even) .cd-timeline-content .cd-date{left:auto;right:125%;text-align:right}.cssanimations .cd-timeline-content.is-hidden{visibility:hidden}.cssanimations .cd-timeline-content.bounce-in{visibility:visible;animation:cd-bounce-2 .6s}.cssanimations .cd-timeline-block:nth-child(even) .cd-timeline-content.bounce-in{animation:cd-bounce-2-inverse .6s}}@keyframes cd-bounce-2{0%{opacity:0;transform:translateX(-100px)}60%{opacity:1;transform:translateX(20px)}100%{transform:translateX(0)}}@keyframes cd-bounce-2-inverse{0%{opacity:0;transform:translateX(100px)}60%{opacity:1;transform:translateX(-20px)}100%{transform:translateX(0)}}.more-to-come-container{position:relative;background:#EFEFEF;display:block;width:100%;text-align:center}.more-to-come{margin:10em 0 0;padding:1em 0;font-weight:200;color:rgba(100,100,100,.46)}.page article.page{background:0 0!important;box-shadow:none;border:none;-webkit-box-shadow:none}#cd-timeline span.fa{color:#fff;font-size:28px;display:block;text-align:center;margin-top:17px}.cd-timeline-icon-link{color:#fff!important}@media only screen and (max-width:821px){#cd-timeline span.fa{color:#fff;font-size:24px;display:block;text-align:center;margin-top:15px}.cd-timeline-block:nth-child(even) .cd-timeline-content .timeline-express-read-more-link,.cd-timeline-block:nth-child(odd) .cd-timeline-content .timeline-express-read-more-link{position:relative;z-index:10}.cd-timeline-content::before{border:9px solid transparent}}.timeline-width100{width:100%}.timeline-width34{width:34%}.timeline-width30{width:30%}.timeline-date-left{width:100%;float:left!important}body.single-te_announcements .timeline-express-content-area{width:100%}body.single-te_announcements .timeline-express-main{max-width:960px}body.single-te_announcements .timeline-express-single-page-announcement-date{display:block;margin:.5em 0}body.single-te_announcements .timeline-express-single-page-content{margin:.5em 0 1em}body.single-te_announcements nav.navigation.post-navigation{display:none} \ No newline at end of file diff --git a/lib/public/css/timeline-express-single-page.css b/lib/public/css/timeline-express-single-page.css index 42a2917..8ca8145 100644 --- a/lib/public/css/timeline-express-single-page.css +++ b/lib/public/css/timeline-express-single-page.css @@ -1,3 +1,11 @@ +body.single-te_announcements .timeline-express-content-area { + width: 100%; +} + + body.single-te_announcements .timeline-express-main { + max-width: 960px; + } + body.single-te_announcements .timeline-express-single-page-announcement-date { display: block; margin: .5em 0; @@ -10,4 +18,5 @@ body.single-te_announcements .timeline-express-single-page-content { body.single-te_announcements nav.navigation.post-navigation { display: none; } -/*# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInRpbWVsaW5lLWV4cHJlc3Mtc2luZ2xlLXBhZ2UuY3NzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBO0NBQ0EsZUFBQTtDQUNDLGVBQVk7Q0FDWjs7QUFFRDtDQUNBLHFCQUFBO0NBQ0M7O0FBRUQ7Q0FDQSxjQUFBO0NBQ0MiLCJmaWxlIjoidGltZWxpbmUtZXhwcmVzcy1zaW5nbGUtcGFnZS5jc3MiLCJzb3VyY2VzQ29udGVudCI6WyIvKiBTaW5nbGUtdGVfYW5ub3VuY2VtZW50cyBTdHlsZXMgKi9cbi5zaW5nbGUtdGVfYW5ub3VuY2VtZW50cyBpbWcuYW5ub3VuY2VtZW50LWJhbm5lci1pbWFnZSB7XG5cdGZsb2F0OiBsZWZ0O1xuXHRtYXJnaW46IDVweCAxNXB4IDE1cHggMDtcbn0iXX0= */ \ No newline at end of file + +/*# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInRpbWVsaW5lLWV4cHJlc3Mtc2luZ2xlLXBhZ2UuY3NzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBO0NBQ0EsWUFBQTtDQUNDOztDQUVEO0VBQ0EsaUJBQUE7RUFDQTs7QUFFQTtDQUNBLGVBQUE7Q0FDQSxlQUFBO0NBQ0M7O0FBRUQ7Q0FDQyxxQkFBYztDQUNkOztBQUVEO0NBQ0MsY0FBYztDQUNkIiwiZmlsZSI6InRpbWVsaW5lLWV4cHJlc3Mtc2luZ2xlLXBhZ2UuY3NzIiwic291cmNlc0NvbnRlbnQiOlsiLyogU2luZ2xlLXRlX2Fubm91bmNlbWVudHMgU3R5bGVzICovXG4uc2luZ2xlLXRlX2Fubm91bmNlbWVudHMgaW1nLmFubm91bmNlbWVudC1iYW5uZXItaW1hZ2Uge1xuXHRmbG9hdDogbGVmdDtcblx0bWFyZ2luOiA1cHggMTVweCAxNXB4IDA7XG59Il19 */ \ No newline at end of file diff --git a/lib/public/css/timeline-express.css b/lib/public/css/timeline-express.css index 5d66430..6aa8813 100644 --- a/lib/public/css/timeline-express.css +++ b/lib/public/css/timeline-express.css @@ -354,5 +354,4 @@ width: 100%; float: left !important; } - /*# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["timeline-express.css"],"names":[],"mappings":"AAAA;EACE,YAAY;EACZ,eAAA;CACD;AACD;EACA,YAAA;EACA,eAAA;EACE,YAAA;CACD;AACD;EACA,2BAAA;EACE,YAAA;EACD,eAAA;EACD,iBAAA;CACC;AACD;EACA,mBAAA;EACC,eAAA;EACD,gBAAA;EACA,mBAAA;EACE,qBAAE;EACF,UAAA;EACA,iEAAA;EACD,YAAA;EACD,yBAAA;EACC,cAAA;EACA,gBAAA;EACA,gBAAY;EACZ,kBAAA;EACA,mBAAA;EACA,WAAA;CACA;AACD;EACA,YAAA;EACC,mBAAA;EACA,OAAA;EACD,WAAA;EACE,aAAA;EACA,WAAA;EACA,oBAAS;CACV;AACD;EACA,YAAA;CACC,mBAAC;CACD,mBAAA;CACA;AACD;EACA,eAAA;EACE,mBAAA;CACD;AACD;EACA;IACE,gBAAA;IACF,qBAAA;GACG;EACD;IACA,UAAA;IACF,kBAAA;GACG;CACF;AACD;EACA,eAAA;CACC;AACD;EACA,YAAA;EACE,eAAA;EACA,YAAA;CACD;AACD;EACA,cAAA;CACC;AACD;EACA,iBAAA;CACC;AACD;EACA;IACE,YAAA;IACD,iBAAA;GACE;EACD;IACA,cAAA;GACC;EACD;IACA,iBAAA;GACC;CACF;AACD;EACA,mBAAA;EACE,UAAA;EACA,YAAA;CACD,aAAC;CACD,YAAA;EACA,mBAAC;EACF,8FAAA;CACC;AACD;CACA,sBAAA;CACC,YAAA;CACA,aAAA;CACA,mBAAA;CACA,kBAAA;CACA;AACD;EACA,eAAA;EACC,mBAAA;EACA,UAAA;EACD,SAAA;EACC,mBAAA;EACA,kBAAA;CACA;AACD;EACA,oBAAA;CACC;AACD;EACA,oBAAA;CACC;AACD;EACA,oBAAA;CACC;AACD;EACA;IACE,YAAA;IACD,aAAA;IACD,UAAA;IACA,mBAAA;IACE,iCAAA;IACD,oCAAA;GACE;CACF;EACA,sBAAA;EACC,YAAA;EACA,aAAA;EACA,kBAAA;EACA,mBAAA;EACA;EACA;IACA,mBAAA;GACC;EACD;IACA,oBAAA;IAEA,2BAAA;GACC;CACF;AAcD;EACA;IACE,WAAA;IAEF,sBAAA;GACG;EACD;IACA,WAAA;IAEA,sBAAA;GACC;EACD;IAEC,oBAAA;GACA;CACF;AACD;EACA,mBAAA;EACE,kBAAA;EACD,iBAAA;EACC,qBAAA;EACA,aAAA;EACA,4BAAA;CACD,sBAAA;CACD,2BAAA;CACC,8BAAA;CACA,0BAAA;CACA;AACD;EACA,YAAA;EACC,eAAA;EACA,YAAA;CACA;AACD;EACA,mBAAA;EACC,cAAA;CACA;AACD;EACA,YAAA;EACA,gBAAA;EACC,YAAA;EACD,gBAAA;CACC;AACD;EACA,sBAAA;EACA,YAAA;EACC,YAAA;CACA;AACD,4EAAA;AACA;CACC,gBAAA;CACD;AACA,0EAAA;AAhBA;CAkBC,gBAAA;CACA;AACD;EACA,eAAA;CAhBC,cAiBD;CAhBC;AACD;EAkBC,YAAA;EACD,mBAAA;EACA,UAAA;EACC,YAAA;EACD,UAAA;EACE,SAAA;EAhBA,+BAiBA;CAhBD;AACD;EAkBE;IACA,cAAA;IACA,iBAAA;GAhBC;EACD;EACA,mBAiBA;IACC,eAAA;IACD,YAAA;IACD,YAAA;IACD,WAAA;GACE;EACD;IACD,mBAAA;IACE,YAAA;GAhBC;CACF;AACD;EACE;IAkBC,eAAA;IACD,eAAA;IACC,aAAA;IACD,oBAAA;GAhBC;EACD;IAkBA,UAAA;IACA,WAAA;IACC,0DAAA;GAhBA;EACD;IAkBA,mBAAA;IACA,YAAA;IACA,WAAA;IACC,UAAA;GACD;EAhBA;IAkBA,aAAA;GAhBC;EACD;IAkBC,UAAA;IACD,WAAA;IACC,YAAA;IACD,0DAAA;GAhBC;EACD;IAkBA,WAAA;IACA,YAAA;IACC,kBAAA;GACD;EAhBA;IAmBF,mBAAA;GACE;EACD;IACD,oBAAA;IACE,2BAAA;GAjBC;CACF;AACD;EAiCA;IACE,mCAAA;GA/BC;CACF;AACD;EAkCE;IACC,WAAA;IAED,8BAAA;GACC;EACD;IAEF,WAAA;IACE,4BAAA;GACD;EAcD;IACE,yBAAA;GA/CC;CACF;AACD;EAkDE;IACC,WAAA;IAED,6BAAA;GACC;EACD;IAEF,WAAA;IACE,6BAAA;GACD;EACD;IACE,yBAAF;GACE;CAlDD;AACD;EAoDA,mBAAA;EACC,oBAAA;EACD,eAAA;EACA,YAAA;EACC,mBAAA;CAlDA;AACD;EAoDC,iBAAA;EACD,eAAA;EACA,iBAAA;EACC,gCAAA;CAlDA;AACD;EAoDC,0BAAA;EACD,iBAAA;EACA,aAAA;EACC,yBAAA;CAlDA;AACD;EAoDA,YAAA;EACC,gBAAA;EACD,eAAA;EACA,mBAAA;EACC,iBAAA;CACD;AAlDA;EACE,uBAmDF;CAlDC;AACD;EACE;IAoDE,YAAA;IACD,gBAAA;IACD,eAAA;IAlDE,mBAAmB;IAoDtB,iBAAA;GAlDE;EACD;;IAqDF,mBAAA;IACE,YAAA;GACD;CACD;EACA,8BAAA;EACA;CACA;AAlDA;EAoDC,WAAA;CACD;AAlDA;EAoDC,UAAA;CACD;AAlDA;EAoDE,UAAA;CACD;AAlDD;EACE,YAAY;EACZ,uBAAuB;CACxB","file":"timeline-express.css","sourcesContent":["/* Timeline Express Styles 1.1.6.6 */\n/*\tBy Evan Herman (http://www.evan-herman.com */\n/* -------------------------------------------------- */\n.cd-container {\n    width: 100%;\n    max-width: 822px;\n    margin: 0 auto;\n}\n.cd-container::after {\n    content: '';\n    display: table;\n    clear: both;\n}\n.cd-timeline-announcement-image {\n    box-shadow: none!important;\n    width: 100%;\n    display: block;\n    margin: 1em auto;\n}\n#cd-timeline {\n    position: relative;\n    padding: 2em 0;\n    margin-top: 2em;\n    margin-bottom: 3em;\n\t/* @since v1.1.5.7 */\n\t/* IE 8 */\n\t-ms-filter: \"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)\";\n\t/* IE 5-7 */\n\tfilter: alpha(opacity=0);\n\t/* Netscape */\n\t-moz-opacity: 0;\n\t/* Safari 1.x */\n\t-khtml-opacity: 0;\n\t/* Good browsers */\n\topacity: 0;\n}\n#cd-timeline::before {\n    content: '';\n    position: absolute;\n    top: 0;\n    left: 18px;\n    height: 100%;\n    width: 4px;\n    background: #d7e4ed;\n}\n.announcement-banner-image {\n    width: 100%}\n.timeline-express-single-page-announcement-date {\n    display: block;\n    margin-bottom: 1em;\n}\n@media only screen and (min-width:822px) {\n    #cd-timeline {\n    margin-top: 3em;\n    margin-bottom: 5.5em;\n}\n#cd-timeline::before {\n    left: 50%;\n    margin-left: -2px;\n}\n}.cd-timeline-block {\n    margin: 25px 0;\n}\n.cd-timeline-block:after {\n    content: \"\";\n    display: table;\n    clear: both;\n}\n.cd-timeline-block:first-child {\n    margin-top: 0;\n}\n.cd-timeline-block:last-child {\n    margin-bottom: 0;\n}\n@media only screen and (min-width:822px) {\n    .cd-timeline-block {\n    width: 100%;\n    margin: -3.5em 0;\n}\n.cd-timeline-block:first-child {\n    margin-top: 0;\n}\n.cd-timeline-block:last-child {\n    margin-bottom: 0;\n}\n}.cd-timeline-img {\n    position: absolute;\n    top: 0;\n    left: 0;\n    width: 40px;\n    height: 40px;\n    border-radius: 50%;\n    box-shadow: 0 0 0 4px white, inset 0 2px 0 rgba(0, 0, 0, .08), 0 3px 0 4px rgba(0, 0, 0, .05);\n}\n.cd-timeline-img img {\n    display: block;\n    width: 24px;\n    height: 24px;\n    position: relative;\n    left: 50%;\n    top: 50%;\n    margin-left: -12px;\n    margin-top: -12px;\n}\n.cd-timeline-img.cd-picture {\n    background: #75ce66;\n}\n.cd-timeline-img.cd-movie {\n    background: #c03b44;\n}\n.cd-timeline-img.cd-location {\n    background: #f0ca45;\n}\n@media only screen and (min-width:822px) {\n    .cd-timeline-img {\n    width: 60px;\n    height: 60px;\n    left: 50%;\n    margin-left: -30px;\n    -webkit-transform: translateZ(0);\n    -webkit-backface-visibility: hidden;\n}\n.cssanimations .cd-timeline-img.is-hidden {\n    visibility: hidden;\n}\n.cssanimations .cd-timeline-img.bounce-in {\n    visibility: visible;\n    -webkit-animation: cd-bounce-1 .6s;\n    -moz-animation: cd-bounce-1 .6s;\n    animation: cd-bounce-1 .6s;\n}\n}@-webkit-keyframes cd-bounce-1 {\n    0% {\n    opacity: 0;\n    -webkit-transform: scale(0.5);\n}\n60% {\n    opacity: 1;\n    -webkit-transform: scale(1.2);\n}\n100% {\n    -webkit-transform: scale(1);\n}\n}@-moz-keyframes cd-bounce-1 {\n    0% {\n    opacity: 0;\n    -moz-transform: scale(0.5);\n}\n60% {\n    opacity: 1;\n    -moz-transform: scale(1.2);\n}\n100% {\n    -moz-transform: scale(1);\n}\n}@keyframes cd-bounce-1 {\n    0% {\n    opacity: 0;\n    -webkit-transform: scale(0.5);\n    -moz-transform: scale(0.5);\n    -ms-transform: scale(0.5);\n    -o-transform: scale(0.5);\n    transform: scale(0.5);\n}\n60% {\n    opacity: 1;\n    -webkit-transform: scale(1.2);\n    -moz-transform: scale(1.2);\n    -ms-transform: scale(1.2);\n    -o-transform: scale(1.2);\n    transform: scale(1.2);\n}\n100% {\n    -webkit-transform: scale(1);\n    -moz-transform: scale(1);\n    -ms-transform: scale(1);\n    -o-transform: scale(1);\n    transform: scale(1);\n}\n}.cd-timeline-content {\n    position: relative;\n    margin-left: 60px;\n    background: #fff;\n    border-radius: .25em;\n    padding: 1em;\n    box-shadow: 0 3px 0 #B9C5CD;\n}\n.cd-timeline-content:after {\n    content: \"\";\n    display: table;\n    clear: both;\n}\n.cd-timeline-content .cd-date, .cd-timeline-content .cd-read-more {\n    display: inline-block;\n}\n.cd-timeline-content .cd-read-more {\n    padding: .8em 1em;\n    position: relative;\n    z-index: 9999;\n}\n.cd-timeline-content .cd-date {\n    float: left;\n    padding: .8em 0;\n    opacity: .7;\n    font-size: 12px;\n}\n.cd-timeline-title-container {\n    display: inline-block;\n    width: 100%;\n    float: left;\n    margin: .55em 0;\n}\n.cd-timeline-title-container h2 {\n    float: left;\n}\n.cd-timeline-content .timeline-date {\n    opacity: .7;\n    font-size: .857143rem;\n    float: right;\n    margin-top: .5em;\n}\n.cd-timeline-content::before {\n    content: '';\n    position: absolute;\n    top: 16px;\n    right: 100%;\n    height: 0;\n    width: 0;\n    border: 7px solid transparent;\n    border-right: 7px solid #fff;\n}\n@media only screen and (min-width:768px) {\n    .cd-timeline-content h2 {\n    margin-top: 0;\n    margin-bottom: 0;\n}\n.cd-timeline-content .the-excerpt {\n    display: block;\n    float: left;\n    width: 100%;\n    margin: 1em 0;\n\tposition: relative;\n\tz-index: 999;\n}\n.cd-timeline-content .cd-date, .cd-timeline-content .cd-read-more {\n    font-size: 14px;\n    font-size: .875rem;\n\tposition: relative;\n\tz-index: 999;\n}\n}@media only screen and (min-width:822px) {\n    .cd-timeline-content {\n    margin-left: 0;\n    padding: 1.6em;\n    width: 39%;\n    background: #EFEFEF;\n}\n.cd-timeline-content::before {\n    top: 24px;\n    left: 100%;\n    border-color: transparent transparent transparent #EFEFEF;\n}\n.cd-timeline-content .cd-read-more {\n    float: left;\n    color: #333;\n}\n.cd-timeline-content .cd-date {\n    position: absolute;\n    width: 100%;\n    left: 125%;\n    top: 15px;\n}\n.cd-timeline-block:nth-child(even) .cd-timeline-content {\n    float: right;\n}\n.cd-timeline-block:nth-child(even) .cd-timeline-content::before {\n    top: 24px;\n    left: auto;\n    right: 100%;\n    border-color: transparent #EFEFEF transparent transparent;\n}\n.cd-timeline-block:nth-child(even) .cd-timeline-content .cd-read-more {\n    float: right;\n    color: #333;\n    padding-right: 0;\n}\n.cd-timeline-block:nth-child(odd) .cd-timeline-content .cd-read-more {\n    position: relative;\n    z-index: 99999;\n    padding-left: 0;\n}\n.cd-timeline-block:nth-child(even) .cd-timeline-content .cd-date {\n    left: auto;\n    right: 125%;\n    text-align: right;\n}\n.cssanimations .cd-timeline-content.is-hidden {\n    visibility: hidden;\n}\n.cssanimations .cd-timeline-content.bounce-in {\n    visibility: visible;\n    -webkit-animation: cd-bounce-2 .6s;\n    -moz-animation: cd-bounce-2 .6s;\n    animation: cd-bounce-2 .6s;\n}\n}@media only screen and (min-width:822px) {\n    .cssanimations .cd-timeline-block: nth-child(even) .cd-timeline-content.bounce-in {\n    -webkit-animation: cd-bounce-2-inverse .6s;\n    -moz-animation: cd-bounce-2-inverse .6s;\n    animation: cd-bounce-2-inverse .6s;\n}\n}@-webkit-keyframes cd-bounce-2 {\n    0% {\n    opacity: 0;\n    -webkit-transform: translateX(-100px);\n}\n60% {\n    opacity: 1;\n    -webkit-transform: translateX(20px);\n}\n100% {\n    -webkit-transform: translateX(0);\n}\n}@-moz-keyframes cd-bounce-2 {\n    0% {\n    opacity: 0;\n    -moz-transform: translateX(-100px);\n}\n60% {\n    opacity: 1;\n    -moz-transform: translateX(20px);\n}\n100% {\n    -moz-transform: translateX(0);\n}\n}@keyframes cd-bounce-2 {\n    0% {\n    opacity: 0;\n    -webkit-transform: translateX(-100px);\n    -moz-transform: translateX(-100px);\n    -ms-transform: translateX(-100px);\n    -o-transform: translateX(-100px);\n    transform: translateX(-100px);\n}\n60% {\n    opacity: 1;\n    -webkit-transform: translateX(20px);\n    -moz-transform: translateX(20px);\n    -ms-transform: translateX(20px);\n    -o-transform: translateX(20px);\n    transform: translateX(20px);\n}\n100% {\n    -webkit-transform: translateX(0);\n    -moz-transform: translateX(0);\n    -ms-transform: translateX(0);\n    -o-transform: translateX(0);\n    transform: translateX(0);\n}\n}@-webkit-keyframes cd-bounce-2-inverse {\n    0% {\n    opacity: 0;\n    -webkit-transform: translateX(100px);\n}\n60% {\n    opacity: 1;\n    -webkit-transform: translateX(-20px);\n}\n100% {\n    -webkit-transform: translateX(0);\n}\n}@-moz-keyframes cd-bounce-2-inverse {\n    0% {\n    opacity: 0;\n    -moz-transform: translateX(100px);\n}\n60% {\n    opacity: 1;\n    -moz-transform: translateX(-20px);\n}\n100% {\n    -moz-transform: translateX(0);\n}\n}@keyframes cd-bounce-2-inverse {\n    0% {\n    opacity: 0;\n    -webkit-transform: translateX(100px);\n    -moz-transform: translateX(100px);\n    -ms-transform: translateX(100px);\n    -o-transform: translateX(100px);\n    transform: translateX(100px);\n}\n60% {\n    opacity: 1;\n    -webkit-transform: translateX(-20px);\n    -moz-transform: translateX(-20px);\n    -ms-transform: translateX(-20px);\n    -o-transform: translateX(-20px);\n    transform: translateX(-20px);\n}\n100% {\n    -webkit-transform: translateX(0);\n    -moz-transform: translateX(0);\n    -ms-transform: translateX(0);\n    -o-transform: translateX(0);\n    transform: translateX(0);\n}\n}.more-to-come-container {\n    position: relative;\n    background: #EFEFEF;\n    display: block;\n    width: 100%;\n    text-align: center;\n}\n.more-to-come {\n    margin: 10em 0 0;\n    padding: 1em 0;\n    font-weight: 200;\n    color: rgba(100, 100, 100, .46);\n}\n.page article.page {\n    background: 0 0!important;\n    box-shadow: none;\n    border: none;\n    -webkit-box-shadow: none;\n}\n#cd-timeline span.fa {\n    color: #fff;\n    font-size: 28px;\n    display: block;\n    text-align: center;\n    margin-top: 17px;\n}\n.cd-timeline-icon-link {\n    color: #fff!important;\n}\n@media only screen and (max-width:821px) {\n    #cd-timeline span.fa {\n\t\tcolor: #fff;\n\t\tfont-size: 18px;\n\t\tdisplay: block;\n\t\ttext-align: center;\n\t\tmargin-top: 12px;\n\t}\n\t.cd-timeline-block:nth-child(even) .cd-timeline-content .cd-read-more, .cd-timeline-block:nth-child(odd) .cd-timeline-content .cd-read-more {\n\t\tpadding-left: 0!important;\n\t\tposition: relative;\n\t\tz-index: 99999;\n\t}\n}\n.timeline-width100 {\n    width: 100%}\n.timeline-width34 {\n    width: 34%}\n.timeline-width30 {\n    width: 30%}\n.timeline-date-left {\n    width: 100%;\n    float: left !important;\n}\n\n\n/* Single Post Styles */\n.single-post .announcement-banner-image, .single-post .timeline-express-single-page-announcement-date, .single-post .return-to-timeline  {\n\tdisplay: none;\n}"]} */ \ No newline at end of file diff --git a/lib/public/js/min/timeline-express.min.js b/lib/public/js/min/timeline-express.min.js index 3f2b709..86f7590 100644 --- a/lib/public/js/min/timeline-express.min.js +++ b/lib/public/js/min/timeline-express.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 */ jQuery(document).ready(function(){jQuery("html").addClass("cssanimations csscolumns cssgradients cssreflections csstransforms csstransforms3d csstransitions");var a=jQuery(".cd-timeline-block");a.each(function(){timeline_express_data.animation_disabled||jQuery(this).offset().top>jQuery(window).scrollTop()+.75*jQuery(window).height()&&jQuery(this).find(".cd-timeline-img, .cd-timeline-content").addClass("is-hidden")}),timeline_express_data.animation_disabled||jQuery(window).on("scroll",function(){a.each(function(){jQuery(this).offset().top<=jQuery(window).scrollTop()+.75*jQuery(window).height()&&jQuery(this).find(".cd-timeline-img").hasClass("is-hidden")&&jQuery(this).find(".cd-timeline-img, .cd-timeline-content").removeClass("is-hidden").addClass("bounce-in")})});var b=jQuery(".timeline-express");b.imagesLoaded(function(){b.masonry({itemSelector:".cd-timeline-block"}),jQuery(".timeline-express").fadeTo("fast",1)})}); \ No newline at end of file diff --git a/lib/public/partials/single.timeline-express.php b/lib/public/partials/single-timeline-express-content.php similarity index 92% rename from lib/public/partials/single.timeline-express.php rename to lib/public/partials/single-timeline-express-content.php index f8143bf..d5ef3ef 100644 --- a/lib/public/partials/single.timeline-express.php +++ b/lib/public/partials/single-timeline-express-content.php @@ -1,6 +1,6 @@ + +
    +
    + +
    + ', '' ); ?> +
    + +
    + +
    + + + +
    +
    + + diff --git a/package.json b/package.json index cdb2658..e167933 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "Timeline-Express", "title": "Timeline Express", - "version": "1.2.5", + "version": "1.2.6", "description": "Build beautiful, animated CSS3 timelines on your WordPress site..", "main": "index.js", "scripts": { diff --git a/readme.txt b/readme.txt index c985e49..e2bf9e2 100644 --- a/readme.txt +++ b/readme.txt @@ -3,7 +3,7 @@ Contributors: codeparrots, eherman24 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: 4.0 Tested up to: 4.5.2 -Stable tag: 1.2.5 +Stable tag: 1.2.6 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! @@ -357,6 +357,10 @@ The above example will load font awesome version 4.4.0 instead of the current st == Changelog == += 1.2.6 - May 18th, 2106 = +* Define a custom content filter, to enable shortcode usage and other quirks in announcements. (Note:YouTube embeds need to be done with the ``[embed]www.youtube_url.com[/embed]` shortcode.) +* New single announcement template can be fully customized. Please see: How do I customize the single announcement template?. + = 1.2.5 - May 17th, 2106 = * Revert to the old method of filtering the content. (this was an overlooked breaking change) * Fix content filtering issue - some themes not properly displaying the content on single announcements. diff --git a/templates/single.timeline-express.php b/templates/single-timeline-express-content.php similarity index 92% rename from templates/single.timeline-express.php rename to templates/single-timeline-express-content.php index f8143bf..d5ef3ef 100644 --- a/templates/single.timeline-express.php +++ b/templates/single-timeline-express-content.php @@ -1,6 +1,6 @@ + +
    +
    + +
    + ', '' ); ?> +
    + +
    + +
    + + + +
    +
    + + diff --git a/tests/test-helper-functions.php b/tests/test-helper-functions.php index 7f511d2..92fa798 100644 --- a/tests/test-helper-functions.php +++ b/tests/test-helper-functions.php @@ -203,18 +203,4 @@ public function test_timeline_express_get_announcement_date() { // $announcement_date = get_post_meta( $announcement_id, 'announcement_date', true ); $this->assertEquals( $announcement_date, $comparison_date ); } - - /** - * Testing that timeline_express_get_announcement_content() returns what we expect - */ - public function test_timeline_express_get_announcement_content() { - // Re-instantiate this class - $helper_functions_test_class = new TE_Helper_Tests; - // Create some test announcements, passing in some defaults. - $announcement_id = $helper_functions_test_class->test_create_announcement(); - // Grab the announcement date - $announcement_content = trim( timeline_express_get_announcement_content( $announcement_id ) ); - // $announcement_date = get_post_meta( $announcement_id, 'announcement_date', true ); - $this->assertEquals( $announcement_content, 'This is some test content for our announcement.' ); - } } diff --git a/timeline-express.php b/timeline-express.php index b19fdb1..a6ac1aa 100644 --- a/timeline-express.php +++ b/timeline-express.php @@ -4,7 +4,7 @@ Plugin Name: Timeline Express Plugin URI: http://www.wp-timelineexpress.com Description: Create a beautiful vertical, CSS3 animated and responsive timeline in minutes flat without writing code. - Version: 1.2.5 + Version: 1.2.6 Author: Code Parrots Text Domain: timeline-express Author URI: http://www.codeparrots.com