Merged trunk r1773.

git-svn-id: http://redmine.rubyforge.org/svn/branches/work@1774 e93f8b46-1217-0410-a6f0-8f06a7374b81

groups/app/views/projects/_form.rhtml

@@ -13,12 +13,12 @@
 <% unless @project.identifier_frozen? %>
 <br /><em><%= l(:text_length_between, 3, 20) %> <%= l(:text_project_identifier_info) %></em>
 <% end %></p>
-<p><%= f.text_field :homepage, :size => 40 %></p>
+<p><%= f.text_field :homepage, :size => 60 %></p>
 <p><%= f.check_box :is_public %></p>
 <%= wikitoolbar_for 'project_description' %>
 
-<% for @custom_value in @custom_values %>
-	<p><%= custom_field_tag_with_label @custom_value %></p>
+<% @project.custom_field_values.each do |value| %>
+	<p><%= custom_field_tag_with_label :project, value %></p>
 <% end %>
 </div>
 
@@ -34,15 +34,15 @@
 </fieldset>
 <% end %>
 
-<% unless @custom_fields.empty? %>
+<% unless @issue_custom_fields.empty? %>
 <fieldset class="box"><legend><%=l(:label_custom_field_plural)%></legend>
-<% for custom_field in @custom_fields %>
+<% @issue_custom_fields.each do |custom_field| %>
     <label class="floating">
-	<%= check_box_tag 'project[custom_field_ids][]', custom_field.id, ((@project.custom_fields.include? custom_field) or custom_field.is_for_all?), (custom_field.is_for_all? ? {:disabled => "disabled"} : {}) %>
+	<%= check_box_tag 'project[issue_custom_field_ids][]', custom_field.id, (@project.all_issue_custom_fields.include? custom_field), (custom_field.is_for_all? ? {:disabled => "disabled"} : {}) %>
 	<%= custom_field.name %>
 	</label>
 <% end %>
-<%= hidden_field_tag 'project[custom_field_ids][]', '' %>
+<%= hidden_field_tag 'project[issue_custom_field_ids][]', '' %>
 </fieldset>
 <% end %>
 <!--[eoform:project]-->

groups/app/views/projects/activity.rhtml

@@ -6,11 +6,11 @@
 <h3><%= format_activity_day(day) %></h3>
 <dl>
 <% @events_by_day[day].sort {|x,y| y.event_datetime <=> x.event_datetime }.each do |e| -%>
-  <dt class="<%= e.event_type %>"><span class="time"><%= format_time(e.event_datetime, false) %></span>
-  <%= content_tag('span', h(e.project), :class => 'project') if @project.nil? || @project != e.project %> <%= link_to h(truncate(e.event_title, 100)), e.event_url %></dt>
-  <dd><% unless e.event_description.blank? -%>
-  <span class="description"><%= format_activity_description(e.event_description) %></span><br />
-  <% end %>
+  <dt class="<%= e.event_type %> <%= User.current.logged? && e.respond_to?(:event_author) && User.current == e.event_author ? 'me' : nil %>">
+  <span class="time"><%= format_time(e.event_datetime, false) %></span>
+  <%= content_tag('span', h(e.project), :class => 'project') if @project.nil? || @project != e.project %>
+  <%= link_to format_activity_title(e.event_title), e.event_url %></dt>
+  <dd><span class="description"><%= format_activity_description(e.event_description) %></span>
   <span class="author"><%= e.event_author if e.respond_to?(:event_author) %></span></dd>
 <% end -%>
 </dl>
@@ -44,8 +44,8 @@
 <% content_for :sidebar do %>
 <% form_tag({}, :method => :get) do %>
 <h3><%= l(:label_activity) %></h3>
-<p><% @event_types.each do |t| %>
-<label><%= check_box_tag "show_#{t}", 1, @scope.include?(t) %> <%= l("label_#{t.singularize}_plural")%></label><br />
+<p><% @activity.event_types.each do |t| %>
+<label><%= check_box_tag "show_#{t}", 1, @activity.scope.include?(t) %> <%= l("label_#{t.singularize}_plural")%></label><br />
 <% end %></p>
 <% if @project && @project.active_children.any? %>
     <p><label><%= check_box_tag 'with_subprojects', 1, @with_subprojects %> <%=l(:label_subproject_plural)%></label></p>

