From 4b0dcd64ebbbc1296eae11087a798477b2e01df1 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Thu, 17 Aug 2017 14:39:42 -0400 Subject: [PATCH] FIX: Footer message was missing the class --- .../components/footer-message.js.es6 | 3 ++ .../discourse/templates/discovery/topics.hbs | 2 +- .../templates/mobile/discovery/topics.hbs | 30 +++++-------------- 3 files changed, 12 insertions(+), 23 deletions(-) create mode 100644 app/assets/javascripts/discourse/components/footer-message.js.es6 diff --git a/app/assets/javascripts/discourse/components/footer-message.js.es6 b/app/assets/javascripts/discourse/components/footer-message.js.es6 new file mode 100644 index 00000000000..1d6d8528383 --- /dev/null +++ b/app/assets/javascripts/discourse/components/footer-message.js.es6 @@ -0,0 +1,3 @@ +export default Ember.Component.extend({ + classNames: ['footer-message'] +}); diff --git a/app/assets/javascripts/discourse/templates/discovery/topics.hbs b/app/assets/javascripts/discourse/templates/discovery/topics.hbs index 9d65972904c..19cdd9116d7 100644 --- a/app/assets/javascripts/discourse/templates/discovery/topics.hbs +++ b/app/assets/javascripts/discourse/templates/discovery/topics.hbs @@ -64,7 +64,7 @@ {{d-icon "check"}} {{i18n 'topics.bulk.dismiss_new'}} {{/if}} - {{#footer-message education=footerEducation message=footerMessage tagName=""}} + {{#footer-message education=footerEducation message=footerMessage}} {{#if latest}} {{#if canCreateTopicOnCategory}}{{i18n 'topic.suggest_create_topic'}}{{/if}} {{else if top}} diff --git a/app/assets/javascripts/discourse/templates/mobile/discovery/topics.hbs b/app/assets/javascripts/discourse/templates/mobile/discovery/topics.hbs index 4eb7503e29b..5c07afdc592 100644 --- a/app/assets/javascripts/discourse/templates/mobile/discovery/topics.hbs +++ b/app/assets/javascripts/discourse/templates/mobile/discovery/topics.hbs @@ -40,29 +40,15 @@ {{i18n 'topics.bulk.dismiss_new'}} {{/if}} - {{#if latest}} -
- {{{footerEducation}}} -
-

- {{footerMessage}} - {{#if model.can_create_topic}}{{i18n 'topic.suggest_create_topic'}}{{/if}} -

- {{else}} - {{#if top}} -

- {{#link-to "discovery.categories"}}{{i18n 'topic.browse_all_categories'}}{{/link-to}}, {{#link-to 'discovery.latest'}}{{i18n 'topic.view_latest_topics'}}{{/link-to}} {{i18n 'or'}} {{i18n 'filters.top.other_periods'}} -
- {{top-period-buttons period=period action="changePeriod"}} -

+ {{#footer-message education=footerEducation message=footerMessage}} + {{#if latest}} + {{#if canCreateTopicOnCategory}}{{i18n 'topic.suggest_create_topic'}}{{/if}} + {{else if top}} + {{#link-to "discovery.categories"}}{{i18n 'topic.browse_all_categories'}}{{/link-to}}, {{#link-to 'discovery.latest'}}{{i18n 'topic.view_latest_topics'}}{{/link-to}} {{i18n 'or'}} {{i18n 'filters.top.other_periods'}} + {{top-period-buttons period=period action="changePeriod"}} {{else}} -
- {{{footerEducation}}} -
-

- {{footerMessage}}{{#link-to "discovery.categories"}} {{i18n 'topic.browse_all_categories'}}{{/link-to}} {{i18n 'or'}} {{#link-to 'discovery.latest'}}{{i18n 'topic.view_latest_topics'}}{{/link-to}} -

+ {{#link-to "discovery.categories"}} {{i18n 'topic.browse_all_categories'}}{{/link-to}} {{i18n 'or'}} {{#link-to 'discovery.latest'}}{{i18n 'topic.view_latest_topics'}}{{/link-to}} {{/if}} - {{/if}} + {{/footer-message}} {{/if}}