diff options
| author | Riyad Preukschas <riyad@informatik.uni-bremen.de> | 2012-10-16 02:57:15 +0400 |
|---|---|---|
| committer | Riyad Preukschas <riyad@informatik.uni-bremen.de> | 2012-10-16 02:57:15 +0400 |
| commit | 866b9f6d919c90bf402a05780677a5cdd283d582 (patch) | |
| tree | 1ae17c0a950ce8f1e347a85781a6552bf65ae567 /app | |
| parent | 536eb8e82893b5c0ae80f47ca24986ea6d9d4a3a (diff) | |
Make history link for trees look like action links for blobs
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/sections/tree.scss | 4 | ||||
| -rw-r--r-- | app/views/tree/_submodule_item.html.haml | 2 | ||||
| -rw-r--r-- | app/views/tree/_tree.html.haml | 6 | ||||
| -rw-r--r-- | app/views/tree/_tree_item.html.haml | 2 |
4 files changed, 9 insertions, 5 deletions
diff --git a/app/assets/stylesheets/sections/tree.scss b/app/assets/stylesheets/sections/tree.scss index c08a93fc8af..fd12ed00a2a 100644 --- a/app/assets/stylesheets/sections/tree.scss +++ b/app/assets/stylesheets/sections/tree.scss @@ -43,6 +43,10 @@ } .tree-table { + th .btn { + margin: -2px -1px; + padding: 2px 10px; + } td { background:#fafafa; } diff --git a/app/views/tree/_submodule_item.html.haml b/app/views/tree/_submodule_item.html.haml index cfb0256ce88..43fa7f24642 100644 --- a/app/views/tree/_submodule_item.html.haml +++ b/app/views/tree/_submodule_item.html.haml @@ -7,5 +7,5 @@ %strong= truncate(name, length: 40) %td %code= submodule_item.id[0..10] - %td + %td{ colspan: 2 } = link_to truncate(url, length: 40), url diff --git a/app/views/tree/_tree.html.haml b/app/views/tree/_tree.html.haml index 08a83b9b272..71192109b8f 100644 --- a/app/views/tree/_tree.html.haml +++ b/app/views/tree/_tree.html.haml @@ -18,9 +18,8 @@ %thead %th Name %th Last Update - %th - Last commit - = link_to "History", tree.history_path, class: "right" + %th Last Commit + %th= link_to "history", project_commits_path(@project, @id), class: "btn very_small right" - if tree.up_dir? %tr.tree-item @@ -29,6 +28,7 @@ = link_to "..", tree.up_dir_path %td %td + %td = render_tree(tree.contents) diff --git a/app/views/tree/_tree_item.html.haml b/app/views/tree/_tree_item.html.haml index e9675248e79..0a76d5c21b6 100644 --- a/app/views/tree/_tree_item.html.haml +++ b/app/views/tree/_tree_item.html.haml @@ -6,4 +6,4 @@ %span.log_loading.hide Loading commit data... = image_tag "ajax_loader_tree.gif", width: 14 - %td.tree_commit + %td.tree_commit{ colspan: 2 } |