From c9140a24414f871490315ebdb1014a53c10c10a0 Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Thu, 28 Feb 2013 16:19:22 -0500
Subject: [PATCH] Add a nag to update often

---
 .../admin/templates/dashboard.js.handlebars   | 35 ++++++++++++-------
 app/assets/stylesheets/admin/admin_base.scss  | 20 ++++++++---
 config/locales/client.en.yml                  |  3 +-
 3 files changed, 41 insertions(+), 17 deletions(-)

diff --git a/app/assets/javascripts/admin/templates/dashboard.js.handlebars b/app/assets/javascripts/admin/templates/dashboard.js.handlebars
index 0a518434551..6313de948b4 100644
--- a/app/assets/javascripts/admin/templates/dashboard.js.handlebars
+++ b/app/assets/javascripts/admin/templates/dashboard.js.handlebars
@@ -1,17 +1,20 @@
 <h3>{{i18n admin.dashboard.welcome}}</h3>
 
 {{#if Discourse.SiteSettings.version_checks}}
-  <p {{bindAttr class=":version-check versionCheck.critical_updates:critical:normal"}}>
+  <div {{bindAttr class=":version-check versionCheck.critical_updates:critical:normal"}}>
     {{#if loading }}
-      {{i18n loading}}
+      <p>{{i18n loading}}</p>
     {{else}}
-      {{i18n admin.dashboard.version}}: <span class="version-number">{{ versionCheck.installed_version }}</span>
+      <p>
+        {{i18n admin.dashboard.version}}: <span class="version-number">{{ versionCheck.installed_version }}</span>
 
-      {{#if versionCheck.installed_sha}}
-        <span class="git-version">(<a {{bindAttr href="versionCheck.gitLink"}} target="_blank">{{versionCheck.shortSha}}</a>)</span>
-      {{/if}}
+        {{#if versionCheck.installed_sha}}
+          <span class="git-version">(<a {{bindAttr href="versionCheck.gitLink"}} target="_blank">{{versionCheck.shortSha}}</a>)</span>
+        {{/if}}
+      </p>
 
-      <span class="version-notes">
+      <p class="version-notes">
+        {{i18n admin.dashboard.latest_version}}: <span class="version-number">{{ versionCheck.latest_version }}</span>
         {{#if versionCheck.upToDate }}
           <i class='icon icon-ok update-to-date'></i> {{i18n admin.dashboard.up_to_date}}
         {{else}}
@@ -19,11 +22,19 @@
           <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}}
-          {{i18n admin.dashboard.latest_version}}: <span class="version-number">{{ versionCheck.latest_version }}</span>
         {{/if}}
-      </span>
-    {{/if}}
-  </p>
+      </p>
 
-  <iframe src="http://tylerlh.github.com/github-latest-commits-widget/?username=discourse&repo=discourse&limit=10" allowtransparency="true" frameborder="0" scrolling="no" width="502px" height="252px" id="git-commits-widget"></iframe>
+      <p class="update-nag">
+        <i class="icon icon-github"></i>
+        <a href="https://github.com/discourse/discourse" target="_blank">{{i18n admin.dashboard.update_often}}</a>
+      </p>
+    {{/if}}
+  </div>
+
+  <div class="version-check-right">
+    <iframe src="http://tylerlh.github.com/github-latest-commits-widget/?username=discourse&repo=discourse&limit=10" allowtransparency="true" frameborder="0" scrolling="no" width="502px" height="252px" id="git-commits-widget"></iframe>
+  </div>
+
+  <div class='clearfix'></div>
 {{/if}}
\ No newline at end of file
diff --git a/app/assets/stylesheets/admin/admin_base.scss b/app/assets/stylesheets/admin/admin_base.scss
index cc6d04d08be..1d2fd49c7a5 100644
--- a/app/assets/stylesheets/admin/admin_base.scss
+++ b/app/assets/stylesheets/admin/admin_base.scss
@@ -77,14 +77,24 @@
   }
 }
 
+.version-check {
+  float: left;
+  width: 500px;
+}
+.version-check-right {
+  float:right;
+  width: 500px;
+  margin-right: 15px;
+}
+
 .version-check {
   .version-number {
     font-size: 18px;
     font-weight: bold
   }
 
-  .version-notes {
-    margin-left: 24px;
+  .version-notes i.icon {
+    margin-left: 20px;
   }
 
   &.critical .version-notes .normal-note {
@@ -109,8 +119,10 @@
   }
 }
 
-#git-commits-widget {
-  margin: 10px 0;
+.update-nag {
+  i.icon {
+    font-size: 20px;
+  }
 }
 
 .settings {
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index d0f8bb4803f..ae45c00875e 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -631,12 +631,13 @@ en:
       dashboard:
         title: "Admin Dashboard"
         welcome: "Welcome to the admin section."
-        version: "Discourse version"
+        version: "Installed version"
         up_to_date: "You are running the latest version of Discourse."
         critical_available: "A critical update is available."
         updates_available: "Updates are available."
         please_upgrade: "Please upgrade!"
         latest_version: "Latest version"
+        update_often: 'Please update often!'
 
       flags:
         title: "Flags"