From e17ea2e787c31b17938d19ecc45e3ae83775494d Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Thu, 23 Apr 2015 14:50:06 -0400
Subject: [PATCH] UX: Show a dash if a version string is missing

---
 .../javascripts/admin/templates/dashboard.hbs |  2 +-
 .../admin/templates/version-checks.hbs        | 72 ++++++++++++++++++
 .../admin/templates/version_checks.hbs        | 75 -------------------
 .../discourse/helpers/dash-if-empty.js.es6    |  3 +
 4 files changed, 76 insertions(+), 76 deletions(-)
 create mode 100644 app/assets/javascripts/admin/templates/version-checks.hbs
 delete mode 100644 app/assets/javascripts/admin/templates/version_checks.hbs
 create mode 100644 app/assets/javascripts/discourse/helpers/dash-if-empty.js.es6

diff --git a/app/assets/javascripts/admin/templates/dashboard.hbs b/app/assets/javascripts/admin/templates/dashboard.hbs
index 0f06bf37828..f73a52b5cda 100644
--- a/app/assets/javascripts/admin/templates/dashboard.hbs
+++ b/app/assets/javascripts/admin/templates/dashboard.hbs
@@ -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">
diff --git a/app/assets/javascripts/admin/templates/version-checks.hbs b/app/assets/javascripts/admin/templates/version-checks.hbs
new file mode 100644
index 00000000000..1da45f3abcf
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/version-checks.hbs
@@ -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>
diff --git a/app/assets/javascripts/admin/templates/version_checks.hbs b/app/assets/javascripts/admin/templates/version_checks.hbs
deleted file mode 100644
index 9148a4562d5..00000000000
--- a/app/assets/javascripts/admin/templates/version_checks.hbs
+++ /dev/null
@@ -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>
diff --git a/app/assets/javascripts/discourse/helpers/dash-if-empty.js.es6 b/app/assets/javascripts/discourse/helpers/dash-if-empty.js.es6
new file mode 100644
index 00000000000..a018479e7de
--- /dev/null
+++ b/app/assets/javascripts/discourse/helpers/dash-if-empty.js.es6
@@ -0,0 +1,3 @@
+export default Ember.Handlebars.makeBoundHelper(function(str) {
+  return Ember.isEmpty(str) ? new Handlebars.SafeString('&mdash;') : str;
+});