Changeset 2186241

Timestamp:

11/05/2019 03:01:09 PM (6 years ago)

Author:

wpemaker

Message:

bug correction: tinyMCE dialog
Email verify - alert premium required

Location:

download-sender/trunk

Files:

• assets/css/admin.css (modified) (1 diff)
• assets/css/form.css (modified) (1 diff)
• assets/images/logs-email_verify-icons-sprites.png (modified) (previous)
• assets/js/settings.js (modified) (1 diff)
• assets/js/tinymce.js (modified) (3 diffs)
• includes/admin/class-admin-assets.php (modified) (3 diffs)
• includes/core-functions.php (modified) (1 diff)

download-sender/trunk/assets/css/admin.css

@@ -27 +27 @@
     top: -4px;
 }
+
+/*-------------------------------------------------------------------------*/
+/*  tinyMCE
+/*-------------------------------------------------------------------------*/
+
+body .ui-dialog[aria-describedby="downloadsender-mce-dialog"] {
+    font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;
+    font-size: 13px;
+    line-height: 1.4em;
+    padding: 0;
+    border: 0;
+    color: #444;
+    background: transparent;
+}
+[aria-describedby="downloadsender-mce-dialog"] .ui-dialog-title {
+    color: #444;
+}
+form#downloadsender-mce-dialog  {
+    position: unset;
+}
+body [aria-describedby="downloadsender-mce-dialog"] .ui-button .ui-icon {
+    background-image: url(../images/ui-icons_777777_256x240.png)!important;
+}
+body [aria-describedby="downloadsender-mce-dialog"] .ui-button-icon-only {
+    text-indent: inherit;
+    white-space:normal;
+}
+body [aria-describedby="downloadsender-mce-dialog"] .ui-state-default, body [aria-describedby="downloadsender-mce-dialog"] .ui-widget-content .ui-state-default, body [aria-describedby="downloadsender-mce-dialog"] .ui-widget-header .ui-state-default {
+    border: 0;
+    background: transparent;
+    font-weight:unset;
+    color: #444;
+}
+body [aria-describedby="downloadsender-mce-dialog"] .ui-dialog-titlebar-close span {
+    display: none;
+}
+form#downloadsender-mce-dialog {
+    margin-bottom: 60px;
+    padding-top: 0px;
+    background: #f1f1f1;
+}
+form#downloadsender-mce-dialog select, form#downloadsender-mce-dialog input[type="text"] {
+    min-width: 250px;
+}
+form#downloadsender-mce-dialog .wp-picker-container {
+    display: inline-block;
+}
+.mce-dialog-tabs .toggle-button:before {
+    height: 32px;
+    width: 32px;
+    line-height: 32px;
+}
+.mce-dialog-tabs .downloadsender_options-tab label {
+    min-width: 150px;
+}
+.mce-dialog-tabs .downloadsender_options-tab.disabled {
+    display: none;
+}
+.mce-dialog-tabs .downloadsender_tab-title:not(.no-background) {
+    height: 32px;
+    line-height: 32px;
+}
+.downloadsender_tab-title.active {
+    z-index: 15;
+    border-bottom: 1px solid #f1f1f1;
+    background: #f1f1f1;
+    color: #000;
+}
+.mce-dialog-tabs {
+    margin-bottom: 40px;
+}
+[aria-describedby="downloadsender-mce-dialog"] {
+    max-width: 96% !important;
+    border-radius: 10px;
+    overflow: hidden;
+    z-index: 100102!important;
+}
+[aria-describedby="downloadsender-mce-dialog"] .ui-button.ui-dialog-titlebar-close,
+[aria-describedby="downloadsender-mce-dialog"] .ui-dialog-titlebar {
+    height: 60px;
+    background: #fff!important;
+    border-radius: 0;
+    text-shadow: none;
+}
+[aria-describedby="downloadsender-mce-dialog"] .ui-widget-header, 
+[aria-describedby="downloadsender-mce-dialog"] .ui-widget-header .ui-state-default:not(.ui-dialog-titlebar-close) {
+    border: 0!important;
+    border-bottom: 1px solid #dfdfdf !important;
+}
+
+[aria-describedby="downloadsender-mce-dialog"] .ui-button.ui-dialog-titlebar-close {
+    top: 0;
+    margin: 0;
+    width: 45px;
+}
+[aria-describedby="downloadsender-mce-dialog"] .ui-button.ui-dialog-titlebar-close:hover {
+    color: #00a0d2;
+}
+[aria-describedby="downloadsender-mce-dialog"] .ui-dialog-titlebar {    
+    line-height: 60px;
+    padding: 0 15px;
+    font-weight: 400;
+}
+[aria-describedby="downloadsender-mce-dialog"] .ui-dialog-title {
+    position: relative;
+    padding-left: 30px;
+}
+[aria-describedby="downloadsender-mce-dialog"] .ui-dialog-title:before {
+    position: absolute;
+    content: '';
+    width: 20px;
+    height: 20px;
+    background: url('../images/downloadsender-blue.png') no-repeat;
+    left: 0;
+    top: 50%;
+    margin-top: -10px;
+}
+.downloadsender-submitbox {
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    background: #fff;
+    padding: 18px 18px;
+    right: 0;
+    text-align: right;
+    border-top: 1px solid #e3e3e3;
+}
+#downloadsender-mce-dialog-default {
+    float: left;
+    text-align: center;
+}
+
 
 /* chosen */