groups/app/views/projects/calendar.rhtml

@@ -23,7 +23,7 @@
 <% content_for :sidebar do %>
     <h3><%= l(:label_calendar) %></h3>
     
-    <% form_tag() do %>
+    <% form_tag({}, :method => :get) do %>
     <p><%= select_month(@month, :prefix => "month", :discard_type => true) %>
     <%= select_year(@year, :prefix => "year", :discard_type => true) %></p>
     

groups/app/views/projects/gantt.rfpdf

@@ -124,9 +124,9 @@ pdf.SetFontStyle('B',7)
 	
 	if i.is_a? Issue
 		i_start_date = (i.start_date >= @date_from ? i.start_date : @date_from )
-		i_end_date = (i.due_date <= @date_to ? i.due_date : @date_to )
+		i_end_date = (i.due_before <= @date_to ? i.due_before : @date_to )
 		
-		i_done_date = i.start_date + ((i.due_date - i.start_date+1)*i.done_ratio/100).floor
+		i_done_date = i.start_date + ((i.due_before - i.start_date+1)*i.done_ratio/100).floor
 		i_done_date = (i_done_date <= @date_from ? @date_from : i_done_date )
 		i_done_date = (i_done_date >= @date_to ? @date_to : i_done_date )
 		

groups/app/views/projects/gantt.rhtml

@@ -166,9 +166,9 @@ top = headers_height + 10
 @events.each do |i| 
   if i.is_a? Issue 
 	i_start_date = (i.start_date >= @date_from ? i.start_date : @date_from )
-	i_end_date = (i.due_date <= @date_to ? i.due_date : @date_to )
+	i_end_date = (i.due_before <= @date_to ? i.due_before : @date_to )
 	
-	i_done_date = i.start_date + ((i.due_date - i.start_date+1)*i.done_ratio/100).floor
+	i_done_date = i.start_date + ((i.due_before - i.start_date+1)*i.done_ratio/100).floor
 	i_done_date = (i_done_date <= @date_from ? @date_from : i_done_date )
 	i_done_date = (i_done_date >= @date_to ? @date_to : i_done_date )
 	
@@ -190,7 +190,6 @@ top = headers_height + 10
 	<%= i.status.name %>
 	<%= (i.done_ratio).to_i %>%
 	</div>
-	<% # === tooltip === %>
 	<div class="tooltip" style="position: absolute;top:<%= top %>px;left:<%= i_left %>px;width:<%= i_width %>px;height:12px;">
 	<span class="tip">
     <%= render_issue_tooltip i %>
@@ -235,7 +234,7 @@ if Date.today >= @date_from and Date.today <= @date_to %>
 
 <% content_for :sidebar do %>
     <h3><%= l(:label_gantt) %></h3>
-    <% form_tag(params.merge(:tracker_ids => nil, :with_subprojects => nil)) do %>
+    <% form_tag(params.merge(:tracker_ids => nil, :with_subprojects => nil), :method => :get) do %>
     <% @trackers.each do |tracker| %>
       <label><%= check_box_tag "tracker_ids[]", tracker.id, (@selected_tracker_ids.include? tracker.id.to_s) %> <%= tracker.name %></label><br />
     <% end %>
@@ -243,7 +242,7 @@ if Date.today >= @date_from and Date.today <= @date_to %>
     <br /><label><%= check_box_tag 'with_subprojects', 1, @with_subprojects %> <%=l(:label_subproject_plural)%></label>
     <%= hidden_field_tag 'with_subprojects', 0 %>
     <% end %>
-    <p><%= submit_tag l(:button_apply), :class => 'button-small' %></p>
+    <p><%= submit_tag l(:button_apply), :class => 'button-small', :name => nil %></p>
     <% end %>
 <% end %>
 

groups/app/views/projects/index.rhtml

@@ -1,4 +1,5 @@
 <div class="contextual">
+    <%= link_to(l(:label_project_new), {:controller => 'projects', :action => 'add'}, :class => 'icon icon-add') + ' |' if User.current.admin? %>
     <%= link_to l(:label_issue_view_all), { :controller => 'issues' } %> |
     <%= link_to l(:label_overall_activity), { :controller => 'projects', :action => 'activity' }%>
 </div>
@@ -17,9 +18,14 @@
 <% end %>
 
 <% if User.current.logged? %>
