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

UX: Show a dash if a version string is missing

This commit is contained in:
Robin Ward 2015-04-23 14:50:06 -04:00
parent 8bda53a8cd
commit e17ea2e787
4 changed files with 76 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/admin/templates/dashboard.hbs
View File

@ -1,6 +1,6 @@
<div class="dashboard-left">
{{#if showVersionChecks}}
{{partial 'admin/templates/version_checks'}}
{{partial 'admin/templates/version-checks'}}
{{/if}}
<div class="dashboard-stats trust-levels">

72
app/assets/javascripts/admin/templates/version-checks.hbs Normal file
View File

@ -0,0 +1,72 @@
<div {{bind-attr class=":dashboard-stats :version-check versionCheck.critical_updates:critical:normal"}}>
<table class="table table-condensed table-hover">
<thead>
{{custom-html 'upgrade-header'}}
<tr>
<th>&nbsp;</th>
<th>{{i18n 'admin.dashboard.installed_version'}}</th>
<th colspan="3">{{i18n 'admin.dashboard.latest_version'}}</th>
</tr>
</thead>
{{#unless loading}}
<tbody>
<td class="title">{{i18n 'admin.dashboard.version'}}</td>
<td class="version-number"><a {{bind-attr href="versionCheck.gitLink"}} target="_blank">{{dash-if-empty versionCheck.installed_describe}}</a></td>
{{#if versionCheck.noCheckPerformed}}
<td class="version-number">&mdash;</td>
<td class="face">
<span class="icon critical-updates-available">☹</span>
</td>
<td class="version-notes">
<span class="normal-note">{{i18n 'admin.dashboard.no_check_performed'}}</span>
</td>
{{else}}
{{#if versionCheck.staleData}}
<td class="version-number">{{#if versionCheck.version_check_pending}}{{dash-if-empty versionCheck.installed_version}}{{/if}}</td>
<td class="face">
{{#if versionCheck.version_check_pending}}
<span class='icon up-to-date'>{{fa-icon "smile-o"}}</span>
{{else}}
<span class="icon critical-updates-available">{{fa-icon "frown-o"}}</span>
{{/if}}
</td>
<td class="version-notes">
<span class="normal-note">
{{#if versionCheck.version_check_pending}}
{{i18n 'admin.dashboard.version_check_pending'}}
{{else}}
{{i18n 'admin.dashboard.stale_data'}}
{{/if}}
</span>
</td>
{{else}}
<td class="version-number">{{dash-if-empty versionCheck.latest_version}}</td>
<td class="face">
{{#if versionCheck.upToDate }}
<span class='icon up-to-date'>{{fa-icon "frown-o"}}</span>
{{else}}
<span {{bind-attr class=":icon versionCheck.critical_updates:critical-updates-available:updates-available"}}>
{{#if versionCheck.behindByOneVersion}}
{{fa-icon "smile-o"}}
{{else}}
{{fa-icon "frown-o"}}
{{/if}}
</span>
{{/if}}
</td>
<td class="version-notes">
{{#if versionCheck.upToDate }}
{{i18n 'admin.dashboard.up_to_date'}}
{{else}}
<span class="critical-note">{{i18n 'admin.dashboard.critical_available'}}</span>
<span class="normal-note">{{i18n 'admin.dashboard.updates_available'}}</span>
{{i18n 'admin.dashboard.please_upgrade'}}
{{/if}}
</td>
{{/if}}
{{/if}}
</tbody>
{{/unless}}
</table>
</div>

75
app/assets/javascripts/admin/templates/version_checks.hbs
View File

@ -1,75 +0,0 @@
<div {{bind-attr class=":dashboard-stats :version-check versionCheck.critical_updates:critical:normal"}}>
<table class="table table-condensed table-hover">
<thead>
{{custom-html 'upgrade-header'}}
<tr>
<th>&nbsp;</th>
<th>{{i18n 'admin.dashboard.installed_version'}}</th>
<th>{{i18n 'admin.dashboard.latest_version'}}</th>
<th>&nbsp;</th>
<th>&nbsp;</th>
</tr>
</thead>
{{#unless loading}}
<tbody>
<td class="title">{{i18n 'admin.dashboard.version'}}</td>
<td class="version-number"><a {{bind-attr href="versionCheck.gitLink"}} target="_blank">{{ versionCheck.installed_describe }}</a></td>
{{#if versionCheck.noCheckPerformed}}
<td class="version-number">&nbsp;</td>
<td class="face">
<span class="icon critical-updates-available">☹</span>
</td>
<td class="version-notes">
<span class="normal-note">{{i18n 'admin.dashboard.no_check_performed'}}</span>
</td>
{{else}}
{{#if versionCheck.staleData}}
<td class="version-number">{{#if versionCheck.version_check_pending}}{{ versionCheck.installed_version }}{{/if}}</td>
<td class="face">
{{#if versionCheck.version_check_pending}}
<span class='icon up-to-date'>☻</span>
{{else}}
<span class="icon critical-updates-available">☹</span>
{{/if}}
</td>
<td class="version-notes">
<span class="normal-note">
{{#if versionCheck.version_check_pending}}
{{i18n 'admin.dashboard.version_check_pending'}}
{{else}}
{{i18n 'admin.dashboard.stale_data'}}
{{/if}}
</span>
</td>
{{else}}
<td class="version-number">{{ versionCheck.latest_version }}</td>
<td class="face">
{{#if versionCheck.upToDate }}
<span class='icon up-to-date'>☻</span>
{{else}}
<span {{bind-attr class=":icon versionCheck.critical_updates:critical-updates-available:updates-available"}}>
{{#if versionCheck.behindByOneVersion}}
☺
{{else}}
☹
{{/if}}
</span>
{{/if}}
</td>
<td class="version-notes">
{{#if versionCheck.upToDate }}
{{i18n 'admin.dashboard.up_to_date'}}
{{else}}
<span class="critical-note">{{i18n 'admin.dashboard.critical_available'}}</span>
<span class="normal-note">{{i18n 'admin.dashboard.updates_available'}}</span>
{{i18n 'admin.dashboard.please_upgrade'}}
{{/if}}
</td>
{{/if}}
{{/if}}
</tbody>
{{/unless}}
</table>
</div>

3
app/assets/javascripts/discourse/helpers/dash-if-empty.js.es6 Normal file
View File

@ -0,0 +1,3 @@
export default Ember.Handlebars.makeBoundHelper(function(str) {
return Ember.isEmpty(str) ? new Handlebars.SafeString('&mdash;') : str;
});