diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 5ecbca255..cc50de1f9 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -88,7 +88,7 @@ class ApplicationController < ActionController::Base def redirect_unless_admin unless current_user.admin? - redirect_to multi_stream_url, :notice => 'you need to be an admin to do that' + redirect_to explore_url, :notice => 'you need to be an admin to do that' return end end @@ -116,7 +116,7 @@ class ApplicationController < ActionController::Base end def after_sign_in_path_for(resource) - stored_location_for(:user) || (current_user.getting_started? ? getting_started_path : multi_stream_path) + stored_location_for(:user) || (current_user.getting_started? ? getting_started_path : explore_path) end def max_time diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index e33d51656..3922c4372 100644 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -6,7 +6,7 @@ class HomeController < ApplicationController def show if current_user - redirect_to multi_stream_path if current_user + redirect_to explore_path if current_user elsif is_mobile_device? redirect_to user_session_path else diff --git a/app/controllers/notifications_controller.rb b/app/controllers/notifications_controller.rb index 201b61636..e27eb1f1d 100644 --- a/app/controllers/notifications_controller.rb +++ b/app/controllers/notifications_controller.rb @@ -52,7 +52,7 @@ class NotificationsController < ApplicationController def read_all Notification.where(:recipient_id => current_user.id).update_all(:unread => false) respond_to do |format| - format.html { redirect_to multi_stream_path } + format.html { redirect_to explore_path } format.xml { render :xml => {}.to_xml } format.json { render :json => {}.to_json } end diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb index 6f62abc6a..99a915d65 100644 --- a/app/controllers/posts_controller.rb +++ b/app/controllers/posts_controller.rb @@ -50,7 +50,7 @@ class PostsController < ApplicationController respond_to do |format| format.js {render 'destroy'} format.json { render :nothing => true, :status => 204 } - format.all {redirect_to multi_stream_path} + format.all {redirect_to explore_path} end else Rails.logger.info "event=post_destroy status=failure user=#{current_user.diaspora_handle} reason='User does not own post'" diff --git a/app/controllers/status_messages_controller.rb b/app/controllers/status_messages_controller.rb index afbbbefba..fc79eed3e 100644 --- a/app/controllers/status_messages_controller.rb +++ b/app/controllers/status_messages_controller.rb @@ -61,7 +61,7 @@ class StatusMessagesController < ApplicationController respond_to do |format| format.html { redirect_to :back} - format.mobile{ redirect_to multi_stream_path} + format.mobile{ redirect_to explore_path} format.json{ render :json => @status_message.as_api_response(:backbone), :status => 201 } end else diff --git a/app/controllers/tag_followings_controller.rb b/app/controllers/tag_followings_controller.rb index f9a0e7b63..6fdd90e4b 100644 --- a/app/controllers/tag_followings_controller.rb +++ b/app/controllers/tag_followings_controller.rb @@ -63,6 +63,6 @@ class TagFollowingsController < ApplicationController @tag_following = current_user.tag_followings.create(:tag_id => @tag.id) end end - redirect_to multi_stream_path + redirect_to explore_path end end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 75f3a9581..2e098f03d 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -87,7 +87,7 @@ class UsersController < ApplicationController if params[:user] && params[:user][:current_password] && current_user.valid_password?(params[:user][:current_password]) current_user.close_account! sign_out current_user - redirect_to(multi_stream_path, :notice => I18n.t('users.destroy.success')) + redirect_to(explore_path, :notice => I18n.t('users.destroy.success')) else if params[:user].present? && params[:user][:current_password].present? flash[:error] = t 'users.destroy.wrong_password' @@ -111,7 +111,7 @@ class UsersController < ApplicationController format.any { redirect_to person_path(user.person) } end else - redirect_to multi_stream_path, :error => I18n.t('users.public.does_not_exist', :username => params[:username]) + redirect_to explore_path, :error => I18n.t('users.public.does_not_exist', :username => params[:username]) end end @@ -127,14 +127,14 @@ class UsersController < ApplicationController def logged_out @page = :logged_out if user_signed_in? - redirect_to multi_stream_path + redirect_to explore_path end end def getting_started_completed user = current_user user.update_attributes(:getting_started => false) - redirect_to multi_stream_path + redirect_to explore_path end def export diff --git a/app/helpers/stream_helper.rb b/app/helpers/stream_helper.rb index 10a6e27b0..b23bf25f1 100644 --- a/app/helpers/stream_helper.rb +++ b/app/helpers/stream_helper.rb @@ -13,7 +13,7 @@ module StreamHelper elsif controller.instance_of?(PostsController) public_stream_path(:max_time => time_for_scroll(@stream)) elsif controller.instance_of?(StreamsController) - multi_stream_path(:max_time => time_for_scroll(@stream)) + explore_path(:max_time => time_for_scroll(@stream)) else raise 'in order to use pagination for this new controller, update next_page_path in stream helper' end diff --git a/app/views/layouts/application.mobile.haml b/app/views/layouts/application.mobile.haml index 980e687ab..f7fd75414 100644 --- a/app/views/layouts/application.mobile.haml +++ b/app/views/layouts/application.mobile.haml @@ -49,7 +49,7 @@ .navbar.navbar-fixed-top .navbar-inner .container{:style => "position: relative;"} - = link_to(image_tag('header-logo2x.png', :height => 40, :width => 40, :id => 'header_title'), multi_stream_path) + = link_to(image_tag('header-logo2x.png', :height => 40, :width => 40, :id => 'header_title'), explore_path) - if user_signed_in? .right diff --git a/app/views/layouts/main_stream.html.haml b/app/views/layouts/main_stream.html.haml index 4a73f346e..4848825be 100644 --- a/app/views/layouts/main_stream.html.haml +++ b/app/views/layouts/main_stream.html.haml @@ -31,7 +31,7 @@ .section %ul.left_nav %li - = link_to t("streams.multi.title"), multi_stream_path, :class => 'home_selector', :rel => 'backbone' + = link_to t("streams.multi.title"), explore_path, :class => 'home_selector', :rel => 'backbone' = render 'aspects/aspect_listings', :stream => @stream @@ -41,7 +41,7 @@ %br %ul.left_nav %li - = link_to t("streams.participate.title"), participate_stream_path, :class => 'home_selector', :rel => 'backbone' + = link_to t("streams.participate.title"), participate_path, :class => 'home_selector', :rel => 'backbone' %ul.left_nav.sub %li diff --git a/app/views/users/logged_out.haml b/app/views/users/logged_out.haml index 9ca4a458b..3a954ff9a 100644 --- a/app/views/users/logged_out.haml +++ b/app/views/users/logged_out.haml @@ -22,7 +22,7 @@ %h4 = t('.simply_visit') %strong - = link_to AppConfig[:pod_url], multi_stream_path + = link_to AppConfig[:pod_url], explore_path = t('.on_your_mobile_device') %p.dull diff --git a/config/routes.rb b/config/routes.rb index 153e5ce37..edb4ab1f3 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -21,9 +21,9 @@ Diaspora::Application.routes.draw do end # Streams - get "participate" => "streams#participate", :as => "participate_stream" + get "participate" => "streams#participate", :as => "participate" + get "explore" => "streams#multi", :as => "explore" get "public" => "streams#public", :as => "public_stream" - get "stream" => "streams#multi", :as => "multi_stream" get "followed_tags" => "streams#followed_tags", :as => "followed_tags_stream" get "mentions" => "streams#mentioned", :as => "mentioned_stream" get "liked" => "streams#liked", :as => "liked_stream" diff --git a/features/accepts_invitation.feature b/features/accepts_invitation.feature index 3971078ce..d38c2df47 100644 --- a/features/accepts_invitation.feature +++ b/features/accepts_invitation.feature @@ -16,7 +16,7 @@ Feature: invitation acceptance And I preemptively confirm the alert And I follow "awesome_button" - Then I should be on the multi stream page + Then I should be on the explore page Scenario: accept invitation from user Given I have been invited by a user @@ -34,7 +34,7 @@ Feature: invitation acceptance And I preemptively confirm the alert And I follow "awesome_button" - Then I should be on the multi stream page + Then I should be on the explore page Scenario: sends an invitation Given a user with email "bob@bob.bob" diff --git a/features/change_password.feature b/features/change_password.feature index 6bb646c91..126259c65 100644 --- a/features/change_password.feature +++ b/features/change_password.feature @@ -11,7 +11,7 @@ Feature: Change password Then I should see "Password changed" Then I should be on the new user session page When I sign in with password "newsecret" - Then I should be on the multi stream page + Then I should be on the explore page Scenario: Reset my password Given a user with email "forgetful@users.net" diff --git a/features/logs_in_and_out.feature b/features/logs_in_and_out.feature index cc01930c1..e41bf52bc 100644 --- a/features/logs_in_and_out.feature +++ b/features/logs_in_and_out.feature @@ -6,7 +6,7 @@ Feature: user authentication And I fill in "Username" with "ohai" And I fill in "Password" with "secret" And I press "Sign in" - Then I should be on the multi stream page + Then I should be on the explore page @javascript Scenario: user logs out @@ -19,5 +19,5 @@ Feature: user authentication Scenario: user uses token auth Given a user with username "ohai" and password "secret" When I post a photo with a token - And I go to the multi stream page + And I go to the explore page Then I should be on the new user session page diff --git a/features/signs_up.feature b/features/signs_up.feature index 8cdd51e87..99d0d1160 100644 --- a/features/signs_up.feature +++ b/features/signs_up.feature @@ -19,18 +19,18 @@ Feature: new user registration And I preemptively confirm the alert And I follow "awesome_button" - Then I should be on the multi stream page + Then I should be on the explore page And I should not see "awesome_button" Scenario: new user skips the setup wizard When I preemptively confirm the alert And I follow "awesome_button" - Then I should be on the multi stream page + Then I should be on the explore page Scenario: closing a popover clears getting started When I preemptively confirm the alert And I follow "awesome_button" - Then I should be on the multi stream page + Then I should be on the explore page And I have turned off jQuery effects And I wait for the popovers to appear And I click close on all the popovers diff --git a/features/support/paths.rb b/features/support/paths.rb index ce6ccb3dc..83d7f6d18 100644 --- a/features/support/paths.rb +++ b/features/support/paths.rb @@ -2,7 +2,7 @@ module NavigationHelpers def path_to(page_name) case page_name when /^the home(?: )?page$/ - multi_stream_path + explore_path when /^step (\d)$/ if $1.to_i == 1 getting_started_path diff --git a/lib/stream/multi.rb b/lib/stream/multi.rb index f191202c6..e5f68cd4f 100644 --- a/lib/stream/multi.rb +++ b/lib/stream/multi.rb @@ -2,7 +2,7 @@ class Stream::Multi < Stream::Base # @return [String] URL def link(opts) - Rails.application.routes.url_helpers.multi_stream_path(opts) + Rails.application.routes.url_helpers.explore_path(opts) end # @return [String] diff --git a/lib/stream/participate.rb b/lib/stream/participate.rb index 4a5f269e1..a7e412596 100644 --- a/lib/stream/participate.rb +++ b/lib/stream/participate.rb @@ -1,6 +1,6 @@ class Stream::Participate < Stream::Base def link(opts={}) - Rails.application.routes.url_helpers.participate_stream_path(opts) + Rails.application.routes.url_helpers.participate_path(opts) end def order diff --git a/public/javascripts/app/router.js b/public/javascripts/app/router.js index 4b29da6a6..2277d6970 100644 --- a/public/javascripts/app/router.js +++ b/public/javascripts/app/router.js @@ -1,7 +1,7 @@ app.Router = Backbone.Router.extend({ routes: { "participate": "stream", - "stream": "stream", + "explore": "stream", "aspects:query": "stream", "commented": "stream", "liked": "stream", diff --git a/public/javascripts/app/templates/header.handlebars b/public/javascripts/app/templates/header.handlebars index 445f59f54..614b80034 100644 --- a/public/javascripts/app/templates/header.handlebars +++ b/public/javascripts/app/templates/header.handlebars @@ -1,6 +1,6 @@
- + @@ -13,7 +13,7 @@