WordPress.org
Get WordPress

Plugin Directory

Changeset 1640327


Ignore:
Timestamp:
04/19/2017 07:16:23 AM (9 years ago)
Author:
kosinix
Message:

To trunk v2.13.0

Location:
cyclone-slider-2/trunk
Files:
280 added
2 edited

Legend:

Unmodified
Added
Removed

  • cyclone-slider-2/trunk/README.txt

    r1471540 r1640327  
    44Tags: slider, slideshow, drag-and-drop, wordpress-slider, wordpress-slideshow, cycle 2, jquery, responsive, translation-ready, custom-post, cyclone-slider
    55Requires at least: 3.5
    6 Tested up to: 4.5.3
     6Tested up to: 4.7.3
    77Stable tag: trunk
    88License: GPLv3
    … …  
    118118
    119119== Changelog ==
     120
     121= 2.13.0 - 2017-04-19 =
     122* Codebase merge with Cyclone Slider. See [detailed post](https://www.codefleet.net/cyclone-slider-reborn/).
     123* Add Merge Screen and merge notice.
    120124
    121125= 2.12.4 - 2016-08-10 =

  • cyclone-slider-2/trunk/cyclone-slider.php

    r1471540 r1640327  
    44Plugin URI: http://www.codefleet.net/cyclone-slider-2/
    55Description: Create and manage sliders with ease. Built for both casual users and developers.
    6 Version: 2.12.4
     6Version: 2.13.0
    77Author: Nico Amarilla
    88Author URI: http://www.codefleet.net/
    … …  
    1515require_once 'src/autoloader.php';
    1616
     17
     18
     19function child_plugin_notice(){
     20    global $post;
     21    $get = $_GET;
     22    $page = '';
     23    $post_type = '';
     24    if( isset($post->post_type)){
     25        $post_type = $post->post_type;
     26    } else if (isset($get['post_type'])){
     27        $post_type = $get['post_type'];
     28    }
     29
     30    if (isset($get['page'])){
     31        $page = $get['page'];
     32    }
     33
     34    if( $post_type  == 'cycloneslider' and $page != 'cycloneslider-merge'):
     35    ?><div class="notice notice-info">
     36    <p><?php echo sprintf(__('Announcement: Cyclone Slider 2 has been merged back to Cyclone Slider. All future updates will be delivered on the Cyclone Slider trunk. A detailed explanation can be found <a href="%s">here</a>.', 'cycloneslider'), 'https://www.codefleet.net/cyclone-slider-reborn');?></p>
     37    <p><a href="<?php echo get_admin_url(NULL, 'edit.php?post_type=cycloneslider&page=cycloneslider-merge' ); ?>" class="button-secondary"><?php _e('Go to Merge Screen', 'cycloneslider');?></a></p>
     38    </div><?php
     39    endif;
     40}
     41
    1742$cyclone_slider_plugin_instance = null;
    1843$cyclone_slider_saved_done = false;
    … …  
    2348    global $cyclone_slider_plugin_instance;
    2449
     50   
     51    add_action( 'admin_notices', 'child_plugin_notice' );
    2552    $plugin = new CycloneSlider_Plugin();
    2653   
    … …  
    137164    );
    138165
     166    $plugin['merge_page'] = 'cycloneslider_service_merge_page';
     167   
     168
    139169    $plugin['zip_archive'] = 'cycloneslider_service_zip_archive';
    140170    $plugin['youtube'] = new CycloneSlider_Youtube();
    … …  
    429459}
    430460
     461function cycloneslider_service_merge_page( $plugin ){
     462    static $object;
     463
     464    if (null !== $object) {
     465        return $object;
     466    }
     467
     468    $object = new CycloneSlider_Merge($plugin['view'], $plugin);
     469    return $object;
     470}
     471
    431472function cycloneslider_service_zip_archive( $plugin ){
    432473    return 'ZipArchive';
Note: See TracChangeset for help on using the changeset viewer.