diff --git a/app/views/org_admin/templates/_edit_template.html.erb b/app/views/org_admin/templates/_edit_template.html.erb index b64f5c4..93f29c2 100644 --- a/app/views/org_admin/templates/_edit_template.html.erb +++ b/app/views/org_admin/templates/_edit_template.html.erb @@ -70,7 +70,9 @@ <% end %>
- <%= f.button(_('Save'), class: 'btn btn-default', type: "submit") %> - <%= link_to(_('Cancel'), '#', { class: 'btn btn-default template_show_link', role: "button" }) %> +
+ <%= f.button(_('Save'), class: 'btn btn-default', type: "submit") %> + <%= link_to(_('Cancel'), '#', { class: 'btn btn-default template_show_link', role: "button" }) %> +
<% end %> \ No newline at end of file diff --git a/app/views/phases/_edit_phase.html.erb b/app/views/phases/_edit_phase.html.erb index 0423a90..03c4811 100644 --- a/app/views/phases/_edit_phase.html.erb +++ b/app/views/phases/_edit_phase.html.erb @@ -17,9 +17,10 @@ <%= f.label(:description, _('Description'), class: "control-label") %>
"> <%= text_area_tag('phase-desc', phase.description, class: 'phase tinymce form-control') %> +
-
+
<%= f.button(_('Save'), class: 'btn btn-default', type: "submit") %> <%= link_to _('Cancel'), '#', class: 'btn btn-default phase_show_link', role: 'button' %> diff --git a/app/views/questions/_edit_question.html.erb b/app/views/questions/_edit_question.html.erb index 836e34f..e42ff2a 100644 --- a/app/views/questions/_edit_question.html.erb +++ b/app/views/questions/_edit_question.html.erb @@ -93,13 +93,15 @@ :id, :title, {prompt: false}, {multiple: true, 'data-toggle': 'tooltip', 'data-html': true, title: _("

Select themes that are relevant to this question.

This allows your generic institution-level guidance to be drawn in, as well as that from other sources e.g. the %{organisation_abbreviation} or any Schools/Departments that you provide guidance for.

You can select multiple themes by using the CTRL button.

"), class: 'form-control'}) %>
-
- <%= f.submit _('Save'), class: "btn btn-default", role:'button' %> - <% if !question.section.phase.template.published? %> - <%= link_to _('Delete'), admin_destroy_question_path(question_id: question.id), - confirm: _("You are about to delete '%{question_text}'. Are you sure?") % { :question_text => question.text }, method: :delete, class: "btn btn-default", role:'button'%> - <% end %> - <%= link_to _('Cancel'), '#', class: "btn btn-default edit_question_cancel", role: 'button' %> +
+
+ <%= f.submit _('Save'), class: "btn btn-default", role:'button' %> + <% if !question.section.phase.template.published? %> + <%= link_to _('Delete'), admin_destroy_question_path(question_id: question.id), + confirm: _("You are about to delete '%{question_text}'. Are you sure?") % { :question_text => question.text }, method: :delete, class: "btn btn-default", role:'button'%> + <% end %> + <%= link_to _('Cancel'), '#', class: "btn btn-default edit_question_cancel", role: 'button' %> +
<% end %> diff --git a/app/views/sections/_edit_section.html.erb b/app/views/sections/_edit_section.html.erb index f976b8d..f2b5ce7 100644 --- a/app/views/sections/_edit_section.html.erb +++ b/app/views/sections/_edit_section.html.erb @@ -27,11 +27,13 @@
-
- <%= f.button(_('Save'), class: 'btn btn-default', type: "submit") %> - <%= link_to _('Cancel'), admin_show_phase_path(section.phase), class: 'btn btn-default', role: 'button' %> - <%= link_to _('Delete'), admin_destroy_section_path(section_id: section.id), - confirm: _("You are about to delete '%{section_title}'. This will affect questions linked to this section. Are you sure?") % { :section_title => section.title }, method: :delete, class: 'btn btn-default', role:'button' %> +
+
+ <%= f.button(_('Save'), class: 'btn btn-default', type: "submit") %> + <%= link_to _('Cancel'), admin_show_phase_path(section.phase), class: 'btn btn-default', role: 'button' %> + <%= link_to _('Delete'), admin_destroy_section_path(section_id: section.id), + confirm: _("You are about to delete '%{section_title}'. This will affect questions linked to this section. Are you sure?") % { :section_title => section.title }, method: :delete, class: 'btn btn-default', role:'button' %> +
<% end %>