Merge pull request #2282 from DMPRoadmap/issue2240 ...

These feature are part of the request for improving the Admin view of

These feature are part of the request for improving the Admin view of ...

users.

Changes:
- on the Editing profile of a user the School or Department dropdown
menu has been made the same horizontal size as other inputs.
- A link has been created on the Users page from Plans (i.e, no. of
plans) to a Plans page for the user.

Fix for #2240.

Merge pull request #2273 from DMPRoadmap/issue1656 ...

Fix to make labels for the Permissions radio buttons on the Plan

Updated Org admins template table Action menu. ...

Change:
  - Re-worded "Export as pdf" to "Download".
  - Removed "Export as docx".

Fix for #2091.

Fix to make labels for the Permissions radio buttons on the Plan ...

Share tab clickable.

All the Write Plan sections seen to have clickable labels for radio
buttons and checkboxes.

Change:
- renamed the f.label helper method object to match id added to
f.radio_button helper.

Fix for issue #1656.

Merge pull request #2266 from DMPRoadmap/issue2240 ...

Updated functionality for Admin View of Users.

Merge pull request #2268 from DMPRoadmap/issue2147 ...

Fix for the formatting issues with bullet points for exported docx plans

Added functionality to allow Org admins to export their org's templates. ...

Re-used the template_export templates template_export.docx.erb
and template_export.pdf.erb.

Changes:
 - Moved templates template_export.docx.erb and template_export.pdf.erb
to a separate view folder template_exports.
- Added functionality for Org admins to export both current and historic
templates for their organisation. The version name has been appended to
the templates, e.g., My_Template_v0.docx or  My_Template_v5.pdf.

Fix for issue #2091.

Fix for the formatting issues with bullet points for exported docx plans ...

when viewed in an old Word editor.

The fix follows the solution suggested in  the HtmlToWord bug "List item
bullets corrupted in Microsoft Word"
https://github.com/karnov/htmltoword/issues/73 suggested by David
Verhasselt @dv.

Changes:
   - Firstly, removed earlier attempted fix in commit
     5ef7e05 (Fix for format issues for
     bullet points in Plan docx exports).
   - Made a copy of Htmltoword (1.1.0) xslt stylesheets functions.xslt
     and numbering.xslt and made changes suggested by https://github.com/karnov/htmltoword/issues/73
   - Prepended the Htmltoword library XSLTHelper method xslt_path() in
     config/initializers/htmlto_word_xslt_helper.rb. This method ensures
     the Htmltoword library picks up the changed  numbering.xslt template instead of
     the library's version.
   - pinned version of htmltoword to 1.1.0

Fix for issue #2147.

Merge pull request #2265 from DMPRoadmap/issue2249 ...

added some filename sanitization and now limiting filenames to 100 ch…

The Plans 'Request Feedback' has been relocated from the Share form to a ...

separate form.

Changes:
 - Removed "Request feedback" from the _share_form.html.erb partial and
created a new partial _request_feedback_form.html.erb.
- Added a tab to Plan _navigation.html.erb for 'Request feedback'.

Fix for #2234

Updated functionality for Admin View of Users. ...

Changes:
 - for Super Admins: Added user department and plans.
 - for Org Admins:
        (1) The user view now has a clickable link for opening up
            a view of a user's profile and plans.
        (2) In a user's profile view the Department if it exists for the
            organisation is editable. The Organisation must have
            departments in systerm to avail of this functionality.

Fix for #2240.

Merge pull request #2264 from DMPRoadmap/issue1712 ...

fixed bug with saving template visibility

Merge pull request #2244 from DMPRoadmap/issue2095 ...

Updated logic in Plan.num_answered_questions to allow for Phase context

added some filename sanitization and now limiting filenames to 100 characters

fixed bug with saving template visibility

fixed issue with progress bar totals ...

updated logic to allow for phase sepcific progress or total progress

updated plan

Refactored num_answrered_questions

Fix for improving search functionality of plans in Admin area. ...

Changes:
Allow search based on Owner/Principal investigator (based on principal_investigator or principal_investigator_identifier.

Fix for #2236

Fix for format issues for bullet points in Plan docx exports. ...

The fix was suggested by @benjaminfaure: https://github.com/DMPRoadmap/roadmap/issues/2147#issuecomment-535935932

Changes:
Replaced <li> tag with <ol> in _plan.erb as suggested by @benjaminfaure
that <li> tag being transformed as € sign in the Word export.

Fix for issue #2147

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 #2230 from DMPRoadmap/issue2170 ...

Add an outline to table cell that is in focus.

Add an outline to table cell that is in focus. ...

Note we use the css :focus-within psuedo class that is not supported in either
IE or Edge
https://developer.mozilla.org/en-US/docs/Web/CSS/:focus-within

Fix #2170

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

Sync Development with Bugfix from Master

Merge pull request #2225 from DMPRoadmap/issue2173 ...

Removed the clickable link from the Organisation logo, as it was repo…

Removed the clickable link from the Organisation logo, as it was reported to cause problems for Accessibility. The fact that image link would open the Organisations home page rather than return to the Roadmap page was confusing for users from an Accessibility pont of view. ...

Change:
  - Organisation logo if present is no longer clickable.

Fix for #2173.

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

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

Merge pull request #2224 from DigitalCurationCentre/feature/remove_users ...

Allow Super admins to Archive and Merge users

Merge pull request #2223 from DMPRoadmap/issue2172 ...

Fix to improve screen visibility when using zoomText or Windows Magni…

Merge pull request #2222 from DMPRoadmap/issue2174 ...

Fix for providing a text alternative for tooltips for assistive techn…