Replace people_stream with people-stream
This commit is contained in:
parent
7729635485
commit
9fa032e4c9
16 changed files with 17 additions and 17 deletions
|
|
@ -17,7 +17,7 @@ app.pages.Contacts = Backbone.View.extend({
|
||||||
this.chatToggle = $("#chat_privilege_toggle i");
|
this.chatToggle = $("#chat_privilege_toggle i");
|
||||||
this.stream = opts.stream;
|
this.stream = opts.stream;
|
||||||
this.stream.render();
|
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);
|
$(document).on("ajax:success", "form.edit_aspect", this.updateAspectName);
|
||||||
app.events.on("aspect:create", function(){ window.location.reload() });
|
app.events.on("aspect:create", function(){ window.location.reload() });
|
||||||
app.events.on("aspect_membership:create", this.addAspectMembership, this);
|
app.events.on("aspect_membership:create", this.addAspectMembership, this);
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@ var List = {
|
||||||
},
|
},
|
||||||
|
|
||||||
handleSearchRefresh: function( data ) {
|
handleSearchRefresh: function( data ) {
|
||||||
var streamEl = $("#people_stream.stream");
|
var streamEl = $("#people-stream.stream");
|
||||||
var string = data.search_html || $("<p>", {
|
var string = data.search_html || $("<p>", {
|
||||||
text : Diaspora.I18n.t("people.not_found")
|
text : Diaspora.I18n.t("people.not_found")
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -61,7 +61,7 @@ body {
|
||||||
|
|
||||||
#invitationsModal #email_invitation { border-top: 1px dashed $gray-light; }
|
#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;
|
background-color: $state-success-bg;
|
||||||
border-left: 3px solid darken($state-success-bg, 10%);
|
border-left: 3px solid darken($state-success-bg, 10%);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
#contacts_container {
|
#contacts_container {
|
||||||
#people_stream.contacts {
|
#people-stream.contacts {
|
||||||
.header {
|
.header {
|
||||||
#change_aspect_name { cursor: pointer; }
|
#change_aspect_name { cursor: pointer; }
|
||||||
#aspect_name_form {
|
#aspect_name_form {
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@
|
||||||
}
|
}
|
||||||
#invitations-button { padding-left: 0; }
|
#invitations-button { padding-left: 0; }
|
||||||
}
|
}
|
||||||
#people_stream {
|
#people-stream {
|
||||||
.media, .media-body {
|
.media, .media-body {
|
||||||
overflow: visible;
|
overflow: visible;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -139,7 +139,7 @@
|
||||||
|
|
||||||
.stream-container > .pagination { text-align: center; }
|
.stream-container > .pagination { text-align: center; }
|
||||||
|
|
||||||
#people_stream {
|
#people-stream {
|
||||||
background-color: $white;
|
background-color: $white;
|
||||||
box-shadow: $card-shadow;
|
box-shadow: $card-shadow;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -30,7 +30,7 @@ h1.tag {
|
||||||
line-height: 1.1;
|
line-height: 1.1;
|
||||||
}
|
}
|
||||||
|
|
||||||
.side_stream #people_stream {
|
.side_stream #people-stream {
|
||||||
.name { display: block; }
|
.name { display: block; }
|
||||||
.name, .diaspora_handle {
|
.name, .diaspora_handle {
|
||||||
word-break: break-all;
|
word-break: break-all;
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@
|
||||||
= render "contacts/sidebar"
|
= render "contacts/sidebar"
|
||||||
|
|
||||||
.col-md-9
|
.col-md-9
|
||||||
.stream.contacts.framed-content#people_stream
|
.stream.contacts.framed-content#people-stream
|
||||||
= render "contacts/header"
|
= render "contacts/header"
|
||||||
|
|
||||||
- if @contacts_size > 0
|
- if @contacts_size > 0
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@
|
||||||
%h2
|
%h2
|
||||||
= t(".title")
|
= t(".title")
|
||||||
|
|
||||||
#people_stream.stream.contacts
|
#people-stream.stream.contacts
|
||||||
- if @contacts.size > 0
|
- if @contacts.size > 0
|
||||||
- for contact in @contacts
|
- for contact in @contacts
|
||||||
= render "people/person", person: contact.person, contact: contact
|
= render "people/person", person: contact.person, contact: contact
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@
|
||||||
= render "contacts/sidebar"
|
= render "contacts/sidebar"
|
||||||
|
|
||||||
.col-md-9
|
.col-md-9
|
||||||
.stream.contacts.framed-content#people_stream
|
.stream.contacts.framed-content#people-stream
|
||||||
.header.clearfix
|
.header.clearfix
|
||||||
- if AppConfig.settings.community_spotlight.suggest_email.present?
|
- if AppConfig.settings.community_spotlight.suggest_email.present?
|
||||||
.pull-right
|
.pull-right
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
#people_stream
|
#people-stream
|
||||||
- people.each do |person|
|
- people.each do |person|
|
||||||
.media.stream-element{id: person.id}
|
.media.stream-element{id: person.id}
|
||||||
.media-object.pull-left
|
.media-object.pull-left
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@
|
||||||
-# more JS
|
-# more JS
|
||||||
|
|
||||||
.stream-container
|
.stream-container
|
||||||
#people_stream.stream
|
#people-stream.stream
|
||||||
- @hashes.each do |hash|
|
- @hashes.each do |hash|
|
||||||
= render partial: 'people/person', locals: hash
|
= render partial: 'people/person', locals: hash
|
||||||
= will_paginate @contacts_of_contact, renderer: WillPaginate::ActionView::BootstrapLinkRenderer
|
= will_paginate @contacts_of_contact, renderer: WillPaginate::ActionView::BootstrapLinkRenderer
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,7 @@
|
||||||
= search_header
|
= search_header
|
||||||
.row
|
.row
|
||||||
.col-md-8
|
.col-md-8
|
||||||
#people_stream.stream
|
#people-stream.stream
|
||||||
- if @hashes.empty?
|
- if @hashes.empty?
|
||||||
%p
|
%p
|
||||||
- if @background_query.present?
|
- if @background_query.present?
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,7 @@
|
||||||
=t('.no_one_found')
|
=t('.no_one_found')
|
||||||
|
|
||||||
- else
|
- else
|
||||||
#people_stream.stream
|
#people-stream.stream
|
||||||
- for hash in @hashes
|
- for hash in @hashes
|
||||||
= render :partial => 'people/person', :locals => hash
|
= render :partial => 'people/person', :locals => hash
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -25,8 +25,8 @@ Feature: show contacts
|
||||||
Then I should see "Contacts" within "#profile-horizontal-bar"
|
Then I should see "Contacts" within "#profile-horizontal-bar"
|
||||||
|
|
||||||
When I press the first "#contacts_link"
|
When I press the first "#contacts_link"
|
||||||
Then I should see "Bob Jones" within "#people_stream .media-body"
|
Then I should see "Bob Jones" within "#people-stream .media-body"
|
||||||
When I add the person to my "Besties" aspect within "#people_stream"
|
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!"
|
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
|
Scenario: don't see contacts of an invisible aspect list
|
||||||
|
|
|
||||||
|
|
@ -205,7 +205,7 @@ Then /^the "([^"]*)" field(?: within "([^"]*)")? should be filled with "([^"]*)"
|
||||||
end
|
end
|
||||||
|
|
||||||
Then /^I should see (\d+) contacts$/ do |n_posts|
|
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
|
end
|
||||||
|
|
||||||
And /^I scroll down$/ do
|
And /^I scroll down$/ do
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue