WordPress.org
Get WordPress

Plugin Directory

Changeset 1184923


Ignore:
Timestamp:
06/21/2015 06:00:01 AM (11 years ago)
Author:
sebwordpress
Message:

Updated trunk - modified order of included files, adjusted ui.

Location:
the-welcomizer/trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • the-welcomizer/trunk/includes/twiz.ajax.class.php

    r1180732 r1184923  
    6666        twizGetMenu();
    6767        twizPostMenu(twiz_current_section_id,"","none");
    68         twizGetMultiSection(twiz_current_section_id, "'.parent::ACTION_EDIT.'", "'.parent::ACTION_IMPORT_FROM_SERVER.'");
     68        twizGetMultiSection(twiz_current_section_id, "'.parent::ACTION_EDIT.'", "'.parent::ACTION_IMPORT.'");
    6969    }else{
    7070        restoreTwizCurrentSectionId();
    … …  
    23132313                twiz_current_section_id = data.newsectionid;
    23142314                twizGetMenu();
    2315                 twizGetMultiSection(twiz_current_section_id, "'.parent::ACTION_EDIT.'", "'.parent::ACTION_IMPORT_FROM_SERVER.'");
     2315                twizGetMultiSection(twiz_current_section_id, "'.parent::ACTION_EDIT.'", "'.parent::ACTION_IMPORT.'");
    23162316                $("#twiz_sub_container").css("display", "block");             
    23172317                twiz_view_id = null;

  • the-welcomizer/trunk/includes/twiz.class.php

    r1180734 r1184923  
    117117    const ACTION_DELETE         = 'delete';
    118118    const ACTION_STATUS         = 'status';
     119    const ACTION_IMPORT         = 'import';
    119120    const ACTION_IMPORT_FROM_COMPUTER = 'importfromcomputer';
    120121    const ACTION_IMPORT_FROM_SERVER   = 'importfromserver';

  • the-welcomizer/trunk/includes/twiz.menu.class.php

    r1180514 r1184923  
    13461346                break;
    13471347
    1348             case parent::ACTION_IMPORT_FROM_SERVER: // on edit, and import from the server
     1348            case parent::ACTION_IMPORT: // from server or from computer
    13491349
    13501350                $stay = ''; // not stay exception
    1351                 $jsscript .= '$("#twiz_menu_save_img_box_1").show();
    1352                 $("#twiz_menu_save_img_box_1").attr("class","twiz-success twiz-loading-gif-save");
    1353                 $("#twiz_menu_save_img_box_1").animate({ opacity: 0 });
     1351                $jsscript .= '
    13541352                $("#twiz_shortcode_sample").select();
    13551353                $("#twiz_shortcode_sample").animate({opacity:0}, 300, function(){$("#twiz_shortcode_sample").animate({opacity:1}, 300, function(){})});';

  • the-welcomizer/trunk/twiz-index.php

    r1180510 r1184923  
    412412            wp_enqueue_script('twiz-jquery.ui.droppable.min', plugin_dir_url( __FILE__ ) .'includes/jquery/ui/droppable.min.js');
    413413                   
    414             // Admin Ajax script
    415             wp_enqueue_script( 'twiz-ajax-request', plugin_dir_url( __FILE__ ) . 'twiz-ajax.js.php', array( 'jquery' ) );
    416            
    417414            // Fileuploader
    418415            wp_enqueue_script( 'twiz-file-uploader', plugin_dir_url( __FILE__ ) . 'includes/import/client/fileuploader.js', array( 'jquery' ) );           
    419416            wp_enqueue_style('twiz-css-b', plugins_url('includes/import/client/fileuploader.css', __FILE__ ));
     417           
     418            // Admin Ajax script
     419            wp_enqueue_script( 'twiz-ajax-request', plugin_dir_url( __FILE__ ) . 'twiz-ajax.js.php', array( 'jquery' ) );
    420420        }
    421421       
Note: See TracChangeset for help on using the changeset viewer.