deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Update usages of tree_file_project_ref_path to project_tree_path

Browse source
This commit is contained in:
Robert Speicher 2012-09-17 12:39:57 -04:00
parent e33cbb9b42
commit 79a02df92e
20 changed files with 41 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/views/tree/_head.html.haml
View file

@ -1,8 +1,8 @@
%ul.nav.nav-tabs
%li
= render partial: 'shared/ref_switcher', locals: {destination: 'tree', path: params[:path]}
%li{class: "#{'active' if (controller.controller_name == "refs") }"}
= link_to tree_project_ref_path(@project, @ref) do
%li{class: "#{'active' if (controller.controller_name == "tree") }"}
= link_to project_tree_path(@project, @ref) do
Source
%li.right
.input-prepend.project_clone_holder

10
app/views/tree/_tree.html.haml
View file

@ -1,7 +1,7 @@
%ul.breadcrumb
%li
%span.arrow
= link_to tree_project_ref_path(@project, @ref, path: nil), remote: true do
= link_to project_tree_path(@project, @ref), remote: true do
= @project.name
- tree.breadcrumbs(6) do |link|
\/
@ -10,7 +10,7 @@
%div.tree_progress
#tree-content-holder
- if tree.is_blob?
= render partial: "refs/tree_file", locals: { name: tree.name, content: tree.data, file: tree }
= render partial: "tree/tree_file", locals: { name: tree.name, content: tree.data, file: tree }
- else
- contents = tree.contents
%table#tree-slider{class: "table_#{@hex_path}" }
@ -31,11 +31,11 @@
- index = 0
- contents.select{ |i| i.is_a?(Grit::Tree)}.each do |content|
= render partial: "refs/tree_item", locals: { content: content, index: (index += 1) }
= render partial: "tree/tree_item", locals: { content: content, index: (index += 1) }
- contents.select{ |i| i.is_a?(Grit::Blob)}.each do |content|
= render partial: "refs/tree_item", locals: { content: content, index: (index += 1) }
= render partial: "tree/tree_item", locals: { content: content, index: (index += 1) }
- contents.select{ |i| i.is_a?(Grit::Submodule)}.each do |content|
= render partial: "refs/submodule_item", locals: { content: content, index: (index += 1) }
= render partial: "tree/submodule_item", locals: { content: content, index: (index += 1) }
- if content = contents.select{ |c| c.is_a?(Grit::Blob) and c.name =~ /^readme/i }.first
.file_holder#README

4
app/views/tree/_tree_file.html.haml
View file

@ -5,9 +5,9 @@
= name.force_encoding('utf-8')
%small #{file.mode}
%span.options
= link_to "raw", blob_project_ref_path(@project, @ref, path: params[:path]), class: "btn very_small", target: "_blank"
= link_to "raw", blob_project_ref_path(@project, @ref, path: @path), class: "btn very_small", target: "_blank"
= link_to "history", project_commits_path(@project, path: params[:path], ref: @ref), class: "btn very_small"
= link_to "blame", blame_file_project_ref_path(@project, @ref, path: params[:path]), class: "btn very_small"
= link_to "blame", blame_file_project_ref_path(@project, @ref, path: @path.gsub(/^\//, '')), class: "btn very_small"
- if file.text?
- if gitlab_markdown?(name)
.file_content.wiki

4
app/views/tree/_tree_item.html.haml
View file

@ -1,8 +1,8 @@
- file = tree_full_path(content)
%tr{ class: "tree-item #{tree_hex_class(content)}", url: tree_file_project_ref_path(@project, @ref, file) }
%tr{ class: "tree-item #{tree_hex_class(content)}", url: project_tree_path(@project, tree_join(@id, file)) }
%td.tree-item-file-name
= tree_icon(content)
%strong= link_to truncate(content.name, length: 40), tree_file_project_ref_path(@project, @ref || @commit.id, file), remote: :true
%strong= link_to truncate(content.name, length: 40), project_tree_path(@project, tree_join(@id || @commit.id, file)), remote: :true
%td.tree_time_ago.cgray
- if index == 1
%span.log_loading