Commit 2a705c4f authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Admin logs improved. Commits list box styled

parent 244a1cad
...@@ -202,6 +202,10 @@ a:focus { ...@@ -202,6 +202,10 @@ a:focus {
color:$style_color; color:$style_color;
} }
.nav-tabs > .active > a {
font-weight:bold;
}
/** COLORS **/ /** COLORS **/
.cgray { color:gray; } .cgray { color:gray; }
.cred { color:#D12F19; } .cred { color:#D12F19; }
...@@ -443,6 +447,13 @@ form { ...@@ -443,6 +447,13 @@ form {
background-image: -moz-linear-gradient(#eee 6.6%, #dfdfdf); background-image: -moz-linear-gradient(#eee 6.6%, #dfdfdf);
background-image: -o-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 { form {
padding:9px 0; padding:9px 0;
margin:0px; margin:0px;
...@@ -628,13 +639,6 @@ h3.page_title { ...@@ -628,13 +639,6 @@ h3.page_title {
line-height: 28px; line-height: 28px;
} }
pre.logs {
.log {
font-size:12px;
line-height:18px;
}
}
/** /**
* File content holder * File content holder
* *
...@@ -676,10 +680,10 @@ pre.logs { ...@@ -676,10 +680,10 @@ pre.logs {
} }
.file_content { .file_content {
background:#fff; background:#fff;
color:#514721;
font-size: 11px; font-size: 11px;
&.wiki { &.wiki {
font-size: 13px;
code { code {
padding:0 4px; padding:0 4px;
} }
...@@ -730,6 +734,33 @@ pre.logs { ...@@ -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 * Code file
*/ */
......
%h4 .file_holder#README
%i.icon-file .file_title
githost.log %i.icon-file
%pre.logs githost.log
- Gitlab::Logger.read_latest.each do |line| .file_content.logs
%span.log= line %ol
- Gitlab::Logger.read_latest.each do |line|
%li
%p= line
- @commits.group_by { |c| c.committed_date.to_date }.each do |day, commits| - @commits.group_by { |c| c.committed_date.to_date }.each do |day, commits|
%div.ui-box %div.ui-box
%h5= day.stamp("28 Aug, 2010") %h5.small
%i.icon-calendar
= day.stamp("28 Aug, 2010")
%ul.unstyled= render commits %ul.unstyled= render commits
...@@ -13,12 +13,12 @@ ...@@ -13,12 +13,12 @@
%li{:class => "#{branches_tab_class}"} %li{:class => "#{branches_tab_class}"}
= link_to project_repository_path(@project) do = link_to project_repository_path(@project) do
Branches Branches
%span.number= @project.repo.branch_count %span.badge= @project.repo.branch_count
%li{:class => "#{'active' if current_page?(tags_project_repository_path(@project)) }"} %li{:class => "#{'active' if current_page?(tags_project_repository_path(@project)) }"}
= link_to tags_project_repository_path(@project) do = link_to tags_project_repository_path(@project) do
Tags Tags
%span.number= @project.repo.tag_count %span.badge= @project.repo.tag_count
- if current_page?(project_commits_path(@project)) && current_user.private_token - if current_page?(project_commits_path(@project)) && current_user.private_token
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
= "..." = "..."
= text_field_tag :to, params[:to], :placeholder => "aa8b4ef", :class => "xlarge" = text_field_tag :to, params[:to], :placeholder => "aa8b4ef", :class => "xlarge"
.actions .actions
= submit_tag "Compare", :class => "btn primary" = submit_tag "Compare", :class => "btn btn-primary"
- unless @commits.empty? - unless @commits.empty?
......
- if @commits.present? - if @commits.present?
.ui-box .ui-box
%h5 Commits (#{@commits.count}) %h5
%i.icon-list
Commits (#{@commits.count})
.merge-request-commits .merge-request-commits
- if @commits.count > 8 - if @commits.count > 8
%ul.first_mr_commits.unstyled %ul.first_mr_commits.unstyled
......
...@@ -8,7 +8,7 @@ module Gitlab ...@@ -8,7 +8,7 @@ module Gitlab
def self.read_latest def self.read_latest
path = Rails.root.join("log/githost.log") path = Rails.root.join("log/githost.log")
logs = `tail -n 50 #{path}`.split("\n") logs = File.read(path).split("\n")
end end
end end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment