Changeset 608099

Timestamp:

10/04/2012 11:10:00 PM (12 years ago)

Author:

stephenh1988

Message:

Fixes ICS bugs. Adds Danish translation. Minor UI improvements.

Location:

event-organiser/trunk

Files:

• css/eventorganiser-admin-classic.css (modified) (1 diff)
• css/eventorganiser-admin-fresh.css (modified) (2 diffs)
• event-organiser.php (modified) (1 diff)
• includes/class-event-organiser-im-export.php (modified) (3 diffs)
• includes/event-organiser-ajax.php (modified) (1 diff)
• includes/event-organiser-archives.php (modified) (4 diffs)
• includes/event.php (modified) (2 diffs)
• languages/eventorganiser-da_DK.mo (added)
• languages/eventorganiser-da_DK.po (added)
• readme.txt (modified) (2 diffs)

event-organiser/trunk/css/eventorganiser-admin-classic.css

@@ -437 +437 @@
  */
 .ui-dialog { position: absolute; padding: .2em; width: 300px; overflow: hidden; }
-.ui-dialog .ui-dialog-titlebar { padding: .4em 1em; position: relative;  }
+.ui-dialog .ui-dialog-titlebar { padding: .4em 1em; position: relative;  }
 .ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .1em 0; } 
-.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; }
+.ui-dialog .ui-dialog-titlebar-close { position: absolute; }
 .ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; }
-.ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; }
+.ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; }
 .ui-dialog .ui-dialog-content { position: relative; border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; }
 .ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; }

event-organiser/trunk/css/eventorganiser-admin-fresh.css

@@ -436 +436 @@
  */
 .ui-dialog { position: fixed; padding: .2em; width: 300px; overflow: hidden; }
-.ui-dialog .ui-dialog-titlebar { padding: .4em 1em; position: relative;  }
+.ui-dialog .ui-dialog-titlebar { padding: .4em 1em; position: relative;  }
 .ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .1em 0; } 
-.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; }
+.ui-dialog .ui-dialog-titlebar-close { position: absolute; }
 .ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; }
-.ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; }
+.ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; }
 .ui-dialog .ui-dialog-content { position: relative; border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; }
 .ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; }
@@ -574 +574 @@
     background-image: -ms-linear-gradient(bottom, rgb(114,167,207) 0%, rgb(144,197,238) 100%);
 }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

event-organiser/trunk/event-organiser.php

@@ -3 +3 @@
 Plugin Name: Event Organiser
 Plugin URI: http://www.HarrisWebSolutions.co.uk/event-organiser
-Version: 1.5.6
+Version: 1.5.
 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

event-organiser/trunk/includes/class-event-organiser-im-export.php

@@ -45 +45 @@
                 'showpastevents'=>true,
                 'group_events_by'=>'series',
+
             ));
             $this->get_export_file();
@@ -240 +241 @@
 <?php if( !empty($schedule_data['exclude']) ):
     $exclude_strings = array();
-    foreach ( $schedule_data['exclude'] as $include ){
+    foreach ( $schedule_data['exclude'] as $clude ){
         if( !eo_is_all_day() ){
             $vdate='';
-            $include->setTimezone($UTC_tz);
-            $include_strings[] = $include->format('Ymd\THis\Z');
+            $clude->setTimezone($UTC_tz);
+            $clude->format('Ymd\THis\Z');
         }else{
             $vdate=';VALUE=DATE';
-            $include_strings[] = $include->format('Ymd');
+            $clude->format('Ymd');
         }
     }?>
@@ -265 +266 @@
             }
     }?>
+
 RDATE<?php echo $vdate;?>:<?php echo implode(',',$include_strings);?>
 

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

