Cavemanon/piratepoet
8
Fork 0
Code Pull Requests Actions Releases 16 Activity

Merge pull request #1385 from mailpoet/add-new-button-fix

Browse Source 
Emails listing: Add new button fix [MAILPOET-1408]
This commit is contained in:
Michelle Shull
2018-06-11 11:38:44 -04:00
committed by GitHub
parent 7cc165b3d1 b00b42e4ca
commit b7db18425a
5 changed files with 31 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
assets/js/src/newsletters/listings/heading.jsx Normal file
View File

@@ -0,0 +1,23 @@
import React from 'react';
import { Link } from 'react-router';
import MailPoet from 'mailpoet';
const ListingHeading = () => (
<h1 className="title">
{MailPoet.I18n.t('pageTitle')}
<Link
className="page-title-action"
to="/new"
onClick={() => MailPoet.trackEvent(
'Emails > Add New',
{ 'MailPoet Free version': window.mailpoet_version }
)}
data-automation-id="new_email"
>
{MailPoet.I18n.t('new')}
</Link>
</h1>
);
module.exports = ListingHeading;

5
assets/js/src/newsletters/listings/notification.jsx
View File

@@ -3,6 +3,7 @@ import { Link } from 'react-router';
import Listing from 'listing/listing.jsx';
import ListingTabs from 'newsletters/listings/tabs.jsx';
import ListingHeading from 'newsletters/listings/heading.jsx';
import { MailerMixin } from 'newsletters/listings/mixins.jsx';
@@ -310,9 +311,7 @@ const NewsletterListNotification = React.createClass({
render: function render() {
return (
<div>
<h1 className="title">
{MailPoet.I18n.t('pageTitle')} <Link className="page-title-action" to="/new" data-automation-id="new_email">{MailPoet.I18n.t('new')}</Link>
</h1>
<ListingHeading />
<ListingTabs tab="notification" />

5
assets/js/src/newsletters/listings/notification_history.jsx
View File

@@ -6,6 +6,7 @@ import Hooks from 'wp-js-hooks';
import Listing from 'listing/listing.jsx';
import ListingTabs from 'newsletters/listings/tabs.jsx';
import ListingHeading from 'newsletters/listings/heading.jsx';
import {
QueueMixin,
@@ -97,9 +98,7 @@ const NewsletterListNotificationHistory = React.createClass({
render: function render() {
return (
<div>
<h1 className="title">
{MailPoet.I18n.t('pageTitle')} <Link className="page-title-action" to="/new" data-automation-id="new_email">{MailPoet.I18n.t('new')}</Link>
</h1>
<ListingHeading />
<ListingTabs tab="notification" />

16
assets/js/src/newsletters/listings/standard.jsx
View File

@@ -1,5 +1,4 @@
import React from 'react';
import { Link } from 'react-router';
import { confirmAlert } from 'react-confirm-alert';
import classNames from 'classnames';
import MailPoet from 'mailpoet';
@@ -7,6 +6,7 @@ import Hooks from 'wp-js-hooks';
import Listing from 'listing/listing.jsx';
import ListingTabs from 'newsletters/listings/tabs.jsx';
import ListingHeading from 'newsletters/listings/heading.jsx';
import {
QueueMixin,
@@ -214,19 +214,7 @@ const NewsletterListStandard = React.createClass({
render: function render() {
return (
<div>
<h1 className="title">
{MailPoet.I18n.t('pageTitle')}
<Link
className="page-title-action"
to="/new"
onClick={() => MailPoet.trackEvent('Emails > Add New',
{ 'MailPoet Free version': window.mailpoet_version }
)}
data-automation-id="new_email"
>
{MailPoet.I18n.t('new')}
</Link>
</h1>
<ListingHeading />
<ListingTabs tab="standard" />

6
assets/js/src/newsletters/listings/welcome.jsx
View File

@@ -1,8 +1,8 @@
import React from 'react';
import { Link } from 'react-router';
import Listing from 'listing/listing.jsx';
import ListingTabs from 'newsletters/listings/tabs.jsx';
import ListingHeading from 'newsletters/listings/heading.jsx';
import { StatisticsMixin, MailerMixin } from 'newsletters/listings/mixins.jsx';
@@ -293,9 +293,7 @@ const NewsletterListWelcome = React.createClass({
render: function render() {
return (
<div>
<h1 className="title">
{ MailPoet.I18n.t('pageTitle') } <Link className="page-title-action" to="/new" data-automation-id="new_email">{ MailPoet.I18n.t('new') }</Link>
</h1>
<ListingHeading />
<ListingTabs tab="welcome" />