Merge pull request #1908 from riking/docker-link

Extract version check in dashboard to own template
This commit is contained in:
Régis Hanol 2014-02-06 09:54:03 +01:00
commit f2a75aaf26
2 changed files with 75 additions and 73 deletions

View file

@ -34,79 +34,7 @@
{{/if}}
{{#if Discourse.SiteSettings.version_checks}}
<div {{bind-attr class=":dashboard-stats :version-check versionCheck.critical_updates:critical:normal"}}>
<table class="table table-condensed table-hover">
<thead>
<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_version }}</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">&nbsp;</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>
{{ render 'admin/templates/version_checks' controller }}
{{/if}}
<div class="dashboard-stats trust-levels">

View file

@ -0,0 +1,74 @@
<div {{bind-attr class=":dashboard-stats :version-check versionCheck.critical_updates:critical:normal"}}>
<table class="table table-condensed table-hover">
<thead>
<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_version }}</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">&nbsp;</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>