renalware-core 2.0.164 → 2.1.1

data/app/views/{renalware/devise → devise}/sessions/new.html.slim

@@ -1,11 +1,11 @@
  .main-content
   .row.small-8.large-12
-    h3= "Log in to #{Renalware.config.site_name}"
-
+    br
     = render "renalware/system/messages/list"
     = render "warning"
 
   .row.small-6.large-3
+    h3= t(".sign_in")
     = simple_form_for(resource,
                       as: resource_name,
                       url: session_path(resource_name),

data/app/views/devise/shared/_links.html.erb

@@ -0,0 +1,26 @@
+<%# From https://github.com/tigrish/devise-i18n %>
+<%- if controller_name != 'sessions' %>
+  <%= link_to t(".sign_in"), new_session_path(resource_name) %><br />
+<% end %>
+
+<%- if devise_mapping.registerable? && controller_name != 'registrations' %>
+  <%= link_to t(".sign_up"), new_registration_path(resource_name) %><br />
+<% end %>
+
+<%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %>
+  <%= link_to t(".forgot_your_password"), new_password_path(resource_name) %><br />
+<% end %>
+
+<%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
+  <%= link_to t('.didn_t_receive_confirmation_instructions'), new_confirmation_path(resource_name) %><br />
+<% end %>
+
+<%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %>
+  <%= link_to t('.didn_t_receive_unlock_instructions'), new_unlock_path(resource_name) %><br />
+<% end %>
+
+<%- if devise_mapping.omniauthable? %>
+  <%- resource_class.omniauth_providers.each do |provider| %>
+    <%= link_to t('.sign_in_with_provider', provider: OmniAuth::Utils.camelize(provider)), omniauth_authorize_path(resource_name, provider) %><br />
+  <% end %>
+<% end %>

data/app/views/devise/unlocks/new.html.erb

@@ -0,0 +1,19 @@
+<h2><%= t(".resend_unlock_instructions") %></h2>
+
+<%= simple_form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |f| %>
+  <%= f.error_notification %>
+  <%= f.full_error :unlock_token %>
+
+  <div class="form-inputs">
+    <%= f.input :email,
+                required: true,
+                autofocus: true,
+                input_html: { autocomplete: "email" } %>
+  </div>
+
+  <div class="form-actions">
+    <%= f.button :submit, t(".resend_unlock_instructions") %>
+  </div>
+<% end %>
+
+<%= render "devise/shared/links" %>

data/app/views/renalware/accesses/assessments/_form.html.slim

@@ -5,7 +5,7 @@ ruby:
   .medium-6.columns
     = f.button :submit
     '  or
-    = link_to "cancel", back_path
+    = link_to t("btn.cancel"), back_path
 
 .form-content
   = f.simple_fields_for :document, f.object.document do |fd|
@@ -40,4 +40,4 @@ ruby:
     .large-12.columns
       = f.button :submit
       '  or
-      = link_to "cancel", back_path
+      = link_to t("btn.cancel"), back_path

data/app/views/renalware/accesses/assessments/_list.html.slim

@@ -19,8 +19,8 @@ article.access-assessments
       - assessments.each do |assessment|
         tr
           td.actions
-            = link_to "View", patient_accesses_assessment_path(patient, assessment)
-            = link_to "Edit", edit_patient_accesses_assessment_path(patient, assessment)
+            = link_to t("btn.view"), patient_accesses_assessment_path(patient, assessment)
+            = link_to t("btn.edit"), edit_patient_accesses_assessment_path(patient, assessment)
           td= assessment.performed_on
           td= assessment.type
           td= assessment.side

data/app/views/renalware/accesses/assessments/show.html.slim

@@ -1,5 +1,5 @@
 = content_for(:actions) do
-  = link_to "Edit",
+  = link_to t("btn.edit"),
           edit_patient_accesses_assessment_path(patient, assessment),
           class: "button"
 

data/app/views/renalware/accesses/dashboards/_page_actions.html.slim

@@ -2,7 +2,7 @@ button.button.dropdown(href="#"
                        data-dropdown="access-options"
                        aria-controls="access-options"
                        aria-expanded="false")
-  | Add
+  = t("btn.add_")
 ul.f-dropdown#access-options(data-dropdown-content aria-hidden="true")
   li= link_to("Access Profile", new_patient_accesses_profile_path(patient))
   li= link_to("Access Plan", new_patient_accesses_plan_path(patient))

data/app/views/renalware/accesses/plans/_list.html.slim

@@ -12,7 +12,7 @@ table.align-top
   tbody
     - plans.each do |plan|
       tr
-        td= link_to("View", [patient, plan])
+        td= link_to(t("btn.view"), [patient, plan])
         td= l(plan.created_at&.to_date)
         td= l(plan.terminated_at&.to_date)
         td= plan.plan_type.to_s

data/app/views/renalware/accesses/plans/_summary.html.slim

@@ -4,10 +4,10 @@ article.access-plans
   header
     h2 Current Access Plan
     ul
-      li= link_to "Edit",
+      li= link_to t("btn.edit"),
                   edit_patient_accesses_plan_path(patient, current_plan),
                   class: "button"
-      li= link_to "View",
+      li= link_to t("btn.view"),
                   patient_accesses_plan_path(patient, current_plan),
                   class: "button secondary"
   .current-access-plan

data/app/views/renalware/accesses/plans/new.html.slim

@@ -17,6 +17,6 @@
                       collection: Renalware::User.ordered,
                       wrapper: :horizontal_medium
 
-      = f.submit "Save", class: "button"
+      = f.submit t("btn.save"), class: "button"
       '  or
-      = link_to "cancel", patient_accesses_dashboard_path(patient)
+      = link_to t("btn.cancel"), patient_accesses_dashboard_path(patient)

data/app/views/renalware/accesses/procedures/_form.html.slim

@@ -5,7 +5,7 @@ ruby:
   .medium-6.columns
     = f.button :submit
     '  or
-    = link_to "cancel", back_path
+    = link_to t("btn.cancel"), back_path
 
 .form-content
   = render layout: "renalware/shared/fieldset",
@@ -42,4 +42,4 @@ ruby:
   .large-12.columns
     = f.button :submit
     '  or
-    = link_to "cancel", back_path
+    = link_to t("btn.cancel"), back_path

data/app/views/renalware/accesses/procedures/_list.html.slim

@@ -20,8 +20,8 @@ article.access-procedures
         tr
           td.toggler = toggler("#procedure-quick-preview-#{procedure.id}")
           td.actions
-            = link_to "View", patient_accesses_procedure_path(patient, procedure)
-            = link_to "Edit", edit_patient_accesses_procedure_path(patient, procedure)
+            = link_to t("btn.view"), patient_accesses_procedure_path(patient, procedure)
+            = link_to t("btn.edit"), edit_patient_accesses_procedure_path(patient, procedure)
           td= procedure.performed_on
           td= procedure.type&.long_name
           td= procedure.side

data/app/views/renalware/accesses/procedures/show.html.slim

@@ -1,5 +1,5 @@
 = content_for(:actions) do
-  = link_to "Edit",
+  = link_to t("btn.edit"),
            edit_patient_accesses_procedure_path(patient, procedure),
            class: "button"
 

data/app/views/renalware/accesses/profiles/_current_profile.html.slim

@@ -4,10 +4,10 @@ article
   header
     h2 Current Access Profile
     ul
-      li= link_to "Edit",
+      li= link_to t("btn.edit"),
                   edit_patient_accesses_profile_path(patient, current_profile),
                   class: "button"
-      li= link_to "View",
+      li= link_to t("btn.view"),
                   patient_accesses_profile_path(patient, current_profile),
                   class: "button secondary"
 

data/app/views/renalware/accesses/profiles/_form.html.slim

@@ -5,7 +5,7 @@ ruby:
   .medium-6.columns
     = f.button :submit
     '  or
-    = link_to "cancel", back_path
+    = link_to t("btn.cancel"), back_path
 
 .form-content
   = render layout: "renalware/shared/fieldset",
@@ -32,4 +32,4 @@ ruby:
   .large-12.columns
     = f.button :submit
     '  or
-    = link_to "cancel", back_path
+    = link_to t("btn.cancel"), back_path

data/app/views/renalware/accesses/profiles/_list.html.slim

@@ -18,8 +18,8 @@ article.access-profiles
       - profiles.each do |profile|
         tr
           td.actions
-            = link_to "View", patient_accesses_profile_path(patient, profile)
-            = link_to "Edit", edit_patient_accesses_profile_path(patient, profile)
+            = link_to t("btn.view"), patient_accesses_profile_path(patient, profile)
+            = link_to t("btn.edit"), edit_patient_accesses_profile_path(patient, profile)
           td= profile.formed_on
           td= profile.started_on
           td= profile.terminated_on

data/app/views/renalware/accesses/profiles/show.html.slim

@@ -1,5 +1,5 @@
 = content_for(:actions) do
-  = link_to "Edit",
+  = link_to t("btn.edit"),
           edit_patient_accesses_profile_path(patient, profile),
           class: "button"
 

data/app/views/renalware/admin/feeds/files/index.html.slim

@@ -38,7 +38,7 @@
           td= "#{(file.time_taken.to_f / 1000.0).round(2)}s" if file.time_taken?
           td.col-width-large-with-ellipsis.css-toggle-container
             - if file.result?
-              = link_to "Toggle",
+              = link_to t("btn.toggle"),
                 "#file-#{file.id} .css-toggle-container",
                 class: "button compact low-key",
                 title: file.result,

data/app/views/renalware/admin/users/_filters.html.slim

@@ -1,11 +1,11 @@
 .filters
   .filters__form
-    = search_form_for user_search, url: admin_users_path do |f|
+    = search_form_for user_search, url: admin_users_path, html: { class: "fn-form" } do |f|
       .row
         .small-9.large-4.columns
           = f.label "Name or username contains"
           = f.search_field :family_name_or_given_name_or_username_or_email_cont
         .small-3.large-4.columns.actions.end
-          = f.submit t("helpers.submit.filter"), class: "button"
+          = f.submit t("btn.filter"), class: "button"
           '  or
-          = link_to t("helpers.reset"), admin_users_path
+          = link_to t("btn.reset"), admin_users_path

data/app/views/renalware/admin/users/_tabs.html.slim

@@ -1,6 +1,6 @@
 dl.sub-nav.no-js-selection
   dd(class=("active" if params.fetch(:q, {}).empty?))
-    = link_to "All", admin_users_path(q: nil)
+    = link_to t("btn.all"), admin_users_path(q: nil)
   dd(class=("active" if params.fetch(:q, {})[:unapproved]))
     = link_to "Unapproved", admin_unapproved_users_path
   dd(class=("active" if params.fetch(:q, {})[:expired]))

data/app/views/renalware/admin/users/edit.html.slim

@@ -64,4 +64,4 @@
     - msg = user.approved? ? "Update" : "Approve"
     = f.submit msg, class: "button"
     '  or
-    = link_to "cancel", admin_users_path
+    = link_to t("btn.cancel"), admin_users_path

data/app/views/renalware/admin/users/index.html.slim

@@ -31,7 +31,7 @@
     tbody
       - users.each do |user|
         = content_tag_for(:tr, user) do
-          td= link_to "Edit", edit_admin_user_path(user) if policy(user).update?
+          td= link_to t("btn.edit"), edit_admin_user_path(user) if policy(user).update?
           td= user.id
           td= user.to_s
           td= user.username

data/app/views/renalware/admissions/_summary_part.html.slim

@@ -4,9 +4,9 @@
   article
     header
       h2
-        = link_to "Admissions (#{summary_part.admissions_count})", view_all_url
+        = link_to "#{t('titles.admissions')} (#{summary_part.admissions_count})", view_all_url
       ul
-        li= link_to "View All", view_all_url, class: "button"
+        li= link_to t("btn.view_all"), view_all_url, class: "button"
 
     - if summary_part.admissions.any?
       = render "renalware/admissions/admissions/table",

data/app/views/renalware/admissions/admissions/_filters.html.slim

@@ -10,6 +10,6 @@
       .w-full.sm:min-w-md.pr-2= ward_dropdown_grouped_by_hospital_unit(f, :hospital_ward_id, label: "Ward", wrapper: nil)
       .w-full.sm:min-w-xs.pr-2= f.input :status, collection: form.status_dropdown_options, include_blank: "Any"
       .flex-shrink-0.pt-4.filters--actions
-        = f.submit "Filter", class: "button", style: "margin: 0"
+        = f.submit t("btn.filter"), class: "button", style: "margin: 0"
         '  or
-        = link_to t("helpers.reset"), admissions_admissions_path
+        = link_to t("btn.reset"), admissions_admissions_path

data/app/views/renalware/admissions/admissions/_form.html.slim

@@ -46,4 +46,4 @@
 
   = f.submit class: :button
   '  or
-  = link_to "Cancel", admissions_admissions_path
+  = link_to t("btn.cancel"), admissions_admissions_path

data/app/views/renalware/admissions/admissions/_table.html.slim

@@ -7,7 +7,7 @@
           th.col-width-tiny(rowspan=2)
         th.col-width-medium(rowspan=2) Site/Ward
         - unless compact
-          th.at-least.col-width-medium(rowspan=2) Patient
+          th.at-least.col-width-medium(rowspan=2)= t("thead.patient")
           th.col-width-nhs-no(rowspan=2) NHS No.
           th.col-width-reference-no(rowspan=2) Hosp Nos.
           th.col-width-smal(rowspan=2) Modality
@@ -32,7 +32,7 @@
           - unless compact
             td
               - if policy(admission).edit?
-                = link_to "Edit", edit_admissions_admission_path(admission)
+                = link_to t("btn.edit"), edit_admissions_admission_path(admission)
           td= admission.unit_and_ward
           - unless compact
             td= default_patient_link(admission.patient)
@@ -49,7 +49,7 @@
           td= admission.summarised_on
           td
             - if admission.discharge_summary.present?
-             = link_to("Toggle",
+             = link_to(t("btn.toggle"),
                        "#admission-quick-preview-#{admission.id}",
                        data: { behaviour: "toggler" })
             - else

data/app/views/renalware/admissions/admissions/index.html.slim

@@ -1,5 +1,5 @@
 = content_for(:actions) do
-  = link_to("Add", new_admissions_admission_path, class: :button)
+  = link_to(t("btn.add"), new_admissions_admission_path, class: :button)
 
 = content_for(:filters) do
   = render "filters", form: form

data/app/views/renalware/admissions/consults/_filters.html.slim

@@ -36,6 +36,6 @@
                   collection: Renalware::Modalities::Description.pluck("name", "id"),
                   label: "Modality"
       .columns.medium-2.large-2.actions.end
-        = f.submit "Filter", class: "button"
+        = f.submit t("btn.filter"), class: "button"
         '  or
-        = link_to t("helpers.reset"), admissions_consults_path(reset: 1)
+        = link_to t("btn.reset"), admissions_consults_path(reset: 1)

data/app/views/renalware/admissions/consults/_form.html.slim

@@ -55,4 +55,4 @@
 
   = f.submit class: :button
   '  or
-  = link_to "Cancel", admissions_consults_path
+  = link_to t("btn.cancel"), admissions_consults_path

data/app/views/renalware/admissions/consults/_summary_part.html.slim

@@ -6,10 +6,10 @@
 #consults.summary-part--consults
   article
     header
-      h2= link_to("Consults (#{summary_part.consults_count})", view_all_url)
+      h2= link_to("#{t('titles.consults')} (#{summary_part.consults_count})", view_all_url)
 
       ul
-        li= link_to("View All", view_all_url, class: "button")
+        li= link_to(t("btn.view_all"), view_all_url, class: "button")
 
     - if summary_part.consults.any?
       = render "renalware/admissions/consults/table",

data/app/views/renalware/admissions/consults/index.html.slim

@@ -1,7 +1,7 @@
 - content_for(:body_class) { "consults-list" }
 
 = content_for(:actions) do
-  = link_to("Add", new_admissions_consult_path, class: :button)
+  = link_to(t("btn.add"), new_admissions_consult_path, class: :button)
   = link_to(admissions_consults_path(q: params[:q]&.permit!, format: :pdf), class: "button secondary") do
     i.fas.fa-print
     | Print (PDF)

data/app/views/renalware/admissions/patient_admissions/index.html.slim

@@ -1,5 +1,5 @@
 = content_for(:actions) do
-  = link_to t("new_record.link_title"),
+  = link_to t("btn.add"),
             new_admissions_admission_path,
             class: "button"
 

data/app/views/renalware/admissions/requests/_form.html.slim

@@ -23,7 +23,7 @@
       = f.input :notes, as: :text, wrapper: :horizontal_large, input_html: { rows: 5 }
       = f.submit class: :button
       '  or
-      = link_to "Cancel",
+      = link_to t("btn.cancel"),
                "#",
                "aria-label" => "Close",
                 class: "reveal-modal-close"

data/app/views/renalware/admissions/requests/_request.html.slim

@@ -25,7 +25,7 @@ ruby:
               data: { confirm: "Are you sure you want to remove this item?" } do
       i.fas.fa-trash.fa-link-annotation
       |  |  
-      = link_to "Edit",
+      = link_to t("btn.edit"),
                 edit_admissions_request_path(request, format: :html),
                 data: { "reveal-id" => "admissions-request-modal", "reveal-ajax" => "true" }
   td.handle

data/app/views/renalware/clinical/allergies/_list.html.slim

@@ -2,7 +2,7 @@ article.clinical-allergies
   header
     h2= t(".legend")
     / Link to launch the modal dialog
-    = link_to t(".add"),
+    = link_to t("btn.add"),
               "#",
               class: "button right",
               data: { "reveal-id" => "add-allergy-modal" }
@@ -14,7 +14,7 @@ article.clinical-allergies
   table.natural-width
     thead
       tr
-        th.col-width-large= t(".description")
+        th.col-width-large= t(".thead.description")
         th.col-width-date-time= t(".recorded_at")
         th.col-width-medium= t(".recorded_by")
         th.col-width-tiny
@@ -32,7 +32,7 @@ article.clinical-allergies
                       data: { confirm: delete_confirmation_msg }
 
   = render "renalware/clinical/allergies/new",
-           link_text: t(".add"),
+           link_text: t("btn.add"),
            patient: patient
 
   = render "renalware/clinical/allergy_statuses/form", patient: patient