diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-06-16 20:26:52 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-06-16 18:22:44 -0400 |
| commit | 465f4c3054bdd8c1d5b6312519be6001aad2cf38 (patch) | |
| tree | a225ac5d96b247c33f7c6acb2f70890847459222 | |
| parent | e4366b8ab931fa6ce1d10d6ecc30ae5f888ef23f (diff) | |
| download | gitlab-ce-465f4c3054bdd8c1d5b6312519be6001aad2cf38.tar.gz | |
Merge branch 'tree-file-title' into 'master'
Added title attribute to entries in tree view
## What does this MR do?
Adds a title attribute to entries in the tree view. Moe useful when files have long names.
## What are the relevant issue numbers?
Closes #18353
See merge request !4709
| -rw-r--r-- | app/views/projects/tree/_blob_item.html.haml | 5 | ||||
| -rw-r--r-- | app/views/projects/tree/_tree_item.html.haml | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/app/views/projects/tree/_blob_item.html.haml b/app/views/projects/tree/_blob_item.html.haml index 2ddc5d504fa..a3a4dba3fa4 100644 --- a/app/views/projects/tree/_blob_item.html.haml +++ b/app/views/projects/tree/_blob_item.html.haml @@ -1,8 +1,9 @@ %tr{ class: "tree-item #{tree_hex_class(blob_item)}" } %td.tree-item-file-name = tree_icon(type, blob_item.mode, blob_item.name) - %span.str-truncated - = link_to blob_item.name, namespace_project_blob_path(@project.namespace, @project, tree_join(@id || @commit.id, blob_item.name)) + - file_name = blob_item.name + = link_to namespace_project_blob_path(@project.namespace, @project, tree_join(@id || @commit.id, blob_item.name)), title: file_name do + %span.str-truncated= file_name %td.tree_time_ago.cgray = render 'projects/tree/spinner' %td.hidden-xs.tree_commit diff --git a/app/views/projects/tree/_tree_item.html.haml b/app/views/projects/tree/_tree_item.html.haml index cf65057e704..9577696fc0d 100644 --- a/app/views/projects/tree/_tree_item.html.haml +++ b/app/views/projects/tree/_tree_item.html.haml @@ -1,9 +1,9 @@ %tr{ class: "tree-item #{tree_hex_class(tree_item)}" } %td.tree-item-file-name = tree_icon(type, tree_item.mode, tree_item.name) - %span.str-truncated - - path = flatten_tree(tree_item) - = link_to path, namespace_project_tree_path(@project.namespace, @project, tree_join(@id || @commit.id, path)) + - path = flatten_tree(tree_item) + = link_to namespace_project_tree_path(@project.namespace, @project, tree_join(@id || @commit.id, path)), title: path do + %span.str-truncated= path %td.tree_time_ago.cgray = render 'projects/tree/spinner' %td.hidden-xs.tree_commit |