submodules displayed for tree view

8 files changed, 38 insertions, 9 deletions

diff --git a/app/assets/images/submodule.png b/app/assets/images/submodule.png
new file mode 100644
index 00000000000..62a88cc619b
--- /dev/null
+++ b/app/assets/images/submodule.png
diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 6bd7cfc4a95..d952033faa0 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -234,12 +234,19 @@ img.lil_av {
   border-color:#ddd;
 
   h5 { 
-    padding: 5px 10px;
+    padding: 0 10px;
     background:#f5f5f5;
     border-bottom: 1px solid #ccc;
+    @include round-borders-top(4px);
+    border-top:none;
   }
 
   li {
     padding:10px;
+    &:first-child { 
+      @include round-borders-top(4px);
+      border-top:none;
+    }
   }
+
 }
diff --git a/app/assets/stylesheets/tree.scss b/app/assets/stylesheets/tree.scss
index cacdaa66570..b023dd77a96 100644
--- a/app/assets/stylesheets/tree.scss
+++ b/app/assets/stylesheets/tree.scss
@@ -144,3 +144,7 @@ table.highlighttable .linenodiv pre {
     background:#f5f5f5;
   }
 }
+
+.tree-commit-link { 
+  color:#333;
+}
diff --git a/app/controllers/commits_controller.rb b/app/controllers/commits_controller.rb
index 18f2758794e..c7fcae3b79a 100644
--- a/app/controllers/commits_controller.rb
+++ b/app/controllers/commits_controller.rb
@@ -28,6 +28,7 @@ class CommitsController < ApplicationController
     @notes = project.commit_notes(@commit).fresh.limit(20)
     @note = @project.build_commit_note(@commit)
 
+    @comments_allowed = true
     @line_notes = project.commit_line_notes(@commit)
 
     respond_to do |format|
diff --git a/app/views/commits/_text_file.html.haml b/app/views/commits/_text_file.html.haml
index 3058ee1d9bf..a9b3f65aa81 100644
--- a/app/views/commits/_text_file.html.haml
+++ b/app/views/commits/_text_file.html.haml
@@ -8,12 +8,14 @@
       - else 
         %td.old_line
           = link_to raw(type == "new" ? "&nbsp;" : line_old), "##{line_code}", :id => line_code
-          = link_to "", "#", :class => "line_note_link", "line_code" => line_code, :title => "Add note for this line"
+          - if @comments_allowed
+            = link_to "", "#", :class => "line_note_link", "line_code" => line_code, :title => "Add note for this line" 
         %td.new_line= link_to raw(type == "old" ? "&nbsp;" : line_new) , "##{line_code}", :id => line_code
         %td.line_content{:class => "noteable_line #{type} #{line_code}", "line_code" => line_code}= raw "#{line} &nbsp;"
-
-        - comments = @line_notes.select { |n| n.line_code == line_code }.sort_by(&:created_at).reverse
-        - unless comments.empty?
-          - comments.each do |note|
-            = render "notes/per_line_show", :note => note
-            - @line_notes.reject!{ |n| n == note }
+        
+        - if @comments_allowed
+          - comments = @line_notes.select { |n| n.line_code == line_code }.sort_by(&:created_at).reverse
+          - unless comments.empty?
+            - comments.each do |note|
+              = render "notes/per_line_show", :note => note
+              - @line_notes.reject!{ |n| n == note }
diff --git a/app/views/refs/_submodule_item.html.haml b/app/views/refs/_submodule_item.html.haml
new file mode 100644
index 00000000000..fc32c37b9a4
--- /dev/null
+++ b/app/views/refs/_submodule_item.html.haml
@@ -0,0 +1,13 @@
+- url = content.url(@ref)
+- name = content.basename
+- return unless url
+%tr{ :class => "tree-item", :url => url }
+  %td.tree-item-file-name
+    = image_tag "submodule.png"
+    %strong= truncate(name, :length => 40)
+  %td
+    %code= content.id[0..10]
+  %td
+    = link_to truncate(url, :length => 40), url
+
+
diff --git a/app/views/refs/_tree.html.haml b/app/views/refs/_tree.html.haml
index d1fcc2958bf..e2360360ad8 100644
--- a/app/views/refs/_tree.html.haml
+++ b/app/views/refs/_tree.html.haml
@@ -39,6 +39,8 @@
         = render :partial => "refs/tree_item", :locals => { :content => content }
       - contents.select{ |i| i.is_a?(Grit::Blob)}.each do |content|
         = render :partial => "refs/tree_item", :locals => { :content => content }
+      - contents.select{ |i| i.is_a?(Grit::Submodule)}.each do |content|
+        = render :partial => "refs/submodule_item", :locals => { :content => content }
 
     - if content = contents.select{ |c| c.is_a?(Grit::Blob) and c.name =~ /^readme/i }.first
       #tree-readme-holder
diff --git a/app/views/refs/_tree_item.html.haml b/app/views/refs/_tree_item.html.haml
index 73385514cd0..b5c29220da7 100644
--- a/app/views/refs/_tree_item.html.haml
+++ b/app/views/refs/_tree_item.html.haml
@@ -15,4 +15,4 @@
     - tm = @project.team_member_by_name_or_email(content_commit.author_email, content_commit.author_name)
     - if tm
       = link_to "[#{tm.user_name}]", project_team_member_path(@project, tm)
-    = link_to truncate(content_commit.safe_message, :length => tm ? 20 : 40), project_commit_path(@project, content_commit.id), :class => "tree-commit-link"
+    = link_to truncate(content_commit.safe_message, :length => tm ? 30 : 50), project_commit_path(@project, content_commit.id), :class => "tree-commit-link"