Admin logs improved. Commits list box styled

7 files changed, 58 insertions, 20 deletions

diff --git a/app/assets/stylesheets/gitlab_bootstrap.scss b/app/assets/stylesheets/gitlab_bootstrap.scss
index e2d639065ed..8197590f5a2 100644
--- a/app/assets/stylesheets/gitlab_bootstrap.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap.scss
@@ -202,6 +202,10 @@ a:focus {
   color:$style_color;
 }
 
+.nav-tabs > .active > a { 
+  font-weight:bold;
+}
+
 /** COLORS **/
 .cgray { color:gray; }
 .cred { color:#D12F19; }
@@ -443,6 +447,13 @@ form {
     background-image: -moz-linear-gradient(#eee 6.6%, #dfdfdf);
     background-image: -o-linear-gradient(#eee 6.6%, #dfdfdf);
 
+    &.small { 
+      line-height: 28px;
+      font-size: 14px;
+      line-height:28px;
+      text-shadow: 0 1px 1px white;
+    }
+
     form { 
       padding:9px 0;
       margin:0px;
@@ -628,13 +639,6 @@ h3.page_title {
   line-height: 28px;
 }
 
-pre.logs { 
-  .log { 
-    font-size:12px;
-    line-height:18px;
-  }
-}
-
 /**
  * File content holder 
  *
@@ -676,10 +680,10 @@ pre.logs {
   }
   .file_content {
     background:#fff;
-    color:#514721;
     font-size: 11px;
 
     &.wiki { 
+      font-size: 13px;
       code { 
         padding:0 4px;
       }
@@ -730,6 +734,33 @@ pre.logs {
       }
     }
 
+    &.logs { 
+      background:#eee;
+      max-height: 700px;
+      overflow-y: auto;
+
+      ol { 
+        margin-left:40px;
+        padding: 10px 0;
+        border-left: 1px solid #CCC;
+        margin-bottom:0;
+        background: white;
+        li { 
+          color:#888;
+          p { 
+            margin:0;
+            color:#333;
+            line-height:24px;
+            padding-left: 10px;
+          }
+
+          &:hover { 
+            background:$hover;
+          }
+        }
+      }
+    }
+
     /**
      *  Code file
      */
diff --git a/app/views/admin/logs/show.html.haml b/app/views/admin/logs/show.html.haml
index 7963e18adcd..800d3bb288f 100644
--- a/app/views/admin/logs/show.html.haml
+++ b/app/views/admin/logs/show.html.haml
@@ -1,6 +1,9 @@
-%h4
-  %i.icon-file
-  githost.log
-%pre.logs
-  - Gitlab::Logger.read_latest.each do |line|
-    %span.log= line
+.file_holder#README
+  .file_title
+    %i.icon-file
+    githost.log
+  .file_content.logs
+    %ol
+      - Gitlab::Logger.read_latest.each do |line|
+        %li
+          %p= line
diff --git a/app/views/commits/_commits.html.haml b/app/views/commits/_commits.html.haml
index c2c9ca624b2..c3c7d49ce74 100644
--- a/app/views/commits/_commits.html.haml
+++ b/app/views/commits/_commits.html.haml
@@ -1,4 +1,6 @@
 - @commits.group_by { |c| c.committed_date.to_date }.each do |day, commits|
   %div.ui-box
-    %h5= day.stamp("28 Aug, 2010")
+    %h5.small
+      %i.icon-calendar
+      = day.stamp("28 Aug, 2010")
     %ul.unstyled= render commits
diff --git a/app/views/commits/_head.html.haml b/app/views/commits/_head.html.haml
index 8e9195c5b50..453ca4eac12 100644
--- a/app/views/commits/_head.html.haml
+++ b/app/views/commits/_head.html.haml
@@ -13,12 +13,12 @@
   %li{:class => "#{branches_tab_class}"}
     = link_to project_repository_path(@project) do
       Branches
-      %span.number= @project.repo.branch_count
+      %span.badge= @project.repo.branch_count
 
   %li{:class => "#{'active' if current_page?(tags_project_repository_path(@project)) }"}
     = link_to tags_project_repository_path(@project) do
       Tags
-      %span.number= @project.repo.tag_count
+      %span.badge= @project.repo.tag_count
 
 
   - if current_page?(project_commits_path(@project)) && current_user.private_token
diff --git a/app/views/commits/compare.html.haml b/app/views/commits/compare.html.haml
index c02263296f4..66ed8dad595 100644
--- a/app/views/commits/compare.html.haml
+++ b/app/views/commits/compare.html.haml
@@ -20,7 +20,7 @@
       = "..."
       = text_field_tag :to, params[:to], :placeholder => "aa8b4ef", :class => "xlarge"
     .actions
-      = submit_tag "Compare", :class => "btn primary"
+      = submit_tag "Compare", :class => "btn btn-primary"
 
 
 - unless @commits.empty?
diff --git a/app/views/merge_requests/show/_commits.html.haml b/app/views/merge_requests/show/_commits.html.haml
index 78fe1a062d3..d10e8fd597a 100644
--- a/app/views/merge_requests/show/_commits.html.haml
+++ b/app/views/merge_requests/show/_commits.html.haml
@@ -1,6 +1,8 @@
 - if @commits.present?
   .ui-box
-    %h5 Commits (#{@commits.count})
+    %h5
+      %i.icon-list
+      Commits (#{@commits.count})
     .merge-request-commits
       - if @commits.count > 8
         %ul.first_mr_commits.unstyled
diff --git a/lib/gitlab/logger.rb b/lib/gitlab/logger.rb
index e8d20ad90c2..5249fdbca0e 100644
--- a/lib/gitlab/logger.rb
+++ b/lib/gitlab/logger.rb
@@ -8,7 +8,7 @@ module Gitlab
 
     def self.read_latest
       path = Rails.root.join("log/githost.log")
-      logs = `tail -n 50 #{path}`.split("\n")
+      logs = File.read(path).split("\n")
     end
   end
 end