Changeset 699979

Timestamp:

04/18/2013 11:18:34 PM (11 years ago)

Author:

stephenh1988

Message:

Releasing 2.0.1

Location:

event-organiser/trunk

Files:

• event-organiser-edit.php (modified) (1 diff)
• event-organiser.php (modified) (2 diffs)
• includes/event-organiser-ajax.php (modified) (1 diff)
• includes/event-organiser-archives.php (modified) (1 diff)
• includes/event-organiser-cpt.php (modified) (1 diff)
• includes/event-organiser-event-functions.php (modified) (3 diffs)
• includes/event-organiser-register.php (modified) (5 diffs)
• includes/event-organiser-templates.php (modified) (1 diff)
• js/event-manager.js (added)
• js/event-manager.min.js (added)
• js/frontend.js (modified) (1 diff)
• js/frontend.min.js (modified) (1 diff)
• readme.md (modified) (2 diffs)
• readme.txt (modified) (2 diffs)
• templates/archive-event.php (modified) (1 diff)

event-organiser/trunk/event-organiser-edit.php

@@ -58 +58 @@
     $venue_id = (int) eo_get_venue( $post->ID );
 
-    $sche_once = $schedule == 'once';
+    
+    //$sche_once is used to disable date editing unless the user specifically requests it.
+    //But a new event might be recurring (via filter), and we don't want to 'lock' new events.
+    //See http://wordpress.org/support/topic/wrong-default-in-input-element
+    $sche_once = ( $schedule == 'once' || !empty(get_current_screen()->action) );
      
     if ( !$sche_once ){

event-organiser/trunk/event-organiser.php

@@ -3 +3 @@
 Plugin Name: Event Organiser
 Plugin URI: http://www.wp-event-organiser.com
-Version: 2.0
+Version: 2.0
 Description: Creates a custom post type 'events' with features such as reoccurring events, venues, Google Maps, calendar views and events and venue pages
 Author: Stephen Harris
@@ -42 +42 @@
  */ 
 global $eventorganiser_db_version;
-$eventorganiser_db_version = '2.0';
+$eventorganiser_db_version = '2.0';
 
 

event-organiser/trunk/includes/event-organiser-ajax.php

@@ -133 +133 @@
                 $event['className'][] = 'eo-future-event';
                 
+
+
+
+
             //Include venue if this is set
             $venue = eo_get_venue($post->ID);

event-organiser/trunk/includes/event-organiser-archives.php

@@ -25 +25 @@
     $qvars[] = 'event_end_before';
     $qvars[] = 'event_after_after';
+
     return $qvars;
 }

event-organiser/trunk/includes/event-organiser-cpt.php

@@ -1035 +1035 @@
 
 add_action( 'threewp_activity_monitor_new_activity', 'eventorganiser_threeWP' );
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 ?>

event-organiser/trunk/includes/event-organiser-event-functions.php

@@ -1006 +1006 @@
  * * **columnformatweek** (string) Dateformat for month columns. Default 'D n/j'.
  * * **columnformatday** (string) Dateformat for month columns. Default 'l n/j',
+
+
+
  *
  * @link http://arshaw.com/fullcalendar/ The fullCalendar (jQuery plug-in)
@@ -1020 +1023 @@
         'tooltip'=>true, 'weekends'=>true, 'mintime'=>'0', 'maxtime'=>'24', 'alldayslot'=>true,
         'alldaytext'=>__('All Day','eventorganiser'), 'columnformatmonth'=>'D', 'columnformatweek'=>'D n/j', 'columnformatday'=>'l n/j',
-        'titleformatmonth' => 'F Y', 'titleformatweek' => "M j[ Y]{ '—'[ M] j Y}", 'titleformatday' => 'l, M j, Y'
+        'titleformatmonth' => 'F Y', 'titleformatweek' => "M j[ Y]{ '—'[ M] j Y}", 'titleformatday' => 'l, M j, Y',
+        'year' => false, 'month' => false, 'date' => false,         
     );
     $args = shortcode_atts( $defaults, $args );
@@ -1036 +1040 @@
         $args[$date_attribute] = eventorganiser_php2xdate( $args[$date_attribute] );
     }
+
+
+
 
     EventOrganiser_Shortcodes::$calendars[] = array_merge( $args );

event-organiser/trunk/includes/event-organiser-register.php

@@ -10 +10 @@
 function eventorganiser_register_script() {
     global $wp_locale;
-    $version = '2.0';
+    $version = '2.0';
 
     $ext = (defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG) ? '' : '.min';
@@ -60 +60 @@
             ));
 