download-sender/trunk/assets/css/form.css

@@ -442 +442 @@
 }
 */
-/*-------------------------------------------------------------------------*/
-/*  tinyMCE
-/*-------------------------------------------------------------------------*/
-
-[aria-describedby="downloadsender-mce-dialog"] .ui-dialog-title {
-    color: #444;
-}
-form#downloadsender-mce-dialog {
-    margin-bottom: 60px;
-    padding-top: 0px;
-    background: #f1f1f1;
-}
-form#downloadsender-mce-dialog select, form#downloadsender-mce-dialog input[type="text"] {
-    min-width: 250px;
-}
-form#downloadsender-mce-dialog .wp-picker-container {
-    display: inline-block;
-}
-.mce-dialog-tabs .toggle-button:before {
-    height: 32px;
-    width: 32px;
-    line-height: 32px;
-}
-.mce-dialog-tabs .downloadsender_options-tab label {
-    min-width: 150px;
-}
-.mce-dialog-tabs .downloadsender_options-tab.disabled {
-    display: none;
-}
-.mce-dialog-tabs .downloadsender_tab-title:not(.no-background) {
-    height: 32px;
-    line-height: 32px;
-}
-.downloadsender_tab-title.active {
-    z-index: 15;
-    border-bottom: 1px solid #f1f1f1;
-    background: #f1f1f1;
-    color: #000;
-}
-.mce-dialog-tabs {
-    margin-bottom: 40px;
-}
-[aria-describedby="downloadsender-mce-dialog"] {
-    max-width: 96% !important;
-    border-radius: 10px;
-    overflow: hidden;
-    z-index: 100102!important;
-}
-[aria-describedby="downloadsender-mce-dialog"] .ui-button.ui-dialog-titlebar-close,
-[aria-describedby="downloadsender-mce-dialog"] .ui-dialog-titlebar {
-    height: 60px;
-    background: #fff!important;
-    border-radius: 0;
-    text-shadow: none;
-}
-[aria-describedby="downloadsender-mce-dialog"] .ui-widget-header, 
-[aria-describedby="downloadsender-mce-dialog"] .ui-widget-header .ui-state-default {
-    border: 0!important;
-    border-bottom: 1px solid #dfdfdf !important;
-}
-
-[aria-describedby="downloadsender-mce-dialog"] .ui-button.ui-dialog-titlebar-close {
-    top: 0;
-    margin: 0;
-    width: 45px;
-}
-[aria-describedby="downloadsender-mce-dialog"] .ui-button.ui-dialog-titlebar-close:hover {
-    color: #00a0d2;
-}
-[aria-describedby="downloadsender-mce-dialog"] .ui-dialog-titlebar {    
-    line-height: 60px;
-    padding: 0 15px;
-    font-weight: 400;
-}
-[aria-describedby="downloadsender-mce-dialog"] .ui-dialog-title {
-    position: relative;
-    padding-left: 30px;
-}
-[aria-describedby="downloadsender-mce-dialog"] .ui-dialog-title:before {
-    position: absolute;
-    content: '';
-    width: 20px;
-    height: 20px;
-    background: url('../images/downloadsender-blue.png') no-repeat;
-    left: 0;
-    top: 50%;
-    margin-top: -10px;
-}
-.downloadsender-submitbox {
-    position: absolute;
-    bottom: 0;
-    left: 0;
-    background: #fff;
-    padding: 18px 18px;
-    right: 0;
-    text-align: right;
-    border-top: 1px solid #e3e3e3;
-}
-#downloadsender-mce-dialog-default {
-    float: left;
-    text-align: center;
-}
 
 /* Buttons */

