Skip to content
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

Link login modal questions #4255

Closed
wants to merge 4 commits into from
Closed

Link login modal questions #4255

wants to merge 4 commits into from

Conversation

okonek
Copy link
Contributor

@okonek okonek commented Dec 10, 2018

Fixes #4159 (<=== Add issue number here)

Make sure these boxes are checked before your pull request (PR) is ready to be reviewed and merged. Thanks!

  • tests pass -- look for a green checkbox ✔️ a few minutes after opening your PR -- or run tests locally with rake test
  • code is in uniquely-named feature branch and has no merge conflicts
  • PR is descriptively titled
  • ask @publiclab/reviewers for help, in a comment below

We're happy to help you get this ready -- don't be afraid to ask for help, and don't be discouraged if your tests fail at first!

If tests do fail, click on the red X to learn why by reading the logs.

Please be sure you've reviewed our contribution guidelines at https://publiclab.org/contributing-to-public-lab-software

Thanks!

spamquestions

@okonek
Copy link
Contributor Author

okonek commented Dec 10, 2018

@SidharthBansal Is it ok? When the user is not logged in and he clicks the spam button the login modal shows up and then redirects.

Copy link
Member

@SidharthBansal SidharthBansal left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome. Please claim the task on the dashboard so that we can reward you.

@okonek
Copy link
Contributor Author

okonek commented Dec 10, 2018

@okonek
Copy link
Contributor Author

okonek commented Dec 10, 2018

Thank you!

@plotsbot
Copy link
Collaborator

2 Messages
📖 @okonek Thank you for your pull request! I’m here to help with some tips and recommendations. Please take a look at the list provided and help us review and accept your contribution! And don’t be discouraged if you see errors – we’re here to help.
📖 It looks like you haven’t marked all the checkboxes. Help us review and accept your suggested changes by going through the steps one by one. If it is still a ‘Work in progresss’, please include ‘[WIP]’ in the title.

Generated by 🚫 Danger

@SidharthBansal
Copy link
Member

@jywarren please review and merge this.

@SidharthBansal SidharthBansal added this to the OAuth milestone Dec 10, 2018
@jywarren
Copy link
Member

I think it's starting to take up a lot of space here -- and we'd like to have the "flag" associated with the "spam" -- what if we had a single Flag button which opens up a Bootstrap popover, which shows "Flag" this to moderators (email) and "Spam" this if you are a moderator (and link to learn more about moderators). These could fit under just one tiny flag icon, and expand out when you click it.

However, you've successfully completed the original task even if this isn't merged yet -- so you should get approved for the task! Thanks!

@SidharthBansal
Copy link
Member

I have already rewarded him the points

@SidharthBansal
Copy link
Member

I think it's starting to take up a lot of space here -- and we'd like to have the "flag" associated with the "spam" -- what if we had a single Flag button which opens up a Bootstrap popover, which shows "Flag" this to moderators (email) and "Spam" this if you are a moderator (and link to learn more about moderators). These could fit under just one tiny flag icon, and expand out when you click it.

I think we should merge this now. And open up a different issue for the above comment. We can brainstorm on it. What do you say?

@jywarren
Copy link
Member

It's OK - we can just leave it open with the task approved... and solve this in follow-up in the same PR. Sound OK?

@SidharthBansal
Copy link
Member

SidharthBansal commented Dec 10, 2018 via email

@jywarren
Copy link
Member

OK - thanks for your patience - how about this as a solution:

image

where the top has a flag icon, the two middle ones have the ban (like circle with slash) icon, and the bottom is a link to /moderators

(mockup made in this doc)

@jywarren
Copy link
Member

The ones that say "only mods and admins" could be a link instead that says "Log in to moderate" maybe... but really you'd still have to become a mod or admin to be able to so I don't know if it's necessary?

And since we have these flag icons in so many places, maybe we should think about making this a partial template or something standard (as with the login modal) we can insert anywhere?

@SidharthBansal
Copy link
Member

Oh it is so nice.
It is compact design and also reduced redundancy and ambiguity.
I really loved it
We can first complete this issue. Once we complete this issue we can raise an issue to identify these flag icons at different places throughout the website. Then we can create ftos for linking flag buttons to partials and for deletion of the redundant buttons.

@grvsachdeva
Copy link
Member

Hi @okonek would you like to implement the design suggested by @jywarren ? Thanks!

@@ -22,7 +22,12 @@
<span id="tag_<%= tag.id %>" class="label label-primary"><a href="/questions/tag/<%= tag.name %>"><%= tag.name %></a></span>
<% end %>
</span>
<p style="margin-top:30px;"><% if logged_in_as(['admin','moderator']) %><a class="btn btn-default btn-xs" href="/moderate/spam/<%= node.id %>"><i class="fa fa-ban"></i> Spam</a><% end %>
<p style="margin-top:30px;">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Due to recent changes by Kevin and design suggested by Jeff, we need to change this code a lot. So, I am closing this PR. @okonek please feel free to open up a PR for the design suggested by Jeff () and then a follow up PR for the linking of modals(#4255).

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These changes are no longer needed due to new PRs merged.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please feel free to open a new pr @okonek
Thanks for awesome work you are doing at PL

@ghost ghost removed the in progress label Dec 26, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants