Issue/1682 (#2440) ...

* remove monthly usage from funder-usage-dashboard, adjust spacing on page

* rename usage statistic accordion partials

* usage-dashboard accordions now conditional on the type of user, also made the js more robust to the charts not existing

fix eslint issues

DRY up the stat and JS code

Merge branch 'development' of https://github.com/DMPRoadmap/roadmap into issue/1682

usage dashboard working but not dry, moving machines

Merge branch 'development' into bug/tinymce_styling

issue#2375 allow change of delimiter for csv download (#2403) ...

* issue#2375 allow change of delimiter for csv download

* fix eslint issues, bugfix usage-dashboard when no stats exist, Styling tweaks to csv separator

* fix issues with tests by defaulting the separator to a comma NOTE: does not enforce tests on the separator param working

* fix issues with new separator argument in stat-created-plan and spec

Co-authored-by: Sam Rust <xsrust@gmail.com>

enable js.erb parsing with webpacker, rename references to tinymce.js, and properly get the asset_path for the tinymce content stylesheet

added browser_spellcheck to tinymce

Refactor of usage dashboard (moved logic from JS to Ruby) (#2336) ...

* removed erroneous div tag

* Updated deep_copy on PLan model to set feedback_requested to false

* fixed typo in plan export

* refactored usage code to place most of the presentation logic into Rails instead of JS

finished up changes to usage

fixed eslinter issues

fixed rubocop issues

fixed additional rubocop issues

fixed issue with filter

fixed issue with totals

removed old controller test and added new usage_controller tests

added tests for new usage_helper

added usage_policy tests and pundit test helper

fixed some rubocop complaints

fixed up remaining rubocop issues

* removed opens in a new window for usage download buttons and moved org selector to below filters

* fixed some rubocop complaints in spec test

added method to reattach labels to their corresponding tinymce iframe

Modify Merge Account messaging (#2287) ...

* revised user merge text and made responsive

* remove debug  lines

* update for eslint errors

* actually fixes eslint issues, this time with testing locally

[Feature] Create plan from link (#2284) ...

* Added direct link for plan creation from templates list

* Moved link generation to helper

* Added modal for link copy

* Added JS for link copy

* Improved modal style and moved it to a partial

* Added template link copy to admin area (organisation templates)

* Added confirmation modal for creation link

* Minor changes for direct_link helper

* Fixed typo in YARD doc

Updated gems with bundle update and eslint errors in outOfFocus.js.

Fix for Accessibility issues with Tables (highlighted by UCOP electronic accessibility review) ...

Changes:
  - Added scope="col" to table header tags <th> that were missing them.
  - The Jquery dropdown menus in tables are closed when the table cell
containing it is out of focus.

(The issue the fontawesome sort icons are read as 'column # link'.
Add some screen reader only text. This issue was sorted by someone else
who added ".screen-reader-text" class to the sort_link_name() method in
app/controllers/concerns/paginable.rb.)

Fix for issue #1455.

Merge pull request #2211 from DMPRoadmap/issue2175 ...

Added functionality to give warnings when links open in new windows.

add confirmation dialog and fix merge logic

Added functionality to give warnings when links open in new windows. ...

The solution is based on the recommendation in "Techniques for WCAG 2.0" section
"G201: Giving users advanced warning when opening a new window":
"Example 2: Using CSS to provide a warning before opening a new window"
(cf., https://www.w3.org/TR/WCAG20-TECHS/G201.html)

Changes:

- any link in the views with target="_blank" has had css class "has-new-window-popup-info" to the link together with the span   <span class="new-window-pop-info"><%= _('Opens in new window') %></span>.
- The javascript script externalLink.js is used for external links that don't have the target="_blank" in the view.

Fix for issue #2175.

capture status

Merge pull request #2210 from DMPRoadmap/master ...

Sync Development with Bugfixes/Patches from Master

fixed js logic to initilize the my_org partial when the org is the other_org (#2208)

Fix for making links have a higher color contrast to other text in blocks. (#2192) ...

The changes were based on the article  https://www.viget.com/articles/color-contrast/

Changes:
 - Link color has been  changed from #337ab7 to #107896.
According to https://webaim.org/resources/linkcontrastchecker/?fcolor=000000&bcolor=FFFFFF&lcolor=107896 (the "Link to Body Text" ratio is 4.14:1 and passes WCAG A test and "Link to Background" ratio is 5.06 and passes the 5.06:1 which satisfies WCAG AA test.)
- The TinyMce editor required new stylesheets to be created.

Fix for issue #1457

Re-introduced the drag feature for the TinyMCE editors. ...

Note that we only allow re-sizing vertically. Resizing horizontally would allow the editor to stretch over
other elements in the flow.

Fix for Issue #2093.

replaced timestamps on notes with timeago

Merge pull request #2128 from DMPRoadmap/feature/research-grant-id ...

Add typeahead field for Research Grant ID

fix rda_metadata question

Merge branch 'development' into feature/research-grant-id

Fix JS lint errors

Add typeahead field for Grant ID

Updated Usage page display to fix several issues. ...

- Moved mouse pointer instruction.
    - Made textual changes to "No. of plans by template"
    - The bar charts for  "No. users joined during last year" and
    "No. plans during last year" months are in ascending order. They were
    in descending order previously. Updated the count statistics methods
    in statistics_controller.rb.
    - The "No. plans by template" bar chart is now  replaced by a stacked bar chart
    as this is visually better for large data.
    - updated the by_template method in the create_or_update.rb with code from @xsrust.
    This now aggregates template counts for a month correctly.

    Fix for issue #1679.