Commit 866b9f6d authored by Riyad Preukschas's avatar Riyad Preukschas

Make history link for trees look like action links for blobs

parent 536eb8e8
...@@ -43,6 +43,10 @@ ...@@ -43,6 +43,10 @@
} }
.tree-table { .tree-table {
th .btn {
margin: -2px -1px;
padding: 2px 10px;
}
td { td {
background:#fafafa; background:#fafafa;
} }
......
...@@ -7,5 +7,5 @@ ...@@ -7,5 +7,5 @@
%strong= truncate(name, length: 40) %strong= truncate(name, length: 40)
%td %td
%code= submodule_item.id[0..10] %code= submodule_item.id[0..10]
%td %td{ colspan: 2 }
= link_to truncate(url, length: 40), url = link_to truncate(url, length: 40), url
...@@ -18,9 +18,8 @@ ...@@ -18,9 +18,8 @@
%thead %thead
%th Name %th Name
%th Last Update %th Last Update
%th %th Last Commit
Last commit %th= link_to "history", project_commits_path(@project, @id), class: "btn very_small right"
= link_to "History", tree.history_path, class: "right"
- if tree.up_dir? - if tree.up_dir?
%tr.tree-item %tr.tree-item
...@@ -29,6 +28,7 @@ ...@@ -29,6 +28,7 @@
= link_to "..", tree.up_dir_path = link_to "..", tree.up_dir_path
%td %td
%td %td
%td
= render_tree(tree.contents) = render_tree(tree.contents)
......
...@@ -6,4 +6,4 @@ ...@@ -6,4 +6,4 @@
%span.log_loading.hide %span.log_loading.hide
Loading commit data... Loading commit data...
= image_tag "ajax_loader_tree.gif", width: 14 = image_tag "ajax_loader_tree.gif", width: 14
%td.tree_commit %td.tree_commit{ colspan: 2 }
...@@ -5,14 +5,14 @@ class ProjectBrowseFiles < Spinach::FeatureSteps ...@@ -5,14 +5,14 @@ class ProjectBrowseFiles < Spinach::FeatureSteps
Then 'I should see files from repository' do Then 'I should see files from repository' do
page.should have_content "app" page.should have_content "app"
page.should have_content "History" page.should have_content "history"
page.should have_content "Gemfile" page.should have_content "Gemfile"
end end
Then 'I should see files from repository for "8470d70"' do Then 'I should see files from repository for "8470d70"' do
current_path.should == project_tree_path(@project, "8470d70") current_path.should == project_tree_path(@project, "8470d70")
page.should have_content "app" page.should have_content "app"
page.should have_content "History" page.should have_content "history"
page.should have_content "Gemfile" page.should have_content "Gemfile"
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