resolved cherry-pick conflicts

resolved cherry-pick conflicts

updated class for button, fixes issue brought up in #373

Merge pull request #404 from DigitalCurationCentre/issue337 ...

Fixed problem when creating a question. Fixed JS to display/hide defa…

Fixed problem when creating a question. Fixed JS to display/hide default answer. Fixed tinymce problem for example answer. DMPRoadmap/roadmap#337 ...

fixed create_a_new_question test. DMPRoadmap/roadmap#337

updated org-admin customization of templates according to #373

Added method to validate answer according to each question format. Partial view for section progress. Eager loading of resources needed to calculate plan and section progress. Refactoring of code for progress plan. DMPRoadmap/roadmap#382 ...

Fixed merge conflict. DMPRoadmap/roadmap#382

onChange event for tinymce at plan answers. Removed unnecessary options passed to tinymce. DMPRoadmap/roadmap#382

Fixed timeago problem for when a new answer is created. Refactored JavaScript logic into its own file. Created a partial to handle answer status. DMPRoadmap/roadmap#355

Fixed sign up form. DMPRoadmap/roadmap#317

fixed merge conflicts after rebase

updated names of files, consolidated new css, added accessible submit to contact us page

merged in latest changes from rework-create-plan

switched from using clickable to aria-disabled for submit button

converted all <form><table> and <form><ol> to <fieldset> on non-org-admin pages DMPRoadmap/roadmap#125

simplification of create plan js and html presence of plan_template_id triggers submit button disabled

added an accessible_submit_button widget that displays a tooltip and cancels click event when button is disabled

Replace UC3 -> CDL - fixes #245

made adjustments based on feedback DMPRoadmap/roadmap#150

switched defined function over to unique combobox events because they were conflicting when m,ultple boxes on the same screen

finalized initial create plan js

removed dmproadmap.scss from the javascripts dir. must have been copied over by accident. it was interfering with the load of css files

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 create plan so that submit button is disabled until both selections are made DMPRoadmap/roadmap#124

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

added new css and js files to go with create plan page. css should be used for all new ui work going forward DMPRoadmap/roadmap#150

added the new jquery-accessible-autocomplete JS widget DMPRoadmap/roadmap#124

bug fix for show_export.html.erb and to jquery.timeago.js

Merge pull request #42 from DMPRoadmap/development ...

Rebase with lastest fixes from DCC