- <%= link_to 'https://www.pawsey.org.au/', class: 'funder-logo', target: '_blank' do %>
- <%= image_tag 'supporters/Pawsey-Logo.png', title: 'Pawsey Supercomputing Research Centre' %>
- <% end %>
-
-
+
<%= link_to 'https://www.ardc.edu.au/', class: 'funder-logo', target: '_blank' do %>
<%= image_tag 'supporters/ARDC-Logo.png', title: 'Australian Research Data Commons' %>
<% end %>
-
-
-
- <%= raw t 'footer.funded_by' %>
+
+ <%= link_to 'https://www.nci.org.au/', class: 'funder-logo', target: '_blank' do %>
+ <%= image_tag 'supporters/NCI-Australia-Logo-Inverted.png', title: 'National Computational Infrastructure Australia' %>
+ <% end %>
-
-
-
- <%= link_to 'https://www.dese.gov.au/ncris', class: 'funder-logo', target: '_blank' do %>
- <%= image_tag 'supporters/NCRIS-Logo-Inverted.png', style: 'height: 80px;',
- title: 'National Collaborative Research Infrastructure Strategy (NCRIS)' %>
+
+ <%= link_to 'https://www.pawsey.org.au/', class: 'funder-logo', target: '_blank' do %>
+ <%= image_tag 'supporters/Pawsey-Logo.png', title: 'Pawsey Supercomputing Research Centre' %>
<% end %>
-
diff --git a/app/views/layouts/_dresa_funded_by_text.erb b/app/views/layouts/_dresa_funded_by_text.erb
new file mode 100644
index 000000000..f04c94d8b
--- /dev/null
+++ b/app/views/layouts/_dresa_funded_by_text.erb
@@ -0,0 +1,13 @@
+
+
+ <%= raw t 'footer.funded_by' %>
+
+
+
+
+ <%= link_to 'https://www.dese.gov.au/ncris', class: 'funder-logo', target: '_blank' do %>
+ <%= image_tag 'supporters/NCRIS-Logo-Inverted.png', style: 'height: 80px;',
+ title: 'National Collaborative Research Infrastructure Strategy (NCRIS)' %>
+ <% end %>
+
+
diff --git a/app/views/layouts/_dresa_supported_by.erb b/app/views/layouts/_dresa_supported_by.erb
index b80515003..a31b65290 100644
--- a/app/views/layouts/_dresa_supported_by.erb
+++ b/app/views/layouts/_dresa_supported_by.erb
@@ -33,11 +33,6 @@
title: 'Department of Data Science and Artificial Intelligence, Monash University' %>
<% end %>
-<%= link_to 'https://www.nci.org.au/', class: 'footer-logo', target: '_blank' do %>
- <%= image_tag 'supporters/NCI-Australia-Logo-Gray.png', style: 'height: 22px;',
- title: 'National Computational Infrastructure Australia' %>
-<% end %>
-
<%= link_to 'https://www.newcastle.edu.au/', class: 'footer-logo', target: '_blank' do %>
<%= image_tag 'supporters/Newcastle-Logo-Inverted.png', style: 'height: 24px;',
title: 'University of Newcastle, Australia' %>
@@ -51,4 +46,4 @@
<%= link_to 'https://www.sydney.edu.au/researc/facilities/sydney-informatics-hub.html', class: 'footer-logo', target: '_blank' do %>
<%= image_tag 'supporters/UoS-Inverted.png', style: 'height: 33px',
title: 'Sydney Informatics Hub' %>
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb
index 77f21dc9d..170a7539c 100644
--- a/app/views/layouts/_footer.html.erb
+++ b/app/views/layouts/_footer.html.erb
@@ -2,7 +2,7 @@
-
+
<%= link_to 'Terms of Use', '/DReSA-Terms-of-use.pdf', target: '_blank' %>
|
<%= link_to 'User Manual', '/DReSA-User-Manual.pdf', target: '_blank' %>
@@ -12,10 +12,16 @@ <%= link_to "Source code [ version: #{app_version_text} ]", "#{TeSS::Config.site['repository']}/blob/master/README.md", target: '_blank' %>
- @@ -12,10 +12,16 @@ <%= link_to "Source code [ version: #{app_version_text} ]", "#{TeSS::Config.site['repository']}/blob/master/README.md", target: '_blank' %>
+
+
+
<%= render :partial => 'layouts/dresa_funded_by' %>
+
+ <%= render :partial => 'layouts/dresa_funded_by_text' %>
+
+
diff --git a/app/views/search/common/_search_info.html.erb b/app/views/search/common/_search_info.html.erb
index 5dc0c9750..5a313681b 100644
--- a/app/views/search/common/_search_info.html.erb
+++ b/app/views/search/common/_search_info.html.erb
@@ -10,5 +10,5 @@ resource_type - type of result objects returned by SOLR, may or may not be passe
<% local_assigns.fetch :resource_type, 'result' %>
<%# RESULTS COUNT %>
- <%= pluralize( resources.total, resource_type.humanize.downcase ) %> found
+ <%=resources.total.to_s%> <%=resource_type.humanize.downcase.pluralize(resources.total)%> found
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index fab2b21b3..3ae518a2e 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -185,8 +185,8 @@
- <%= (upcoming_events.count > 0 ? "Showing" : "Found") + " #{pluralize(events.count, "upcoming event")}#{(upcoming_events.count > resource_limit) ? " out of #{upcoming_events.count}" : ''}." %>
- <%= "Found #{pluralize(past_events.count, "past event")}." %>
+ <%= (upcoming_events.count > 0 ? "Showing" : "Found") + " " + events.count.to_s + " #{"upcoming event".pluralize(events.count)}#{(upcoming_events.count > resource_limit) ? " out of #{upcoming_events.count}" : ''}." %>
+ <%= "Found " + past_events.count.to_s + " #{"past event".pluralize(past_events.count)}." %>
-
<% if upcoming_events.count > resource_limit %>
@@ -212,7 +212,7 @@
- Lift Australasian researchers' capabilities and skills by improving the findability of events and resources +
- Build national, collaborative, training partnerships +
- Strategically leverage trainers' and learners' time and resources +
- Nick May (Contractor)
- Anastasios Papaioannou (Intersect Australia) +
- Ann Backhaus (Pawsey Supercomputing Research Centre) +
- Kathryn Unsworth (Australian Research Data Commons - ARDC) +
- Melissa Burke (Australian BioCommons) +
- Christina Street (Commonwealth Scientific and Industrial Research Organisation - CSIRO) +
- Christopher McAvaney (Deakin University) +
- Darya Vanichkina (University of Sydney, Sydney Informatics Hub) +
- Jingbo Wang (National Computational Infrastructure - NCI) +
- Jon Symon (University of Newcastle) +
- Kay Steel (Federation University) +
- Kiowa Scott (Monash University) +
- Mark Crowe (Queensland Cyber Infrastructure Foundation - QCIF) +
- Mortaza Rezae (Australian Space Data Analysis Facility, ASDAF) +
- Nick Hamilton (University of Queensland, QCIF) +
- Phillippa Bourke (University of Sydney) +
- Titus Tang (Monash University, Data Science and AI Platform) +
- Angus White (DCC UK) +
- Chris Child (ELIXIR TeSS) +
- Iryna Kuchma (IEFL) +
- Members of the ARDC National Training Registry Working Group +
- Attendees of eResearch and Data Skills conferences +
- ELIXIR's Training Platform and + TeSS community +
- The Digital Curation Centre +
- The European Open Science Cloud +
- Create a user profile, by logging in using the Australian Access Federation (AAF) +
- And either:
-
+
- Use our form to register events manually, or +
- Contact us to develop an automatic registration solution. +
- RSS Feed: an RSS feed is a type of news format. Many websites have such feeds, which list recent + posts in a standard format. We can write scripts to parse this format; +
- Git Repository: a git repository is a directory containing files that can be edited collaboratively. + If you are using GitHub (or similar) to develop your training resources, and/or use GitHub Pages to render them, + we can write a script that clones the repository and extracts resource information. We may ask you to create a + metadata file in YAML format to help us extract the metadata; +
- SOLR server (or similar): a SOLR server is a search engine that many sites use for their internal + search functionality. If you have a publicly accessible SOLR server, we can write a script to interface with it; + +
- Other: if you have training metadata in another structured format (e.g., an XML or JSON dump, a CSV + file, a YAML file, or other format), we would be happy to write a script to parse it.
- Create a user profile, by logging in using AAF. +
- Click either the Register Event button or the Register Material button to register your + training events or training materials, respectively.
- DReSA delegates authentication to your identity provider (IdP). You can view which attributes are shared with + DReSA by your IdP by using the AAF Validator service. + +
- The e-mail address that you provide as a contact for an event or resource will be visible when a user views + that event/resource. +
- <%= (materials.count > 0 ? "Showing" : "Found") + " #{pluralize(materials.count, "material")}#{(@user.materials.count > resource_limit) ? " out of #{@user.materials.count}" : ''}." %>
+ <%= (materials.count > 0 ? "Showing" : "Found") + " " + materials.count.to_s + " #{"material".pluralize(materials.count)}#{(@user.materials.count > resource_limit) ? " out of #{@user.materials.count}" : ''}." %>
<%= link_to('View all results.', materials_path(user: @user.username)) if (@user.materials.count > resource_limit) %>
<% materials.each do |material| %>
@@ -227,7 +227,7 @@
- <%= (packages.count > 0 ? "Showing" : "Found") + " #{pluralize(packages.count, "package")}#{(@user.packages.count > resource_limit) ? " out of #{@user.packages.count}" : ''}." %>
+ <%= (packages.count > 0 ? "Showing" : "Found") + " " + packages.count.to_s + " #{"package".pluralize(packages.count)}#{(@user.packages.count > resource_limit) ? " out of #{@user.packages.count}" : ''}." %>
<%= link_to('View all results.', packages(user: @user.username)) if (@user.packages.count > resource_limit) %>
<% packages.each do |package| %>
diff --git a/bin/bundle b/bin/bundle
old mode 100755
new mode 100644
diff --git a/bin/rails b/bin/rails
old mode 100755
new mode 100644
diff --git a/bin/rake b/bin/rake
old mode 100755
new mode 100644
diff --git a/bin/setup b/bin/setup
old mode 100755
new mode 100644
diff --git a/bin/spring b/bin/spring
old mode 100755
new mode 100644
diff --git a/bin/update b/bin/update
old mode 100755
new mode 100644
diff --git a/bin/yarn b/bin/yarn
old mode 100755
new mode 100644
diff --git a/config/dictionaries/licences.yml b/config/dictionaries/licences.yml
index bb0a2e14e..0abfd54af 100644
--- a/config/dictionaries/licences.yml
+++ b/config/dictionaries/licences.yml
@@ -167,14 +167,26 @@
status: "active"
title: "Computer Associates Trusted Open Source License 1.1 (CATOSL-1.1)"
url: "http://www.opensource.org/licenses/CATOSL-1.1"
+ cc-by-4.0:
+ domain_content: true
+ domain_data: true
+ domain_software: false
+ family: "Creative Commons"
+ id: "cc-by-4.0"
+ maintainer: "Creative Commons"
+ od_conformance: "rejected"
+ osd_conformance: "not reviewed"
+ status: "active"
+ title: "Creative Commons Attribution 4.0 lower case"
+ url: "https://creativecommons.org/licenses/by/4.0/"
CC-BY-4.0:
domain_content: true
domain_data: true
domain_software: false
- family: ""
+ family: "Creative Commons"
id: "CC-BY-4.0"
maintainer: "Creative Commons"
- od_conformance: "approved"
+ od_conformance: "rejected"
osd_conformance: "not reviewed"
status: "active"
title: "Creative Commons Attribution 4.0"
@@ -1354,4 +1366,4 @@
osd_conformance: "not reviewed"
status: "active"
title: "UK PSI Public Sector Information"
- url: "http://www.opendefinition.org/licenses/ukpsi"
\ No newline at end of file
+ url: "http://www.opendefinition.org/licenses/ukpsi"
diff --git a/config/dictionaries/licences_dresa.yml b/config/dictionaries/licences_dresa.yml
index 08af4df86..05f6b04ab 100644
--- a/config/dictionaries/licences_dresa.yml
+++ b/config/dictionaries/licences_dresa.yml
@@ -13,6 +13,18 @@ notspecified:
status: "active"
title: "License Not Specified"
url: ""
+cc-by-4.0:
+ domain_content: true
+ domain_data: true
+ domain_software: false
+ family: "popular"
+ id: "cc-by-4.0"
+ maintainer: "Creative Commons"
+ od_conformance: "approved"
+ osd_conformance: "not reviewed"
+ status: "active"
+ title: "Creative Commons Attribution 4.0"
+ url: "https://creativecommons.org/licenses/by/4.0/"
CC-BY-4.0:
domain_content: true
domain_data: true
@@ -23,7 +35,7 @@ CC-BY-4.0:
od_conformance: "approved"
osd_conformance: "not reviewed"
status: "active"
- title: "Creative Commons Attribution 4.0"
+ title: "Creative Commons Attribution 4.0 lower case"
url: "https://creativecommons.org/licenses/by/4.0/"
Fair:
domain_content: false
@@ -1381,4 +1393,4 @@ ukpsi:
osd_conformance: "not reviewed"
status: "active"
title: "UK PSI Public Sector Information"
- url: "http://www.opendefinition.org/licenses/ukpsi"
\ No newline at end of file
+ url: "http://www.opendefinition.org/licenses/ukpsi"
diff --git a/config/initializers/version.rb b/config/initializers/version.rb
index 69d971f5d..4e60c160a 100644
--- a/config/initializers/version.rb
+++ b/config/initializers/version.rb
@@ -1 +1 @@
-APP_VERSION = '1.4.2'
+APP_VERSION = '1.4.3'
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 14782c565..ef03e404e 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1,30 +1,15 @@
-# Files in the config/locales directory are used for internationalization
-# and are automatically loaded by Rails. If you want to use locales other
-# than English, add the necessary files in this directory.
-#
-# To use the locales, use `I18n.t`:
-#
-# I18n.t 'hello'
-#
-# In views, this is aliased to just `t`:
-#
-# <%= t('hello') %>
-#
-# To use a different locale, set it with `I18n.locale`:
-#
-# I18n.locale = :es
-#
-# This would use the information in config/locales/es.yml.
-#
-# To learn more, please read the Rails Internationalization guide
-# available at http://guides.rubyonrails.org/i18n.html.
-
-en:
+en-AU:
pundit:
default: 'You are not authorised to perform this action.'
material_policy:
event_policy:
activerecord:
+ errors:
+ models:
+ material:
+ attributes:
+ url:
+ url: 'is not valid'
attributes:
content_provider:
url: 'URL'
@@ -36,3 +21,403 @@ en:
profile:
firstname: 'First name'
surname: 'Last name'
+ home:
+ welcome: "Welcome to Digital Research Skills Australasia (DReSA)"
+ subtitle: "Browsing, discovering and organising digital research events and training resources, collected from Australasian providers."
+ events_message: "Browse and discover training events from across Australasia."
+ materials_message: "Browse and discover training materials from Australasian providers."
+ workflows_message: "Create training workflows to visualise learning steps and link to resources specific to your training needs."
+ providers_message: "Browse and discover Australasian training providers who contribute events and materials to DReSA."
+ trainers_message: "Browse and discover Australasian trainers for digital research skills."
+ footer:
+ funded_by: >
+ The DReSA training registry is developed and delivered in partnership with the + Australian Research Data Commons (ARDC), the + National Computational Infrastructure Australia (NCI), the + Pawsey Supercomputing Research Centre (Pawsey) and the + digital research trainer community.
+ARDC, NCI and Pawsey are funded by the National Collaborative Research Infrastructure Strategy (NCRIS).
+ acknowledgement: > + We acknowledge and pay respects to the Elders and Traditional Owners of the lands on which our partner + organisations stand. + about: + registry: > +DReSA makes it easier for learners, trainers, and training providers to find digital research skills-focused + educational events and resources.
+Through DReSA, its creators seek to:
-
+
DReSA began as a grassroots movement among trainers and training providers in Australia and New Zealand to improve + the discoverability of training. After scoping the landscape for similar solutions, the Working Group located + ELIXIR's TeSS platform. From there, began a truly collaborative, global partnership with ELIXIR and an exchange + of, not only the infrastructure that underlies TeSS, but also the ideas, support and encouragement.
+ events: > +Events in DReSA are defined as face-to-face or online training opportunities that have set start and end times. + These primarily take the form of workshops, courses, webinars, etc.
+DReSA also collects information about conferences, meetings, and hackathons, as these may also provide + opportunities for learning.
+ nominatim: "Nominatim" + materials: > + Materials in DReSA are defined as training resources that can be accessed at any time. These may be in + a variety of different formats, including online tutorials, videos, PowerPoint presentations, and so on. + workflows: '' + learning_paths: '' + concept_maps: '' + resources: '' + subscribe: > + DReSA also provides a subscription feature to help users to stay informed about training events of interest to + them. The service may be customised by selecting the relevant filters, and initiated via the subscribe button. + Users may choose to receive email notifications about upcoming events, or have them automatically added to their + preferred calendar application. + widgets: > + providers, institutions and organizations may readily import information, about relevant events and materials, to + their site using widgets. Alternatively, they can create custom feeds using our API. + developer: + license: > + DReSA is committed to the FAIR principles: making data findable, accessible, interoperable and re-usable. + As such, all data in DReSA is available under the CC BY 4.0 licence, and can be accessed through our API + and widgets. The DReSA codebase is also available on GitHub for re-use under the BSD Licence. + code_license: > + BSE 3-Clause + data_license: > + Creative Commons CC-BY 4.0 + gmaps_countries: > + 'Australia', 'New Zealand' + widgets: > + DReSA events and materials can be displayed on your website using widgets. + There are several different styles and functionalities available from our configurable widget suite. + The javascript code and documentation about using these widgets is available in our detailed documentation guide. + widgets_available: "https://nrmay.github.io/TeSS_widgets/" + widgets_mailing: > +If you do decide to include our widgets on your website, we have a mailing list you can join to keep informed + about any service disruptions, required updates, or new features
++ Join the widgets mailing list
+ api_example_1: "/events.json_api" + api_example_2: "" + api_example_3: "/materials.json_api" + api_example_4: "/content_providers.json_api" + api_example_5: "/workflows.json_api" + swaggerhub: > +The full documentation for our JSON API with interactive examples can be found in our + + Swagger Hub Documentation +
+ +
We recommend using our JSON API, but if you have already begun using our old API technical information + can still be found on our here.
+ us: + tess_club: > +Fortnightly meetings, hackathons, shared activities, open priority setting, open contribution to unite the + community.
The TeSS Club runs fortnightly at 9:00 GMT / 10:00 CET Friday.
For all the details please + visit the TeSS Club Website.
+ contact: > + For enquiries, information, or assistance; contact the DReSA support desk at: + contact@dresa.edu.au + team: + description: > +The idea for a training registry and calendar had been bubbling away for some time. Seen by trainers and + training providers as a challenge to tackle, DReSA was born out of the need to improve the discoverability of + training. The Working Group formed at the ARDC Skills Summit 2020, as a result of active participation, + collaboration and a common objective. A key first step was to scan the landscape for similar solutions, with + the Working Group identifying ELIXIR's TeSS platform as a likely exemplar. From there began a truly + collaborative and global partnership with ELIXIR and an exchange of the infrastructure that underlies TeSS, and + also ideas, support and encouragement.
+ develop: > +Software Engineering & Project Management
+ + working: > +
Working Group Members
+ Product Owners
+ -
+
Core Members
+ -
+
+ partner: '
Partner Organisations
' + guidance: > +
Additional Guidance
+ -
+
DReSA received investments from the + Pawsey Supercomputing Research Centre (Pawsey) and the + Australian Research Data Commons (ARDC).
+Pawsey and ARDC are funded by the National Collaborative Research Infrastructure Strategy (NCRIS).
+ acknowledge: > +The DReSA team would like to acknowledge the help of a number of groups and individuals, and thank them + for useful discussions, feedback and assistance in developing the DReSA portal:
+-
+
Adding events to DReSA make them easier to find for learners, trainers and other training providers. + This can help attract bigger audiences and increase the reach and impact of your events.
+ methods: > +To add an event to DReSA:
-
+
Events added to DReSA must be related to digital research skills and must take place, or be open to + researchers, in the Australasian region.
+ automatic: > +The DReSA team can provide various automated scraping solutions for adding your events to the website. + Scrapers are based on the extraction of structured metadata from existing websites.
+If those solutions are not applicable, you can contact the DReSA team to discuss potential, alternative + solutions. This option is particularly useful if you regularly add many events to DReSA.
+For more information on automatically registering events in DReSA, refer to the + DReSA Scrapers repository.
+ auto_condition_1: "Contains more than 3 resources" + auto_condition_2: "Has some structured data" + auto_condition_3: "Is relevant to life scientists" + structured: > +
To register resources in TeSS automatically, our scrapers need to be able to extract data from target + websites reliably. To this end, it is helpful if these websites include some structured data.
+The following are examples of the kinds of structured data that we can work with. If your website contains one + or more of these, and satisfies the criteria above, contact us and we will create a scraper.
+If your website includes no structured data, and you’d like your resources added to TeSS, we recommend using + Bioschemas to structure your site.
+ schema: > +Schema.org is a project run by a consortiumof search engines. + Schema.org has created an extensive library of simple, lightweight schemas that web-masters can use to explicitly + define their websites content in order to improve search engine visibility and interoperability.
+For events, you can use the schema.org Event type; and + for training materials: schema.org CreativeWork Type +
The schemas provided by schema.org are convoluted, and lack some important training-specific fields. + As such, a life science community group, called Bioschemas, + has created schema.org extensions with life science-specific vocabularies, which add additional fields relevant + to the discipline.
+The Bioschemas group is producing tools, documents and training to facilitate adoption of standard metadata + mark-up.
+ bioschema_events: > + + View Events Bioschema + bioschema_materials: > + + View Materials Bioschema + schema_example_1: > + + French Institute of Bioinformatics + schema_example_2: > + + Swiss Institute Bioinformatics + schema_example_3: "" + api: > +Application Programming Interfaces, or APIs, typically have endpoint URLs that, when accessed, return raw, + unstyled data in a common exchange format, such as XML or JSON.
+If your website has an API that programmatically displays data for your training or event content, the TeSS + team can write an API client to interface with it.
+ api_example_1: > + + University of Cambridge + api_example_2: > + + Dutch Techcentre for Lifesciences + api_example_3: "" + calendar: > +Many organisations use calendar applications to organise and display their events. + These may be custom-made or, more likely, utilise applications like Google Calendar. Calendar applications + maintain an underlying file for event storage and retrieval, typically in the .ics format.
+If your website has a calendar application, the TeSS team can write a scraper to extract from it the date, + location and event descriptions, and upload the data to TeSS.
+ calendar_example_1: > + NBIS + calendar_example_2: > + + Software Carpentry + calendar_example_3: "" + other_types: > +Resources may be added manually to DReSA.
+Registration with DReSA is build upon Australian Access Federation (AAF) authentication. When you register, + the AAF Display Name will be visible at the top of the page.
+-
+