diff --git a/app/assets/stylesheets/_dashboard.scss b/app/assets/stylesheets/_dashboard.scss index 77caff72d..2944d7ca1 100644 --- a/app/assets/stylesheets/_dashboard.scss +++ b/app/assets/stylesheets/_dashboard.scss @@ -125,4 +125,10 @@ vertical-align: top; } +} + +#admin-listing { + .section { + margin-top: 2em; + } } \ No newline at end of file diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb index f9faf75fe..f3287f101 100644 --- a/app/controllers/welcome_controller.rb +++ b/app/controllers/welcome_controller.rb @@ -5,8 +5,8 @@ class WelcomeController < ApplicationController def index return if current_user.nil? - @pending_projects = Project.pending_projects - @approved_projects = Project.approved_projects + @pending_projects = Project.pending_projects.map { |project| ProjectDashboardPresenter.new(project) } + @approved_projects = Project.approved_projects.map { |project| ProjectDashboardPresenter.new(project) } @eligible_data_user = true if !current_user.eligible_sponsor? && !current_user.eligible_manager? @dashboard_projects = Project.users_projects(@current_user).map { |project| ProjectDashboardPresenter.new(project) } diff --git a/app/views/welcome/_admin_listing.html.erb b/app/views/welcome/_admin_listing.html.erb new file mode 100644 index 000000000..b73bba102 --- /dev/null +++ b/app/views/welcome/_admin_listing.html.erb @@ -0,0 +1,61 @@ +
(none)
+ <% end %> +(none)
+ <% end %> +(none)
- <% end %> -<%= link_to(project.title, project) %> | -
(none)
- <% end %> -