Commit 84397ce8 authored by gitlabhq's avatar gitlabhq

commits page

parent 09039323
...@@ -102,54 +102,6 @@ table.round-borders { ...@@ -102,54 +102,6 @@ table.round-borders {
float:left; float:left;
} }
.day-commits-table {
@include round-borders-all(4px);
padding: 4px 0px;
margin-bottom:10px;
display:block;
width:100%;
background: #E6F1F6;
.day-header {
padding:10px;
h3 {
margin:0px;
}
}
ul {
display:block;
list-style:none;
margin:0px;
padding:0px;
li.commit {
display:list-item;
padding:8px;
margin:0px;
background: #F7FBFC;
border-top: 1px solid #E2EAEE;
&:first-child {
border-top: 1px solid #E2EAEE;
}
&:nth-child(2n+1) {
background: white;
}
a.button {
width:85px;
padding:10px;
margin:0px;
float:right;
}
p {
margin-bottom: 3px;
font-size: 13px;
}
}
}
}
@mixin panel-color { @mixin panel-color {
background: #111 !important; background: #111 !important;
background: -webkit-gradient(linear,left top,left bottom,from(#333),to(#111)) !important; background: -webkit-gradient(linear,left top,left bottom,from(#333),to(#111)) !important;
......
- @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|
.day-commits-table %div{ :class => "commits-date ui-box ui-box-small ui-box-big" }
.day-header .day-commits-table
%h3= day.stamp("28 Aug, 2010") %h3= day.stamp("28 Aug, 2010")
%ul .data
- commits.each do |commit| - commits.each do |commit|
%li{ :class => "commit", :url => project_commit_path(@project, :id => commit.id) } %a{ :class => "commit", :href => project_commit_path(@project, :id => commit.id) }
- if commit.author.email %span.commit-info
= image_tag gravatar_icon(commit.author.email), :class => "left", :width => 40, :style => "padding-right:5px;" %data.commit-button
- else = truncate(commit.id.to_s, :length => 16)
= image_tag "no_avatar.png", :class => "left", :width => 40, :style => "padding-right:5px;" %i
%p %data.commit-browse{ :onclick => "location.href='#{tree_project_path(@project, :commit_id => commit.id)}';return false;"}
%strong Browse Code
= truncate(commit.safe_message, :length => 60) - if commit.author.email
= link_to "Browse Code", tree_project_path(@project, :commit_id => commit.id), :class => "lite_button", :style => "float:right" = image_tag gravatar_icon(commit.author.email), :class => "left", :width => 40, :style => "padding-right:5px;"
= link_to truncate(commit.id.to_s, :length => 16), project_commit_path(@project, :id => commit.id), :class => "lite_button", :style => "width:120px;float:right" - else
%span = image_tag "no_avatar.png", :class => "left", :width => 40, :style => "padding-right:5px;"
%span.author %span.commit-title
= commit.author %strong
= time_ago_in_words(commit.committed_date) = truncate(commit.safe_message, :length => 60)
ago %span.commit-author
%strong= commit.author
= time_ago_in_words(commit.committed_date)
ago
= more_commits_link if @commits.size > 99 = more_commits_link if @commits.size > 99
- content_for(:body_class, "project-page commits-page")
%div %div
%h3 %h3
.left .left
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
= javascript_tag do = javascript_tag do
REQ_URI = "#{request.env["REQUEST_URI"]}"; REQ_URI = "#{request.env["REQUEST_URI"]}";
REQ_REFFER = "#{request.env["HTTP_REFERER"]}"; REQ_REFFER = "#{request.env["HTTP_REFERER"]}";
%body.project-page %body{ :class => content_for?(:body_class) ? yield(:body_class) : 'project-page', :id => yield(:boyd_id)}
#container #container
= render :partial => "layouts/flash" = render :partial => "layouts/flash"
= render :partial => "layouts/head_panel" = render :partial => "layouts/head_panel"
...@@ -19,25 +19,25 @@ ...@@ -19,25 +19,25 @@
.fixed .fixed
%input.git-url.text{:id => "", :name => "", :readonly => "", :type => "text", :value => @project.url_to_repo} %input.git-url.text{:id => "", :name => "", :readonly => "", :type => "text", :value => @project.url_to_repo}
%aside %aside
= link_to image_tag("home.png", :width => 20), project_path(@project), :class => current_page?(:controller => "projects", :action => "show", :id => @project) ? "current" : nil = link_to "History", project_path(@project), :class => current_page?(:controller => "projects", :action => "show", :id => @project) ? "current" : nil
= link_to "Tree", tree_project_path(@project), :class => current_page?(:controller => "projects", :action => "tree", :id => @project) ? "current" : nil = link_to "Tree", tree_project_path(@project), :class => current_page?(:controller => "projects", :action => "tree", :id => @project) ? "current" : nil
= link_to "Commits", project_commits_path(@project), :class => current_page?(:controller => "commits", :action => "index", :project_id => @project) ? "current" : nil = link_to "Commits", project_commits_path(@project), :class => current_page?(:controller => "commits", :action => "index", :project_id => @project) ? "current" : nil
= link_to team_project_path(@project), :class => (current_page?(:controller => "projects", :action => "team", :id => @project) || controller.controller_name == "team_members") ? "current" : nil do = link_to team_project_path(@project), :class => (current_page?(:controller => "projects", :action => "team", :id => @project) || controller.controller_name == "team_members") ? "current" : nil do
Team Team
- if @project.users_projects.count > 0 - if @project.users_projects.count > 0
%span{ :class => "top_menu_count" }= @project.users_projects.count %span{ :class => "number" }= @project.users_projects.count
= link_to project_issues_path(@project), :class => (controller.controller_name == "issues") ? "current" : nil do = link_to project_issues_path(@project), :class => (controller.controller_name == "issues") ? "current" : nil do
Issues Issues
- if @project.issues.opened.count > 0 - if @project.issues.opened.count > 0
%span{ :class => "top_menu_count" }= @project.issues.opened.count %span{ :class => "number" }= @project.issues.opened.count
= link_to wall_project_path(@project), :class => current_page?(:controller => "projects", :action => "wall", :id => @project) ? "current" : nil do = link_to wall_project_path(@project), :class => current_page?(:controller => "projects", :action => "wall", :id => @project) ? "current" : nil do
Wall Wall
- if @project.common_notes.count > 0 - if @project.common_notes.count > 0
%span{ :class => "top_menu_count" }= @project.common_notes.count %span{ :class => "number" }= @project.common_notes.count
= link_to project_snippets_path(@project), :class => (controller.controller_name == "snippets") ? "current" : nil do = link_to project_snippets_path(@project), :class => (controller.controller_name == "snippets") ? "current" : nil do
Snippets Snippets
- if @project.snippets.count > 0 - if @project.snippets.count > 0
%span{ :class => "top_menu_count" }= @project.snippets.non_expired.count %span{ :class => "number" }= @project.snippets.non_expired.count
- if @commit - if @commit
= link_to truncate(commit_name(@project,@commit), :length => 15), project_commit_path(@project, :id => @commit.id), :class => current_page?(:controller => "commits", :action => "show", :project_id => @project, :id => @commit.id) ? "current" : nil = link_to truncate(commit_name(@project,@commit), :length => 15), project_commit_path(@project, :id => @commit.id), :class => current_page?(:controller => "commits", :action => "show", :project_id => @project, :id => @commit.id) ? "current" : nil
......
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