Download as
Browse Code »

Commit 20721eff1c9a9a8f291d68538f209091b92961b4

Authored by Dmitriy Zaporozhets
1 parent ae5faf0f
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Bootstrap: Commits page

Showing 4 changed files with 22 additions and 18 deletions   Show diff stats
app/assets/stylesheets/top_panel.scss
  Diff comments   View file @20721ef
... ... @@ -109,7 +109,6 @@ body header {
109 109 margin:0 15px;
110 110 padding:3px;
111 111 border-radius:3px;
112   - float:left;
113 112 }
114 113  
115 114  
... ...
app/views/commits/_commits.html.haml
  Diff comments   View file @20721ef
... ... @@ -2,19 +2,18 @@
2 2 %div{ :class => "commits-date ui-box ui-box-small ui-box-big" }
3 3 .day-commits-table
4 4 %h5.underlined= day.stamp("28 Aug, 2010")
  5 + %br
5 6 %ul.unstyled
6 7 - commits.each do |commit|
7   - %li.wll
8   - %a{ :class => "update-item", :href => project_commit_path(@project, :id => commit.id) }
9   - .right.btn
10   - = truncate(commit.id.to_s, :length => 10)
11   - »
12   - = image_tag gravatar_icon(commit.author_email), :class => "avatar", :width => 32
13   - %span.update-author
14   - %strong= commit.author_name
15   - –
16   - = time_ago_in_words(commit.committed_date)
17   - ago
18   - %p
  8 + %li.entry
  9 + = link_to project_commit_path(@project, :id => commit.id) do
  10 + %div
19 11 %strong
20   - = truncate(commit.safe_message, :length => 50)
  12 + = truncate commit.id.to_s, :length => 10
  13 + –
  14 + = image_tag gravatar_icon(commit.author_email), :class => "", :width => 16
  15 + = truncate(commit.safe_message, :length => 50)
  16 +
  17 + %span.right.cgray
  18 + = time_ago_in_words(commit.committed_date)
  19 + ago
... ...
app/views/commits/index.html.haml
  Diff comments   View file @20721ef
1   -- if current_user.private_token
2   - = content_for :rss_icon do
3   - .rss-icon
  1 +%h3
  2 + Commits
  3 + - if current_user.private_token
  4 + %span.rss-icon
4 5 = link_to project_commits_path(@project, :atom, { :private_token => current_user.private_token, :ref => @ref }) do
5 6 = image_tag "Rss-UI.PNG", :width => 22, :title => "feed"
  7 + = form_tag switch_project_refs_path(@project), :method => :get, :class => "project-refs-form right" do
  8 + = select_tag "ref", grouped_options_refs, :onchange => "$(this.form).trigger('submit');", :class => "project-refs-select"
  9 + = hidden_field_tag :destination, "commits"
  10 +%hr
6 11  
7 12 - if params[:path]
8 13 %ul.breadcrumb
... ... @@ -24,4 +29,5 @@
24 29 :javascript
25 30 $(function(){
26 31 CommitsList.init("#{@ref}", 20);
  32 + $('.project-refs-select').chosen();
27 33 });
... ...
app/views/layouts/_project_side.html.haml
  Diff comments   View file @20721ef
... ... @@ -6,7 +6,7 @@
6 6  
7 7 - if @project.repo_exists?
8 8 = link_to "Repository", project_repository_path(@project), :class => repository_tab_class
9   - = link_to "Tree", tree_project_ref_path(@project), :class => tree_tab_class
  9 + = link_to "Tree", tree_project_ref_path(@project, @project.root_ref), :class => tree_tab_class
10 10 = link_to "Commits", project_commits_path(@project), :class => (controller.controller_name == "commits") ? "current" : nil
11 11 = link_to "Network", graph_project_path(@project), :class => current_page?(:controller => "projects", :action => "graph", :id => @project) ? "current" : nil
12 12 = link_to project_issues_filter_path(@project), :class => (controller.controller_name == "issues") ? "current" : nil do
... ...