diff --git a/app/views/submissions/show.html.erb b/app/views/submissions/show.html.erb index 624f38e6f..1f8ffae58 100644 --- a/app/views/submissions/show.html.erb +++ b/app/views/submissions/show.html.erb @@ -11,10 +11,8 @@ <% with_signature_id_reason = configs.find { |e| e.key == AccountConfig::WITH_SIGNATURE_ID_REASON_KEY }&.value != false %> <% with_signature_id_completed_at = configs.find { |e| e.key == AccountConfig::WITH_SIGNATURE_ID_COMPLETED_AT_KEY }&.value == true %>
-
- <% if turbo_native_app? %> -

<% (@submission.name || @submission.template&.name).to_s.split(/(_)/).each do |item| %><%= item %><% end %>

- <% else %> +
+ <% unless turbo_native_app? %> <%= render 'submissions/logo' %>

<% (@submission.name || @submission.template&.name).to_s.split(/(_)/).each do |item| %><%= item %><% end %>

@@ -22,19 +20,19 @@ <% end %>
<% if signed_in? && can?(:destroy, @submission) && @submission.archived_at? && !@submission.completed_at? %> - + <%= button_to button_title(title: t('unarchive'), disabled_with: t('unarchive')[0..-2], icon: svg_icon('rotate', class: 'w-6 h-6')), submission_unarchive_index_path(@submission), class: 'btn btn-primary btn-ghost text-base hidden md:flex' %> <% end %> <% if @submission.audit_trail.present? %> - + <%= svg_icon('external_link', class: 'w-6 h-6') %> <% elsif signed_in? %> - + <%= link_to submission_events_path(@submission), class: 'white-button', data: { turbo_frame: :modal } do %> <%= svg_icon('logs', class: 'w-6 h-6') %> @@ -57,7 +55,7 @@ <% show_download_dropdown = show_combined_download || show_unarchive %> <% if @submission.completed_at? || !is_combined_enabled %>
- + <%= svg_icon('download', class: 'w-6 h-6') %> @@ -97,7 +95,7 @@ <% end %> <% if show_unarchive %>
  • - + @@ -111,7 +109,7 @@
  • <% end %> <% elsif @submission.submitters.to_a.size == 1 && !@submission.expired? && !@submission.submitters.to_a.first.declined_at? && !@submission.archived_at? && !@submission.template&.archived_at? %> - + <%= render 'shared/clipboard_copy', text: submit_form_url(slug: @submission.submitters.to_a.first.slug, host: form_link_host), class: 'base-button', icon_class: 'w-6 h-6 text-white', copy_title: t('copy_share_link'), copied_title: t('copied_to_clipboard') %> <% end %> @@ -135,7 +133,7 @@ <% end %>
    -
    +
    <% fields_index = Templates.build_field_areas_index(@submission.template_fields || @submission.template.fields) %> <% submitters_index = @submission.submitters.index_by(&:uuid) %> <% submitters_order_index = nil %> @@ -189,7 +187,7 @@ <% end %>
    - - + <% if turbo_native_app? %> + + + + + + + <% else %> + + <% end %>
    <% unless request.headers['HTTP_X_TURBO'] %> diff --git a/app/views/submissions_dashboard/index.html.erb b/app/views/submissions_dashboard/index.html.erb index c653f660d..9e8cd0401 100644 --- a/app/views/submissions_dashboard/index.html.erb +++ b/app/views/submissions_dashboard/index.html.erb @@ -33,7 +33,7 @@ <% if can?(:manage, :countless) || current_account.submissions.archived.exists? || current_account.templates.where(Submission.where(Submission.arel_table[:template_id].eq(::Template.arel_table[:id])).arel.exists).archived.exists? %>
    - <%= t('view_archived') %> + <%= t('view_archived') %>
    <% end %> diff --git a/app/views/template_folders/show.html.erb b/app/views/template_folders/show.html.erb index 9b0f5f20a..35438910c 100644 --- a/app/views/template_folders/show.html.erb +++ b/app/views/template_folders/show.html.erb @@ -1,7 +1,7 @@ <% content_for(:native_title, @template_folder.name) if turbo_native_app? %> <% if turbo_native_app? && (can?(:manage, :countless) || current_account.templates.where.not(archived_at: nil).exists?) %> - <%= t('view_archived') %> + <%= t('view_archived') %> <% end %> <% unless turbo_native_app? %> diff --git a/app/views/templates/_submission.html.erb b/app/views/templates/_submission.html.erb index e7ea158b1..3c2189adc 100644 --- a/app/views/templates/_submission.html.erb +++ b/app/views/templates/_submission.html.erb @@ -1,5 +1,5 @@ <% status_badges = { 'awaiting' => 'badge-info', 'sent' => 'badge-info', 'completed' => 'badge-success', 'opened' => 'badge-warning', 'declined' => 'badge-error' } %> -
    +
    <% if local_assigns[:with_template] %> <% template = submission.template %> diff --git a/app/views/templates/_title.html.erb b/app/views/templates/_title.html.erb index 33ee03b5d..2987312e6 100644 --- a/app/views/templates/_title.html.erb +++ b/app/views/templates/_title.html.erb @@ -18,7 +18,7 @@ <% if @template.account_id == current_account.id %>
    - + <%= svg_icon('folder', class: 'w-5 h-5 flex-shrink-0') %> <%= @template.folder.full_name %> @@ -81,7 +81,7 @@ <% end %> <% if !template.archived_at? && can?(:update, template) %> - + diff --git a/app/views/templates_dashboard/index.html.erb b/app/views/templates_dashboard/index.html.erb index 700eb270d..0cdcc91a9 100644 --- a/app/views/templates_dashboard/index.html.erb +++ b/app/views/templates_dashboard/index.html.erb @@ -45,7 +45,7 @@ <% if has_archived %> <% end %> diff --git a/app/views/templates_shared/index.html.erb b/app/views/templates_shared/index.html.erb index b7c561f13..26e47d1e6 100644 --- a/app/views/templates_shared/index.html.erb +++ b/app/views/templates_shared/index.html.erb @@ -26,7 +26,7 @@ <% view_archived_html = capture do %> <% if @has_archived && params[:q].blank? %> <% end %> <% end %>