Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Milan
diaspora
Commits
9fa032e4
Unverified
Commit
9fa032e4
authored
Aug 30, 2017
by
Steffen van Bergerem
Committed by
Benjamin Neff
Aug 31, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace people_stream with people-stream
parent
77296354
Changes
16
Hide whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
17 additions
and
17 deletions
+17
-17
app/assets/javascripts/app/pages/contacts.js
app/assets/javascripts/app/pages/contacts.js
+1
-1
app/assets/javascripts/contact-list.js
app/assets/javascripts/contact-list.js
+1
-1
app/assets/stylesheets/color_themes/_color_theme_override_dark.scss
.../stylesheets/color_themes/_color_theme_override_dark.scss
+1
-1
app/assets/stylesheets/contacts.scss
app/assets/stylesheets/contacts.scss
+1
-1
app/assets/stylesheets/people.scss
app/assets/stylesheets/people.scss
+1
-1
app/assets/stylesheets/profile.scss
app/assets/stylesheets/profile.scss
+1
-1
app/assets/stylesheets/tag.scss
app/assets/stylesheets/tag.scss
+1
-1
app/views/contacts/index.html.haml
app/views/contacts/index.html.haml
+1
-1
app/views/contacts/index.mobile.haml
app/views/contacts/index.mobile.haml
+1
-1
app/views/contacts/spotlight.haml
app/views/contacts/spotlight.haml
+1
-1
app/views/people/_index.html.haml
app/views/people/_index.html.haml
+1
-1
app/views/people/contacts.haml
app/views/people/contacts.haml
+1
-1
app/views/people/index.html.haml
app/views/people/index.html.haml
+1
-1
app/views/people/index.mobile.haml
app/views/people/index.mobile.haml
+1
-1
features/desktop/contacts.feature
features/desktop/contacts.feature
+2
-2
features/step_definitions/custom_web_steps.rb
features/step_definitions/custom_web_steps.rb
+1
-1
No files found.
app/assets/javascripts/app/pages/contacts.js
View file @
9fa032e4
...
...
@@ -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
);
...
...
app/assets/javascripts/contact-list.js
View file @
9fa032e4
...
...
@@ -9,7 +9,7 @@ var List = {
},
handleSearchRefresh
:
function
(
data
)
{
var
streamEl
=
$
(
"
#people
_
stream.stream
"
);
var
streamEl
=
$
(
"
#people
-
stream.stream
"
);
var
string
=
data
.
search_html
||
$
(
"
<p>
"
,
{
text
:
Diaspora
.
I18n
.
t
(
"
people.not_found
"
)
});
...
...
app/assets/stylesheets/color_themes/_color_theme_override_dark.scss
View file @
9fa032e4
...
...
@@ -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%
);
}
...
...
app/assets/stylesheets/contacts.scss
View file @
9fa032e4
...
...
@@ -21,7 +21,7 @@
}
#contacts_container
{
#people
_
stream
.contacts
{
#people
-
stream
.contacts
{
.header
{
#change_aspect_name
{
cursor
:
pointer
;
}
#aspect_name_form
{
...
...
app/assets/stylesheets/people.scss
View file @
9fa032e4
...
...
@@ -5,7 +5,7 @@
}
#invitations-button
{
padding-left
:
0
;
}
}
#people
_
stream
{
#people
-
stream
{
.media
,
.media-body
{
overflow
:
visible
;
}
...
...
app/assets/stylesheets/profile.scss
View file @
9fa032e4
...
...
@@ -139,7 +139,7 @@
.stream-container
>
.pagination
{
text-align
:
center
;
}
#people
_
stream
{
#people
-
stream
{
background-color
:
$white
;
box-shadow
:
$card-shadow
;
}
...
...
app/assets/stylesheets/tag.scss
View file @
9fa032e4
...
...
@@ -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
;
...
...
app/views/contacts/index.html.haml
View file @
9fa032e4
...
...
@@ -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
...
...
app/views/contacts/index.mobile.haml
View file @
9fa032e4
...
...
@@ -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
...
...
app/views/contacts/spotlight.haml
View file @
9fa032e4
...
...
@@ -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
...
...
app/views/people/_index.html.haml
View file @
9fa032e4
#people
_
stream
#people
-
stream
-
people
.
each
do
|
person
|
.media.stream-element
{
id:
person
.
id
}
.media-object.pull-left
...
...
app/views/people/contacts.haml
View file @
9fa032e4
...
...
@@ -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
...
...
app/views/people/index.html.haml
View file @
9fa032e4
...
...
@@ -14,7 +14,7 @@
=
search_header
.row
.col-md-8
#people
_
stream
.stream
#people
-
stream
.stream
-
if
@hashes
.
empty?
%p
-
if
@background_query
.
present?
...
...
app/views/people/index.mobile.haml
View file @
9fa032e4
...
...
@@ -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
...
...
features/desktop/contacts.feature
View file @
9fa032e4
...
...
@@ -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
...
...
features/step_definitions/custom_web_steps.rb
View file @
9fa032e4
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment