New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#4304 Add ignore user icon on profile sidebar #4417

Closed
wants to merge 16 commits into
base: develop
from

Conversation

Projects
None yet
8 participants
@sjain1107
Contributor

sjain1107 commented Aug 21, 2013

No description provided.

@Raven24

This comment has been minimized.

Show comment
Hide comment
@Raven24

Raven24 Aug 21, 2013

Member

[work in progress]

Member

Raven24 commented Aug 21, 2013

[work in progress]

@goobertron goobertron referenced this pull request Aug 21, 2013

Merged

Add tutorials pages #44

@jhass

View changes

Show outdated Hide outdated app/assets/stylesheets/application.css.sass
@jhass

View changes

Show outdated Hide outdated app/views/people/_profile_sidebar.html.haml
@jhass

View changes

Show outdated Hide outdated app/views/people/_profile_sidebar.html.haml
@svbergerem

This comment has been minimized.

Show comment
Hide comment
@svbergerem

svbergerem Aug 25, 2013

Member

@MrZYX The javascript is not being invoked in profile.js while it's working fine in people.js. Any ideas why this doesn't work?

@sjain1107 You will also have to change app/assets/stylesheets/profile.css.scss. There are two comments (those are the only comments ;) ) you will have to uncomment and delete in both cases the line under the comment.

Member

svbergerem commented Aug 25, 2013

@MrZYX The javascript is not being invoked in profile.js while it's working fine in people.js. Any ideas why this doesn't work?

@sjain1107 You will also have to change app/assets/stylesheets/profile.css.scss. There are two comments (those are the only comments ;) ) you will have to uncomment and delete in both cases the line under the comment.

@jhass

This comment has been minimized.

Show comment
Hide comment
@jhass

jhass Aug 25, 2013

Member

Hm, looks like profile.js is only included on the profile edit page, on the profile/person show page people.js is explicitly included. So maybe we just keep it that way then and keep/move the JS to people.js

Member

jhass commented Aug 25, 2013

Hm, looks like profile.js is only included on the profile edit page, on the profile/person show page people.js is explicitly included. So maybe we just keep it that way then and keep/move the JS to people.js

@sjain1107

This comment has been minimized.

Show comment
Hide comment
@sjain1107

sjain1107 Aug 25, 2013

Contributor

@MrZYX If I add the JS to people.js, the person once ignored can be re-ignored !!
image

Contributor

sjain1107 commented Aug 25, 2013

@MrZYX If I add the JS to people.js, the person once ignored can be re-ignored !!
image

@jhass

This comment has been minimized.

Show comment
Hide comment
@jhass

jhass Aug 25, 2013

Member

Don't display the icon if there's already a block then. I doubt this changes in any way if you inline the script or put it into people.js

Member

jhass commented Aug 25, 2013

Don't display the icon if there's already a block then. I doubt this changes in any way if you inline the script or put it into people.js

@goobertron

This comment has been minimized.

Show comment
Hide comment
@goobertron

goobertron Aug 25, 2013

The original idea, as I understood it, was for it to be possible to ignore a user from the profile page, and to stop ignoring a user if they are currently being ignored.

We will need a specific area on the red bar (when a user is currently being ignored) where you can click to stop ignoring that user. It would be useful to have an icon in this area, to make it obvious what to click to stop ignoring that person. Someone suggested using the standard 'ignore' icon but without the line through the person; if that's not possible, perhaps we should use the same icon as for 'ignore' - the bar being red is the key that you will stop ignoring the person by clicking the icon. And perhaps a tooltip could read 'ignore this user' or 'stop ignoring this user', depending on the case.

Or is the option to stop ignoring a user from the profile page being dropped from this PR?

goobertron commented Aug 25, 2013

The original idea, as I understood it, was for it to be possible to ignore a user from the profile page, and to stop ignoring a user if they are currently being ignored.

