| |   |
| 113 | 113 | content_for(:meta_description, %Q{<meta name="description" content="#{text}" />}) |
| 114 | 114 | end |
| 115 | 115 | |
| 116 | | def norobots |
| 117 | | content_for(:norobots, %Q{<meta name="ROBOTS" content="NOINDEX">}) |
| 116 | def meta_noindex |
| 117 | content_for(:noindex, %Q{<meta name="ROBOTS" content="NOINDEX">}) |
| 118 | 118 | end |
| 119 | 119 | |
| 120 | def meta_nofollow |
| 121 | content_for(:nofollow, %Q{<meta name="ROBOTS" content="NOFOLLOW">}) |
| 122 | end |
| 123 | |
| 120 | 124 | def div_no_breadcrumb |
| 121 | 125 | %Q{<div id='no_breadcrumb'></div>} |
| 122 | 126 | end |
| … | … | |
| 337 | 337 | acts << %Q{<li>#{link_to("Edit Article", edit_project_article_path(@project.slug, @article.slug))}</li>} if flags[:edit_article] && is_member |
| 338 | 338 | acts << %Q{<li>#{link_to("New Article", new_project_article_path(@project.slug))}</li>} if flags[:new_article] && is_member |
| 339 | 339 | acts << %Q{<li>#{link_to("New Ticket", new_project_ticket_path(@project.slug))}</li>} if flags[:new_ticket] |
| 340 | acts << %Q{<li>#{link_to("Edit Ticket", edit_project_ticket_path(@project.slug))}</li>} if flags[:edit_ticket] |
| 341 | acts << %Q{<li>#{link_to("Close Ticket", root_path)}</li>} if flags[:close_ticket] |
| 342 | acts << %Q{<li>#{link_to("List Tickets", project_tickets_path(@project.slug))}</li>} if flags[:list_tickets] |
| 340 | 343 | acts << %Q{<li>#{link_to("New Milestone", new_project_milestone_path(@project.slug))}</li>} if flags[:new_milestone] && is_member |
| 341 | 344 | acts << %Q{<li>#{link_to("Current Milestones", root_path)}</li>} if flags[:current_milestones] |
| 342 | 345 | acts << %Q{<li>#{link_to("Completed Milestones", root_path)}</li>} if flags[:completed_milestones] |
| toggle raw diff |
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -113,10 +113,14 @@ module ApplicationHelper
content_for(:meta_description, %Q{<meta name="description" content="#{text}" />})
end
- def norobots
- content_for(:norobots, %Q{<meta name="ROBOTS" content="NOINDEX">})
+ def meta_noindex
+ content_for(:noindex, %Q{<meta name="ROBOTS" content="NOINDEX">})
end
+ def meta_nofollow
+ content_for(:nofollow, %Q{<meta name="ROBOTS" content="NOFOLLOW">})
+ end
+
def div_no_breadcrumb
%Q{<div id='no_breadcrumb'></div>}
end
@@ -333,6 +337,9 @@ module ApplicationHelper
acts << %Q{<li>#{link_to("Edit Article", edit_project_article_path(@project.slug, @article.slug))}</li>} if flags[:edit_article] && is_member
acts << %Q{<li>#{link_to("New Article", new_project_article_path(@project.slug))}</li>} if flags[:new_article] && is_member
acts << %Q{<li>#{link_to("New Ticket", new_project_ticket_path(@project.slug))}</li>} if flags[:new_ticket]
+ acts << %Q{<li>#{link_to("Edit Ticket", edit_project_ticket_path(@project.slug))}</li>} if flags[:edit_ticket]
+ acts << %Q{<li>#{link_to("Close Ticket", root_path)}</li>} if flags[:close_ticket]
+ acts << %Q{<li>#{link_to("List Tickets", project_tickets_path(@project.slug))}</li>} if flags[:list_tickets]
acts << %Q{<li>#{link_to("New Milestone", new_project_milestone_path(@project.slug))}</li>} if flags[:new_milestone] && is_member
acts << %Q{<li>#{link_to("Current Milestones", root_path)}</li>} if flags[:current_milestones]
acts << %Q{<li>#{link_to("Completed Milestones", root_path)}</li>} if flags[:completed_milestones] |
| |   |
| 125 | 125 | out << render(:partial => "ac_right_actionbox_post_message") if @is_member |
| 126 | 126 | out << render_right_project_members |
| 127 | 127 | when PRJ_TAB_TICKETS |
| 128 | | out << actionbox_complex(:allow_shortcuts => true, :new_ticket => true, :new_milestone => true, :completed_milestones => true, :current_milestones => true) |
| 129 | | out << render(:partial => "ac_right_ticket_filter") |
| 128 | case subtab |
| 129 | when PRJ_TAB_SUBTAB_NONE |
| 130 | out << actionbox_complex(:allow_shortcuts => true, :new_ticket => true, :new_milestone => true, :completed_milestones => true, :current_milestones => true) |
| 131 | out << render(:partial => "ac_right_ticket_filter") |
| 132 | when PRJ_TAB_TICKETS_SHOW |
| 133 | out << actionbox_complex(:allow_shortcuts => true, :list_tickets => true, :edit_ticket => true, :close_ticket => true) |
| 134 | when PRJ_TAB_TICKETS_NEW |
| 135 | when PRJ_TAB_TICKETS_EDIT |
| 136 | end |
| 130 | 137 | when PRJ_TAB_WIKI |
| 131 | 138 | case subtab |
| 132 | 139 | when PRJ_TAB_WIKI_EDIT, PRJ_TAB_WIKI_NEW |
| toggle raw diff |
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -125,8 +125,15 @@ module ProjectsHelper
out << render(:partial => "ac_right_actionbox_post_message") if @is_member
out << render_right_project_members
when PRJ_TAB_TICKETS
- out << actionbox_complex(:allow_shortcuts => true, :new_ticket => true, :new_milestone => true, :completed_milestones => true, :current_milestones => true)
- out << render(:partial => "ac_right_ticket_filter")
+ case subtab
+ when PRJ_TAB_SUBTAB_NONE
+ out << actionbox_complex(:allow_shortcuts => true, :new_ticket => true, :new_milestone => true, :completed_milestones => true, :current_milestones => true)
+ out << render(:partial => "ac_right_ticket_filter")
+ when PRJ_TAB_TICKETS_SHOW
+ out << actionbox_complex(:allow_shortcuts => true, :list_tickets => true, :edit_ticket => true, :close_ticket => true)
+ when PRJ_TAB_TICKETS_NEW
+ when PRJ_TAB_TICKETS_EDIT
+ end
when PRJ_TAB_WIKI
case subtab
when PRJ_TAB_WIKI_EDIT, PRJ_TAB_WIKI_NEW |
| |   |
| 1 | | <%= render :partial => "projects/ac_project_header", :locals => { :tab => PRJ_TAB_TICKETS, :project => @project, :pagetitle => @title } %> |
| 1 | <%= render :partial => "projects/ac_project_header", :locals => { :tab => PRJ_TAB_TICKETS, |
| 2 | :subtab => PRJ_TAB_TICKETS_SHOW, |
| 3 | :project => @project, |
| 4 | :pagetitle => @title } %> |
| 2 | 5 | |
| 3 | 6 | <%= div_formattedtext_open %> |
| 4 | 7 | |
| toggle raw diff |
--- a/app/views/tickets/ac_project_show.html.erb
+++ b/app/views/tickets/ac_project_show.html.erb
@@ -1,4 +1,7 @@
-<%= render :partial => "projects/ac_project_header", :locals => { :tab => PRJ_TAB_TICKETS, :project => @project, :pagetitle => @title } %>
+<%= render :partial => "projects/ac_project_header", :locals => { :tab => PRJ_TAB_TICKETS,
+ :subtab => PRJ_TAB_TICKETS_SHOW,
+ :project => @project,
+ :pagetitle => @title } %>
<%= div_formattedtext_open %>
|