download-sender/trunk/assets/js/settings.js

@@ -164 +164 @@
     $( document.body ).delegate( "#make_log_verified", "click", function() {
         if (!downloadSender.is_premium_v){
-            //alert(downloadSender.premium_required_msg);
+            alert(downloadSender.premium_required_msg);
             //return false;
         }
     });
     
-    $('#make_log_verified').modaal({
-        type: 'inline',
-        content_source: '#email_verify_modaal',
-        overlay_close: false,
-        hide_close: true,
-        background_scroll: true,
-        width: 500,
-    });
+    if (!downloadSender.is_premium_v){
+        $('#make_log_verified').modaal({
+            type: 'inline',
+            content_source: '#email_verify_modaal',
+            overlay_close: false,
+            hide_close: true,
+            background_scroll: true,
+            width: 500,
+        });
+    }
+    
     
     $( document.body ).delegate( "#modaal-close", "click", function() {

download-sender/trunk/assets/js/tinymce.js

@@ -31 +31 @@
             $('.ui-dialog-titlebar-close').click();
             return false;
-        });
-        
+        });     
         tinymce.PluginManager.add('download_sender', function( editor, url ) {
             
@@ -77 +76 @@
                     
                     editor.windowManager.open( {
+                        //file   : url+'/dialog.php',
                         width: 880,
                         height: 550,
@@ -82 +82 @@
                         wpDialog: true,
                         id : 'downloadsender-mce-dialog'
+                        //inline: 1,
                         }, {
-                        //plugin_url : url,
+                            //plugin_url : url,
                     });
                 }

download-sender/trunk/includes/admin/class-admin-assets.php

@@ -21 +21 @@
         add_action( 'admin_enqueue_scripts', array( $this, 'dynamic_styles' ) );
     }
-
+    
+    /**
+     * Dynamic_styles.
+     */
     public function dynamic_styles() {
         $options = new Options;
@@ -154 +157 @@
                     array( 
                         'ajax'                  => admin_url( 'admin-ajax.php' ),
+                        'ABSURL'                => DOWNLOAD_SENDER_ABSURL,
                         'settings_saved'        => __( 'Settings saved.' ),
                         'download_sent'         => __( 'Download link were sent to %s', 'download-sender' ),
@@ -163 +167 @@
                         'set_default'           => __( 'Set Default' ),
                         'is_premium_v'          => is_downloadsender_premium_activated(),
-                        //'premium_required_msg'    => __( 'The premium version is required to use this feature.', 'download-sender' ), 
+                        'premium_required_msg'  => __( 'You have free version. Buy Premium Version to access this feature.', 'download-sender' ),   
                         'confirm_resend_msg'    => __( '<strong>File :</strong> {file}<br><strong>To Email :</strong> {email}', 'download-sender' ),
                         'confirm_resend'            => __( 'Are you sure you want to resend file?', 'download-sender' ),

download-sender/trunk/includes/core-functions.php

@@ -115 +115 @@
 }
 
+
+
+add_action( 'wp_enqueue_scripts', 'remove_default_stylesheet', 20 );
+
+function remove_default_stylesheet() {
+    
+    wp_dequeue_style( 'widgetopts-jquery-ui' );
+    wp_deregister_style( 'widgetopts-jquery-ui' );
+
+    //wp_register_style( 'new-style', get_stylesheet_directory_uri() . '/new.css', false, '1.0.0' ); 
+    //wp_enqueue_style( 'new-style' );
+
+}
+
 /**
  * Check if Download Sender Premium is activated