We will need a specific area on the red bar (when a user is currently being ignored) where you can click to stop ignoring that user. It would be useful to have an icon in this area, to make it obvious what to click to stop ignoring that person. Someone suggested using the standard 'ignore' icon but without the line through the person; if that's not possible, perhaps we should use the same icon as for 'ignore' - the bar being red is the key that you will stop ignoring the person by clicking the icon. And perhaps a tooltip could read 'ignore this user' or 'stop ignoring this user', depending on the case.

Or is the option to stop ignoring a user from the profile page being dropped from this PR?

@svbergerem

This comment has been minimized.

Show comment
Hide comment
@svbergerem

svbergerem Aug 25, 2013

Member

@goobertron I'd vote for "drop that feature from this PR, try to get this PR done for the release and implement the 'stop ignoring' in a different PR"

Member

svbergerem commented Aug 25, 2013

@goobertron I'd vote for "drop that feature from this PR, try to get this PR done for the release and implement the 'stop ignoring' in a different PR"

@DeadSuperHero

This comment has been minimized.

Show comment
Hide comment
@DeadSuperHero

DeadSuperHero Aug 27, 2013

Member

Seems we have one failing cucumber spec for blocking the user from the profile page. Do we have time to fix that so that it can make it in to the release? :)

Member

DeadSuperHero commented Aug 27, 2013

Seems we have one failing cucumber spec for blocking the user from the profile page. Do we have time to fix that so that it can make it in to the release? :)

@PallaviTS

This comment has been minimized.

Show comment
Hide comment
@PallaviTS

PallaviTS Aug 27, 2013

Contributor

We will work on it :) Try our best.

On Tue, Aug 27, 2013 at 12:45 PM, Sean Tilley notifications@github.comwrote:

Seems we have one failing cucumber spec for blocking the user from the
profile page. Do we have time to fix that so that it can make it in to the
release? :)


Reply to this email directly or view it on GitHubhttps://github.com/diaspora/diaspora/pull/4417#issuecomment-23317058
.

Regards ,
Pallavi TS

Contributor

PallaviTS commented Aug 27, 2013

We will work on it :) Try our best.

On Tue, Aug 27, 2013 at 12:45 PM, Sean Tilley notifications@github.comwrote:

Seems we have one failing cucumber spec for blocking the user from the
profile page. Do we have time to fix that so that it can make it in to the
release? :)


Reply to this email directly or view it on GitHubhttps://github.com/diaspora/diaspora/pull/4417#issuecomment-23317058
.

Regards ,
Pallavi TS

@Raven24

This comment has been minimized.

Show comment
Hide comment
@Raven24

Raven24 Aug 29, 2013

Member

do we need the $("#block_user_button").click function in both profile.js and people.js?

Member

Raven24 commented Aug 29, 2013

do we need the $("#block_user_button").click function in both profile.js and people.js?

@jhass

This comment has been minimized.

Show comment
Hide comment
@jhass

jhass Aug 29, 2013

Member

do we need the $("#block_user_button").click function in both profile.js and people.js?

Nope, just people.js, profile.js is for the edit profile page actually.

Member

jhass commented Aug 29, 2013

do we need the $("#block_user_button").click function in both profile.js and people.js?

Nope, just people.js, profile.js is for the edit profile page actually.

@Raven24

This comment has been minimized.

Show comment
Hide comment
@Raven24

Raven24 Aug 30, 2013

Member

ok, so I sent you another pull request on your branch. that is the last thing I think is necessary before we can pull this.
Please rebase again and add a changelog entry once you included the changes.

