Index: app/views/activities/index.html.erb =================================================================== --- app/views/activities/index.html.erb (revision 11734) +++ app/views/activities/index.html.erb (working copy) @@ -43,11 +43,11 @@ <% content_for :sidebar do %> <%= form_tag({}, :method => :get) do %>

<%= l(:label_activity) %>

-

<% @activity.event_types.each do |t| %> -<%= check_box_tag "show_#{t}", 1, @activity.scope.include?(t) %> +

<% if @project && @project.descendants.active.any? %> <%= hidden_field_tag 'with_subprojects', 0 %>

Index: app/views/documents/index.html.erb =================================================================== --- app/views/documents/index.html.erb (revision 11734) +++ app/views/documents/index.html.erb (working copy) @@ -25,10 +25,12 @@ <% content_for :sidebar do %>

<%= l(:label_sort_by, '') %>

- <%= link_to l(:field_category), {:sort_by => 'category'}, :class => (@sort_by == 'category' ? 'selected' :nil) %>
- <%= link_to l(:label_date), {:sort_by => 'date'}, :class => (@sort_by == 'date' ? 'selected' :nil) %>
- <%= link_to l(:field_title), {:sort_by => 'title'}, :class => (@sort_by == 'title' ? 'selected' :nil) %>
- <%= link_to l(:field_author), {:sort_by => 'author'}, :class => (@sort_by == 'author' ? 'selected' :nil) %> + <% end %> <% html_title(l(:label_document_plural)) -%> Index: app/views/versions/index.html.erb =================================================================== --- app/views/versions/index.html.erb (revision 11734) +++ app/views/versions/index.html.erb (working copy) @@ -34,10 +34,14 @@ <% content_for :sidebar do %> <%= form_tag({}, :method => :get) do %>

<%= l(:label_roadmap) %>

+
<% if @project.descendants.active.any? %> @@ -48,17 +52,21 @@ <% end %>

<%= l(:label_version_plural) %>

+ <% if @completed_versions.present? %>

<%= link_to_function l(:label_completed_versions), '$("#toggle-completed-versions").toggleClass("collapsed"); $("#completed-versions").toggle()', :id => 'toggle-completed-versions', :class => 'collapsible collapsed' %>
- +

<% end %> <% end %> Index: app/views/wiki/_sidebar.html.erb =================================================================== --- app/views/wiki/_sidebar.html.erb (revision 11734) +++ app/views/wiki/_sidebar.html.erb (working copy) @@ -3,7 +3,8 @@ <% end -%>

<%= l(:label_wiki) %>

- -<%= link_to l(:field_start_page), {:action => 'show', :id => nil} %>
-<%= link_to l(:label_index_by_title), {:action => 'index'} %>
-<%= link_to l(:label_index_by_date), {:controller => 'wiki', :project_id => @project, :action => 'date_index'} %>
+ \ No newline at end of file