DEV: Partial ‘block-indentation’ linting fixes
diff --git a/app/assets/javascripts/discourse/templates/components/user-fields/text.hbs b/app/assets/javascripts/discourse/templates/components/user-fields/text.hbs
index 1c33ea1..1518688 100644
--- a/app/assets/javascripts/discourse/templates/components/user-fields/text.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-fields/text.hbs
@@ -1,4 +1,6 @@
-<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>
<div class='controls'>
{{input id=(concat 'user-' elementId) value=value maxlength=site.user_field_max_length}}
diff --git a/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs b/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
index 0949b56..72ed944 100644
--- a/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
@@ -1,59 +1,59 @@
{{#conditional-loading-spinner condition=loading}}
{{#if hasIncoming}}
- <div class="show-mores">
- <a href class='alert alert-info clickable' {{action showInserted}}>
- {{count-i18n key="topic_count_" suffix="latest" count=incomingCount}}
- </a>
- </div>
+ <div class="show-mores">
+ <a href class='alert alert-info clickable' {{action showInserted}}>
+ {{count-i18n key="topic_count_" suffix="latest" count=incomingCount}}
+ </a>
+ </div>
{{/if}}
{{#if topics}}
<table class="topic-list">
<tbody>
- {{#each topics as |t|}}
- <tr class="topic-list-item {{if t.archived 'archived'}} {{if t.visited 'visited'}}" data-topic-id={{t.id}}>
- <td>
- <div class='main-link'>
- {{topic-status topic=t}}
- {{topic-link t}}
- {{raw "list/unread-indicator" includeUnreadIndicator=showUnreadIndicator
- topicId=t.id
- unreadClass=(if t.unread_by_group_member "" "read")}}
- {{#if t.unseen}}
- <span class="badge-notification new-topic"></span>
- {{/if}}
- {{#if t.hasExcerpt}}
- <div class="topic-excerpt">
- {{html-safe t.excerpt}}
- {{#if t.excerptTruncated}}
- {{#unless t.canClearPin}}<a href={{t.url}}>{{i18n 'read_more'}}</a>{{/unless}}
- {{/if}}
- {{#if t.canClearPin}}
- <a href {{action "clearPin" t}} title={{i18n 'topic.clear_pin.help'}}>{{i18n 'topic.clear_pin.title'}}</a>
- {{/if}}
- </div>
- {{/if}}
- </div>
- <div class='pull-right'>
- {{raw "list/post-count-or-badges" topic=t postBadgesEnabled="true"}}
- </div>
- <div class='clearfix'></div>
- <div class="topic-item-stats clearfix">
- {{discourse-tags t mode="list" tagsForUser=tagsForUser}}
- <div class="pull-right">
- {{raw "list/activity-column" topic=t tagName="div" class="num activity last"}}
- <a href={{t.lastPostUrl}} title='{{i18n 'last_post'}}: {{raw-date t.bumped_at}}'>{{t.last_poster_username}}</a>
- </div>
- {{#unless hideCategory}}
- <div class='category'>
- {{category-link t.category}}
- </div>
- {{/unless}}
- <div class="clearfix"></div>
- </div>
- </td>
- </tr>
- {{/each}}
+ {{#each topics as |t|}}
+ <tr class="topic-list-item {{if t.archived 'archived'}} {{if t.visited 'visited'}}" data-topic-id={{t.id}}>
+ <td>
+ <div class='main-link'>
+ {{topic-status topic=t}}
+ {{topic-link t}}
+ {{raw "list/unread-indicator" includeUnreadIndicator=showUnreadIndicator
+ topicId=t.id
+ unreadClass=(if t.unread_by_group_member "" "read")}}
+ {{#if t.unseen}}
+ <span class="badge-notification new-topic"></span>
+ {{/if}}
+ {{#if t.hasExcerpt}}
+ <div class="topic-excerpt">
+ {{html-safe t.excerpt}}
+ {{#if t.excerptTruncated}}
+ {{#unless t.canClearPin}}<a href={{t.url}}>{{i18n 'read_more'}}</a>{{/unless}}
+ {{/if}}
+ {{#if t.canClearPin}}
+ <a href {{action "clearPin" t}} title={{i18n 'topic.clear_pin.help'}}>{{i18n 'topic.clear_pin.title'}}</a>
+ {{/if}}
+ </div>
+ {{/if}}
+ </div>
+ <div class='pull-right'>
+ {{raw "list/post-count-or-badges" topic=t postBadgesEnabled="true"}}
+ </div>
+ <div class='clearfix'></div>
+ <div class="topic-item-stats clearfix">
+ {{discourse-tags t mode="list" tagsForUser=tagsForUser}}
+ <div class="pull-right">
+ {{raw "list/activity-column" topic=t tagName="div" class="num activity last"}}
+ <a href={{t.lastPostUrl}} title='{{i18n 'last_post'}}: {{raw-date t.bumped_at}}'>{{t.last_poster_username}}</a>
+ </div>
+ {{#unless hideCategory}}
+ <div class='category'>
+ {{category-link t.category}}
+ </div>
+ {{/unless}}
+ <div class="clearfix"></div>
+ </div>
+ </td>
+ </tr>
+ {{/each}}
</tbody>
</table>
{{else}}
diff --git a/app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs b/app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs
index ac7691b..b57dfeb 100644
--- a/app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs
@@ -11,58 +11,56 @@
</tr>
{{#unless c.isMuted}}
- {{#if c.description_excerpt}}
- <tr class="category-description">
- <td colspan="3">
- {{html-safe c.description_excerpt}}
- </td>
- </tr>
- {{/if}}
+ {{#if c.description_excerpt}}
+ <tr class="category-description">
+ <td colspan="3">
+ {{html-safe c.description_excerpt}}
+ </td>
+ </tr>
+ {{/if}}
- {{#if showTopics}}
- {{#each c.topics as |t|}}
- {{mobile-category-topic topic=t}}
- {{/each}}
- {{/if}}
+ {{#if showTopics}}
+ {{#each c.topics as |t|}}
+ {{mobile-category-topic topic=t}}
+ {{/each}}
+ {{/if}}
- {{#if c.isGrandParent}}
- {{#each c.subcategories as |subcategory|}}
- <tr data-category-id={{c.id}} class='subcategory-list-item category' style={{border-color subcategory.color}}>
- <td>
- {{category-title-link tagName="h4" category=subcategory}}
-
- <div class="subcategories-list">
- {{#if subcategory.subcategories}}
- <div class='subcategories'>
- {{#each subcategory.subcategories as |subsubcategory|}}
- {{#unless subsubcategory.isMuted}}
- {{category-link subsubcategory}}
- {{/unless}}
- {{/each}}
- </div>
- {{/if}}
- </div>
- </td>
- </tr>
- {{/each}}
- {{else if c.subcategories}}
- <tr class="subcategories-list">
- <td>
- <div class='subcategories'>
- {{#each c.subcategories as |subcategory|}}
- {{#unless subcategory.isMuted}}
- {{category-link subcategory}}
- {{/unless}}
[... diff too long, it was truncated ...]
GitHub sha: 2a2555e5