Changeset 646914

Timestamp:

01/02/2013 11:04:32 AM (12 years ago)

Author:

stephenh1988

Message:

Fixes venue zoom, are running events past label, uses condensed jquery ui for front-end. Code refactoring and improved documentation.

Location:

event-organiser/trunk

Files:

• classes/class-eo-event-list-widget.php (modified) (1 diff)
• classes/class-eventorganiser-shortcodes.php (modified) (1 diff)
• css/eventorganiser-admin-style.css (modified) (1 diff)
• css/eventorganiser-front-end.css (modified) (1 diff)
• event-organiser-settings.php (modified) (21 diffs)
• event-organiser.php (modified) (4 diffs)
• includes/event-organiser-ajax.php (modified) (1 diff)
• includes/event-organiser-event-functions.php (modified) (9 diffs)
• includes/event-organiser-install.php (modified) (1 diff)
• includes/event-organiser-register.php (modified) (3 diffs)
• includes/event-organiser-utility-functions.php (modified) (2 diffs)
• includes/event-organiser-venue-functions.php (modified) (16 diffs)
• includes/event.php (modified) (4 diffs)
• js/admin-calendar.js (modified) (2 diffs)
• js/admin-calendar.min.js (modified) (1 diff)
• js/event.js (modified) (2 diffs)
• js/event.min.js (modified) (1 diff)
• js/frontend.js (modified) (2 diffs)
• js/frontend.min.js (modified) (2 diffs)
• readme.txt (modified) (2 diffs)

event-organiser/trunk/classes/class-eo-event-list-widget.php

@@ -74 +74 @@
     <label for="<?php echo $this->get_field_id('template'); ?>"><?php _e('Template (leave blank for default)', 'eventorganiser'); ?>  </label>
       <input  id="<?php echo $this->get_field_id('template'); ?>" class="widefat" name="<?php echo $this->get_field_name('template'); ?>" type="text" value="<?php echo esc_attr($instance['template']);?>" />
+
   </p>
   <p>

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

@@ -378 +378 @@
         )); 
 
-        if(!empty(self::$calendars) || !empty(self::$map) || !empty(self::$widget_calendars) ):             
+        if(!empty(self::$calendars) || !empty(self::$map) || !empty(self::$widget_calendars) ):                
             wp_enqueue_script( 'eo_qtip2'); 
-            wp_enqueue_style('eventorganiser-jquery-ui-style',EVENT_ORGANISER_URL.'css/eventorganiser-admin-fresh.css',array());    
             wp_enqueue_style('eo_calendar-style');  
             wp_enqueue_style('eo_front');   

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

@@ -68 +68 @@
 .ui-combobox-toggle {top: 0;bottom: 0;margin-left: -1px;padding: 0;/* adjust styles for IE 6/7 */*height: 1.7em;*top: 0.1em;}
 .ui-combobox-input {margin: 0;padding: 0.3em;}
-.eo-venue-combobox-buttons{position: absolute;width:4.4em;}
+.eo-venue-combobox-buttons{position: absolute;width:4.em;}
 
 /*

event-organiser/trunk/css/eventorganiser-front-end.css

@@ -18 +18 @@
 .eo-agenda-widget li.event .meta{font-size:0.9em}
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

event-organiser/trunk/event-organiser-settings.php

@@ -91 +91 @@
             case 'general':
                 /* General - main */
