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

Rebase with lastest fixes from DCC

removed rake wrapper task because json dir can be set in initializer. Added initializer and updated _('') to __('') DMPRoadmap/roadmap#204

swapped out all other I18n calls in JS with gettext calls DMPRoadmap/roadmap#204

replaced all of the old I18n('helpers...') references in JS files with new gettext method DMPRoadmap/roadmap#204

updated plans.js so that 'Answered by' is now coming from JSON locales DMPRoadmap/roadmap#204

interface tinymce to the page is_dirty functionality

remove debug alert

change how updating various status indicators are done fixes: https://github.com/DMPRoadmap/roadmap/issues/182

Change notes to work with AJAX calls.

fixes issues around answer text not saving properly; references https://github.com/DMPRoadmap/roadmap/issues/181 ...

fixes issues around status spacing and adds in untranslated strings for
status; references https://github.com/DMPRoadmap/roadmap/issues/182

timestamp off updated_at rather than created_at plus other tidying up

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.

Chnage progress bar to reduce num queries. Fixes DMPRoadmap/roadmap#103

trying to reduce data access queries. Needs more work

merge in changes from origin

first port of plan creation and editing to new data model

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.

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