diff --git a/app/controllers/maps_controller.rb b/app/controllers/maps_controller.rb index bd61483c..c3e74334 100644 --- a/app/controllers/maps_controller.rb +++ b/app/controllers/maps_controller.rb @@ -23,6 +23,23 @@ class MapsController < ApplicationController format.ttl { redirect_to action: :export, format: :ttl } end end + + # GET maps/:id/conversation + def conversation + respond_to do |format| + format.html do + UserMap.where(map: @map, user: current_user).map(&:mark_invite_notifications_as_read) + @allmappers = @map.contributors + @allcollaborators = @map.editors + @alltopics = policy_scope(@map.topics) + @allsynapses = policy_scope(@map.synapses) + @allmappings = policy_scope(@map.mappings) + @allmessages = @map.messages.sort_by(&:created_at) + @allstars = @map.stars + @allrequests = @map.access_requests + end + end + end # GET maps/new def new diff --git a/app/views/layouts/_head.html.erb b/app/views/layouts/_head.html.erb index a2f92380..8c45cb96 100644 --- a/app/views/layouts/_head.html.erb +++ b/app/views/layouts/_head.html.erb @@ -29,8 +29,13 @@ <% end %> - <%= stylesheet_link_tag "application", :media => "all" %> - <%= javascript_include_tag "application" %> + <% if controller_name == "maps" && action_name == "conversation" %> + <%= stylesheet_link_tag "application_secret", :media => "all" %> + <%= javascript_include_tag "application_secret" %> + <% else %> + <%= stylesheet_link_tag "application", :media => "all" %> + <%= javascript_include_tag "application" %> + <% end %> diff --git a/app/views/maps/conversation.html.erb b/app/views/maps/conversation.html.erb new file mode 100644 index 00000000..4ecbd274 --- /dev/null +++ b/app/views/maps/conversation.html.erb @@ -0,0 +1,22 @@ +<%# +# @file +# Code to display a map +# /maps/:id +#%> + +<% content_for :title, @map.name + " | Metamaps" %> +<% content_for :mobile_title, @map.name %> + diff --git a/config/routes.rb b/config/routes.rb index e365cab5..3c9abd5b 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -18,6 +18,7 @@ Metamaps::Application.routes.draw do resources :maps, except: [:index, :edit] do member do + get :conversation get :export post 'events/:event', action: :events get :contains