Commit b4e3f846 authored by Steffen van Bergerem's avatar Steffen van Bergerem Committed by Benjamin Neff

Replace main_stream with main-stream

parent e31c5ff4
......@@ -11,7 +11,7 @@ app.pages.Profile = app.views.Base.extend({
subviews: {
"#profile": "sidebarView",
".profile_header": "headerView",
"#main_stream": "streamView"
"#main-stream": "streamView"
},
tooltipSelector: ".profile_button .profile-header-icon, .sharing_message_container",
......
......@@ -220,7 +220,7 @@ app.Router = Backbone.Router.extend({
app.page.setupAvatarFallback($(".main-stream-publisher"));
}
$("#main_stream").html(app.page.render().el);
$("#main-stream").html(app.page.render().el);
this._hideInactiveStreamLists();
},
......
......@@ -15,7 +15,7 @@ app.views.Photos = app.views.InfScroll.extend({
},
postRenderTemplate: function(){
var photoAttachments = $("#main_stream > div");
var photoAttachments = $("#main-stream > div");
if(photoAttachments.length > 0) {
new app.views.Gallery({ el: photoAttachments });
}
......
......@@ -108,7 +108,7 @@ app.views.Publisher = Backbone.View.extend({
this.viewGettingStarted = new app.views.PublisherGettingStarted({
firstMessageEl: this.inputEl,
visibilityEl: this.$(".public_toggle .aspect_dropdown > .dropdown-toggle"),
streamEl: $("#main_stream")
streamEl: $("#main-stream")
});
this.viewUploader = new app.views.PublisherUploader({
......
body {
#main_stream .stream-element {
#main-stream .stream-element {
border: 0;
border-bottom: 1px solid $border-grey;
margin-bottom: 10px;
......
......@@ -206,7 +206,7 @@ footer {
padding: 0; } }
#main_stream {
#main-stream {
.from {
white-space: nowrap;
overflow: hidden;
......
......@@ -61,7 +61,7 @@
}
}
#main_stream .stream-element {
#main-stream .stream-element {
margin-bottom: 20px;
border: 1px solid $border-grey;
box-shadow: $card-shadow;
......
......@@ -8,10 +8,10 @@
= render "publisher/publisher", publisher_aspects_for(stream)
- if current_user.getting_started?
.stream#main_stream{:title => popover_with_close_html("3. #{t('.stay_updated')}"),
.stream#main-stream{:title => popover_with_close_html("3. #{t('.stay_updated')}"),
"data-content" => t(".stay_updated_explanation")}
- else
.stream#main_stream
.stream#main-stream
#paginate
.loader.hidden
......
......@@ -2,7 +2,7 @@
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
#main_stream.stream
#main-stream.stream
.login-form
.login-container
= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f|
......
......@@ -2,7 +2,7 @@
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
#main_stream.stream
#main-stream.stream
.login-form
.login-container
= form_for(resource, :as => resource_name, :url => password_path(resource_name)) do |f|
......
......@@ -23,7 +23,7 @@
- if user_signed_in? && current_user.person.id == @person.id && !current_page?(person_photos_path(@person))
= render 'publisher/publisher', publisher_aspects_for(nil)
.stream.clearfix#main_stream
.stream.clearfix#main-stream
-# JS
#paginate
......
......@@ -19,7 +19,7 @@
- if @post_type == :photos
= render "photos/index", photos: @posts
- else
.stream#main_stream
.stream#main-stream
- if @stream.stream_posts.length > 0
= render "shared/stream", posts: @stream.stream_posts
= render "shared/stream_more_button"
......
......@@ -2,6 +2,6 @@
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
#main_stream
#main-stream
- for photo in photos
= link_to image_tag(photo.url(:thumb_large)), person_photo_path(photo.author, photo), class: "thumbnail"
......@@ -2,7 +2,7 @@
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
.stream#main_stream
.stream#main-stream
- flash.each do |name, msg|
.expose#flash-container
.flash-message{class: "message alert alert-#{flash_class name}", role: "alert"}
......
......@@ -2,7 +2,7 @@
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
.stream#main_stream
.stream#main-stream
- flash.each do |name, msg|
.expose#flash-container
.flash-message{class: "message alert alert-#{flash_class name}", role: "alert"}
......
......@@ -2,6 +2,6 @@
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
#main_stream.stream
#main-stream.stream
= render 'shared/stream', posts: @stream.stream_posts
= render 'shared/stream_more_button'
......@@ -28,7 +28,7 @@
- if current_user
= render "publisher/publisher", publisher_aspects_for(@stream)
#main_stream.stream
#main-stream.stream
#paginate
.loader.hidden
......
......@@ -12,7 +12,7 @@
.btn.btn-danger.tag_following_action{data: {name: @stream.tag_name}}
= t(".stop_following", tag: @stream.tag_name)
#main_stream.stream
#main-stream.stream
= render 'shared/stream', :posts => @stream.stream_posts
= render 'shared/stream_more_button'
......@@ -24,12 +24,12 @@ Feature: Hovercards
Scenario: Hovercards on the main stream in reshares
Given I sign in as "alice@alice.alice"
And I am on "bob@bob.bob"'s page
Then I should see "Alice" within "#main_stream"
When I hover "Alice" within "#main_stream"
Then I should see "Alice" within "#main-stream"
When I hover "Alice" within "#main-stream"
Then I should not see a hovercard
When I am on "alice@alice.alice"'s page
Then I should see "Bob Jones" within "#main_stream"
When I hover "Bob Jones" within "#main_stream"
Then I should see "Bob Jones" within "#main-stream"
When I hover "Bob Jones" within "#main-stream"
Then I should see a hovercard
Scenario: Hovercards on the tag stream as a logged out user
......
......@@ -17,12 +17,12 @@ Feature: Liking posts
Then I should not have activated notifications for the post
When I like the post "I like unicorns" in the stream
Then I should see "Unlike" within ".stream-element .feedback"
And I should see a ".likes .media" within "#main_stream .stream-element"
And I should see a ".likes .media" within "#main-stream .stream-element"
And I should have activated notifications for the post
When I unlike the post "I like unicorns" in the stream
Then I should see "Like" within ".stream-element .feedback"
And I should not see a ".likes .media" within "#main_stream .stream-element"
And I should not see a ".likes .media" within "#main-stream .stream-element"
Scenario: Liking and unliking a post from a single post page
......@@ -39,4 +39,4 @@ Feature: Liking posts
When I like the post "I like unicorns" in the stream
And I sign out
And I sign in as "bob@bob.bob"
Then I should see a ".likes" within "#main_stream .stream-element"
Then I should see a ".likes" within "#main-stream .stream-element"
......@@ -31,8 +31,8 @@ Feature: show photos
Scenario: I delete a photo
When I am on "robert@grimm.grimm"'s photos page
Then I should see a ".thumbnail" within "#main_stream"
Then I should see a ".thumbnail" within "#main-stream"
When I confirm the alert after I delete a photo
Then I should not see a ".thumbnail" within "#main_stream"
Then I should not see a ".thumbnail" within "#main-stream"
When I am on "robert@grimm.grimm"'s page
Then I should not see "Photos" within "#profile-horizontal-bar"
......@@ -58,11 +58,11 @@ Feature: Navigate between pages using the header menu and the drawer
And I click on "My aspects" in the drawer
And I click on "All aspects" in the drawer
Then I should be on the aspects page
And I should see "Hi you!" within "#main_stream"
And I should see "Hi you!" within "#main-stream"
When I open the drawer
And I click on "My aspects" in the drawer
And I click on "Unicorns" in the drawer
And I should not see "Hi you!" within "#main_stream"
And I should not see "Hi you!" within "#main-stream"
Scenario: navigate to the followed tags page
When I follow the "boss" tag
......
......@@ -13,4 +13,4 @@ Feature: Viewing the main stream mobile page
When I sign in as "bob@bob.bob" on the mobile website
And I go to the stream page
Then I should see "Hello! I am #newhere" within ".ltr"
And I should see "less than a minute ago" within "#main_stream"
And I should see "less than a minute ago" within "#main-stream"
......@@ -3,12 +3,12 @@ When /^I focus the comment field$/ do
end
Then /^the first comment field should be open/ do
find("#main_stream .stream-element .new-comment").should be_visible
find("#main-stream .stream-element .new-comment").should be_visible
end
Then /^the first comment field should be closed$/ do
page.should have_css(".stream-element .media")
page.should_not have_selector("#main_stream .stream-element .new-comment", match: :first)
page.should_not have_selector("#main-stream .stream-element .new-comment", match: :first)
end
When /^I make a show page comment "([^"]*)"$/ do |comment_text|
......
When /^I press the "([^\"]*)" key somewhere$/ do |key|
within("#main_stream") do
within("#main-stream") do
find("div.stream-element", match: :first).native.send_keys(key)
end
end
......
......@@ -7,7 +7,7 @@ When "I filter notifications by mentions" do
end
Then /^I should( not)? have activated notifications for the post( in the single post view)?$/ do |negate, spv|
selector = spv ? "#single-post-moderation" : "#main_stream .stream-element"
selector = spv ? "#single-post-moderation" : "#main-stream .stream-element"
if negate
expect(find(selector, match: :first)).to have_no_css(".destroy_participation", visible: false)
expect(find(selector, match: :first)).to have_css(".create_participation", visible: false)
......
......@@ -30,7 +30,7 @@ module PublishingCukeHelpers
# wait for the publisher to be closed
expect(find("#publisher")["class"]).to include("closed")
# wait for the content to appear
expect(find("#main_stream")).to have_content(txt)
expect(find("#main-stream")).to have_content(txt)
end
def click_and_post(text)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment