Changeset 667334

Timestamp:

02/13/2013 10:44:49 AM (11 years ago)

Author:

stephenh1988

Message:

Committing 1.7.2

Location:

event-organiser/trunk

Files:

• classes/class-eventorganiser-shortcodes.php (modified) (1 diff)
• event-organiser-edit.php (modified) (1 diff)
• event-organiser.php (modified) (2 diffs)
• includes/event-organiser-register.php (modified) (3 diffs)
• includes/event-organiser-templates.php (modified) (1 diff)
• js/event.js (modified) (2 diffs)
• js/event.min.js (modified) (2 diffs)
• readme.md (modified) (2 diffs)
• readme.txt (modified) (2 diffs)

event-organiser/trunk/classes/class-eventorganiser-shortcodes.php

@@ -98 +98 @@
             $atts['event_venue'] = $atts['venue'];
         if( isset($atts['category']) && !isset( $atts['event_category'] ) )
-            $atts['event_category'] = $atts['venue'];
+            $atts['event_category'] = $atts[''];
 
         return eo_get_event_fullcalendar( $atts );

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

@@ -271 +271 @@
 
     //Maybe create a new venue
-    if ( empty( $venue_id ) && !empty( $_POST['eo_venue']) ){
+    if ( empty( $venue_id ) && !empty( $_POST['eo_venue']) ){
         $venue = $_POST['eo_venue'];
         if ( !empty( $venue['name'] ) ){

event-organiser/trunk/event-organiser.php

@@ -3 +3 @@
 Plugin Name: Event Organiser
 Plugin URI: http://www.wp-event-organiser.com
-Version: 1.7.1
+Version: 1.7.
 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 = '1.7.1';
+$eventorganiser_db_version = '1.7.';
 
 /**

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

@@ -10 +10 @@
 function eventorganiser_register_script() {
     global $wp_locale;
-    $version = '1.7';
+    $version = '1.7';
 
     $ext = (defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG) ? '' : '.min';
@@ -77 +77 @@
  */
 function eventorganiser_register_scripts(){
-    $version = '1.7';
+    $version = '1.7';
     $ext = (defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG) ? '' : '.min';
 
@@ -160 +160 @@
                     'startday'=>intval(get_option('start_of_week')),
                     'format'=> eventorganiser_get_option('dateformat').'-yy',
+
+
+
                     'location'=>get_option('timezone_string'),
                     'locale'=>array(

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

@@ -227 +227 @@
      * add content in via the_content
     */
-    if( is_singular('event') && !!eventorganiser_is_event_template($template,'single') ){   
+    if( is_singular('event') && !eventorganiser_is_event_template($template,'single') ){    
         //Viewing a single event
 

event-organiser/trunk/js/event.js

@@ -1 +1 @@
 var eo_occurrences_by_rule = new Array;
-var eo_include_dates;
-var eo_exclude_dates;
 jQuery(document).ready(function($) {
 
@@ -109 +107 @@
             });
 
-        if( 'event' == pagenow ){
+        if( 'event' == pagenow ){
             //Only add this on event edit page - i.e. not on calendar page.
             $("<a style='vertical-align: top;margin: 0px -1px;padding: 0px;height: 21px;'>").attr("title", "Create New Venue").appendTo(button_wrappers).button({

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

@@ -1 @@
-var eo_occurrences_by_rule=[],eo_include_dates,eo_exclude_dates;
+var eo_occurrences_by_rule=[];
 jQuery(document).ready(function(b){function z(){b("#eo_occurrence_includes").val(eo_include_dates.join(",\r\n"));b("#eo_occurrence_excludes").val(eo_exclude_dates.join(",\r\n"))}function v(){var g=!b("#HWSEvent_rec").prop("checked");b(".reoccurence .event-date :input").attr("disabled",g);b(".reoccurence .event-date :input").toggleClass("ui-state-disabled",g);g=!b("#eo_allday:checkbox").attr("checked");b(".eo_time").attr("disabled",!g);b(".eo_time").toggleClass("ui-state-disabled",!g);switch(b("#HWSEventInput_Req").val()){case "once":case "custom":b("#HWSEvent_freq").val("1");
 b(".reocurrence_row").hide();b("#dayofweekrepeat").show();b("#dayofmonthrepeat").show();b(".reocurrence_row :input").attr("disabled",true);break;case "weekly":b(".reocurrence_row :input").attr("disabled",false);b("#HWSEvent_freq").val()>1?b("#recpan").text(o.weeks):b("#recpan").text(o.week);b(".reocurrence_row").fadeIn(700);b("#dayofweekrepeat").fadeIn(700);b("#dayofweekrepeat :input").attr("disabled",false);b("#dayofmonthrepeat").hide();b("#dayofmonthrepeat :radio").attr("disabled",true);break;case "monthly":b(".reocurrence_row :input").attr("disabled",
@@ -16 +16 @@
 b("#eo_venue_Lng").val(h.item.venue_lng)}b("#venue_select").removeAttr("selected");b("#venue_select").val(h.item.term_id)}}).addClass("ui-widget-content ui-corner-left");g.data("autocomplete")._renderItem=function(m,h){if(h.term_id==0)return b("<li></li>").data("item.autocomplete",h).append("<a>"+h.label+"</a>").appendTo(m);var n=[h.venue_address,h.venue_city,h.venue_state,h.venue_postcode,h.venue_country];n=b.grep(n,function(p){return p});return b("<li></li>").data("item.autocomplete",h).append("<a>"+
 h.label+"</br> <span style='font-size: 0.8em'><em>"+n.join(", ")+"</span></em></a>").appendTo(m)};i=b("<span>").addClass("eo-venue-combobox-buttons").appendTo(i);b("<a style='vertical-align: top;margin: 0px -1px;padding: 0px;height: 21px;'>").attr("title","Show All Items").appendTo(i).button({icons:{primary:"ui-icon-triangle-1-s"},text:false}).removeClass("ui-corner-all").addClass("ui-corner-right ui-combobox-toggle ui-combobox-button").click(function(){if(g.autocomplete("widget").is(":visible"))g.autocomplete("close");
-else{b(this).blur();g.autocomplete("search","");g.focus()}});"event"==pagenow&&b("<a style='vertical-align: top;margin: 0px -1px;padding: 0px;height: 21px;'>").attr("title","Create New Venue").appendTo(i).button({icons:{primary:"ui-icon-plus"},text:false}).removeClass("ui-corner-all").addClass("ui-corner-right add-new-venue ui-combobox-button").click(function(){b("#eventorganiser_event_detail tr.eo-add-new-venue").show();b("tr.venue_row").show();u={id:b("#venue_select").val(),label:b(".eo-venue-input input").val(),
-lat:b("#eo_venue_Lat").val(),lng:b("#eo_venue_Lng").val()};b("#venue_select").removeAttr("selected").val(0);b(".eo-venue-combobox-select").hide();b(".eo-venue-input input").val("");eo_initialize_map(0,0);var m=EO_Ajax_Event.location;if(m){m=m.split("/");m=m[m.length-1];eventorganiser_code_address(m)}else map.setZoom(1);b(this).blur()})}});b("#venue_select").combobox()});b(".eo-add-new-venue-cancel").click(function(g){g.preventDefault();b(".eo-venue-combobox-select").show();b(".eo-add-new-venue input").val("");
-eo_initialize_map(u.lat,u.lng);b("#venue_select").val(u.id);b(".eo-venue-input input").val(u.label);b("#eventorganiser_event_detail tr.eo-add-new-venue").hide()});var o=EO_Ajax_Event.locale;if(b("#eventorganiser_detail #from_date, #eventorganiser_detail #to_date").length>0){var D=b("#eventorganiser_detail #from_date, #eventorganiser_detail #to_date").datepicker({dateFormat:EO_Ajax_Event.format,changeMonth:true,changeYear:true,monthNamesShort:EO_Ajax_Event.locale.monthAbbrev,dayNamesMin:EO_Ajax_Event.locale.dayAbbrev,
-firstDay:parseInt(EO_Ajax_Event.startday),buttonImage:"images/ui-icon-calendar.png",onSelect:function(g){var i=this.id=="from_date"?"minDate":"maxDate",t=b(this).data("datepicker");g=b.datepicker.parseDate(t.settings.dateFormat||b.datepicker._defaults.dateFormat,g,t.settings);D.not(this).datepicker("option",i,g);this.id=="from_date"&&b("#recend").datepicker("option","minDate",g);c();v()}});b("#recend").datepicker({dateFormat:EO_Ajax_Event.format,monthNamesShort:EO_Ajax_Event.locale.monthAbbrev,dayNamesMin:EO_Ajax_Event.locale.dayAbbrev,
-changeMonth:true,changeYear:true,firstDay:parseInt(EO_Ajax_Event.startday)});b("#HWSEvent_time, #HWSEvent_time2").timepicker({showPeriodLabels:false,hourText:EO_Ajax_Event.locale.hour,minuteText:EO_Ajax_Event.locale.minute});b("#HWSEvent_rec").click(function(){v()});b(".reoccurence .event-date :input, .onetime .event-date :input").not(".eo_time").change(function(){v();b(this).attr("id")!="eo_allday"&&c()});v();var y=!b(this).prop("checked");b(".reoccurence .event-date :input").attr("disabled",y);
-b(".reoccurence .event-date :input").toggleClass("ui-state-disabled",y)}b(".eo_occurrence_toogle").click(function(g){g.preventDefault();g.stopPropagation();A.toggle();A.is(":visible")?b(".eo_occurrence_toogle").val(EO_Ajax_Event.locale.hideDates):b(".eo_occurrence_toogle").val(EO_Ajax_Event.locale.showDates)});y=new Date;f(y.getFullYear(),y.getMonth()+1,{});var A=b("#eo_occurrence_datepicker");A.length>0&&A.datepicker({dateFormat:"yy-mm-dd",onSelect:j,beforeShowDay:e,onChangeMonthYear:f,changeMonth:true,
+else{b(this).blur();g.autocomplete("search","");g.focus()}});"event"==pagenow&&t").val(),
+la);
+Abbrev,
+Abbrev,
+dayNamesMin:EO_Ajax_Event.locale.dayAbbrev,changeMonth:true,changeYear:true,firstDay:parseInt(EO_Ajax_Event.startday)});b("#HWSEvent_time, #HWSEvent_time2").timepicker({showPeriodLabels:false,hourText:EO_Ajax_Event.locale.hour,minuteText:EO_Ajax_Event.locale.minute});b("#HWSEvent_rec").click(function(){v()});b(".reoccurence .event-date :input, .onetime .event-date :input").not(".eo_time").change(function(){v();b(this).attr("id")!="eo_allday"&&c()});v();var y=!b(this).prop("checked");b(".reoccurence .event-date :input").attr("disabled",
+b(".reoccurence .event-date :input").toggleClass("ui-state-disabled",y)}b(".eo_occurrence_toogle").click(function(g){g.preventDefault();g.stopPropagation();A.toggle();A.is(":visible")?b(".eo_occurrence_toogle").val(EO_Ajax_Event.locale.hideDates):b(".eo_occurrence_toogle").val(EO_Ajax_Event.locale.showDates)});y=new Date;f(y.getFullYear(),y.getMonth()+1,{});var A=b("#eo_occurrence_datepicker");A.length>0&&A.datepicker({dateFormat:"yy-mm-dd",onSelect:j,beforeShowDay:e,onChangeMonthYear:f,changeMonth:true,
 changeYear:true,monthNamesShort:EO_Ajax_Event.locale.monthAbbrev,dayNamesMin:EO_Ajax_Event.locale.dayAbbrev,firstDay:parseInt(EO_Ajax_Event.startday)}).hide();b("html").click(function(){A.hide()});A.find(".ui-datepicker-inline").click(function(g){if(!g)g=window.event;g.cancelBubble=true;g.stopPropagation&&g.stopPropagation()})});
 var sprintf=function(){function b(q){return Object.prototype.toString.call(q).slice(8,-1).toLowerCase()}function z(q,a){for(var c=[];a>0;c[--a]=q);return c.join("")}var v=function(){v.cache.hasOwnProperty(arguments[0])||(v.cache[arguments[0]]=v.parse(arguments[0]));return v.format.call(null,v.cache[arguments[0]],arguments)};v.format=function(q,a){var c=1,e=q.length,d="",f=[],j,l,k,s;for(j=0;j<e;j++){d=b(q[j]);if(d==="string")f.push(q[j]);else if(d==="array"){k=q[j];if(k[2]){d=a[c];for(l=0;l<k[2].length;l++){if(!d.hasOwnProperty(k[2][l]))throw sprintf('[sprintf] property "%s" does not exist',

event-organiser/trunk/readme.md

@@ -5 +5 @@
 **Requires at least:** 3.3  
 **Tested up to:** 3.5  
-**Stable tag:** 1.7.1  
+**Stable tag:** 1.7.
 **License:** GPLv3  
 
@@ -175 +175 @@
 ## Changelog ##
 
+
+
+
+
+
 ### 1.7.1 ###
 * Fixes archive bug. See [ticket](https://github.com/stephenharris/Event-Organiser/issues/39)

event-organiser/trunk/readme.txt

@@ -5 +5 @@
 Requires at least: 3.3
 Tested up to: 3.5
-Stable tag: 1.7.1
+Stable tag: 1.7.
 License: GPLv3
 
@@ -163 +163 @@
 == Changelog ==
 
+
+
+
+
+
 = 1.7.1 =
 * Fixes archive bug. See [ticket](https://github.com/stephenharris/Event-Organiser/issues/39)