Integrated revision graph into scmid column.

Allow wrapping of comment text so that the width doesn't overlap the sidebar while using multiple repositories.
Some code cleanup also.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8850 e93f8b46-1217-0410-a6f0-8f06a7374b81

2 files changed, 21 insertions, 33 deletions

diff --git a/app/views/repositories/_revision_graph.html.erb b/app/views/repositories/_revision_graph.html.erb
index ef04220af..db82bedae 100644
--- a/app/views/repositories/_revision_graph.html.erb
+++ b/app/views/repositories/_revision_graph.html.erb
@@ -4,9 +4,10 @@
 <script type="text/javascript" charset="utf-8">
   Event.observe(window, 'load', function(){
     revisionGraph(
-        document.getElementById("holder"),
-        <%= commits.to_json.html_safe %>);
+        document.getElementById('holder'),
+        <%= commits.to_json.html_safe %>,
+        <%= space %>);
   });
 </script>
 
-<div id="holder" class="graph"></div>
+<div id="holder" class="revision-graph" style="width: <%= (space + 1) * 20 %>px;"></div>
diff --git a/app/views/repositories/_revisions.html.erb b/app/views/repositories/_revisions.html.erb
index 77744dae1..cb583689d 100644
--- a/app/views/repositories/_revisions.html.erb
+++ b/app/views/repositories/_revisions.html.erb
@@ -6,9 +6,6 @@
      ) do %>
 <table class="list changesets">
 <thead><tr>
-<% if show_revision_graph %>
-  <th></th>
-<% end %>
 <th>#</th>
 <th></th>
 <th></th>
@@ -18,40 +15,30 @@
 </tr></thead>
 <tbody>
 <% show_diff = revisions.size > 1 %>
+<%= if show_revision_graph && revisions && revisions.any?
+    indexed_commits, graph_space = index_commits(revisions, @repository.branches) do |scmid|
+                             url_for(
+                               :controller => 'repositories',
+                               :action => 'revision',
+                               :id => project,
+                               :repository_id => @repository.identifier_param,
+                               :rev => scmid)
+                         end
+    render :partial => 'revision_graph',
+         :locals => {
+            :commits => indexed_commits,
+            :space => graph_space
+        }
+end %>
 <% line_num = 1 %>
 <% revisions.each do |changeset| %>
 <tr class="changeset <%= cycle 'odd', 'even' %>">
-<% if show_revision_graph %>
-  <% if line_num == 1 %>
-    <td class="revision_graph" rowspan="<%= revisions.size %>">
-      <%= render :partial => 'revision_graph',
-                 :locals => {
-                    :commits => index_commits(
-                                 revisions,
-                                 @repository.branches) do |scmid|
-                                     url_for(
-                                       :controller => 'repositories',
-                                       :action => 'revision',
-                                       :id => project,
-                                       :repository_id => @repository.identifier_param,
-                                       :rev => scmid)
-                                end
-                    } %>
-    </td>
-  <% end %>
-<% end %>
-<td class="id"><%= link_to_revision(changeset, @repository) %></td>
+<td class="id"<%= show_revision_graph ? " style=\"padding-left:#{(graph_space + 1) * 20}px\"" : '' %>><%= link_to_revision(changeset, @repository) %></td>
 <td class="checkbox"><%= radio_button_tag('rev', changeset.identifier, (line_num==1), :id => "cb-#{line_num}", :onclick => "$('cbto-#{line_num+1}').checked=true;") if show_diff && (line_num < revisions.size) %></td>
 <td class="checkbox"><%= radio_button_tag('rev_to', changeset.identifier, (line_num==2), :id => "cbto-#{line_num}", :onclick => "if ($('cb-#{line_num}').checked==true) {$('cb-#{line_num-1}').checked=true;}") if show_diff && (line_num > 1) %></td>
 <td class="committed_on"><%= format_time(changeset.committed_on) %></td>
 <td class="author"><%= h truncate(changeset.author.to_s, :length => 30) %></td>
-<% if show_revision_graph %>
-  <td class="comments_nowrap">
-    <%= textilizable(truncate(truncate_at_line_break(changeset.comments, 0), :length => 90)) %>
-  </td>
-<% else %>
-  <td class="comments"><%= textilizable(truncate_at_line_break(changeset.comments)) %></td>
-<% end %>
+<td class="comments"><%= textilizable(truncate_at_line_break(changeset.comments)) %></td>
 </tr>
 <% line_num += 1 %>
 <% end %>