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

Added question prompt on dashboard (Fixes #2401) #2431

Merged
merged 3 commits into from
Mar 20, 2018

Conversation

amitsin6h
Copy link
Member

Used bootstrap panel to add question prompt on dashboard and also modified Question button as large button was not looking good.

used bootstrap panel to add question prompt on dashboard and also modified Ask Question button
@grvsachdeva
Copy link
Member

hi @amitsin6h just keep the part you wanted to in _sidebar.html.erb by editing the file using resolve conflicts button and after that Travis test would continue.

@amitsin6h
Copy link
Member Author

@Gauravano could you please look now

@PublicLabBot
Copy link

PublicLabBot commented Mar 5, 2018

1 Warning
⚠️ It looks like you merged from master in this pull request. Please rebase to get rid of the merge commits – you may want to rewind the master branch and rebase instead of merging in from master, which can cause problems when accepting new code!
1 Message
📖 @amitsin6h 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.

Generated by 🚫 Danger

@grvsachdeva
Copy link
Member

hi @amitsin6h please add the screenshot of the new view.Thanks.

@amitsin6h
Copy link
Member Author

screenshot from 2018-03-06 12-49-48

@Gauravano screen shot of Ask a question

@jywarren
Copy link
Member

jywarren commented Mar 6, 2018 via email

@amitsin6h
Copy link
Member Author

amitsin6h commented Mar 7, 2018

@jywarren thats great and we can add wiki on the top navigation bar. Reason to do this because it will be directly visible to the user whoever login and can read wiki. I have also visited the wiki page and saw that it has stuffs like Getting Started , Media , Licenses etc . And according to me keeping wiki in top navigation bar would be great implementation to the dashboard.

And we will attach discussion list with ask question.

Let me know what you think about this ??

@jywarren
Copy link
Member

jywarren commented Mar 8, 2018 via email

@amitsin6h
Copy link
Member Author

amitsin6h commented Mar 8, 2018

screenshot from 2018-03-09 00-21-47

@jywarren is it ok now ?

also implementing card design will give great look to this sidebar. what you say ?

@amitsin6h
Copy link
Member Author

@jywarren if it looks good then let me know. I will make the PR

Copy link
Member

@jywarren jywarren left a comment

Choose a reason for hiding this comment

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

This is looking great -- just a few more changes to make for it to be ready to merge. Thank you!

@@ -1,5 +1,57 @@
<br />
<br />
<div class="panel panel-default">
Copy link
Member

Choose a reason for hiding this comment

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

Hi - this is looking real good -- but do you think you could make the indentation really consistent here? It makes it a lot easier to read and helps keep our code clean in the future. Thank you!!!

<h1 class="panel-title">Ask a question</h1>
</div>
<div class="panel-body">
<p>The easiest way to start with Public Lab community is to ask a question.<br />See questions and ask your own here:</p>
Copy link
Member

Choose a reason for hiding this comment

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

I think this could be two separate <p>s instead of using a br -- do you think you could make that small change? Thanks!!!


</div>

<div class="tab-pane" id="lists">
Copy link
Member

Choose a reason for hiding this comment

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

Do we need the lists content here? I think it was removed in a previous project. Be sure to update your master branch before adding new work to it, or older changes will creep back into your code like this!

For now, compare to the latest publiclab/plots2 master branch's file to see what's been removed, and let's update this to match, sound good?

@amitsin6h
Copy link
Member Author

@jywarren could you please review it.

@jywarren
Copy link
Member

This looks fantastic. Thanks so much for doing this so thoroughly!!!

@jywarren jywarren merged commit 8ab0e67 into publiclab:master Mar 20, 2018
SrinandanPai pushed a commit to SrinandanPai/plots2 that referenced this pull request May 5, 2019
…2431)

* Added question prompt on dashboard (Fixes publiclab#2401)

used bootstrap panel to add question prompt on dashboard and also modified Ask Question button

* updated _sidebar.html.erb
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.

4 participants