-                add_settings_field('supports', __('Select which features events should support','eventorganiser'), array($this,'display_event_properties'), 'eventorganiser_'.$tab_id, $tab_id,
+                add_settings_field('supports', __('Select which features events should support','eventorganiser'), , 'eventorganiser_'.$tab_id, $tab_id,
                     array(
                         'label_for'=>'supports',
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
                 ));
 
@@ -104 +124 @@
                     array(
                         'label_for'=>'dateformat',
-                        'select'=> eventorganiser_get_option('dateformat'),
+                        'selected'=> eventorganiser_get_option('dateformat'),
+                        'name'=>'eventorganiser_options[dateformat]',
                         'options'=>array(
                             'dd-mm'=> __('dd-mm-yyyy','eventorganiser'),
@@ -115 +136 @@
                     array(
                         'label_for'=>'showpast',
-                        'checked'=>  eventorganiser_get_option('showpast'),
+                        'name'=>'eventorganiser_options[showpast]',
+                        'options'=> 1,
+                        'checked'=> eventorganiser_get_option('showpast'),
                         'help'=> __("Display past events on calendars, event lists and archives (this can be over-ridden by shortcode attributes and widget options).",'eventorganiser')
                 ));
@@ -122 +145 @@
                     array(
                         'label_for'=>'group_events',
-                        'checked'=> eventorganiser_get_option('group_events',''),
-                        'value'=>'series',
+                        'name'=>'eventorganiser_options[group_events]',
+                        'options'=> 'series',
+                        'checked'=> eventorganiser_get_option('group_events'),
                         'help'=> __("If selected only one occurrence of an event will be displayed on event lists and archives (this can be over-ridden by shortcode attributes and widget options.",'eventorganiser')
                 ));             
@@ -130 +154 @@
                     array(
                         'label_for'=>'runningisnotpast',
-                        'select'=> eventorganiser_get_option('runningisnotpast',0),
+                        'name'=>'eventorganiser_options[runningisnotpast]',
+                        'selected'=> eventorganiser_get_option('runningisnotpast',0),
                         'options'=>array(
-                            '0'=> __('Yes','eventorganiser'),
-                            '1'=> __('No','eventorganiser'),
+                            '0'=> __('','eventorganiser'),
+                            '1'=> __('','eventorganiser'),
                         ),
                         'help'=>__("If 'no' is selected, an occurrence of an event is only past when it has finished. Otherwise, an occurrence is considered 'past' as soon as it starts.",'eventorganiser'),
@@ -141 +166 @@
                     array(
                         'label_for'=>'deleteexpired',
+
+
                         'checked'=> eventorganiser_get_option('deleteexpired'),
                         'help'=> __("If selected the event will be automatically trashed 24 hours after the last occurrence finishes.",'eventorganiser')
@@ -148 +175 @@
                     array(
                         'label_for'=>'feed',
+
+
                         'checked'=>eventorganiser_get_option('feed'),
                         'help'=>sprintf(__('If selected, visitors can subscribe to your events with the url: %s','eventorganiser'), '<code>'.eo_get_events_feed().'</code>')
@@ -155 +184 @@
                     array(
                         'label_for'=>'excludefromsearch',
+
+
                         'checked'=>eventorganiser_get_option('excludefromsearch'),
                 ));
@@ -161 +192 @@
                     array(
                         'label_for'=>'templates',
-                        'checked'=> eventorganiser_get_option('templates'),
+                        'name'=>'eventorganiser_options[templates]',
+                        'options'=> 1,
+                        'checked'=>eventorganiser_get_option('templates'),
                         'help'=>__("For each of the pages, the corresponding template is used. To use your own template simply give it the same name and store in your theme folder. By default, if Event Organiser cannot find a template in your theme directory, it will use its own default template. To prevent this, uncheck this option. WordPress will then decide which template from your theme's folder to use.",'eventorganiser'). sprintf("<p><strong> %s </strong><code>archive-event.php</code></p>
                                             <p><strong> %s </strong><code>single-event.php</code></p>
@@ -182 +215 @@
                     array(
                         'label_for'=>'prettyurl',
+
+
                         'checked'=>eventorganiser_get_option('prettyurl'),
                         'help'=>__("If you have pretty permalinks enabled, select to have pretty premalinks for events.",'eventorganiser')
@@ -190 +225 @@
                     array(
                         'label_for'=>'url_event',
+
                         'value'=>eventorganiser_get_option('url_event'),
                         'help'=>"<label><code>{$site_url}/<strong>".eventorganiser_get_option('url_event')."</strong>/[event_slug]</code></label>"
@@ -197 +233 @@
                     array(
                         'label_for'=>'url_events',
+
                         'value'=>eventorganiser_get_option('url_events'),
                         'help'=>"<label><code>{$site_url}/<strong>".eventorganiser_get_option('url_events')."</strong></code></label>"
@@ -204 +241 @@
                     array(
                         'label_for'=>'url_venue',
+
                         'value'=>eventorganiser_get_option('url_venue'),
                         'help'=>"<label><code>{$site_url}/<strong>".eventorganiser_get_option('url_venue')."</strong>/[venue_slug]</code></label>"
@@ -211 +249 @@
                     array(
                         'label_for'=>'url_cat',
+
                         'value'=>eventorganiser_get_option('url_cat'),
                         'help'=>"<label><code>{$site_url}/<strong>".eventorganiser_get_option('url_cat')."</strong>/[event_cat_slug]</code></label>"
@@ -218 +257 @@
                     array(
                         'label_for'=>'url_tag',
+
                         'value'=>eventorganiser_get_option('url_tag'),
                         'help'=>"<label><code>{$site_url}/<strong>".eventorganiser_get_option('url_tag')."</strong>/[event_tag_slug]</code></label>"
@@ -242 +282 @@
         switch( $tab ){
             case 'general':
-                $checkboxes  = array('showpast','templates','excludefromsearch','deleteexpired','feed','eventtag','group_events');
+                $checkboxes  = array('showpast','templates','excludefromsearch','deleteexpired','feed','group_events');
                 $text = array('navtitle','dateformat','runningisnotpast','addtomenu');
 
@@ -393 +433 @@
             <?php screen_icon('options-general'); ?>
                 <?php 
-                settings_errors(); 
 
                 $active_tab = ( isset( $_GET[ 'tab' ] ) &&  isset( $this->tabs[$_GET[ 'tab' ]] ) ? $_GET[ 'tab' ] : 'general');
@@ -416 +455 @@
                         do_settings_sections( 'eventorganiser_'.$active_tab ); 
                         //Tab identifier - so we know which tab we are validating. See $this->validate().
+
                         printf('<input type="hidden" name="eventorganiser_options[tab]" value="%s" />',esc_attr($active_tab));
                         submit_button(); 
@@ -434 +474 @@
     }
     
-
-    function display_event_properties(){
-        $counter=1; 
-         $supports = eventorganiser_get_option('supports');
-
-        $supportables= array(
-            'author' => __('Organiser','eventorganiser').' ('.__('Author').')',
-            'thumbnail' =>__('Thumbnail'),
-            'excerpt' => __('Excerpt'),
-            'custom-fields' => __('Custom Fields'),
-            'comments' => __('Comments'),
-            'revisions' => __('Revisions')
-        );
-
-        echo '<table>';
-            echo '<tr>';
-            foreach ( $supportables as $supp => $supp_display):
-                printf('<td>
-                            <input type="checkbox" name="eventorganiser_options[supports][]" value="%s"  %s/> %s
-                        </td>',
-                        $supp,
-                        checked(true, in_array($supp,$supports),false),
-                        esc_html($supp_display)
-                );
-
-                if($counter==4)
-                    echo '</tr><tr>';
-                $counter++;
-            endforeach;
-
-            printf('<td>
-                        <input type="checkbox" name="eventorganiser_options[eventtag]" value="1" %s /> %s
-                    </td>',
-                    checked(1,eventorganiser_get_option('eventtag'),false),
-                    esc_html__("Event Tags",'eventorganiser')
-            );
-            echo '</tr>';
-        echo '</table>';
-    }
-
-
     function display_permissions(){
         global $wp_roles;
@@ -543 +542 @@
 
             <?php printf('<input type="hidden" name ="eventorganiser_options[menu_item_db_id]" value="%d" />',eventorganiser_get_option('menu_item_db_id')); ?>
-            <?php printf('<input type="text" name="eventorganiser_options[navtitle]" value="%s" />',eventorganiser_get_option('navtitle')); ?>
-            
-            <?php _e("(This may not work with some themes)",'eventorganiser'); 
+            <?php printf('<input type="text" name="eventorganiser_options[navtitle]" value="%s" />',eventorganiser_get_option('navtitle')); 
     }
 
@@ -553 +550 @@
 }
 $settings_page = new EventOrganiser_Settings_Page();
-
-function eventorganiser_radio_field( $args ){
-
-    if ( $args['label_for'] ){
-
-        $current = $args['select'];
-        $name_prefix = isset($args['name_prefix']) ?  $args['name_prefix'] : 'eventorganiser_options';
-        printf('<fieldset %s>%s',
-            isset($args['class']) ? 'class="'.esc_attr($args['class']).'"'  : '',
-            isset($args['label']) ? '<legend class="screen-reader-text"><span>'.esc_html($args['label']).'</span></legend>' : ''
-        );
-
-        if( !empty($args['options']) ){
-            foreach ($args['options'] as $value => $label ){
-                printf('<label for="%s"><input type="radio" id="%s" %s name="%s" value="%s"> <span> %s </span></label><br>',
-                    esc_attr($args['label_for'].'_'.$value),
-                    esc_attr($args['label_for'].'_'.$value),
-                    checked($value, $current, false),
-                    esc_attr($name_prefix.'['.$args['label_for'].']'),
-                    esc_attr($value),
-                    esc_html($label));
-            }
-        }
-        if(!empty($args['help'])){
-                echo '<p class="description">'.esc_html($args['help']).'</p>';
-        }
-        echo '</fieldset>';
-
-    }
-}
-
-    function eventorganiser_select_field($args){
-
-        if ( $args['label_for'] ){
-            $current = $args['select'];
-            $name_prefix = isset($args['name_prefix']) ?  $args['name_prefix'] : 'eventorganiser_options';
-            printf('<select %s name="%s" id="%s">',
-                isset($args['class']) ? 'class="'.esc_attr($args['class']).'"'  : '',
-                esc_attr($name_prefix.'['.$args['label_for'].']'),
-                esc_attr($args['label_for'])
-            );
-        
-            if( !empty($args['options']) ){
-                foreach ($args['options'] as $value => $label ){
-                    printf('<option value="%s" %s> %s </option>',esc_attr($value), selected($current, $value, false), esc_html($label));
-                }
-            }
-            echo '</select>';
-
-            if(!empty($args['help'])){
-                echo '<p class="description">'.esc_html($args['help']).'</p>';
-            }
-        }
-    }
-
-    function eventorganiser_text_field($args){
-        if ( $args['label_for'] ){
-            $current = $current = $args['value'];
-            $type = isset($args['type']) ? $args['type'] : 'text';
-            $name_prefix = isset($args['name_prefix']) ?  $args['name_prefix'] : 'eventorganiser_options';
-
-            printf('<input type="%s" name="%s" class="%s regular-text ltr" id="%s" value="%s" autocomplete="off" />',
-                esc_attr($type),
-                esc_attr($name_prefix.'['.$args['label_for'].']'),
-                isset($args['class']) ? esc_attr($args['class'])  : '',
-                esc_attr($args['label_for']),
-                esc_attr($current)
-            );
-            if(!empty($args['help'])){
-                echo '<p class="description">'.$args['help'].'</p>';
-            }
-        }
-    }
-    
-
-    function eventorganiser_checkbox_field($args=array()){
-        if ( $args['label_for'] ){
-
-            /* Backwards compatible - now accept an options array: */
-            /* $options = array( option_id =>array('value'=>value,'checked'=>1|0,'label'=>label ) */
-            $options =  isset($args['options']) ? $args['options'] : false;
-            $values =  isset($args['value']) ? $args['value'] : 1;
-            $checked =  isset($args['checked']) ? $args['checked'] : 0;
-                        
-            if( empty($options) && !is_array( $values ) ){
-                $options = array( 
-                            $args['label_for'] => array(
-                                'label'=>'',
-                                'value'=>$values,
-                                'checked'=>$checked,
-                            ));
-            }
-
-            $name_prefix = isset($args['name_prefix']) ?  $args['name_prefix'] : 'eventorganiser_options';
-
-            foreach( $options as $id => $checkbox ){
-                printf('<label for="%1$s">
-                            <input type="checkbox" name="%2$s" id="%1$s" value="%3$s" %4$s %5$s> 
-                            %6$s </br>
-                        </label>',
-                        $id,
-                        esc_attr($name_prefix.'['.$id.']'),
-                        esc_attr($checkbox['value']),
-                        ( $checkbox['checked'] ? 'checked="checked"' : ''),
-                        isset($args['class']) ? 'class"'.esc_attr($args['class']).'"'  : '', 
-                         isset($checkbox['label']) ? $checkbox['label'] : ''
-                );
-            }
-
-            if(!empty($args['help'])){
-                echo '<p class="description">'.$args['help'].'</p>';
-            }
-        }
-    }
-
-    function eventorganiser_textarea_field($args){
-        if ( $args['label_for'] ){
-            $current = $args['value'];
-            $type = isset($args['type']) ? $args['type'] : 'text';
-            $name_prefix = isset($args['name_prefix']) ?  $args['name_prefix'] : 'eventorganiser_options';
-
-            if( !empty($args['tinymce']) ){
-                wp_editor( $current, esc_attr($args['label_for']) ,array(
-                    'textarea_name'=>$name_prefix.'['.$args['label_for'].']',
-                    'media_buttons'=>false,
-                ));
-
-            }else{
-
-                printf('<textarea cols="50" rows="4" name="%s" class="%s large-text" id="%s">%s</textarea>',
-                    esc_attr($name_prefix.'['.$args['label_for'].']'),
-                    isset($args['class']) ? esc_attr($args['class'])  : '',
-                    esc_attr($args['label_for']),
-                    esc_textarea($current)
-                );
-            }
-            if(!empty($args['help'])){
-                echo '<p class="description"><label for="'.$args['label_for'].'">'.$args['help'].'<label></p>';
-            }
-        }
-    }
 ?>

event-organiser/trunk/event-organiser.php

@@ -3 +3 @@
 Plugin Name: Event Organiser
 Plugin URI: http://www.wp-event-organiser.com
-Version: 1.6.1
+Version: 1.6.
 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
@@ -35 +35 @@
  */ 
 global $eventorganiser_db_version;
-$eventorganiser_db_version = "1.6.1";
+$eventorganiser_db_version = "1.6.";
 
 
@@ -103 +103 @@
         'group_events'=>'',
         'feed' => 1,
-        'eventtag' => 1,
         'deleteexpired' => 0,
-        'supports' => array('title','editor','author','thumbnail','excerpt','custom-fields','comments'),
+        'supports' => array('title','editor','author','thumbnail','excerpt','custom-fields','comments'),
         'event_redirect' => 'events',
         'dateformat'=>'dd-mm',
@@ -114 +113 @@
         'excludefromsearch'=>0,
         'showpast'=> 0,
-        'eventtag' => 1,
         'runningisnotpast' => 0,
       );
       $options = get_option('eventorganiser_options',$defaults);
       $options = wp_parse_args( $options, $defaults );
+
+
+
+
 
       if( !isset($options[$option]) )

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

@@ -204 +204 @@
         $calendar = get_transient('eo_full_calendar_admin');
         $key = $_GET['start'].'--'.$_GET['end'];
-        if( $calendar && is_array($calendar) && isset($calendar[$key]) ){
+
+        if( ( !defined('WP_DEBUG') || !WP_DEBUG ) && $calendar && is_array($calendar) && isset($calendar[$key]) ){
             echo json_encode($calendar[$key]);
             exit;

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

@@ -177 +177 @@
 
 /**
-* Returns the start date of occurrence of event an event, like eo_get_the_start().
+* Returns the start date of occurrence of event an event, like .
 * The difference is that the occurrence ID *must* be supplied (event ID is not). 
 * @since 1.6
@@ -299 +299 @@
 /**
 * Returns an array of datetimes (start and end) corresponding to the next occurrence of an event
-* eo_get_next_occurrence() on the other hand returns a formated datetime of the start date.
+* {@see `eo_get_next_occurrence()`} on the other hand returns a formated datetime of the start date.
+*
 * @since 1.6
 *
@@ -599 +600 @@
 /**
 * Returns the colour of a category associated with the event.
-* Applies the 'eventorganiser_event_color' filter.
+* Applies the  filter.
 * @since 1.6
 *
@@ -634 +635 @@
 * Adds eo-event-cat-[category slug] for each event category it bleongs to. 
 * Adds eo-event-[future|past|running].
-* Applies filter eventorganiser_event_classes
+* Applies filter 
 * @since 1.6
 *
@@ -677 +678 @@
 
 /**
-* Checks if an event taxonomy archive page is being displayed. A simple wrapper for is_tax().
+* Checks if an event taxonomy archive page is being displayed. A simple wrapper for .
 * @since 1.6
 *
@@ -687 +688 @@
 
 /**
-* Retrieves the permalink for the ICAL event feed. A simple wrapper for get_feed_link().
+* Retrieves the permalink for the ICAL event feed. A simple wrapper for .
 *
 * Retrieve the permalink for the events feed. The returned link is the url with which visitors can subscribe 
@@ -755 +756 @@
 }
 
-
-
+/**
+ * @ignore
+*/
 function eo_has_event_started($id='',$occurrence=0){
     $tz = eo_get_blog_timezone();
@@ -765 +767 @@
 }
 
+
+
+
 function eo_has_event_finished($id='',$occurrence=0){
     $tz = eo_get_blog_timezone();
@@ -773 +778 @@
 }
 
+
+
+
 function eo_event_category_dropdown( $args = '' ) {
     $defaults = array(

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

@@ -153 +153 @@
             eventorganiser_install();
         }
+
+
+
+
+
+
+
+
         update_option('eventorganiser_version', $eventorganiser_db_version);
 

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

@@ -10 +10 @@
 function eventorganiser_register_script() {
     global $wp_locale;
-    $version = '1.6.1';
+    $version = '1.6.';
 
     $ext = (defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG) ? '' : '.min';
@@ -55 +55 @@
     /* Styles */
     wp_register_style('eo_calendar-style',EVENT_ORGANISER_URL.'css/fullcalendar.css',array(),$version);
-    wp_register_style('eo_front',EVENT_ORGANISER_URL.'css/eventorganiser-front-end.css',array('eventorganiser-jquery-ui-style'),$version);
-    wp_register_style('eventorganiser-jquery-ui-style',EVENT_ORGANISER_URL.'css/eventorganiser-admin-fresh.css',array(),$version);
+    wp_register_style('eo_front',EVENT_ORGANISER_URL.'css/eventorganiser-front-end.css',array(),$version);
 }   
 add_action('init', 'eventorganiser_register_script');
@@ -68 +67 @@
  */
 function eventorganiser_register_scripts(){
-    $version = '1.6.1';
+    $version = '1.6.';
     $ext = (defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG) ? '' : '.min';
 

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

@@ -8 +8 @@
 /**
  * Formats a datetime object into a specified format and handles translations.
- * Used by eo_get_the_start/end/schedule_start etc. 
+ * Used by 
+ *
+ * * {@see `eo_get_the_start()`} 
+ * * {@see `eo_get_the_end()`}
+ * * {@see `eo_get_schedule_start()`}
+ * * {@see `eo_get_schedule_last()`}
+ *
  * The constant DATETIMEOBJ can be passed to them to get datetime objects 
- * Applies eventorganiser_format_datetime filter
+ * Applies  filter
  *
  * @since 1.2.0
@@ -436 +442 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 ?>

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

@@ -40 +40 @@
 /**
 * Returns the slug of the venue of an event.
-* Can be used inside the loop to output the 
-* venue id of the current event.
+*
+* When used without an argument it uses the event specified in the global $post (e.g. current event in the loop).
+* Can be used inside the loop to output the venue id of the current event.
 * @since 1.0.0
 *
@@ -72 +73 @@
 * A utility function for getting the venue ID from a venue ID or slug.
 * Useful for when we don't know which is being passed to us, but we want the ID.
+
 * @since 1.6
 *
@@ -97 +99 @@
 
 /**
- * Get all venue data from database by venue field and data. This acts as a simple wrapper for get_term_by
+ * Get all venue data from database by venue field and data. This acts as a simple wrapper for 
  *
  * Warning: $value is not escaped for 'name' $field. You must do it yourself, if required.
@@ -123 +125 @@
 *
 * Returns the name of a venue specified by it's slug or ID. If used inside the loop, it can return the name of the current post's venue. If specifying the venue by ID, **the ID must be an integer**.
-* This function behaves differently to `eo_get_venue_slug` which takes the event ID, rather than venue ID or slug, as an optional argument.
+*
+* This function behaves differently to {@see `eo_get_venue_slug()`} which takes the event ID, rather than venue ID or slug, as an optional argument.
 *
 * @since 1.0.0
@@ -143 +146 @@
 * Echos the venue of the event
 *
-* @uses eo_get_venue_name
+* @uses eo_get_venue_name
 * @param (int) venue id or (string) venue slug
 *
@@ -156 +159 @@
 * Returns the description of the description of an event.
 * If used with any arguments uses the venue of the current event.
+
+
+
+
 * @since 1.0.0
 *
@@ -190 +197 @@
 * Returns an latitude-longtitude array (keys 'lat', 'lng')
 * If used with any arguments uses the venue of the current event.
+
+
+
 * @since 1.0.0
 *
@@ -204 +214 @@
 * Returns the latitude co-ordinate of a venue.
 * If used with any arguments uses the venue of the current event.
+
+
+
 * @since 1.0.0
 *
@@ -219 +232 @@
 * Returns the longtitude co-ordinate of a venue.
 * If used with any arguments uses the venue of the current event.
+
+
+
 * @since 1.0.0
 *
@@ -308 +324 @@
 
 /**
- * Retrieve array of venues. Acts as a wrapper for get_terms, except hide_empty defaults to false.
- *
- * The list of arguments that $args can contain, which will overwrite the defaults:
- *
- * orderby - Default is 'name'. Can be name, count, term_group, slug or nothing
+ * Retrieve array of venues. Acts as a wrapper for  defaults to false.
+ *
+ * The list of arguments that  can contain, which will overwrite the defaults:
+ *
+ *  - Default is 'name'. Can be name, count, term_group, slug or nothing
  * (will use venue/term ID), Passing a custom value other than these will cause it to
  * order based on the custom value.
- *
- * order - Default is ASC. Can use DESC.
- *
- * hide_empty - Default is 0
- *
- * exclude - Default is an empty array. An array, comma- or space-delimited string
+ * * **order** - Default is ASC. Can use DESC.
+ * * **hide_empty** - Default is 0 (false)
+ * * **exclude** - Default is an empty array. An array, comma- or space-delimited string
  * of term ids to exclude from the return array. If 'include' is non-empty,
  * 'exclude' is ignored.
- *
- * include - Default is an empty array. An array, comma- or space-delimited string
+ * * **include** - Default is an empty array. An array, comma- or space-delimited string
  * of term ids to include in the return array.
- *
- * number - The maximum number of terms to return. Default is to return them all.
- *
- * offset - The number by which to offset the terms query.
- *
- * fields - Default is 'all', which returns an array of term objects.
- * If 'fields' is 'ids' or 'names', returns an array of
- * integers or strings, respectively.
- *
- * slug - Returns terms whose "slug" matches this value. Default is empty string.
- *
- * search - Returned terms' names will contain the value of 'search',
- * case-insensitive. Default is an empty string.
- *
- * The argument 'pad_counts', if set to true will include the quantity of a term's
- * children in the quantity of each term's "count" object variable.
- *
- * The 'get' argument, if set to 'all' instead of its default empty string,
- * returns terms regardless of ancestry or whether the terms are empty.
- *
- * The 'cache_domain' argument enables a unique cache key to be produced when this query is stored
- * in object cache. For instance, if you are using one of this function's filters to modify the
- * query (such as 'terms_clauses'), setting 'cache_domain' to a unique value will not overwrite
- * the cache for similar queries. Default value is 'core'.
- *
+ * * **number** - The maximum number of terms to return. Default is to return them all.
+ * * **offset** - The number by which to offset the terms query.
+ * * **fields** - Default is 'all', which returns an array of term objects.
+ * If 'fields' is 'ids' or 'names', returns an array of integers or strings, respectively.
+ * *  **slug** - Returns terms whose "slug" matches this value. Default is empty string.
+ * * **search** - Returned terms' names will contain the value of 'search',
+ * * **case-insensitive**. Default is an empty string.
  * @uses get_terms()
  * @link https://gist.github.com/3902494 Gist for creating an archive page of all the venues
@@ -359 +353 @@
  */
 function eo_get_venues($args=array()){
-    $args = wp_parse_args( $args, array('hide_empty'=>0 ) );
-    return get_terms('event-venue',$args);
+    $args = wp_parse_args( $args, array('hide_empty'=>0, 'fields'=>'all') );
+    $venues = get_terms('event-venue',$args);
+    if( $venues ){
+        //Ensure IDs are cast as integers {@link https://github.com/stephenh1988/Event-Organiser/issues/21}
+        if( $args['fields'] == 'ids' ){
+            $venues = array_map('intval', $venues);
+        }elseif( $args['fields'] == 'all' ){
+            foreach( $venues as $venue)
+                $venue->term_id = (int)$venue->term_id;
+        }
+    }
+    return $venues;
 }
 
@@ -367 +371 @@
  * Updates new venue in the database. 
  *
- * Calls wp_update_term to update the taxonomy term
+ * Calls  to update the taxonomy term
  * Updates venue meta data to database (for 'core' meta keys)
  * 
- * The $args is an array - the same as that accepted by wp_update_term
+ * The $args is an array - the same as that accepted by 
  * The $args array can also accept the following keys: description, address, postcode, country, latitude, longtitude
  *
  * @since 1.4.0
  *
- * @uses wp_update_term to update venue (taxonomy) term
+ * @uses wp_update_term to update venue (taxonomy) term
  * @uses do_action() Calls 'eventorganiser_save_venue' hook with the venue id
  *
@@ -424 +428 @@
  * Adds a new venue to the database. 
  *
- * Calls wp_insert_term to create the taxonomy term
+ * Calls  to create the taxonomy term
  * Adds venue meta data to database (for 'core' meta keys)
  * 
- * The $args is an array - the same as that accepted by wp_insert_term
- * The $args array can also accept the following keys: 
- * *  description, address, postcode, country, latitude, longtitude
+ * The $args is an array - the same as that accepted by `wp_insert_term()`
+ * The $args array can also accept the following keys: description, address, postcode, country, latitude, longtitude
  *
  * @since 1.4.0
  *
- * @uses wp_insert_term to create venue (taxonomy) term
+ * @uses  to create venue (taxonomy) term
  * @uses do_action() Calls 'eventorganiser_insert_venue' hook with the venue id
  * @uses do_action() Calls 'eventorganiser_save_venue' hook with the venue id
@@ -481 +484 @@
  * Deletes a venue in the database. 
  *
- * Calls wp_delete_term to delete the taxonomy term
+ * Calls  to delete the taxonomy term
  * Deletes all the venue's meta 
  * 
@@ -544 +547 @@
 
         //Cast zoom as integer
-        $zoom = (int) $args['zoom']; 
+        $ = (int) $args['zoom']; 
         
         //Escape attributes
@@ -627 +630 @@
  *
  * Use the $prev_value parameter to differentiate between meta fields with the
- * same key and venue ID. This may be used in place of `eo_add_venue_meta()` function. The first thing this function will do is make sure that `$meta_key` already exists on `$venue_id`. If it does not, `add_post_meta($venue_id, $meta_key, $meta_value)` is called instead and its result is returned. Returns meta_id if the meta doesn't exist, otherwise returns true on success and false on failure.
+ * same key and venue ID. This may be used in place of  function. The first thing this function will do is make sure that `$meta_key` already exists on `$venue_id`. If it does not, `add_post_meta($venue_id, $meta_key, $meta_value)` is called instead and its result is returned. Returns meta_id if the meta doesn't exist, otherwise returns true on success and false on failure.
  *
  * If the meta field for the venue does not exist, it will be added.

event-organiser/trunk/includes/event.php

@@ -6 +6 @@
 * This functions updates a post of event type, with data given in the $post_data
 * and event data given in $event_data. Returns the post_id. 
+
+
 *
 * The event data array can contain
@@ -106 +108 @@
 * and event data given in $event_data. Returns the post ID.
 *
+
+
 * The event data array can contain
 *
@@ -169 +173 @@
     }
 
-
 /**
 * Deletes all occurrences for an event (removes them from the eo_events table).
-* Triggers `eventorganiser_delete_event` (this action is used to break the caches).
+* Triggers  (this action is used to break the caches).
  * @since 1.5
  *
@@ -184 +187 @@
     $del = $wpdb->get_results($wpdb->prepare("DELETE FROM $wpdb->eo_events WHERE post_id=%d",$post_id));
 }
-
-
 
 /**

event-organiser/trunk/js/admin-calendar.js

@@ -6 +6 @@
     $('.eo-dialog').dialog({ 
         autoOpen: false,
-        width: 450,
+        width: ,
         modal:true
     });
@@ -114 +114 @@
                             }
                                 $("#eo_event_create_cal input[name='eo_event[event_title]']").val('');
-                                $("#eo_event_create_cal select[name='eo_event[Venue']] option:first-child").attr("selected", 'selected');
                                 $("#eo_event_create_cal input.ui-autocomplete-input").val('');
                                 $("#eo_event_create_cal textarea[name='eo_event[event_content]']").val('');

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

@@ -1 +1 @@
 (function(b){b(document).ready(function(){function a(){return b("<span class='fc-header-goto'><input type='hidden' id='miniCalendar'/></span>")}function c(f){var i=f.categories,h="<select class='eo-cal-filter' id='eo-event-cat'>";h+="<option value=''>"+f.buttonText.cat+"</option>";for(f=0;f<i.length;f++)h+="<option class='cat-slug-"+i[f].slug+" cat' value='"+i[f].slug+"'>"+i[f].name+"</option>";h+="</select>";return b("<span class='fc-header-dropdown filter-category'></span>").append(h)}function d(f){var i=
-f.venues,h="<select class='eo-cal-filter' id='eo-event-venue'>";h+="<option value=''>"+f.buttonText.venue+"</option>";for(f=0;f<i.length;f++)h+="<option value='"+i[f].term_id+"'>"+i[f].name+"</option>";h+="</select>";return b("<span class='fc-header-dropdown filter-venue'></span>").append(h)}b("#eo-dialog-tabs").tabs();b(".eo-dialog").dialog({autoOpen:false,width:450,modal:true});b("#events-meta").parent().find(".ui-dialog-titlebar-close").appendTo(".ui-tabs-nav").closest(".ui-dialog").children(".ui-dialog-titlebar").remove();
+f.venues,h="<select class='eo-cal-filter' id='eo-event-venue'>";h+="<option value=''>"+f.buttonText.venue+"</option>";for(f=0;f<i.length;f++)h+="<option value='"+i[f].term_id+"'>"+i[f].name+"</option>";h+="</select>";return b("<span class='fc-header-dropdown filter-venue'></span>").append(h)}b("#eo-dialog-tabs").tabs();b(".eo-dialog").dialog({autoOpen:false,width:,modal:true});b("#events-meta").parent().find(".ui-dialog-titlebar-close").appendTo(".ui-tabs-nav").closest(".ui-dialog").children(".ui-dialog-titlebar").remove();
 var e=b("#eofc_time_format").is(":checked")?"HH:mm":"h:mmtt",g=jQuery("#eo_admin_calendar").fullCalendar({firstDay:parseInt(EO_Ajax.startday),editable:false,lazyFetching:"true",eventColor:"#21759B",theme:true,customButtons:{category:c,venue:d,"goto":a},buttonText:{today:EO_Ajax.locale.today,month:EO_Ajax.locale.month,week:EO_Ajax.locale.week,day:EO_Ajax.locale.day,cat:EO_Ajax.locale.cat,venue:EO_Ajax.locale.venue},monthNames:EO_Ajax.locale.monthNames,monthNamesShort:EO_Ajax.locale.monthAbbrev,dayNames:EO_Ajax.locale.dayNames,
 dayNamesShort:EO_Ajax.locale.dayAbbrev,header:{left:"title",center:"category venue",right:"prev goto today next"},buttonIcons:false,buttonui:true,events:function(f,i,h){jQuery.ajax({url:EO_Ajax.ajaxurl+"?action=event-admin-cal",dataType:"JSON",data:{start:jQuery.fullCalendar.formatDate(f,"yyyy-MM-dd"),end:jQuery.fullCalendar.formatDate(i,"yyyy-MM-dd")},success:function(k){h(k)}})},categories:EO_Ajax.categories,venues:EO_Ajax.venues,selectable:true,selectHelper:true,eventRender:function(f){var i=jQuery(".filter-category .eo-cal-filter").val(),
 h=jQuery(".filter-venue .eo-cal-filter").val();if(typeof i!=="undefined"&&i!=""&&jQuery.inArray(i,f.category)<0)return"<div></div>";if(typeof h!=="undefined"&&h!=""&&h!=f.venue)return"<div></div>"},weekMode:"variable",aspectRatio:1.5,loading:function(f){f?jQuery("#loading").show():jQuery("#loading").hide()},timeFormat:e,axisFormat:e,eventClick:function(f,i){i.preventDefault();jQuery("#eo-dialog-tabs ul li").each(function(){var h=b(this).attr("id").substring(14);jQuery("#eo-dialog-tabs #"+b(this).attr("id")+
 "-content").html(f[h])});b("#events-meta").dialog("open")},select:function(f,i,h,k){if(EO_Ajax.perm_edit){k.preventDefault();k=jQuery(this)[0].calendar.options;var l=jQuery.fullCalendar.formatDate(f,"yyyy-MM-dd"),n=jQuery.fullCalendar.formatDate(f,"HH:mm"),m=jQuery.fullCalendar.formatDate(i,"yyyy-MM-dd"),o=jQuery.fullCalendar.formatDate(i,"HH:mm");if(h){e="ddd, dS MMMM";h=1}else{e="ddd, dS MMMM h(:mm)tt";h=0}if(l==m){f=jQuery.fullCalendar.formatDate(f,e,k);h||(f=f+" &mdash; "+jQuery.fullCalendar.formatDate(i,
-"h(:mm)tt",k))}else f=jQuery.fullCalendar.formatDate(f,e,k)+" &mdash; "+jQuery.fullCalendar.formatDate(i,e,k);b("#eo_event_create_cal input[name='eo_event[event_title]']").val("");b("#eo_event_create_cal select[name='eo_event[Venue']] option:first-child").attr("selected","selected");b("#eo_event_create_cal input.ui-autocomplete-input").val("");b("#eo_event_create_cal textarea[name='eo_event[event_content]']").val("");b("#eo_event_create_cal input[name='eo_event[StartDate]']").val(l);b("#eo_event_create_cal input[name='eo_event[StartTime]']").val(n);
-b("#eo_event_create_cal input[name='eo_event[EndDate]']").val(m);b("#eo_event_create_cal input[name='eo_event[FinishTime]']").val(o);b("#eo_event_create_cal input[name='eo_event[allday]']").val(h);b("#eo_event_create_cal td#date").html(f);b("#eo_event_create_cal").dialog("open");b("form.eo_cal input[type='submit']").removeAttr("disabled");b("form.eo_cal input#reset").click(function(){b("#eo_event_create_cal").dialog("close")})}}});b("#eofc_time_format").change(function(){e=b("#eofc_time_format").is(":checked")?
-"HH:mm":"h:mmtt";g.fullCalendar("option","timeFormat",e);b.post(ajaxurl,{action:"eofc-format-time",is24:b("#eofc_time_format").is(":checked")})});b(".view-button").click(function(f){f.preventDefault();b(".view-button").removeClass("active");g.fullCalendar("changeView",b(this).attr("id"));b(this).addClass("active")});b("#miniCalendar").datepicker({dateFormat:"DD, d MM, yy",firstDay:parseInt(EO_Ajax.startday),changeMonth:true,monthNamesShort:EO_Ajax.locale.monthAbbrev,dayNamesMin:EO_Ajax.locale.dayAbbrev,
-changeYear:true,showOn:"button",buttonText:EO_Ajax.locale.gotodate,onSelect:function(f){g.fullCalendar("gotoDate",new Date(Date.parse(f)))}});b("button.ui-datepicker-trigger").button();b(".eo-cal-filter").change(function(){g.fullCalendar("rerenderEvents")});b(".filter-venue .eo-cal-filter").selectmenu({wrapperElement:"<span class='fc-header-filter'></span>"});b(".filter-category .eo-cal-filter").selectmenu({wrapperElement:"<span class='fc-header-filter'></span>",icons:[{find:".cat"}]});var j=b("#eo-event-venue-button").width()+
-30;b("#eo-event-venue-button").width(j+"px");b("#eo-event-venue-menu").width(j+"px");j=b("#eo-event-cat-button").width()+30;b("#eo-event-cat-button").width(j+"px");b("#eo-event-cat-menu").width(j+"px")})})(jQuery);
+"h(:mm)tt",k))}else f=jQuery.fullCalendar.formatDate(f,e,k)+" &mdash; "+jQuery.fullCalendar.formatDate(i,e,k);b("#eo_event_create_cal input[name='eo_event[event_title]']").val("");b("#eo_event_create_cal );
+b("#eo_event_create_cal input[name='eo_event[
+,
++
+"px");b("#eo-event-venue-menu").width(j+"px");j=b("#eo-event-cat-button").width()+30;b("#eo-event-cat-button").width(j+"px");b("#eo-event-cat-menu").width(j+"px")})})(jQuery);
 (function(b){b.widget("ui.selectmenu",{options:{appendTo:"body",typeAhead:1E3,style:"dropdown",positionOptions:{my:"left top",at:"left bottom",offset:null},width:null,menuWidth:null,handleWidth:26,maxHeight:null,icons:null,format:null,escapeHtml:false,bgImage:function(){}},_create:function(){var a=this,c=this.options,d=(this.element.attr("id")||"ui-selectmenu-"+Math.random().toString(16).slice(2,10)).replace(/(:|\.)/g,"");this.ids=[d,d+"-button",d+"-menu"];this._safemouseup=true;this.isOpen=false;
 this.newelement=b("<a />",{"class":this.widgetBaseClass+" ui-widget ui-state-default ui-corner-all",id:this.ids[1],role:"button",href:"#nogo",tabindex:this.element.attr("disabled")?1:0,"aria-haspopup":true,"aria-owns":this.ids[2]});this.newelementWrap=b("<span />").append(this.newelement).insertAfter(this.element);(d=this.element.attr("tabindex"))&&this.newelement.attr("tabindex",d);this.newelement.data("selectelement",this.element);this.selectmenuIcon=b('<span class="'+this.widgetBaseClass+'-icon ui-icon"></span>').prependTo(this.newelement);

event-organiser/trunk/js/event.js

@@ +1 @@
+
+
+
 jQuery(document).ready(function($) {
 
@@ -25 +28 @@
 }
 
-    var eo_occurrences_by_rule = new Array;
-    var eo_include_dates;
-    var eo_exclude_dates;
     if ($('#eo_occurrence_includes').length > 0) {
         eo_include_dates = $('#eo_occurrence_includes').val().split(",");

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

@@ -1 @@
-jQuery(document).ready(function(b){function B(){b("#eo_occurrence_includes").val(w.join(",\r\n"));b("#eo_occurrence_excludes").val(x.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").attr("disabled",true);break;case "weekly":b(".reocurrence_row :input").attr("disabled",false);b("#HWSEvent_freq").val()>1?b("#recpan").text(n.weeks):b("#recpan").text(n.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",
-false);b("#HWSEvent_freq").val()>1?b("#recpan").text(n.months):b("#recpan").text(n.month);b(".reocurrence_row").fadeIn(700);b("#dayofmonthrepeat").fadeIn(700);b("#dayofmonthrepeat :input").attr("disabled",false);b("#dayofweekrepeat").hide();b("#dayofweekrepeat :input").attr("disabled",true);break;case "daily":b(".reocurrence_row :input").attr("disabled",false);b(".reocurrence_row").fadeIn(700);b("#HWSEvent_freq").val()>1?b("#recpan").text(n.days):b("#recpan").text(n.day);b("#dayofweekrepeat").hide();
-b("#dayofweekrepeat :input").attr("disabled",true);b("#dayofmonthrepeat").hide();b("#dayofmonthrepeat :radio").attr("disabled",true);break;case "yearly":b(".reocurrence_row :input").attr("disabled",false);b(".reocurrence_row").fadeIn(700);b("#HWSEvent_freq").val()>1?b("#recpan").text(n.years):b("#recpan").text(n.year);b("#dayofweekrepeat").hide();b("#dayofweekrepeat :input").attr("disabled",true);b("#dayofmonthrepeat").hide();b("#dayofmonthrepeat :radio").attr("disabled",true);break}b("#venue_select").val()===
-null&&b("tr.venue_row").hide();q()}function q(){if(b("#HWSEventInput_Req").val()=="once")b("#event_summary").html("This event will be a one-time event");else{var g=b("#from_date").datepicker("getDate"),h=EO_Ajax_Event.locale.weekDay,u=new Array("SU","MO","TU","WE","TH","FR","SA"),o={monthNamesShort:EO_Ajax_Event.locale.monthAbbrev,dayNamesMin:EO_Ajax_Event.locale.dayAbbrev,monthNames:EO_Ajax_Event.locale.monthNames};b("#HWSEventInput_Req :selected").text();var i=parseInt(b("#HWSEvent_freq").val()),
-m=n.summary+" ";switch(b("#HWSEventInput_Req").val()){case "custom":case "daily":m+=i>1?sprintf(n.dayPlural,i):n.daySingle;break;case "weekly":m+=i>1?sprintf(n.weekPlural,i):n.weekSingle;i=b("#dayofweekrepeat :checkbox:checked");if(i.length==0){i=g.getDay();b("#dayofweekrepeat :checkbox[value='"+u[i]+"']").attr("checked",true)}i=b("#dayofweekrepeat :checkbox:checked");i.each(function(p){if(p==0)m=m+" "+h[u.indexOf(b(this).val())];if(p>0)m=m+", "+h[u.indexOf(b(this).val())]});break;case "monthly":m+=
-i>1?sprintf(n.monthPlural,i):n.monthSingle;if(b("#dayofmonthrepeat :radio:checked").val()=="BYMONTHDAY=")m=m+" "+g.getDate()+a(g);else{i=g.getDay()%7;g=parseInt(Math.floor((g.getDate()-1)/7));m=m+" "+n.occurrence[g]+" "+h[i]}break;case "yearly":m+=i>1?sprintf(n.yearPlural,i):n.yearSingle;m=m+" "+b.datepicker.formatDate("MM d",g,o)+a(g);break}g=b("#recend").datepicker("getDate");if(g!=null)m=m+" "+n.until+" "+b.datepicker.formatDate("MM d'"+a(g)+"' yy",g,o);b("#event_summary").html(m)}}function a(g){return["th",
-"st","nd","rd"][3<g.getDate()&&g.getDate()<20?0:Math.min(g.getDate()%10,4)%4]}function c(){x=[];w=[];B();f(eo_viewing_month[0],eo_viewing_month[1],{});y.datepicker("refresh")}function e(g){g=b.datepicker.formatDate("yy-mm-dd",g);if(d(g)[0])return[true,"ui-state-active",""];return[true,"ui-state-disabled",""]}function d(g){if(b.inArray(g,s)>-1){g=b.inArray(g,x);return g>-1?[false,g]:[true,-1]}else{g=b.inArray(g,w);return g>-1?[true,g]:[false,-1]}}function f(g,h){s=[];eo_viewing_month=[g,h];var u=b("#HWSEventInput_Req").val(),
-o=parseInt(b("#HWSEvent_freq").val()),i=b("#from_date").datepicker("getDate"),m=b("#recend").datepicker("getDate");h-=1;var p=new Date(g,h,1),z=new Date(new Date(g,h+1,1)-1);if(!(m<p||i>z)){switch(u){case "once":case "custom":g=b.datepicker.formatDate("yy-mm-dd",i);s.push(g);return;case "daily":if(i<p){var C=Math.abs((p-i)/864E5)-1;C%=o}else C=parseInt(i.getDate());h=o;var G=[],E=new Date(p);E.setDate(p.getDate()+(C-1));G.push(E);break;case "weekly":var r=p.getDay();r=b("#dayofweekrepeat :checkbox:checked");
-var J=new Array("SU","MO","TU","WE","TH","FR","SA");G=[];r.each(function(I){I=J.indexOf(b(this).val());E=new Date(i);E.setDate(i.getDate()+(I-i.getDay()+7)%7);if(E<p){C=Math.abs((p-i)/864E5);C-=C%(o*7);E.setDate(E.getDate()+C)}G.push(E)});h=7*o;break;case "monthly":if(((g-i.getFullYear())*12+h-(i.getMonth()+1))%o!=0)return;if(b('input[name="eo_input[schedule_meta]"]:checked').val()=="BYMONTHDAY="){var F=i.getDate();z=z.getDate();if(F<=z)r=new Date(g,h,F)}else{g=Math.ceil(i.getDate()/7);F=i.getDay();
-if(g>=5){r=z.getDay();z=z.getDate()+(F-r-7)%7}else{r=p.getDay();z=(F-r+7)%7+(g-1)*7+1}r=new Date(p);r.setDate(z)}if(r<=m){g=b.datepicker.formatDate("yy-mm-dd",r);s.push(g)}return;case "yearly":if((g-i.getFullYear())%o!=0)return;z=new Date(g,i.getMonth(),i.getDate());if(h==i.getMonth()&&z.getMonth()==i.getMonth()){r=new Date(i);r.setYear(g);if(r<=m){g=b.datepicker.formatDate("yy-mm-dd",r);s.push(g)}}return;default:return}for(F in G)for(r=new Date(G[F]);r<=z&&r<=m;){g=b.datepicker.formatDate("yy-mm-dd",
-r);s.push(g);r.setDate(r.getDate()+h)}}}function j(g){var h=d(g);if(h[0]){h=h[1];h>-1?k(h):t(g)}else{h=h[1];h>-1?A(h):l(g)}B()}function l(g){b.inArray(g,w)<0&&w.push(g)}function k(g){w.splice(g,1)}function t(g){b.inArray(g,x)<0&&x.push(g)}function A(g){x.splice(g,1)}if(!Array.prototype.indexOf)Array.prototype.indexOf=function(g,h){var u=this.length;h=Number(h)||0;h=h<0?Math.ceil(h):Math.floor(h);if(h<0)h+=u;for(;h<u;h++)if(h in this&&this[h]===g)return h;return-1};var s=[],w,x;if(b("#eo_occurrence_includes").length>
-0){w=b("#eo_occurrence_includes").val().split(",");x=b("#eo_occurrence_excludes").val().split(",")}b(document).ready(function(){b.widget("ui.combobox",{_create:function(){var g,h=this.element.hide(),u=h.children(":selected");u=u.val()?u.text():"";h=b("<span>").addClass("ui-combobox eo-venue-input").insertAfter(h);g=b("<input>").appendTo(h).val(u).addClass("ui-combobox-input").autocomplete({delay:0,minLength:0,source:function(o,i){b.getJSON(EO_Ajax_Event.ajaxurl+"?callback=?&action=eo-search-venue",
-o,function(m){m=b.map(m,function(p){p.label=p.name;return p});i(m)})},select:function(o,i){if(b("tr.venue_row").length>0){i.item.term_id==0?b("tr.venue_row").hide():b("tr.venue_row").show();b("#eventorganiser_event_detail tr.eo-add-new-venue").hide();eo_initialize_map(i.item.venue_lat,i.item.venue_lng)}b("#venue_select").removeAttr("selected");b("#venue_select").val(i.item.term_id)}}).addClass("ui-widget-content ui-corner-left");g.data("autocomplete")._renderItem=function(o,i){if(i.term_id==0)return b("<li></li>").data("item.autocomplete",
-i).append("<a>"+i.label+"</a>").appendTo(o);var m=[i.venue_address,i.venue_postal,i.venue_country];m=b.grep(m,function(p){return p});return b("<li></li>").data("item.autocomplete",i).append("<a>"+i.label+"</br> <span style='font-size: 0.8em'><em>"+m.join(", ")+"</span></em></a>").appendTo(o)};h=b("<span>").addClass("eo-venue-combobox-buttons").appendTo(h);b("<a style='vertical-align: top;margin: 0px -1px;padding: 0px;height: 21px;'>").attr("title","Show All Items").appendTo(h).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(h).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();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 o=EO_Ajax_Event.location;if(o){o=o.split("/");o=o[o.length-1];eventorganiser_code_address(o)}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("");b("#eventorganiser_event_detail tr.eo-add-new-venue").hide();
-b("#eventorganiser_event_detail tr.venue_row ").hide()});var n=EO_Ajax_Event.locale;if(b("#eventorganiser_detail #from_date, #eventorganiser_detail #to_date").length>0){var H=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 h=
-this.id=="from_date"?"minDate":"maxDate",u=b(this).data("datepicker");g=b.datepicker.parseDate(u.settings.dateFormat||b.datepicker._defaults.dateFormat,g,u.settings);H.not(this).datepicker("option",h,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 D=!b(this).prop("checked");b(".reoccurence .event-date :input").attr("disabled",D);b(".reoccurence .event-date :input").toggleClass("ui-state-disabled",D)}b(".eo_occurrence_toogle").click(function(g){g.preventDefault();
-g.stopPropagation();y.toggle()});D=new Date;f(D.getFullYear(),D.getMonth()+1,{});var y=b("#eo_occurrence_datepicker");y.length>0&&y.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(){y.hide()});y.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 B(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,t;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',
+var eo_occurrences_by_rule=[],eo_include_dates,eo_exclude_dates;
+jQuery(document).ready(function(b){function A(){b("#eo_occurrence_includes").val(eo_include_dates.join(",\r\n"));b("#eo_occurrence_excludes").val(eo_exclude_dates.join(",\r\n"))}function u(){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").attr("disabled",true);break;case "weekly":b(".reocurrence_row :input").attr("disabled",false);b("#HWSEvent_freq").val()>1?b("#recpan").text(m.weeks):b("#recpan").text(m.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",
+false);b("#HWSEvent_freq").val()>1?b("#recpan").text(m.months):b("#recpan").text(m.month);b(".reocurrence_row").fadeIn(700);b("#dayofmonthrepeat").fadeIn(700);b("#dayofmonthrepeat :input").attr("disabled",false);b("#dayofweekrepeat").hide();b("#dayofweekrepeat :input").attr("disabled",true);break;case "daily":b(".reocurrence_row :input").attr("disabled",false);b(".reocurrence_row").fadeIn(700);b("#HWSEvent_freq").val()>1?b("#recpan").text(m.days):b("#recpan").text(m.day);b("#dayofweekrepeat").hide();
+b("#dayofweekrepeat :input").attr("disabled",true);b("#dayofmonthrepeat").hide();b("#dayofmonthrepeat :radio").attr("disabled",true);break;case "yearly":b(".reocurrence_row :input").attr("disabled",false);b(".reocurrence_row").fadeIn(700);b("#HWSEvent_freq").val()>1?b("#recpan").text(m.years):b("#recpan").text(m.year);b("#dayofweekrepeat").hide();b("#dayofweekrepeat :input").attr("disabled",true);b("#dayofmonthrepeat").hide();b("#dayofmonthrepeat :radio").attr("disabled",true);break}b("#venue_select").val()===
+null&&b("tr.venue_row").hide();r()}function r(){if(b("#HWSEventInput_Req").val()=="once")b("#event_summary").html("This event will be a one-time event");else{var g=b("#from_date").datepicker("getDate"),j=EO_Ajax_Event.locale.weekDay,p=new Array("SU","MO","TU","WE","TH","FR","SA"),o={monthNamesShort:EO_Ajax_Event.locale.monthAbbrev,dayNamesMin:EO_Ajax_Event.locale.dayAbbrev,monthNames:EO_Ajax_Event.locale.monthNames};b("#HWSEventInput_Req :selected").text();var h=parseInt(b("#HWSEvent_freq").val()),
+n=m.summary+" ";switch(b("#HWSEventInput_Req").val()){case "custom":case "daily":n+=h>1?sprintf(m.dayPlural,h):m.daySingle;break;case "weekly":n+=h>1?sprintf(m.weekPlural,h):m.weekSingle;h=b("#dayofweekrepeat :checkbox:checked");if(h.length==0){h=g.getDay();b("#dayofweekrepeat :checkbox[value='"+p[h]+"']").attr("checked",true)}h=b("#dayofweekrepeat :checkbox:checked");h.each(function(s){if(s==0)n=n+" "+j[p.indexOf(b(this).val())];if(s>0)n=n+", "+j[p.indexOf(b(this).val())]});break;case "monthly":n+=
+h>1?sprintf(m.monthPlural,h):m.monthSingle;if(b("#dayofmonthrepeat :radio:checked").val()=="BYMONTHDAY=")n=n+" "+g.getDate()+a(g);else{h=g.getDay()%7;g=parseInt(Math.floor((g.getDate()-1)/7));n=n+" "+m.occurrence[g]+" "+j[h]}break;case "yearly":n+=h>1?sprintf(m.yearPlural,h):m.yearSingle;n=n+" "+b.datepicker.formatDate("MM d",g,o)+a(g);break}g=b("#recend").datepicker("getDate");if(g!=null)n=n+" "+m.until+" "+b.datepicker.formatDate("MM d'"+a(g)+"' yy",g,o);b("#event_summary").html(n)}}function a(g){return["th",
+"st","nd","rd"][3<g.getDate()&&g.getDate()<20?0:Math.min(g.getDate()%10,4)%4]}function c(){eo_exclude_dates=[];eo_include_dates=[];A();f(eo_viewing_month[0],eo_viewing_month[1],{});y.datepicker("refresh")}function e(g){g=b.datepicker.formatDate("yy-mm-dd",g);if(d(g)[0])return[true,"ui-state-active",""];return[true,"ui-state-disabled",""]}function d(g){if(b.inArray(g,eo_occurrences_by_rule)>-1){g=b.inArray(g,eo_exclude_dates);return g>-1?[false,g]:[true,-1]}else{g=b.inArray(g,eo_include_dates);return g>
+-1?[true,g]:[false,-1]}}function f(g,j){eo_occurrences_by_rule=[];eo_viewing_month=[g,j];var p=b("#HWSEventInput_Req").val(),o=parseInt(b("#HWSEvent_freq").val()),h=b("#from_date").datepicker("getDate"),n=b("#recend").datepicker("getDate");j-=1;var s=new Date(g,j,1),v=new Date(new Date(g,j+1,1)-1);if(!(n<s||h>v)){switch(p){case "once":case "custom":g=b.datepicker.formatDate("yy-mm-dd",h);eo_occurrences_by_rule.push(g);return;case "daily":if(h<s){var C=Math.abs((s-h)/864E5)-1;C%=o}else C=parseInt(h.getDate());
+j=o;var D=[],B=new Date(s);B.setDate(s.getDate()+(C-1));D.push(B);break;case "weekly":var q=s.getDay();q=b("#dayofweekrepeat :checkbox:checked");var G=new Array("SU","MO","TU","WE","TH","FR","SA");D=[];q.each(function(F){F=G.indexOf(b(this).val());B=new Date(h);B.setDate(h.getDate()+(F-h.getDay()+7)%7);if(B<s){C=Math.abs((s-h)/864E5);C-=C%(o*7);B.setDate(B.getDate()+C)}D.push(B)});j=7*o;break;case "monthly":if(((g-h.getFullYear())*12+j-(h.getMonth()+1))%o!=0)return;if(b('input[name="eo_input[schedule_meta]"]:checked').val()==
+"BYMONTHDAY="){var E=h.getDate();v=v.getDate();if(E<=v)q=new Date(g,j,E)}else{g=Math.ceil(h.getDate()/7);E=h.getDay();if(g>=5){q=v.getDay();v=v.getDate()+(E-q-7)%7}else{q=s.getDay();v=(E-q+7)%7+(g-1)*7+1}q=new Date(s);q.setDate(v)}if(q<=n){g=b.datepicker.formatDate("yy-mm-dd",q);eo_occurrences_by_rule.push(g)}return;case "yearly":if((g-h.getFullYear())%o!=0)return;v=new Date(g,h.getMonth(),h.getDate());if(j==h.getMonth()&&v.getMonth()==h.getMonth()){q=new Date(h);q.setYear(g);if(q<=n){g=b.datepicker.formatDate("yy-mm-dd",
+q);eo_occurrences_by_rule.push(g)}}return;default:return}for(E in D)for(q=new Date(D[E]);q<=v&&q<=n;){g=b.datepicker.formatDate("yy-mm-dd",q);eo_occurrences_by_rule.push(g);q.setDate(q.getDate()+j)}}}function i(g){var j=d(g);if(j[0]){j=j[1];j>-1?k(j):t(g)}else{j=j[1];j>-1?w(j):l(g)}A()}function l(g){b.inArray(g,eo_include_dates)<0&&eo_include_dates.push(g)}function k(g){eo_include_dates.splice(g,1)}function t(g){b.inArray(g,eo_exclude_dates)<0&&eo_exclude_dates.push(g)}function w(g){eo_exclude_dates.splice(g,
+1)}if(!Array.prototype.indexOf)Array.prototype.indexOf=function(g,j){var p=this.length;j=Number(j)||0;j=j<0?Math.ceil(j):Math.floor(j);if(j<0)j+=p;for(;j<p;j++)if(j in this&&this[j]===g)return j;return-1};if(b("#eo_occurrence_includes").length>0){eo_include_dates=b("#eo_occurrence_includes").val().split(",");eo_exclude_dates=b("#eo_occurrence_excludes").val().split(",")}b(document).ready(function(){b.widget("ui.combobox",{_create:function(){var g,j=this.element.hide(),p=j.children(":selected");p=
+p.val()?p.text():"";j=b("<span>").addClass("ui-combobox eo-venue-input").insertAfter(j);g=b("<input>").appendTo(j).val(p).addClass("ui-combobox-input").autocomplete({delay:0,minLength:0,source:function(o,h){b.getJSON(EO_Ajax_Event.ajaxurl+"?callback=?&action=eo-search-venue",o,function(n){n=b.map(n,function(s){s.label=s.name;return s});h(n)})},select:function(o,h){if(b("tr.venue_row").length>0){h.item.term_id==0?b("tr.venue_row").hide():b("tr.venue_row").show();b("#eventorganiser_event_detail tr.eo-add-new-venue").hide();
+eo_initialize_map(h.item.venue_lat,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(o,h){if(h.term_id==0)return b("<li></li>").data("item.autocomplete",h).append("<a>"+h.label+"</a>").appendTo(o);var n=[h.venue_address,h.venue_postal,h.venue_country];n=b.grep(n,function(s){return s});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(o)};j=b("<span>").addClass("eo-venue-combobox-buttons").appendTo(j);b("<a style='vertical-align: top;margin: 0px -1px;padding: 0px;height: 21px;'>").attr("title","Show All Items").appendTo(j).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(j).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();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 o=EO_Ajax_Event.location;if(o){o=o.split("/");o=o[o.length-1];eventorganiser_code_address(o)}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("");b("#eventorganiser_event_detail tr.eo-add-new-venue").hide();b("#eventorganiser_event_detail tr.venue_row ").hide()});var m=EO_Ajax_Event.locale;if(b("#eventorganiser_detail #from_date, #eventorganiser_detail #to_date").length>
+0){var z=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 j=this.id=="from_date"?"minDate":"maxDate",p=b(this).data("datepicker");g=b.datepicker.parseDate(p.settings.dateFormat||b.datepicker._defaults.dateFormat,
+g,p.settings);z.not(this).datepicker("option",j,g);this.id=="from_date"&&b("#recend").datepicker("option","minDate",g);c();u()}});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(){u()});b(".reoccurence .event-date :input, .onetime .event-date :input").not(".eo_time").change(function(){u();b(this).attr("id")!="eo_allday"&&c()});u();var x=!b(this).prop("checked");b(".reoccurence .event-date :input").attr("disabled",x);b(".reoccurence .event-date :input").toggleClass("ui-state-disabled",x)}b(".eo_occurrence_toogle").click(function(g){g.preventDefault();g.stopPropagation();y.toggle()});x=new Date;f(x.getFullYear(),x.getMonth()+1,{});var y=b("#eo_occurrence_datepicker");
+y.length>0&&y.datepicker({dateFormat:"yy-mm-dd",onSelect:i,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(){y.hide()});y.find(".ui-datepicker-inline").click(function(g){if(!g)g=window.event;g.cancelBubble=true;g.stopPropagation&&g.stopPropagation()})});
+var sprintf=function(){function b(r){return Object.prototype.toString.call(r).slice(8,-1).toLowerCase()}function A(r,a){for(var c=[];a>0;c[--a]=r);return c.join("")}var u=function(){u.cache.hasOwnProperty(arguments[0])||(u.cache[arguments[0]]=u.parse(arguments[0]));return u.format.call(null,u.cache[arguments[0]],arguments)};u.format=function(r,a){var c=1,e=r.length,d="",f=[],i,l,k,t;for(i=0;i<e;i++){d=b(r[i]);if(d==="string")f.push(r[i]);else if(d==="array"){k=r[i];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',
 k[2][l]);d=d[k[2][l]]}}else d=k[1]?a[k[1]]:a[c++];if(/[^s]/.test(k[8])&&b(d)!="number")throw sprintf("[sprintf] expecting number but found %s",b(d));switch(k[8]){case "b":d=d.toString(2);break;case "c":d=String.fromCharCode(d);break;case "d":d=parseInt(d,10);break;case "e":d=k[7]?d.toExponential(k[7]):d.toExponential();break;case "f":d=k[7]?parseFloat(d).toFixed(k[7]):parseFloat(d);break;case "o":d=d.toString(8);break;case "s":d=(d=String(d))&&k[7]?d.substring(0,k[7]):d;break;case "u":d=Math.abs(d);
-break;case "x":d=d.toString(16);break;case "X":d=d.toString(16).toUpperCase();break}d=/[def]/.test(k[8])&&k[3]&&d>=0?"+"+d:d;l=k[4]?k[4]=="0"?"0":k[4].charAt(1):" ";t=k[6]-String(d).length;l=k[6]?B(l,t):"";f.push(k[5]?d+l:l+d)}}return f.join("")};v.cache={};v.parse=function(q){q=q;for(var a=[],c=[],e=0;q;){if((a=/^[^\x25]+/.exec(q))!==null)c.push(a[0]);else if((a=/^\x25{2}/.exec(q))!==null)c.push("%");else if((a=/^\x25(?:([1-9]\d*)\$|\(([^\)]+)\))?(\+)?(0|'[^$])?(-)?(\d+)?(?:\.(\d+))?([b-fosuxX])/.exec(q))!==
-null){if(a[2]){e|=1;var d=[],f=a[2],j=[];if((j=/^([a-z_][a-z_\d]*)/i.exec(f))!==null)for(d.push(j[1]);(f=f.substring(j[0].length))!=="";)if((j=/^\.([a-z_][a-z_\d]*)/i.exec(f))!==null)d.push(j[1]);else if((j=/^\[(\d+)\]/.exec(f))!==null)d.push(j[1]);else throw"[sprintf] huh?";else throw"[sprintf] huh?";a[2]=d}else e|=2;if(e===3)throw"[sprintf] mixing positional and named placeholders is not (yet) supported";c.push(a)}else throw"[sprintf] huh?";q=q.substring(a[0].length)}return c};return v}(),vsprintf=
-function(b,B){B.unshift(b);return sprintf.apply(null,B)};
-(function(b){function B(){this._curInst=null;this._disabledInputs=[];this._inDialog=this._timepickerShowing=false;this._dialogClass="ui-timepicker-dialog";this._mainDivId="ui-timepicker-div";this._inlineClass="ui-timepicker-inline";this._currentClass="ui-timepicker-current";this._dayOverClass="ui-timepicker-days-cell-over";this.regional=[];this.regional[""]={hourText:"Hour",minuteText:"Minute",amPmText:["AM","PM"],closeButtonText:"Done",nowButtonText:"Now",deselectButtonText:"Deselect"};this._defaults=
+break;case "x":d=d.toString(16);break;case "X":d=d.toString(16).toUpperCase();break}d=/[def]/.test(k[8])&&k[3]&&d>=0?"+"+d:d;l=k[4]?k[4]=="0"?"0":k[4].charAt(1):" ";t=k[6]-String(d).length;l=k[6]?))!==
+null){if(a[2]){e|=1;var d=[],f=a[2],}(),vsprintf=
+function(b,)};
+(function(b){function (){this._curInst=null;this._disabledInputs=[];this._inDialog=this._timepickerShowing=false;this._dialogClass="ui-timepicker-dialog";this._mainDivId="ui-timepicker-div";this._inlineClass="ui-timepicker-inline";this._currentClass="ui-timepicker-current";this._dayOverClass="ui-timepicker-days-cell-over";this.regional=[];this.regional[""]={hourText:"Hour",minuteText:"Minute",amPmText:["AM","PM"],closeButtonText:"Done",nowButtonText:"Now",deselectButtonText:"Deselect"};this._defaults=
 {showOn:"focus",button:null,showAnim:"fadeIn",showOptions:{},appendText:"",beforeShow:null,onSelect:null,onClose:null,timeSeparator:":",periodSeparator:" ",showPeriod:false,showPeriodLabels:true,showLeadingZero:true,showMinutesLeadingZero:true,altField:"",defaultTime:"now",myPosition:"left top",atPosition:"left bottom",onHourShow:null,onMinuteShow:null,hours:{starts:0,ends:23},minutes:{starts:0,ends:55,interval:5},rows:4,showHours:true,showMinutes:true,optionalMinutes:false,showCloseButton:false,
-showNowButton:false,showDeselectButton:false};b.extend(this._defaults,this.regional[""]);this.tpDiv=b('<div id="'+this._mainDivId+'" class="ui-timepicker ui-widget ui-helper-clearfix ui-corner-all " style="display: none"></div>')}function v(a,c){b.extend(a,c);for(var e in c)if(c[e]==null||c[e]==undefined)a[e]=c[e];return a}b.extend(b.ui,{timepicker:{version:"0.3.1"}});var q=(new Date).getTime();b.extend(B.prototype,{markerClassName:"hasTimepicker",log:function(){},_widgetTimepicker:function(){return this.tpDiv},
-setDefaults:function(a){v(this._defaults,a||{});return this},_attachTimepicker:function(a,c){var e=null;for(var d in this._defaults){var f=a.getAttribute("time:"+d);if(f){e=e||{};try{e[d]=eval(f)}catch(j){e[d]=f}}}d=a.nodeName.toLowerCase();f=d=="div"||d=="span";if(!a.id){this.uuid+=1;a.id="tp"+this.uuid}var l=this._newInst(b(a),f);l.settings=b.extend({},c||{},e||{});if(d=="input"){this._connectTimepicker(a,l);this._setTimeFromField(l)}else f&&this._inlineTimepicker(a,l)},_newInst:function(a,c){return{id:a[0].id.replace(/([^A-Za-z0-9_-])/g,
-"\\\\$1"),input:a,inline:c,tpDiv:!c?this.tpDiv:b('<div class="'+this._inlineClass+' ui-timepicker ui-widget  ui-helper-clearfix"></div>')}},_connectTimepicker:function(a,c){var e=b(a);c.append=b([]);c.trigger=b([]);if(!e.hasClass(this.markerClassName)){this._attachments(e,c);e.addClass(this.markerClassName).keydown(this._doKeyDown).keyup(this._doKeyUp).bind("setData.timepicker",function(d,f,j){c.settings[f]=j}).bind("getData.timepicker",function(d,f){return this._get(c,f)});b.data(a,"timepicker",
+showNowButton:false,showDeselectButton:false};b.extend(this._defaults,this.regional[""]);this.tpDiv=b('<div id="'+this._mainDivId+'" class="ui-timepicker ui-widget ui-helper-clearfix ui-corner-all " style="display: none"></div>')}function .prototype,{markerClassName:"hasTimepicker",log:function(){},_widgetTimepicker:function(){return this.tpDiv},
+setDefaults:function(a){){e[d]=f}}}d=a.nodeName.toLowerCase();f=d=="div"||d=="span";if(!a.id){this.uuid+=1;a.id="tp"+this.uuid}var l=this._newInst(b(a),f);l.settings=b.extend({},c||{},e||{});if(d=="input"){this._connectTimepicker(a,l);this._setTimeFromField(l)}else f&&this._inlineTimepicker(a,l)},_newInst:function(a,c){return{id:a[0].id.replace(/([^A-Za-z0-9_-])/g,
+"\\\\$1"),input:a,inline:c,tpDiv:!c?this.tpDiv:b('<div class="'+this._inlineClass+' ui-timepicker ui-widget  ui-helper-clearfix"></div>')}},_connectTimepicker:function(a,c){var e=b(a);c.append=b([]);c.trigger=b([]);if(!e.hasClass(this.markerClassName)){this._attachments(e,c);e.addClass(this.markerClassName).keydown(this._doKeyDown).keyup(this._doKeyUp).bind("setData.timepicker",function(d,f,}).bind("getData.timepicker",function(d,f){return this._get(c,f)});b.data(a,"timepicker",
 c)}},_doKeyDown:function(a){var c=b.timepicker._getInst(a.target),e=true;c._keyEvent=true;if(b.timepicker._timepickerShowing)switch(a.keyCode){case 9:b.timepicker._hideTimepicker();e=false;break;case 13:b.timepicker._updateSelectedValue(c);b.timepicker._hideTimepicker();return false;case 27:b.timepicker._hideTimepicker();break;default:e=false}else if(a.keyCode==36&&a.ctrlKey)b.timepicker._showTimepicker(this);else e=false;if(e){a.preventDefault();a.stopPropagation()}},_doKeyUp:function(a){a=b.timepicker._getInst(a.target);
 b.timepicker._setTimeFromField(a);b.timepicker._updateTimepicker(a)},_attachments:function(a,c){var e=this._get(c,"appendText"),d=this._get(c,"isRTL");c.append&&c.append.remove();if(e){c.append=b('<span class="'+this._appendClass+'">'+e+"</span>");a[d?"before":"after"](c.append)}a.unbind("focus.timepicker",this._showTimepicker);a.unbind("click.timepicker",this._adjustZIndex);c.trigger&&c.trigger.remove();e=this._get(c,"showOn");if(e=="focus"||e=="both"){a.bind("focus.timepicker",this._showTimepicker);
-a.bind("click.timepicker",this._adjustZIndex)}if(e=="button"||e=="both"){e=this._get(c,"button");b(e).bind("click.timepicker",function(){if(b.timepicker._timepickerShowing&&b.timepicker._lastInput==a[0])b.timepicker._hideTimepicker();else c.input.is(":disabled")||b.timepicker._showTimepicker(a[0]);return false})}},_inlineTimepicker:function(a,c){var e=b(a);if(!e.hasClass(this.markerClassName)){e.addClass(this.markerClassName).append(c.tpDiv).bind("setData.timepicker",function(d,f,j){c.settings[f]=
-j}).bind("getData.timepicker",function(d,f){return this._get(c,f)});b.data(a,"timepicker",c);this._setTimeFromField(c);this._updateTimepicker(c);c.tpDiv.show()}},_adjustZIndex:function(a){a=a.target||a;b.timepicker._getInst(a).tpDiv.css("zIndex",b.timepicker._getZIndex(a)+1)},_showTimepicker:function(a){a=a.target||a;if(a.nodeName.toLowerCase()!="input")a=b("input",a.parentNode)[0];if(!(b.timepicker._isDisabledTimepicker(a)||b.timepicker._lastInput==a)){b.timepicker._hideTimepicker();var c=b.timepicker._getInst(a);
-b.timepicker._curInst&&b.timepicker._curInst!=c&&b.timepicker._curInst.tpDiv.stop(true,true);var e=b.timepicker._get(c,"beforeShow");v(c.settings,e?e.apply(a,[a,c]):{});c.lastVal=null;b.timepicker._lastInput=a;b.timepicker._setTimeFromField(c);if(b.timepicker._inDialog)a.value="";if(!b.timepicker._pos){b.timepicker._pos=b.timepicker._findPos(a);b.timepicker._pos[1]+=a.offsetHeight}var d=false;b(a).parents().each(function(){d|=b(this).css("position")=="fixed";return!d});if(d&&b.browser.opera){b.timepicker._pos[0]-=
+a.bind("click.timepicker",this._adjustZIndex)}if(e=="button"||e=="both"){e=this._get(c,"button");b(e).bind("click.timepicker",function(){if(b.timepicker._timepickerShowing&&b.timepicker._lastInput==a[0])b.timepicker._hideTimepicker();else c.input.is(":disabled")||b.timepicker._showTimepicker(a[0]);return false})}},_inlineTimepicker:function(a,c){var e=b(a);if(!e.hasClass(this.markerClassName)){e.addClass(this.markerClassName).append(c.tpDiv).bind("setData.timepicker",function(d,f,){c.settings[f]=
+}).bind("getData.timepicker",function(d,f){return this._get(c,f)});b.data(a,"timepicker",c);this._setTimeFromField(c);this._updateTimepicker(c);c.tpDiv.show()}},_adjustZIndex:function(a){a=a.target||a;b.timepicker._getInst(a).tpDiv.css("zIndex",b.timepicker._getZIndex(a)+1)},_showTimepicker:function(a){a=a.target||a;if(a.nodeName.toLowerCase()!="input")a=b("input",a.parentNode)[0];if(!(b.timepicker._isDisabledTimepicker(a)||b.timepicker._lastInput==a)){b.timepicker._hideTimepicker();var c=b.timepicker._getInst(a);
+b.timepicker._curInst&&b.timepicker._curInst!=c&&b.timepicker._curInst.tpDiv.stop(true,true);var e=b.timepicker._get(c,"beforeShow");(c.settings,e?e.apply(a,[a,c]):{});c.lastVal=null;b.timepicker._lastInput=a;b.timepicker._setTimeFromField(c);if(b.timepicker._inDialog)a.value="";if(!b.timepicker._pos){b.timepicker._pos=b.timepicker._findPos(a);b.timepicker._pos[1]+=a.offsetHeight}var d=false;b(a).parents().each(function(){d|=b(this).css("position")=="fixed";return!d});if(d&&b.browser.opera){b.timepicker._pos[0]-=
 document.documentElement.scrollLeft;b.timepicker._pos[1]-=document.documentElement.scrollTop}e={left:b.timepicker._pos[0],top:b.timepicker._pos[1]};b.timepicker._pos=null;c.tpDiv.css({position:"absolute",display:"block",top:"-1000px"});b.timepicker._updateTimepicker(c);if(!c.inline&&typeof b.ui.position=="object"){c.tpDiv.position({of:c.input,my:b.timepicker._get(c,"myPosition"),at:b.timepicker._get(c,"atPosition"),collision:"flip"});e=c.tpDiv.offset();b.timepicker._pos=[e.top,e.left]}c._hoursClicked=
-false;c._minutesClicked=false;e=b.timepicker._checkOffset(c,e,d);c.tpDiv.css({position:b.timepicker._inDialog&&b.blockUI?"static":d?"fixed":"absolute",display:"none",left:e.left+"px",top:e.top+"px"});if(!c.inline){e=b.timepicker._get(c,"showAnim");var f=b.timepicker._get(c,"duration"),j=function(){b.timepicker._timepickerShowing=true;var l=b.timepicker._getBorders(c.tpDiv);c.tpDiv.find("iframe.ui-timepicker-cover").css({left:-l[0],top:-l[1],width:c.tpDiv.outerWidth(),height:c.tpDiv.outerHeight()})};
-b.timepicker._adjustZIndex(a);b.effects&&b.effects[e]?c.tpDiv.show(e,b.timepicker._get(c,"showOptions"),f,j):c.tpDiv[e||"show"](e?f:null,j);if(!e||!f)j();c.input.is(":visible")&&!c.input.is(":disabled")&&c.input.focus();b.timepicker._curInst=c}}},_getZIndex:function(a){a=b(a);for(var c;a.length&&a[0]!==document;){c=a.css("position");if(c==="absolute"||c==="relative"||c==="fixed"){c=parseInt(a.css("zIndex"),10);if(!isNaN(c)&&c!==0)return c}a=a.parent()}},_refreshTimepicker:function(a){(a=this._getInst(a))&&
+false;c._minutesClicked=false;e=b.timepicker._checkOffset(c,e,d);c.tpDiv.css({position:b.timepicker._inDialog&&b.blockUI?"static":d?"fixed":"absolute",display:"none",left:e.left+"px",top:e.top+"px"});if(!c.inline){e=b.timepicker._get(c,"showAnim");var f=b.timepicker._get(c,"duration"),=function(){b.timepicker._timepickerShowing=true;var l=b.timepicker._getBorders(c.tpDiv);c.tpDiv.find("iframe.ui-timepicker-cover").css({left:-l[0],top:-l[1],width:c.tpDiv.outerWidth(),height:c.tpDiv.outerHeight()})};
+b.timepicker._adjustZIndex(a);b.effects&&b.effects[e]?c.tpDiv.show(e,b.timepicker._get(c,"showOptions"),f,();c.input.is(":visible")&&!c.input.is(":disabled")&&c.input.focus();b.timepicker._curInst=c}}},_getZIndex:function(a){a=b(a);for(var c;a.length&&a[0]!==document;){c=a.css("position");if(c==="absolute"||c==="relative"||c==="fixed"){c=parseInt(a.css("zIndex"),10);if(!isNaN(c)&&c!==0)return c}a=a.parent()}},_refreshTimepicker:function(a){(a=this._getInst(a))&&
 this._updateTimepicker(a)},_updateTimepicker:function(a){a.tpDiv.empty().append(this._generateHTML(a));this._rebindDialogEvents(a)},_rebindDialogEvents:function(a){var c=b.timepicker._getBorders(a.tpDiv),e=this;a.tpDiv.find("iframe.ui-timepicker-cover").css({left:-c[0],top:-c[1],width:a.tpDiv.outerWidth(),height:a.tpDiv.outerHeight()}).end().find(".ui-timepicker-minute-cell").unbind().bind("click",{fromDoubleClick:false},b.proxy(b.timepicker.selectMinutes,this)).bind("dblclick",{fromDoubleClick:true},
 b.proxy(b.timepicker.selectMinutes,this)).end().find(".ui-timepicker-hour-cell").unbind().bind("click",{fromDoubleClick:false},b.proxy(b.timepicker.selectHours,this)).bind("dblclick",{fromDoubleClick:true},b.proxy(b.timepicker.selectHours,this)).end().find(".ui-timepicker td a").unbind().bind("mouseout",function(){b(this).removeClass("ui-state-hover");this.className.indexOf("ui-timepicker-prev")!=-1&&b(this).removeClass("ui-timepicker-prev-hover");this.className.indexOf("ui-timepicker-next")!=-1&&
 b(this).removeClass("ui-timepicker-next-hover")}).bind("mouseover",function(){if(!e._isDisabledTimepicker(a.inline?a.tpDiv.parent()[0]:a.input[0])){b(this).parents(".ui-timepicker-calendar").find("a").removeClass("ui-state-hover");b(this).addClass("ui-state-hover");this.className.indexOf("ui-timepicker-prev")!=-1&&b(this).addClass("ui-timepicker-prev-hover");this.className.indexOf("ui-timepicker-next")!=-1&&b(this).addClass("ui-timepicker-next-hover")}}).end().find("."+this._dayOverClass+" a").trigger("mouseover").end().find(".ui-timepicker-now").bind("click",
-function(d){b.timepicker.selectNow(d)}).end().find(".ui-timepicker-deselect").bind("click",function(d){b.timepicker.deselectTime(d)}).end().find(".ui-timepicker-close").bind("click",function(){b.timepicker._hideTimepicker()}).end()},_generateHTML:function(a){var c,e,d,f,j=this._get(a,"showPeriod")==true,l=this._get(a,"showPeriodLabels")==true,k=this._get(a,"showLeadingZero")==true;e=this._get(a,"showHours")==true;var t=this._get(a,"showMinutes")==true,A=this._get(a,"amPmText"),s=this._get(a,"rows"),
-w=0,x=0,n=f=0,H=0,D=0,y=Array(),g=this._get(a,"hours");c=null;var h=0;d=this._get(a,"hourText");var u=this._get(a,"showCloseButton"),o=this._get(a,"closeButtonText"),i=this._get(a,"showNowButton"),m=this._get(a,"nowButtonText"),p=this._get(a,"showDeselectButton"),z=this._get(a,"deselectButtonText"),C=u||i||p;for(c=g.starts;c<=g.ends;c++)y.push(c);c=Math.ceil(y.length/s);if(l){for(h=0;h<y.length;h++)if(y[h]<12)f++;else n++;h=0;w=Math.floor(f/y.length*s);x=Math.floor(n/y.length*s);if(s!=w+x)if(f&&(!n||
-!w||x&&f/w>=n/x))w++;else x++;H=Math.min(w,1);D=w+1;c=Math.ceil(Math.max(f/w,n/x))}f='<table class="ui-timepicker-table ui-widget-content ui-corner-all"><tr>';if(e){f+='<td class="ui-timepicker-hours"><div class="ui-timepicker-title ui-widget-header ui-helper-clearfix ui-corner-all">'+d+'</div><table class="ui-timepicker">';for(e=1;e<=s;e++){f+="<tr>";if(e==H&&l)f+='<th rowspan="'+w.toString()+'" class="periods" scope="row">'+A[0]+"</th>";if(e==D&&l)f+='<th rowspan="'+x.toString()+'" class="periods" scope="row">'+
-A[1]+"</th>";for(d=1;d<=c;d++)if(l&&e<D&&y[h]>=12)f+=this._generateHTMLHourCell(a,undefined,j,k);else{f+=this._generateHTMLHourCell(a,y[h],j,k);h++}f+="</tr>"}f+="</tr></table></td>"}if(t){f+='<td class="ui-timepicker-minutes">';f+=this._generateHTMLMinutes(a);f+="</td>"}f+="</tr>";if(C){j='<tr><td colspan="3"><div class="ui-timepicker-buttonpane ui-widget-content">';if(i)j+='<button type="button" class="ui-timepicker-now ui-state-default ui-corner-all"  data-timepicker-instance-id="#'+a.id.replace(/\\\\/g,
-"\\")+'" >'+m+"</button>";if(p)j+='<button type="button" class="ui-timepicker-deselect ui-state-default ui-corner-all"  data-timepicker-instance-id="#'+a.id.replace(/\\\\/g,"\\")+'" >'+z+"</button>";if(u)j+='<button type="button" class="ui-timepicker-close ui-state-default ui-corner-all"  data-timepicker-instance-id="#'+a.id.replace(/\\\\/g,"\\")+'" >'+o+"</button>";f+=j+"</div></td></tr>"}f+="</table>";f+=b.browser.msie&&parseInt(b.browser.version,10)<7&&!a.inline?'<iframe src="javascript:false;" class="ui-timepicker-cover" frameborder="0"></iframe>':
-"";return f},_updateMinuteDisplay:function(a){var c=this._generateHTMLMinutes(a);a.tpDiv.find("td.ui-timepicker-minutes").html(c);this._rebindDialogEvents(a)},_generateHTMLMinutes:function(a){var c,e,d="",f=this._get(a,"rows"),j=Array();e=this._get(a,"minutes");var l=null,k=0,t=this._get(a,"showMinutesLeadingZero")==true,A=this._get(a,"onMinuteShow"),s=this._get(a,"minuteText");if(!e.starts)e.starts=0;if(!e.ends)e.ends=59;for(c=e.starts;c<=e.ends;c+=e.interval)j.push(c);l=Math.round(j.length/f+0.49);
-if(A&&A.apply(a.input?a.input[0]:null,[a.hours,a.minutes])==false)for(k=0;k<j.length;k+=1){c=j[k];if(A.apply(a.input?a.input[0]:null,[a.hours,c])){a.minutes=c;break}}d+='<div class="ui-timepicker-title ui-widget-header ui-helper-clearfix ui-corner-all">'+s+'</div><table class="ui-timepicker">';k=0;for(e=1;e<=f;e++){for(d+="<tr>";k<e*l;){c=j[k];A="";if(c!==undefined)A=c<10&&t?"0"+c.toString():c.toString();d+=this._generateHTMLMinuteCell(a,c,A);k++}d+="</tr>"}d+="</table>";return d},_generateHTMLHourCell:function(a,
+function(d){b.timepicker.selectNow(d)}).end().find(".ui-timepicker-deselect").bind("click",function(d){b.timepicker.deselectTime(d)}).end().find(".ui-timepicker-close").bind("click",function(){b.timepicker._hideTimepicker()}).end()},_generateHTML:function(a){var c,e,d,f,=this._get(a,"rows"),
+||
+!&&l)f+='<th rowspan="'+x.toString()+'" class="periods" scope="row">'+
++='<button type="button" class="ui-timepicker-now ui-state-default ui-corner-all"  data-timepicker-instance-id="#'+a.id.replace(/\\\\/g,
+"\\")+'" >'++"</div></td></tr>"}f+="</table>";f+=b.browser.msie&&parseInt(b.browser.version,10)<7&&!a.inline?'<iframe src="javascript:false;" class="ui-timepicker-cover" frameborder="0"></iframe>':
+"";return f},_updateMinuteDisplay:function(a){var c=this._generateHTMLMinutes(a);a.tpDiv.find("td.ui-timepicker-minutes").html(c);this._rebindDialogEvents(a)},_generateHTMLMinutes:function(a){var c,e,d="",f=this._get(a,"rows"),.length/f+0.49);
+if();k++}d+="</tr>"}d+="</table>";return d},_generateHTMLHourCell:function(a,
 c,e,d){var f=c;if(c>12&&e)f=c-12;if(f==0&&e)f=12;if(f<10&&d)f="0"+f;e="";e=true;d=this._get(a,"onHourShow");if(c==undefined)return e='<td><span class="ui-state-default ui-state-disabled">&nbsp;</span></td>';if(d)e=d.apply(a.input?a.input[0]:null,[c]);return e=e?'<td class="ui-timepicker-hour-cell" data-timepicker-instance-id="#'+a.id.replace(/\\\\/g,"\\")+'" data-hour="'+c.toString()+'"><a class="ui-state-default '+(c==a.hours?"ui-state-active":"")+'">'+f.toString()+"</a></td>":'<td><span class="ui-state-default ui-state-disabled '+
 (c==a.hours?" ui-state-active ":" ")+'">'+f.toString()+"</span></td>"},_generateHTMLMinuteCell:function(a,c,e){var d="";d=true;var f=this._get(a,"onMinuteShow");if(f)d=f.apply(a.input?a.input[0]:null,[a.hours,c]);if(c==undefined)return d='<td><span class="ui-state-default ui-state-disabled">&nbsp;</span></td>';return d=d?'<td class="ui-timepicker-minute-cell" data-timepicker-instance-id="#'+a.id.replace(/\\\\/g,"\\")+'" data-minute="'+c.toString()+'" ><a class="ui-state-default '+(c==a.minutes?"ui-state-active":
 "")+'" >'+e+"</a></td>":'<td><span class="ui-state-default ui-state-disabled" >'+e+"</span></td>"},_destroyTimepicker:function(a){var c=b(a),e=b.data(a,"timepicker");if(c.hasClass(this.markerClassName)){var d=a.nodeName.toLowerCase();b.removeData(a,"timepicker");if(d=="input"){e.append.remove();e.trigger.remove();c.removeClass(this.markerClassName).unbind("focus.timepicker",this._showTimepicker).unbind("click.timepicker",this._adjustZIndex)}else if(d=="div"||d=="span")c.removeClass(this.markerClassName).empty()}},
 _enableTimepicker:function(a){var c=b(a),e=c.attr("id"),d=b.data(a,"timepicker");if(c.hasClass(this.markerClassName)){var f=a.nodeName.toLowerCase();if(f=="input"){a.disabled=false;a=this._get(d,"button");b(a).removeClass("ui-state-disabled").disabled=false;d.trigger.filter("button").each(function(){this.disabled=false}).end()}else if(f=="div"||f=="span"){d=c.children("."+this._inlineClass);d.children().removeClass("ui-state-disabled");d.find("button").each(function(){this.disabled=false})}this._disabledInputs=
-b.map(this._disabledInputs,function(j){return j==e?null:j})}},_disableTimepicker:function(a){var c=b(a),e=b.data(a,"timepicker");if(c.hasClass(this.markerClassName)){var d=a.nodeName.toLowerCase();if(d=="input"){d=this._get(e,"button");b(d).addClass("ui-state-disabled").disabled=true;a.disabled=true;e.trigger.filter("button").each(function(){this.disabled=true}).end()}else if(d=="div"||d=="span"){e=c.children("."+this._inlineClass);e.children().addClass("ui-state-disabled");e.find("button").each(function(){this.disabled=
-true})}this._disabledInputs=b.map(this._disabledInputs,function(f){return f==a?null:f});this._disabledInputs[this._disabledInputs.length]=c.attr("id")}},_isDisabledTimepicker:function(a){if(!a)return false;for(var c=0;c<this._disabledInputs.length;c++)if(this._disabledInputs[c]==a)return true;return false},_checkOffset:function(a,c,e){var d=a.tpDiv.outerWidth(),f=a.tpDiv.outerHeight(),j=a.input?a.input.outerWidth():0,l=a.input?a.input.outerHeight():0,k=document.documentElement.clientWidth+b(document).scrollLeft(),
-t=document.documentElement.clientHeight+b(document).scrollTop();c.left-=this._get(a,"isRTL")?d-j:0;c.left-=e&&c.left==a.input.offset().left?b(document).scrollLeft():0;c.top-=e&&c.top==a.input.offset().top+l?b(document).scrollTop():0;c.left-=Math.min(c.left,c.left+d>k&&k>d?Math.abs(c.left+d-k):0);c.top-=Math.min(c.top,c.top+f>t&&t>f?Math.abs(f+l):0);return c},_findPos:function(a){for(var c=this._get(this._getInst(a),"isRTL");a&&(a.type=="hidden"||a.nodeType!=1);)a=a[c?"previousSibling":"nextSibling"];
+b.map(this._disabledInputs,function(})}},_disableTimepicker:function(a){var c=b(a),e=b.data(a,"timepicker");if(c.hasClass(this.markerClassName)){var d=a.nodeName.toLowerCase();if(d=="input"){d=this._get(e,"button");b(d).addClass("ui-state-disabled").disabled=true;a.disabled=true;e.trigger.filter("button").each(function(){this.disabled=true}).end()}else if(d=="div"||d=="span"){e=c.children("."+this._inlineClass);e.children().addClass("ui-state-disabled");e.find("button").each(function(){this.disabled=
+true})}this._disabledInputs=b.map(this._disabledInputs,function(f){return f==a?null:f});this._disabledInputs[this._disabledInputs.length]=c.attr("id")}},_isDisabledTimepicker:function(a){if(!a)return false;for(var c=0;c<this._disabledInputs.length;c++)if(this._disabledInputs[c]==a)return true;return false},_checkOffset:function(a,c,e){var d=a.tpDiv.outerWidth(),f=a.tpDiv.outerHeight(),=a.input?a.input.outerWidth():0,l=a.input?a.input.outerHeight():0,k=document.documentElement.clientWidth+b(document).scrollLeft(),
+t=document.documentElement.clientHeight+b(document).scrollTop();c.left-=this._get(a,"isRTL")?d-:0;c.left-=e&&c.left==a.input.offset().left?b(document).scrollLeft():0;c.top-=e&&c.top==a.input.offset().top+l?b(document).scrollTop():0;c.left-=Math.min(c.left,c.left+d>k&&k>d?Math.abs(c.left+d-k):0);c.top-=Math.min(c.top,c.top+f>t&&t>f?Math.abs(f+l):0);return c},_findPos:function(a){for(var c=this._get(this._getInst(a),"isRTL");a&&(a.type=="hidden"||a.nodeType!=1);)a=a[c?"previousSibling":"nextSibling"];
 a=b(a).offset();return[a.left,a.top]},_getBorders:function(a){var c=function(e){return{thin:1,medium:2,thick:3}[e]||e};return[parseFloat(c(a.css("border-left-width"))),parseFloat(c(a.css("border-top-width")))]},_checkExternalClick:function(a){if(b.timepicker._curInst){a=b(a.target);a[0].id!=b.timepicker._mainDivId&&a.parents("#"+b.timepicker._mainDivId).length==0&&!a.hasClass(b.timepicker.markerClassName)&&!a.hasClass(b.timepicker._triggerClass)&&b.timepicker._timepickerShowing&&!(b.timepicker._inDialog&&
 b.blockUI)&&b.timepicker._hideTimepicker()}},_hideTimepicker:function(a){var c=this._curInst;if(!(!c||a&&c!=b.data(a,"timepicker")))if(this._timepickerShowing){a=this._get(c,"showAnim");var e=this._get(c,"duration"),d=function(){b.timepicker._tidyDialog(c);this._curInst=null};b.effects&&b.effects[a]?c.tpDiv.hide(a,b.timepicker._get(c,"showOptions"),e,d):c.tpDiv[a=="slideDown"?"slideUp":a=="fadeIn"?"fadeOut":"hide"](a?e:null,d);a||d();this._timepickerShowing=false;this._lastInput=null;if(this._inDialog){this._dialogInput.css({position:"absolute",
 left:"0",top:"-100px"});if(b.blockUI){b.unblockUI();b("body").append(this.tpDiv)}}this._inDialog=false;if(a=this._get(c,"onClose"))a.apply(c.input?c.input[0]:null,[c.input?c.input.val():"",c])}},_tidyDialog:function(a){a.tpDiv.removeClass(this._dialogClass).unbind(".ui-timepicker")},_getInst:function(a){try{return b.data(a,"timepicker")}catch(c){throw"Missing instance data for this timepicker";}},_get:function(a,c){return a.settings[c]!==undefined?a.settings[c]:this._defaults[c]},_setTimeFromField:function(a){if(a.input.val()!=
 a.lastVal){var c=this._get(a,"defaultTime");c=c=="now"?this._getCurrentTimeRounded(a):c;if(a.inline==false&&a.input.val()!="")c=a.input.val();if(c instanceof Date){a.hours=c.getHours();a.minutes=c.getMinutes()}else{var e=a.lastVal=c;if(c==""){a.hours=-1;a.minutes=-1}else{c=this.parseTime(a,e);a.hours=c.hours;a.minutes=c.minutes}}b.timepicker._updateTimepicker(a)}},_optionTimepicker:function(a,c,e){var d=this._getInst(a);if(arguments.length==2&&typeof c=="string")return c=="defaults"?b.extend({},b.timepicker._defaults):
-d?c=="all"?b.extend({},d.settings):this._get(d,c):null;var f=c||{};if(typeof c=="string"){f={};f[c]=e}if(d){this._curInst==d&&this._hideTimepicker();v(d.settings,f);this._updateTimepicker(d)}},_setTimeTimepicker:function(a,c){if(a=this._getInst(a)){this._setTime(a,c);this._updateTimepicker(a);this._updateAlternate(a,c)}},_setTime:function(a,c,e){var d=a.hours,f=a.minutes;c=this.parseTime(a,c);a.hours=c.hours;a.minutes=c.minutes;if((d!=a.hours||f!=a.minuts)&&!e)a.input.trigger("change");this._updateTimepicker(a);
-this._updateSelectedValue(a)},_getCurrentTimeRounded:function(){var a=new Date,c=a.getMinutes();c=Math.round(c/5)*5;a.setMinutes(c);return a},parseTime:function(a,c){var e={};e.hours=-1;e.minutes=-1;var d=this._get(a,"timeSeparator"),f=this._get(a,"amPmText"),j=this._get(a,"showHours"),l=this._get(a,"showMinutes"),k=this._get(a,"optionalMinutes");a=this._get(a,"showPeriod")==true;d=c.indexOf(d);if(d!=-1){e.hours=parseInt(c.substr(0,d),10);e.minutes=parseInt(c.substr(d+1),10)}else if(j&&(!l||k))e.hours=
-parseInt(c,10);else if(!j&&l)e.minutes=parseInt(c,10);if(j){c=c.toUpperCase();if(e.hours<12&&a&&c.indexOf(f[1].toUpperCase())!=-1)e.hours+=12;if(e.hours==12&&a&&c.indexOf(f[0].toUpperCase())!=-1)e.hours=0}return e},selectNow:function(a){a=b(a.target).attr("data-timepicker-instance-id");a=this._getInst(b(a)[0]);var c=new Date;a.hours=c.getHours();a.minutes=c.getMinutes();this._updateSelectedValue(a);this._updateTimepicker(a);this._hideTimepicker()},deselectTime:function(a){a=b(a.target).attr("data-timepicker-instance-id");
-a=this._getInst(b(a)[0]);a.hours=-1;a.minutes=-1;this._updateSelectedValue(a);this._hideTimepicker()},selectHours:function(a){var c=b(a.currentTarget),e=c.attr("data-timepicker-instance-id"),d=parseInt(c.attr("data-hour"));a=a.data.fromDoubleClick;e=b(e);var f=this._getInst(e[0]),j=this._get(f,"showMinutes")==true;if(b.timepicker._isDisabledTimepicker(e.attr("id")))return false;c.parents(".ui-timepicker-hours:first").find("a").removeClass("ui-state-active");c.children("a").addClass("ui-state-active");
-f.hours=d;this._get(f,"onMinuteShow")&&this._updateMinuteDisplay(f);this._updateSelectedValue(f);f._hoursClicked=true;if(f._minutesClicked||a||j==false)b.timepicker._hideTimepicker();return false},selectMinutes:function(a){var c=b(a.currentTarget),e=c.attr("data-timepicker-instance-id"),d=parseInt(c.attr("data-minute"));a=a.data.fromDoubleClick;e=b(e);var f=this._getInst(e[0]),j=this._get(f,"showHours")==true;if(b.timepicker._isDisabledTimepicker(e.attr("id")))return false;c.parents(".ui-timepicker-minutes:first").find("a").removeClass("ui-state-active");
-c.children("a").addClass("ui-state-active");f.minutes=d;this._updateSelectedValue(f);f._minutesClicked=true;if(f._hoursClicked||a||j==false){b.timepicker._hideTimepicker();return false}return false},_updateSelectedValue:function(a){var c=this._getParsedTime(a);if(a.input){a.input.val(c);a.input.trigger("change")}var e=this._get(a,"onSelect");if(e)e.apply(a.input?a.input[0]:null,[c,a]);this._updateAlternate(a,c);return c},_getParsedTime:function(a){if(a.hours==-1&&a.minutes==-1)return"";if(a.hours<
-a.hours.starts||a.hours>a.hours.ends)a.hours=0;if(a.minutes<a.minutes.starts||a.minutes>a.minutes.ends)a.minutes=0;var c="",e=this._get(a,"showPeriod")==true,d=this._get(a,"showLeadingZero")==true,f=this._get(a,"showHours")==true,j=this._get(a,"showMinutes")==true,l=this._get(a,"optionalMinutes")==true,k=this._get(a,"amPmText"),t=a.hours?a.hours:0,A=a.minutes?a.minutes:0,s=t?t:0;t="";if(e){if(a.hours==0)s=12;if(a.hours<12)c=k[0];else{c=k[1];if(s>12)s-=12}}e=s.toString();if(d&&s<10)e="0"+e;d=A.toString();
-if(A<10)d="0"+d;if(f)t+=e;if(f&&j&&(!l||d!=0))t+=this._get(a,"timeSeparator");if(j&&(!l||d!=0))t+=d;if(f)if(c.length>0)t+=this._get(a,"periodSeparator")+c;return t},_updateAlternate:function(a,c){(a=this._get(a,"altField"))&&b(a).each(function(e,d){b(d).val(c)})},_getTimeTimepicker:function(a){return this._getParsedTime(this._getInst(a))},_getHourTimepicker:function(a){a=this._getInst(a);if(a==undefined)return-1;return a.hours},_getMinuteTimepicker:function(a){a=this._getInst(a);if(a==undefined)return-1;
+d?c=="all"?b.extend({},d.settings):this._get(d,c):null;var f=c||{};if(typeof c=="string"){f={};f[c]=e}if(d){this._curInst==d&&this._hideTimepicker();(d.settings,f);this._updateTimepicker(d)}},_setTimeTimepicker:function(a,c){if(a=this._getInst(a)){this._setTime(a,c);this._updateTimepicker(a);this._updateAlternate(a,c)}},_setTime:function(a,c,e){var d=a.hours,f=a.minutes;c=this.parseTime(a,c);a.hours=c.hours;a.minutes=c.minutes;if((d!=a.hours||f!=a.minuts)&&!e)a.input.trigger("change");this._updateTimepicker(a);
+this._updateSelectedValue(a)},_getCurrentTimeRounded:function(){var a=new Date,c=a.getMinutes();c=Math.round(c/5)*5;a.setMinutes(c);return a},parseTime:function(a,c){var e={};e.hours=-1;e.minutes=-1;var d=this._get(a,"timeSeparator"),f=this._get(a,"amPmText"),&&(!l||k))e.hours=
+parseInt(c,10);else if(!){c=c.toUpperCase();if(e.hours<12&&a&&c.indexOf(f[1].toUpperCase())!=-1)e.hours+=12;if(e.hours==12&&a&&c.indexOf(f[0].toUpperCase())!=-1)e.hours=0}return e},selectNow:function(a){a=b(a.target).attr("data-timepicker-instance-id");a=this._getInst(b(a)[0]);var c=new Date;a.hours=c.getHours();a.minutes=c.getMinutes();this._updateSelectedValue(a);this._updateTimepicker(a);this._hideTimepicker()},deselectTime:function(a){a=b(a.target).attr("data-timepicker-instance-id");
+a=this._getInst(b(a)[0]);a.hours=-1;a.minutes=-1;this._updateSelectedValue(a);this._hideTimepicker()},selectHours:function(a){var c=b(a.currentTarget),e=c.attr("data-timepicker-instance-id"),d=parseInt(c.attr("data-hour"));a=a.data.fromDoubleClick;e=b(e);var f=this._getInst(e[0]),=this._get(f,"showMinutes")==true;if(b.timepicker._isDisabledTimepicker(e.attr("id")))return false;c.parents(".ui-timepicker-hours:first").find("a").removeClass("ui-state-active");c.children("a").addClass("ui-state-active");
+f.hours=d;this._get(f,"onMinuteShow")&&this._updateMinuteDisplay(f);this._updateSelectedValue(f);f._hoursClicked=true;if(f._minutesClicked||a||=this._get(f,"showHours")==true;if(b.timepicker._isDisabledTimepicker(e.attr("id")))return false;c.parents(".ui-timepicker-minutes:first").find("a").removeClass("ui-state-active");
+c.children("a").addClass("ui-state-active");f.minutes=d;this._updateSelectedValue(f);f._minutesClicked=true;if(f._hoursClicked||a||==false){b.timepicker._hideTimepicker();return false}return false},_updateSelectedValue:function(a){var c=this._getParsedTime(a);if(a.input){a.input.val(c);a.input.trigger("change")}var e=this._get(a,"onSelect");if(e)e.apply(a.input?a.input[0]:null,[c,a]);this._updateAlternate(a,c);return c},_getParsedTime:function(a){if(a.hours==-1&&a.minutes==-1)return"";if(a.hours<
+a.hours.starts||a.hours>a.hours.ends)a.hours=0;if(a.minutes<a.minutes.starts||a.minutes>a.minutes.ends)a.minutes=0;var c="",e=this._get(a,"showPeriod")==true,d=this._get(a,"showLeadingZero")==true,f=this._get(a,"showHours")==true,.toString();
+if(&&(!l||d!=0))t+=d;if(f)if(c.length>0)t+=this._get(a,"periodSeparator")+c;return t},_updateAlternate:function(a,c){(a=this._get(a,"altField"))&&b(a).each(function(e,d){b(d).val(c)})},_getTimeTimepicker:function(a){return this._getParsedTime(this._getInst(a))},_getHourTimepicker:function(a){a=this._getInst(a);if(a==undefined)return-1;return a.hours},_getMinuteTimepicker:function(a){a=this._getInst(a);if(a==undefined)return-1;
 return a.minutes}});b.fn.timepicker=function(a){if(!b.timepicker.initialized){b(document).mousedown(b.timepicker._checkExternalClick).find("body").append(b.timepicker.tpDiv);b.timepicker.initialized=true}var c=Array.prototype.slice.call(arguments,1);if(typeof a=="string"&&(a=="getTime"||a=="getHour"||a=="getMinute"))return b.timepicker["_"+a+"Timepicker"].apply(b.timepicker,[this[0]].concat(c));if(a=="option"&&arguments.length==2&&typeof arguments[1]=="string")return b.timepicker["_"+a+"Timepicker"].apply(b.timepicker,
-[this[0]].concat(c));return this.each(function(){typeof a=="string"?b.timepicker["_"+a+"Timepicker"].apply(b.timepicker,[this].concat(c)):b.timepicker._attachTimepicker(this,a)})};b.timepicker=new B;b.timepicker.initialized=false;b.timepicker.uuid=(new Date).getTime();b.timepicker.version="0.3.1";window["TP_jQuery_"+q]=b})(jQuery);
+[this[0]].concat(c));return this.each(function(){typeof a=="string"?b.timepicker["_"+a+"Timepicker"].apply(b.timepicker,[this].concat(c)):b.timepicker._attachTimepicker(this,a)})};b.timepicker=new ]=b})(jQuery);

event-organiser/trunk/js/frontend.js

@@ -19 +19 @@
 
     function eventorganiser_mini_calendar(){
-        var element = $("<span class='fc-header-goto'><input type='hidden' id='miniCalendar'/></span>");
+        var element = $("<span class='fc-header-goto'><input type='hidden' alendar'/></span>");
         return element;
     }
@@ -194 +194 @@
     }
 
-        $('.miniCalendar').datepicker({
+        $('.alendar').datepicker({
             dateFormat: 'DD, d MM, yy',
             changeMonth: true,
             changeYear: true,
+
+
+
+
+
             showOn: 'button',
-                    buttonText: 'Go to Date'
+            onSelect: function (dateText, dp) {
+                var cal_id = $(this).parents('div.eo-fullcalendar').attr('id');
+                $('#'+cal_id).fullCalendar('gotoDate', new Date(Date.parse(dateText)));
+                    }
             });
 

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

@@ -1 @@
-(function(a){jQuery(document).ready(function(){function f(b){var d=b.categories,g="<select class='eo-cal-filter' id='eo-event-cat'>";g+="<option value=''>"+b.buttonText.cat+"</option>";for(b=0;b<d.length;b++)g+="<option class='cat-colour-"+d[b].colour+" cat' value='"+d[b].slug+"'>"+d[b].name+"</option>";g+="</select>";d=a("<span class='fc-header-dropdown filter-category'></span>");d.append(g);return d}function j(){return a("<span class='fc-header-goto'><input type='hidden' id='miniCalendar'/></span>")}
+(function(a){jQuery(document).ready(function(){function f(b){var d=b.categories,g="<select class='eo-cal-filter' id='eo-event-cat'>";g+="<option value=''>"+b.buttonText.cat+"</option>";for(b=0;b<d.length;b++)g+="<option class='cat-colour-"+d[b].colour+" cat' value='"+d[b].slug+"'>"+d[b].name+"</option>";g+="</select>";d=a("<span class='fc-header-dropdown filter-category'></span>");d.append(g);return d}function j(){return a("<span class='fc-header-goto'><input type='hidden' alendar'/></span>")}
 function k(b){var d=b.venues,g="<select class='eo-cal-filter' id='eo-event-venue'>";g+="<option value=''>"+b.buttonText.venue+"</option>";for(b=0;b<d.length;b++)g+="<option value='"+d[b].term_id+"'>"+d[b].name+"</option>";g+="</select>";d=a("<span class='fc-header-dropdown filter-venue'></span>");d.append(g);return d}if(a(".eo-venue-map").length>0)if(EOAjax.map!==undefined){var e=document.createElement("script");e.type="text/javascript";e.src="http://maps.googleapis.com/maps/api/js?sensor=false&callback=eo_load_map";
 document.body.appendChild(e)}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].category,venue:e[c].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,
@@ -5 +5 @@
 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(".miniCalendar").datepicker({dateFormat:"DD, d MM, yy",
-changeMonth:true,changeYear:true,showOn:"button",buttonText:"Go to Date"});if(a(".eo_widget_calendar").length>0){a(".eo_widget_calendar tfoot").unbind("click");a(".eo_widget_calendar tfoot a").die("click").live("click",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=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>");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," "))}
+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 tfoot a").die("click").live("click",
+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=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>");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," "))}
 function eo_load_map(){for(var a=EOAjax.map,f=0;f<a.length;f++){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.txt

@@ -1 +1 @@
 === Event Organiser ===
 Contributors: stephenh1988
-Donate link: http://www.wp-event-organiser.com
+Donate link: http://www.wp-event-organiser.com
 Tags: events, event, event categories, event organiser, event calendar, events calendar, event management, ical, locations, google map, widget, venues, maps, gigs, shows,
 Requires at least: 3.3
 Tested up to: 3.5
-Stable tag: 1.6.1
+Stable tag: 1.6.
 
 Create and maintain events, including complex reoccurring patterns, venue management (with Google maps), calendars and customisable event lists
@@ -145 +145 @@
 == Changelog ==
 
+
+
+
+
+
+
+
+
 = 1.6.1 =
 * Fixes js bug for weekly events (see [https://github.com/stephenh1988/Event-Organiser/issues/17](https://github.com/stephenh1988/Event-Organiser/issues/17)).