@@ -437 +437 @@
 
         foreach($venues as $venue){
-            $term_id = (int) $venue->term_id;
+            $_id = (int) $venue->term_id;
             if( !isset($term->venue_address) ){
-                $address = eo_get_venue_address($term_id);
-                $term->venue_address =  isset($address['address']) ? $address['address'] : '';
-                $term->venue_postal =  isset($address['postcode']) ? $address['postcode'] : '';
-                $term->venue_country =  isset($address['country']) ? $address['country'] : '';
+                $address = eo_get_venue_address($_id);
+                $->venue_address =  isset($address['address']) ? $address['address'] : '';
+                $->venue_postal =  isset($address['postcode']) ? $address['postcode'] : '';
+                $->venue_country =  isset($address['country']) ? $address['country'] : '';
             }
 
-            if( !isset($term->venue_lat) || !isset($term->venue_lng) ){
-                $term->venue_lat =  number_format(floatval(eo_get_venue_lat($term_id)), 6);
-                $term->venue_lng =  number_format(floatval(eo_get_venue_lng($term_id)), 6);
+            if( !isset($->venue_lng) ){
+                $_id)), 6);
+                $_id)), 6);
             }
 
-            if( !isset($term->venue_description) ){
-                $term->venue_description = eo_get_venue_description($term_id);
+            if( !isset($->venue_description) ){
+                $_id);
             }
         }

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

@@ -133 +133 @@
                     if($post_ids)
                         $query->set('post__in',wp_list_pluck($post_ids, 'post_id'));
-                        
+
                 }else{
                     if( empty($date_objs['event_start_before']) || $cutoff < $date_objs['event_start_before'] ){
@@ -168 +168 @@
     if( $query->is_feed('eo-events') ){
         //Posts per page for feeds bug http://core.trac.wordpress.org/ticket/17853
-        add_filter('pre_option_posts_per_rss','wp17853_eventorganiser_workaround');
+        add_filter('ps','wp17853_eventorganiser_workaround');
         $query->set('posts_per_page',-1);
     }
@@ -182 +182 @@
 
 /**
- * A work around for a bug that posts_per_page is over-ridden by the posts_per_rss option.
- * For ics feeds this should be -1. We intercept the option using a filter, added in pre_get_posts for event feeds
- * We return -1 and then remove the filter.
+ * A work around for a bug that posts_per_page is over-ridden by the posts_per_rss option.
+ * For ics feeds 
+ * We return .
  *@see http://core.trac.wordpress.org/ticket/17853
  */
-function wp17853_eventorganiser_workaround( $posts_per_page_rss ){
+function wp17853_eventorganiser_workaround( $ ){
     remove_filter(current_filter(),__FUNCTION__);
-    return -1;
+    return ;
 }
 
@@ -338 +338 @@
                 return  " {$wpdb->eo_events}.EndDate $order_dir, {$wpdb->eo_events}.FinishTime $order_dir";
                 break;
-    
+
             default:
                 return $orderby;

event-organiser/trunk/includes/event.php

@@ -274 +274 @@
  *  *  * 'start' =>  start date (of first occurrence)  as a datetime object
  *  *  * 'end' => end date (of first occurrence)  as a datetime object
- *  *  * 'schedule_end' =>  **START** date of last occurrence (or upper-bound thereof) as a datetime object
+ *  *  * 'schedule_' =>  **START** date of last occurrence (or upper-bound thereof) as a datetime object
  *  *  * 'include' => array of datetime objects to include in the schedule
  *  *  * 'exclude' => array of datetime objects to exclude in the schedule
@@ -653 +653 @@
 
         $schedule_last->setTimezone(new DateTimeZone('UTC'));
-        $schedule_last = $end->format($format);
+        $schedule_last = $->format($format);
 
         switch($schedule):

event-organiser/trunk/readme.txt

@@ -5 +5 @@
 Requires at least: 3.3
 Tested up to: 3.4.2
-Stable tag: 1.5.6
+Stable tag: 1.5.
 
 Create and maintain events, including complex reoccurring patterns, venue management (with Google maps), calendars and customisable event lists
@@ -149 +149 @@
 == Changelog ==
 
+
+
+
+
+
 = 1.5.6 =
 * Add filter for formatting datetime objects