Remove the git commits widget from the admin dashboard

discourse · Sep 11, 2014 · d492bac · d492bac
1 parent 0eaf023
commit d492bac
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 115 deletions.
diff --git a/app/assets/javascripts/admin/controllers/admin-commits.js.es6 b/app/assets/javascripts/admin/controllers/admin-commits.js.es6
diff --git a/app/assets/javascripts/admin/models/github_commit.js b/app/assets/javascripts/admin/models/github_commit.js
diff --git a/app/assets/javascripts/admin/routes/admin-dashboard.js.es6 b/app/assets/javascripts/admin/routes/admin-dashboard.js.es6
@@ -11,7 +11,6 @@ export default Discourse.Route.extend({
 
   setupController: function(c) {
     this.fetchDashboardData(c);
-    this.fetchGithubCommits(c);
   },
 
   fetchDashboardData: function(c) {
@@ -45,13 +44,6 @@ export default Discourse.Route.extend({
       c.set('problemsFetchedAt', new Date());
       c.loadProblems();
     }
-  },
-
-  fetchGithubCommits: function(c) {
-    if( !c.get('commitsCheckedAt') || moment().subtract(1, 'hour').toDate() > c.get('commitsCheckedAt') ) {
-      c.set('commitsCheckedAt', new Date());
-      c.set('githubCommits', Discourse.GithubCommit.findAll());
-    }
   }
 });
 
diff --git a/app/assets/javascripts/admin/templates/commits.js.handlebars b/app/assets/javascripts/admin/templates/commits.js.handlebars
diff --git a/app/assets/javascripts/admin/templates/dashboard.js.handlebars b/app/assets/javascripts/admin/templates/dashboard.js.handlebars
@@ -1,38 +1,4 @@
 <div class="dashboard-left">
-  {{#if foundProblems}}
-    <div class="dashboard-stats detected-problems">
-      <div class="look-here"><i class="fa fa-exclamation-triangle"></i></div>
-      <div class="problem-messages">
-        <p {{bind-attr class="loadingProblems:invisible"}}>
-          {{i18n admin.dashboard.problems_found}}
-          <ul {{bind-attr class="loadingProblems:invisible"}}>
-            {{#each problem in problems}}
-              <li>{{{problem}}}</li>
-            {{/each}}
-          </ul>
-        </p>
-        <p class="actions">
-          <small>{{i18n admin.dashboard.last_checked}}: {{problemsTimestamp}}</small>
-          <button {{action refreshProblems}} class="btn btn-small"><i class="fa fa-refresh"></i>{{i18n admin.dashboard.refresh_problems}}</button>
-        </p>
-      </div>
-      <div class="clearfix"></div>
-    </div>
-  {{else}}
-    {{#if thereWereProblems}}
-      <div class="dashboard-stats detected-problems">
-        <div class="look-here">&nbsp;</div>
-        <div class="problem-messages">
-          <p>
-            {{i18n admin.dashboard.no_problems}}
-            <button {{action refreshProblems}} class="btn btn-small"><i class="fa fa-refresh"></i>{{i18n admin.dashboard.refresh_problems}}</button>
-          </p>
-        </div>
-        <div class="clearfix"></div>
-      </div>
-    {{/if}}
-  {{/if}}
-
   {{#if Discourse.SiteSettings.version_checks}}
     {{partial 'admin/templates/version_checks'}}
   {{/if}}
@@ -138,7 +104,40 @@
 </div>
 
 <div class="dashboard-right">
-  {{ render 'admin/templates/commits' githubCommits }}
+
+  {{#if foundProblems}}
+    <div class="dashboard-stats detected-problems">
+      <div class="look-here"><i class="fa fa-exclamation-triangle"></i></div>
+      <div class="problem-messages">
+        <p {{bind-attr class="loadingProblems:invisible"}}>
+          {{i18n admin.dashboard.problems_found}}
+          <ul {{bind-attr class="loadingProblems:invisible"}}>
+            {{#each problem in problems}}
+              <li>{{{problem}}}</li>
+            {{/each}}
+          </ul>
+        </p>
+        <p class="actions">
+          <small>{{i18n admin.dashboard.last_checked}}: {{problemsTimestamp}}</small>
+          <button {{action refreshProblems}} class="btn btn-small"><i class="fa fa-refresh"></i>{{i18n admin.dashboard.refresh_problems}}</button>
+        </p>
+      </div>
+      <div class="clearfix"></div>
+    </div>
+  {{else}}
+    {{#if thereWereProblems}}
+      <div class="dashboard-stats detected-problems">
+        <div class="look-here">&nbsp;</div>
+        <div class="problem-messages">
+          <p>
+            {{i18n admin.dashboard.no_problems}}
+            <button {{action refreshProblems}} class="btn btn-small"><i class="fa fa-refresh"></i>{{i18n admin.dashboard.refresh_problems}}</button>
+          </p>
+        </div>
+        <div class="clearfix"></div>
+      </div>
+    {{/if}}
+  {{/if}}
 
   <div class="dashboard-stats">
     <table class="table table-condensed table-hover">

diff --git a/app/assets/stylesheets/common/admin/admin_base.scss b/app/assets/stylesheets/common/admin/admin_base.scss
@@ -591,6 +591,7 @@ section.details {
 
 .dashboard-left {
   float: left;
+  margin-top: 10px;
   width: 60%;
 }
 .dashboard-right {
@@ -606,6 +607,8 @@ section.details {
 }
 
 .version-check {
+  margin-top: 10px;
+
   .version-number {
     font-size: 18px;
     font-weight: bold;
@@ -790,9 +793,9 @@ table.api-keys {
   }
 
   .referred-topic-title {
-    width: 410px;
-    @include medium-width { width: 360px; }
-    @include small-width  { width: 320px; }
+    width: 355px;
+    @include medium-width { width: 305px; }
+    @include small-width  { width: 265px; }
   }
 }