Plugin Directory

Changeset 2137964


Ignore:
Timestamp:
08/12/2019 09:33:11 AM (7 years ago)
Author:
eventprime
Message:

Release Version 1.2.7

Location:
eventprime-event-calendar-management
Files:
330 added
7 edited

Legend:

Unmodified
Added
Removed
  • eventprime-event-calendar-management/trunk/event-magic.php

    r2134258 r2137964  
    44 * Plugin URI: http://eventprime.net
    55 * Description: EventPrime is a complete event management system featuring a backend calendar for event creation, event sites, performers, and many more.
    6  * Version: 1.2.6
     6 * Version: 1.2.7
    77 * Author: EventPrime
    88 * Text Domain: eventprime-event-calendar-management
     
    2121    class Event_Magic {
    2222
    23         public $version = '1.2.6';
     23        public $version = '1.2.7';
    2424        public $request_type;
    2525        public $errors = array();
  • eventprime-event-calendar-management/trunk/includes/admin/template/global_settings.php

    r2099015 r2137964  
    390390                </div>
    391391            </div>   
    392 
     392           
     393             <div ng-show="showPageGSettings">
     394                <div class="emrow">
     395                    <div class="emfield"><?php _e('Default Calendar View', 'eventprime-event-calendar-management'); ?></div>
     396                    <div class="eminput">
     397                        <select id="default_cal_view" name="default_cal_view" ng-model="data.options.default_cal_view">
     398                            <option value="month"><?php _e('Month','eventprime-event-calendar-management') ?></option>
     399                            <option value="week"><?php _e('Week','eventprime-event-calendar-management') ?></option>
     400                            <option value="day"><?php _e('Day','eventprime-event-calendar-management') ?></option>
     401                            <option value="card"><?php _e('Card','eventprime-event-calendar-management') ?></option>
     402                            <option value="list"><?php _e('List','eventprime-event-calendar-management') ?></option>
     403                        </select>
     404                    </div>                   
     405                    <div class="emfield_error">
     406                    </div>
     407                    <div class="emnote"><i class="fa fa-info-circle" aria-hidden="true"></i>
     408                        <?php _e('Select the default view for the Event Calendar on the frontend.', 'eventprime-event-calendar-management'); ?>
     409                    </div>
     410                </div>
     411            </div>
     412           
    393413            <div ng-show="showPayments">
    394414                <div class="emrow kf_pricefield_checkbox">
  • eventprime-event-calendar-management/trunk/includes/admin/template/js/em-global-settings-controller.js

    r2041573 r2137964  
    7474    {
    7575     
    76         if(tinymce.get('registration_email_content')!=null)
     76        if(typeof tinymce !== 'undefined' && tinymce.get('registration_email_content')!=null)
    7777            $scope.data.options.registration_email_content= tinymce.get('registration_email_content').getContent(); 
    7878        else
    7979           $scope.data.options.registration_email_content= jQuery('#registration_email_content').val();   
    8080
    81         if(tinymce.get('booking_pending_email')!=null)
     81        if(typeof tinymce !== 'undefined' && tinymce.get('booking_pending_email')!=null)
    8282            $scope.data.options.booking_pending_email= tinymce.get('booking_pending_email').getContent();
    8383        else
    8484            $scope.data.options.booking_pending_email= jQuery('#booking_pending_email').val();
    8585       
    86         if(tinymce.get('booking_confirmed_email')!=null)
     86        if(typeof tinymce !== 'undefined' && tinymce.get('booking_confirmed_email')!=null)
    8787            $scope.data.options.booking_confirmed_email= tinymce.get('booking_confirmed_email').getContent(); 
    8888        else
    8989            $scope.data.options.booking_confirmed_email= jQuery('#booking_confirmed_email').val();
    9090       
    91         if(tinymce.get('booking_cancelation_email')!=null)
     91        if(typeof tinymce !== 'undefined' && tinymce.get('booking_cancelation_email')!=null)
    9292             $scope.data.options.booking_cancelation_email= tinymce.get('booking_cancelation_email').getContent(); 
    9393        else
    9494             $scope.data.options.booking_cancelation_email= jQuery('#booking_cancelation_email').val();
    9595       
    96         if(tinymce.get('booking_refund_email')!=null)
     96        if(typeof tinymce !== 'undefined' && tinymce.get('booking_refund_email')!=null)
    9797            $scope.data.options.booking_refund_email= tinymce.get('booking_refund_email').getContent();   
    9898        else
    9999            $scope.data.options.booking_refund_email= jQuery('#booking_refund_email').val();
    100100       
    101         if(tinymce.get('reset_password_mail')!=null)
     101        if(typeof tinymce !== 'undefined' && tinymce.get('reset_password_mail')!=null)
    102102            $scope.data.options.reset_password_mail= tinymce.get('reset_password_mail').getContent();   
    103103        else
  • eventprime-event-calendar-management/trunk/includes/models/class-em-global-settings.php

    r2099015 r2137964  
    3333    public $paypal_api_password='';
    3434    public $paypal_api_sig='';
     35    public $default_cal_view= 'month';
    3536}
  • eventprime-event-calendar-management/trunk/includes/templates/event_views/card.php

    r2134258 r2137964  
    55    $posts = apply_filters('ep_filter_front_events',$posts,$atts);
    66    $service= EventM_Factory::get_service('EventM_Service');
    7     $setting_service = EventM_Factory::get_service('EventM_Setting_Service');
    8     $global_settings= $setting_service->load_model_from_db();
    9    
    107?> 
    118<div class="emagic">
  • eventprime-event-calendar-management/trunk/includes/templates/events.php

    r2134258 r2137964  
    33wp_enqueue_script('em-public');
    44$event_service = EventM_Factory::get_service('EventM_Service');
    5 $global_settings = new EventM_Global_Settings_Model();
     5$gs_service = EventM_Factory::get_service('EventM_Setting_Service');
     6$global_settings = $gs_service->load_model_from_db();
    67global $wp;
    78if (event_m_get_param('em_types')) {
     
    2021}
    2122$currency_symbol = em_currency_symbol();
    22 $view = isset($_GET['events_view']) ? $_GET['events_view'] : 'month';
     23$view = isset($_GET['events_view']) ? $_GET['events_view'] : $global_settings->default_cal_view;
    2324$form_action = !empty($events_page_id) ? get_permalink($events_page_id) : "";
    2425$form_action = add_query_arg('events_view', $view,$form_action);
  • eventprime-event-calendar-management/trunk/readme.txt

    r2134258 r2137964  
    55Requires at least: 3.5
    66Tested up to: 5.2
    7 Stable tag: 1.2.6
     7Stable tag: 1.2.7
    88License: GPLv2 or later
    99License URI: http://www.gnu.org/licenses/gpl-2.0.html
     
    132132== Changelog ==
    133133
     134= 1.2.7 =
     135* Added option to select default event calendar view from the Global Settings
     136
    134137= 1.2.6 =
    135138* Added support for ProfileGrid-EventPrime Integration
     
    190193== Upgrade Notice ==
    191194
     195= 1.2.7 =
     196* Added option to select default event calendar view from the Global Settings
     197
    192198= 1.2.6 =
    193199* Added support for ProfileGrid-EventPrime Integration
Note: See TracChangeset for help on using the changeset viewer.