diff options
Diffstat (limited to 'app/views/projects')
| -rw-r--r-- | app/views/projects/export_issues_pdf.rfpdf | 49 | ||||
| -rw-r--r-- | app/views/projects/list_issues.rhtml | 72 | ||||
| -rw-r--r-- | app/views/projects/roadmap.rhtml | 4 | ||||
| -rw-r--r-- | app/views/projects/show.rhtml | 4 |
4 files changed, 4 insertions, 125 deletions
diff --git a/app/views/projects/export_issues_pdf.rfpdf b/app/views/projects/export_issues_pdf.rfpdf deleted file mode 100644 index d782c54b0..000000000 --- a/app/views/projects/export_issues_pdf.rfpdf +++ /dev/null @@ -1,49 +0,0 @@ -<% pdf=IfpdfHelper::IFPDF.new(current_language)
- pdf.SetTitle("#{@project.name} - #{l(:label_issue_plural)}")
- pdf.AliasNbPages
- pdf.footer_date = format_date(Date.today)
- pdf.AddPage("L")
- row_height = 7
-
- #
- # title
- #
- pdf.SetFontStyle('B',11)
- pdf.Cell(190,10, "#{@project.name} - #{l(:label_issue_plural)}")
- pdf.Ln
-
- #
- # headers
- #
- pdf.SetFontStyle('B',10)
- pdf.SetFillColor(230, 230, 230)
- pdf.Cell(15, row_height, "#", 0, 0, 'L', 1)
- pdf.Cell(30, row_height, l(:field_tracker), 0, 0, 'L', 1)
- pdf.Cell(30, row_height, l(:field_status), 0, 0, 'L', 1)
- pdf.Cell(30, row_height, l(:field_priority), 0, 0, 'L', 1)
- pdf.Cell(40, row_height, l(:field_author), 0, 0, 'L', 1)
- pdf.Cell(25, row_height, l(:field_updated_on), 0, 0, 'L', 1)
- pdf.Cell(0, row_height, l(:field_subject), 0, 0, 'L', 1)
- pdf.Line(10, pdf.GetY, 287, pdf.GetY)
- pdf.Ln
- pdf.Line(10, pdf.GetY, 287, pdf.GetY)
- pdf.SetY(pdf.GetY() + 1)
-
- #
- # rows
- #
- pdf.SetFontStyle('',9)
- pdf.SetFillColor(255, 255, 255)
- @issues.each do |issue|
- pdf.Cell(15, row_height, issue.id.to_s, 0, 0, 'L', 1)
- pdf.Cell(30, row_height, issue.tracker.name, 0, 0, 'L', 1)
- pdf.Cell(30, row_height, issue.status.name, 0, 0, 'L', 1)
- pdf.Cell(30, row_height, issue.priority.name, 0, 0, 'L', 1)
- pdf.Cell(40, row_height, issue.author.name, 0, 0, 'L', 1)
- pdf.Cell(25, row_height, format_date(issue.updated_on), 0, 0, 'L', 1)
- pdf.MultiCell(0, row_height, (@project == issue.project ? issue.subject : "#{issue.project.name} - #{issue.subject}"))
- pdf.Line(10, pdf.GetY, 287, pdf.GetY)
- pdf.SetY(pdf.GetY() + 1)
- end
-%>
-<%= pdf.Output %>
\ No newline at end of file diff --git a/app/views/projects/list_issues.rhtml b/app/views/projects/list_issues.rhtml deleted file mode 100644 index 0c0aaa418..000000000 --- a/app/views/projects/list_issues.rhtml +++ /dev/null @@ -1,72 +0,0 @@ -<% if @query.new_record? %> - <h2><%=l(:label_issue_plural)%></h2> - <% set_html_title l(:label_issue_plural) %> - - <% form_tag({ :controller => 'queries', :action => 'new', :project_id => @project }, :id => 'query_form') do %> - <%= render :partial => 'queries/filters', :locals => {:query => @query} %> - <div class="contextual"> - <%= link_to_remote l(:button_apply), - { :url => { :controller => 'projects', :action => 'list_issues', :id => @project, :set_filter => 1 }, - :update => "content", - :with => "Form.serialize('query_form')" - }, :class => 'icon icon-edit' %> - - <%= link_to_remote l(:button_clear), - { :url => {:controller => 'projects', :action => 'list_issues', :id => @project, :set_filter => 1}, - :update => "content", - }, :class => 'icon icon-reload' %> - - <% if current_role.allowed_to?(:save_queries) %> - <%= link_to l(:button_save), {}, :onclick => "$('query_form').submit(); return false;", :class => 'icon icon-save' %> - <% end %> - </div> - <br /> - - <% end %> -<% else %> - <div class="contextual"> - <% if @query.editable_by?(User.current) %> - <%= link_to l(:button_edit), {:controller => 'queries', :action => 'edit', :id => @query}, :class => 'icon icon-edit' %> - <%= link_to l(:button_delete), {:controller => 'queries', :action => 'destroy', :id => @query}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %> - <% end %> - </div> - - <h2><%= @query.name %></h2> - <div id="query_form"></div> - <% set_html_title @query.name %> -<% end %> -<%= error_messages_for 'query' %> -<% if @query.valid? %> -<% if @issues.empty? %> -<p class="nodata"><%= l(:label_no_data) %></p> -<% else %> -<% form_tag({:controller => 'projects', :action => 'bulk_edit_issues', :id => @project}, :id => 'issues_form', :onsubmit => "if (!checkBulkEdit(this)) {alert('#{l(:notice_no_issue_selected)}'); return false;}" ) do %> -<%= render :partial => 'issues/list', :locals => {:issues => @issues, :query => @query} %> -<div class="contextual"> -<%= l(:label_export_to) %> -<%= link_to 'CSV', {:action => 'export_issues_csv', :id => @project}, :class => 'icon icon-csv' %>, -<%= link_to 'PDF', {:action => 'export_issues_pdf', :id => @project}, :class => 'icon icon-pdf' %> -</div> -<p> -<%= pagination_links_full @issue_pages %> -[ <%= @issue_pages.current.first_item %> - <%= @issue_pages.current.last_item %> / <%= @issue_count %> ] -</p> -<% end %> -<% end %> -<% end %> - -<% content_for :sidebar do %> - <%= render :partial => 'issues/sidebar' %> -<% end %> - -<% content_for :header_tags do %> - <%= javascript_include_tag 'calendar/calendar' %> - <%= javascript_include_tag "calendar/lang/calendar-#{current_language}.js" %> - <%= javascript_include_tag 'calendar/calendar-setup' %> - <%= stylesheet_link_tag 'calendar' %> - <%= javascript_include_tag 'context_menu' %> - <%= stylesheet_link_tag 'context_menu' %> -<% end %> - -<div id="context-menu" style="display: none;"></div> -<%= javascript_tag 'new ContextMenu({})' %> diff --git a/app/views/projects/roadmap.rhtml b/app/views/projects/roadmap.rhtml index 8d681657e..d45bc207c 100644 --- a/app/views/projects/roadmap.rhtml +++ b/app/views/projects/roadmap.rhtml @@ -34,8 +34,8 @@ <% end %> </tr> </table> - <em><%= link_to(complete, :controller => 'projects', :action => 'list_issues', :id => @project, :status_id => 'c', :fixed_version_id => version, :set_filter => 1) %> <%= lwr(:label_closed_issues, complete) %> (<%= percentComplete %>%)   - <%= link_to((total - complete), :controller => 'projects', :action => 'list_issues', :id => @project, :status_id => 'o', :fixed_version_id => version, :set_filter => 1) %> <%= lwr(:label_open_issues, total - complete)%> (<%= percentIncomplete %>%)</em> + <em><%= link_to(complete, :controller => 'issues', :action => 'index', :project_id => @project, :status_id => 'c', :fixed_version_id => version, :set_filter => 1) %> <%= lwr(:label_closed_issues, complete) %> (<%= percentComplete %>%)   + <%= link_to((total - complete), :controller => 'issues', :action => 'index', :project_id => @project, :status_id => 'o', :fixed_version_id => version, :set_filter => 1) %> <%= lwr(:label_open_issues, total - complete)%> (<%= percentIncomplete %>%)</em> <br /> <br /> <%= render(:partial => "wiki/content", :locals => {:content => version.wiki_page.content}) if version.wiki_page %> diff --git a/app/views/projects/show.rhtml b/app/views/projects/show.rhtml index 25fbe3c68..88178cb5d 100644 --- a/app/views/projects/show.rhtml +++ b/app/views/projects/show.rhtml @@ -22,14 +22,14 @@ <h3 class="icon22 icon22-tracker"><%=l(:label_issue_tracking)%></h3> <ul> <% for tracker in @trackers %> - <li><%= link_to tracker.name, :controller => 'projects', :action => 'list_issues', :id => @project, + <li><%= link_to tracker.name, :controller => 'issues', :action => 'index', :project_id => @project, :set_filter => 1, "tracker_id" => tracker.id %>: <%= @open_issues_by_tracker[tracker] || 0 %> <%= lwr(:label_open_issues, @open_issues_by_tracker[tracker] || 0) %> <%= l(:label_on) %> <%= @total_issues_by_tracker[tracker] || 0 %></li> <% end %> </ul> - <p><%= link_to l(:label_issue_view_all), :controller => 'projects', :action => 'list_issues', :id => @project, :set_filter => 1 %></p> + <p><%= link_to l(:label_issue_view_all), :controller => 'issues', :action => 'index', :project_id => @project, :set_filter => 1 %></p> </div> <% end %> </div> |