diff --git a/app/assets/javascripts/app/pages/contacts.js b/app/assets/javascripts/app/pages/contacts.js index a7d21a0b0..01edab466 100644 --- a/app/assets/javascripts/app/pages/contacts.js +++ b/app/assets/javascripts/app/pages/contacts.js @@ -17,7 +17,7 @@ app.pages.Contacts = Backbone.View.extend({ this.chatToggle = $("#chat_privilege_toggle i"); this.stream = opts.stream; this.stream.render(); - $("#people_stream.contacts .header i").tooltip({"placement": "bottom"}); + $("#people-stream.contacts .header i").tooltip({"placement": "bottom"}); $(document).on("ajax:success", "form.edit_aspect", this.updateAspectName); app.events.on("aspect:create", function(){ window.location.reload() }); app.events.on("aspect_membership:create", this.addAspectMembership, this); diff --git a/app/assets/javascripts/contact-list.js b/app/assets/javascripts/contact-list.js index 87740a64a..c5734d583 100644 --- a/app/assets/javascripts/contact-list.js +++ b/app/assets/javascripts/contact-list.js @@ -9,7 +9,7 @@ var List = { }, handleSearchRefresh: function( data ) { - var streamEl = $("#people_stream.stream"); + var streamEl = $("#people-stream.stream"); var string = data.search_html || $("

", { text : Diaspora.I18n.t("people.not_found") }); diff --git a/app/assets/stylesheets/color_themes/_color_theme_override_dark.scss b/app/assets/stylesheets/color_themes/_color_theme_override_dark.scss index 924ccf0c7..0a9791042 100644 --- a/app/assets/stylesheets/color_themes/_color_theme_override_dark.scss +++ b/app/assets/stylesheets/color_themes/_color_theme_override_dark.scss @@ -61,7 +61,7 @@ body { #invitationsModal #email_invitation { border-top: 1px dashed $gray-light; } - #contacts_container #people_stream.contacts .stream-element.in_aspect { + #contacts_container #people-stream.contacts .stream-element.in_aspect { background-color: $state-success-bg; border-left: 3px solid darken($state-success-bg, 10%); } diff --git a/app/assets/stylesheets/contacts.scss b/app/assets/stylesheets/contacts.scss index 4d49d39ad..8a35dbe48 100644 --- a/app/assets/stylesheets/contacts.scss +++ b/app/assets/stylesheets/contacts.scss @@ -21,7 +21,7 @@ } #contacts_container { - #people_stream.contacts { + #people-stream.contacts { .header { #change_aspect_name { cursor: pointer; } #aspect_name_form { diff --git a/app/assets/stylesheets/people.scss b/app/assets/stylesheets/people.scss index 59e0b2285..5e2e5a1a4 100644 --- a/app/assets/stylesheets/people.scss +++ b/app/assets/stylesheets/people.scss @@ -5,7 +5,7 @@ } #invitations-button { padding-left: 0; } } -#people_stream { +#people-stream { .media, .media-body { overflow: visible; } diff --git a/app/assets/stylesheets/profile.scss b/app/assets/stylesheets/profile.scss index 8163542f1..85300a491 100644 --- a/app/assets/stylesheets/profile.scss +++ b/app/assets/stylesheets/profile.scss @@ -139,7 +139,7 @@ .stream-container > .pagination { text-align: center; } - #people_stream { + #people-stream { background-color: $white; box-shadow: $card-shadow; } diff --git a/app/assets/stylesheets/tag.scss b/app/assets/stylesheets/tag.scss index 08a9c1ff4..99f2e8f79 100644 --- a/app/assets/stylesheets/tag.scss +++ b/app/assets/stylesheets/tag.scss @@ -30,7 +30,7 @@ h1.tag { line-height: 1.1; } - .side_stream #people_stream { + .side_stream #people-stream { .name { display: block; } .name, .diaspora_handle { word-break: break-all; diff --git a/app/views/contacts/index.html.haml b/app/views/contacts/index.html.haml index a4fc8da4e..217f61c5d 100644 --- a/app/views/contacts/index.html.haml +++ b/app/views/contacts/index.html.haml @@ -8,7 +8,7 @@ = render "contacts/sidebar" .col-md-9 - .stream.contacts.framed-content#people_stream + .stream.contacts.framed-content#people-stream = render "contacts/header" - if @contacts_size > 0 diff --git a/app/views/contacts/index.mobile.haml b/app/views/contacts/index.mobile.haml index 0e27e5dbb..7873bacc0 100644 --- a/app/views/contacts/index.mobile.haml +++ b/app/views/contacts/index.mobile.haml @@ -9,7 +9,7 @@ %h2 = t(".title") -#people_stream.stream.contacts +#people-stream.stream.contacts - if @contacts.size > 0 - for contact in @contacts = render "people/person", person: contact.person, contact: contact diff --git a/app/views/contacts/spotlight.haml b/app/views/contacts/spotlight.haml index 47767a482..e12010f8d 100644 --- a/app/views/contacts/spotlight.haml +++ b/app/views/contacts/spotlight.haml @@ -8,7 +8,7 @@ = render "contacts/sidebar" .col-md-9 - .stream.contacts.framed-content#people_stream + .stream.contacts.framed-content#people-stream .header.clearfix - if AppConfig.settings.community_spotlight.suggest_email.present? .pull-right diff --git a/app/views/people/_index.html.haml b/app/views/people/_index.html.haml index 3980b16d7..e8afa9529 100644 --- a/app/views/people/_index.html.haml +++ b/app/views/people/_index.html.haml @@ -1,4 +1,4 @@ -#people_stream +#people-stream - people.each do |person| .media.stream-element{id: person.id} .media-object.pull-left diff --git a/app/views/people/contacts.haml b/app/views/people/contacts.haml index 01567d6fe..b3af8650d 100644 --- a/app/views/people/contacts.haml +++ b/app/views/people/contacts.haml @@ -12,7 +12,7 @@ -# more JS .stream-container - #people_stream.stream + #people-stream.stream - @hashes.each do |hash| = render partial: 'people/person', locals: hash = will_paginate @contacts_of_contact, renderer: WillPaginate::ActionView::BootstrapLinkRenderer diff --git a/app/views/people/index.html.haml b/app/views/people/index.html.haml index a3c19c069..912be0d6f 100644 --- a/app/views/people/index.html.haml +++ b/app/views/people/index.html.haml @@ -14,7 +14,7 @@ = search_header .row .col-md-8 - #people_stream.stream + #people-stream.stream - if @hashes.empty? %p - if @background_query.present? diff --git a/app/views/people/index.mobile.haml b/app/views/people/index.mobile.haml index 56255bd14..a4b91a51d 100644 --- a/app/views/people/index.mobile.haml +++ b/app/views/people/index.mobile.haml @@ -23,7 +23,7 @@ =t('.no_one_found') - else - #people_stream.stream + #people-stream.stream - for hash in @hashes = render :partial => 'people/person', :locals => hash diff --git a/features/desktop/contacts.feature b/features/desktop/contacts.feature index 5521f74fe..1beecbc86 100644 --- a/features/desktop/contacts.feature +++ b/features/desktop/contacts.feature @@ -25,8 +25,8 @@ Feature: show contacts Then I should see "Contacts" within "#profile-horizontal-bar" When I press the first "#contacts_link" - Then I should see "Bob Jones" within "#people_stream .media-body" - When I add the person to my "Besties" aspect within "#people_stream" + Then I should see "Bob Jones" within "#people-stream .media-body" + When I add the person to my "Besties" aspect within "#people-stream" Then I should see a flash message containing "You have started sharing with Bob Jones!" Scenario: don't see contacts of an invisible aspect list diff --git a/features/step_definitions/custom_web_steps.rb b/features/step_definitions/custom_web_steps.rb index d28ccdfed..25405d5b9 100644 --- a/features/step_definitions/custom_web_steps.rb +++ b/features/step_definitions/custom_web_steps.rb @@ -205,7 +205,7 @@ Then /^the "([^"]*)" field(?: within "([^"]*)")? should be filled with "([^"]*)" end Then /^I should see (\d+) contacts$/ do |n_posts| - has_css?("#people_stream .stream-element", count: n_posts.to_i).should be true + has_css?("#people-stream .stream-element", count: n_posts.to_i).should be true end And /^I scroll down$/ do