From 60e27d386fe2ebd05f21e02e4929e86fbfb576ca Mon Sep 17 00:00:00 2001 From: tahmidshahriar <tahmids@seas.upenn.edu> Date: Wed, 1 Jul 2015 10:20:14 -0700 Subject: [PATCH 1/2] add close buttonn to payment methods --- app/views/core/SubscribeModal.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/core/SubscribeModal.coffee b/app/views/core/SubscribeModal.coffee index 3a82645e9..9c1b49c18 100644 --- a/app/views/core/SubscribeModal.coffee +++ b/app/views/core/SubscribeModal.coffee @@ -44,7 +44,6 @@ module.exports = class SubscribeModal extends ModalView popoverTitle = $.i18n.t 'subscribe.parent_email_title' popoverTitle += '<button type="button" class="close" onclick="$('.parent-button').popover('hide');">×</button>' popoverContent = -> - console.log 'found html', $('.parent-button-popover-content').html() $('.parent-button-popover-content').html() @$el.find('.parent-button').popover( animation: true @@ -78,6 +77,7 @@ module.exports = class SubscribeModal extends ModalView setupPaymentMethodsInfoPopover: -> popoverTitle = $.i18n.t('subscribe.payment_methods_title') + popoverTitle += '<button type="button" class="close" onclick="$('#payment-methods-info').popover('hide');">×</button>' popoverContent = "<p>" + $.i18n.t('subscribe.payment_methods_blurb1') + "</p>" popoverContent += "<p>" + $.i18n.t('subscribe.payment_methods_blurb2') + " <a href='mailto:support@codecombat.com'>support@codecombat.com</a>." @$el.find('#payment-methods-info').popover( From f6dd3ce0c8f4fdb42c93f40284e2d94c2f116963 Mon Sep 17 00:00:00 2001 From: tahmidshahriar <tahmids@seas.upenn.edu> Date: Wed, 1 Jul 2015 10:22:25 -0700 Subject: [PATCH 2/2] minimize changes --- app/views/core/SubscribeModal.coffee | 1 + 1 file changed, 1 insertion(+) diff --git a/app/views/core/SubscribeModal.coffee b/app/views/core/SubscribeModal.coffee index 9c1b49c18..d9e3ee8a1 100644 --- a/app/views/core/SubscribeModal.coffee +++ b/app/views/core/SubscribeModal.coffee @@ -44,6 +44,7 @@ module.exports = class SubscribeModal extends ModalView popoverTitle = $.i18n.t 'subscribe.parent_email_title' popoverTitle += '<button type="button" class="close" onclick="$('.parent-button').popover('hide');">×</button>' popoverContent = -> + console.log 'found html', $('.parent-button-popover-content').html() $('.parent-button-popover-content').html() @$el.find('.parent-button').popover( animation: true