Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DEV: Remove use of PluginOutlet `@tagName` argument in core 

The `tagName` argument is now deprecated. This commit uses a codemod (https://github.com/discourse/discourse-ember-codemods/tree/main/transforms/extract-plugin-outlet-tagname) to automatically remove the `@tagName` from all PluginOutlet invocations, and create a matching wrapper element so that the HTML structure is unchanged. We may want to remove some/all of these wrappers entirely in future, but that would be a riskier change which we should tackle on a case-by-case basis.
This commit is contained in:
David Taylor 2023-01-31 11:33:26 +00:00
parent f9d5203610
commit 26b5c0472f
59 changed files with 664 additions and 593 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/assets/javascripts/admin/addon/templates/components/themes-list-item.hbs
View File

@ -1,10 +1,11 @@
<div class="inner-wrapper"> <div class="inner-wrapper">
<PluginOutlet <span>
@name="admin-customize-themes-list-item" <PluginOutlet
@tagName="span" @name="admin-customize-themes-list-item"
@connectorTagName="span" @connectorTagName="span"
@args={{hash theme=this.theme}} @args={{hash theme=this.theme}}
/> />
</span>
<div class="info"> <div class="info">
<span class="name"> <span class="name">

13
app/assets/javascripts/admin/addon/templates/customize-themes-show.hbs
View File

@ -1,10 +1,11 @@
<div class="show-current-style"> <div class="show-current-style">
<PluginOutlet <span>
@name="admin-customize-themes-show-top" <PluginOutlet
@tagName="span" @name="admin-customize-themes-show-top"
@connectorTagName="div" @connectorTagName="div"
@args={{hash theme=this.model}} @args={{hash theme=this.model}}
/> />
</span>
<div class="title"> <div class="title">
{{#if this.editingName}} {{#if this.editingName}}
<TextField @value={{this.model.name}} @autofocus="true" /> <TextField @value={{this.model.name}} @autofocus="true" />

16
app/assets/javascripts/admin/addon/templates/dashboard.hbs
View File

@ -1,8 +1,6 @@
<PluginOutlet <span>
@name="admin-dashboard-top" <PluginOutlet @name="admin-dashboard-top" @connectorTagName="div" />
@tagName="span" </span>
@connectorTagName="div"
/>
{{#if this.showVersionChecks}} {{#if this.showVersionChecks}}
<div class="section-top"> <div class="section-top">
@ -57,8 +55,6 @@
<DashboardNewFeatures @tagName="div" /> <DashboardNewFeatures @tagName="div" />
<PluginOutlet <span>
@name="admin-dashboard-bottom" <PluginOutlet @name="admin-dashboard-bottom" @connectorTagName="div" />
@tagName="span" </span>
@connectorTagName="div"
/>

19
app/assets/javascripts/admin/addon/templates/dashboard_general.hbs
View File

@ -1,9 +1,7 @@
<ConditionalLoadingSpinner @condition={{this.isLoading}}> <ConditionalLoadingSpinner @condition={{this.isLoading}}>
<PluginOutlet <span>
@name="admin-dashboard-general-top" <PluginOutlet @name="admin-dashboard-general-top" @connectorTagName="div" />
@tagName="span" </span>
@connectorTagName="div"
/>
{{#if this.isCommunityHealthVisible}} {{#if this.isCommunityHealthVisible}}
<div class="community-health section"> <div class="community-health section">
@ -197,9 +195,10 @@
{{/if}} {{/if}}
</div> </div>
<PluginOutlet <span>
@name="admin-dashboard-general-bottom" <PluginOutlet
@tagName="span" @name="admin-dashboard-general-bottom"
@connectorTagName="div" @connectorTagName="div"
/> />
</span>
</ConditionalLoadingSpinner> </ConditionalLoadingSpinner>

24
app/assets/javascripts/admin/addon/templates/dashboard_moderation.hbs
View File

@ -1,9 +1,10 @@
<div class="sections"> <div class="sections">
<PluginOutlet <span>
@name="admin-dashboard-moderation-top" <PluginOutlet
@tagName="span" @name="admin-dashboard-moderation-top"
@connectorTagName="div" @connectorTagName="div"
/> />
</span>
{{#if this.isModeratorsActivityVisible}} {{#if this.isModeratorsActivityVisible}}
<div class="moderators-activity section"> <div class="moderators-activity section">
@ -49,11 +50,12 @@
@reportOptions={{this.userFlaggingRatioOptions}} @reportOptions={{this.userFlaggingRatioOptions}}
/> />
<PluginOutlet <span>
@name="admin-dashboard-moderation-bottom" <PluginOutlet
@tagName="span" @name="admin-dashboard-moderation-bottom"
@connectorTagName="div" @connectorTagName="div"
@args={{hash filters=this.lastWeekfilters}} @args={{hash filters=this.lastWeekfilters}}
/> />
</span>
</div> </div>
</div> </div>

22
app/assets/javascripts/admin/addon/templates/dashboard_security.hbs
View File

@ -1,9 +1,10 @@
<div class="sections"> <div class="sections">
<PluginOutlet <span>
@name="admin-dashboard-security-top" <PluginOutlet
@tagName="span" @name="admin-dashboard-security-top"
@connectorTagName="div" @connectorTagName="div"
/> />
</span>
<div class="main-section"> <div class="main-section">
<AdminReport <AdminReport
@ -16,10 +17,11 @@
@filters={{this.lastWeekfilters}} @filters={{this.lastWeekfilters}}
/> />
<PluginOutlet <span>
@name="admin-dashboard-security-bottom" <PluginOutlet
@tagName="span" @name="admin-dashboard-security-bottom"
@connectorTagName="div" @connectorTagName="div"
/> />
</span>
</div> </div>
</div> </div>

13
app/assets/javascripts/admin/addon/templates/plugins-index.hbs
View File

@ -81,9 +81,10 @@
href="https://meta.discourse.org/t/install-a-plugin/19157" href="https://meta.discourse.org/t/install-a-plugin/19157"
>{{i18n "admin.plugins.howto"}}</a></p> >{{i18n "admin.plugins.howto"}}</a></p>
<PluginOutlet <span>
@name="admin-below-plugins-index" <PluginOutlet
@tagName="span" @name="admin-below-plugins-index"
@connectorTagName="div" @connectorTagName="div"
@args={{hash model=this.model}} @args={{hash model=this.model}}
/> />
</span>

26
app/assets/javascripts/admin/addon/templates/user-index.hbs
View File

@ -259,12 +259,13 @@
</section> </section>
{{/if}} {{/if}}
<PluginOutlet <span>
@name="admin-user-details" <PluginOutlet
@tagName="span" @name="admin-user-details"
@connectorTagName="div" @connectorTagName="div"
@args={{hash model=this.model}} @args={{hash model=this.model}}
/> />
</span>
<section class="details"> <section class="details">
<h1>{{i18n "admin.user.permissions"}}</h1> <h1>{{i18n "admin.user.permissions"}}</h1>
@ -857,12 +858,13 @@
</section> </section>
{{/if}} {{/if}}
<PluginOutlet <span>
@name="after-user-details" <PluginOutlet
@tagName="span" @name="after-user-details"
@connectorTagName="div" @connectorTagName="div"
@args={{hash model=this.model}} @args={{hash model=this.model}}
/> />
</span>
<section> <section>
<hr /> <hr />

13
app/assets/javascripts/admin/addon/templates/web-hooks-edit.hbs
View File

@ -115,12 +115,13 @@
</div> </div>
</div> </div>
<PluginOutlet <span>
@name="web-hook-fields" <PluginOutlet
@tagName="span" @name="web-hook-fields"
@connectorTagName="div" @connectorTagName="div"
@args={{hash model=this.model}} @args={{hash model=this.model}}
/> />
</span>
<label> <label>
<Input <Input

26
app/assets/javascripts/discourse/app/components/user-preferences/categories.hbs
View File

@ -91,18 +91,20 @@
{{/if}} {{/if}}
</div> </div>
<PluginOutlet <span>
@name="user-preferences-categories" <PluginOutlet
@tagName="span" @name="user-preferences-categories"
@connectorTagName="div" @connectorTagName="div"
@args={{hash model=@model save=@save}} @args={{hash model=@model save=@save}}
/> />
</span>
<br /> <br />
<PluginOutlet <span>
@name="user-custom-controls" <PluginOutlet
@tagName="span" @name="user-custom-controls"
@connectorTagName="div" @connectorTagName="div"
@args={{hash model=@model}} @args={{hash model=@model}}
/> />
</span>

26
app/assets/javascripts/discourse/app/templates/about.hbs
View File

@ -46,12 +46,13 @@
</section> </section>
{{/if}} {{/if}}
<PluginOutlet <span>
@name="about-after-admins" <PluginOutlet
@tagName="span" @name="about-after-admins"
@connectorTagName="section" @connectorTagName="section"
@args={{hash model=this.model}} @args={{hash model=this.model}}
/> />
</span>
{{#if this.model.moderators}} {{#if this.model.moderators}}
<section class="about moderators"> <section class="about moderators">
@ -64,12 +65,13 @@
</section> </section>
{{/if}} {{/if}}
<PluginOutlet <span>
@name="about-after-moderators" <PluginOutlet
@tagName="span" @name="about-after-moderators"
@connectorTagName="section" @connectorTagName="section"
@args={{hash model=this.model}} @args={{hash model=this.model}}
/> />
</span>
{{#if this.model.category_moderators.length}} {{#if this.model.category_moderators.length}}
{{#each this.model.category_moderators as |cm|}} {{#each this.model.category_moderators as |cm|}}

8
app/assets/javascripts/discourse/app/templates/badges/index.hbs
View File

@ -2,11 +2,9 @@
<div class="container badges"> <div class="container badges">
<h1>{{i18n "badges.title"}}</h1> <h1>{{i18n "badges.title"}}</h1>
<PluginOutlet <span>
@name="below-badges-title" <PluginOutlet @name="below-badges-title" @connectorTagName="div" />
@tagName="span" </span>
@connectorTagName="div"
/>
<div class="badge-groups"> <div class="badge-groups">
{{#each this.badgeGroups as |bg|}} {{#each this.badgeGroups as |bg|}}

8
app/assets/javascripts/discourse/app/templates/components/composer-toggles.hbs
View File

@ -1,9 +1,7 @@
<div class="composer-controls"> <div class="composer-controls">
<PluginOutlet <span>
@name="before-composer-toggles" <PluginOutlet @name="before-composer-toggles" @connectorTagName="div" />
@tagName="span" </span>
@connectorTagName="div"
/>
{{#if this.site.mobileView}} {{#if this.site.mobileView}}
<DButton <DButton

2
app/assets/javascripts/discourse/app/templates/components/d-navigation.hbs
View File

@ -51,7 +51,6 @@
<PluginOutlet <PluginOutlet
@name="before-create-topic-button" @name="before-create-topic-button"
@connectorTagName="div" @connectorTagName="div"
@tagName=""
@args={{hash @args={{hash
canCreateTopic=this.canCreateTopic canCreateTopic=this.canCreateTopic
createTopicDisabled=this.createTopicDisabled createTopicDisabled=this.createTopicDisabled
@ -74,7 +73,6 @@
<PluginOutlet <PluginOutlet
@name="after-create-topic-button" @name="after-create-topic-button"
@connectorTagName="div" @connectorTagName="div"
@tagName=""
@args={{hash @args={{hash
canCreateTopic=this.canCreateTopic canCreateTopic=this.canCreateTopic
createTopicDisabled=this.createTopicDisabled createTopicDisabled=this.createTopicDisabled

11
app/assets/javascripts/discourse/app/templates/components/edit-category-security.hbs
View File

@ -55,8 +55,9 @@
{{/unless}} {{/unless}}
</section> </section>
<PluginOutlet <section>
@name="category-custom-security" <PluginOutlet
@args={{hash category=this.category}} @name="category-custom-security"
@tagName="section" @args={{hash category=this.category}}
/> />
</section>

24
app/assets/javascripts/discourse/app/templates/components/edit-category-settings.hbs
View File

@ -342,12 +342,13 @@
</label> </label>
</section> </section>
<PluginOutlet <span>
@name="category-email-in" <PluginOutlet
@tagName="span" @name="category-email-in"
@connectorTagName="div" @connectorTagName="div"
@args={{hash category=this.category}} @args={{hash category=this.category}}
/> />
</span>
{{/if}} {{/if}}
{{#unless this.emailInEnabled}} {{#unless this.emailInEnabled}}
@ -360,8 +361,9 @@
{{/unless}} {{/unless}}
</section> </section>
<PluginOutlet <section>
@name="category-custom-settings" <PluginOutlet
@args={{hash category=this.category}} @name="category-custom-settings"
@tagName="section" @args={{hash category=this.category}}
/> />
</section>

26
app/assets/javascripts/discourse/app/templates/components/groups-form-interaction-fields.hbs
View File

@ -105,12 +105,13 @@
@placeholderKey="admin.groups.manage.interaction.incoming_email_placeholder" @placeholderKey="admin.groups.manage.interaction.incoming_email_placeholder"
/> />
<PluginOutlet <span>
@name="group-email-in" <PluginOutlet
@tagName="span" @name="group-email-in"
@connectorTagName="div" @connectorTagName="div"
@args={{hash model=this.model}} @args={{hash model=this.model}}
/> />
</span>
</div> </div>
{{/if}} {{/if}}
@ -129,9 +130,10 @@
/> />
</div> </div>
<PluginOutlet <span>
@name="groups-interaction-custom-options" <PluginOutlet
@tagName="span" @name="groups-interaction-custom-options"
@connectorTagName="div" @connectorTagName="div"
@args={{hash model=this.model}} @args={{hash model=this.model}}
/> />
</span>

13
app/assets/javascripts/discourse/app/templates/components/groups-form-membership-fields.hbs
View File

@ -94,12 +94,13 @@
{{/if}} {{/if}}
</div> </div>
<PluginOutlet <span>
@name="groups-form-membership-below-automatic" <PluginOutlet
@tagName="span" @name="groups-form-membership-below-automatic"
@connectorTagName="div" @connectorTagName="div"
@args={{hash model=this.model}} @args={{hash model=this.model}}
/> />
</span>
<div class="control-group"> <div class="control-group">
<label class="control-label">{{i18n <label class="control-label">{{i18n

13
app/assets/javascripts/discourse/app/templates/components/groups-form-profile-fields.hbs
View File

@ -44,10 +44,11 @@
{{#if this.canEdit}} {{#if this.canEdit}}
{{yield}} {{yield}}
<PluginOutlet <span>
@name="group-edit" <PluginOutlet
@tagName="span" @name="group-edit"
@connectorTagName="div" @connectorTagName="div"
@args={{hash group=this.model}} @args={{hash group=this.model}}
/> />
</span>
{{/if}} {{/if}}

13
app/assets/javascripts/discourse/app/templates/components/reviewable-flagged-post.hbs
View File

@ -21,12 +21,13 @@
{{html-safe this.reviewable.cooked}} {{html-safe this.reviewable.cooked}}
{{/if}} {{/if}}
</div> </div>
<PluginOutlet <span>
@name="after-reviewable-flagged-post-body" <PluginOutlet
@tagName="span" @name="after-reviewable-flagged-post-body"
@connectorTagName="div" @connectorTagName="div"
@args={{hash model=this.reviewable}} @args={{hash model=this.reviewable}}
/> />
</span>
{{yield}} {{yield}}
</div> </div>
</div> </div>

13
app/assets/javascripts/discourse/app/templates/components/search-result-entry.hbs
View File

@ -41,12 +41,13 @@
{{#if this.post.topic}} {{#if this.post.topic}}
{{discourse-tags this.post.topic}} {{discourse-tags this.post.topic}}
{{/if}} {{/if}}
<PluginOutlet <span>
@name="full-page-search-category" <PluginOutlet
@tagName="span" @name="full-page-search-category"
@connectorTagName="div" @connectorTagName="div"
@args={{hash post=this.post}} @args={{hash post=this.post}}
/> />
</span>
</div> </div>
</div> </div>

13
app/assets/javascripts/discourse/app/templates/components/suggested-topics.hbs
View File

@ -27,9 +27,10 @@
</h3> </h3>
</div> </div>
<PluginOutlet <span>
@name="below-suggested-topics" <PluginOutlet
@tagName="span" @name="below-suggested-topics"
@connectorTagName="div" @connectorTagName="div"
@args={{hash topic=this.topic}} @args={{hash topic=this.topic}}
/> />
</span>

11
app/assets/javascripts/discourse/app/templates/components/tag-info.hbs
View File

@ -131,11 +131,12 @@
</section> </section>
{{/if}} {{/if}}
{{#if this.canAdminTag}} {{#if this.canAdminTag}}
<PluginOutlet <section>
@name="tag-custom-settings" <PluginOutlet
@args={{hash tag=this.tagInfo}} @name="tag-custom-settings"
@tagName="section" @args={{hash tag=this.tagInfo}}
/> />
</section>
<div class="tag-actions"> <div class="tag-actions">
<DButton <DButton
@class="btn-default" @class="btn-default"

13
app/assets/javascripts/discourse/app/templates/components/topic-category.hbs
View File

@ -12,9 +12,10 @@
{{/if}} {{/if}}
</div> </div>
<PluginOutlet <span>
@name="topic-category" <PluginOutlet
@tagName="span" @name="topic-category"
@connectorTagName="div" @connectorTagName="div"
@args={{hash topic=this.topic category=this.topic.category}} @args={{hash topic=this.topic category=this.topic.category}}
/> />
</span>

6
app/assets/javascripts/discourse/app/templates/components/topic-progress.hbs
View File

@ -29,8 +29,4 @@
<div class="bg"></div> <div class="bg"></div>
</nav> </nav>
<PluginOutlet <PluginOutlet @name="after-topic-progress" @connectorTagName="div" />
@name="after-topic-progress"
@tagName=""
@connectorTagName="div"
/>

13
app/assets/javascripts/discourse/app/templates/components/topic-title.hbs
View File

@ -2,10 +2,11 @@
<div class="title-wrapper"> <div class="title-wrapper">
{{yield}} {{yield}}
</div> </div>
<PluginOutlet <span>
@name="topic-title" <PluginOutlet
@tagName="span" @name="topic-title"
@connectorTagName="div" @connectorTagName="div"
@args={{hash model=this.model}} @args={{hash model=this.model}}
/> />
</span>
</div> </div>

53
app/assets/javascripts/discourse/app/templates/components/user-card-contents.hbs
View File

@ -43,12 +43,13 @@
<UserAvatarFlair @user={{this.user}} /> <UserAvatarFlair @user={{this.user}} />
<PluginOutlet <div>
@name="user-card-avatar-flair" <PluginOutlet
@connectorTagName="div" @name="user-card-avatar-flair"
@args={{hash user=this.user}} @connectorTagName="div"
@tagName="div" @args={{hash user=this.user}}
/> />
</div>
</div> </div>
<div class="names"> <div class="names">
<h1 <h1
@ -117,12 +118,13 @@
{{format-date this.user.status.ends_at format="tiny"}} {{format-date this.user.status.ends_at format="tiny"}}
</h3> </h3>
{{/if}} {{/if}}
<PluginOutlet <div>
@name="user-card-post-names" <PluginOutlet
@connectorTagName="div" @name="user-card-post-names"
@args={{hash user=this.user}} @connectorTagName="div"
@tagName="div" @args={{hash user=this.user}}
/> />
</div>
</div> </div>
<ul class="usercard-controls"> <ul class="usercard-controls">
{{#if this.user.can_send_private_message_to_user}} {{#if this.user.can_send_private_message_to_user}}
@ -139,7 +141,6 @@
@name="user-card-below-message-button" @name="user-card-below-message-button"
@connectorTagName="li" @connectorTagName="li"
@args={{hash user=this.user close=(action "close")}} @args={{hash user=this.user close=(action "close")}}
@tagName=""
/> />
{{#if this.showFilter}} {{#if this.showFilter}}
<li> <li>
@ -171,12 +172,13 @@
/> />
</li> </li>
{{/if}} {{/if}}
<PluginOutlet <li>
@name="user-card-additional-buttons" <PluginOutlet
@connectorTagName="div" @name="user-card-additional-buttons"
@args={{hash user=this.user close=(action "close")}} @connectorTagName="div"
@tagName="li" @args={{hash user=this.user close=(action "close")}}
/> />
</li>
</ul> </ul>
<PluginOutlet <PluginOutlet
@name="user-card-additional-controls" @name="user-card-additional-controls"
@ -278,12 +280,13 @@
<span>{{this.formattedUserLocalTime}}</span> <span>{{this.formattedUserLocalTime}}</span>
</span> </span>
{{/if}} {{/if}}
<PluginOutlet <span>
@name="user-card-location-and-website" <PluginOutlet
@tagName="span" @name="user-card-location-and-website"
@connectorTagName="div" @connectorTagName="div"
@args={{hash user=this.user}} @args={{hash user=this.user}}
/> />
</span>
</div> </div>
</div> </div>
{{/if}} {{/if}}

26
app/assets/javascripts/discourse/app/templates/components/user-info.hbs
View File

@ -37,12 +37,13 @@
@showTooltip={{@showStatusTooltip}} @showTooltip={{@showStatusTooltip}}
/> />
{{/if}} {{/if}}
<PluginOutlet <span>
@name="after-user-name" <PluginOutlet
@tagName="span" @name="after-user-name"
@connectorTagName="span" @connectorTagName="span"
@args={{hash user=this.user}} @args={{hash user=this.user}}
/> />
</span>
</div> </div>
<div class="title">{{@user.title}}</div> <div class="title">{{@user.title}}</div>
@ -54,9 +55,10 @@
</div> </div>
<PluginOutlet <span>
@name="after-user-info" <PluginOutlet
@tagName="span" @name="after-user-info"
@connectorTagName="div" @connectorTagName="div"
@args={{hash user=this.user}} @args={{hash user=this.user}}
/> />
</span>

13
app/assets/javascripts/discourse/app/templates/components/user-profile-avatar.hbs
View File

@ -1,10 +1,11 @@
<div class="user-profile-avatar"> <div class="user-profile-avatar">
{{bound-avatar @user "huge"}} {{bound-avatar @user "huge"}}
<UserAvatarFlair @user={{@user}} /> <UserAvatarFlair @user={{@user}} />
<PluginOutlet <div>
@name="user-profile-avatar-flair" <PluginOutlet
@connectorTagName="div" @name="user-profile-avatar-flair"
@args={{hash model=@user}} @connectorTagName="div"
@tagName="div" @args={{hash model=@user}}
/> />
</div>
</div> </div>

13
app/assets/javascripts/discourse/app/templates/components/user-stream-item.hbs
View File

@ -43,12 +43,13 @@
</span> </span>
{{/if}} {{/if}}
<PluginOutlet <span>
@name="user-stream-item-header" <PluginOutlet
@tagName="span" @name="user-stream-item-header"
@connectorTagName="div" @connectorTagName="div"
@args={{hash item=@item}} @args={{hash item=@item}}
/> />
</span>
</div> </div>
{{#if this.actionDescription}} {{#if this.actionDescription}}

70
app/assets/javascripts/discourse/app/templates/composer.hbs
View File

@ -27,12 +27,13 @@
aria-label={{I18n this.saveLabel}} aria-label={{I18n this.saveLabel}}
class="reply-area {{if this.canEditTags 'with-tags' 'without-tags'}}" class="reply-area {{if this.canEditTags 'with-tags' 'without-tags'}}"
> >
<PluginOutlet <span>
@name="composer-open" <PluginOutlet
@tagName="span" @name="composer-open"
@connectorTagName="div" @connectorTagName="div"
@args={{hash model=this.model}} @args={{hash model=this.model}}
/> />
</span>
<div class="reply-to"> <div class="reply-to">
{{#unless this.model.viewFullscreen}} {{#unless this.model.viewFullscreen}}
@ -201,29 +202,32 @@
</div> </div>
{{/if}} {{/if}}
<PluginOutlet <span>
@name="composer-fields" <PluginOutlet
@tagName="span" @name="composer-fields"
@connectorTagName="div" @connectorTagName="div"
@args={{hash model=this.model showPreview=this.showPreview}} @args={{hash model=this.model showPreview=this.showPreview}}
/> />
</span>
{{/unless}} {{/unless}}
</div> </div>
</ComposerEditor> </ComposerEditor>
<PluginOutlet <span>
@name="composer-after-composer-editor"
@tagName="span"
@args={{hash model=this.model}}
/>
<div class="submit-panel">
<PluginOutlet <PluginOutlet
@name="composer-fields-below" @name="composer-after-composer-editor"
@tagName="span"
@connectorTagName="div"
@args={{hash model=this.model}} @args={{hash model=this.model}}
/> />
</span>
<div class="submit-panel">
<span>
<PluginOutlet
@name="composer-fields-below"
@connectorTagName="div"
@args={{hash model=this.model}}
/>
</span>
<div class="save-or-cancel"> <div class="save-or-cancel">
<ComposerSaveButton <ComposerSaveButton
@ -304,19 +308,21 @@
{{/if}} {{/if}}
</div> </div>
<PluginOutlet <span>
@name="composer-after-save-or-cancel" <PluginOutlet
@tagName="span" @name="composer-after-save-or-cancel"
@args={{hash model=this.model}} @args={{hash model=this.model}}
/> />
</span>
</div> </div>
{{#if this.site.mobileView}} {{#if this.site.mobileView}}
<PluginOutlet <span>
@name="composer-mobile-buttons-bottom" <PluginOutlet
@tagName="span" @name="composer-mobile-buttons-bottom"
@args={{hash model=this.model}} @args={{hash model=this.model}}
/> />
</span>
{{#if this.allowUpload}} {{#if this.allowUpload}}
<a <a

17
app/assets/javascripts/discourse/app/templates/discovery.hbs
View File

@ -8,11 +8,9 @@
{{/unless}} {{/unless}}
</div> </div>
<PluginOutlet <span>
@name="discovery-list-controls-above" <PluginOutlet @name="discovery-list-controls-above" @connectorTagName="div" />
@tagName="span" </span>
@connectorTagName="div"
/>
<div class="list-controls"> <div class="list-controls">
<PluginOutlet <PluginOutlet
@ -26,7 +24,9 @@
<ConditionalLoadingSpinner @condition={{this.loading}} /> <ConditionalLoadingSpinner @condition={{this.loading}} />
<PluginOutlet @name="discovery-above" @tagName="span" @connectorTagName="div" /> <span>
<PluginOutlet @name="discovery-above" @connectorTagName="div" />
</span>
{{#if this.showEditWelcomeTopicBanner}} {{#if this.showEditWelcomeTopicBanner}}
<WelcomeTopicBanner /> <WelcomeTopicBanner />
@ -50,7 +50,6 @@
<div id="list-area"> <div id="list-area">
<PluginOutlet <PluginOutlet
@name="discovery-list-container-top" @name="discovery-list-container-top"
@tagName=""
@connectorTagName="span" @connectorTagName="span"
@args={{hash category=this.category listLoading=this.loading}} @args={{hash category=this.category listLoading=this.loading}}
/> />
@ -60,4 +59,6 @@
</div> </div>
</div> </div>
<PluginOutlet @name="discovery-below" @tagName="span" @connectorTagName="div" /> <span>
<PluginOutlet @name="discovery-below" @connectorTagName="div" />
</span>

26
app/assets/javascripts/discourse/app/templates/discovery/topics.hbs
View File

@ -59,12 +59,13 @@
</div> </div>
{{/if}} {{/if}}
{{/if}} {{/if}}
<PluginOutlet <span>
@name="before-topic-list" <PluginOutlet
@tagName="span" @name="before-topic-list"
@connectorTagName="div" @connectorTagName="div"
@args={{hash category=this.category}} @args={{hash category=this.category}}
/> />
</span>
{{#if this.hasTopics}} {{#if this.hasTopics}}
<TopicList <TopicList
@ -95,12 +96,13 @@
/> />
{{/if}} {{/if}}
<PluginOutlet <span>
@name="after-topic-list" <PluginOutlet
@tagName="span" @name="after-topic-list"
@connectorTagName="div" @connectorTagName="div"
@args={{hash category=this.category}} @args={{hash category=this.category}}
/> />
</span>
</DiscoveryTopicsList> </DiscoveryTopicsList>
<footer class="topic-list-bottom"> <footer class="topic-list-bottom">

13
app/assets/javascripts/discourse/app/templates/full-page-search.hbs
View File

@ -137,12 +137,13 @@
{{/if}} {{/if}}
{{/if}} {{/if}}
<PluginOutlet <span>
@name="full-page-search-below-search-info" <PluginOutlet
@tagName="span" @name="full-page-search-below-search-info"
@connectorTagName="div" @connectorTagName="div"
@args={{hash search=this.searchTerm}} @args={{hash search=this.searchTerm}}
/> />
</span>
{{#if this.searching}} {{#if this.searching}}
{{loading-spinner size="medium"}} {{loading-spinner size="medium"}}

26
app/assets/javascripts/discourse/app/templates/group.hbs
View File

@ -1,9 +1,10 @@
<PluginOutlet <span>
@name="before-group-container" <PluginOutlet
@tagName="span" @name="before-group-container"
@connectorTagName="div" @connectorTagName="div"
@args={{hash group=this.model}} @args={{hash group=this.model}}
/> />
</span>
<div class="container group group-{{this.model.name}}"> <div class="container group group-{{this.model.name}}">
{{#if this.showTooltip}} {{#if this.showTooltip}}
@ -73,12 +74,13 @@
{{/if}} {{/if}}
</div> </div>
<PluginOutlet <span>
@name="group-details-after" <PluginOutlet
@tagName="span" @name="group-details-after"
@connectorTagName="div" @connectorTagName="div"
@args={{hash model=this.model}} @args={{hash model=this.model}}
/> />
</span>
</div> </div>
{{#if this.model.bio_cooked}} {{#if this.model.bio_cooked}}

13
app/assets/javascripts/discourse/app/templates/groups/index.hbs
View File

@ -102,12 +102,13 @@
{{/if}} {{/if}}
</GroupMembershipButton> </GroupMembershipButton>
<PluginOutlet <span>
@name="group-index-box-after" <PluginOutlet
@tagName="span" @name="group-index-box-after"
@connectorTagName="div" @connectorTagName="div"
@args={{hash model=group}} @args={{hash model=group}}
/> />
</span>
</div> </div>
</div> </div>
</LinkTo> </LinkTo>

13
app/assets/javascripts/discourse/app/templates/mobile/users.hbs
View File

@ -1,12 +1,13 @@
<LoadMore @selector=".directory .user" @action={{action "loadMore"}}> <LoadMore @selector=".directory .user" @action={{action "loadMore"}}>
<div class="container"> <div class="container">
<div class="users-directory directory"> <div class="users-directory directory">
<PluginOutlet <span>
@name="users-top" <PluginOutlet
@tagName="span" @name="users-top"
@connectorTagName="div" @connectorTagName="div"
@args={{hash model=this.model}} @args={{hash model=this.model}}
/> />
</span>
<div class="directory-controls"> <div class="directory-controls">
<PeriodChooser <PeriodChooser

11
app/assets/javascripts/discourse/app/templates/modal/create-account.hbs
View File

@ -4,11 +4,12 @@
@action={{action "createAccount"}} @action={{action "createAccount"}}
> >
{{#unless this.complete}} {{#unless this.complete}}
<PluginOutlet <span>
@name="create-account-before-modal-body" <PluginOutlet
@tagName="span" @name="create-account-before-modal-body"
@connectorTagName="div" @connectorTagName="div"
/> />
</span>
<DModalBody <DModalBody
@class={{this.modalBodyClasses}} @class={{this.modalBodyClasses}}
@preventModalAlertHiding={{true}} @preventModalAlertHiding={{true}}

13
app/assets/javascripts/discourse/app/templates/modal/history.hbs
View File

@ -158,12 +158,13 @@
</div> </div>
{{/if}} {{/if}}
<PluginOutlet <span>
@name="post-revisions" <PluginOutlet
@tagName="span" @name="post-revisions"
@connectorTagName="div" @connectorTagName="div"
@args={{hash model=this.model}} @args={{hash model=this.model}}
/> />
</span>
<LinksRedirect @class="row"> <LinksRedirect @class="row">
{{html-safe this.bodyDiff}} {{html-safe this.bodyDiff}}

13
app/assets/javascripts/discourse/app/templates/navigation/category.hbs
View File

@ -8,12 +8,13 @@
{{/if}} {{/if}}
{{/if}} {{/if}}
<PluginOutlet <span>
@name="category-heading" <PluginOutlet
@tagName="span" @name="category-heading"
@connectorTagName="div" @connectorTagName="div"
@args={{hash category=this.category}} @args={{hash category=this.category}}
/> />
</span>
</section> </section>
<DSection @class="navigation-container category-navigation"> <DSection @class="navigation-container category-navigation">

39
app/assets/javascripts/discourse/app/templates/preferences.hbs
View File

@ -79,12 +79,13 @@
</li> </li>
{{/if}} {{/if}}
<PluginOutlet <span>
@name="user-preferences-nav-under-interface" <PluginOutlet
@tagName="span" @name="user-preferences-nav-under-interface"
@connectorTagName="div" @connectorTagName="div"
@args={{hash model=this.model}} @args={{hash model=this.model}}
/> />
</span>
{{#if this.model.userApiKeys}} {{#if this.model.userApiKeys}}
<li class="nav-apps"> <li class="nav-apps">
@ -94,23 +95,25 @@
</li> </li>
{{/if}} {{/if}}
<PluginOutlet <span>
@name="user-preferences-nav" <PluginOutlet
@tagName="span" @name="user-preferences-nav"
@connectorTagName="li" @connectorTagName="li"
@args={{hash model=this.model}} @args={{hash model=this.model}}
/> />
</span>
</MobileNav> </MobileNav>
</DSection> </DSection>
{{/if}} {{/if}}
<section class="user-content user-preferences" id="user-content"> <section class="user-content user-preferences" id="user-content">
<PluginOutlet <span>
@name="above-user-preferences" <PluginOutlet
@tagName="span" @name="above-user-preferences"
@connectorTagName="div" @connectorTagName="div"
@args={{hash model=this.model}} @args={{hash model=this.model}}
/> />
</span>
<form class="form-vertical"> <form class="form-vertical">
{{outlet}} {{outlet}}

26
app/assets/javascripts/discourse/app/templates/preferences/account.hbs
View File

@ -263,21 +263,23 @@
</div> </div>
{{/if}} {{/if}}
<PluginOutlet <span>
@name="user-preferences-account" <PluginOutlet
@tagName="span" @name="user-preferences-account"
@connectorTagName="div" @connectorTagName="div"
@args={{hash model=this.model save=(action "save")}} @args={{hash model=this.model save=(action "save")}}
/> />
</span>
<br /> <br />
<PluginOutlet <span>
@name="user-custom-controls" <PluginOutlet
@tagName="span" @name="user-custom-controls"
@connectorTagName="div" @connectorTagName="div"
@args={{hash model=this.model}} @args={{hash model=this.model}}
/> />
</span>
{{#if this.canSaveUser}} {{#if this.canSaveUser}}
<SaveControls <SaveControls

13
app/assets/javascripts/discourse/app/templates/preferences/apps.hbs
View File

@ -1,8 +1,9 @@
<UserPreferences::UserApiKeys @model={{@model}} /> <UserPreferences::UserApiKeys @model={{@model}} />
<PluginOutlet <span>
@name="user-preferences-apps" <PluginOutlet
@tagName="span" @name="user-preferences-apps"
@connectorTagName="div" @connectorTagName="div"
@args={{hash model=this.model}} @args={{hash model=this.model}}
/> />
</span>

39
app/assets/javascripts/discourse/app/templates/preferences/emails.hbs
View File

@ -52,12 +52,13 @@
@checked={{this.model.user_option.email_in_reply_to}} @checked={{this.model.user_option.email_in_reply_to}}
/> />
<PluginOutlet <span>
@name="user-preferences-emails-pref-email-settings" <PluginOutlet
@tagName="span" @name="user-preferences-emails-pref-email-settings"
@connectorTagName="div" @connectorTagName="div"
@args={{hash model=this.model save=(action "save")}} @args={{hash model=this.model save=(action "save")}}
/> />
</span>
</div> </div>
{{#unless this.siteSettings.disable_digest_emails}} {{#unless this.siteSettings.disable_digest_emails}}
@ -112,21 +113,23 @@
</div> </div>
{{/unless}} {{/unless}}
<PluginOutlet <span>
@name="user-preferences-emails" <PluginOutlet
@tagName="span" @name="user-preferences-emails"
@connectorTagName="div" @connectorTagName="div"
@args={{hash model=this.model save=(action "save")}} @args={{hash model=this.model save=(action "save")}}
/> />
</span>
<br /> <br />
<PluginOutlet <span>
@name="user-custom-controls" <PluginOutlet
@tagName="span" @name="user-custom-controls"
@connectorTagName="div" @connectorTagName="div"
@args={{hash model=this.model}} @args={{hash model=this.model}}
/> />
</span>
<SaveControls <SaveControls
@model={{this.model}} @model={{this.model}}

39
app/assets/javascripts/discourse/app/templates/preferences/interface.hbs
View File

@ -1,9 +1,10 @@
<PluginOutlet <span>
@name="user-preferences-interface-top" <PluginOutlet
@tagName="span" @name="user-preferences-interface-top"
@connectorTagName="div" @connectorTagName="div"
@args={{hash model=this.model save=(action "save")}} @args={{hash model=this.model save=(action "save")}}
/> />
</span>
{{#if this.showThemeSelector}} {{#if this.showThemeSelector}}
<div class="control-group theme"> <div class="control-group theme">
@ -233,21 +234,23 @@
{{/if}} {{/if}}
</fieldset> </fieldset>
<PluginOutlet <span>
@name="user-preferences-interface" <PluginOutlet
@tagName="span" @name="user-preferences-interface"
@connectorTagName="div" @connectorTagName="div"
@args={{hash model=this.model save=(action "save")}} @args={{hash model=this.model save=(action "save")}}
/> />
</span>
<br /> <br />
<PluginOutlet <span>
@name="user-custom-controls" <PluginOutlet
@tagName="span" @name="user-custom-controls"
@connectorTagName="div" @connectorTagName="div"
@args={{hash model=this.model}} @args={{hash model=this.model}}
/> />
</span>
<SaveControls <SaveControls
@model={{this.model}} @model={{this.model}}

39
app/assets/javascripts/discourse/app/templates/preferences/notifications.hbs
View File

@ -32,12 +32,13 @@
<div class="instructions">{{i18n <div class="instructions">{{i18n
"user.desktop_notifications.each_browser_note" "user.desktop_notifications.each_browser_note"
}}</div> }}</div>
<PluginOutlet <span>
@name="user-preferences-desktop-notifications" <PluginOutlet
@tagName="span" @name="user-preferences-desktop-notifications"
@connectorTagName="div" @connectorTagName="div"
@args={{hash model=this.model save=(action "save")}} @args={{hash model=this.model save=(action "save")}}
/> />
</span>
</div> </div>
{{/unless}} {{/unless}}
@ -49,21 +50,23 @@
{{/unless}} {{/unless}}
{{/if}} {{/if}}
<PluginOutlet <span>
@name="user-preferences-notifications" <PluginOutlet
@tagName="span" @name="user-preferences-notifications"
@connectorTagName="div" @connectorTagName="div"
@args={{hash model=this.model save=(action "save")}} @args={{hash model=this.model save=(action "save")}}
/> />
</span>
<br /> <br />
<PluginOutlet <span>
@name="user-custom-controls" <PluginOutlet
@tagName="span" @name="user-custom-controls"
@connectorTagName="div" @connectorTagName="div"
@args={{hash model=this.model}} @args={{hash model=this.model}}
/> />
</span>
<SaveControls <SaveControls
@model={{this.model}} @model={{this.model}}

39
app/assets/javascripts/discourse/app/templates/preferences/profile.hbs
View File

@ -155,28 +155,31 @@
</div> </div>
{{/if}} {{/if}}
<PluginOutlet <span>
@name="user-preferences-profile" <PluginOutlet
@tagName="span" @name="user-preferences-profile"
@connectorTagName="div" @connectorTagName="div"
@args={{hash model=this.model save=(action "save")}} @args={{hash model=this.model save=(action "save")}}
/> />
</span>
<PluginOutlet <span>
@name="user-custom-preferences" <PluginOutlet
@tagName="span" @name="user-custom-preferences"
@connectorTagName="div" @connectorTagName="div"
@args={{hash model=this.model}} @args={{hash model=this.model}}
/> />
</span>
<br /> <br />
<PluginOutlet <span>
@name="user-custom-controls" <PluginOutlet
@tagName="span" @name="user-custom-controls"
@connectorTagName="div" @connectorTagName="div"
@args={{hash model=this.model}} @args={{hash model=this.model}}
/> />
</span>
<SaveControls <SaveControls
@model={{this.model}} @model={{this.model}}

26
app/assets/javascripts/discourse/app/templates/preferences/security.hbs
View File

@ -104,18 +104,20 @@
<UserPreferences::UserApiKeys @model={{@model}} /> <UserPreferences::UserApiKeys @model={{@model}} />
{{/if}} {{/if}}
<PluginOutlet <span>
@name="user-preferences-security" <PluginOutlet
@tagName="span" @name="user-preferences-security"
@connectorTagName="div" @connectorTagName="div"
@args={{hash model=this.model save=(action "save")}} @args={{hash model=this.model save=(action "save")}}
/> />
</span>
<br /> <br />
<PluginOutlet <span>
@name="user-custom-controls" <PluginOutlet
@tagName="span" @name="user-custom-controls"
@connectorTagName="div" @connectorTagName="div"
@args={{hash model=this.model}} @args={{hash model=this.model}}
/> />
</span>

13
app/assets/javascripts/discourse/app/templates/preferences/users.hbs
View File

@ -56,12 +56,13 @@
</div> </div>
{{/if}} {{/if}}
<PluginOutlet <span>
@name="user-custom-controls" <PluginOutlet
@tagName="span" @name="user-custom-controls"
@connectorTagName="div" @connectorTagName="div"
@args={{hash model=this.model}} @args={{hash model=this.model}}
/> />
</span>
<SaveControls <SaveControls
@model={{this.model}} @model={{this.model}}

16
app/assets/javascripts/discourse/app/templates/review-index.hbs
View File

@ -28,12 +28,16 @@
{{#if this.filtersExpanded}} {{#if this.filtersExpanded}}
<PluginOutlet <span>
@name="above-review-filters" <PluginOutlet
@tagName="span" @name="above-review-filters"
@connectorTagName="div" @connectorTagName="div"
@args={{hash model=this.model additionalFilters=this.additionalFilters}} @args={{hash
/> model=this.model
additionalFilters=this.additionalFilters
}}
/>
</span>
<div class="reviewable-filter"> <div class="reviewable-filter">
<label class="filter-label">{{i18n "review.filters.type.title"}}</label> <label class="filter-label">{{i18n "review.filters.type.title"}}</label>

8
app/assets/javascripts/discourse/app/templates/static.hbs
View File

@ -2,11 +2,9 @@
<WatchRead @action={{action "markFaqRead"}} @path={{this.model.path}}> <WatchRead @action={{action "markFaqRead"}} @path={{this.model.path}}>
<div class="contents clearfix body-page"> <div class="contents clearfix body-page">
<PluginOutlet <span>
@name="above-static" <PluginOutlet @name="above-static" @connectorTagName="div" />
@tagName="span" </span>
@connectorTagName="div"
/>
{{html-safe this.model.html}} {{html-safe this.model.html}}

40
app/assets/javascripts/discourse/app/templates/tag/show.hbs
View File

@ -13,11 +13,12 @@
<DiscourseBanner @user={{this.currentUser}} @banner={{this.site.banner}} /> <DiscourseBanner @user={{this.currentUser}} @banner={{this.site.banner}} />
</div> </div>
<PluginOutlet <span>
@name="discovery-list-controls-above" <PluginOutlet
@tagName="span" @name="discovery-list-controls-above"
@connectorTagName="div" @connectorTagName="div"
/> />
</span>
<div class="list-controls"> <div class="list-controls">
<PluginOutlet <PluginOutlet
@ -61,12 +62,13 @@
/> />
{{/if}} {{/if}}
<PluginOutlet <span>
@name="discovery-list-container-top" <PluginOutlet
@tagName="span" @name="discovery-list-container-top"
@connectorTagName="div" @connectorTagName="div"
@args={{hash category=this.category}} @args={{hash category=this.category}}
/> />
</span>
<TopicDismissButtons <TopicDismissButtons
@position="top" @position="top"
@ -77,11 +79,9 @@
@resetNew={{action "resetNew"}} @resetNew={{action "resetNew"}}
/> />
<PluginOutlet <span>
@name="discovery-above" <PluginOutlet @name="discovery-above" @connectorTagName="div" />
@tagName="span" </span>
@connectorTagName="div"
/>
<div class="container list-container"> <div class="container list-container">
<div class="row"> <div class="row">
@ -178,9 +178,7 @@
</div> </div>
</div> </div>
<PluginOutlet <span>
@name="discovery-below" <PluginOutlet @name="discovery-below" @connectorTagName="div" />
@tagName="span" </span>
@connectorTagName="div"
/>
</DSection> </DSection>

13
app/assets/javascripts/discourse/app/templates/tags/index.hbs
View File

@ -11,12 +11,13 @@
</div> </div>
</div> </div>
<PluginOutlet <div>
@name="tags-below-title" <PluginOutlet
@connectorTagName="div" @name="tags-below-title"
@tagName="div" @connectorTagName="div"
@args={{hash model=this.model}} @args={{hash model=this.model}}
/> />
</div>
<div class="tag-sort-options"> <div class="tag-sort-options">
{{i18n "tagging.sort_by"}} {{i18n "tagging.sort_by"}}

79
app/assets/javascripts/discourse/app/templates/topic.hbs
View File

@ -24,12 +24,13 @@
<SharedDraftControls @topic={{this.model}} /> <SharedDraftControls @topic={{this.model}} />
{{/if}} {{/if}}
<PluginOutlet <span>
@name="topic-above-post-stream" <PluginOutlet
@tagName="span" @name="topic-above-post-stream"
@connectorTagName="div" @connectorTagName="div"
@args={{hash model=this.model editFirstPost=(action "editFirstPost")}} @args={{hash model=this.model editFirstPost=(action "editFirstPost")}}
/> />
</span>
{{#if this.model.postStream.loaded}} {{#if this.model.postStream.loaded}}
{{#if this.model.postStream.firstPostPresent}} {{#if this.model.postStream.firstPostPresent}}
@ -72,12 +73,13 @@
/> />
{{/if}} {{/if}}
<PluginOutlet <span>
@name="edit-topic" <PluginOutlet
@tagName="span" @name="edit-topic"
@connectorTagName="div" @connectorTagName="div"
@args={{hash model=this.model buffered=this.buffered}} @args={{hash model=this.model buffered=this.buffered}}
/> />
</span>
<div class="edit-controls"> <div class="edit-controls">
<DButton <DButton
@ -148,7 +150,6 @@
<PluginOutlet <PluginOutlet
@name="topic-title-suffix" @name="topic-title-suffix"
@tagName=""
@args={{hash model=this.model}} @args={{hash model=this.model}}
/> />
</h1> </h1>
@ -291,12 +292,13 @@
@expanded={{info.topicProgressExpanded}} @expanded={{info.topicProgressExpanded}}
@jumpToPost={{action "jumpToPost"}} @jumpToPost={{action "jumpToPost"}}
> >
<PluginOutlet <span>
@name="before-topic-progress" <PluginOutlet
@tagName="span" @name="before-topic-progress"
@connectorTagName="div" @connectorTagName="div"
@args={{hash model=this.model jumpToPost=(action "jumpToPost")}} @args={{hash model=this.model jumpToPost=(action "jumpToPost")}}
/> />
</span>
<TopicAdminMenuButton <TopicAdminMenuButton
@topic={{this.model}} @topic={{this.model}}
@openUpwards="true" @openUpwards="true"
@ -329,12 +331,13 @@
@condition={{this.model.postStream.loadingAbove}} @condition={{this.model.postStream.loadingAbove}}
/> />
<PluginOutlet <span>
@name="topic-above-posts" <PluginOutlet
@tagName="span" @name="topic-above-posts"
@connectorTagName="div" @connectorTagName="div"
@args={{hash model=this.model}} @args={{hash model=this.model}}
/> />
</span>
{{#unless this.model.postStream.loadingFilter}} {{#unless this.model.postStream.loadingFilter}}
<ScrollingPostStream <ScrollingPostStream
@ -519,12 +522,13 @@
<SignupCta /> <SignupCta />
{{else}} {{else}}
{{#if this.currentUser}} {{#if this.currentUser}}
<PluginOutlet <span>
@name="topic-above-footer-buttons" <PluginOutlet
@tagName="span" @name="topic-above-footer-buttons"
@connectorTagName="div" @connectorTagName="div"
@args={{hash model=this.model}} @args={{hash model=this.model}}
/> />
</span>
<TopicFooterButtons <TopicFooterButtons
@topic={{this.model}} @topic={{this.model}}
@ -560,12 +564,13 @@
{{/if}} {{/if}}
{{/if}} {{/if}}
<PluginOutlet <span>
@name="topic-above-suggested" <PluginOutlet
@tagName="span" @name="topic-above-suggested"
@connectorTagName="div" @connectorTagName="div"
@args={{hash model=this.model}} @args={{hash model=this.model}}
/> />
</span>
<div <div
class="{{if class="{{if
this.model.relatedMessages.length this.model.relatedMessages.length

58
app/assets/javascripts/discourse/app/templates/user.hbs
View File

@ -146,12 +146,13 @@
class="user-profile-names__title" class="user-profile-names__title"
>{{this.model.title}}</div> >{{this.model.title}}</div>
{{/if}} {{/if}}
<PluginOutlet <span>
@name="user-post-names" <PluginOutlet
@tagName="span" @name="user-post-names"
@connectorTagName="div" @connectorTagName="div"
@args={{hash model=this.model}} @args={{hash model=this.model}}
/> />
</span>
</div> </div>
{{#if this.showFeaturedTopic}} {{#if this.showFeaturedTopic}}
@ -196,12 +197,13 @@
{{/if}} {{/if}}
</div> </div>
{{/if}} {{/if}}
<PluginOutlet <span>
@name="user-location-and-website" <PluginOutlet
@tagName="span" @name="user-location-and-website"
@connectorTagName="div" @connectorTagName="div"
@args={{hash model=this.model}} @args={{hash model=this.model}}
/> />
</span>
</div> </div>
<div class="bio"> <div class="bio">
@ -250,24 +252,26 @@
{{/if}} {{/if}}
{{/each}} {{/each}}
<PluginOutlet <span>
@name="user-profile-public-fields" <PluginOutlet
@tagName="span" @name="user-profile-public-fields"
@connectorTagName="div" @connectorTagName="div"
@args={{hash @args={{hash
publicUserFields=this.publicUserFields publicUserFields=this.publicUserFields
model=this.model model=this.model
}} }}
/> />
</span>
</div> </div>
{{/if}} {{/if}}
<PluginOutlet <span>
@name="user-profile-primary" <PluginOutlet
@tagName="span" @name="user-profile-primary"
@connectorTagName="div" @connectorTagName="div"
@args={{hash model=this.model}} @args={{hash model=this.model}}
/> />
</span>
</div> </div>
<section class="controls"> <section class="controls">

13
app/assets/javascripts/discourse/app/templates/user/activity.hbs
View File

@ -67,12 +67,13 @@
}}</DNavigationItem> }}</DNavigationItem>
{{/if}} {{/if}}
<PluginOutlet <span>
@name="user-activity-bottom" <PluginOutlet
@tagName="span" @name="user-activity-bottom"
@connectorTagName="li" @connectorTagName="li"
@args={{hash model=this.model}} @args={{hash model=this.model}}
/> />
</span>
</MobileNav> </MobileNav>
</nav> </nav>
</DSection> </DSection>

13
app/assets/javascripts/discourse/app/templates/user/messages.hbs
View File

@ -154,12 +154,13 @@
{{/if}} {{/if}}
{{/if}} {{/if}}
<PluginOutlet <span>
@name="user-messages-nav" <PluginOutlet
@tagName="span" @name="user-messages-nav"
@connectorTagName="li" @connectorTagName="li"
@args={{hash model=this.model}} @args={{hash model=this.model}}
/> />
</span>
</MobileNav> </MobileNav>
</DSection> </DSection>

13
app/assets/javascripts/discourse/app/templates/user/notifications.hbs
View File

@ -56,12 +56,13 @@
{{i18n "user_action_groups.11"}} {{i18n "user_action_groups.11"}}
</LinkTo> </LinkTo>
</li> </li>
<PluginOutlet <span>
@name="user-notifications-bottom" <PluginOutlet
@tagName="span" @name="user-notifications-bottom"
@connectorTagName="li" @connectorTagName="li"
@args={{hash model=this.model}} @args={{hash model=this.model}}
/> />
</span>
</MobileNav> </MobileNav>
</DSection> </DSection>

13
app/assets/javascripts/discourse/app/templates/users.hbs
View File

@ -2,12 +2,13 @@
<LoadMore @selector=".directory tbody tr" @action={{action "loadMore"}}> <LoadMore @selector=".directory tbody tr" @action={{action "loadMore"}}>
<div class="container"> <div class="container">
<div class="users-directory directory"> <div class="users-directory directory">
<PluginOutlet <span>
@name="users-top" <PluginOutlet
@tagName="span" @name="users-top"
@connectorTagName="div" @connectorTagName="div"
@args={{hash model=this.model}} @args={{hash model=this.model}}
/> />
</span>
<div class="directory-controls"> <div class="directory-controls">
<div class="period-controls"> <div class="period-controls">
<PeriodChooser <PeriodChooser