@@ -13,13 +13,8 @@
       <% questions.each do |question| %>
         <hr />
         <div class="question_show" id="<%= "question_show#{question.id}" %>">
-          <%= render partial: 'org_admin/questions/show', locals: {template: template, question: question, current_tab: current_tab, edit: edit, original_org: template.base_org} %>
+          <%= render partial: 'org_admin/questions/show', locals: { template: template, question: question, original_org: template.base_org} %>
         </div>
-        <% if question.modifiable && edit %>
-          <div class="question_edit" id="<%= "question_edit#{question.id}" %>" style="display: none;">
-            <%= render partial: 'org_admin/questions/edit', locals: {template: template, question: question, current_tab: current_tab} %>
-          </div>
-        <% end %>
         <% if questions.last.id != question.id %>
           <hr />
         <% end %>
<div class="row">
  <div class="col-md-12">
    <p class="text-justify">
      <%= raw section.description %>
    </p>
  </div>
</div>
<div class="row">
  <div class="col-md-12">
    <h3><%= _('Questions') %></h3>
    <% questions = section.questions.order('number') %>
    <% if questions.present? %>
      <% questions.each do |question| %>
        <hr />
        <div class="question_show" id="<%= "question_show#{question.id}" %>">
          <%= render partial: 'org_admin/questions/show', locals: {template: template, question: question, current_tab: current_tab, edit: edit, original_org: template.base_org} %>
        </div>
        <% if question.modifiable && edit %>
          <div class="question_edit" id="<%= "question_edit#{question.id}" %>" style="display: none;">
            <%= render partial: 'org_admin/questions/edit', locals: {template: template, question: question, current_tab: current_tab} %>
          </div>
        <% end %>
        <% if questions.last.id != question.id %>
          <hr />
        <% end %>
      <% end %>
    <% end %>
  </div>
</div>
do we want to remove the questions/edit partial from here? What about the section being non-modifiable however it has questions that are modifiable (e.g. adding new questions to a customised template...)