From c2982c9a3116f95036d74530f7c20c692cb983d7 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 10 Jan 2013 08:43:25 +0200
Subject: [PATCH] sidekiq.log in admin area. Improved admin dashboard

---
 app/assets/stylesheets/common.scss        |  1 +
 app/views/admin/dashboard/index.html.haml | 44 ++++++++++++++++++++---
 app/views/admin/logs/show.html.haml       | 16 +++++++++
 3 files changed, 56 insertions(+), 5 deletions(-)

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index bcaa6a2f76e..b72c9e93d9e 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -371,6 +371,7 @@ li.note {
         font-size: 48px;
         padding: 20px;
         text-align: center;
+        font-weight: normal;
       }
     }
   }
diff --git a/app/views/admin/dashboard/index.html.haml b/app/views/admin/dashboard/index.html.haml
index 2e572aaba79..9a5e7edea0f 100644
--- a/app/views/admin/dashboard/index.html.haml
+++ b/app/views/admin/dashboard/index.html.haml
@@ -25,17 +25,51 @@
         = link_to 'New User', new_admin_user_path, class: "btn small"
 
 .row
-  .span6
-    %h3 Latest projects
+  .span4
+    %h4 Latest projects
     %hr
     - @projects.each do |project|
       %p
         = link_to project.name_with_namespace, [:admin, project]
-  .span6
-    %h3 Latest users
+        %span.light.right
+          = time_ago_in_words project.created_at
+          ago
+
+  .span4
+    %h4 Latest users
     %hr
     - @users.each do |user|
       %p
         = link_to [:admin, user] do
           = user.name
-          %small= user.email
+        %span.light.right
+          = time_ago_in_words user.created_at
+          ago
+
+  .span4
+    %h4 Stats
+    %hr
+    %p
+      Issues
+      %span.light.right
+        = Issue.count
+    %p
+      Merge Requests
+      %span.light.right
+        = MergeRequest.count
+    %p
+      Notes
+      %span.light.right
+        = Note.count
+    %p
+      Snippets
+      %span.light.right
+        = Snippet.count
+    %p
+      SSH Keys
+      %span.light.right
+        = Key.count
+    %p
+      Milestones
+      %span.light.right
+        = Milestone.count
diff --git a/app/views/admin/logs/show.html.haml b/app/views/admin/logs/show.html.haml
index 25644d6321a..c8be2ffa43c 100644
--- a/app/views/admin/logs/show.html.haml
+++ b/app/views/admin/logs/show.html.haml
@@ -5,6 +5,8 @@
     = link_to "application.log", "#application", 'data-toggle' => 'tab'
   %li
     = link_to "production.log", "#production", 'data-toggle' => 'tab'
+  %li
+    = link_to "sidekiq.log", "#sidekiq", 'data-toggle' => 'tab'
 
 %p.light To prevent perfomance issues admin logs output the last 2000 lines
 .tab-content
@@ -50,3 +52,17 @@
           - Gitlab::Logger.read_latest_for('production.log').each do |line|
             %li
               %p= line
+  .tab-pane#sidekiq
+    .file_holder#README
+      .file_title
+        %i.icon-file
+        sidekiq.log
+        .right
+          = link_to '#', class: 'log-bottom' do
+            %i.icon-arrow-down
+            Scroll down
+      .file_content.logs
+        %ol
+          - Gitlab::Logger.read_latest_for('sidekiq.log').each do |line|
+            %li
+              %p= line