+
+
+
     /* Q-Tip */
     wp_register_script( 'eo_qtip2', EVENT_ORGANISER_URL.'js/qtip2.js',array('jquery'),$version,true);
@@ -77 +80 @@
  */
 function eventorganiser_register_scripts(){
-    $version = '2.0';
+    $version = '2.0';
     $ext = (defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG) ? '' : '.min';
 
@@ -115 +118 @@
 add_action( 'admin_init', 'eventorganiser_register_scripts', 5 );
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
  /**
@@ -354 +375 @@
 */
 function eventorganiser_get_next_cron_time( $cron_name ){
-
-    foreach( _get_cron_array() as $timestamp => $crons ){
-
-        if( in_array( $cron_name, array_keys( $crons ) ) ){
-            return $timestamp - time();
-        }
-
-    }
-
-    return false;
-}
+    if( $timestamp = wp_next_scheduled( $cron_name ) ){
+        $timestamp = $timestamp - time();
+    }
+    return $timestamp;
+}
+
 
 /**

event-organiser/trunk/includes/event-organiser-templates.php

@@ -249 +249 @@
         return $content;
 
+
+
+
+
+
+
+
     //Object buffering              
     ob_start();

event-organiser/trunk/js/frontend.js

@@ -83 +83 @@
                     $(calendar).fullCalendar({
                 id: calendar,
+
+
+
                 category: calendars[i].event_category,
                 venue: calendars[i].event_venue,

event-organiser/trunk/js/frontend.min.js

@@ -3 +3 @@
 e.less+'</a> <span id="eo-upcoming-dates-pipe">|</span> <a href="#" id="eo-upcoming-dates-more">'+e.more+"</a>"));a("#eo-upcoming-dates-pipe").hide();a("#eo-upcoming-dates-less").hide().click(function(b){b.preventDefault();b=Math.floor((a("#eo-upcoming-dates li:visible").length-1)/5)*5-1;a("#eo-upcoming-dates li:gt("+b+")").hide();a("#eo-upcoming-dates-more,#eo-upcoming-dates-pipe").show();a("#eo-upcoming-dates li:visible").length<=5&&a("#eo-upcoming-dates-less,#eo-upcoming-dates-pipe").hide()});
 a("#eo-upcoming-dates-more").click(function(b){b.preventDefault();a("#eo-upcoming-dates-less,#eo-upcoming-dates-pipe, #eo-upcoming-dates li:hidden:lt(5)").show();b=a("#eo-upcoming-dates-pipe").offset();a("html, body").animate({scrollTop:Math.max(b.top+40-a(window).height(),a(window).scrollTop())});a("#eo-upcoming-dates li:hidden").length==0&&a("#eo-upcoming-dates-more,#eo-upcoming-dates-pipe").hide()})}if(a(".eo-fullcalendar").length>0){e=EOAjax.calendars;for(var l,c=0;c<e.length;c++){var n="#eo_fullcalendar_"+
-(c+1);if(typeof e[c].category==="undefined")e[c].category="";if(typeof e[c].venue==="undefined")e[c].venue="";a(n).fullCalendar({id:n,category:e[c].event_category,venue:e[c].event_venue,customButtons:{category:f,venue:k,"goto":j},theme:true,categories:EOAjax.fullcal.categories,venues:EOAjax.fullcal.venues,timeFormatphp:e[c].timeformatphp,timeFormat:e[c].timeformat,editable:false,tooltip:e[c].tooltip,firstDay:parseInt(EOAjax.fullcal.firstDay),weekends:e[c].weekends,allDaySlot:e[c].alldayslot,allDayText:e[c].alldaytext,
-axisFormat:e[c].axisformat,minTime:e[c].mintime,maxTime:e[c].maxtime,columnFormat:{month:e[c].columnformatmonth,week:e[c].columnformatweek,day:e[c].columnformatday},titleFormat:{month:e[c].titleformatmonth,week:e[c].titleformatweek,day:e[c].titleformatday},header:{left:e[c].headerleft,center:e[c].headercenter,right:e[c].headerright},eventRender:function(b,d,g){var h=a(g.calendar.options.id).find(".filter-category .eo-cal-filter").val(),i=a(g.calendar.options.id).find(".filter-venue .eo-cal-filter").val();
-if(typeof h!=="undefined"&&h!=""&&a.inArray(h,b.category)<0)return"<div></div>";if(typeof i!=="undefined"&&i!=""&&i!=b.venue)return"<div></div>";g.calendar.options.tooltip&&a(d).qtip({content:{text:b.description,button:"x",title:b.title},position:{my:"top center",at:"bottom center"},hide:{fixed:true,delay:500,effect:function(){a(this).fadeOut("50")}},border:{radius:4,width:3},style:{classes:"ui-tooltip-shadow",widget:true,tip:"topMiddle"}})},buttonText:{today:EOAjaxFront.locale.today,month:EOAjaxFront.locale.month,
-week:EOAjaxFront.locale.week,day:EOAjaxFront.locale.day,cat:EOAjaxFront.locale.cat,venue:EOAjaxFront.locale.venue},monthNames:EOAjaxFront.locale.monthNames,monthNamesShort:EOAjaxFront.locale.monthAbbrev,dayNames:EOAjaxFront.locale.dayNames,dayNamesShort:EOAjaxFront.locale.dayAbbrev,eventColor:"#21759B",defaultView:e[c].defaultview,lazyFetching:"true",events:function(b,d,g,h){b={start:jQuery.fullCalendar.formatDate(b,"yyyy-MM-dd"),end:jQuery.fullCalendar.formatDate(d,"yyyy-MM-dd"),timeformat:h.timeFormatphp};
-if(typeof h.category!=="undefined"&&h.category!="")b.category=h.category;if(typeof h.venue!=="undefined"&&h.venue!="")b.venue=h.venue;jQuery.ajax({url:EOAjax.ajaxurl+"?action=eventorganiser-fullcal",dataType:"JSON",data:b,success:g})},selectable:false,weekMode:"variable",aspectRatio:1.5,loading:function(b){var d=a("#"+a(this).attr("id")+"_loading");if(b){window.clearTimeout(l);l=window.setTimeout(function(){d.show()},1E3)}else{window.clearTimeout(l);d.hide()}}})}a(".eo-cal-filter").change(function(){a(".eo-fullcalendar").fullCalendar("rerenderEvents")});
-a(".eo-mini-calendar").datepicker({dateFormat:"DD, d MM, yy",changeMonth:true,changeYear:true,dateFormat:"DD, d MM, yy",firstDay:parseInt(EOAjax.fullcal.firstDay),buttonText:EOAjaxFront.locale.gotodate,monthNamesShort:EOAjaxFront.locale.monthAbbrev,dayNamesMin:EOAjaxFront.locale.dayAbbrev,showOn:"button",onSelect:function(b){var d=a(this).parents("div.eo-fullcalendar").attr("id");a("#"+d).fullCalendar("gotoDate",new Date(Date.parse(b)))}})}if(a(".eo_widget_calendar").length>0){a(".eo_widget_calendar tfoot").unbind("click");
-a(".eo_widget_calendar").off("click").on("click","tfoot a",function(b){b.preventDefault();var d=a(this).closest(".eo_widget_calendar").attr("id");b={showpastevents:1};if(typeof EOAjax!=="undefined"&&typeof EOAjax.widget_calendars!=="undefined")b=EOAjax.widget_calendars[d];if(typeof eo_widget_cal!=="undefined")b=eo_widget_cal[d];b.eo_month=eveorg_getParameterByName("eo_month",a(this).attr("href"));a.getJSON(EOAjaxFront.adminajax+"?action=eo_widget_cal",b,function(g){a("#"+d+"_content").html(g)})})}if(a(".eo-agenda-widget").length>
-0){function o(b,d){a.ajax({url:EOAjaxFront.adminajax,dataType:"JSON",data:{action:"eo_widget_agenda",instance_number:d.number,direction:b,start:d.StartDate,end:d.EndDate},success:function(g){if(!jQuery.isArray(g)||!g[0])return false;else{d.StartDate=g[0].StartDate;d.EndDate=g[g.length-1].StartDate;r(g,d)}}})}function r(b,d){var g=a("#"+d.id+"_container"),h=g.find("ul.dates"),i=h.find("li");a(i).remove();i="";for(c=0;c<b.length;c++){if(i==""||i!=b[c].StartDate&&d.mode=="day"){i=b[c].StartDate;var p=
-a('<li class="date" >'+b[c].display+'<ul class="a-date"></ul></li>');h.append(p)}var q=d.add_to_google?a('<li class="event"></li>').append('<span class="cat"></span><span><strong>'+b[c].time+": </strong></span>"+b[c].post_title).append('<div class="meta" style="display:none;"><span>'+b[c].link+"</span><span> \u00a0 </span><span>"+b[c].Glink+"</span></div>"):a('<li class="event"></li>').append("<a class='eo-agenda-event-permalink' href='"+b[c].event_url+"'><span class='cat'></span><span><strong>"+
-b[c].time+": </strong></span>"+b[c].post_title+"</a>");q.find("span.cat").css({background:b[c].color});p.append(q)}i=h.find("li");g.find("ul li.event").on("click",function(){a(this).find(".meta").toggle("400")})}for(var m in eo_widget_agenda){m=eo_widget_agenda[m];m.StartDate=a.fullCalendar.formatDate(new Date,"yyyy-MM-dd");m.EndDate=m.StartDate;o(1,m)}a(".eo-agenda-widget .agenda-nav span.button").click(function(b){var d=a(this).parents(".eo-agenda-widget").attr("id");m=eo_widget_agenda[d];b.preventDefault();
-b=a(this).hasClass("next")?"+1":a(this).hasClass("prev")?"-1":a(this).parent().hasClass("prev")?"-1":"+1";o(b,m)})}})})(jQuery);function eveorg_getParameterByName(a,f){a=a.replace(/[\[]/,"\\[").replace(/[\]]/,"\\]");a=(new RegExp("[\\?&]"+a+"=([^&#]*)")).exec(f);return a==null?"":decodeURIComponent(a[1].replace(/\+/g," "))}
+(c+1);if(typeof e[c].category==="undefined")e[c].category="";if(typeof e[c].venue==="undefined")e[c].venue="";a(n).fullCalendar({id:n,,
+firstDay:parseInt(EOAjax.fullcal.firstDay),weekends:e[c].weekends,allDaySlot:e[c].alldayslot,allDayText:e[c].alldaytext,axisFormat:e[c].axisformat,minTime:e[c].mintime,maxTime:e[c].maxtime,columnFormat:{month:e[c].columnformatmonth,week:e[c].columnformatweek,day:e[c].columnformatday},titleFormat:{month:e[c].titleformatmonth,week:e[c].titleformatweek,day:e[c].titleformatday},header:{left:e[c].headerleft,center:e[c].headercenter,right:e[c].headerright},eventRender:function(b,d,g){var h=a(g.calendar.options.id).find(".filter-category .eo-cal-filter").val(),
+i,
+buttonText:{today:EOAjaxFront.locale.today,month:EOAjaxFront.locale.month,week:EOAjaxFront.locale.week,day:EOAjaxFront.locale.day,cat:EOAjaxFront.locale.cat,venue:EOAjaxFront.locale.venue},monthNames:EOAjaxFront.locale.monthNames,monthNamesShort:EOAjaxFront.locale.monthAbbrev,dayNames:EOAjaxFront.locale.dayNames,dayNamesShort:EOAjaxFront.locale.dayAbbrev,eventColor:"#21759B",defaultView:e[c].defaultview,lazyFetching:"true",events:function(b,d,g,h){b={start:jQuery.fullCalendar.formatDate(b,"yyyy-MM-dd"),
+);
+d.hide()}}})}a(".eo-cal-filter").change(function(){a(".eo-fullcalendar").fullCalendar("rerenderEvents")});a(".eo-mini-calendar").datepicker({dateFormat:"DD, d MM, yy",changeMonth:true,changeYear:true,dateFormat:"DD, d MM, yy",firstDay:parseInt(EOAjax.fullcal.firstDay),buttonText:EOAjaxFront.locale.gotodate,monthNamesShort:EOAjaxFront.locale.monthAbbrev,dayNamesMin:EOAjaxFront.locale.dayAbbrev,showOn:"button",onSelect:function(b){var d=a(this).parents("div.eo-fullcalendar").attr("id");a("#"+d).fullCalendar("gotoDate",
+new Date(Date.parse(b)))}})}if(a(".eo_widget_calendar").length>0){a(".eo_widget_calendar tfoot").unbind("click");a(".eo_widget_calendar").off("click").on("click","tfoot a",function(b){b.preventDefault();var d=a(this).closest(".eo_widget_calendar").attr("id");b={showpastevents:1};if(typeof EOAjax!=="undefined"&&typeof EOAjax.widget_calendars!=="undefined")b=EOAjax.widget_calendars[d];if(typeof eo_widget_cal!=="undefined")b=eo_widget_cal[d];b.eo_month=eveorg_getParameterByName("eo_month",a(this).attr("href"));
+a.getJSON(EOAjaxFront.adminajax+"?action=eo_widget_cal",b,function(g){a("#"+d+"_content").html(g)})})}if(a(".eo-agenda-widget").length>0){function o(b,d){a.ajax({url:EOAjaxFront.adminajax,dataType:"JSON",data:{action:"eo_widget_agenda",instance_number:d.number,direction:b,start:d.StartDate,end:d.EndDate},success:function(g){if(!jQuery.isArray(g)||!g[0])return false;else{d.StartDate=g[0].StartDate;d.EndDate=g[g.length-1].StartDate;r(g,d)}}})}function r(b,d){var g=a("#"+d.id+"_container"),h=g.find("ul.dates"),
+"+
+b[c].);
+b=a(this).hasClass("next")?"+1":a(this).hasClass("prev")?"-1":a(this).parent().hasClass("prev")?"-1":"+1";o(b,m)})}})})(jQuery);function eveorg_getParameterByName(a,f){a=a.replace(/[\[]/,"\\[").replace(/[\]]/,"\\]");a=(new RegExp("[\\?&]"+a+"=([^&#]*)")).exec(f);return a==null?"":decodeURIComponent(a[1].replace(/\+/g," "))}
 function eo_load_map(){for(var a=EOAjax.map,f=0;f<a.length;f++)if(null!==document.getElementById("eo_venue_map-"+(f+1))){var j=a[f].locations,k={zoom:a[f].zoom,scrollwheel:a[f].scrollwheel,zoomControl:a[f].zoomcontrol,rotateControl:a[f].rotatecontrol,panControl:a[f].pancontrol,overviewMapControl:a[f].overviewmapcontrol,streetViewControl:a[f].streetviewcontrol,draggable:a[f].draggable,mapTypeControl:a[f].maptypecontrol,mapTypeId:google.maps.MapTypeId[a[f].maptypeid]};k=new google.maps.Map(document.getElementById("eo_venue_map-"+
 (f+1)),k);for(var e=new google.maps.LatLngBounds,l=[],c=0;c<j.length;c++){var n=j[c].lat,o=j[c].lng;if(n!==undefined&&o!=undefined){l.push(new google.maps.LatLng(n,o));e.extend(l[c]);n=new google.maps.Marker({position:l[c],map:k,content:j[c].tooltipContent});"false"!=a[f].tooltip&&google.maps.event.addListener(n,"click",eventorganiser_venue_tooltip)}}j.length>1?k.fitBounds(e):k.setCenter(l[0])}}

event-organiser/trunk/readme.md

@@ -5 +5 @@
 **Requires at least:** 3.3  
 **Tested up to:** 3.5  
-**Stable tag:** 2.0  
+**Stable tag:** 2.0
 **License:** GPLv3  
 
@@ -175 +175 @@
 ## Changelog ##
 
+
+
+
+
+
 ### 2.0 ###
 * Launch of [Event Organiser Pro](http://wp-event-organiser.com/pro-features/)

event-organiser/trunk/readme.txt

@@ -5 +5 @@
 Requires at least: 3.3
 Tested up to: 3.5
-Stable tag: 2.0
+Stable tag: 2.0
 License: GPLv3
 
@@ -163 +163 @@
 == Changelog ==
 
+
+
+
+
+
 = 2.0 =
 * Launch of [Event Organiser Pro](http://wp-event-organiser.com/pro-features/)

event-organiser/trunk/templates/archive-event.php

@@ -113 +113 @@
             if ( $wp_query->max_num_pages > 1 ) : ?>
                 <nav id="nav-below">
-                    <div class="nav-next events-nav-newer"><?php next_posts_link( __( 'Later events <span class="meta-nav">&larr;</span>' , 'eventorganiser' ) ); ?></div>
-                    <div class="nav-previous events-nav-newer"><?php previous_posts_link( __( ' <span class="meta-nav">&rarr;</span> Newer events', 'eventorganiser' ) ); ?></div>
+                    <div class="nav-next events-nav-newer"><?php next_posts_link( __( 'Later events <span class="meta-nav">&arr;</span>' , 'eventorganiser' ) ); ?></div>
+                    <div class="nav-previous events-nav-newer"><?php previous_posts_link( __( ' <span class="meta-nav">&arr;</span> Newer events', 'eventorganiser' ) ); ?></div>
                 </nav><!-- #nav-below -->
             <?php endif; ?>