diff --git a/app/assets/javascripts/admin/templates/backups_index.js.handlebars b/app/assets/javascripts/admin/templates/backups_index.js.handlebars index cfce46b1b5b..780119c4737 100644 --- a/app/assets/javascripts/admin/templates/backups_index.js.handlebars +++ b/app/assets/javascripts/admin/templates/backups_index.js.handlebars @@ -12,7 +12,7 @@ {{#each backup in model}} {{backup.filename}} - {{humanSize backup.size}} + {{human-size backup.size}}
{{i18n admin.backups.operations.download.text}} diff --git a/app/assets/javascripts/admin/templates/email_all.js.handlebars b/app/assets/javascripts/admin/templates/email_all.js.handlebars index 784136f2d50..48b0e0e868c 100644 --- a/app/assets/javascripts/admin/templates/email_all.js.handlebars +++ b/app/assets/javascripts/admin/templates/email_all.js.handlebars @@ -19,7 +19,7 @@ {{#each model}} - {{unboundDate created_at}} + {{date created_at}} {{#if user}} {{#link-to 'adminUser' user}}{{avatar user imageSize="tiny"}}{{/link-to}} diff --git a/app/assets/javascripts/admin/templates/email_sent.js.handlebars b/app/assets/javascripts/admin/templates/email_sent.js.handlebars index 7da46451077..57029ac8eec 100644 --- a/app/assets/javascripts/admin/templates/email_sent.js.handlebars +++ b/app/assets/javascripts/admin/templates/email_sent.js.handlebars @@ -19,7 +19,7 @@ {{#each model}} - {{unboundDate created_at}} + {{date created_at}} {{#if user}} {{#link-to 'adminUser' user}}{{avatar user imageSize="tiny"}}{{/link-to}} diff --git a/app/assets/javascripts/admin/templates/email_skipped.js.handlebars b/app/assets/javascripts/admin/templates/email_skipped.js.handlebars index 784136f2d50..48b0e0e868c 100644 --- a/app/assets/javascripts/admin/templates/email_skipped.js.handlebars +++ b/app/assets/javascripts/admin/templates/email_skipped.js.handlebars @@ -19,7 +19,7 @@ {{#each model}} - {{unboundDate created_at}} + {{date created_at}} {{#if user}} {{#link-to 'adminUser' user}}{{avatar user imageSize="tiny"}}{{/link-to}} diff --git a/app/assets/javascripts/admin/templates/flags.js.handlebars b/app/assets/javascripts/admin/templates/flags.js.handlebars index e34127199e1..12b45b2bf41 100644 --- a/app/assets/javascripts/admin/templates/flags.js.handlebars +++ b/app/assets/javascripts/admin/templates/flags.js.handlebars @@ -51,7 +51,7 @@ {{#link-to 'adminUser' this.user}}{{avatar this.user imageSize="small"}} {{/link-to}} - {{unboundDate this.flaggedAt}} + {{date this.flaggedAt}} {{this.flagType}} diff --git a/app/assets/javascripts/admin/templates/logs/screened_emails_list_item.js.handlebars b/app/assets/javascripts/admin/templates/logs/screened_emails_list_item.js.handlebars index cfffc7fd545..ca574ceb8ff 100644 --- a/app/assets/javascripts/admin/templates/logs/screened_emails_list_item.js.handlebars +++ b/app/assets/javascripts/admin/templates/logs/screened_emails_list_item.js.handlebars @@ -3,8 +3,8 @@
{{actionName}}
{{match_count}}
-
{{unboundAgeWithTooltip last_match_at}}
-
{{unboundAgeWithTooltip created_at}}
+
{{age-with-tooltip last_match_at}}
+
{{age-with-tooltip created_at}}
{{ip_address}}
diff --git a/app/assets/javascripts/admin/templates/logs/screened_ip_addresses_list_item.js.handlebars b/app/assets/javascripts/admin/templates/logs/screened_ip_addresses_list_item.js.handlebars index 130fa69a9a6..4bd84e47a40 100644 --- a/app/assets/javascripts/admin/templates/logs/screened_ip_addresses_list_item.js.handlebars +++ b/app/assets/javascripts/admin/templates/logs/screened_ip_addresses_list_item.js.handlebars @@ -12,10 +12,10 @@
{{match_count}}
{{#if last_match_at}} - {{unboundAgeWithTooltip last_match_at}} + {{age-with-tooltip last_match_at}} {{/if}}
-
{{unboundAgeWithTooltip created_at}}
+
{{age-with-tooltip created_at}}
{{#unless editing}} diff --git a/app/assets/javascripts/admin/templates/logs/screened_urls_list_item.js.handlebars b/app/assets/javascripts/admin/templates/logs/screened_urls_list_item.js.handlebars index 659ceccd7e1..51589bf2c4f 100644 --- a/app/assets/javascripts/admin/templates/logs/screened_urls_list_item.js.handlebars +++ b/app/assets/javascripts/admin/templates/logs/screened_urls_list_item.js.handlebars @@ -3,6 +3,6 @@
{{actionName}}
{{match_count}}
-
{{unboundAgeWithTooltip last_match_at}}
-
{{unboundAgeWithTooltip created_at}}
+
{{age-with-tooltip last_match_at}}
+
{{age-with-tooltip created_at}}
diff --git a/app/assets/javascripts/admin/templates/logs/staff_action_logs_list_item.js.handlebars b/app/assets/javascripts/admin/templates/logs/staff_action_logs_list_item.js.handlebars index 65ae8c09827..14f5938f472 100644 --- a/app/assets/javascripts/admin/templates/logs/staff_action_logs_list_item.js.handlebars +++ b/app/assets/javascripts/admin/templates/logs/staff_action_logs_list_item.js.handlebars @@ -14,7 +14,7 @@ {{subject}} {{/if}} -
{{unboundAgeWithTooltip created_at}}
+
{{age-with-tooltip created_at}}
{{{formattedDetails}}} {{#if useCustomModalForDetails}} diff --git a/app/assets/javascripts/admin/templates/user_badges.js.handlebars b/app/assets/javascripts/admin/templates/user_badges.js.handlebars index 2401b9ceea9..faa16f001f6 100644 --- a/app/assets/javascripts/admin/templates/user_badges.js.handlebars +++ b/app/assets/javascripts/admin/templates/user_badges.js.handlebars @@ -42,7 +42,7 @@ {{granted_by.username}} {{/link-to}} - {{unboundAgeWithTooltip granted_at}} + {{age-with-tooltip granted_at}} diff --git a/app/assets/javascripts/admin/templates/version_checks.js.handlebars b/app/assets/javascripts/admin/templates/version_checks.js.handlebars index cbac6556554..49009e47dcb 100644 --- a/app/assets/javascripts/admin/templates/version_checks.js.handlebars +++ b/app/assets/javascripts/admin/templates/version_checks.js.handlebars @@ -2,7 +2,7 @@
- {{customHTML 'upgrade-header'}} + {{custom-html 'upgrade-header'}} diff --git a/app/assets/javascripts/discourse/components/category-group.js.es6 b/app/assets/javascripts/discourse/components/category-group.js.es6 index 2859e3bd0ec..99c5c1e0424 100644 --- a/app/assets/javascripts/discourse/components/category-group.js.es6 +++ b/app/assets/javascripts/discourse/components/category-group.js.es6 @@ -5,7 +5,7 @@ function templateFunction() { "" + diff --git a/app/assets/javascripts/discourse/helpers/application_helpers.js b/app/assets/javascripts/discourse/helpers/application_helpers.js index aace8f17faf..d89bd512b26 100644 --- a/app/assets/javascripts/discourse/helpers/application_helpers.js +++ b/app/assets/javascripts/discourse/helpers/application_helpers.js @@ -1,21 +1,3 @@ -/** - Breaks up a long string - - @method breakUp - @for Handlebars -**/ -Handlebars.registerHelper('breakUp', function(property, hint, options) { - var prop = Ember.Handlebars.get(this, property, options); - if (!prop) return ""; - if (typeof(hint) === 'string') { - hint = Ember.Handlebars.get(this, hint, options); - } else { - hint = undefined; - } - - return new Handlebars.SafeString(Discourse.Formatter.breakUp(prop, hint)); -}); - // helper function for dates function daysSinceEpoch(dt) { // 1000 * 60 * 60 * 24 = days since epoch @@ -25,9 +7,10 @@ function daysSinceEpoch(dt) { /** Converts a date to a coldmap class - @method coldDate + @method cold-age-class + @for Handlebars **/ -Handlebars.registerHelper('coldAgeClass', function(property, options) { +Handlebars.registerHelper('cold-age-class', function(property, options) { var dt = Em.Handlebars.get(this, property, options); if (!dt) { return 'age'; } @@ -56,10 +39,10 @@ Handlebars.registerHelper('shorten', function(property, options) { /** Produces a link to a topic - @method topicLink + @method topic-link @for Handlebars **/ -Handlebars.registerHelper('topicLink', function(property, options) { +Handlebars.registerHelper('topic-link', function(property, options) { var topic = Ember.Handlebars.get(this, property, options), title = topic.get('fancy_title'); return "" + title + ""; @@ -90,18 +73,18 @@ function categoryLinkHTML(category, options) { /** Produces a link to a category - @method categoryLink + @method category-link @for Handlebars **/ -Handlebars.registerHelper('categoryLink', function(property, options) { +Handlebars.registerHelper('category-link', function(property, options) { return categoryLinkHTML(Ember.Handlebars.get(this, property, options), options); }); -Handlebars.registerHelper('categoryLinkRaw', function(property, options) { +Handlebars.registerHelper('category-link-raw', function(property, options) { return categoryLinkHTML(property, options); }); -Handlebars.registerHelper('categoryBadge', function(property, options) { +Handlebars.registerHelper('category-badge', function(property, options) { options.hash.link = false; return categoryLinkHTML(Ember.Handlebars.get(this, property, options), options); }); @@ -110,18 +93,18 @@ Handlebars.registerHelper('categoryBadge', function(property, options) { /** Produces a bound link to a category - @method boundCategoryLink + @method bound-category-link @for Handlebars **/ -Ember.Handlebars.registerBoundHelper('boundCategoryLink', categoryLinkHTML); +Em.Handlebars.helper('bound-category-link', categoryLinkHTML); /** Produces a link to a route with support for i18n on the title - @method titledLinkTo + @method titled-link-to @for Handlebars **/ -Handlebars.registerHelper('titledLinkTo', function(name, object) { +Handlebars.registerHelper('titled-link-to', function(name, object) { var options = [].slice.call(arguments, -1)[0]; if (options.hash.titleKey) { options.hash.title = I18n.t(options.hash.titleKey); @@ -139,7 +122,7 @@ Handlebars.registerHelper('titledLinkTo', function(name, object) { @method shortenUrl @for Handlebars **/ -Handlebars.registerHelper('shortenUrl', function(property, options) { +Handlebars.registerHelper('shorten-url', function(property, options) { var url, matches; url = Ember.Handlebars.get(this, property, options); // Remove trailing slash if it's a top level URL @@ -152,22 +135,6 @@ Handlebars.registerHelper('shortenUrl', function(property, options) { return url.substring(0,80); }); -/** - Display a property in lower case - - @method lower - @for Handlebars -**/ -Handlebars.registerHelper('lower', function(property, options) { - var o; - o = Ember.Handlebars.get(this, property, options); - if (o && typeof o === 'string') { - return o.toLowerCase(); - } else { - return ""; - } -}); - /** Show an avatar for a user, intelligently making use of available properties @@ -217,10 +184,10 @@ Handlebars.registerHelper('avatar', function(user, options) { /** Bound avatar helper. - @method boundAvatar + @method bound-avatar @for Handlebars **/ -Ember.Handlebars.registerBoundHelper('boundAvatar', function(user, size, uploadId) { +Em.Handlebars.helper('bound-avatar', function(user, size, uploadId) { var username = Em.get(user, 'username'); @@ -239,7 +206,7 @@ Ember.Handlebars.registerBoundHelper('boundAvatar', function(user, size, uploadI /* * Used when we only have a template */ -Ember.Handlebars.registerBoundHelper('boundAvatarTemplate', function(avatarTemplate, size) { +Em.Handlebars.helper('bound-avatar-template', function(avatarTemplate, size) { return new Handlebars.SafeString(Discourse.Utilities.avatarImg({ size: size, avatarTemplate: avatarTemplate @@ -249,21 +216,31 @@ Ember.Handlebars.registerBoundHelper('boundAvatarTemplate', function(avatarTempl /** Nicely format a date without binding or returning HTML - @method rawDate + @method raw-date @for Handlebars **/ -Handlebars.registerHelper('rawDate', function(property, options) { +Handlebars.registerHelper('raw-date', function(property, options) { var dt = new Date(Ember.Handlebars.get(this, property, options)); return Discourse.Formatter.longDate(dt); }); /** - Live refreshing age helper + Nicely format a bound date without returning HTML - @method unboundAge + @method bound-raw-date @for Handlebars **/ -Handlebars.registerHelper('unboundAge', function(property, options) { +Em.Handlebars.helper('bound-raw-date', function (date) { + return Discourse.Formatter.longDate(new Date(date)); +}); + +/** + Live refreshing age helper + + @method age + @for Handlebars +**/ +Handlebars.registerHelper('age', function(property, options) { var dt = new Date(Ember.Handlebars.get(this, property, options)); return new Handlebars.SafeString(Discourse.Formatter.autoUpdatingRelativeAge(dt)); }); @@ -271,50 +248,14 @@ Handlebars.registerHelper('unboundAge', function(property, options) { /** Live refreshing age helper, with a tooltip showing the date and time - @method unboundAgeWithTooltip + @method age-with-tooltip @for Handlebars **/ -Handlebars.registerHelper('unboundAgeWithTooltip', function(property, options) { +Handlebars.registerHelper('age-with-tooltip', function(property, options) { var dt = new Date(Ember.Handlebars.get(this, property, options)); return new Handlebars.SafeString(Discourse.Formatter.autoUpdatingRelativeAge(dt, {title: true})); }); -/** - Display a date related to an edit of a post - - @method editDate - @for Handlebars -**/ -Handlebars.registerHelper('editDate', function(property, options) { - // autoupdating this is going to be painful - var date = new Date(Ember.Handlebars.get(this, property, options)); - return new Handlebars.SafeString(Discourse.Formatter.autoUpdatingRelativeAge(date, {format: 'medium', title: true, leaveAgo: true, wrapInSpan: false})); -}); - -/** - Displays a percentile based on a `percent_rank` field - - @method percentile - @for Ember.Handlebars -**/ -Ember.Handlebars.registerHelper('percentile', function(property, options) { - var percentile = Ember.Handlebars.get(this, property, options); - return Math.round((1.0 - percentile) * 100); -}); - -/** - Displays a float nicely - - @method float - @for Ember.Handlebars -**/ -Ember.Handlebars.registerHelper('float', function(property, options) { - var x = Ember.Handlebars.get(this, property, options); - if (!x) return "0"; - if (Math.round(x) === x) return x; - return x.toFixed(3); -}); - /** Display logic for numbers. @@ -351,10 +292,10 @@ Handlebars.registerHelper('number', function(property, options) { Display logic for dates. It is unbound in Ember but will use jQuery to update the dates on a regular interval. - @method unboundDate + @method date @for Handlebars **/ -Handlebars.registerHelper('unboundDate', function(property, options) { +Handlebars.registerHelper('date', function(property, options) { var leaveAgo; if (property.hash) { if (property.hash.leaveAgo) { @@ -372,7 +313,7 @@ Handlebars.registerHelper('unboundDate', function(property, options) { } }); -Ember.Handlebars.registerBoundHelper('date', function(dt) { +Em.Handlebars.helper('bound-date', function(dt) { return new Handlebars.SafeString(Discourse.Formatter.autoUpdatingRelativeAge(new Date(dt), {format: 'medium', title: true })); }); @@ -380,10 +321,10 @@ Ember.Handlebars.registerBoundHelper('date', function(dt) { Look for custom html content using `Discourse.HTML`. If none exists, look for a template to render with that name. - @method customHTML + @method custom-html @for Handlebars **/ -Handlebars.registerHelper('customHTML', function(name, contextString, options) { +Handlebars.registerHelper('custom-html', function(name, contextString, options) { var html = Discourse.HTML.getCustomHTML(name); if (html) { return html; } @@ -394,7 +335,7 @@ Handlebars.registerHelper('customHTML', function(name, contextString, options) { } }); -Ember.Handlebars.registerBoundHelper('humanSize', function(size) { +Em.Handlebars.helper('human-size', function(size) { return new Handlebars.SafeString(I18n.toHumanSize(size)); }); diff --git a/app/assets/javascripts/discourse/templates/badges/show.js.handlebars b/app/assets/javascripts/discourse/templates/badges/show.js.handlebars index a1a30057192..e113ccf27d7 100644 --- a/app/assets/javascripts/discourse/templates/badges/show.js.handlebars +++ b/app/assets/javascripts/discourse/templates/badges/show.js.handlebars @@ -21,7 +21,7 @@ {{avatar user imageSize="large"}}
{{user.username}} - {{unboundDate granted_at}} + {{date granted_at}}
{{/link-to}} diff --git a/app/assets/javascripts/discourse/templates/components/basic-topic-list.js.handlebars b/app/assets/javascripts/discourse/templates/components/basic-topic-list.js.handlebars index f5126ba1ab4..95055329438 100644 --- a/app/assets/javascripts/discourse/templates/components/basic-topic-list.js.handlebars +++ b/app/assets/javascripts/discourse/templates/components/basic-topic-list.js.handlebars @@ -37,7 +37,7 @@ {{#unless controller.hideCategory}} {{/unless}} @@ -65,14 +65,14 @@ {{#if topic.bumped}} {{else}} {{/if}} diff --git a/app/assets/javascripts/discourse/templates/components/category-drop.js.handlebars b/app/assets/javascripts/discourse/templates/components/category-drop.js.handlebars index 36bba0c22fe..7e56dd5a3bb 100644 --- a/app/assets/javascripts/discourse/templates/components/category-drop.js.handlebars +++ b/app/assets/javascripts/discourse/templates/components/category-drop.js.handlebars @@ -20,6 +20,6 @@ {{#if subCategory}}
{{i18n categories.no_subcategory}}
{{/if}} - {{#each categories}}
{{categoryLink this allowUncategorized=true}}
{{/each}} + {{#each categories}}
{{category-link this allowUncategorized=true}}
{{/each}} {{/if}} diff --git a/app/assets/javascripts/discourse/templates/components/topic-map.js.handlebars b/app/assets/javascripts/discourse/templates/components/topic-map.js.handlebars index c7bbc15ccb4..e52616147f9 100644 --- a/app/assets/javascripts/discourse/templates/components/topic-map.js.handlebars +++ b/app/assets/javascripts/discourse/templates/components/topic-map.js.handlebars @@ -7,17 +7,17 @@
  • - +

    {{i18n created}}

    {{avatar details.created_by imageSize="tiny"}} - {{unboundDate topic.created_at}} + {{date topic.created_at}}

  • {{i18n last_post}}

    {{avatar details.last_poster imageSize="tiny"}} - {{unboundDate topic.last_posted_at}} + {{date topic.last_posted_at}}
  • @@ -62,7 +62,7 @@
  • {{clicks}} - {{#if title}}{{title}}{{else}}{{shortenUrl url}}{{/if}} + {{#if title}}{{title}}{{else}}{{shorten-url url}}{{/if}} {{link-domain this}}
    • diff --git a/app/assets/javascripts/discourse/templates/composer/similar_topics.js.handlebars b/app/assets/javascripts/discourse/templates/composer/similar_topics.js.handlebars index c2567e367ba..280db69b43f 100644 --- a/app/assets/javascripts/discourse/templates/composer/similar_topics.js.handlebars +++ b/app/assets/javascripts/discourse/templates/composer/similar_topics.js.handlebars @@ -3,6 +3,6 @@
      {{#each similarTopics}} -
    • {{{topicLink this}}} ({{{i18n topic.filters.n_posts count="posts_count"}}})
      • +
    • {{{topic-link this}}} ({{{i18n topic.filters.n_posts count="posts_count"}}})
      • {{/each}}
    diff --git a/app/assets/javascripts/discourse/templates/discovery.js.handlebars b/app/assets/javascripts/discourse/templates/discovery.js.handlebars index d4f7a4df1cc..20fb4b0e98c 100644 --- a/app/assets/javascripts/discourse/templates/discovery.js.handlebars +++ b/app/assets/javascripts/discourse/templates/discovery.js.handlebars @@ -1,5 +1,5 @@
    - {{customHTML "top"}} + {{custom-html "top"}} {{Discourse.globalNotice}}
    diff --git a/app/assets/javascripts/discourse/templates/discovery/categories.js.handlebars b/app/assets/javascripts/discourse/templates/discovery/categories.js.handlebars index 38b0e193530..db9277cc155 100644 --- a/app/assets/javascripts/discourse/templates/discovery/categories.js.handlebars +++ b/app/assets/javascripts/discourse/templates/discovery/categories.js.handlebars @@ -18,7 +18,7 @@
    {{#if controller.ordering}}{{/if}} - {{categoryLink this allowUncategorized=true extraClasses="bigger"}} + {{category-link this allowUncategorized=true extraClasses="bigger"}} {{#if unreadTopics}} {{unbound unreadTopics}} {{/if}} @@ -41,7 +41,7 @@ {{#if subcategories}}
    {{#each subcategories}} - {{categoryLink this showParent=true}} + {{category-link this showParent=true}} {{#if unreadTopics}} {{unbound unreadTopics}} {{/if}} @@ -70,11 +70,11 @@ {{#if controller.latestTopicOnly}} {{else}}   - {{unboundAge last_posted_at}} + {{age last_posted_at}} {{/if}}
    {{/each}} diff --git a/app/assets/javascripts/discourse/templates/embedded_post.js.handlebars b/app/assets/javascripts/discourse/templates/embedded_post.js.handlebars index 6699389075c..1358c9a65dc 100644 --- a/app/assets/javascripts/discourse/templates/embedded_post.js.handlebars +++ b/app/assets/javascripts/discourse/templates/embedded_post.js.handlebars @@ -10,7 +10,7 @@
    {{{unbound username}}}
    {{#if view.parentView.previousPost}}{{/if}} -
    {{unboundAgeWithTooltip created_at}}
    +
    {{age-with-tooltip created_at}}
    {{{unbound cooked}}} {{#unless view.parentView.previousPost}}{{/unless}} diff --git a/app/assets/javascripts/discourse/templates/featured_topics.js.handlebars b/app/assets/javascripts/discourse/templates/featured_topics.js.handlebars index 9fdb077a3c9..f265221e768 100644 --- a/app/assets/javascripts/discourse/templates/featured_topics.js.handlebars +++ b/app/assets/javascripts/discourse/templates/featured_topics.js.handlebars @@ -1,7 +1,7 @@
  {{i18n admin.dashboard.installed_version}} - {{categoryLink topic.category showParent=true}} + {{category-link topic.category showParent=true}} - {{unboundAge topic.created_at}} + {{age topic.created_at}} - {{unboundAge topic.bumped_at}} + {{age topic.bumped_at}} - {{unboundAge topic.created_at}} + {{age topic.created_at}}
- + {{/each}} @@ -62,7 +62,7 @@
{{i18n categories.subcategories}} {{#each subcategory in subcategories}} - {{categoryLink subcategory showParent=true}} + {{category-link subcategory showParent=true}} {{/each}}
diff --git a/app/assets/javascripts/discourse/templates/group/index.js.handlebars b/app/assets/javascripts/discourse/templates/group/index.js.handlebars index db2bad90e4b..810bf21bd94 100644 --- a/app/assets/javascripts/discourse/templates/group/index.js.handlebars +++ b/app/assets/javascripts/discourse/templates/group/index.js.handlebars @@ -3,7 +3,7 @@
{{#link-to 'user' user class="avatar-link"}}
{{avatar user imageSize="large" extraClasses="actor" ignoreTitle="true"}}
{{/link-to}} - {{unboundDate path="created_at" leaveAgo="true"}} + {{date path="created_at" leaveAgo="true"}} {{unbound title}} diff --git a/app/assets/javascripts/discourse/templates/group/members.js.handlebars b/app/assets/javascripts/discourse/templates/group/members.js.handlebars index 0a0c8171926..2bafdd7efcc 100644 --- a/app/assets/javascripts/discourse/templates/group/members.js.handlebars +++ b/app/assets/javascripts/discourse/templates/group/members.js.handlebars @@ -13,7 +13,7 @@

{{name}}

diff --git a/app/assets/javascripts/discourse/templates/header.js.handlebars b/app/assets/javascripts/discourse/templates/header.js.handlebars index f235a1c232f..825856c9b57 100644 --- a/app/assets/javascripts/discourse/templates/header.js.handlebars +++ b/app/assets/javascripts/discourse/templates/header.js.handlebars @@ -14,9 +14,9 @@ {{icon envelope}} {{/if}} {{#if topic.category.parentCategory}} - {{boundCategoryLink topic.category.parentCategory}} + {{bound-category-link topic.category.parentCategory}} {{/if}} - {{boundCategoryLink topic.category}} + {{bound-category-link topic.category}} {{#if topic.details.loaded}} {{topic-status topic=topic}} {{{topic.fancy_title}}} @@ -104,7 +104,7 @@ href="#" title='{{i18n user.avatar.title}}' id="current-user"> - {{boundAvatar currentUser "medium"}} + {{bound-avatar currentUser "medium"}} {{/if}} diff --git a/app/assets/javascripts/discourse/templates/list/topic_list_item.js.handlebars b/app/assets/javascripts/discourse/templates/list/topic_list_item.js.handlebars index 9d97e6227c8..a81a34a0817 100644 --- a/app/assets/javascripts/discourse/templates/list/topic_list_item.js.handlebars +++ b/app/assets/javascripts/discourse/templates/list/topic_list_item.js.handlebars @@ -12,7 +12,7 @@ {{#unless hideCategory}} - + {{/unless}} {{else}} {{/if}} diff --git a/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.js.handlebars b/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.js.handlebars index 0f6ea29b4ce..e1e5028405b 100644 --- a/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.js.handlebars +++ b/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.js.handlebars @@ -6,7 +6,7 @@ - + {{#if can_see_invite_details}} - + diff --git a/app/assets/javascripts/discourse/templates/user/preferences.js.handlebars b/app/assets/javascripts/discourse/templates/user/preferences.js.handlebars index 7584d9a5de3..494613d2dc1 100644 --- a/app/assets/javascripts/discourse/templates/user/preferences.js.handlebars +++ b/app/assets/javascripts/discourse/templates/user/preferences.js.handlebars @@ -79,7 +79,7 @@
- {{boundAvatar model "large"}} + {{bound-avatar model "large"}} {{#if allowAvatarUpload}} {{else}} diff --git a/app/assets/javascripts/discourse/templates/user/stream.js.handlebars b/app/assets/javascripts/discourse/templates/user/stream.js.handlebars index 2d27ccea518..7a3b328c157 100644 --- a/app/assets/javascripts/discourse/templates/user/stream.js.handlebars +++ b/app/assets/javascripts/discourse/templates/user/stream.js.handlebars @@ -2,10 +2,10 @@
- {{categoryLink this allowUncategorized=true}} + {{category-link this allowUncategorized=true}}
{{#each featured_users}} @@ -26,7 +26,7 @@
{{topic-status topic=this}} - {{{topicLink this}}} + {{{topic-link this}}} {{#if unread}} {{unbound unread}} @@ -52,7 +52,7 @@
{{number posts_count}}{{{unboundAge created_at}}}{{{age created_at}}}
- {{date last_seen_at}} + {{bound-date last_seen_at}}
{{topic-status topic=this.model}} - {{{topicLink this}}} + {{{topic-link this}}} {{#if unread}} {{unread}} {{/if}} @@ -37,7 +37,7 @@ {{boundCategoryLink category showParent=true}}{{bound-category-link category showParent=true}} @@ -58,14 +58,14 @@ {{#if bumped}} - {{unboundAge created_at}} + {{age created_at}} - {{unboundAge bumped_at}} + {{age bumped_at}} - {{unboundAge created_at}} + {{age created_at}}
{{topic-status topic=this}} - {{{topicLink this}}} + {{{topic-link this}}} {{#if unread}} {{unread}} {{/if}} @@ -42,17 +42,17 @@ {{/if}} {{#if bumped}}
- {{unboundAge bumped_at}} + {{age bumped_at}}
{{else}}
- {{unboundAge created_at}} + {{age created_at}}
{{/if}}
{{#unless controller.hideCategory}}
- {{categoryLink category showParent=true}} + {{category-link category showParent=true}}
{{/unless}} {{#if controller.showParticipants}} diff --git a/app/assets/javascripts/discourse/templates/mobile/list/topic_list_item.js.handlebars b/app/assets/javascripts/discourse/templates/mobile/list/topic_list_item.js.handlebars index 90559bda050..8f0dfe6b1ba 100644 --- a/app/assets/javascripts/discourse/templates/mobile/list/topic_list_item.js.handlebars +++ b/app/assets/javascripts/discourse/templates/mobile/list/topic_list_item.js.handlebars @@ -1,7 +1,7 @@
{{topic-status topic=this}} - {{{topicLink this}}} + {{{topic-link this}}} {{#if unread}} {{unread}} {{/if}} @@ -28,7 +28,7 @@
{{#unless controller.hideCategory}}
- {{categoryLink category showParent=true}} + {{category-link category showParent=true}}
{{/unless}} @@ -41,13 +41,13 @@ {{#if bumped}}
- {{last_poster_username}} - {{unboundAge bumped_at}} + {{last_poster_username}} + {{age bumped_at}}
{{else}}
- {{last_poster_username}} - {{unboundAge created_at}} + {{last_poster_username}} + {{age created_at}}
{{/if}}
diff --git a/app/assets/javascripts/discourse/templates/modal/avatar_selector.js.handlebars b/app/assets/javascripts/discourse/templates/modal/avatar_selector.js.handlebars index c5295b90f80..e286dfb81c1 100644 --- a/app/assets/javascripts/discourse/templates/modal/avatar_selector.js.handlebars +++ b/app/assets/javascripts/discourse/templates/modal/avatar_selector.js.handlebars @@ -2,11 +2,11 @@
- +
- +
@@ -14,9 +14,9 @@
- {{i18n post.revisions.details.edited_by}} {{boundAvatarTemplate content.avatar_template "small"}} {{username}} {{date created_at}} {{#if edit_reason}} — {{edit_reason}}{{/if}} + {{i18n post.revisions.details.edited_by}} {{bound-avatar-template content.avatar_template "small"}} {{username}} {{bound-date created_at}} {{#if edit_reason}} — {{edit_reason}}{{/if}}
{{#if title_changes}} @@ -32,7 +32,7 @@ {{/if}} {{#if user_changes}}
- {{boundAvatarTemplate user_changes.previous.avatar_template "small"}} {{user_changes.previous.username}} → {{boundAvatarTemplate user_changes.current.avatar_template "small"}} {{user_changes.current.username}} + {{bound-avatar-template user_changes.previous.avatar_template "small"}} {{user_changes.previous.username}} → {{bound-avatar-template user_changes.current.avatar_template "small"}} {{user_changes.current.username}}
{{/if}} {{#if wiki_changes}} diff --git a/app/assets/javascripts/discourse/templates/navigation/categories.js.handlebars b/app/assets/javascripts/discourse/templates/navigation/categories.js.handlebars index 04ca78e96c7..3ebb14e9512 100644 --- a/app/assets/javascripts/discourse/templates/navigation/categories.js.handlebars +++ b/app/assets/javascripts/discourse/templates/navigation/categories.js.handlebars @@ -4,7 +4,7 @@ {{#each navItem in navItems}} {{navigation-item content=navItem filterMode=filterMode}} {{/each}} - {{customHTML "extraNavItem"}} + {{custom-html "extraNavItem"}} {{#if canCreateCategory}} diff --git a/app/assets/javascripts/discourse/templates/navigation/category.js.handlebars b/app/assets/javascripts/discourse/templates/navigation/category.js.handlebars index f38f92d2a2b..ac4d45671dc 100644 --- a/app/assets/javascripts/discourse/templates/navigation/category.js.handlebars +++ b/app/assets/javascripts/discourse/templates/navigation/category.js.handlebars @@ -4,7 +4,7 @@ {{#each navItem in navItems}} {{navigation-item content=navItem filterMode=filterMode}} {{/each}} - {{customHTML "extraNavItem"}} + {{custom-html "extraNavItem"}} {{#if canChangeCategoryNotificationLevel}} diff --git a/app/assets/javascripts/discourse/templates/navigation/default.js.handlebars b/app/assets/javascripts/discourse/templates/navigation/default.js.handlebars index 04bbf2b4e67..5acd6e0952c 100644 --- a/app/assets/javascripts/discourse/templates/navigation/default.js.handlebars +++ b/app/assets/javascripts/discourse/templates/navigation/default.js.handlebars @@ -4,7 +4,7 @@ {{#each navItem in navItems}} {{navigation-item content=navItem filterMode=filterMode}} {{/each}} - {{customHTML "extraNavItem"}} + {{custom-html "extraNavItem"}} {{#if canCreateTopic}} diff --git a/app/assets/javascripts/discourse/templates/post.js.handlebars b/app/assets/javascripts/discourse/templates/post.js.handlebars index 7fd1635b35f..30b02835216 100644 --- a/app/assets/javascripts/discourse/templates/post.js.handlebars +++ b/app/assets/javascripts/discourse/templates/post.js.handlebars @@ -40,17 +40,17 @@
{{poster-name post=this expandAction="showPosterExpansion"}}
- {{unboundAgeWithTooltip created_at}} + {{age-with-tooltip created_at}}
{{#if hasHistory}}
{{#if can_view_edit_history}} - + {{editCount}} {{else}} - + {{editCount}} diff --git a/app/assets/javascripts/discourse/templates/poster_expansion.handlebars b/app/assets/javascripts/discourse/templates/poster_expansion.handlebars index ac96c9cb6c0..3a7db86ce3d 100644 --- a/app/assets/javascripts/discourse/templates/poster_expansion.handlebars +++ b/app/assets/javascripts/discourse/templates/poster_expansion.handlebars @@ -1,5 +1,5 @@ {{#if model}} - {{#link-to 'user' user}}{{boundAvatar model "huge"}}{{/link-to}} + {{#link-to 'user' user}}{{bound-avatar model "huge"}}{{/link-to}}

{{username}}

@@ -24,8 +24,8 @@ {{#if user}}
{{#if user.location}}

{{{user.location}}}

{{/if}} -

{{i18n last_post}} {{unboundDate path="user.last_posted_at" leaveAgo="true"}}

-

{{i18n joined}} {{unboundDate path="user.created_at" leaveAgo="true"}}

+

{{i18n last_post}} {{date path="user.last_posted_at" leaveAgo="true"}}

+

{{i18n joined}} {{date path="user.created_at" leaveAgo="true"}}

{{groups-list groups=user.custom_groups}}
diff --git a/app/assets/javascripts/discourse/templates/share.js.handlebars b/app/assets/javascripts/discourse/templates/share.js.handlebars index 7a1d5f738ea..29a4bb73e60 100644 --- a/app/assets/javascripts/discourse/templates/share.js.handlebars +++ b/app/assets/javascripts/discourse/templates/share.js.handlebars @@ -1,7 +1,7 @@

{{view.title}}

{{#if date}} - {{rawDate date}} + {{bound-raw-date date}} {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/site_map/_category.js.handlebars b/app/assets/javascripts/discourse/templates/site_map/_category.js.handlebars index 566f40cdf44..9bffe1173b7 100644 --- a/app/assets/javascripts/discourse/templates/site_map/_category.js.handlebars +++ b/app/assets/javascripts/discourse/templates/site_map/_category.js.handlebars @@ -1,4 +1,4 @@ -{{categoryLink this allowUncategorized=true showParent=true}} +{{category-link this allowUncategorized=true showParent=true}} {{#if showBadges}} {{#if unreadTopics}} {{unreadTopics}} diff --git a/app/assets/javascripts/discourse/templates/site_map/_latest_topics_link.js.handlebars b/app/assets/javascripts/discourse/templates/site_map/_latest_topics_link.js.handlebars index f83cd32c303..b913e893c6f 100644 --- a/app/assets/javascripts/discourse/templates/site_map/_latest_topics_link.js.handlebars +++ b/app/assets/javascripts/discourse/templates/site_map/_latest_topics_link.js.handlebars @@ -1 +1 @@ -{{#titledLinkTo "discovery.latest" (query-params ascending="false" order="default") titleKey="filters.latest.help" class="latest-topics-link"}}{{i18n filters.latest.title}}{{/titledLinkTo}} +{{#titled-link-to "discovery.latest" (query-params ascending="false" order="default") titleKey="filters.latest.help" class="latest-topics-link"}}{{i18n filters.latest.title}}{{/titled-link-to}} diff --git a/app/assets/javascripts/discourse/templates/topic.js.handlebars b/app/assets/javascripts/discourse/templates/topic.js.handlebars index b3135ce5d1c..ec8add46b9a 100644 --- a/app/assets/javascripts/discourse/templates/topic.js.handlebars +++ b/app/assets/javascripts/discourse/templates/topic.js.handlebars @@ -1,5 +1,5 @@
- {{customHTML "top"}} + {{custom-html "top"}} {{Discourse.globalNotice}}
@@ -28,9 +28,9 @@

{{#if category.parentCategory}} - {{boundCategoryLink category.parentCategory}} + {{bound-category-link category.parentCategory}} {{/if}} - {{boundCategoryLink category}} + {{bound-category-link category}} {{#if details.loaded}} {{topic-status topic=model}} diff --git a/app/assets/javascripts/discourse/templates/user/invited.js.handlebars b/app/assets/javascripts/discourse/templates/user/invited.js.handlebars index 6bf4e5a241a..9d93cc5c40d 100644 --- a/app/assets/javascripts/discourse/templates/user/invited.js.handlebars +++ b/app/assets/javascripts/discourse/templates/user/invited.js.handlebars @@ -32,9 +32,9 @@ {{#link-to 'user' invite.user}}{{avatar invite.user imageSize="tiny"}}{{/link-to}} {{#link-to 'user' invite.user}}{{invite.user.username}}{{/link-to}}

{{unboundDate invite.redeemed_at}}{{date invite.redeemed_at}}{{unboundDate invite.user.last_seen_at}}{{date invite.user.last_seen_at}} {{number invite.user.topics_entered}} {{number invite.user.posts_read_count}} {{{unbound invite.user.time_read}}}