nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

updated routes to reflect page titles (explore/participate)

Browse source
This commit is contained in:
danielgrippi 2012-02-08 14:40:28 -08:00
parent 8fb3ad710f
commit 84eb313e20
32 changed files with 45 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/application_controller.rb
View file

@ -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

2
app/controllers/home_controller.rb
View file

@ -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

2
app/controllers/notifications_controller.rb
View file

@ -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

2
app/controllers/posts_controller.rb
View file

@ -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'"

2
app/controllers/status_messages_controller.rb
View file

@ -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

2
app/controllers/tag_followings_controller.rb
View file

@ -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

8
app/controllers/users_controller.rb
View file

@ -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

2
app/helpers/stream_helper.rb
View file

@ -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

2
app/views/layouts/application.mobile.haml
View file

@ -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

4
app/views/layouts/main_stream.html.haml
View file

@ -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

2
app/views/users/logged_out.haml
View file

@ -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

4
config/routes.rb
View file

@ -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"

4
features/accepts_invitation.feature
View file

@ -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"

2
features/change_password.feature
View file

@ -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"

4
features/logs_in_and_out.feature
View file

@ -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

6
features/signs_up.feature
View file

@ -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

2
features/support/paths.rb
View file

@ -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

2
lib/stream/multi.rb
View file

@ -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]

2
lib/stream/participate.rb
View file

@ -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

2
public/javascripts/app/router.js
View file

@ -1,7 +1,7 @@
app.Router = Backbone.Router.extend({
routes: {
"participate": "stream",
"stream": "stream",
"explore": "stream",
"aspects:query": "stream",
"commented": "stream",
"liked": "stream",

4
public/javascripts/app/templates/header.handlebars
View file

@ -1,6 +1,6 @@
<div class="container" style="position:relative;">
<a href="/stream">
<a href="/explore">
<img alt="Logo_small" class="diaspora_header_logo" height="38px" width="65px" src="{{imageUrl "/images/header-logo.png"}}" />
</a>
@ -13,7 +13,7 @@
<div id="nav_badges">
<div class="badge" id="home_badge">
<a href="/stream" title="{{t "header.home"}}"><img alt="Home" src="{{imageUrl "/images/icons/home_grey.png"}}" />
<a href="/explore" title="{{t "header.home"}}"><img alt="Home" src="{{imageUrl "/images/icons/home_grey.png"}}" />
</a>
</div>

1
public/javascripts/publisher.js
View file

@ -191,7 +191,6 @@ var Publisher = {
},
initialize: function() {
console.log("OHHHHH MY GAWD")
Publisher.cachedForm = Publisher.cachedSubmit =
Publisher.cachedInput = Publisher.cachedHiddenInput = false;

4
spec/controllers/admins_controller_spec.rb
View file

@ -14,7 +14,7 @@ describe AdminsController do
context 'admin not signed in' do
it 'is behind redirect_unless_admin' do
get :user_search
response.should redirect_to multi_stream_path
response.should redirect_to explore_path
end
end
@ -64,7 +64,7 @@ describe AdminsController do
context 'admin not signed in' do
it 'is behind redirect_unless_admin' do
get :admin_inviter
response.should redirect_to multi_stream_path
response.should redirect_to explore_path
end
end

2
spec/controllers/home_controller_spec.rb
View file

@ -14,7 +14,7 @@ describe HomeController do
it 'redirects to multis index if user is logged in' do
sign_in alice
get :show, :home => true
response.should redirect_to(multi_stream_path)
response.should redirect_to(explore_path)
end
end
end

4
spec/controllers/jasmine_fixtures/streams_spec.rb
View file

@ -10,7 +10,7 @@ describe StreamsController do
sign_in :user, alice
end
it 'generates the multi_stream_json fixture', :fixture => true do
it 'generates the explore_json fixture', :fixture => true do
posts = []
time = Time.now
@ -53,7 +53,7 @@ TXT
get :multi, :format => :json
response.should be_success
save_fixture(response.body, "multi_stream_json")
save_fixture(response.body, "explore_json")
Timecop.return
end

2
spec/controllers/notifications_controller_spec.rb
View file

@ -59,7 +59,7 @@ describe NotificationsController do
it "should redirect to the stream in the html version" do
Factory(:notification, :recipient => @user)
get :read_all, :format => :html
response.should redirect_to(multi_stream_path)
response.should redirect_to(explore_path)
end
it "should return a dummy value in the json version" do
Factory(:notification, :recipient => @user)

2
spec/controllers/registrations_controller_spec.rb
View file

@ -67,7 +67,7 @@ describe RegistrationsController do
it "redirects to the home path" do
get :create, @valid_params
response.should be_redirect
response.location.should match /^#{multi_stream_url}\??$/
response.location.should match /^#{explore_url}\??$/
end
end

4
spec/controllers/sessions_controller_spec.rb
View file

@ -27,14 +27,14 @@ describe SessionsController do
it "redirects to /stream for a non-mobile user" do
post :create, {"user" => {"remember_me" => "0", "username" => @user.username, "password" => "evankorth"}}
response.should be_redirect
response.location.should match /^#{multi_stream_url}\??$/
response.location.should match /^#{explore_url}\??$/
end
it "redirects to /stream for a mobile user" do
@request.env['HTTP_USER_AGENT'] = 'Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_1 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8B117 Safari/6531.22.7'
post :create, {"user" => {"remember_me" => "0", "username" => @user.username, "password" => "evankorth"}}
response.should be_redirect
response.location.should match /^#{multi_stream_url}\??$/
response.location.should match /^#{explore_url}\??$/
end
it 'queues up an update job' do

2
spec/javascripts/app/views/feedback_view_spec.js
View file

@ -9,7 +9,7 @@ describe("app.views.Feedback", function(){
'limited' : "Limted"
}})
var posts = $.parseJSON(spec.readFixture("multi_stream_json"))["posts"];
var posts = $.parseJSON(spec.readFixture("explore_json"))["posts"];
this.post = new app.models.Post(posts[0]);
this.view = new app.views.Feedback({model: this.post});

2
spec/javascripts/app/views/likes_info_view_spec.js
View file

@ -9,7 +9,7 @@ describe("app.views.LikesInfo", function(){
}
})
var posts = $.parseJSON(spec.readFixture("multi_stream_json"))["posts"];
var posts = $.parseJSON(spec.readFixture("explore_json"))["posts"];
this.post = new app.models.Post(posts[0]); // post with a like
this.view = new app.views.LikesInfo({model: this.post});
});

2
spec/javascripts/app/views/post_view_spec.js
View file

@ -11,7 +11,7 @@ describe("app.views.Post", function(){
}
}})
var posts = $.parseJSON(spec.readFixture("multi_stream_json"))["posts"];
var posts = $.parseJSON(spec.readFixture("explore_json"))["posts"];
this.collection = new app.collections.Posts(posts);
this.statusMessage = this.collection.models[0];

2
spec/javascripts/app/views/stream_view_spec.js
View file

@ -2,7 +2,7 @@ describe("app.views.Stream", function() {
beforeEach(function() {
loginAs({name: "alice", avatar : {small : "http://avatar.com/photo.jpg"}});
this.posts = $.parseJSON(spec.readFixture("multi_stream_json"))["posts"];
this.posts = $.parseJSON(spec.readFixture("explore_json"))["posts"];
this.stream = new app.models.Stream();
this.stream.add(this.posts);