From 311bb2907db9d7467daaa6bdf8b37d83161b447b Mon Sep 17 00:00:00 2001 From: Christian Ratz Date: Thu, 16 Jan 2014 11:51:43 +0100 Subject: [PATCH] new layout for project overview --- .../blocks/_members.html.erb | 2 +- .../blocks/_news_latest.html.erb | 5 +++-- .../blocks/_work_package_tracking.html.erb | 6 +++--- .../_work_packages_assigned_to_me.html.erb | 14 +++++++++----- .../_work_packages_reported_by_me.html.erb | 16 ++++++++++------ .../blocks/_work_packages_watched.html.erb | 14 +++++++++----- 6 files changed, 35 insertions(+), 22 deletions(-) diff --git a/app/views/my_projects_overviews/blocks/_members.html.erb b/app/views/my_projects_overviews/blocks/_members.html.erb index 713814c5d8..2bf5f110b3 100644 --- a/app/views/my_projects_overviews/blocks/_members.html.erb +++ b/app/views/my_projects_overviews/blocks/_members.html.erb @@ -33,7 +33,7 @@ See doc/COPYRIGHT.md for more details. <%= link_to(l(:'project_page.all'), { :controller => 'my_projects_overviews', :action => 'show_all_members', :id => project.id }, - :class => "all" ) %> + :class => "all button" ) %> <% end %>

diff --git a/app/views/my_projects_overviews/blocks/_news_latest.html.erb b/app/views/my_projects_overviews/blocks/_news_latest.html.erb index a6e9161915..757513c868 100644 --- a/app/views/my_projects_overviews/blocks/_news_latest.html.erb +++ b/app/views/my_projects_overviews/blocks/_news_latest.html.erb @@ -25,9 +25,10 @@ See doc/COPYRIGHT.md for more details. <%= render :partial => 'news/news', :collection => recent_news %>

<%= link_to l(:label_news_view_all), - :controller => 'news', + {:controller => 'news', :action => 'index', - :project_id => project %> + :project_id => project}, + :class => 'button' %>

<% end %> diff --git a/app/views/my_projects_overviews/blocks/_work_package_tracking.html.erb b/app/views/my_projects_overviews/blocks/_work_package_tracking.html.erb index 50c763bf6b..d95c442ef2 100644 --- a/app/views/my_projects_overviews/blocks/_work_package_tracking.html.erb +++ b/app/views/my_projects_overviews/blocks/_work_package_tracking.html.erb @@ -33,12 +33,12 @@ See doc/COPYRIGHT.md for more details. <% end %>

- <%= link_to l(:label_work_package_view_all), :controller => '/work_packages', :action => 'index', :project_id => project, :set_filter => 1 %> + <%= link_to l(:label_work_package_view_all), {:controller => '/work_packages', :action => 'index', :project_id => project, :set_filter => 1}, :class => 'button' %> <% if User.current.allowed_to?(:view_calendar, project, :global => true) %> - | <%= link_to(l(:label_calendar), :controller => '/calendars', :action => 'show', :project_id => project) %> + <%= link_to(l(:label_calendar), {:controller => '/work_packages/calendars', :action => 'index', :project_id => project}, :class => 'button') %> <% end %> <% if User.current.allowed_to?(:view_gantt, project, :global => true) %> - | <%= link_to(l(:label_gantt), :controller => '/gantts', :action => 'show', :project_id => project) %> + <%= link_to(l(:label_gantt), {:controller => '/gantts', :action => 'show', :project_id => project}, :class => 'button') %> <% end %>

diff --git a/app/views/my_projects_overviews/blocks/_work_packages_assigned_to_me.html.erb b/app/views/my_projects_overviews/blocks/_work_packages_assigned_to_me.html.erb index 25dde2ac6e..335fe5ce61 100644 --- a/app/views/my_projects_overviews/blocks/_work_packages_assigned_to_me.html.erb +++ b/app/views/my_projects_overviews/blocks/_work_packages_assigned_to_me.html.erb @@ -27,11 +27,15 @@ See doc/COPYRIGHT.md for more details. :order => "#{IssuePriority.table_name}.position DESC, #{WorkPackage.table_name}.updated_at DESC") %> <%= render :partial => 'work_packages/list_simple', :locals => { :work_packages => assigned_work_packages } %> <% if assigned_work_packages.length > 0 %> -

<%= link_to l(:label_work_packages_view_all_assigned_to_me), :controller => '/work_packages', - :action => 'index', - :set_filter => 1, - :assigned_to_id => 'me', - :sort => 'priority:desc,updated_at:desc' %>

+

+ <%= link_to l(:label_assigned_to_me_work_packages), + {:controller => '/work_packages', + :action => 'index', + :set_filter => 1, + :assigned_to_id => 'me', + :sort => 'priority:desc,updated_at:desc'}, + :class => 'button' %> +

<% end %> <% content_for :header_tags do %> diff --git a/app/views/my_projects_overviews/blocks/_work_packages_reported_by_me.html.erb b/app/views/my_projects_overviews/blocks/_work_packages_reported_by_me.html.erb index 2ae5201526..198040bff2 100644 --- a/app/views/my_projects_overviews/blocks/_work_packages_reported_by_me.html.erb +++ b/app/views/my_projects_overviews/blocks/_work_packages_reported_by_me.html.erb @@ -27,12 +27,16 @@ See doc/COPYRIGHT.md for more details. :order => "#{WorkPackage.table_name}.updated_at DESC") %> <%= render :partial => 'work_packages/list_simple', :locals => { :work_packages => reported_work_packages } %> <% if reported_work_packages.length > 0 %> -

<%= link_to l(:label_work_package_view_all_reported_by_me), :controller => '/work_packages', - :action => 'index', - :set_filter => 1, - :status_id => '*', - :author_id => 'me', - :sort => 'updated_at:desc' %>

+

+ <%= link_to l(:label_work_package_view_all_reported_by_me), + {:controller => '/work_packages', + :action => 'index', + :set_filter => 1, + :status_id => '*', + :author_id => 'me', + :sort => 'updated_at:desc'}, + :class => 'button' %> +

<% end %> <% content_for :header_tags do %> diff --git a/app/views/my_projects_overviews/blocks/_work_packages_watched.html.erb b/app/views/my_projects_overviews/blocks/_work_packages_watched.html.erb index 153f6921f6..e1026437fd 100644 --- a/app/views/my_projects_overviews/blocks/_work_packages_watched.html.erb +++ b/app/views/my_projects_overviews/blocks/_work_packages_watched.html.erb @@ -23,9 +23,13 @@ See doc/COPYRIGHT.md for more details. <%= render :partial => 'work_packages/list_simple', :locals => { :work_packages => watched_work_packages } %> <% if watched_work_packages.length > 0 %> -

<%= link_to l(:label_work_package_view_all_watched), :controller => '/work_packages', - :action => 'index', - :set_filter => 1, - :watcher_id => 'me', - :sort => 'updated_on:desc' %>

+

+ <%= link_to l(:label_work_package_view_all_watched), + {:controller => '/work_packages', + :action => 'index', + :set_filter => 1, + :watcher_id => 'me', + :sort => 'updated_on:desc'}, + :class => 'button' %> +

<% end %>