From f6a6e767e6b524f715e7fbc83b60c2b140fba29a Mon Sep 17 00:00:00 2001 From: Thomas Date: Mon, 17 Oct 2022 10:56:25 +0200 Subject: [PATCH] Merge pull request #9947 from overleaf/tm-teardown-bts2022-promo Teardown Back to School 2022 promo banners GitOrigin-RevId: b26229af17c7ce272632106850fce504cdca04d2 --- .../app/views/project/list/notifications.pug | 25 ------------------- .../subscriptions/plans-marketing-v2.pug | 16 ------------ .../views/subscriptions/plans-marketing.pug | 16 ------------ .../project-list/notifications-controller.js | 13 ---------- 4 files changed, 70 deletions(-) diff --git a/services/web/app/views/project/list/notifications.pug b/services/web/app/views/project/list/notifications.pug index 9e96709284..a8672d9c36 100644 --- a/services/web/app/views/project/list/notifications.pug +++ b/services/web/app/views/project/list/notifications.pug @@ -251,28 +251,3 @@ include ../../_mixins/reconfirm_affiliation ng-if="userEmail.samlIdentifier && userEmail.samlIdentifier.providerId === reconfirmedViaSAML" ) +reconfirmedAffiliationNotification() - - - var hasPaidAffiliation = userAffiliations.some(affiliation => affiliation.licence && affiliation.licence !== 'free') - if settings.enableSubscriptions && !hasSubscription && !hasPaidAffiliation - ul.list-unstyled( - ng-controller="DismissableNotificationsController", - ng-cloak - ) - li.notification-entry( - ng-if="shouldShowNotification && projects.length > 0" - ) - .alert.alert-info - .notification-body - span We're celebrating the new school year! Receive 15% off the first year of an annual Student or Standard subscription now through October 14. - .notification-action - a.pull-right.btn.btn-sm.btn-info( - href="https://www.overleaf.com/events/limited-time-promo-sept2022" - event-tracking="promo-click" - event-tracking-mb="true" - event-tracking-trigger="click" - event-segmentation='{"name": "bts2022", "location": "dashboard-banner"}' - ) Upgrade - .notification-close - button(ng-click="dismiss()").close.pull-right - span(aria-hidden="true") × - span.sr-only #{translate("close")} diff --git a/services/web/app/views/subscriptions/plans-marketing-v2.pug b/services/web/app/views/subscriptions/plans-marketing-v2.pug index 0c41bc669c..33001e4964 100644 --- a/services/web/app/views/subscriptions/plans-marketing-v2.pug +++ b/services/web/app/views/subscriptions/plans-marketing-v2.pug @@ -14,22 +14,6 @@ block append meta block content main.content.content-alt#main-content - .container - .user-notifications - ul.list-unstyled(ng-cloak) - li.notification-entry - .alert.alert-info - .notification-body - span We're celebrating the new school year! Receive 15% off the first year of an annual Student or Standard subscription now through October 14. - .notification-action - a.btn.btn-sm.btn-info( - href="https://www.overleaf.com/events/limited-time-promo-sept2022" - event-tracking="promo-click" - event-tracking-mb="true" - event-tracking-trigger="click" - event-segmentation='{"name": "bts2022", "location": "plans-v2-banner"}' - ) Upgrade - .content-page .plans .container(ng-cloak) diff --git a/services/web/app/views/subscriptions/plans-marketing.pug b/services/web/app/views/subscriptions/plans-marketing.pug index 735a086744..1163223386 100644 --- a/services/web/app/views/subscriptions/plans-marketing.pug +++ b/services/web/app/views/subscriptions/plans-marketing.pug @@ -14,22 +14,6 @@ block append meta block content main.content.content-alt#main-content - .container - .user-notifications - ul.list-unstyled(ng-cloak) - li.notification-entry - .alert.alert-info - .notification-body - span We're celebrating the new school year! Receive 15% off the first year of an annual Student or Standard subscription now through October 14. - .notification-action - a.btn.btn-sm.btn-info( - href="https://www.overleaf.com/events/limited-time-promo-sept2022" - event-tracking="promo-click" - event-tracking-mb="true" - event-tracking-trigger="click" - event-segmentation='{"name": "bts2022", "location": "plans-banner"}' - ) Upgrade - .content-page .plans .container(ng-cloak) diff --git a/services/web/frontend/js/main/project-list/notifications-controller.js b/services/web/frontend/js/main/project-list/notifications-controller.js index 113b091d1a..9a34fff5ee 100644 --- a/services/web/frontend/js/main/project-list/notifications-controller.js +++ b/services/web/frontend/js/main/project-list/notifications-controller.js @@ -23,19 +23,6 @@ App.controller('NotificationsController', function ($scope, $http) { } }) -App.controller( - 'DismissableNotificationsController', - function ($scope, localStorage) { - $scope.shouldShowNotification = - localStorage('dismissed-back-to-school-2022') !== true - - $scope.dismiss = () => { - localStorage('dismissed-back-to-school-2022', true) - $scope.shouldShowNotification = false - } - } -) - App.controller('ProjectInviteNotificationController', function ($scope, $http) { // Shortcuts for translation keys $scope.projectName = $scope.notification.messageOpts.projectName