WordPress.org
Get WordPress

Plugin Directory

Changeset 2140397


Ignore:
Timestamp:
08/16/2019 07:14:06 AM (7 years ago)
Author:
FreshMail.com
Message:

Fixed close button on shortcode

Location:
freshmail-integration/trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • freshmail-integration/trunk/CHANGELOG.md

    r2127193 r2140397  
    11### Changelog
     2 - 2.3.1 - 2019-08-13
     3    * Fix: Close button on shortcode
     4
    25 - 2.3 - 2019-06-04
    36    * Add: Contact Form 7 messages

  • freshmail-integration/trunk/src/Plugin/Newsletter/Freshmail.php

    r2127193 r2140397  
    458458    }
    459459
    460     public function shortcode($fmFormId)
    461     {
     460    public function shortcode($fmFormId, $popup)
     461    {
     462
    462463        ob_start();
    463464        global $wpdb;
    … …  
    485486        $buttonHovered = $freshmailForm['appearance']['button_hovered'];
    486487        $errorSuccess = $freshmailForm['appearance']['error_success'];
     488        if(isset($fmFormId['in_popup'])){
     489            $in_popup = $fmFormId['in_popup'];
     490        }
    487491
    488492        if ($freshmailForm['redirection'] != 'no' && empty($fmFormId['redirect'])) {

  • freshmail-integration/trunk/templates/shortcode.php

    r2127193 r2140397  
    44<div class="freshMailPopUp__container">
    55<div class="freshMailPopUp__body" style="max-width:<?php echo $formContainer['width'].$formContainer['width2']; ?>;" >
    6     <div id="freshMailPopUp__close"></div>
     6    <?php if(isset($in_popup) AND $in_popup == true){ ?>
     7        <div id="freshMailPopUp__close"></div>
     8    <?php } ?>
    79    <div style="<?php echo 'background-color: '.$formContainer['background_color'].';border:'.$formContainer['border_width'].'px solid '.$formContainer['border_color'].';border-radius:'.$formContainer['rounded_corners'].'px; padding: '.$formContainer['padding1'].'px  '.$formContainer['padding2'].'px;'; ?>overflow:hidden;" id="fm_form_<?php echo $fmFormId['id']; ?>">
    810        <div class="form_container">

  • freshmail-integration/trunk/wp-freshmail.php

    r2127193 r2140397  
    44 * Plugin URI: http://freshmail.com/plugin/wordpress-newsletter/
    55 * Description: FreshMail is an email marketing tool for creating and sending amazing newsletters. Our intuitive system leads users from campaign planning and creation to final reports. A free account lets you send up to 2000 messages to a maximum of 500 recipients each month.
    6  * Version: 2.3
     6 * Version: 2.3.1
    77 * Author: Borbis Media
    88 * Author URI: http://www.borbis.com
Note: See TracChangeset for help on using the changeset viewer.