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 publiclab editor,fixes #904 #1177

Closed
wants to merge 1 commit into from
Closed

Added publiclab editor,fixes #904 #1177

wants to merge 1 commit into from

Conversation

500swapnil
Copy link
Collaborator

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

  • all tests pass -- rake test:all
  • code is in uniquely-named feature branch, and has been rebased on top of latest master (especially if you've been asked to make additional changes)
  • pull request is descriptively named with #number reference back to original issue
  • if possible, multiple commits squashed if they're smaller changes
  • reviewed/confirmed/tested by another contributor or maintainer
  • schema.rb.example has been updated if any database migrations were added

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

We have a loose schedule of reviewing and pulling in changes every Tuesday and Friday, and publishing changes on Fridays. Please alert developers on plots-dev@googlegroups.com when your request is ready or if you need assistance.

Thanks!

@500swapnil
Copy link
Collaborator Author

500swapnil commented Jan 9, 2017

@jywarren Do I need to integrate the editor only in the "Share your work" textarea?

@jywarren
Copy link
Member

Hmm, can you elaborate on your last question?

Also, does this seem to work on your local setup, and could you upload a screenshot so I could take a look?

Thanks!

@500swapnil
Copy link
Collaborator Author

@jywarren I meant, where should I integrate the publiclab editor? In the "Share your work" text area?
screenshot from 2017-01-12 15-54-03

@jywarren
Copy link
Member

Ah, i see -- and apologies for the slow response, we've had some outages and also Github was even briefly down (!).

Actually the code from "rich.html.erb" can replace the entire <form> from the questions page. Then we can begin adding/removing things to make it look more like the mockup. Does that make sense?

@500swapnil
Copy link
Collaborator Author

500swapnil commented Jan 14, 2017

@jywarren There is no <form> tag in the questions page. Where should I add exactly?

@jywarren
Copy link
Member

Oh, i'm so sorry I missed this and didn't respond earlier! I've been a bit extra busy this past week. Looking now.

</div>

</div>
<%= javascript_include_tag "post" %>
Copy link
Member

Choose a reason for hiding this comment

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

See how here, the new "rich" template ends and the older editor template begins? You actually only need one of the two -- that's why you're seeing the old form sort of overlaid on the new one. You should be able to remove everything below this line, but transfer some of the special question-related features from the old template to the new. I'll mark the ones I see.

url = { :controller => "notes", :action => "create", :id => params[:id] }
end
%>
<%= form_for @node, :as => :drupal_node, :url => url do |f| %>
Copy link
Member

Choose a reason for hiding this comment

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

Here's where the second form is generated. But actually upon reading through it, I don't think there's anything in particular you need to save from this older form. I think you can just delete it and get this template (and its corresponding controller) to match rich.html.erb as closely as you can.

Then we can take the next steps on the design and getting it to look like the mockup.

@jywarren
Copy link
Member

jywarren commented Feb 6, 2017

Hi, just checking if you've gotten stuck on this at all, or if I could help in any way? Thanks!

@500swapnil
Copy link
Collaborator Author

@jywarren Hi, I'm having exams right now. I will continue working on it in a couple of days.

@jywarren
Copy link
Member

jywarren commented Feb 6, 2017

Good luck!

@500swapnil
Copy link
Collaborator Author

Hey @jywarren My exams are over. I will continue working on this issue. I have created another PR #1286

@jywarren
Copy link
Member

jywarren commented Feb 22, 2017 via email

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.

2 participants