diff --git a/app/controllers/requests_controller.rb b/app/controllers/requests_controller.rb index 3f98eefb5..56ffae0e4 100644 --- a/app/controllers/requests_controller.rb +++ b/app/controllers/requests_controller.rb @@ -22,15 +22,7 @@ class RequestsController < ApplicationController include RequestsHelper respond_to :html - respond_to :json, :only => :index - def index - @remote_requests = Request.for_user current_user - @request = Request.new - - respond_with @remote_requests - end - def destroy if params[:accept] if params[:aspect_id] diff --git a/app/views/requests/_request.html.haml b/app/views/requests/_request.html.haml deleted file mode 100644 index f003958e2..000000000 --- a/app/views/requests/_request.html.haml +++ /dev/null @@ -1,42 +0,0 @@ --# Copyright 2010 Diaspora Inc. --# --# This file is part of Diaspora. --# --# Diaspora is free software: you can redistribute it and/or modify --# it under the terms of the GNU Affero General Public License as published by --# the Free Software Foundation, either version 3 of the License, or --# (at your option) any later version. --# --# Diaspora is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --# GNU Affero General Public License for more details. --# --# You should have received a copy of the GNU Affero General Public License --# along with Diaspora. If not, see . --# - - -:javascript - $(document).ready(function(){ - $(".aspect_selector").change( function() { - var id = $(this).children(":selected").val(); - $(this).parent().children(".accept").html( "Accept"); - }); - }); - - -%li.message{:id => request.id} - - %span.from - = link_to "#{request.person.real_name}", '#' - - %ul.request_buttons - %select{ :class => "aspect_selector", :style=>"display:inline;"} - %option Add to aspect - %option - - for aspect in current_user.aspects - %option{:value => aspect.id}= aspect.name - %li.accept= link_to 'Accept', request_path(request, :accept => true), :method => :delete, :class => "button" - %li.ignore= link_to 'Ignore', request_path(request), :confirm => 'Are you sure?', :method => :delete, :class => "button" - diff --git a/app/views/requests/edit.html.haml b/app/views/requests/edit.html.haml deleted file mode 100644 index 94e6fd172..000000000 --- a/app/views/requests/edit.html.haml +++ /dev/null @@ -1,27 +0,0 @@ --# Copyright 2010 Diaspora Inc. --# --# This file is part of Diaspora. --# --# Diaspora is free software: you can redistribute it and/or modify --# it under the terms of the GNU Affero General Public License as published by --# the Free Software Foundation, either version 3 of the License, or --# (at your option) any later version. --# --# Diaspora is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --# GNU Affero General Public License for more details. --# --# You should have received a copy of the GNU Affero General Public License --# along with Diaspora. If not, see . --# - - -- title "Edit Request" - -= render 'form' - -%p - = link_to "Show", request_path(@person_request) - | - = link_to "View All", request_path diff --git a/app/views/requests/index.html.haml b/app/views/requests/index.html.haml deleted file mode 100644 index c56c2aa4a..000000000 --- a/app/views/requests/index.html.haml +++ /dev/null @@ -1,32 +0,0 @@ --# Copyright 2010 Diaspora Inc. --# --# This file is part of Diaspora. --# --# Diaspora is free software: you can redistribute it and/or modify --# it under the terms of the GNU Affero General Public License as published by --# the Free Software Foundation, either version 3 of the License, or --# (at your option) any later version. --# --# Diaspora is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --# GNU Affero General Public License for more details. --# --# You should have received a copy of the GNU Affero General Public License --# along with Diaspora. If not, see . --# - - -%h1.big_text - .back - = link_to "⇧ home", root_path - Requests - -%h3= "currently #{@request_count} requests" -%ul#stream - - for request in @remote_requests - = render "request", :request => request - -#content_bottom - .back - = link_to "⇧ home", root_path diff --git a/app/views/requests/show.html.haml b/app/views/requests/show.html.haml deleted file mode 100644 index 8026a593e..000000000 --- a/app/views/requests/show.html.haml +++ /dev/null @@ -1,30 +0,0 @@ --# Copyright 2010 Diaspora Inc. --# --# This file is part of Diaspora. --# --# Diaspora is free software: you can redistribute it and/or modify --# it under the terms of the GNU Affero General Public License as published by --# the Free Software Foundation, either version 3 of the License, or --# (at your option) any later version. --# --# Diaspora is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --# GNU Affero General Public License for more details. --# --# You should have received a copy of the GNU Affero General Public License --# along with Diaspora. If not, see . --# - - -- title "Request" - -%p - = @request.inspect - -%p - = link_to "Edit", edit_request_path(@request) - | - = link_to "Destroy", @request, :confirm => 'Are you sure?', :method => :delete - | - = link_to "View All", requests_path