From 183ede84fd80c8d4592869dfb631ec6c2ad58543 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 8 Apr 2007 17:44:54 +0000
Subject: Various changes on views. On project summary, members are now grouped
 by role and subprojects are listed inline.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@434 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/issues/show.rhtml   |  2 +-
 app/views/projects/show.rhtml | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'app/views')

diff --git a/app/views/issues/show.rhtml b/app/views/issues/show.rhtml
index dc386d597..759c54f5e 100644
--- a/app/views/issues/show.rhtml
+++ b/app/views/issues/show.rhtml
@@ -11,7 +11,7 @@
     <td style="width:15%"><b><%=l(:field_priority)%> :</b></td><td style="width:35%"><%= @issue.priority.name %></td>
 </tr>
 <tr>
-    <td><b><%=l(:field_assigned_to)%> :</b></td><td><%= @issue.assigned_to ? @issue.assigned_to.name : "-" %></td>
+    <td><b><%=l(:field_assigned_to)%> :</b></td><td><%= @issue.assigned_to ? link_to_user(@issue.assigned_to) : "-" %></td>
     <td><b><%=l(:field_category)%> :</b></td><td><%=h @issue.category ? @issue.category.name : "-" %></td>
 </tr>
 <tr>
diff --git a/app/views/projects/show.rhtml b/app/views/projects/show.rhtml
index 98259f1f8..bc18a4752 100644
--- a/app/views/projects/show.rhtml
+++ b/app/views/projects/show.rhtml
@@ -5,7 +5,7 @@
 <h2><%=l(:label_overview)%></h2> 
 	
 <div class="splitcontentleft">
-	<%= simple_format(auto_link(h(@project.description))) %>	
+	<%= textilizable @project.description %>	
 	<ul>
 	<% unless @project.homepage.empty? %><li><%=l(:field_homepage)%>: <%= auto_link @project.homepage %></li><% end %>
 	<li><%=l(:field_created_on)%>: <%= format_date(@project.created_on) %></li>
@@ -40,17 +40,15 @@
 <div class="splitcontentright">
 	<div class="box">
 		<h3 class="icon22 icon22-users"><%=l(:label_member_plural)%></h3>	
-		<% for member in @members %>
-		<%= link_to_user member.user %> (<%= member.role.name %>)<br />		
+		<% @members_by_role.keys.sort.each do |role| %>
+		<%= role.name %>: <%= @members_by_role[role].collect(&:user).sort.collect{|u| link_to_user u}.join(", ") %><br />
 		<% end %>		
 	</div>
   
   <% if @subprojects %>
  	<div class="box">
 		<h3 class="icon22 icon22-projects"><%=l(:label_subproject_plural)%></h3>	
-		<% for subproject in @subprojects %>
-		<%= link_to subproject.name, :action => 'show', :id => subproject %><br />		
-		<% end %>		
+		<%= @subprojects.collect{|p| link_to(p.name, :action => 'show', :id => p)}.join(", ") %>
 	</div>
   <% end %>
   
-- 
cgit v1.2.3