-<div class="contextual">
+<p style="text-align:right;">
 <span class="icon icon-fav"><%= l(:label_my_projects) %></span>
-</div>
+</p>
 <% end %>
 
+<p class="other-formats">
+<%= l(:label_export_to) %>
+<span><%= link_to 'Atom', {:format => 'atom', :key => User.current.rss_key}, :class => 'feed' %></span>
+</p>
+
 <% html_title(l(:label_project_plural)) -%>

groups/app/views/projects/list_files.rhtml

@@ -23,8 +23,7 @@
   <% for file in version.attachments %>		
   <tr class="<%= cycle("odd", "even") %>">
     <td></td>
-    <td><%= link_to(file.filename, {:controller => 'versions', :action => 'download', :id => version, :attachment_id => file},
-                                   :title => file.description) %></td>
+    <td><%= link_to_attachment file, :download => true, :title => file.description %></td>
     <td align="center"><%= format_time(file.created_on) %></td>
     <td align="center"><%= number_to_human_size(file.filesize) %></td>
     <td align="center"><%= file.downloads %></td>

groups/app/views/projects/roadmap.rhtml

@@ -20,7 +20,7 @@
     <fieldset class="related-issues"><legend><%= l(:label_related_issues) %></legend>
     <ul>
     <%- issues.each do |issue| -%>
-        <li class="issue <%= 'closed' if issue.closed? %>"><%= link_to_issue(issue) %>: <%=h issue.subject %></li>
+        <li><%= link_to_issue(issue) %>: <%=h issue.subject %></li>
     <%- end -%>
     </ul>
     </fieldset>
@@ -30,7 +30,7 @@
 <% end %>
 
 <% content_for :sidebar do %>
-<% form_tag do %>
+<% form_tag({}, :method => :get) do %>
 <h3><%= l(:label_roadmap) %></h3>
 <% @trackers.each do |tracker| %>
   <label><%= check_box_tag "tracker_ids[]", tracker.id, (@selected_tracker_ids.include? tracker.id.to_s), :id => nil %>
@@ -38,12 +38,12 @@
 <% end %>
 <br />
 <label for="completed"><%= check_box_tag "completed", 1, params[:completed] %> <%= l(:label_show_completed_versions) %></label>
-<p><%= submit_tag l(:button_apply), :class => 'button-small' %></p>
+<p><%= submit_tag l(:button_apply), :class => 'button-small', :name => nil %></p>
 <% end %>
 
 <h3><%= l(:label_version_plural) %></h3>
 <% @versions.each do |version| %>
-<%= link_to version.name, :anchor => version.name %><br />
+<%= link_to version.name, "##{version.name}" %><br />
 <% end %>
 <% end %>
 

groups/app/views/projects/settings/_repository.rhtml

@@ -17,5 +17,5 @@
             :class => 'icon icon-del') if @repository && !@repository.new_record? %>
 </div>
 
-<%= submit_tag((@repository.nil? || @repository.new_record?) ? l(:button_create) : l(:button_save)) %>
+<%= submit_tag((@repository.nil? || @repository.new_record?) ? l(:button_create) : l(:button_save), :disabled => @repository.nil?) %>
 <% end %>

groups/app/views/projects/show.rhtml

@@ -3,14 +3,14 @@
 <div class="splitcontentleft">
 	<%= textilizable @project.description %>	
 	<ul>
-	<% unless @project.homepage.blank? %><li><%=l(:field_homepage)%>: <%= auto_link @project.homepage %></li><% end %>
+	<% unless @project.homepage.blank? %><li><%=l(:field_homepage)%>: <%= auto_link(h(@project.homepage)) %></li><% end %>
     <% if @subprojects.any? %>
  	<li><%=l(:label_subproject_plural)%>: <%= @subprojects.collect{|p| link_to(h(p.name), :action => 'show', :id => p)}.join(", ") %></li>
     <% end %>
 	<% if @project.parent %>
 	<li><%=l(:field_parent)%>: <%= link_to h(@project.parent.name), :controller => 'projects', :action => 'show', :id => @project.parent %></li>
 	<% end %>
-	<% for custom_value in @custom_values %>
+	<% @project.custom_values.each do |custom_value| %>
 	<% if !custom_value.value.empty? %>
 	   <li><%= custom_value.custom_field.name%>: <%=h show_value(custom_value) %></li>
 	<% end %>