Merge pull request #365 from DigitalCurationCentre/xsrust/bugfixes ...

updated org-admin and plan create pages to reflect schema change

updated org-admin and plan create pages to reflect schema change

Now pre-selecting all institutional (themed) guidance which is not optional on plan creation. Closes #326

Added confirmation message for guidance choices - closes #332

updated syntax to allow read-only view of a plan. \n app/views/phases/_answer_form_ro.html.erb probably needs a bigger re-write as the logic is horrendus and it renders the whole thing as a form...but it's not a form because it's read only and it checks to see if it's read only a bunch of times within it. but here's the quick and dirty making it work

fixed merge conflicts after rebase

New display for Guidance choices in Plan Details page. Fixes #288

made adjustments based on feedback DMPRoadmap/roadmap#150

fixed merge conflicts

updated plan creation messaging to match suggestions on DMPRoadmap/roadmap#207

minor css tweaks and added template title to default 'My Plan (title)'

finalized initial create plan js

added new create plan page

updated create plan to call ajax action to get available templates

Started adding in ajax call to retrieve list of templates

Updated styling of new jquery accessible dropdown and added fontawesome DMPRoadmap/roadmap#124

fixed merge conflict in schema.rb

Updated plans_controller and test to work with new create plan workflow DMPRoadmap/roadmap#150

Merge branch 'remove-settings' into development

Removed remaining pieces of the plan_list settings DMPRoadmap/roadmap#248

Removed extraneous .all

Fixed issue with current_user.org ref for unaffiliated users. Then fixed issue with timing of plan creator assignment DMPRoadmap/roadmap#257

Removed early call to save the plan. It was creating extra plans (e.g. user gets directed to select a specific template, 2 plans were being created)

Ordered funders in dropdown - closes #260.

Was not actually using DOCX export but dumping to HTML. Should work now (closes #217).

updated models to relfect new name for join table between plans and guidance groups. fixes #198

ensure correct guidance groups display for plan editing

fixes guidance group selection for plans

change docx export to htmltoword. Hopefully fixes: #217

removed old reference to plan.to_hash