From 7298cf329bb4ca54d6ee110ac5037f6c8151f8e5 Mon Sep 17 00:00:00 2001 From: Maxim Strukov Date: Fri, 15 Feb 2019 16:18:06 -0800 Subject: [PATCH 1/3] fixed the campaigns, mailings tabs appearance in the tab group --- bundle/Listener/LocationViewGroupTab.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bundle/Listener/LocationViewGroupTab.php b/bundle/Listener/LocationViewGroupTab.php index d41c4c4..671e79f 100644 --- a/bundle/Listener/LocationViewGroupTab.php +++ b/bundle/Listener/LocationViewGroupTab.php @@ -83,6 +83,7 @@ public function onTabGroupPreRender(TabGroupEvent $event): void if ($campaigns) { $this->campaignsTab->setCampaigns($campaigns); $this->tabRegistry->addTab($this->campaignsTab, 'location-view'); + $tabGroup->addTab($this->campaignsTab); } $mailingRepo = $this->entityManager->getRepository('NovaeZMailingBundle:Mailing'); @@ -90,6 +91,9 @@ public function onTabGroupPreRender(TabGroupEvent $event): void if ($mailings) { $this->mailingsTab->setMailings($mailings); $this->tabRegistry->addTab($this->mailingsTab, 'location-view'); + $tabGroup->addTab($this->mailingsTab); } + + $event->setData($tabGroup); } } From 499610a1d1e2a71d826bd585542d68d9a2d81901 Mon Sep 17 00:00:00 2001 From: Maxim Strukov Date: Fri, 15 Feb 2019 16:59:29 -0800 Subject: [PATCH 2/3] added highlight and clickable labels on left menu --- bundle/Resources/public/admin/css/ezmailing.scss | 4 ++++ bundle/Resources/public/admin/js/ezmailing.js | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/bundle/Resources/public/admin/css/ezmailing.scss b/bundle/Resources/public/admin/css/ezmailing.scss index 2470eec..e526d73 100644 --- a/bundle/Resources/public/admin/css/ezmailing.scss +++ b/bundle/Resources/public/admin/css/ezmailing.scss @@ -191,3 +191,7 @@ $eZLightBackground: #F5F5F5; margin: 20px 10px 10px 10px; } } + +.campaigns > ul > li > label:hover { + font-weight: bold; +} \ No newline at end of file diff --git a/bundle/Resources/public/admin/js/ezmailing.js b/bundle/Resources/public/admin/js/ezmailing.js index f1c33b0..1b2f9a9 100644 --- a/bundle/Resources/public/admin/js/ezmailing.js +++ b/bundle/Resources/public/admin/js/ezmailing.js @@ -10,4 +10,9 @@ jQuery(function () { eZMailingSubItemsModule.init(jQuery, $app); eZMailingEditFormModule.init(jQuery, $app); eZMailingContentSelectionModule.init(jQuery, $app); + + $('.campaigns > ul > li > label').click(function () { + window.location = $(this).parent().find('ul > li.subscriptions > a').attr('href'); + return false; + }); }); From 38e5da2cbe65b65af507dcb525cc955ba0570272 Mon Sep 17 00:00:00 2001 From: Maxim Strukov Date: Tue, 19 Feb 2019 16:16:08 -0800 Subject: [PATCH 3/3] fixed the translations - #65784, added the content creation to associated content --- .../admin/js/modules/contentSelection.js | 30 +++++++++++++++++++ .../public/admin/js/modules/subitems.js | 2 -- .../Resources/translations/ezmailing.en.yml | 3 +- .../Resources/translations/ezmailing.fr.yml | 3 +- .../views/admin/campaign/details.html.twig | 2 +- .../admin/mailing/mailing_tabs.html.twig | 6 ++++ 6 files changed, 41 insertions(+), 5 deletions(-) diff --git a/bundle/Resources/public/admin/js/modules/contentSelection.js b/bundle/Resources/public/admin/js/modules/contentSelection.js index a8d46df..44ccd07 100644 --- a/bundle/Resources/public/admin/js/modules/contentSelection.js +++ b/bundle/Resources/public/admin/js/modules/contentSelection.js @@ -21,6 +21,36 @@ var eZMailingContentSelectionModule = function () { } }), udwContainer); }); + + $("button.js-novaezmailing-create-content", $app).click(function () { + var token = document.querySelector('meta[name="CSRF-Token"]').content; + var siteaccess = document.querySelector('meta[name="SiteAccess"]').content; + var udwContainer = $("#react-udw").get(0); + var parentLocationId = $(this).data('parent-location-id'); + var title = $(this).find('span').html(); + ReactDOM.render(React.createElement(eZ.modules.UniversalDiscovery, { + onCancel: function () { + ReactDOM.unmountComponentAtNode(udwContainer) + }, + title: title, + multiple: false, + startingLocationId: 1, + canSelectContent: function (data) { + var contentDisabled = true; + if (data.item.pathString.split('/').includes(parentLocationId.toString()) && $('.c-choose-content-type__list .is-selected').length > 0) { + contentDisabled = false; + } + $('button.m-ud__action--create-content').prop("disabled", contentDisabled); + }, + restInfo: {token: token, siteaccess: siteaccess}, + visibleTabs: ['create'], + activeTab: 'create', + onConfirm: function (response) { + ReactDOM.unmountComponentAtNode(udwContainer); + location.reload(); + } + }), udwContainer); + }); } return {init: _init}; diff --git a/bundle/Resources/public/admin/js/modules/subitems.js b/bundle/Resources/public/admin/js/modules/subitems.js index e832e3f..f601d77 100644 --- a/bundle/Resources/public/admin/js/modules/subitems.js +++ b/bundle/Resources/public/admin/js/modules/subitems.js @@ -31,9 +31,7 @@ var eZMailingSubItemsModule = function () { totalCount: subitemsList.ChildrenCount, handleEditItem: function (content) { var contentId = content._id; - var versionNumber = content.CurrentVersion.Version.VersionInfo.versionNo; var langCode = content.mainLanguageCode; - alert("/admin/content/edit/draft/" + contentId + "/" + versionNumber + "/" + langCode); }, generateLink: function (locationId) { return window.Routing.generate('_ezpublishLocation', {locationId: locationId}); diff --git a/bundle/Resources/translations/ezmailing.en.yml b/bundle/Resources/translations/ezmailing.en.yml index 3d0c31e..68e991c 100644 --- a/bundle/Resources/translations/ezmailing.en.yml +++ b/bundle/Resources/translations/ezmailing.en.yml @@ -67,7 +67,7 @@ campaign.details.name: Name campaign.details.sender: Sender campaign.details.report_email: Report Email campaign.details.siteaccess_limit: Siteaccess limit -campaign.details.mailing_lists: Mailing Lists +campaign.details.mailing_lists: Mailing List|Mailing Lists campaign.details.associated_content: Associated content campaign.edit.name: Name campaign.edit.location: Location @@ -135,6 +135,7 @@ mailing.mailing_tabs.confirm_sending: Confirm the sending mailing.mailing_tabs.mailing_lists_count1: Campaign defines mailing.mailing_tabs.mailing_lists_count2: Mailing Lists mailing.mailing_tabs.mailing_list_reach: The reach of this Mailing is +mailing.mailing_tabs.create_content: Create Content mailing.edit.mailing: Mailing mailing_list.edit.name: Name mailing_list.edit.title: Edit diff --git a/bundle/Resources/translations/ezmailing.fr.yml b/bundle/Resources/translations/ezmailing.fr.yml index c3d68c3..6c46675 100644 --- a/bundle/Resources/translations/ezmailing.fr.yml +++ b/bundle/Resources/translations/ezmailing.fr.yml @@ -50,7 +50,7 @@ dashboard.see_mailing_lists: Voir les listes de diffusion dashboard.see_users: Voir les utilisateurs dashboard.last_user_updated: Dernier utilisateur mis à jour dashboard.last_broadcast: Dernières diffusions -campaign.tabs.campaign: Campagne|Campagnes +campaign.tabs.campaign: Campagne campaign.tabs.associated_content: Contenu eZ associé campaign.tabs.mailings: Envoi campaign.tabs.create: Créer @@ -135,6 +135,7 @@ mailing.mailing_tabs.confirm_sending: Confirmer l'envoi mailing.mailing_tabs.mailing_lists_count1: La campagne définit mailing.mailing_tabs.mailing_lists_count2: listes de diffusion mailing.mailing_tabs.mailing_list_reach: La portée de cet envoi est de +mailing.mailing_tabs.create_content: Créer du contenu mailing.edit.mailing: Envoi mailing_list.edit.name: Nom mailing_list.edit.title: Modifier diff --git a/bundle/Resources/views/admin/campaign/details.html.twig b/bundle/Resources/views/admin/campaign/details.html.twig index 066d3de..58a9e6e 100644 --- a/bundle/Resources/views/admin/campaign/details.html.twig +++ b/bundle/Resources/views/admin/campaign/details.html.twig @@ -27,7 +27,7 @@ {% endif %} - {{"campaign.details.mailing_lists"|trans}} + {{"campaign.details.mailing_lists"|transchoice(item.mailingLists|length, {})}}
{% for mailingList in item.mailingLists %} diff --git a/bundle/Resources/views/admin/mailing/mailing_tabs.html.twig b/bundle/Resources/views/admin/mailing/mailing_tabs.html.twig index 77a1d1f..316dc3e 100644 --- a/bundle/Resources/views/admin/mailing/mailing_tabs.html.twig +++ b/bundle/Resources/views/admin/mailing/mailing_tabs.html.twig @@ -78,6 +78,12 @@ {{"mailing.mailing_tabs.confirm"|trans}} +