(Also, please always comment on the pull request, when you update the branch. Otherwise we don't get any notifications that something was changed.)

Member

Raven24 commented Aug 30, 2013

ok, so I sent you another pull request on your branch. that is the last thing I think is necessary before we can pull this.
Please rebase again and add a changelog entry once you included the changes.

(Also, please always comment on the pull request, when you update the branch. Otherwise we don't get any notifications that something was changed.)

@sjain1107

This comment has been minimized.

Show comment
Hide comment
@sjain1107

sjain1107 Aug 31, 2013

Contributor

I have added changelog entry.

Contributor

sjain1107 commented Aug 31, 2013

I have added changelog entry.

@sjain1107

This comment has been minimized.

Show comment
Hide comment
@sjain1107

sjain1107 Sep 1, 2013

Contributor

Final commits.

Contributor

sjain1107 commented Sep 1, 2013

Final commits.

Show outdated Hide outdated Changelog.md
Show outdated Hide outdated Changelog.md

sjain1107 referenced this pull request in railsgirls-generator-app/diaspora Sep 1, 2013

@Raven24

This comment has been minimized.

Show comment
Hide comment
@Raven24

Raven24 Sep 1, 2013

Member

I'll take care of this and remove that extra commit (later, I'm gonna be afk for the afternoon)

Member

Raven24 commented Sep 1, 2013

I'll take care of this and remove that extra commit (later, I'm gonna be afk for the afternoon)

@sjain1107

This comment has been minimized.

Show comment
Hide comment
@sjain1107

sjain1107 Sep 4, 2013

Contributor

Some tests are failing.

Contributor

sjain1107 commented Sep 4, 2013

Some tests are failing.

@jhass

This comment has been minimized.

Show comment
Hide comment
@jhass

jhass Sep 4, 2013

Member

I squashed the commits a bit together that's why Github doesn't show this as merged. Thank you!

Member

jhass commented Sep 4, 2013

I squashed the commits a bit together that's why Github doesn't show this as merged. Thank you!

@jhass jhass closed this Sep 4, 2013

@goobertron

This comment has been minimized.

Show comment
Hide comment
@goobertron

goobertron Sep 4, 2013

Well done Sakshi, Pallavi and everyone else for pulling this together!

goobertron commented Sep 4, 2013

Well done Sakshi, Pallavi and everyone else for pulling this together!

@pxlpnk

This comment has been minimized.

Show comment
Hide comment
@pxlpnk

pxlpnk commented Sep 4, 2013

👍

@DeadSuperHero

This comment has been minimized.

Show comment
Hide comment
@DeadSuperHero

DeadSuperHero Sep 4, 2013

Member

Yay, great job! :D

On Wednesday, September 4, 2013, Andreas Tiefenthaler wrote:

[image: 👍]


Reply to this email directly or view it on GitHubhttps://github.com/diaspora/diaspora/pull/4417#issuecomment-23786728
.

Member

DeadSuperHero commented Sep 4, 2013

Yay, great job! :D

On Wednesday, September 4, 2013, Andreas Tiefenthaler wrote:

[image: 👍]


Reply to this email directly or view it on GitHubhttps://github.com/diaspora/diaspora/pull/4417#issuecomment-23786728
.

@sjain1107

This comment has been minimized.

Show comment
Hide comment
@sjain1107

sjain1107 Sep 4, 2013

Contributor

Thank u so much all :) Specially @MrZYX, @Raven24 and @svbergerem

Contributor

sjain1107 commented Sep 4, 2013

Thank u so much all :) Specially @MrZYX, @Raven24 and @svbergerem

@PallaviTS

This comment has been minimized.

Show comment
Hide comment
@PallaviTS

PallaviTS Sep 4, 2013

Contributor

Thank you all :)

On Wed, Sep 4, 2013 at 6:30 PM, Sakshi Jain notifications@github.comwrote:

Thank u so much all :) Specially @MrZYX https://github.com/MrZYX,
@Raven24 https://github.com/Raven24 and @svbergeremhttps://github.com/svbergerem


Reply to this email directly or view it on GitHubhttps://github.com/diaspora/diaspora/pull/4417#issuecomment-23786872
.

Regards ,
Pallavi TS

Contributor

PallaviTS commented Sep 4, 2013

Thank you all :)

On Wed, Sep 4, 2013 at 6:30 PM, Sakshi Jain notifications@github.comwrote:

Thank u so much all :) Specially @MrZYX https://github.com/MrZYX,
@Raven24 https://github.com/Raven24 and @svbergeremhttps://github.com/svbergerem


Reply to this email directly or view it on GitHubhttps://github.com/diaspora/diaspora/pull/4417#issuecomment-23786872
.

Regards ,
Pallavi TS

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment