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

made adjustments based on feedback DMPRoadmap/roadmap#150

updated new css and swapped out use of table with fieldset on plan details edit DMPRoadmap/roadmap#125

fixed layout of edit profile page DMPRoadmap/roadmap#230 DMPRoadmap/roadmap#125 DMPRoadmap/roadmap#293

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

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

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 answer-notice class that will make the lock version text area wider DMPRoadmap/roadmap#241

Merge branch 'feature/superadmin' into HEAD ...

Replaces ActiveAdmin with Administrate.

choose template where org has more than one valid

Removed ActiveAdmin

Optimistic Locking ...

- add bit field to question_format so we don't have to test strings to determine format

- add isOptionBased to question so we dn't have to do multiple string comps for this - there was a boolean already in the DB not being used

- add migration to add bit field

- add migration to add lock_version field to answer

- change answers_controller to do optimistic locking

- change answers controller not to redirect to plans/phase/edit as it wasn't doing anything

- introduced answers/update.js.erb to handle the return from /answers/update.

- to do the conflict resolution you need the old answer and new answer objects. Tried using clone but it doesn't work because it only does a shallow copy. So adopted a "nuclear-option" deep copy but it's a bit much. A compromise would be better.

merge in changes from origin

first port of plan creation and editing to new data model

resolved merge conflicts

extracted plan visibility work out of dev branch for PR to DCC

removed substance-forms modifications from the dev branch. will place in a separate branch so that we can continue development

fixed merge conflict in seeds.rb file. installed substance-rails gem and updated code to swap in the substance-forms text-area for tinymce on the answer section of the edit plans page

Switched answer text area to substance editor.

Added substance-rails gem and then included the appropriate js and css libraries into the asset pipeline

switched visibility over to an enum. updated the project objects accordingly. Added some more unit tests. Updated locale files with visibility text

Merge branch 'master' into add-orcid-functionality

moved assets from app/assets to lib/assets. The files in lib/assets will be used by Rails unless override by an equivalent file in app/assets. Added logic to applicationController so that it will look first for a template in app/views/[:branded folder name] before using the default in app/views