diff --git a/app/assets/javascripts/discourse/components/d-section.js.es6 b/app/assets/javascripts/discourse/components/d-section.js.es6 new file mode 100644 index 00000000000..1bb1942003e --- /dev/null +++ b/app/assets/javascripts/discourse/components/d-section.js.es6 @@ -0,0 +1,45 @@ +import DiscourseURL from 'discourse/lib/url'; + +// Can add a body class from within a component, also will scroll to the top automatically. +export default Ember.Component.extend({ + tagName: 'section', + + _scrollTop() { + if (Ember.testing) { return; } + $(document).scrollTop(0); + }, + + didInsertElement() { + this._super(); + + const pageClass = this.get('pageClass'); + if (pageClass) { + $('body').addClass(`${pageClass}-page`); + } + + const bodyClass = this.get('bodyClass'); + if (bodyClass) { + $('body').addClass(bodyClass); + } + + if (this.get('scrollTop') === "false") { + return; + } + + if (DiscourseURL.isJumpScheduled()) { return; } + Ember.run.scheduleOnce('afterRender', this, this._scrollTop); + }, + + willDestroyElement() { + this._super(); + const pageClass = this.get('pageClass'); + if (pageClass) { + $('body').removeClass(`${pageClass}-page`); + } + + const bodyClass = this.get('bodyClass'); + if (bodyClass) { + $('body').removeClass(bodyClass); + } + } +}); diff --git a/app/assets/javascripts/discourse/lib/create-view.js.es6 b/app/assets/javascripts/discourse/lib/create-view.js.es6 deleted file mode 100644 index 854fa42fbe0..00000000000 --- a/app/assets/javascripts/discourse/lib/create-view.js.es6 +++ /dev/null @@ -1,15 +0,0 @@ -import { on } from 'ember-addons/ember-computed-decorators'; - -export function createViewWithBodyClass(body_class) { - return Ember.View.extend({ - @on("didInsertElement") - addBodyClass() { - $('body').addClass(body_class); - }, - - @on("willDestroyElement") - removeBodyClass() { - $('body').removeClass(body_class); - } - }); -} diff --git a/app/assets/javascripts/discourse/templates/about.hbs b/app/assets/javascripts/discourse/templates/about.hbs index 3d8f993ba08..480b10c0fde 100644 --- a/app/assets/javascripts/discourse/templates/about.hbs +++ b/app/assets/javascripts/discourse/templates/about.hbs @@ -1,97 +1,99 @@ -
-
+{{#d-section pageClass="about"}} +
+
-
    -
  • {{#link-to 'about' class="active"}}{{i18n 'about.simple_title'}}{{/link-to}}
    • - {{#if faqOverriden}} -
  • {{#link-to 'guidelines'}}{{i18n 'guidelines'}}{{/link-to}}
    • -
  • {{#link-to 'faq'}}{{i18n 'faq'}}{{/link-to}}
    • - {{else}} -
  • {{#link-to 'faq'}}{{i18n 'faq'}}{{/link-to}}
    • - {{/if}} -
  • {{#link-to 'tos'}}{{i18n 'terms_of_service'}}{{/link-to}}
    • -
  • {{#link-to 'privacy'}}{{i18n 'privacy'}}{{/link-to}}
    • -
- -
-

{{i18n 'about.title' title=model.title}}

-

{{model.description}}

-
- - {{#if model.admins}} -
-

{{i18n 'about.our_admins'}}

- - {{#each model.admins as |a|}} - {{user-info user=a}} - {{/each}} -
+
    +
  • {{#link-to 'about' class="active"}}{{i18n 'about.simple_title'}}{{/link-to}}
    • + {{#if faqOverriden}} +
  • {{#link-to 'guidelines'}}{{i18n 'guidelines'}}{{/link-to}}
    • +
  • {{#link-to 'faq'}}{{i18n 'faq'}}{{/link-to}}
    • + {{else}} +
  • {{#link-to 'faq'}}{{i18n 'faq'}}{{/link-to}}
    • + {{/if}} +
  • {{#link-to 'tos'}}{{i18n 'terms_of_service'}}{{/link-to}}
    • +
  • {{#link-to 'privacy'}}{{i18n 'privacy'}}{{/link-to}}
    • +
+
+

{{i18n 'about.title' title=model.title}}

+

{{model.description}}

- {{/if}} - {{#if model.moderators}} -
-

{{i18n 'about.our_moderators'}}

+ {{#if model.admins}} +
+

{{i18n 'about.our_admins'}}

-
- {{#each model.moderators as |m|}} - {{user-info user=m}} + {{#each model.admins as |a|}} + {{user-info user=a}} {{/each}} -
-
+
+ +
+ {{/if}} + + {{#if model.moderators}} +
+

{{i18n 'about.our_moderators'}}

+ +
+ {{#each model.moderators as |m|}} + {{user-info user=m}} + {{/each}} +
+
+
+ {{/if}} + +
+

{{i18n 'about.stats'}}

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
 {{i18n 'about.stat.all_time'}}{{i18n 'about.stat.last_7_days'}}{{i18n 'about.stat.last_30_days'}}
{{i18n 'about.topic_count'}}{{number model.stats.topic_count}}{{number model.stats.topics_7_days}}{{number model.stats.topics_30_days}}
{{i18n 'about.post_count'}}{{number model.stats.post_count}}{{number model.stats.posts_7_days}}{{number model.stats.posts_30_days}}
{{i18n 'about.user_count'}}{{number model.stats.user_count}}{{number model.stats.users_7_days}}{{number model.stats.users_30_days}}
{{i18n 'about.active_user_count'}}—{{number model.stats.active_users_7_days}}{{number model.stats.active_users_30_days}}
{{i18n 'about.like_count'}}{{number model.stats.like_count}}{{number model.stats.likes_7_days}}{{number model.stats.likes_30_days}}
- {{/if}} -
-

{{i18n 'about.stats'}}

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 {{i18n 'about.stat.all_time'}}{{i18n 'about.stat.last_7_days'}}{{i18n 'about.stat.last_30_days'}}
{{i18n 'about.topic_count'}}{{number model.stats.topic_count}}{{number model.stats.topics_7_days}}{{number model.stats.topics_30_days}}
{{i18n 'about.post_count'}}{{number model.stats.post_count}}{{number model.stats.posts_7_days}}{{number model.stats.posts_30_days}}
{{i18n 'about.user_count'}}{{number model.stats.user_count}}{{number model.stats.users_7_days}}{{number model.stats.users_30_days}}
{{i18n 'about.active_user_count'}}—{{number model.stats.active_users_7_days}}{{number model.stats.active_users_30_days}}
{{i18n 'about.like_count'}}{{number model.stats.like_count}}{{number model.stats.likes_7_days}}{{number model.stats.likes_30_days}}
-
- - {{#if contactInfo}} -
-

{{i18n 'about.contact'}}

-

{{{contactInfo}}}

-
- {{/if}} + {{#if contactInfo}} +
+

{{i18n 'about.contact'}}

+

{{{contactInfo}}}

+
+ {{/if}} +
-
+{{/d-section}} diff --git a/app/assets/javascripts/discourse/templates/badges/index.hbs b/app/assets/javascripts/discourse/templates/badges/index.hbs index a5aac17b23a..b30725693b3 100644 --- a/app/assets/javascripts/discourse/templates/badges/index.hbs +++ b/app/assets/javascripts/discourse/templates/badges/index.hbs @@ -1,17 +1,19 @@ -
-

{{i18n 'badges.title'}}

+{{#d-section pageClass="badges"}} +
+

{{i18n 'badges.title'}}

-
- {{#each badgeGroups as |bg|}} -
-
-

{{bg.badgeGrouping.displayName}}

+
+ {{#each badgeGroups as |bg|}} +
+
+

{{bg.badgeGrouping.displayName}}

+
+ + {{#each bg.badges as |b|}} + {{badge-card badge=b navigateOnClick="true"}} + {{/each}}
- - {{#each bg.badges as |b|}} - {{badge-card badge=b navigateOnClick="true"}} - {{/each}} -
- {{/each}} + {{/each}} +
-
+{{/d-section}} diff --git a/app/assets/javascripts/discourse/templates/full-page-search.hbs b/app/assets/javascripts/discourse/templates/full-page-search.hbs index dc5572f8287..edaf9172db9 100644 --- a/app/assets/javascripts/discourse/templates/full-page-search.hbs +++ b/app/assets/javascripts/discourse/templates/full-page-search.hbs @@ -1,132 +1,134 @@ -
- {{search-text-field value=searchTerm class="full-page-search input-xxlarge search no-blur" action="search" hasAutofocus=hasAutofocus}} - {{d-button action="search" icon="search" class="btn-primary" disabled=searching}} +{{#d-section pageClass="search" class="search-container"}} +
+ {{search-text-field value=searchTerm class="full-page-search input-xxlarge search no-blur" action="search" hasAutofocus=hasAutofocus}} + {{d-button action="search" icon="search" class="btn-primary" disabled=searching}} -
- +
+ - {{#if expanded}} - {{search-advanced-options searchTerm=searchTerm isExpanded=expanded}} + {{#if expanded}} + {{search-advanced-options searchTerm=searchTerm isExpanded=expanded}} + {{/if}} +
+ + {{#if canCreateTopic}} + {{d-button id="create-topic" class="btn-default" action="createTopic" actionParam=searchTerm icon="plus" label="topic.create"}} + {{/if}} + + {{#if canBulkSelect}} + {{d-button icon="list" class="bulk-select" title="topics.bulk.toggle" action="toggleBulkSelect"}} + {{bulk-select-button selected=selected action="search"}} {{/if}}
- {{#if canCreateTopic}} - {{d-button id="create-topic" class="btn-default" action="createTopic" actionParam=searchTerm icon="plus" label="topic.create"}} - {{/if}} - - {{#if canBulkSelect}} - {{d-button icon="list" class="bulk-select" title="topics.bulk.toggle" action="toggleBulkSelect"}} - {{bulk-select-button selected=selected action="search"}} - {{/if}} -
- -{{#if bulkSelectEnabled}} -
- {{i18n "search.select_all"}} - {{i18n "search.clear_all"}} -
-{{/if}} - -{{#if invalidSearch}} -
- {{i18n "search.too_short"}} -
-{{/if}} - -{{#if context}} -
- -
-{{/if}} - -{{#conditional-loading-spinner condition=loading}} - - {{#unless hasResults}} -

- {{#if searchActive}} - {{i18n "search.no_results"}} - {{/if}} -

- {{/unless}} - - {{#if hasResults}} -
-
- - {{{i18n "search.result_count" count=resultCount term=noSortQ}}} - -
-
- - {{i18n "search.sort_by"}} - - {{combo-box value=sortOrder content=sortOrders castInteger="true"}} -
+ {{#if bulkSelectEnabled}} +
+ {{i18n "search.select_all"}} + {{i18n "search.clear_all"}}
{{/if}} - {{#each model.posts as |result|}} -
-
- - {{avatar result imageSize="large"}} - -
+ {{#if invalidSearch}} +
+ {{i18n "search.too_short"}} +
+ {{/if}} -
-
- {{#if bulkSelectEnabled}} - {{track-selected selectedList=selected selectedId=result.topic}} - {{/if}} + {{#if context}} +
+ +
+ {{/if}} - - {{topic-status topic=result.topic disableActions=true}}{{#highlight-text highlight=q}}{{{unbound result.topic.fancyTitle}}}{{/highlight-text}} - + {{#conditional-loading-spinner condition=loading}} -
- {{category-link result.topic.category}} - {{#each result.topic.tags as |tag|}} - {{discourse-tag tag}} - {{/each}} - {{plugin-outlet "full-page-search-category"}} -
-
- -
- - {{format-age result.created_at}} - {{#if result.blurb}} - - - {{/if}} - - - {{#if result.blurb}} - {{#highlight-text highlight=q}} - {{{unbound result.blurb}}} - {{/highlight-text}} - {{/if}} -
- - {{#if showLikeCount}} - {{#if result.like_count}} - - {{/if}} + {{#unless hasResults}} +

+ {{#if searchActive}} + {{i18n "search.no_results"}} {{/if}} +

+ {{/unless}} + + {{#if hasResults}} +
+
+ + {{{i18n "search.result_count" count=resultCount term=noSortQ}}} + +
+
+ + {{i18n "search.sort_by"}} + + {{combo-box value=sortOrder content=sortOrders castInteger="true"}} +
-
- {{/each}} + {{/if}} - {{#if hasResults}} -

- {{i18n "search.no_more_results"}} -

- {{/if}} + {{#each model.posts as |result|}} +
+
+ + {{avatar result imageSize="large"}} + +
-{{/conditional-loading-spinner}} +
+
+ {{#if bulkSelectEnabled}} + {{track-selected selectedList=selected selectedId=result.topic}} + {{/if}} + + + {{topic-status topic=result.topic disableActions=true}}{{#highlight-text highlight=q}}{{{unbound result.topic.fancyTitle}}}{{/highlight-text}} + + +
+ {{category-link result.topic.category}} + {{#each result.topic.tags as |tag|}} + {{discourse-tag tag}} + {{/each}} + {{plugin-outlet "full-page-search-category"}} +
+
+ +
+ + {{format-age result.created_at}} + {{#if result.blurb}} + - + {{/if}} + + + {{#if result.blurb}} + {{#highlight-text highlight=q}} + {{{unbound result.blurb}}} + {{/highlight-text}} + {{/if}} +
+ + {{#if showLikeCount}} + {{#if result.like_count}} + + {{/if}} + {{/if}} +
+
+ {{/each}} + + {{#if hasResults}} +

+ {{i18n "search.no_more_results"}} +

+ {{/if}} + + {{/conditional-loading-spinner}} +{{/d-section}} diff --git a/app/assets/javascripts/discourse/templates/navigation/default.hbs b/app/assets/javascripts/discourse/templates/navigation/default.hbs index b02c503fd8e..c8cc96a9e73 100644 --- a/app/assets/javascripts/discourse/templates/navigation/default.hbs +++ b/app/assets/javascripts/discourse/templates/navigation/default.hbs @@ -1,7 +1,9 @@ -{{bread-crumbs categories=categories}} +{{#d-section bodyClass="navigation-topics" scrollTop="false"}} + {{bread-crumbs categories=categories}} -{{navigation-bar navItems=navItems filterMode=filterMode}} + {{navigation-bar navItems=navItems filterMode=filterMode}} -{{#if canCreateTopic}} - -{{/if}} + {{#if canCreateTopic}} + + {{/if}} +{{/d-section}} diff --git a/app/assets/javascripts/discourse/templates/user/preferences.hbs b/app/assets/javascripts/discourse/templates/preferences.hbs similarity index 99% rename from app/assets/javascripts/discourse/templates/user/preferences.hbs rename to app/assets/javascripts/discourse/templates/preferences.hbs index 171da9306b9..2afbb4d9869 100644 --- a/app/assets/javascripts/discourse/templates/user/preferences.hbs +++ b/app/assets/javascripts/discourse/templates/preferences.hbs @@ -1,4 +1,4 @@ -
+{{#d-section pageClass="user-preferences" class="user-content user-preferences"}}
@@ -367,4 +367,4 @@
{{/if}} - +{{/d-section}} diff --git a/app/assets/javascripts/discourse/templates/tags.hbs b/app/assets/javascripts/discourse/templates/tags.hbs index 3fd70a3f751..c355c1f3bd5 100644 --- a/app/assets/javascripts/discourse/templates/tags.hbs +++ b/app/assets/javascripts/discourse/templates/tags.hbs @@ -1,9 +1,11 @@ -
-
-
-
- {{outlet}} +{{#d-section pageClass="tags"}} +
+
+
+
+ {{outlet}} +
-
+{{/d-section}} diff --git a/app/assets/javascripts/discourse/templates/user-invited-show.hbs b/app/assets/javascripts/discourse/templates/user-invited-show.hbs index 098193b7e81..6588a53e01f 100644 --- a/app/assets/javascripts/discourse/templates/user-invited-show.hbs +++ b/app/assets/javascripts/discourse/templates/user-invited-show.hbs @@ -1,109 +1,111 @@ -{{#if canInviteToForum}} - {{#load-more class="paginated-topics-list" selector=".paginated-topics-list .user-invite-list tr" action="loadMore"}} -
-

{{i18n 'user.invited.title'}}

+{{#d-section pageClass="user-invites"}} + {{#if canInviteToForum}} + {{#load-more class="paginated-topics-list" selector=".paginated-topics-list .user-invite-list tr" action="loadMore"}} +
+

{{i18n 'user.invited.title'}}

- {{#if model.can_see_invite_details}} -
-
-
    - {{nav-item route='userInvited.show' routeParam='pending' i18nLabel=pendingLabel}} - {{nav-item route='userInvited.show' routeParam='redeemed' i18nLabel=redeemedLabel}} -
-
+ {{#if model.can_see_invite_details}} +
+
+
    + {{nav-item route='userInvited.show' routeParam='pending' i18nLabel=pendingLabel}} + {{nav-item route='userInvited.show' routeParam='redeemed' i18nLabel=redeemedLabel}} +
+
-
- {{d-button icon="plus" action="showInvite" label="user.invited.create" class="btn"}} - {{#if canBulkInvite}} - {{resumable-upload target="/invites/upload" success="uploadSuccess" error="uploadError" uploadText=uploadText}} - {{/if}} - {{#if showReinviteAllButton}} - {{#if reinvitedAll}} - {{i18n 'user.invited.reinvited_all'}} - {{else}} - {{d-button icon="refresh" action="reinviteAll" class="btn" label="user.invited.reinvite_all"}} +
+ {{d-button icon="plus" action="showInvite" label="user.invited.create" class="btn"}} + {{#if canBulkInvite}} + {{resumable-upload target="/invites/upload" success="uploadSuccess" error="uploadError" uploadText=uploadText}} {{/if}} - {{/if}} -
-
- {{/if}} - - {{#if showSearch}} -
-
{{text-field value=searchTerm placeholderKey="user.invited.search"}}
-
- {{/if}} - - {{#if model.invites}} - - - {{#if inviteRedeemed}} - - - {{#if model.can_see_invite_details}} - - - - - + {{#if showReinviteAllButton}} + {{#if reinvitedAll}} + {{i18n 'user.invited.reinvited_all'}} + {{else}} + {{d-button icon="refresh" action="reinviteAll" class="btn" label="user.invited.reinvite_all"}} + {{/if}} {{/if}} - {{else}} - - - {{/if}} - - {{#each model.invites as |invite|}} + + + {{/if}} + + {{#if showSearch}} +
+
{{text-field value=searchTerm placeholderKey="user.invited.search"}} +
+ {{/if}} + + {{#if model.invites}} +
{{i18n 'user.invited.user'}}{{i18n 'user.invited.redeemed_at'}}{{i18n 'user.last_seen'}}{{i18n 'user.invited.topics_entered'}}{{i18n 'user.invited.posts_read_count'}}{{i18n 'user.invited.time_read'}}{{i18n 'user.invited.days_visited'}}{{i18n 'user.invited.user'}}{{i18n 'user.invited.sent'}}
- {{#if invite.user}} - - + {{#if inviteRedeemed}} + + {{#if model.can_see_invite_details}} - - - - - + + + + + {{/if}} {{else}} - - - + + {{/if}} - {{/each}} -
- {{#link-to 'user' invite.user}}{{avatar invite.user imageSize="tiny"}}{{/link-to}} - {{#link-to 'user' invite.user}}{{invite.user.username}}{{/link-to}} - {{format-date invite.redeemed_at}}{{i18n 'user.invited.user'}}{{i18n 'user.invited.redeemed_at'}}{{format-date invite.user.last_seen_at}}{{number invite.user.topics_entered}}{{number invite.user.posts_read_count}}{{{unbound invite.user.time_read}}}{{{unbound invite.user.days_visited}}} - / - {{{unbound invite.user.days_since_created}}}{{i18n 'user.last_seen'}}{{i18n 'user.invited.topics_entered'}}{{i18n 'user.invited.posts_read_count'}}{{i18n 'user.invited.time_read'}}{{i18n 'user.invited.days_visited'}}{{unbound invite.email}}{{format-date invite.created_at}} - {{#if invite.expired}} - {{i18n 'user.invited.expired'}} -      - {{/if}} - {{#if invite.rescinded}} - {{i18n 'user.invited.rescinded'}} - {{else}} - {{d-button icon="times" action="rescind" actionParam=invite class="btn" label="user.invited.rescind"}} - {{/if}} -      - {{#if invite.reinvited}} - {{i18n 'user.invited.reinvited'}} - {{else}} - {{d-button icon="refresh" action="reinvite" actionParam=invite class="btn" label="user.invited.reinvite"}} - {{/if}} - {{i18n 'user.invited.user'}}{{i18n 'user.invited.sent'}}
- {{conditional-loading-spinner condition=invitesLoading}} + {{#each model.invites as |invite|}} + + {{#if invite.user}} + + {{#link-to 'user' invite.user}}{{avatar invite.user imageSize="tiny"}}{{/link-to}} + {{#link-to 'user' invite.user}}{{invite.user.username}}{{/link-to}} + + {{format-date invite.redeemed_at}} + {{#if model.can_see_invite_details}} + {{format-date invite.user.last_seen_at}} + {{number invite.user.topics_entered}} + {{number invite.user.posts_read_count}} + {{{unbound invite.user.time_read}}} + {{{unbound invite.user.days_visited}}} + / + {{{unbound invite.user.days_since_created}}} + {{/if}} + {{else}} + {{unbound invite.email}} + {{format-date invite.created_at}} + + {{#if invite.expired}} + {{i18n 'user.invited.expired'}} +      + {{/if}} + {{#if invite.rescinded}} + {{i18n 'user.invited.rescinded'}} + {{else}} + {{d-button icon="times" action="rescind" actionParam=invite class="btn" label="user.invited.rescind"}} + {{/if}} +      + {{#if invite.reinvited}} + {{i18n 'user.invited.reinvited'}} + {{else}} + {{d-button icon="refresh" action="reinvite" actionParam=invite class="btn" label="user.invited.reinvite"}} + {{/if}} + + {{/if}} + + {{/each}} + + {{conditional-loading-spinner condition=invitesLoading}} - {{else}} -
- {{#if canBulkInvite}} - {{{i18n 'user.invited.bulk_invite.none'}}} - {{else}} - {{i18n 'user.invited.none'}} - {{/if}} -
- {{/if}} -
- {{/load-more}} -{{/if}} + {{else}} +
+ {{#if canBulkInvite}} + {{{i18n 'user.invited.bulk_invite.none'}}} + {{else}} + {{i18n 'user.invited.none'}} + {{/if}} +
+ {{/if}} +
+ {{/load-more}} + {{/if}} +{{/d-section}} diff --git a/app/assets/javascripts/discourse/templates/user/activity.hbs b/app/assets/javascripts/discourse/templates/user/activity.hbs index 3b07cd95aed..72805bb8fd8 100644 --- a/app/assets/javascripts/discourse/templates/user/activity.hbs +++ b/app/assets/javascripts/discourse/templates/user/activity.hbs @@ -1,4 +1,4 @@ -
+{{#d-section pageClass="user-activity" class="user-nagivation" scrollTop="false"}} {{#mobile-nav class='activity-nav' desktopClass='action-list activity-list nav-stacked' currentPath=currentPath}}
  • {{#link-to 'userActivity.index'}}{{i18n 'user.filters.all'}}{{/link-to}} @@ -31,10 +31,8 @@ {{d-button action="exportUserArchive" label="user.download_archive" icon="download"}}
    • {{/if}} - - +{{/d-section}}
    -{{outlet}} + {{outlet}}
    - diff --git a/app/assets/javascripts/discourse/templates/user/badges.hbs b/app/assets/javascripts/discourse/templates/user/badges.hbs index 01410767aa9..860af54a92d 100644 --- a/app/assets/javascripts/discourse/templates/user/badges.hbs +++ b/app/assets/javascripts/discourse/templates/user/badges.hbs @@ -1,5 +1,5 @@ -
    +{{#d-section pageClass="user-badges" class="user-content user-badges-list"}} {{#each sortedBadges as |ub|}} {{badge-card badge=ub.badge count=ub.count navigateOnClick="true" username=username}} {{/each}} -
    +{{/d-section}} diff --git a/app/assets/javascripts/discourse/templates/user/messages.hbs b/app/assets/javascripts/discourse/templates/user/messages.hbs index 56f03b2e618..ec37e6098a0 100644 --- a/app/assets/javascripts/discourse/templates/user/messages.hbs +++ b/app/assets/javascripts/discourse/templates/user/messages.hbs @@ -1,4 +1,4 @@ -
    +{{#d-section class="user-navigation" pageClass="user-messages"}} {{#unless site.mobileView}} {{#if showNewPM}} {{d-button class="btn-primary new-private-message" action="composePrivateMessage" icon="envelope" label="user.new_private_message"}} @@ -37,8 +37,7 @@ {{/if}} {{/each}} {{/mobile-nav}} - -
    +{{/d-section}}
    diff --git a/app/assets/javascripts/discourse/templates/user/notifications.hbs b/app/assets/javascripts/discourse/templates/user/notifications.hbs index 5682d2e8552..6d2b1e989de 100644 --- a/app/assets/javascripts/discourse/templates/user/notifications.hbs +++ b/app/assets/javascripts/discourse/templates/user/notifications.hbs @@ -1,4 +1,4 @@ -
    +{{#d-section pageClass="user-notifications" class="user-notifications"}} {{#mobile-nav class='notifications-nav' desktopClass='notification-list action-list nav-stacked' currentPath=application.currentPath}}
  • {{#link-to 'userNotifications.index'}}{{i18n 'user.filters.all'}}{{/link-to}} @@ -26,7 +26,7 @@ icon='check' disabled=allNotificationsRead}} {{/if}} -
    • +{{/d-section}}
    {{#load-more class="notification-history user-stream" selector=".user-stream .notification" action="loadMore"}} diff --git a/app/assets/javascripts/discourse/templates/user/summary.hbs b/app/assets/javascripts/discourse/templates/user/summary.hbs index 0042f4ba923..ffb578edcb8 100644 --- a/app/assets/javascripts/discourse/templates/user/summary.hbs +++ b/app/assets/javascripts/discourse/templates/user/summary.hbs @@ -1,185 +1,187 @@ -
    -

    {{i18n "user.summary.stats"}}

    -
      -
    • - {{user-stat value=model.days_visited label="user.summary.days_visited"}} -
      • -
    • - {{model.time_read}} - {{{i18n "user.summary.time_read"}}} -
      • -
    • - {{user-stat value=model.posts_read_count label="user.summary.posts_read"}} -
      • -
    • - {{#link-to 'userActivity.likesGiven'}} - {{user-stat value=model.likes_given label="user.summary.likes_given"}} - {{/link-to}} -
      • - {{#if model.bookmark_count}} +{{#d-section pageClass="user-summary"}} +
      +

      {{i18n "user.summary.stats"}}

      +
        +
      • + {{user-stat value=model.days_visited label="user.summary.days_visited"}} +
        • +
      • + {{model.time_read}} + {{{i18n "user.summary.time_read"}}} +
        • +
      • + {{user-stat value=model.posts_read_count label="user.summary.posts_read"}} +
      • - {{#link-to 'userActivity.bookmarks'}} - {{user-stat value=model.bookmark_count label="user.summary.bookmark_count"}} + {{#link-to 'userActivity.likesGiven'}} + {{user-stat value=model.likes_given label="user.summary.likes_given"}} {{/link-to}}
        • - {{/if}} -
      • - {{#link-to 'userActivity.topics'}} - {{user-stat value=model.topic_count label="user.summary.topic_count"}} - {{/link-to}} -
        • -
      • - {{#link-to 'userActivity.replies'}} - {{user-stat value=model.post_count label="user.summary.post_count"}} - {{/link-to}} -
        • -
      • - {{user-stat value=model.likes_received label="user.summary.likes_received"}} -
        • -
      -
      - -
      -
      -

      {{i18n "user.summary.top_replies"}}

      - {{#if model.replies.length}} -
        - {{#each model.replies as |reply|}} -
      • - - {{format-date reply.createdAt format="tiny" noTitle="true"}} - {{#if reply.like_count}} - · - {{fa-icon 'heart'}}  - {{/if}} - -
        - {{{reply.topic.fancyTitle}}} -
        • - {{/each}} -
      - {{#if moreReplies}} -

      {{#link-to "userActivity.replies" user class="more"}}{{i18n "user.summary.more_replies"}}{{/link-to}}

      + {{#if model.bookmark_count}} +
    • + {{#link-to 'userActivity.bookmarks'}} + {{user-stat value=model.bookmark_count label="user.summary.bookmark_count"}} + {{/link-to}} +
      • {{/if}} - {{else}} -

      {{i18n "user.summary.no_replies"}}

      - {{/if}} +
    • + {{#link-to 'userActivity.topics'}} + {{user-stat value=model.topic_count label="user.summary.topic_count"}} + {{/link-to}} +
      • +
    • + {{#link-to 'userActivity.replies'}} + {{user-stat value=model.post_count label="user.summary.post_count"}} + {{/link-to}} +
      • +
    • + {{user-stat value=model.likes_received label="user.summary.likes_received"}} +
      • +
    -
    -

    {{i18n "user.summary.top_topics"}}

    - {{#if model.topics.length}} -
      - {{#each model.topics as |topic|}} -
    • - - {{format-date topic.createdAt format="tiny" noTitle="true"}} - {{#if topic.like_count}} - · - {{fa-icon 'heart'}}  - {{/if}} - -
      - {{{topic.fancyTitle}}} -
      • - {{/each}} -
    - {{#if moreTopics}} -

    {{#link-to "userActivity.topics" user class="more"}}{{i18n "user.summary.more_topics"}}{{/link-to}}

    + +
    +
    +

    {{i18n "user.summary.top_replies"}}

    + {{#if model.replies.length}} +
      + {{#each model.replies as |reply|}} +
    • + + {{format-date reply.createdAt format="tiny" noTitle="true"}} + {{#if reply.like_count}} + · + {{fa-icon 'heart'}}  + {{/if}} + +
      + {{{reply.topic.fancyTitle}}} +
      • + {{/each}} +
    + {{#if moreReplies}} +

    {{#link-to "userActivity.replies" user class="more"}}{{i18n "user.summary.more_replies"}}{{/link-to}}

    + {{/if}} + {{else}} +

    {{i18n "user.summary.no_replies"}}

    {{/if}} - {{else}} -

    {{i18n "user.summary.no_topics"}}

    - {{/if}} +
    +
    +

    {{i18n "user.summary.top_topics"}}

    + {{#if model.topics.length}} +
      + {{#each model.topics as |topic|}} +
    • + + {{format-date topic.createdAt format="tiny" noTitle="true"}} + {{#if topic.like_count}} + · + {{fa-icon 'heart'}}  + {{/if}} + +
      + {{{topic.fancyTitle}}} +
      • + {{/each}} +
    + {{#if moreTopics}} +

    {{#link-to "userActivity.topics" user class="more"}}{{i18n "user.summary.more_topics"}}{{/link-to}}

    + {{/if}} + {{else}} +

    {{i18n "user.summary.no_topics"}}

    + {{/if}} +
    -
    -
    -
    -

    {{i18n "user.summary.top_links"}}

    - {{#if model.links.length}} - - {{else}} -

    {{i18n "user.summary.no_links"}}

    - {{/if}} +
    +
    +

    {{i18n "user.summary.top_links"}}

    + {{#if model.links.length}} + + {{else}} +

    {{i18n "user.summary.no_links"}}

    + {{/if}} +
    +
    - -
    -
    - -
    -

    {{i18n "user.summary.top_badges"}}

    - {{#each model.badges as |badge|}} - {{badge-card badge=badge count=badge.count navigateOnClick="true" username=user.username_lower}} - {{else}} -

    {{i18n "user.summary.no_badges"}}

    - {{/each}} - {{#if moreBadges}} -

    {{#link-to "user.badges" user class="more"}}{{i18n "user.summary.more_badges"}}{{/link-to}}

    - {{/if}} -
    +
    +

    {{i18n "user.summary.top_badges"}}

    + {{#each model.badges as |badge|}} + {{badge-card badge=badge count=badge.count navigateOnClick="true" username=user.username_lower}} + {{else}} +

    {{i18n "user.summary.no_badges"}}

    + {{/each}} + {{#if moreBadges}} +

    {{#link-to "user.badges" user class="more"}}{{i18n "user.summary.more_badges"}}{{/link-to}}

    + {{/if}} +
    +{{/d-section}} diff --git a/app/assets/javascripts/discourse/templates/users.hbs b/app/assets/javascripts/discourse/templates/users.hbs index 82b7ce0c70c..0fe4408dd76 100644 --- a/app/assets/javascripts/discourse/templates/users.hbs +++ b/app/assets/javascripts/discourse/templates/users.hbs @@ -1,44 +1,46 @@ -{{#load-more selector=".directory tbody tr" action="loadMore"}} -
    -
    +{{#d-section pageClass="users"}} + {{#load-more selector=".directory tbody tr" action="loadMore"}} +
    +
    + +
    + {{period-chooser period=period}} + {{text-field value=nameInput placeholderKey="directory.filter_name" class="filter-name no-blur"}} +
    + + {{#conditional-loading-spinner condition=model.loading}} + {{#if model.length}} +
    {{i18n "directory.total_rows" count=model.totalRows}}
    + + + + + {{directory-toggle field="likes_received" order=order asc=asc icon="heart"}} + {{directory-toggle field="likes_given" order=order asc=asc icon="heart"}} + {{directory-toggle field="topic_count" order=order asc=asc}} + {{directory-toggle field="post_count" order=order asc=asc}} + {{directory-toggle field="topics_entered" order=order asc=asc}} + {{directory-toggle field="posts_read" order=order asc=asc}} + {{directory-toggle field="days_visited" order=order asc=asc}} + {{#if showTimeRead}} + + {{/if}} + + + {{#each model as |item|}} + {{directory-item item=item showTimeRead=showTimeRead}} + {{/each}} + +
     {{i18n "directory.time_read"}}
    + + {{conditional-loading-spinner condition=model.loadingMore}} + {{else}} +
    +

    {{i18n "directory.no_results"}}

    + {{/if}} + {{/conditional-loading-spinner}} -
    - {{period-chooser period=period}} - {{text-field value=nameInput placeholderKey="directory.filter_name" class="filter-name no-blur"}}
    - - {{#conditional-loading-spinner condition=model.loading}} - {{#if model.length}} -
    {{i18n "directory.total_rows" count=model.totalRows}}
    - - - - - {{directory-toggle field="likes_received" order=order asc=asc icon="heart"}} - {{directory-toggle field="likes_given" order=order asc=asc icon="heart"}} - {{directory-toggle field="topic_count" order=order asc=asc}} - {{directory-toggle field="post_count" order=order asc=asc}} - {{directory-toggle field="topics_entered" order=order asc=asc}} - {{directory-toggle field="posts_read" order=order asc=asc}} - {{directory-toggle field="days_visited" order=order asc=asc}} - {{#if showTimeRead}} - - {{/if}} - - - {{#each model as |item|}} - {{directory-item item=item showTimeRead=showTimeRead}} - {{/each}} - -
     {{i18n "directory.time_read"}}
    - - {{conditional-loading-spinner condition=model.loadingMore}} - {{else}} -
    -

    {{i18n "directory.no_results"}}

    - {{/if}} - {{/conditional-loading-spinner}} -
    -
    -{{/load-more}} + {{/load-more}} +{{/d-section}} diff --git a/app/assets/javascripts/discourse/views/about.js.es6 b/app/assets/javascripts/discourse/views/about.js.es6 deleted file mode 100644 index a516e13917d..00000000000 --- a/app/assets/javascripts/discourse/views/about.js.es6 +++ /dev/null @@ -1,3 +0,0 @@ -import { createViewWithBodyClass } from 'discourse/lib/create-view'; - -export default createViewWithBodyClass('about-page'); diff --git a/app/assets/javascripts/discourse/views/badges-index.js.es6 b/app/assets/javascripts/discourse/views/badges-index.js.es6 deleted file mode 100644 index a8527004495..00000000000 --- a/app/assets/javascripts/discourse/views/badges-index.js.es6 +++ /dev/null @@ -1,4 +0,0 @@ -import ScrollTop from 'discourse/mixins/scroll-top'; -import { createViewWithBodyClass } from 'discourse/lib/create-view'; - -export default createViewWithBodyClass('badges-page').extend(ScrollTop); diff --git a/app/assets/javascripts/discourse/views/full-page-search.js.es6 b/app/assets/javascripts/discourse/views/full-page-search.js.es6 deleted file mode 100644 index ed9789dc696..00000000000 --- a/app/assets/javascripts/discourse/views/full-page-search.js.es6 +++ /dev/null @@ -1,5 +0,0 @@ -import { createViewWithBodyClass } from 'discourse/lib/create-view'; - -export default createViewWithBodyClass('search-page').extend({ - classNames: ['search-container'] -}); diff --git a/app/assets/javascripts/discourse/views/navigation-default.js.es6 b/app/assets/javascripts/discourse/views/navigation-default.js.es6 deleted file mode 100644 index 031456f324a..00000000000 --- a/app/assets/javascripts/discourse/views/navigation-default.js.es6 +++ /dev/null @@ -1,3 +0,0 @@ -import { createViewWithBodyClass } from 'discourse/lib/create-view'; - -export default createViewWithBodyClass('navigation-topics'); diff --git a/app/assets/javascripts/discourse/views/preferences.js.es6 b/app/assets/javascripts/discourse/views/preferences.js.es6 deleted file mode 100644 index e0033515fca..00000000000 --- a/app/assets/javascripts/discourse/views/preferences.js.es6 +++ /dev/null @@ -1,6 +0,0 @@ -import { createViewWithBodyClass } from 'discourse/lib/create-view'; - -export default createViewWithBodyClass('user-preferences-page').extend({ - templateName: 'user/preferences', - classNames: ['user-preferences'] -}); diff --git a/app/assets/javascripts/discourse/views/tags.js.es6 b/app/assets/javascripts/discourse/views/tags.js.es6 deleted file mode 100644 index de51094b36b..00000000000 --- a/app/assets/javascripts/discourse/views/tags.js.es6 +++ /dev/null @@ -1,3 +0,0 @@ -import { createViewWithBodyClass } from 'discourse/lib/create-view'; - -export default createViewWithBodyClass('tags-page'); diff --git a/app/assets/javascripts/discourse/views/user-activity.js.es6 b/app/assets/javascripts/discourse/views/user-activity.js.es6 deleted file mode 100644 index d7d7a40a22d..00000000000 --- a/app/assets/javascripts/discourse/views/user-activity.js.es6 +++ /dev/null @@ -1,3 +0,0 @@ -import { createViewWithBodyClass } from 'discourse/lib/create-view'; - -export default createViewWithBodyClass('user-activity-page'); diff --git a/app/assets/javascripts/discourse/views/user-badges.js.es6 b/app/assets/javascripts/discourse/views/user-badges.js.es6 deleted file mode 100644 index c0d06719065..00000000000 --- a/app/assets/javascripts/discourse/views/user-badges.js.es6 +++ /dev/null @@ -1,4 +0,0 @@ -import ScrollTop from 'discourse/mixins/scroll-top'; -import { createViewWithBodyClass } from 'discourse/lib/create-view'; - -export default createViewWithBodyClass('user-badges-page').extend(ScrollTop); diff --git a/app/assets/javascripts/discourse/views/user-invited-show.js.es6 b/app/assets/javascripts/discourse/views/user-invited-show.js.es6 deleted file mode 100644 index 8ea3dc05f2c..00000000000 --- a/app/assets/javascripts/discourse/views/user-invited-show.js.es6 +++ /dev/null @@ -1,3 +0,0 @@ -import { createViewWithBodyClass } from 'discourse/lib/create-view'; - -export default createViewWithBodyClass('user-invites-page'); diff --git a/app/assets/javascripts/discourse/views/user-messages.js.es6 b/app/assets/javascripts/discourse/views/user-messages.js.es6 deleted file mode 100644 index 97e7a137428..00000000000 --- a/app/assets/javascripts/discourse/views/user-messages.js.es6 +++ /dev/null @@ -1,3 +0,0 @@ -import { createViewWithBodyClass } from 'discourse/lib/create-view'; - -export default createViewWithBodyClass('user-messages-page'); diff --git a/app/assets/javascripts/discourse/views/user-notifications.js.es6 b/app/assets/javascripts/discourse/views/user-notifications.js.es6 deleted file mode 100644 index a8141b59c0a..00000000000 --- a/app/assets/javascripts/discourse/views/user-notifications.js.es6 +++ /dev/null @@ -1,3 +0,0 @@ -import { createViewWithBodyClass } from 'discourse/lib/create-view'; - -export default createViewWithBodyClass('user-notifications-page'); diff --git a/app/assets/javascripts/discourse/views/user-summary.js.es6 b/app/assets/javascripts/discourse/views/user-summary.js.es6 deleted file mode 100644 index a51a5595b0d..00000000000 --- a/app/assets/javascripts/discourse/views/user-summary.js.es6 +++ /dev/null @@ -1,3 +0,0 @@ -import { createViewWithBodyClass } from 'discourse/lib/create-view'; - -export default createViewWithBodyClass('user-summary-page'); diff --git a/app/assets/javascripts/discourse/views/users.js.es6 b/app/assets/javascripts/discourse/views/users.js.es6 deleted file mode 100644 index ee5c1efe052..00000000000 --- a/app/assets/javascripts/discourse/views/users.js.es6 +++ /dev/null @@ -1,3 +0,0 @@ -import { createViewWithBodyClass } from 'discourse/lib/create-view'; - -export default createViewWithBodyClass('users-page'); diff --git a/test/javascripts/acceptance/about-test.js.es6 b/test/javascripts/acceptance/about-test.js.es6 index 9819ed8cba5..f6547bc6466 100644 --- a/test/javascripts/acceptance/about-test.js.es6 +++ b/test/javascripts/acceptance/about-test.js.es6 @@ -4,6 +4,7 @@ acceptance("About"); test("viewing", () => { visit("/about"); andThen(() => { + ok($('body.about-page').length, "has body class"); ok(exists('.about.admins .user-info'), 'has admins'); ok(exists('.about.moderators .user-info'), 'has moderators'); ok(exists('.about.stats tr td'), 'has stats'); diff --git a/test/javascripts/acceptance/badges-test.js.es6 b/test/javascripts/acceptance/badges-test.js.es6 index 8017739cafc..ad1f00c0d53 100644 --- a/test/javascripts/acceptance/badges-test.js.es6 +++ b/test/javascripts/acceptance/badges-test.js.es6 @@ -5,6 +5,7 @@ acceptance("Badges"); test("Visit Badge Pages", () => { visit("/badges"); andThen(() => { + ok($('body.badges-page').length, "has body class"); ok(exists('.badge-groups .badge-card'), "has a list of badges"); }); diff --git a/test/javascripts/acceptance/user-preferences-test.js.es6 b/test/javascripts/acceptance/preferences-test.js.es6 similarity index 88% rename from test/javascripts/acceptance/user-preferences-test.js.es6 rename to test/javascripts/acceptance/preferences-test.js.es6 index 1431840a990..49ac4947139 100644 --- a/test/javascripts/acceptance/user-preferences-test.js.es6 +++ b/test/javascripts/acceptance/preferences-test.js.es6 @@ -5,6 +5,7 @@ test("update some fields", () => { visit("/users/eviltrout/preferences"); andThen(() => { + ok($('body.user-preferences-page').length, "has the body class"); equal(currentURL(), '/users/eviltrout/preferences', "it doesn't redirect"); ok(exists('.user-preferences'), 'it shows the preferences'); }); diff --git a/test/javascripts/acceptance/search-full-test.js.es6 b/test/javascripts/acceptance/search-full-test.js.es6 index 9804e6db072..2bc511f93bc 100644 --- a/test/javascripts/acceptance/search-full-test.js.es6 +++ b/test/javascripts/acceptance/search-full-test.js.es6 @@ -43,6 +43,8 @@ test("perform various searches", assert => { visit("/search"); andThen(() => { + ok($('body.search-page').length, "has body class"); + ok(exists('.search-container'), "has container class"); assert.ok(find('input.search').length > 0); assert.ok(find('.fps-topic').length === 0); }); diff --git a/test/javascripts/acceptance/tags-test.js.es6 b/test/javascripts/acceptance/tags-test.js.es6 new file mode 100644 index 00000000000..c24cbee8d18 --- /dev/null +++ b/test/javascripts/acceptance/tags-test.js.es6 @@ -0,0 +1,11 @@ +import { acceptance } from "helpers/qunit-helpers"; +acceptance("Tags", { loggedIn: true }); + +test("list the tags", () => { + visit("/tags"); + + andThen(() => { + ok($('body.tags-page').length, "has the body class"); + ok(exists('.tag-eviltrout'), "shows the evil trout tag"); + }); +}); diff --git a/test/javascripts/acceptance/topic-discovery-test.js.es6 b/test/javascripts/acceptance/topic-discovery-test.js.es6 index 792b7ab7f5e..28749712f35 100644 --- a/test/javascripts/acceptance/topic-discovery-test.js.es6 +++ b/test/javascripts/acceptance/topic-discovery-test.js.es6 @@ -4,6 +4,7 @@ acceptance("Topic Discovery"); test("Visit Discovery Pages", () => { visit("/"); andThen(() => { + ok($('body.navigation-topics').length, "has the default navigation"); ok(exists(".topic-list"), "The list of topics was rendered"); ok(exists('.topic-list .topic-list-item'), "has topics"); }); diff --git a/test/javascripts/acceptance/user-anonymous-test.js.es6 b/test/javascripts/acceptance/user-anonymous-test.js.es6 index 10baa01079a..6d41bffc6a6 100644 --- a/test/javascripts/acceptance/user-anonymous-test.js.es6 +++ b/test/javascripts/acceptance/user-anonymous-test.js.es6 @@ -24,6 +24,9 @@ test("Root URL", () => { test("Filters", () => { visit("/users/eviltrout/activity"); + andThen(() => { + ok($('body.user-activity-page').length, "has the body class"); + }); hasStream(); visit("/users/eviltrout/activity/topics"); @@ -33,6 +36,14 @@ test("Filters", () => { hasStream(); }); +test("Badges", () => { + visit("/users/eviltrout/badges"); + andThen(() => { + ok($('body.user-badges-page').length, "has the body class"); + ok(exists(".user-badges-list .badge-card"), "shows a badge"); + }); +}); + test("Restricted Routes", () => { visit("/users/eviltrout/preferences"); diff --git a/test/javascripts/acceptance/user-test.js.es6 b/test/javascripts/acceptance/user-test.js.es6 index a7e9172687c..045750778e8 100644 --- a/test/javascripts/acceptance/user-test.js.es6 +++ b/test/javascripts/acceptance/user-test.js.es6 @@ -1,17 +1,32 @@ import { acceptance } from "helpers/qunit-helpers"; -import { hasStream } from 'acceptance/user-anonymous-test'; acceptance("User", {loggedIn: true}); -test("Pending", () => { - visit("/users/eviltrout/activity/pending"); - hasStream(); +test("Invites", () => { + visit("/users/eviltrout/invited/pending"); + andThen(() => { + ok($('body.user-invites-page').length, "has the body class"); + }); +}); + +test("Messages", () => { + visit("/users/eviltrout/messages"); + andThen(() => { + ok($('body.user-messages-page').length, "has the body class"); + }); +}); + +test("Notifications", () => { + visit("/users/eviltrout/notifications"); + andThen(() => { + ok($('body.user-notifications-page').length, "has the body class"); + }); }); test("Root URL - Viewing Self", () => { visit("/users/eviltrout"); andThen(() => { + ok($('body.user-summary-page').length, "has the body class"); equal(currentPath(), 'user.summary', "it defaults to summary"); }); }); - diff --git a/test/javascripts/acceptance/users-test.js.es6 b/test/javascripts/acceptance/users-test.js.es6 index b517a8e872c..eb89741d252 100644 --- a/test/javascripts/acceptance/users-test.js.es6 +++ b/test/javascripts/acceptance/users-test.js.es6 @@ -4,6 +4,7 @@ acceptance("User Directory"); test("Visit Page", function() { visit("/users"); andThen(() => { + ok($('body.users-page').length, "has the body class"); ok(exists('.directory table tr'), "has a list of users"); }); }); diff --git a/test/javascripts/helpers/create-pretender.js.es6 b/test/javascripts/helpers/create-pretender.js.es6 index 7e815029b6b..54e33dcf43c 100644 --- a/test/javascripts/helpers/create-pretender.js.es6 +++ b/test/javascripts/helpers/create-pretender.js.es6 @@ -56,6 +56,13 @@ export default function() { return response(json); }); + this.get('/tags', () => { + return response({ tags: [{ + id: 'eviltrout', + count: 1 + }] }); + }); + this.get('/users/eviltrout.json', () => { const json = fixturesByUrl['/users/eviltrout.json']; if (loggedIn()) { @@ -76,6 +83,20 @@ export default function() { }); }); + this.get('/users/eviltrout/invited_count.json', () => { + return response({ + "counts": { "pending": 1, "redeemed": 0, "total": 0 } + }); + }); + + this.get('/users/eviltrout/invited.json', () => { + return response({ "invites": [ {id: 1} ] }); + }); + + this.get('/topics/private-messages/eviltrout.json', () => { + return response({ topic_list: { topics: [] } }); + }); + this.get('/clicks/track', success); this.get('/search', request => {