diff --git a/app/assets/javascripts/admin/models/github_commit.js b/app/assets/javascripts/admin/models/github_commit.js index 140e4e4ea51..35f539a2251 100644 --- a/app/assets/javascripts/admin/models/github_commit.js +++ b/app/assets/javascripts/admin/models/github_commit.js @@ -11,7 +11,7 @@ Discourse.GithubCommit = Discourse.Model.extend({ if( this.get('author') && this.get('author.gravatar_id') ){ return("https://www.gravatar.com/avatar/" + this.get('author.gravatar_id') + ".png?s=38&r=pg&d=identicon"); } else { - return "https://www.gravatar.com/avatar/b30fff48d257cdd17c4437afac19fd30.png?s=38&r=pg&d=identicon"; + return "https://www.gravatar.com/avatar/b30fff48d257cdd17c4437afac19fd30.png?s=38&r=pg&d=identicon"; } }.property("commit"), @@ -31,7 +31,7 @@ Discourse.GithubCommit.reopenClass({ $.ajax( "https://api.github.com/repos/discourse/discourse/commits?callback=callback", { dataType: 'jsonp', type: 'get', - data: { per_page: 10 }, + data: { per_page: 25 }, success: function(response, textStatus, jqXHR) { response.data.each(function(commit) { result.pushObject( Discourse.GithubCommit.create(commit) ); diff --git a/app/assets/javascripts/admin/templates/dashboard.js.handlebars b/app/assets/javascripts/admin/templates/dashboard.js.handlebars index 3738417ef7e..665c88f07ee 100644 --- a/app/assets/javascripts/admin/templates/dashboard.js.handlebars +++ b/app/assets/javascripts/admin/templates/dashboard.js.handlebars @@ -1,80 +1,78 @@ -{{#if Discourse.SiteSettings.version_checks}} +
{{i18n loading}}
- {{else}} -- {{i18n admin.dashboard.version}}: {{ versionCheck.installed_version }} + {{#if Discourse.SiteSettings.version_checks}} + {{#if loading }} +
{{i18n loading}}
+ {{else}} ++ {{i18n admin.dashboard.version}}: {{ versionCheck.installed_version }} - {{#if versionCheck.installed_sha}} - ({{versionCheck.shortSha}}) - {{/if}} -
+ {{#if versionCheck.installed_sha}} + ({{versionCheck.shortSha}}) + {{/if}} + -- {{i18n admin.dashboard.latest_version}}: {{ versionCheck.latest_version }} - {{#if versionCheck.upToDate }} - ☻ {{i18n admin.dashboard.up_to_date}} - {{else}} - - {{#if versionCheck.behindByOneVersion}} - ☺ - {{else}} - ☹ - {{/if}} - - {{i18n admin.dashboard.critical_available}} - {{i18n admin.dashboard.updates_available}} - {{i18n admin.dashboard.please_upgrade}} - {{/if}} -
- -- - {{i18n admin.dashboard.update_often}} -
++ {{i18n admin.dashboard.latest_version}}: {{ versionCheck.latest_version }} + {{#if versionCheck.upToDate }} + ☻ {{i18n admin.dashboard.up_to_date}} + {{else}} + + {{#if versionCheck.behindByOneVersion}} + ☺ + {{else}} + ☹ + {{/if}} + + {{i18n admin.dashboard.critical_available}} + {{i18n admin.dashboard.updates_available}} + {{i18n admin.dashboard.please_upgrade}} + {{/if}} +
+ {{/if}} {{/if}} + ++ | {{i18n admin.dashboard.reports.today}} | +{{i18n admin.dashboard.reports.yesterday}} | +{{i18n admin.dashboard.reports.last_7_days}} | +{{i18n admin.dashboard.reports.last_30_days}} | +
---|
- | {{i18n admin.dashboard.reports.today}} | -{{i18n admin.dashboard.reports.yesterday}} | -{{i18n admin.dashboard.reports.last_7_days}} | -{{i18n admin.dashboard.reports.last_30_days}} | -
---|
+ | {{i18n admin.dashboard.reports.today}} | +{{i18n admin.dashboard.reports.yesterday}} | +{{i18n admin.dashboard.reports.7_days_ago}} | +{{i18n admin.dashboard.reports.30_days_ago}} | +
---|
- | {{i18n admin.dashboard.reports.today}} | -{{i18n admin.dashboard.reports.yesterday}} | -{{i18n admin.dashboard.reports.7_days_ago}} | -{{i18n admin.dashboard.reports.30_days_ago}} | -
---|