From dd333bfe6dfb074c2d2daba995b1a31e859d3013 Mon Sep 17 00:00:00 2001 From: Rafael Reggiani Manzo Date: Mon, 4 Nov 2013 23:38:01 -0200 Subject: [PATCH] Module tree using Glyphicons that are available through Twitter Bootstrap --- app/assets/images/file.png | Bin 3198 -> 0 bytes app/assets/images/folder.png | Bin 5163 -> 0 bytes app/views/repositories/_module_result.html.erb | 11 +++++------ app/views/repositories/show.html.erb | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) delete mode 100644 app/assets/images/file.png delete mode 100644 app/assets/images/folder.png diff --git a/app/assets/images/file.png b/app/assets/images/file.png deleted file mode 100644 index ef0784d..0000000 Binary files a/app/assets/images/file.png and /dev/null differ diff --git a/app/assets/images/folder.png b/app/assets/images/folder.png deleted file mode 100644 index 4e95aef..0000000 Binary files a/app/assets/images/folder.png and /dev/null differ diff --git a/app/views/repositories/_module_result.html.erb b/app/views/repositories/_module_result.html.erb index de948a8..04107df 100644 --- a/app/views/repositories/_module_result.html.erb +++ b/app/views/repositories/_module_result.html.erb @@ -1,11 +1,10 @@ - <% if(module_result.children.empty?) then - icon = "file.png" - else - icon = "folder.png" - end %> - <%= image_tag(icon, :size => "20x16") %> + <% if module_result.folder? %> + + <% else %> + + <% end %> <%= link_to module_result.module.name, project_repository_module_path(repository.project_id, repository.id, module_result.id) %> <%= module_result.module.granularity %> diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb index 7dbfff5..42209a9 100644 --- a/app/views/repositories/show.html.erb +++ b/app/views/repositories/show.html.erb @@ -52,7 +52,7 @@ <%= format_grade(@root_module_result.grade) %>

<% unless @root_module_result.parent_id.nil? %> -

<%= link_to '../', project_repository_module_path(@repository.project_id, @repository.id, @root_module_result.parent_id) %>

+

<%= link_to '../', project_repository_module_path(@repository.project_id, @repository.id, @root_module_result.parent_id) %>

<% end %> <% children = @root_module_result.children %> <% unless children.empty? %> -- libgit2 0.21.2