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

DEV: enforces block-indentation of ember-template-lint rules (#9408)

This commit is contained in:
Joffrey JAFFEUX 2020-04-13 17:17:20 +02:00 committed by GitHub
parent a863d8eecb
commit b66b277dc4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
101 changed files with 2543 additions and 2489 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.template-lintrc.js
View File

@ -6,7 +6,7 @@ module.exports = {
// "eol-last": "always", // "eol-last": "always",
rules: { rules: {
"block-indentation": false, "block-indentation": true,
"deprecated-render-helper": true, "deprecated-render-helper": true,
"img-alt-attributes": false, "img-alt-attributes": false,
"linebreak-style": true, "linebreak-style": true,

3
app/assets/javascripts/admin/templates/admin.hbs
View File

@ -2,9 +2,7 @@
<div class="row"> <div class="row">
<div class="full-width"> <div class="full-width">
<div class="admin-main-nav"> <div class="admin-main-nav">
<ul class="nav nav-pills"> <ul class="nav nav-pills">
{{nav-item route='admin.dashboard' label='admin.dashboard.title'}} {{nav-item route='admin.dashboard' label='admin.dashboard.title'}}
{{#if currentUser.admin}} {{#if currentUser.admin}}
{{nav-item route='adminSiteSettings' label='admin.site_settings.title'}} {{nav-item route='adminSiteSettings' label='admin.site_settings.title'}}
@ -37,7 +35,6 @@
{{outlet}} {{outlet}}
</div> </div>
</div> </div>
</div> </div>
</div> </div>
{{/admin-wrapper}} {{/admin-wrapper}}

4
app/assets/javascripts/admin/templates/components/admin-report.hbs
View File

@ -1,5 +1,5 @@
{{#if isEnabled}} {{#if isEnabled}}
{{#conditional-loading-section isLoading=isLoading}} {{#conditional-loading-section isLoading=isLoading}}
{{#if showHeader}} {{#if showHeader}}
<div class="header"> <div class="header">
{{#if showTitle}} {{#if showTitle}}
@ -196,7 +196,7 @@
</div> </div>
{{/if}} {{/if}}
</div> </div>
{{/conditional-loading-section}} {{/conditional-loading-section}}
{{else}} {{else}}
<div class="alert alert-info"> <div class="alert alert-info">
{{html-safe disabledLabel}} {{html-safe disabledLabel}}

10
app/assets/javascripts/admin/templates/components/admin-theme-editor.hbs
View File

@ -12,9 +12,7 @@
class=(if target.edited 'edited' 'blank') class=(if target.edited 'edited' 'blank')
}} }}
{{#if target.error}}{{d-icon 'exclamation-triangle'}}{{/if}} {{#if target.error}}{{d-icon 'exclamation-triangle'}}{{/if}}
{{#if target.icon}} {{#if target.icon}}{{d-icon target.icon}}{{/if}}
{{d-icon target.icon}}
{{/if}}
{{i18n (concat 'admin.customize.theme.' target.name)}} {{i18n (concat 'admin.customize.theme.' target.name)}}
{{/link-to}} {{/link-to}}
</li> </li>
@ -25,13 +23,11 @@
<a {{action "toggleShowAdvanced"}} <a {{action "toggleShowAdvanced"}}
class='no-text' class='no-text'
href href
title={{i18n (concat "admin.customize.theme." (if showAdvanced "hide_advanced" "show_advanced"))}} title={{i18n (concat "admin.customize.theme." (if showAdvanced "hide_advanced" "show_advanced"))}}>
>
{{d-icon (if showAdvanced "angle-double-left" "angle-double-right")}} {{d-icon (if showAdvanced "angle-double-left" "angle-double-right")}}
</a> </a>
</li> </li>
{{/if}} {{/if}}
<li class="spacer"></li> <li class="spacer"></li>
<li> <li>
<label> <label>
@ -59,7 +55,6 @@
{{#if field.error}}{{d-icon 'exclamation-triangle'}}{{/if}} {{#if field.error}}{{d-icon 'exclamation-triangle'}}{{/if}}
{{#if field.icon}}{{d-icon field.icon}}{{/if}} {{#if field.icon}}{{d-icon field.icon}}{{/if}}
{{field.translatedName}} {{field.translatedName}}
{{/link-to}} {{/link-to}}
</li> </li>
{{/each}} {{/each}}
@ -77,6 +72,7 @@
{{/if}} {{/if}}
</li> </li>
{{/if}} {{/if}}
<li class='spacer'></li> <li class='spacer'></li>
<li> <li>
<a href {{action "toggleMaximize"}} class="no-text"> <a href {{action "toggleMaximize"}} class="no-text">

3
app/assets/javascripts/admin/templates/components/silence-details.hbs
View File

@ -7,7 +7,8 @@
{{text-field {{text-field
value=reason value=reason
class="silence-reason" class="silence-reason"
placeholderKey="admin.user.silence_reason_placeholder"}} placeholderKey="admin.user.silence_reason_placeholder"
}}
</div> </div>
<label> <label>

12
app/assets/javascripts/admin/templates/customize-colors-show.hbs
View File

@ -7,18 +7,21 @@
class="btn-primary" class="btn-primary"
action=(action "save") action=(action "save")
disabled=model.disableSave disabled=model.disableSave
label="admin.customize.save"}} label="admin.customize.save"
}}
{{/unless}} {{/unless}}
{{d-button {{d-button
class="btn-default" class="btn-default"
action=(action "copy" model) action=(action "copy" model)
icon="copy" icon="copy"
label="admin.customize.copy"}} label="admin.customize.copy"
}}
{{d-button {{d-button
class="btn-default" class="btn-default"
action=(action "copyToClipboard" model) action=(action "copyToClipboard" model)
icon="far-clipboard" icon="far-clipboard"
label="admin.customize.copy_to_clipboard"}} label="admin.customize.copy_to_clipboard"
}}
{{#if model.theme_id}} {{#if model.theme_id}}
{{i18n "admin.customize.theme_owner"}} {{i18n "admin.customize.theme_owner"}}
{{#link-to "adminCustomizeThemes.show" model.theme_id}}{{model.theme_name}}{{/link-to}} {{#link-to "adminCustomizeThemes.show" model.theme_id}}{{model.theme_name}}{{/link-to}}
@ -27,7 +30,8 @@
action=(action "destroy") action=(action "destroy")
class="btn-danger" class="btn-danger"
icon="far-trash-alt" icon="far-trash-alt"
label="admin.customize.delete"}} label="admin.customize.delete"
}}
{{/if}} {{/if}}
<span class="saving {{unless model.savingStatus 'hidden'}}">{{model.savingStatus}}</span> <span class="saving {{unless model.savingStatus 'hidden'}}">{{model.savingStatus}}</span>
</div> </div>

4
app/assets/javascripts/admin/templates/dashboard_reports.hbs
View File

@ -6,7 +6,8 @@
class="filter-reports-input" class="filter-reports-input"
input=(action "filterReports" value="target.value") input=(action "filterReports" value="target.value")
placeholder=(i18n "admin.dashboard.filter_reports") placeholder=(i18n "admin.dashboard.filter_reports")
autofocus=true}} autofocus=true
}}
</div> </div>
<ul class="reports-list"> <ul class="reports-list">
@ -14,7 +15,6 @@
<li class="report"> <li class="report">
{{#link-to 'adminReports.show' report.type}} {{#link-to 'adminReports.show' report.type}}
<h3 class="report-title">{{report.title}}</h3> <h3 class="report-title">{{report.title}}</h3>
{{#if report.description}} {{#if report.description}}
<p class="report-description"> <p class="report-description">
{{report.description}} {{report.description}}

10
app/assets/javascripts/admin/templates/email-advanced-test.hbs
View File

@ -5,23 +5,21 @@
{{textarea name="email" value=email class="email-body"}} {{textarea name="email" value=email class="email-body"}}
{{d-button {{d-button
action=(action "run") action=(action "run")
label="admin.email.advanced_test.run"}} label="admin.email.advanced_test.run"
}}
</div> </div>
{{#conditional-loading-spinner condition=loading}} {{#conditional-loading-spinner condition=loading}}
{{#if format}}
{{#if format}}
<hr> <hr>
<div class="text"> <div class="text">
<h3>{{i18n 'admin.email.advanced_test.text'}}</h3> <h3>{{i18n 'admin.email.advanced_test.text'}}</h3>
<pre class="full-reason">{{html-safe text}}</pre> <pre class="full-reason">{{html-safe text}}</pre>
</div> </div>
<hr> <hr>
<div class="elided"> <div class="elided">
<h3>{{i18n 'admin.email.advanced_test.elided'}}</h3> <h3>{{i18n 'admin.email.advanced_test.elided'}}</h3>
<pre class="full-reason">{{html-safe elided}}</pre> <pre class="full-reason">{{html-safe elided}}</pre>
</div> </div>
{{/if}} {{/if}}
{{/conditional-loading-spinner}} {{/conditional-loading-spinner}}

7
app/assets/javascripts/admin/templates/email-preview-digest.hbs
View File

@ -13,8 +13,11 @@
<div class="toggle"> <div class="toggle">
<label>{{i18n 'admin.email.format'}}</label> <label>{{i18n 'admin.email.format'}}</label>
{{#if showHtml}} {{#if showHtml}}
<span>{{i18n 'admin.email.html'}}</span> | <a href <span>{{i18n 'admin.email.html'}}</span>
{{action "toggleShowHtml"}}>{{i18n 'admin.email.text'}}</a> |
<a href {{action "toggleShowHtml"}}>
{{i18n 'admin.email.text'}}
</a>
{{else}} {{else}}
<a href {{action "toggleShowHtml"}}>{{i18n 'admin.email.html'}}</a> | <a href {{action "toggleShowHtml"}}>{{i18n 'admin.email.html'}}</a> |
<span>{{i18n 'admin.email.text'}}</span> <span>{{i18n 'admin.email.text'}}</span>

3
app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs
View File

@ -41,10 +41,10 @@
{{d-button class="btn-default" action=(action "exportStaffActionLogs") label="admin.export_csv.button_text" icon="download"}} {{d-button class="btn-default" action=(action "exportStaffActionLogs") label="admin.export_csv.button_text" icon="download"}}
</div> </div>
<div class="clearfix"></div> <div class="clearfix"></div>
{{#staff-actions}} {{#staff-actions}}
{{#load-more selector=".staff-logs tr" action=(action "loadMore")}} {{#load-more selector=".staff-logs tr" action=(action "loadMore")}}
{{#if model.content}} {{#if model.content}}
<table class='table staff-logs grid'> <table class='table staff-logs grid'>
@ -108,5 +108,4 @@
{{i18n 'search.no_results'}} {{i18n 'search.no_results'}}
{{/if}} {{/if}}
{{/load-more}} {{/load-more}}
{{/staff-actions}} {{/staff-actions}}

2
app/assets/javascripts/admin/templates/modal/site-setting-default-categories.hbs
View File

@ -1,5 +1,5 @@
{{#d-modal-body class="incoming-emails" rawTitle=model.key}} {{#d-modal-body class="incoming-emails" rawTitle=model.key}}
{{i18n "admin.site_settings.default_categories.modal_description" count=model.count}} {{i18n "admin.site_settings.default_categories.modal_description" count=model.count}}
{{/d-modal-body}} {{/d-modal-body}}
<div class="modal-footer"> <div class="modal-footer">

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

@ -29,8 +29,10 @@
{{plugin.name}} {{plugin.name}}
{{/if}} {{/if}}
</td> </td>
<td class="version"> <div class="label">{{i18n "admin.plugins.version"}}</div> <td class="version">
{{plugin.version}}</td> <div class="label">{{i18n "admin.plugins.version"}}</div>
{{plugin.version}}
</td>
<td class="col-enabled"> <td class="col-enabled">
<div class="label">{{i18n "admin.plugins.enabled"}}</div> <div class="label">{{i18n "admin.plugins.enabled"}}</div>
{{#if plugin.enabled_setting}} {{#if plugin.enabled_setting}}

12
app/assets/javascripts/admin/templates/plugins.hbs
View File

@ -1,17 +1,17 @@
<div class='admin-controls'> <div class='admin-controls'>
<div class='controls'> <div class='controls'>
{{d-button action=(action "toggleMenu") class="menu-toggle" icon="bars"}} {{d-button action=(action "toggleMenu") class="menu-toggle" icon="bars"}}
{{#if currentUser.admin}} {{#if currentUser.admin}}
{{d-button label="admin.plugins.change_settings" {{d-button
label="admin.plugins.change_settings"
icon="cog" icon="cog"
class="btn-default settings-button" class="btn-default settings-button"
action=(route-action "showSettings")}} action=(route-action "showSettings")
}}
{{/if}} {{/if}}
</div> </div>
</div>
</div>
<div class="admin-nav pull-left"> <div class="admin-nav pull-left">
<ul class="nav nav-stacked"> <ul class="nav nav-stacked">

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

@ -625,7 +625,7 @@
</section> </section>
{{#if model.single_sign_on_record}} {{#if model.single_sign_on_record}}
<section class="details"> <section class="details">
<h1>{{i18n "admin.user.sso.title"}}</h1> <h1>{{i18n "admin.user.sso.title"}}</h1>
{{#with model.single_sign_on_record as |sso|}} {{#with model.single_sign_on_record as |sso|}}
@ -652,7 +652,7 @@
<div class="value">{{sso.external_avatar_url}}</div> <div class="value">{{sso.external_avatar_url}}</div>
</div> </div>
{{/with}} {{/with}}
</section> </section>
{{/if}} {{/if}}
{{plugin-outlet name="after-user-details" args=(hash model=model)}} {{plugin-outlet name="after-user-details" args=(hash model=model)}}

37
app/assets/javascripts/admin/templates/user-tl3-requirements.hbs
View File

@ -117,31 +117,42 @@
{{#if model.tl3Requirements.requirements_lost}} {{#if model.tl3Requirements.requirements_lost}}
{{! tl implicitly not locked }} {{! tl implicitly not locked }}
{{#if model.tl3Requirements.on_grace_period}} {{#if model.tl3Requirements.on_grace_period}}
{{d-icon "times"}} {{i18n 'admin.user.tl3_requirements.on_grace_period'}} {{d-icon "times"}}
{{else}} {{! not on grace period }} {{i18n 'admin.user.tl3_requirements.on_grace_period'}}
{{d-icon "times"}} {{i18n 'admin.user.tl3_requirements.does_not_qualify'}} {{else}}
{{! not on grace period }}
{{d-icon "times"}}
{{i18n 'admin.user.tl3_requirements.does_not_qualify'}}
{{i18n 'admin.user.tl3_requirements.will_be_demoted'}} {{i18n 'admin.user.tl3_requirements.will_be_demoted'}}
{{/if}} {{/if}}
{{else}} {{! requirements not lost - remains tl3 }} {{else}}
{{! requirements not lost - remains tl3 }}
{{#if model.tl3Requirements.trust_level_locked}} {{#if model.tl3Requirements.trust_level_locked}}
{{d-icon "lock"}} {{i18n 'admin.user.tl3_requirements.locked_will_not_be_demoted'}} {{d-icon "lock"}}
{{else}} {{! tl not locked }} {{i18n 'admin.user.tl3_requirements.locked_will_not_be_demoted'}}
{{d-icon "check"}} {{i18n 'admin.user.tl3_requirements.qualifies'}} {{else}}
{{! tl not locked }}
{{d-icon "check"}}
{{i18n 'admin.user.tl3_requirements.qualifies'}}
{{#if model.tl3Requirements.on_grace_period}} {{#if model.tl3Requirements.on_grace_period}}
{{i18n 'admin.user.tl3_requirements.on_grace_period'}} {{i18n 'admin.user.tl3_requirements.on_grace_period'}}
{{/if}} {{/if}}
{{/if}} {{/if}}
{{/if}} {{/if}}
{{else}} {{! is not tl3 }} {{else}}
{{! is not tl3 }}
{{#if model.tl3Requirements.requirements_met}} {{#if model.tl3Requirements.requirements_met}}
{{! met & not tl3 - will be promoted}} {{! met & not tl3 - will be promoted}}
{{d-icon "check"}} {{i18n 'admin.user.tl3_requirements.qualifies'}} {{d-icon "check"}}
{{i18n 'admin.user.tl3_requirements.qualifies'}}
{{i18n 'admin.user.tl3_requirements.will_be_promoted'}} {{i18n 'admin.user.tl3_requirements.will_be_promoted'}}
{{else}} {{! requirements not met - remains regular }}
{{#if model.tl3Requirements.trust_level_locked}}
{{d-icon "lock"}} {{i18n 'admin.user.tl3_requirements.locked_will_not_be_promoted'}}
{{else}} {{else}}
{{d-icon "times"}} {{i18n 'admin.user.tl3_requirements.does_not_qualify'}} {{! requirements not met - remains regular }}
{{#if model.tl3Requirements.trust_level_locked}}
{{d-icon "lock"}}
{{i18n 'admin.user.tl3_requirements.locked_will_not_be_promoted'}}
{{else}}
{{d-icon "times"}}
{{/if}} {{/if}}
{{/if}} {{/if}}
{{/if}} {{/if}}

6
app/assets/javascripts/admin/templates/web-hooks-show-events.hbs
View File

@ -9,7 +9,7 @@
</div> </div>
<div class='web-hook-events-listing'> <div class='web-hook-events-listing'>
{{#if model}} {{#if model}}
{{#load-more selector=".web-hook-events li" action=(action "loadMore")}} {{#load-more selector=".web-hook-events li" action=(action "loadMore")}}
<div class='web-hook-events content-list'> <div class='web-hook-events content-list'>
<div class='heading-container'> <div class='heading-container'>
@ -33,7 +33,7 @@
</div> </div>
{{conditional-loading-spinner condition=model.loadingMore}} {{conditional-loading-spinner condition=model.loadingMore}}
{{/load-more}} {{/load-more}}
{{else}} {{else}}
<p>{{i18n 'admin.web_hooks.events.none'}}</p> <p>{{i18n 'admin.web_hooks.events.none'}}</p>
{{/if}} {{/if}}
</div> </div>

6
app/assets/javascripts/admin/templates/web-hooks.hbs
View File

@ -5,7 +5,7 @@
{{d-icon 'plus'}} {{i18n 'admin.web_hooks.new'}} {{d-icon 'plus'}} {{i18n 'admin.web_hooks.new'}}
{{/link-to}} {{/link-to}}
</div> </div>
{{#if model}} {{#if model}}
{{#load-more selector=".web-hooks tr" action=(action "loadMore")}} {{#load-more selector=".web-hooks tr" action=(action "loadMore")}}
<table class='web-hooks grid'> <table class='web-hooks grid'>
<thead> <thead>
@ -32,7 +32,7 @@
</table> </table>
{{conditional-loading-spinner condition=model.loadingMore}} {{conditional-loading-spinner condition=model.loadingMore}}
{{/load-more}} {{/load-more}}
{{else}} {{else}}
<p>{{i18n 'admin.web_hooks.none'}}</p> <p>{{i18n 'admin.web_hooks.none'}}</p>
{{/if}} {{/if}}
</div> </div>

1
app/assets/javascripts/discourse/templates/components/avatar-uploader.hbs
View File

@ -5,7 +5,6 @@
{{else}} {{else}}
{{i18n 'upload'}} {{i18n 'upload'}}
{{/if}} {{/if}}
<input class="hidden-upload-field" disabled={{uploading}} type="file" accept="image/*"> <input class="hidden-upload-field" disabled={{uploading}} type="file" accept="image/*">
</label> </label>

7
app/assets/javascripts/discourse/templates/components/basic-topic-list.hbs
View File

@ -8,7 +8,8 @@
{{/if}} {{/if}}
{{#if topics}} {{#if topics}}
{{topic-list showPosters=showPosters {{topic-list
showPosters=showPosters
hideCategory=hideCategory hideCategory=hideCategory
topics=topics topics=topics
expandExcerpts=expandExcerpts expandExcerpts=expandExcerpts
@ -18,8 +19,8 @@
skipHeader=skipHeader skipHeader=skipHeader
tagsForUser=tagsForUser tagsForUser=tagsForUser
onScroll=onScroll onScroll=onScroll
scrollOnLoad=scrollOnLoad}} scrollOnLoad=scrollOnLoad
}}
{{else}} {{else}}
{{#unless loadingMore}} {{#unless loadingMore}}
<div class='alert alert-info'> <div class='alert alert-info'>

7
app/assets/javascripts/discourse/templates/components/categories-boxes-with-topics.hbs
View File

@ -5,13 +5,14 @@
<a href={{c.url}}> <a href={{c.url}}>
{{#unless c.isMuted}} {{#unless c.isMuted}}
{{#if c.uploaded_logo.url}} {{#if c.uploaded_logo.url}}
{{cdn-img src=c.uploaded_logo.url {{cdn-img
src=c.uploaded_logo.url
class="logo" class="logo"
width=c.uploaded_logo.width width=c.uploaded_logo.width
height=c.uploaded_logo.height}} height=c.uploaded_logo.height
}}
{{/if}} {{/if}}
{{/unless}} {{/unless}}
<h3> <h3>
{{category-title-before category=c}} {{category-title-before category=c}}
{{#if c.read_restricted}} {{#if c.read_restricted}}

3
app/assets/javascripts/discourse/templates/components/categories-boxes.hbs
View File

@ -9,7 +9,8 @@
src=c.uploaded_logo.url src=c.uploaded_logo.url
class="logo" class="logo"
width=c.uploaded_logo.width width=c.uploaded_logo.width
height=c.uploaded_logo.height}} height=c.uploaded_logo.height
}}
{{/if}} {{/if}}
</div> </div>
{{/unless}} {{/unless}}

6
app/assets/javascripts/discourse/templates/components/composer-user-selector.hbs
View File

@ -1,5 +1,6 @@
{{#if showSelector}} {{#if showSelector}}
{{user-selector topicId=topicId {{user-selector
topicId=topicId
onChangeCallback=(action "triggerResize") onChangeCallback=(action "triggerResize")
id="private-message-users" id="private-message-users"
includeMessageableGroups='true' includeMessageableGroups='true'
@ -8,7 +9,8 @@
usernames=usernames usernames=usernames
hasGroups=hasGroups hasGroups=hasGroups
allowEmails='true' allowEmails='true'
autocomplete="discourse"}} autocomplete="discourse"
}}
{{else}} {{else}}
<a href {{action "toggleSelector"}}> <a href {{action "toggleSelector"}}>
<div class='ac-wrap composer-user-selector-limited'> <div class='ac-wrap composer-user-selector-limited'>

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

@ -77,13 +77,10 @@
{{i18n "category.all_topics_wiki"}} {{i18n "category.all_topics_wiki"}}
</label> </label>
</section> </section>
</section> </section>
<section> <section>
<h3>{{i18n 'category.settings_sections.moderation'}}</h3> <h3>{{i18n 'category.settings_sections.moderation'}}</h3>
{{#if siteSettings.enable_category_group_review}} {{#if siteSettings.enable_category_group_review}}
<section class="field"> <section class="field">
<label for="reviewable-by-group"> <label for="reviewable-by-group">
@ -93,7 +90,8 @@
groupFinder=groupFinder groupFinder=groupFinder
single="true" single="true"
groupNames=category.reviewable_by_group_name groupNames=category.reviewable_by_group_name
placeholderKey="category.review_group_name"}} placeholderKey="category.review_group_name"
}}
</section> </section>
{{/if}} {{/if}}
@ -139,12 +137,10 @@
</label> </label>
{{text-field value=category.custom_fields.num_auto_bump_daily id="category-number-daily-bump" type="number"}} {{text-field value=category.custom_fields.num_auto_bump_daily id="category-number-daily-bump" type="number"}}
</section> </section>
</section> </section>
<section> <section>
<h3>{{i18n "category.settings_sections.appearance"}}</h3>
<h3> {{i18n "category.settings_sections.appearance"}}</h3>
<section class="field default-view-field"> <section class="field default-view-field">
<label for="category-default-view"> <label for="category-default-view">
@ -200,7 +196,6 @@
{{/unless}} {{/unless}}
</div> </div>
</section> </section>
{{#if isParentCategory}} {{#if isParentCategory}}
<section class="field show-subcategory-list-field"> <section class="field show-subcategory-list-field">
<label> <label>
@ -226,11 +221,10 @@
}} }}
</section> </section>
{{/if}} {{/if}}
</section> </section>
<section> <section>
<h3> {{i18n "category.settings_sections.email"}}</h3> <h3>{{i18n "category.settings_sections.email"}}</h3>
{{#if emailInEnabled}} {{#if emailInEnabled}}
<section class='field'> <section class='field'>
@ -264,7 +258,6 @@
<a href={{get-url '/admin/site_settings/category/email'}}>{{i18n 'category.email_in_disabled_click'}}</a> <a href={{get-url '/admin/site_settings/category/email'}}>{{i18n 'category.email_in_disabled_click'}}</a>
</section> </section>
{{/unless}} {{/unless}}
</section> </section>
{{plugin-outlet name="category-custom-settings" args=(hash category=category) connectorTagName="" tagName="section"}} {{plugin-outlet name="category-custom-settings" args=(hash category=category) connectorTagName="" tagName="section"}}

17
app/assets/javascripts/discourse/templates/components/group-card-contents.hbs
View File

@ -1,6 +1,5 @@
{{#if visible}} {{#if visible}}
<div class="card-content"> <div class="card-content">
<div class="card-row first-row"> <div class="card-row first-row">
<div class="group-card-avatar"> <div class="group-card-avatar">
<a href={{groupPath}} {{action "showGroup" group}} class="card-huge-avatar"> <a href={{groupPath}} {{action "showGroup" group}} class="card-huge-avatar">
@ -8,7 +7,8 @@
flairURL=group.flair_url flairURL=group.flair_url
flairBgColor=group.flair_bg_color flairBgColor=group.flair_bg_color
flairColor=group.flair_color flairColor=group.flair_color
groupName=group.name}} groupName=group.name
}}
</a> </a>
</div> </div>
<div class="names"> <div class="names">
@ -27,7 +27,8 @@
<li> <li>
{{group-membership-button {{group-membership-button
model=group model=group
showLogin=(route-action "showLogin")}} showLogin=(route-action "showLogin")
}}
</li> </li>
{{#if group.messageable}} {{#if group.messageable}}
<li> <li>
@ -35,7 +36,8 @@
action=(action "messageGroup") action=(action "messageGroup")
class="btn-primary group-message-button inline" class="btn-primary group-message-button inline"
icon="envelope" icon="envelope"
label="groups.message"}} label="groups.message"
}}
</li> </li>
{{/if}} {{/if}}
</ul> </ul>
@ -74,13 +76,12 @@
<a href {{action 'showUser' user}} class="card-tiny-avatar">{{bound-avatar user "tiny"}}</a> <a href {{action 'showUser' user}} class="card-tiny-avatar">{{bound-avatar user "tiny"}}</a>
{{/each}} {{/each}}
{{#if showMoreMembers}} {{#if showMoreMembers}}
<a href={{groupPath}} {{action "showGroup" group}} class="more-members-link"><span <a href={{groupPath}} {{action "showGroup" group}} class="more-members-link">
class="more-members-count">+{{moreMembersCount}} <span class="more-members-count">+{{moreMembersCount}}{{i18n "more"}}</span>
{{i18n "more"}}</span></a> </a>
{{/if}} {{/if}}
</div> </div>
</div> </div>
{{/if}} {{/if}}
</div> </div>
{{/if}} {{/if}}

4
app/assets/javascripts/discourse/templates/components/group-manage-save-button.hbs
View File

@ -1,8 +1,8 @@
<div class='control-group buttons'> <div class='control-group buttons'>
{{#d-button action=(action "save") {{#d-button action=(action "save")
disabled=saving disabled=saving
class='btn btn-primary group-manage-save'}} class='btn btn-primary group-manage-save'
}}
{{savingText}} {{savingText}}
{{/d-button}} {{/d-button}}

1
app/assets/javascripts/discourse/templates/components/group-post.hbs
View File

@ -19,7 +19,6 @@
</div> </div>
{{/if}} {{/if}}
</div> </div>
</div> </div>
<div class='excerpt'> <div class='excerpt'>

3
app/assets/javascripts/discourse/templates/components/invite-panel.hbs
View File

@ -42,7 +42,8 @@
{{d-button {{d-button
icon="address-book" icon="address-book"
action=(action "searchContact") action=(action "searchContact")
class="btn-primary open-contact-picker"}} class="btn-primary open-contact-picker"
}}
{{/if}} {{/if}}
</div> </div>
</div> </div>

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

@ -4,5 +4,5 @@
{{custom-html name="extraNavItem" tagName="li"}} {{custom-html name="extraNavItem" tagName="li"}}
{{!- this is done to avoid DIV in the UL, originally {{plugin-outlet name="extra-nav-item"}} {{!- this is done to avoid DIV in the UL, originally {{plugin-outlet name="extra-nav-item"}}
{{#each connectors as |c|}} {{#each connectors as |c|}}
{{plugin-connector connector=c class=c.classNames tagName="li" args=(hash category=category filterMode=filterMode)}} {{plugin-connector connector=c class=c.classNames tagName="li" args=(hash category=category filterMode=filterMode)}}
{{/each}} {{/each}}

8
app/assets/javascripts/discourse/templates/components/navigation-item.hbs
View File

@ -1,6 +1,6 @@
<a href={{hrefLink}} class={{activeClass}}> <a href={{hrefLink}} class={{activeClass}}>
{{#if hasIcon}} {{#if hasIcon}}
<span class={{content.name}}></span> <span class={{content.name}}></span>
{{/if}} {{/if}}
{{content.displayName}} {{content.displayName}}
</a> </a>

2
app/assets/javascripts/discourse/templates/components/reviewable-histories.hbs
View File

@ -19,11 +19,9 @@
{{/user-link}} {{/user-link}}
</td> </td>
<td>{{format-date rh.created_at format="medium"}}</td> <td>{{format-date rh.created_at format="medium"}}</td>
</tr> </tr>
{{/unless}} {{/unless}}
{{/each}} {{/each}}
</tbody> </tbody>
</table> </table>
{{/if}} {{/if}}

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

@ -10,8 +10,10 @@
<nav id='topic-progress' title={{i18n 'topic.progress.title'}} class={{if hideProgress 'hidden'}}> <nav id='topic-progress' title={{i18n 'topic.progress.title'}} class={{if hideProgress 'hidden'}}>
<div class='nums'> <div class='nums'>
<h4>{{progressPosition}}</h4><span class={{if hugeNumberOfPosts 'hidden'}}> <h4>{{progressPosition}}</h4>
<span class={{if hugeNumberOfPosts 'hidden'}}>
<span>/</span> <span>/</span>
<h4>{{postStream.filteredPostsCount}}</h4></span> <h4>{{postStream.filteredPostsCount}}</h4>
</span>
</div> </div>
</nav> </nav>

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

@ -153,8 +153,10 @@
<div class="card-row"> <div class="card-row">
<div class="location-and-website"> <div class="location-and-website">
{{#if user.location}} {{#if user.location}}
<span class='location'>{{d-icon "map-marker-alt"}} <span class='location'>
<span>{{user.location}}</span></span> {{d-icon "map-marker-alt"}}
<span>{{user.location}}</span>
</span>
{{/if}} {{/if}}
{{#if user.website_name}} {{#if user.website_name}}
<span class='website-name'> <span class='website-name'>

7
app/assets/javascripts/discourse/templates/components/user-fields/dropdown.hbs
View File

@ -1,5 +1,10 @@
<label class="control-label" for={{concat 'user-' elementId}}>{{html-safe field.name}} {{#if field.required}}<span class='required'>*</span>{{/if}} <label class="control-label" for={{concat 'user-' elementId}}>
{{html-safe field.name}}
{{#if field.required}}
<span class='required'>*</span>
{{/if}}
</label> </label>
<div class='controls'> <div class='controls'>
{{combo-box {{combo-box
id=(concat 'user-' elementId) id=(concat 'user-' elementId)

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

@ -46,7 +46,8 @@
</p> </p>
{{#each item.children as |child|}} {{#each item.children as |child|}}
<div class='user-stream-item-actions child-actions'>{{!-- DEPRECATED: 'child-actions' class --}} {{!-- DEPRECATED: 'child-actions' class --}}
<div class='user-stream-item-actions child-actions'>
{{d-icon child.icon class="icon"}} {{d-icon child.icon class="icon"}}
{{#each child.items as |grandChild|}} {{#each child.items as |grandChild|}}
{{#if grandChild.removableBookmark}} {{#if grandChild.removableBookmark}}
@ -54,7 +55,8 @@
class="btn-default remove-bookmark" class="btn-default remove-bookmark"
action=(action removeBookmark grandChild) action=(action removeBookmark grandChild)
icon="times" icon="times"
label="bookmarks.remove"}} label="bookmarks.remove"
}}
{{else}} {{else}}
<a href={{grandChild.userUrl}} data-user-card={{grandChild.username}} class='avatar-link'><div class='avatar-wrapper'>{{avatar grandChild imageSize="tiny" extraClasses="actor" ignoreTitle="true" avatarTemplatePath="acting_avatar_template"}}</div></a> <a href={{grandChild.userUrl}} data-user-card={{grandChild.username}} class='avatar-link'><div class='avatar-wrapper'>{{avatar grandChild imageSize="tiny" extraClasses="actor" ignoreTitle="true" avatarTemplatePath="acting_avatar_template"}}</div></a>
{{#if grandChild.edit_reason}} &mdash; <span class="edit-reason">{{grandChild.edit_reason}}</span>{{/if}} {{#if grandChild.edit_reason}} &mdash; <span class="edit-reason">{{grandChild.edit_reason}}</span>{{/if}}

19
app/assets/javascripts/discourse/templates/group-index.hbs
View File

@ -1,11 +1,12 @@
<section class="user-content"> <section class="user-content">
<div class="group-members-actions">
<div class="group-members-actions">
{{#if model.can_see_members}} {{#if model.can_see_members}}
{{text-field value=filterInput {{text-field
value=filterInput
placeholderKey=filterPlaceholder placeholderKey=filterPlaceholder
autocomplete="discourse" autocomplete="discourse"
class="group-username-filter no-blur"}} class="group-username-filter no-blur"
}}
{{/if}} {{/if}}
<div class="group-members-manage"> <div class="group-members-manage">
@ -22,9 +23,9 @@
{{/if}} {{/if}}
{{/if}} {{/if}}
</div> </div>
</div> </div>
{{#if hasMembers}} {{#if hasMembers}}
{{#load-more selector=".group-members tr" action=(action "loadMore")}} {{#load-more selector=".group-members tr" action=(action "loadMore")}}
<table class='group-members'> <table class='group-members'>
<thead> <thead>
@ -76,13 +77,13 @@
{{/load-more}} {{/load-more}}
{{conditional-loading-spinner condition=loading}} {{conditional-loading-spinner condition=loading}}
{{else if model.can_see_members}} {{else if model.can_see_members}}
<br> <br>
<div>{{i18n "groups.empty.members"}}</div> <div>{{i18n "groups.empty.members"}}</div>
{{else}} {{else}}
<br> <br>
<div>{{i18n "groups.members.forbidden"}}</div> <div>{{i18n "groups.members.forbidden"}}</div>
{{/if}} {{/if}}
</section> </section>

16
app/assets/javascripts/discourse/templates/group-requests.hbs
View File

@ -1,12 +1,14 @@
<section class="user-content"> <section class="user-content">
<div class="group-members-actions"> <div class="group-members-actions">
{{text-field value=filterInput {{text-field
value=filterInput
placeholderKey=filterPlaceholder placeholderKey=filterPlaceholder
class="group-username-filter no-blur"}} class="group-username-filter no-blur"
</div> }}
</div>
{{#if hasRequesters}} {{#if hasRequesters}}
{{#load-more selector=".group-members tr" action=(action "loadMore")}} {{#load-more selector=".group-members tr" action=(action "loadMore")}}
<table class='group-members'> <table class='group-members'>
<thead> <thead>
@ -48,8 +50,8 @@
{{/load-more}} {{/load-more}}
{{conditional-loading-spinner condition=loading}} {{conditional-loading-spinner condition=loading}}
{{else}} {{else}}
<div>{{i18n "groups.empty.requests"}}</div> <div>{{i18n "groups.empty.requests"}}</div>
{{/if}} {{/if}}
</section> </section>

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

@ -53,13 +53,12 @@
{{/if}} {{/if}}
</div> </div>
</div> </div>
<div class="user-content-wrapper"> <div class="user-content-wrapper">
<section class="user-primary-navigation"> <section class="user-primary-navigation">
<div class="container"> <div class="container">
{{group-navigation group=model currentPath=currentPath tabs=tabs}} {{group-navigation group=model currentPath=currentPath tabs=tabs}}
</div> </div>
</section> </section>
{{outlet}} {{outlet}}
</div> </div>
</div> </div>

4
app/assets/javascripts/discourse/templates/group/activity.hbs
View File

@ -1,4 +1,4 @@
<section class="user-secondary-navigation"> <section class="user-secondary-navigation">
{{#mobile-nav class='activity-nav' desktopClass='action-list activity-list nav-stacked' currentPath=router._router.currentPath}} {{#mobile-nav class='activity-nav' desktopClass='action-list activity-list nav-stacked' currentPath=router._router.currentPath}}
{{#if model.can_see_members}} {{#if model.can_see_members}}
{{group-activity-filter filter="posts" categoryId=category_id}} {{group-activity-filter filter="posts" categoryId=category_id}}
@ -12,4 +12,4 @@
</section> </section>
<section class="user-content"> <section class="user-content">
{{outlet}} {{outlet}}
</section> </section>

2
app/assets/javascripts/discourse/templates/group/manage.hbs
View File

@ -11,4 +11,4 @@
</section> </section>
<section class="user-content"> <section class="user-content">
{{outlet}} {{outlet}}
</section> </section>

3
app/assets/javascripts/discourse/templates/group/messages.hbs
View File

@ -1,6 +1,5 @@
<section class="user-secondary-navigation"> <section class="user-secondary-navigation">
{{#mobile-nav class='messages-nav' desktopClass='nav-stacked action-list' currentPath=router._router.currentPath}} {{#mobile-nav class='messages-nav' desktopClass='nav-stacked action-list' currentPath=router._router.currentPath}}
<li> <li>
{{#link-to 'group.messages.inbox' model.name}} {{#link-to 'group.messages.inbox' model.name}}
{{i18n 'user.messages.inbox'}} {{i18n 'user.messages.inbox'}}

14
app/assets/javascripts/discourse/templates/invites/show.hbs
View File

@ -1,5 +1,4 @@
<div class="container invites-show clearfix"> <div class="container invites-show clearfix">
<h2>{{welcomeTitle}}</h2> <h2>{{welcomeTitle}}</h2>
<div class="two-col"> <div class="two-col">
@ -10,12 +9,15 @@
<div class="col-form"> <div class="col-form">
{{#if successMessage}} {{#if successMessage}}
<br><br> <br><br>
<div class='alert alert-info'><p>{{html-safe successMessage}}</p></div> <div class='alert alert-info'>
<p>{{html-safe successMessage}}</p>
</div>
{{else}} {{else}}
<p>{{i18n 'invites.invited_by'}}</p> <p>{{i18n 'invites.invited_by'}}</p>
<p>{{user-info user=invitedBy}}</p> <p>{{user-info user=invitedBy}}</p>
<p>{{html-safe yourEmailMessage}} <p>
{{html-safe yourEmailMessage}}
{{#if externalAuthsEnabled}} {{#if externalAuthsEnabled}}
{{i18n 'invites.social_login_available'}} {{i18n 'invites.social_login_available'}}
{{/if}} {{/if}}
@ -44,7 +46,8 @@
<div class="instructions"> <div class="instructions">
{{passwordInstructions}} {{i18n 'invites.optional_description'}} {{passwordInstructions}} {{i18n 'invites.optional_description'}}
<div class="caps-lock-warning {{unless capsLockOn 'invisible'}}"> <div class="caps-lock-warning {{unless capsLockOn 'invisible'}}">
{{d-icon "exclamation-triangle"}} {{i18n 'login.caps_lock_warning'}}</div> {{d-icon "exclamation-triangle"}} {{i18n 'login.caps_lock_warning'}}
</div>
</div> </div>
</div> </div>
@ -61,7 +64,8 @@
action=(action "submit") action=(action "submit")
type="submit" type="submit"
disabled=submitDisabled disabled=submitDisabled
label="invites.accept_invite"}} label="invites.accept_invite"
}}
{{#if errorMessage}} {{#if errorMessage}}
<br><br> <br><br>

14
app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
View File

@ -16,9 +16,11 @@
<div class='main-link'> <div class='main-link'>
{{topic-status topic=t}} {{topic-status topic=t}}
{{topic-link t}} {{topic-link t}}
{{raw "list/unread-indicator" includeUnreadIndicator=showUnreadIndicator {{raw "list/unread-indicator"
includeUnreadIndicator=showUnreadIndicator
topicId=t.id topicId=t.id
unreadClass=(if t.unread_by_group_member "" "read")}} unreadClass=(if t.unread_by_group_member "" "read")
}}
{{#if t.unseen}} {{#if t.unseen}}
<span class="badge-notification new-topic"></span> <span class="badge-notification new-topic"></span>
{{/if}} {{/if}}
@ -26,10 +28,14 @@
<div class="topic-excerpt"> <div class="topic-excerpt">
{{html-safe t.excerpt}} {{html-safe t.excerpt}}
{{#if t.excerptTruncated}} {{#if t.excerptTruncated}}
{{#unless t.canClearPin}}<a href={{t.url}}>{{i18n 'read_more'}}</a>{{/unless}} {{#unless t.canClearPin}}
<a href={{t.url}}>{{i18n 'read_more'}}</a>
{{/unless}}
{{/if}} {{/if}}
{{#if t.canClearPin}} {{#if t.canClearPin}}
<a href {{action "clearPin" t}} title={{i18n 'topic.clear_pin.help'}}>{{i18n 'topic.clear_pin.title'}}</a> <a href {{action "clearPin" t}} title={{i18n 'topic.clear_pin.help'}}>
{{i18n 'topic.clear_pin.title'}}
</a>
{{/if}} {{/if}}
</div> </div>
{{/if}} {{/if}}

21
app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs
View File

@ -9,7 +9,6 @@
{{category-title-link category=c}} {{category-title-link category=c}}
</th> </th>
</tr> </tr>
{{#unless c.isMuted}} {{#unless c.isMuted}}
{{#if c.description_excerpt}} {{#if c.description_excerpt}}
<tr class="category-description"> <tr class="category-description">
@ -18,13 +17,11 @@
</td> </td>
</tr> </tr>
{{/if}} {{/if}}
{{#if showTopics}} {{#if showTopics}}
{{#each c.topics as |t|}} {{#each c.topics as |t|}}
{{mobile-category-topic topic=t}} {{mobile-category-topic topic=t}}
{{/each}} {{/each}}
{{/if}} {{/if}}
{{#if c.isGrandParent}} {{#if c.isGrandParent}}
{{#each c.subcategories as |subcategory|}} {{#each c.subcategories as |subcategory|}}
<tr data-category-id={{c.id}} class='subcategory-list-item category' style={{border-color subcategory.color}}> <tr data-category-id={{c.id}} class='subcategory-list-item category' style={{border-color subcategory.color}}>
@ -61,16 +58,22 @@
</tbody> </tbody>
</table> </table>
<footer class="clearfix"> <footer class="clearfix">
<figure title={{i18n 'all_time_desc'}}>{{number c.topics_all_time}} <figcaption>{{i18n 'all_time'}}</figcaption></figure> <figure title={{i18n 'all_time_desc'}}>
{{number c.topics_all_time}}
<figcaption>{{i18n 'all_time'}}</figcaption>
</figure>
{{#if c.pickMonth}} {{#if c.pickMonth}}
<figure title={{i18n 'month_desc'}}>{{number c.topics_month}} <figcaption>/ {{i18n 'month'}}</figcaption></figure> <figure title={{i18n 'month_desc'}}>
{{number c.topics_month}}
<figcaption>/ {{i18n 'month'}}</figcaption>
</figure>
{{/if}} {{/if}}
{{#if c.pickWeek}} {{#if c.pickWeek}}
<figure title={{i18n 'week_desc'}}>{{number c.topics_week}} <figcaption>/ {{i18n 'week'}}</figcaption></figure> <figure title={{i18n 'week_desc'}}>
{{number c.topics_week}}
<figcaption>/ {{i18n 'week'}}</figcaption>
</figure>
{{/if}} {{/if}}
</footer> </footer>
</div> </div>
{{/each}} {{/each}}

19
app/assets/javascripts/discourse/templates/mobile/group-index.hbs
View File

@ -1,10 +1,12 @@
<section class="user-content"> <section class="user-content">
{{text-field value=filterInput {{text-field
value=filterInput
placeholderKey=filterPlaceholder placeholderKey=filterPlaceholder
autocomplete="discourse" autocomplete="discourse"
class="group-username-filter no-blur"}} class="group-username-filter no-blur"
}}
<div class="group-members-manage"> <div class="group-members-manage">
{{#if canManageGroup}} {{#if canManageGroup}}
{{#if currentUser.admin}} {{#if currentUser.admin}}
{{group-members-dropdown {{group-members-dropdown
@ -16,12 +18,13 @@
icon="plus" icon="plus"
label="groups.add_members.title" label="groups.add_members.title"
class="group-members-add" class="group-members-add"
action=(route-action "showAddMembersModal")}} action=(route-action "showAddMembersModal")
}}
{{/if}} {{/if}}
{{/if}} {{/if}}
</div> </div>
{{#if hasMembers}} {{#if hasMembers}}
{{#load-more selector=".group-members .user-info" action=(action "loadMore")}} {{#load-more selector=".group-members .user-info" action=(action "loadMore")}}
<div class="group-members"> <div class="group-members">
{{#each model.members as |user|}} {{#each model.members as |user|}}
@ -52,9 +55,9 @@
{{/load-more}} {{/load-more}}
{{conditional-loading-spinner condition=loading}} {{conditional-loading-spinner condition=loading}}
{{else}} {{else}}
<br> <br>
<div>{{i18n "groups.empty.members"}}</div> <div>{{i18n "groups.empty.members"}}</div>
{{/if}} {{/if}}
</section> </section>

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

@ -55,13 +55,17 @@
</tr> </tr>
{{/if}} {{/if}}
{{plugin-outlet name="create-account-before-password" {{plugin-outlet
name="create-account-before-password"
noTags=true noTags=true
args=(hash accountName=accountName args=(hash
accountName=accountName
accountUsername=accountUsername accountUsername=accountUsername
accountPassword=accountPassword accountPassword=accountPassword
userFields=userFields userFields=userFields
authOptions=authOptions)}} authOptions=authOptions
)
}}
{{#if passwordRequired}} {{#if passwordRequired}}
<tr class="input"> <tr class="input">
@ -76,7 +80,8 @@
<td> <td>
<label>{{passwordInstructions}}</label> <label>{{passwordInstructions}}</label>
<div class="caps-lock-warning {{unless capsLockOn 'hidden'}}"> <div class="caps-lock-warning {{unless capsLockOn 'hidden'}}">
{{d-icon "exclamation-triangle"}} {{i18n 'login.caps_lock_warning'}}</div> {{d-icon "exclamation-triangle"}} {{i18n 'login.caps_lock_warning'}}
</div>
</td> </td>
</tr> </tr>
{{/if}} {{/if}}
@ -95,17 +100,20 @@
<td> <td>
{{input value=inviteCode id="inviteCode"}} {{input value=inviteCode id="inviteCode"}}
</td> </td>
<td><label>{{i18n 'user.invite_code.instructions'}}</label></td> <td><label>{{i18n 'user.invite_code.instructions'}}</label></td>
</tr> </tr>
{{/if}} {{/if}}
{{plugin-outlet name="create-account-after-password" {{plugin-outlet
name="create-account-after-password"
noTags=true noTags=true
args=(hash accountName=accountName args=(hash
accountName=accountName
accountUsername=accountUsername accountUsername=accountUsername
accountPassword=accountPassword accountPassword=accountPassword
userFields=userFields)}} userFields=userFields
)
}}
</tbody> </tbody>
</table> </table>
@ -116,11 +124,9 @@
{{/each}} {{/each}}
</div> </div>
{{/if}} {{/if}}
</form> </form>
</div> </div>
{{/if}} {{/if}}
{{/d-modal-body}} {{/d-modal-body}}
{{#if showCreateForm}} {{#if showCreateForm}}
@ -129,7 +135,8 @@
class="btn-large btn-primary" class="btn-large btn-primary"
action=(action "createAccount") action=(action "createAccount")
disabled=submitDisabled disabled=submitDisabled
label="create_account.title"}} label="create_account.title"
}}
{{#conditional-loading-spinner condition=formSubmitted size="small"}} {{#conditional-loading-spinner condition=formSubmitted size="small"}}
{{#d-button class="btn-large" id="login-link" action=(route-action "showLogin")}} {{#d-button class="btn-large" id="login-link" action=(route-action "showLogin")}}
@ -141,7 +148,6 @@
</div> </div>
{{plugin-outlet name="create-account-after-modal-footer" tagName=""}} {{plugin-outlet name="create-account-after-modal-footer" tagName=""}}
{{/if}} {{/if}}
{{/unless}} {{/unless}}
{{/create-account}} {{/create-account}}

18
app/assets/javascripts/discourse/templates/modal/flag.hbs
View File

@ -1,13 +1,15 @@
{{#d-modal-body class="flag-modal-body" title=title}} {{#d-modal-body class="flag-modal-body" title=title}}
<form> <form>
{{#flag-selection nameKey=selected.name_key flags=flagsAvailable as |f|}} {{#flag-selection nameKey=selected.name_key flags=flagsAvailable as |f|}}
{{flag-action-type flag=f {{flag-action-type
flag=f
message=message message=message
isWarning=isWarning isWarning=isWarning
selectedFlag=selected selectedFlag=selected
username=model.username username=model.username
staffFlagsAvailable=staffFlagsAvailable staffFlagsAvailable=staffFlagsAvailable
changePostActionType=(action "changePostActionType")}} changePostActionType=(action "changePostActionType")
}}
{{/flag-selection}} {{/flag-selection}}
</form> </form>
{{/d-modal-body}} {{/d-modal-body}}
@ -19,7 +21,8 @@
disabled=submitDisabled disabled=submitDisabled
title="flagging.submit_tooltip" title="flagging.submit_tooltip"
icon=submitIcon icon=submitIcon
label=submitLabel}} label=submitLabel
}}
{{#if canSendWarning}} {{#if canSendWarning}}
{{d-button {{d-button
@ -27,7 +30,8 @@
action=(action "createFlagAsWarning") action=(action "createFlagAsWarning")
disabled=submitDisabled disabled=submitDisabled
icon="exclamation-triangle" icon="exclamation-triangle"
label="flagging.official_warning"}} label="flagging.official_warning"
}}
{{/if}} {{/if}}
{{#if canTakeAction}} {{#if canTakeAction}}
@ -37,7 +41,8 @@
disabled=submitDisabled disabled=submitDisabled
title="flagging.take_action_tooltip" title="flagging.take_action_tooltip"
icon="gavel" icon="gavel"
label="flagging.take_action"}} label="flagging.take_action"
}}
{{/if}} {{/if}}
{{#if showDeleteSpammer}} {{#if showDeleteSpammer}}
@ -46,6 +51,7 @@
action=(action "deleteSpammer") action=(action "deleteSpammer")
disabled=submitDisabled disabled=submitDisabled
icon="exclamation-triangle" icon="exclamation-triangle"
label="flagging.delete_spammer"}} label="flagging.delete_spammer"
}}
{{/if}} {{/if}}
</div> </div>

4
app/assets/javascripts/discourse/templates/modal/second-factor-backup-edit.hbs
View File

@ -1,5 +1,5 @@
{{#d-modal-body}} {{#d-modal-body}}
<section class="user-preferences solo-preference second-factor-backup-preferences"> <section class="user-preferences solo-preference second-factor-backup-preferences">
<form class="form-horizontal"> <form class="form-horizontal">
{{#if successMessage}} {{#if successMessage}}
<div class="alert alert-success"> <div class="alert alert-success">
@ -47,5 +47,5 @@
{{/if}} {{/if}}
{{/conditional-loading-section}} {{/conditional-loading-section}}
</form> </form>
</section> </section>
{{/d-modal-body}} {{/d-modal-body}}

13
app/assets/javascripts/discourse/templates/modal/second-factor-edit-security-key.hbs
View File

@ -5,11 +5,14 @@
<div class='second-factor instructions'> <div class='second-factor instructions'>
{{i18n 'user.second_factor.security_key.edit_description'}} {{i18n 'user.second_factor.security_key.edit_description'}}
</div> </div>
{{d-button action=(action "editSecurityKey") {{d-button
action=(action "editSecurityKey")
class="btn-primary" class="btn-primary"
label="user.second_factor.security_key.edit"}} label="user.second_factor.security_key.edit"
}}
{{d-button action=(action "disableSecurityKey") {{d-button
action=(action "disableSecurityKey")
class="btn-danger" class="btn-danger"
label="user.second_factor.security_key.delete"}} label="user.second_factor.security_key.delete"
}}
{{/d-modal-body}} {{/d-modal-body}}

13
app/assets/javascripts/discourse/templates/modal/second-factor-edit.hbs
View File

@ -5,11 +5,14 @@
<div class='second-factor instructions'> <div class='second-factor instructions'>
{{i18n 'user.second_factor.edit_description'}} {{i18n 'user.second_factor.edit_description'}}
</div> </div>
{{d-button action=(action "editSecondFactor") {{d-button
action=(action "editSecondFactor")
class="btn-primary" class="btn-primary"
label="user.second_factor.edit"}} label="user.second_factor.edit"
}}
{{d-button action=(action "disableSecondFactor") {{d-button
action=(action "disableSecondFactor")
class="btn-danger" class="btn-danger"
label="user.second_factor.disable"}} label="user.second_factor.disable"
}}
{{/d-modal-body}} {{/d-modal-body}}

3
app/assets/javascripts/discourse/templates/password-reset.hbs
View File

@ -53,7 +53,8 @@
<div class="instructions"> <div class="instructions">
<div class="caps-lock-warning {{unless capsLockOn 'invisible'}}"> <div class="caps-lock-warning {{unless capsLockOn 'invisible'}}">
{{d-icon "exclamation-triangle"}} {{i18n 'login.caps_lock_warning'}}</div> {{d-icon "exclamation-triangle"}} {{i18n 'login.caps_lock_warning'}}
</div>
</div> </div>
{{d-button action=(action "submit") class='btn-primary' label='user.change_password.set_password' type='submit'}} {{d-button action=(action "submit") class='btn-primary' label='user.change_password.set_password' type='submit'}}

1
app/assets/javascripts/discourse/templates/preferences-second-factor.hbs
View File

@ -1,7 +1,6 @@
<section class='user-preferences solo-preference second-factor'> <section class='user-preferences solo-preference second-factor'>
{{#conditional-loading-spinner condition=loading}} {{#conditional-loading-spinner condition=loading}}
<form class="form-horizontal"> <form class="form-horizontal">
{{#if showEnforcedNotice}} {{#if showEnforcedNotice}}
<div class="control-group"> <div class="control-group">
<div class="controls"> <div class="controls">

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

@ -4,7 +4,8 @@
<span class='static'>{{model.username}}</span> <span class='static'>{{model.username}}</span>
{{#if model.can_edit_username}} {{#if model.can_edit_username}}
{{#link-to "preferences.username" class="btn btn-default btn-small btn-icon pad-left no-text"}} {{#link-to "preferences.username" class="btn btn-default btn-small btn-icon pad-left no-text"}}
{{d-icon "pencil-alt"}} {{/link-to}} {{d-icon "pencil-alt"}}
{{/link-to}}
{{/if}} {{/if}}
</div> </div>
{{#if siteSettings.enable_mentions}} {{#if siteSettings.enable_mentions}}
@ -66,7 +67,7 @@
{{/if}} {{/if}}
{{#if canChangePassword}} {{#if canChangePassword}}
<div class="control-group pref-password"> <div class="control-group pref-password">
<label class="control-label">{{i18n 'user.password.title'}}</label> <label class="control-label">{{i18n 'user.password.title'}}</label>
<div class="controls"> <div class="controls">
<a href {{action "changePassword"}} class='btn btn-default'> <a href {{action "changePassword"}} class='btn btn-default'>
@ -80,9 +81,9 @@
{{passwordProgress}} {{passwordProgress}}
</div> </div>
</div> </div>
<div class="control-group pref-second-factor"> <div class="control-group pref-second-factor">
<label class="control-label">{{i18n 'user.second_factor.title'}}</label> <label class="control-label">{{i18n 'user.second_factor.title'}}</label>
{{#unless model.second_factor_enabled}} {{#unless model.second_factor_enabled}}
<label> <label>
@ -96,7 +97,7 @@
{{/link-to}} {{/link-to}}
{{/if}} {{/if}}
</div> </div>
</div> </div>
{{/if}} {{/if}}
{{#if canUpdateAssociatedAccounts}} {{#if canUpdateAssociatedAccounts}}

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

@ -1,5 +1,5 @@
{{#if model.userApiKeys}} {{#if model.userApiKeys}}
<div class="control-group apps"> <div class="control-group apps">
<label class="control-label">{{i18n 'user.apps'}}</label> <label class="control-label">{{i18n 'user.apps'}}</label>
<div class="controls"> <div class="controls">
{{#each model.userApiKeys as |key|}} {{#each model.userApiKeys as |key|}}
@ -22,7 +22,7 @@
</div> </div>
{{/each}} {{/each}}
</div> </div>
</div> </div>
{{/if}} {{/if}}
{{plugin-outlet name="user-preferences-apps" args=(hash model=model)}} {{plugin-outlet name="user-preferences-apps" args=(hash model=model)}}

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

@ -1,5 +1,5 @@
{{#if showThemeSelector}} {{#if showThemeSelector}}
<div class="control-group theme"> <div class="control-group theme">
<label class="control-label">{{i18n 'user.theme'}}</label> <label class="control-label">{{i18n 'user.theme'}}</label>
<div class="controls"> <div class="controls">
{{combo-box {{combo-box
@ -13,7 +13,7 @@
{{preference-checkbox labelKey="user.theme_default_on_all_devices" checked=makeThemeDefault}} {{preference-checkbox labelKey="user.theme_default_on_all_devices" checked=makeThemeDefault}}
</div> </div>
{{/if}} {{/if}}
</div> </div>
{{/if}} {{/if}}
<div class="control-group text-size"> <div class="control-group text-size">

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

@ -1,10 +1,10 @@
{{#if canChangeBio}} {{#if canChangeBio}}
<div class="control-group pref-bio"> <div class="control-group pref-bio">
<label class="control-label">{{i18n 'user.bio'}}</label> <label class="control-label">{{i18n 'user.bio'}}</label>
<div class="controls bio-composer input-xxlarge"> <div class="controls bio-composer input-xxlarge">
{{d-editor value=model.bio_raw}} {{d-editor value=model.bio_raw}}
</div> </div>
</div> </div>
{{/if}} {{/if}}
<div class="control-group pref-timezone"> <div class="control-group pref-timezone">
@ -67,7 +67,9 @@
<label class="control-label">{{i18n 'user.featured_topic'}}</label> <label class="control-label">{{i18n 'user.featured_topic'}}</label>
{{#if model.featured_topic}} {{#if model.featured_topic}}
<label class="featured-topic-link"> <label class="featured-topic-link">
{{#link-to "topic" model.featured_topic.slug model.featured_topic.id}}{{html-safe (replace-emoji model.featured_topic.fancy_title)}}{{/link-to}} {{#link-to "topic" model.featured_topic.slug model.featured_topic.id}}
{{html-safe (replace-emoji model.featured_topic.fancy_title)}}
{{/link-to}}
</label> </label>
{{/if}} {{/if}}

25
app/assets/javascripts/discourse/templates/preferences/tags.hbs
View File

@ -1,6 +1,5 @@
{{#if siteSettings.tagging_enabled}} {{#if siteSettings.tagging_enabled}}
<div class="control-group tag-notifications"> <div class="control-group tag-notifications">
<label class="control-label">{{i18n 'user.tag_settings'}}</label> <label class="control-label">{{i18n 'user.tag_settings'}}</label>
<div class="controls tracking-controls"> <div class="controls tracking-controls">
@ -11,8 +10,10 @@
filterPlaceholder="select_kit.filter_placeholder" filterPlaceholder="select_kit.filter_placeholder"
allowCreate=false allowCreate=false
everyTag=true everyTag=true
unlimitedTagCount=true}} unlimitedTagCount=true
}}
</div> </div>
<div class="instructions">{{i18n 'user.watched_tags_instructions'}}</div> <div class="instructions">{{i18n 'user.watched_tags_instructions'}}</div>
<div class="controls tracking-controls"> <div class="controls tracking-controls">
@ -25,6 +26,7 @@
everyTag=true everyTag=true
unlimitedTagCount=true}} unlimitedTagCount=true}}
</div> </div>
<div class="instructions">{{i18n 'user.tracked_tags_instructions'}}</div> <div class="instructions">{{i18n 'user.tracked_tags_instructions'}}</div>
<div class="controls tracking-controls"> <div class="controls tracking-controls">
@ -37,7 +39,10 @@
everyTag=true everyTag=true
unlimitedTagCount=true}} unlimitedTagCount=true}}
</div> </div>
<div class="instructions">{{i18n 'user.watched_first_post_tags_instructions'}}</div>
<div class="instructions">
{{i18n 'user.watched_first_post_tags_instructions'}}
</div>
<div class="controls tracking-controls"> <div class="controls tracking-controls">
<label>{{d-icon "d-muted" class="icon muted"}} {{i18n 'user.muted_tags'}}</label> <label>{{d-icon "d-muted" class="icon muted"}} {{i18n 'user.muted_tags'}}</label>
@ -50,15 +55,13 @@
unlimitedTagCount=true}} unlimitedTagCount=true}}
</div> </div>
<div class="instructions">{{i18n 'user.muted_tags_instructions'}}</div> <div class="instructions">{{i18n 'user.muted_tags_instructions'}}</div>
</div>
</div> {{plugin-outlet name="user-preferences-tags" args=(hash model=model save=(action "save"))}}
{{plugin-outlet name="user-preferences-tags" args=(hash model=model save=(action "save"))}} <br>
<br> {{plugin-outlet name="user-custom-controls" args=(hash model=model)}}
{{plugin-outlet name="user-custom-controls" args=(hash model=model)}}
{{save-controls model=model action=(action "save") saved=saved}}
{{save-controls model=model action=(action "save") saved=saved}}
{{/if}} {{/if}}

20
app/assets/javascripts/discourse/templates/tags/show.hbs
View File

@ -5,13 +5,13 @@
<div class="list-controls"> <div class="list-controls">
<div class="container"> <div class="container">
<section class="navigation-container"> <section class="navigation-container">
{{#if showTagFilter}} {{#if showTagFilter}}
{{bread-crumbs categories=categories {{bread-crumbs
categories=categories
category=category category=category
tagId=tag.id tagId=tag.id
noSubcategories=noSubcategories}} noSubcategories=noSubcategories
}}
{{navigation-bar navItems=navItems filterMode=filterMode}} {{navigation-bar navItems=navItems filterMode=filterMode}}
{{else}} {{else}}
<h2 class="tag-show-heading"> <h2 class="tag-show-heading">
@ -38,7 +38,8 @@
canCreateTopic=canCreateTopic canCreateTopic=canCreateTopic
disabled=createTopicDisabled disabled=createTopicDisabled
label=createTopicLabel label=createTopicLabel
action=(route-action "createTopic")}} action=(route-action "createTopic")
}}
{{#if showToggleInfo}} {{#if showToggleInfo}}
{{d-button icon="tag" label="tagging.info" action=(action "toggleInfo") id="show-tag-info"}} {{d-button icon="tag" label="tagging.info" action=(action "toggleInfo") id="show-tag-info"}}
@ -52,6 +53,7 @@
{{/if}} {{/if}}
{{plugin-outlet name="discovery-list-container-top"}} {{plugin-outlet name="discovery-list-container-top"}}
<div class="container list-container"> <div class="container list-container">
<div class="row"> <div class="row">
<div class="full-width"> <div class="full-width">
@ -60,8 +62,8 @@
{{#if list.topics}} {{#if list.topics}}
{{#discovery-topics-list model=list refresh=(action "refresh")}} {{#discovery-topics-list model=list refresh=(action "refresh")}}
{{bulk-select-button selected=selected action=(action "refresh")}} {{bulk-select-button selected=selected action=(action "refresh")}}
{{topic-list
{{topic-list topics=list.topics topics=list.topics
canBulkSelect=canBulkSelect canBulkSelect=canBulkSelect
toggleBulkSelect=(action "toggleBulkSelect") toggleBulkSelect=(action "toggleBulkSelect")
bulkSelectEnabled=bulkSelectEnabled bulkSelectEnabled=bulkSelectEnabled
@ -69,8 +71,8 @@
showPosters=true showPosters=true
order=order order=order
ascending=ascending ascending=ascending
changeSort=(action "changeSort")}} changeSort=(action "changeSort")
}}
{{/discovery-topics-list}} {{/discovery-topics-list}}
{{else}} {{else}}
<footer class='topic-list-bottom'> <footer class='topic-list-bottom'>

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

@ -1,7 +1,6 @@
{{plugin-outlet name="above-user-profile" tagName='' args=(hash model=model)}} {{plugin-outlet name="above-user-profile" tagName='' args=(hash model=model)}}
<div class="container {{if viewingSelf 'viewing-self'}}"> <div class="container {{if viewingSelf 'viewing-self'}}">
{{#d-section class="user-main"}} {{#d-section class="user-main"}}
<section class="{{if collapsedInfo 'collapsed-info'}} about {{if hasProfileBackgroundUrl 'has-background' 'no-background'}}" > <section class="{{if collapsedInfo 'collapsed-info'}} about {{if hasProfileBackgroundUrl 'has-background' 'no-background'}}" >
{{#unless collapsedInfo}} {{#unless collapsedInfo}}
{{#if showStaffCounters}} {{#if showStaffCounters}}
@ -45,7 +44,6 @@
{{/if}} {{/if}}
<div class="user-profile-image" style={{model.profileBackgroundUrl}}></div> <div class="user-profile-image" style={{model.profileBackgroundUrl}}></div>
{{/unless}} {{/unless}}
<div class='details'> <div class='details'>
<div class='primary'> <div class='primary'>
{{user-profile-avatar user=model tagName=""}} {{user-profile-avatar user=model tagName=""}}
@ -138,7 +136,8 @@
{{else}} {{else}}
{{i18n 'user.suspended_notice' date=model.suspendedTillDate}} {{i18n 'user.suspended_notice' date=model.suspendedTillDate}}
{{/if}} {{/if}}
</b><br> </b>
<br>
{{#if model.suspend_reason}} {{#if model.suspend_reason}}
<b>{{i18n 'user.suspended_reason'}}</b> {{model.suspend_reason}} <b>{{i18n 'user.suspended_reason'}}</b> {{model.suspend_reason}}
{{/if}} {{/if}}
@ -201,7 +200,6 @@
</dd> </dd>
</div> </div>
{{/if}} {{/if}}
{{#if model.displayGroups}} {{#if model.displayGroups}}
<div><dt class="groups">{{i18n 'groups.title' count=model.displayGroups.length}}</dt> <div><dt class="groups">{{i18n 'groups.title' count=model.displayGroups.length}}</dt>
<dd class='groups'> <dd class='groups'>
@ -224,12 +222,8 @@
</div> </div>
{{/unless}} {{/unless}}
</div> </div>
</section> </section>
<div class='user-content-wrapper'> <div class='user-content-wrapper'>
<section class="user-primary-navigation"> <section class="user-primary-navigation">
{{#mobile-nav class='main-nav' desktopClass="nav nav-pills user-nav" currentPath=currentPath}} {{#mobile-nav class='main-nav' desktopClass="nav nav-pills user-nav" currentPath=currentPath}}
{{#unless model.profile_hidden}} {{#unless model.profile_hidden}}
@ -258,9 +252,7 @@
{{/if}} {{/if}}
{{/mobile-nav}} {{/mobile-nav}}
</section> </section>
{{outlet}} {{outlet}}
</div> </div>
{{/d-section}} {{/d-section}}
</div> </div>

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

@ -28,11 +28,12 @@
</li> </li>
{{/if}} {{/if}}
{{/if}} {{/if}}
{{plugin-outlet name="user-activity-bottom" {{plugin-outlet
name="user-activity-bottom"
connectorTagName='li' connectorTagName='li'
args=(hash model=model)}} args=(hash model=model)
}}
{{/mobile-nav}} {{/mobile-nav}}
{{/d-section}} {{/d-section}}
{{#if canDownloadPosts}} {{#if canDownloadPosts}}
<section class='user-additional-controls'> <section class='user-additional-controls'>

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

@ -56,9 +56,7 @@
{{/d-section}} {{/d-section}}
<section class='user-content'> <section class='user-content'>
<div class="list-actions">
<div class="list-actions">
{{#unless site.mobileView}} {{#unless site.mobileView}}
{{#if showToggleBulkSelect}} {{#if showToggleBulkSelect}}
{{d-button {{d-button
@ -106,7 +104,6 @@
onChange=(action "changeGroupNotificationLevel") onChange=(action "changeGroupNotificationLevel")
}} }}
{{/if}} {{/if}}
</div> </div>
{{outlet}}
{{outlet}}
</section> </section>

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

@ -32,15 +32,17 @@
{{/d-section}} {{/d-section}}
{{#if model}} {{#if model}}
<section class="user-additional-controls"> <section class="user-additional-controls">
{{d-button title='user.dismiss_notifications_tooltip' {{d-button
title='user.dismiss_notifications_tooltip'
class='btn btn-default dismiss-notifications' class='btn btn-default dismiss-notifications'
action=(action "resetNew") action=(action "resetNew")
label='user.dismiss_notifications' label='user.dismiss_notifications'
icon='check' icon='check'
disabled=allNotificationsRead}} disabled=allNotificationsRead
}}
</section> </section>
{{/if}} {{/if}}
<section class='user-content'> <section class='user-content'>
{{#load-more class="notification-history user-stream" selector=".user-stream .notification" action=(action "loadMore")}} {{#load-more class="notification-history user-stream" selector=".user-stream .notification" action=(action "loadMore")}}

2
app/assets/javascripts/discourse/templates/user/summary.hbs
View File

@ -1,5 +1,5 @@
{{#d-section pageClass="user-summary" tagName=""}} {{#d-section pageClass="user-summary" tagName=""}}
<div class="user-content"> <div class="user-content">
<div class='top-section stats-section'> <div class='top-section stats-section'>
<h3 class='stats-title'>{{i18n "user.summary.stats"}}</h3> <h3 class='stats-title'>{{i18n "user.summary.stats"}}</h3>
<ul> <ul>

9
app/assets/javascripts/wizard/templates/components/wizard-field-checkbox.hbs
View File

@ -1,7 +1,8 @@
<label> <label>
{{input type="checkbox" {{input
type="checkbox"
class="wizard-checkbox" class="wizard-checkbox"
checked=field.value}} checked=field.value
}}
{{field.placeholder}} {{field.placeholder}}
</label> </label>