diff -ruw redmine_dev/vendor/plugins/projects_tree_view/app/views/admin/projects.rhtml /Users/nathanjo/Downloads/dubcanada-projects_tree_view-81f1f44/app/views/admin/projects.rhtml --- redmine_dev/vendor/plugins/projects_tree_view/app/views/admin/projects.rhtml 2012-06-13 15:40:44.000000000 +0800 +++ /Users/nathanjo/Downloads/dubcanada-projects_tree_view-81f1f44/app/views/admin/projects.rhtml 2011-12-01 07:01:32.000000000 +0800 @@ -81,7 +81,7 @@ <%= link_to(l(:button_archive), { :controller => 'projects', :action => 'archive', :id => project, :status => params[:status] }, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-lock') if project.active? %> <%= link_to(l(:button_unarchive), { :controller => 'projects', :action => 'unarchive', :id => project, :status => params[:status] }, :method => :post, :class => 'icon icon-unlock') if !project.active? && (project.parent.nil? || project.parent.active?) %> <%= link_to(l(:button_copy), { :controller => 'projects', :action => 'copy', :id => project }, :class => 'icon icon-copy') %> - <%= link_to(l(:button_delete), project_path(project), :method => :delete, :class => 'icon icon-del') %> + <%= link_to(l(:button_delete), project_destroy_confirm_path(project), :class => 'icon icon-del') %> <% end %> diff -ruw redmine_dev/vendor/plugins/projects_tree_view/app/views/projects/index.rhtml /Users/nathanjo/Downloads/dubcanada-projects_tree_view-81f1f44/app/views/projects/index.rhtml --- redmine_dev/vendor/plugins/projects_tree_view/app/views/projects/index.rhtml 2012-06-13 16:26:40.000000000 +0800 +++ /Users/nathanjo/Downloads/dubcanada-projects_tree_view-81f1f44/app/views/projects/index.rhtml 2011-12-01 07:01:32.000000000 +0800 @@ -1,14 +1,15 @@ <% content_for :header_tags do %> <%= auto_discovery_link_tag(:atom, {:action => 'index', :format => 'atom', :key => User.current.rss_key}) %> <% end %> -
+ <% if authorize_global_implemented %> <%= link_to(l(:label_project_new), {:controller => 'projects', :action => 'new'}, :class => 'icon icon-add') + ' |' if User.current.allowed_to?(:add_project, nil, :global => true) %> + <% else %> + <%= link_to(l(:label_project_new), {:controller => 'projects', :action => 'new'}, :class => 'icon icon-add') + ' |' if User.current.admin? %> + <% end %> <%= link_to(l(:label_issue_view_all), { :controller => 'issues' }) + ' |' if User.current.allowed_to?(:view_issues, nil, :global => true) %> - <%= link_to(l(:label_overall_spent_time), time_entries_path) + ' |' if User.current.allowed_to?(:view_time_entries, nil, :global => true) %> - <%= link_to l(:label_overall_activity), - { :controller => 'activities', :action => 'index', - :id => nil } %> + <%= link_to(l(:label_overall_spent_time), { :controller => 'time_entries' }) + ' |' if User.current.allowed_to?(:view_time_entries, nil, :global => true) %> + <%= link_to l(:label_overall_activity), { :controller => 'activities', :action => 'index' }%>

<%=l(:label_project_plural)%>

diff -ruw redmine_dev/vendor/plugins/projects_tree_view/app/views/projects/show.rhtml /Users/nathanjo/Downloads/dubcanada-projects_tree_view-81f1f44/app/views/projects/show.rhtml --- redmine_dev/vendor/plugins/projects_tree_view/app/views/projects/show.rhtml 2012-06-13 16:11:52.000000000 +0800 +++ /Users/nathanjo/Downloads/dubcanada-projects_tree_view-81f1f44/app/views/projects/show.rhtml 2011-12-01 07:01:32.000000000 +0800 @@ -2,11 +2,6 @@
<%= textilizable @project.description %> - <% @project.custom_values.each do |custom_value| %> - <% if !custom_value.value.empty? %> -
  • <%= custom_value.custom_field.name%>: <%=h show_value(custom_value) %>
    • - <% end %> - <% end %> @@ -50,6 +45,11 @@ <% end %> + <% @project.custom_values.each do |custom_value| %> + <% if !custom_value.value.empty? %> +
  • <%= custom_value.custom_field.name%>: <%=h show_value(custom_value) %>
    • + <% end %> + <% end %> <% if User.current.allowed_to?(:view_issues, @project) %>
    @@ -71,7 +71,27 @@
    - <%= render :partial => 'members_box' %> +<% if users_by_role_implemented %> + <% if @members_by_role.any? %> +
    +

    <%=l(:label_member_plural)%>

    +

    <% @members_by_role.keys.sort.each do |role| %> + <%= role.name %>: + <%= @members_by_role[role].collect(&:user).sort.collect{|u| link_to_user u}.join(", ") %> +
    + <% end %>

    +
    + <% end %> +<% else %> + <% if @users_by_role.any? %> +
    +

    <%=l(:label_member_plural)%>

    +

    <% @users_by_role.keys.sort.each do |role| %> + <%=h role %>: <%= @users_by_role[role].sort.collect{|u| link_to_user u}.join(", ") %>
    + <% end %>

    +
    + <% end %> +<% end %> <% if @news.any? && authorize_for('news', 'index') %>
    @@ -96,13 +116,13 @@ <% if @total_hours && User.current.allowed_to?(:view_time_entries, @project) %>

    <%= l(:label_spent_time) %>

    <%= l_hours(@total_hours) %>

    -

    <%= link_to(l(:label_details), {:controller => 'timelog', :action => 'index', :project_id => @project}) %> | +

    <%= link_to(l(:label_details), {:controller => 'timelog', :action => 'details', :project_id => @project}) %> | <%= link_to(l(:label_report), {:controller => 'timelog', :action => 'report', :project_id => @project}) %>

    <% end %> <% end %> <% content_for :header_tags do %> -<%= auto_discovery_link_tag(:atom, {:controller => 'activities', :action => 'index', :id => @project, :format => 'atom', :key => User.current.rss_key}) %> +<%= auto_discovery_link_tag(:atom, {:action => 'activity', :id => @project, :format => 'atom', :key => User.current.rss_key}) %> <% end %> <% html_title(l(:label_overview)) -%> Only in redmine_dev/vendor/plugins/projects_tree_view/config: routes.rb