diff --git a/app/controllers/contacts_controller.rb b/app/controllers/contacts_controller.rb index a19af2e..ae9e85a 100644 --- a/app/controllers/contacts_controller.rb +++ b/app/controllers/contacts_controller.rb @@ -30,3 +30,4 @@ end end end +end \ No newline at end of file diff --git a/app/controllers/project_groups_controller.rb b/app/controllers/project_groups_controller.rb index e5cb220..426b842 100644 --- a/app/controllers/project_groups_controller.rb +++ b/app/controllers/project_groups_controller.rb @@ -93,4 +93,4 @@ render(:file => File.join(Rails.root, 'public/403.html'), :status => 403, :layout => false) end end - +end \ No newline at end of file diff --git a/app/models/exported_plan.rb b/app/models/exported_plan.rb index 8ffff24..6d21897 100644 --- a/app/models/exported_plan.rb +++ b/app/models/exported_plan.rb @@ -47,7 +47,7 @@ def funder org = self.plan.project.dmptemplate.try(:organisation) - org.name if org.present? && org.organisation_type.try(:name) == constant("organisation_types.funder")) + org.name if org.present? && org.organisation_type.try(:name) == constant("organisation_types.funder") end def institution diff --git a/app/views/admin/dmptemplates/settings.html.erb b/app/views/admin/dmptemplates/settings.html.erb index 0794201..171d5bc 100644 --- a/app/views/admin/dmptemplates/settings.html.erb +++ b/app/views/admin/dmptemplates/settings.html.erb @@ -1,4 +1,3 @@ -<<<<<<< HEAD <% @settings.errors.full_messages.each do |error| %>
<%= error %>
<% end %> @@ -37,43 +36,3 @@ <%= submit_tag(t('helpers.settings.plans.reset'), class: 'btn btn-primary') %> <% end %> -======= -<% @settings.errors.full_messages.each do |error| %> -
<%= error %>
-<% end %> - -<%= form_for(@settings, url: update_settings_admin_dmptemplate_path(@template), method: :put, as: 'settings[export][formatting]', html: { class: 'formtastic' }) do |f| %> -
- <%= t("admin.formatting")%> -
    -
  1. - <%= f.label(:font_face, t('helpers.settings.plans.font_face')) %> - <%= f.select(:font_face, options_for_select(Settings::Dmptemplate::VALID_FONT_FACES, @settings.formatting[:font_face]), as: 'formatting[font_face]') %> - <%= f.select(:font_size, options_for_select((1..36).to_a, @settings.formatting[:font_size])) %>pt -
    2. -
  2. - <%= f.label(t('helpers.settings.plans.margin')) %> - <% %i( top bottom left right ).each do |pos| %> - <%= t("helpers.settings.plans.margins.#{pos}") -%> - <%= select_tag("settings[export][formatting][margin][#{pos}]", options_for_select((0..100).to_a, @settings.formatting[:margin][pos])) %> - <% end %> -
    3. -
-
- -
- <%= t("admin.max_pages")%> -
    -
  1. - <%= label_tag('settings_export_max_pages', t('helpers.settings.plans.max_pages')) %> - <%= select_tag('settings[export][max_pages]', options_for_select((1..10).to_a, @settings.max_pages)) %> -
    2. -
-
- -
- <%= submit_tag(t('helpers.save'), class: 'btn btn-primary') %> - <%= submit_tag(t('helpers.settings.plans.reset'), class: 'btn btn-primary') %> -
-<% end %> ->>>>>>> 5081913e85a4cd405917545a8559aaaba67db1c6 diff --git a/app/views/api/v0/guidance_groups/index.json.jbuilder b/app/views/api/v0/guidance_groups/index.json.jbuilder index 31998d1..908b19d 100644 --- a/app/views/api/v0/guidance_groups/index.json.jbuilder +++ b/app/views/api/v0/guidance_groups/index.json.jbuilder @@ -1,4 +1,3 @@ -<<<<<<< HEAD # builds a json response to api query for a list of guidance groups json.prettify! @@ -20,30 +19,3 @@ json.optional guidance_group.optional_subset json.updated guidance_group.updated_at end -======= -# builds a json response to api query for a list of guidance groups -json.prettify! - -json.guidance_groups @all_viewable_groups do |guidance_group| - json.name guidance_group.name - json.id guidance_group.id - - # for each template associated with the guidance group, list the template name - @templates = guidance_group.dmptemplates - # if the template is empty, instead use all avalable templates - if @templates.empty? - @templates = Dmptemplate.all - end - json.templates @templates do |template| - json.title template.title - end - - json.guidances guidance_group.guidances do |guidance| - json.text guidance.text - json.id guidance.id - end - - json.optional guidance_group.optional_subset - json.updated guidance_group.updated_at -end ->>>>>>> 5081913e85a4cd405917545a8559aaaba67db1c6 diff --git a/app/views/api/v0/guidance_groups/show.json.jbuilder b/app/views/api/v0/guidance_groups/show.json.jbuilder index 9e2b402..1a412db 100644 --- a/app/views/api/v0/guidance_groups/show.json.jbuilder +++ b/app/views/api/v0/guidance_groups/show.json.jbuilder @@ -1,4 +1,3 @@ -<<<<<<< HEAD # builds a json response to api query for a list of guidance groups json.prettify! @@ -24,29 +23,3 @@ json.optional @guidance_group.optional_subset json.updated @guidance_group.updated_at end -======= -# builds a json response to api query for a list of guidance groups -json.prettify! - -json.guidance_group do - json.name @guidance_group.name - json.id @guidance_group.id - - # for each template associated with the guidance group, list the template name - @templates = @guidance_group.dmptemplates - # if the template is empty, instead use all avalable templates - if @templates.empty? - @templates = Dmptemplate.all - end - json.templates @templates do |template| - json.title template.title - end - - json.guidances @guidance_group.guidances do |guidance| - json.text guidance.text - json.id guidance.id - end - json.optional @guidance_group.optional_subset - json.updated @guidance_group.updated_at -end ->>>>>>> 5081913e85a4cd405917545a8559aaaba67db1c6 diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb index 493dc13..9be1fed 100644 --- a/app/views/devise/registrations/edit.html.erb +++ b/app/views/devise/registrations/edit.html.erb @@ -1,4 +1,3 @@ -<<<<<<< HEAD

<%= t("helpers.edit_profile") %>

<%= raw t("helpers.user_details_text_html") %> @@ -52,6 +51,13 @@ :as => :string, :class => "text_field has-tooltip reg-input", "data-toggle" => "tooltip", "data-container" => "body", "title" => t("helpers.org_type.other_org_help_text") %> + + <%= t('helpers.user_details_language') %> + <%= collection_select(:user, + :language_id, Language.all.order("name"), + :id, :name, {:selected => Language.where(default_language: true).first.id}, + {:class => "typeahead org_sign_up"}) %> + <%= t("helpers.orcid_id") %> <%= f.text_field :orcid_id , @@ -137,150 +143,3 @@ <%= t("helpers.unlink_account") %> -======= -

<%= t("helpers.edit_profile") %>

- -<%= raw t("helpers.user_details_text_html") %> - -
- <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => {:method => :put}) do |f| %> - <%= hidden_field_tag :unlink_flag, "false", :id => "unlink_flag" %> - -
- -

<%= raw t("helpers.user_details_paragraph_html") %>

- - - - - - - - - - - - - - - - - - - <% other_organisations = Array.new %> - <% Organisation.where("parent_id IS ? AND is_other = ?", nil, 1).each do |org| %> - <% other_organisations << org.id %> - <% end %> - "> - - - - - - - - - - - - <% unless @user.api_token.nil? %> - - - - - - - - - <% end %> -
<%= (t("helpers.email") + " *") %><%= f.email_field :email, :as => :email %>
<%= t("helpers.first_name") %><%= f.text_field :firstname, :as => :string, - :id => "first_time_login_firstname", - :autofocus => true, - :class => "text_field has-tooltip", - "data-toggle" => "tooltip", - "data-trigger" => "focus", - "title" => t("helpers.first_name_help_text") %>
<%= t("helpers.last_name") %><%= f.text_field :surname, - :as => :string, :id => "first_time_login_surname", - :class => "text_field has-tooltip", - "data-toggle" => "tooltip", - "data-trigger" => "focus", - "title" => t("helpers.surname_help_text") %>
<%= t("helpers.org_type.organisation") %><%= collection_select(:user, - :organisation_id, Organisation.where("parent_id IS NULL").order("name"), - :id, :name, {include_blank: t("helpers.org_type.organisation")}, - {:class => "typeahead org_sign_up"}) %>
<%= t('helpers.user_details_language') %><%= collection_select(:user, - :language_id, Language.all.order("name"), - :id, :name, {:selected => Language.where(default_language: true).first.id}, - {:class => "typeahead org_sign_up"}) %>
<%= t("helpers.orcid_id") %><%= f.text_field :orcid_id, - :as => :string, - :autocomplete => "off", - :class => "text_field has-tooltip", "data-toggle" => "tooltip", "data-html" => "true", "title" => t("helpers.orcid_html") %>
<%= t("helpers.api_token") %><%= @user.api_token %>
<%= t("helpers.api_info") %><%= link_to(t("helpers.api_use"), controller: "token_permission_types", action: "index") %>
-
-

- <% if Rails.application.config.shibboleth_enabled %> - <% if resource.shibboleth_id.nil? || resource.shibboleth_id.length == 0 then %> - <%= link_to t("helpers.shibboleth_to_link_text"), user_omniauth_shibboleth_path, :class => "a-orange" %> - <% else %> - <%= t("helpers.shibboleth_linked_text") %> - - <%= t("helpers.shibboleth_unlink_label") %> - - <% end %> - <% end %> -

-
-
-
-

- <%= raw t("helpers.edit_password_info") %> -

- - <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %> -
<%= t('custom_devise.waiting_for_confirmation') %><%= resource.unconfirmed_email %>
- <% end %> - - - - - - - - - - - - -
<%= t("helpers.current_password") %> - <%= f.password_field :current_password, :as => :password %> -
<%= t("helpers.new_password") %><%= f.password_field :password, :as => :password, :autocomplete => "off" %> -
<%= t("helpers.password_conf") %><%= f.password_field :password_confirmation, :as => :password, :autocomplete => "off" %>
-
- <%= f.submit t("helpers.submit.save"), :class => "btn btn-primary" %> - <%= link_to t("helpers.submit.cancel"), :back, :class => "btn btn-primary" %> -
- <% end %> - - -
-
- - - - ->>>>>>> 5081913e85a4cd405917545a8559aaaba67db1c6 diff --git a/app/views/dmptemplates/_add_guidance.html.erb b/app/views/dmptemplates/_add_guidance.html.erb index e7322b0..de49775 100644 --- a/app/views/dmptemplates/_add_guidance.html.erb +++ b/app/views/dmptemplates/_add_guidance.html.erb @@ -1,4 +1,3 @@ -<<<<<<< HEAD
<%= form_for :guidance, :url => {:action => "admin_create"}, :html => {:id => "new_guidance_form"} do |f| %> @@ -91,98 +90,4 @@
<%= t('helpers.ok_label') %>
-======= - -
- <%= form_for :guidance, :url => {:action => "admin_createguidance"}, :html => {:id => "new_guidance_form"} do |f| %> - - - - - - - - - - - - - - - - - -
<%= t("org_admin.guidance.text_label") %>
- <%= text_area_tag("guidance-text", "", class: "tinymce") %> -
-
- <%= link_to( image_tag("help_button.png"), "#", :class => "guidance_text_popover", :rel => "popover", "data-html" => "true", "data-content" => t("org_admin.guidance.text_help_text_html"))%> -
-
-
<%= t("org_admin.guidance.by_theme_or_by_question") %>
- <%= select_tag "g_options", options_for_select([[t("org_admin.guidance.by_themes_label"), 1], - [t("org_admin.guidance.by_question_label"), 2]]) %> -
-
- <%= link_to( image_tag("help_button.png"), "#", :class => "guidance_apply_to_popover", :rel => "popover", "data-html" => "true", "data-content" => t("org_admin.guidance.apply_to_help_text_html"))%> -
-
- - -
<%= t("org_admin.guidance.published") %>
- <%= f.check_box :published , :as => :check_boxes%> -
-
- -
-
<%= t("org_admin.guidance.guidance_group_label") %>
- <%= f.collection_select(:guidance_group_ids, - GuidanceGroup.where("organisation_id = ?", current_user.organisation_id).order("name ASC"), - :id, :name, {:prompt => false, :include_blank => t('helpers.none')}, {:multiple => false})%> -
-
- <%= link_to( image_tag("help_button.png"), "#", :class => "guidance_group_select_popover", :rel => "popover", "data-html" => "true", "data-content" => t("org_admin.guidance.guidance_group_select_help_text_html"))%> -
-
- -
- - - -
- <%= t("helpers.submit.save")%> - - <%= link_to t("helpers.submit.cancel"), :back, :class => "btn cancel" %> -
- -
- <%= tinymce :content_css => asset_path("application.css") %> - <%end%> -
- - - - - \ No newline at end of file diff --git a/app/views/dmptemplates/_admin_nav_tabs.html.erb b/app/views/dmptemplates/_admin_nav_tabs.html.erb index db29ff9..6974892 100644 --- a/app/views/dmptemplates/_admin_nav_tabs.html.erb +++ b/app/views/dmptemplates/_admin_nav_tabs.html.erb @@ -1,4 +1,3 @@ -<<<<<<< HEAD -======= - - - ->>>>>>> 5081913e85a4cd405917545a8559aaaba67db1c6 diff --git a/app/views/dmptemplates/_edit_section.html.erb b/app/views/dmptemplates/_edit_section.html.erb index 2fa3108..f85a6ce 100644 --- a/app/views/dmptemplates/_edit_section.html.erb +++ b/app/views/dmptemplates/_edit_section.html.erb @@ -1,5 +1,4 @@ -<<<<<<< HEAD - - - -<%= form_for(section, :url => admin_updatesection_dmptemplate_path(section, :phase => phase, :edit => edit), :html => { :method => :put}) do |s| %> - <%if @open && @section_id == section.id then%> - <% toggle = 'accordion-body section-collapse in collapse'%> - <%else%> - <% toggle = 'accordion-body collapse section-collapse' %> - <%end%> - - <%if @new_sec then%> - <% toggle = 'accordion-body section-collapse in collapse'%> - <%end%> - -
-
-
-
- <%= s.text_field :title, :as => :string, :class => 'text_field', :placeholder => t('org_admin.templates.section_title_placeholder') %> - -
-
-
- - - - -
-
- - -
-
- - - - - - - - - -
<%= t('org_admin.templates.phase_order_label') %><%= s.number_field :number, :in => 1..15, :class => "number_field has-tooltip", 'data-toggle' => "tooltip", 'title' => t('org_admin.templates.section_number_help_text') %>
<%= t('org_admin.templates.desc_label') %> -
- <%= text_area_tag("section-desc-#{section.id}", section.description , class: "tinymce") %> -
-
- <%= link_to( image_tag('help_button.png'), '#', :class => 'section_desc_popover', :rel => "popover", 'data-html' => "true", 'data-content' => t('org_admin.templates.section_desc_help_text_html'))%> -
-
- -
- <%= s.submit t('helpers.submit.save'), :class => 'btn btn-primary' %> - <% if !section.version.published? || phase.dmptemplate.org_type == t("helpers.org_type.funder") then%> - <%= link_to t("helpers.submit.delete"), admin_destroysection_dmptemplate_path(:section_id => section.id), - :confirm => t("org_admin.templates.section_delete_message", :section_title => section.title ), :method => :delete, :class => "btn btn-primary"%> - <%end%> - <%= link_to t('helpers.submit.cancel'), :back, :class => 'btn cancel' %> -
- <%end%> -
- <% @questions = section.questions.order("number")%> - <%if @questions.count > 0 %> - <% question_left = @questions.count %> - <% @questions.each do |question| %> -
-
"> - - <%= render :partial => 'show_question', locals: {question: question} %> -
- - -
- - <%if question_left.to_i > 1 then %> -
- <%else%> -
- <%end%> - <% question_left = question_left - 1 %> - - <%end%> - <%end%> - - - <% if !section.version.published? || phase.dmptemplate.org_type == t("helpers.org_type.funder") then%> - - <%if @questions.count != 0 %> -
- <%end%> - - - - -
-
- <%= hidden_field_tag :section_id, section.id, :class => "section_id" %> - <%= link_to t("org_admin.add_question_label"), '#', :class => "btn btn-primary add_question_button" %> -
-
- <%end%> - -
-
-
-
->>>>>>> 5081913e85a4cd405917545a8559aaaba67db1c6 diff --git a/app/views/dmptemplates/_show_phase.html.erb b/app/views/dmptemplates/_show_phase.html.erb index 18c8860..01117cf 100644 --- a/app/views/dmptemplates/_show_phase.html.erb +++ b/app/views/dmptemplates/_show_phase.html.erb @@ -1,4 +1,3 @@ -<<<<<<< HEAD

@@ -36,42 +35,3 @@
-======= - - -

- <%= t('org_admin.templates.phase_details_label')%> - - - <% if @phase.dmptemplate.org_type != t("helpers.org_type.funder") || current_user.org_type == t("helpers.org_type.funder") then %> -
- <%= link_to t("org_admin.templates.edit_phase_details_label"), '#', :class => "btn btn-primary", :id => "edit_phase_button"%> -
- <%end%> -

- -<%if @phase.dmptemplate.org_type != t("helpers.org_type.funder") then%> -
- <%= raw t('org_admin.templates.phase_details_text_html')%> -
-<%end%> - -
-
- - - - - - - - - - - - - - -
<%= t('org_admin.templates.title_label') %><%= @phase.title %>
<%= t('org_admin.templates.phase_order_label') %><%= @phase.number %>
<%= t('org_admin.templates.desc_label') %><%= raw @phase.description %>
-
->>>>>>> 5081913e85a4cd405917545a8559aaaba67db1c6 diff --git a/app/views/dmptemplates/_show_phases_sections.html.erb b/app/views/dmptemplates/_show_phases_sections.html.erb index 209a035..6822565 100644 --- a/app/views/dmptemplates/_show_phases_sections.html.erb +++ b/app/views/dmptemplates/_show_phases_sections.html.erb @@ -1,4 +1,3 @@ -<<<<<<< HEAD
@@ -70,77 +69,5 @@ <%end%> -======= - -
- -
-

<%= raw phase.description %>

-
- -<% if phase.versions.any? then %> - - <% version = phase.versions.where("published = ?", true).first %> - <% if version.nil? then%> - <% version = phase.versions.order("updated_at DESC").first %> - <%end%> - - -
- - - <%if phase.has_sections == true then %> - <%= link_to t("helpers.preview"), admin_previewphase_dmptemplate_path(version), :class => 'btn btn-primary'%> - <%end%> - <% if phase.latest_published_version == nil then%> - <%= link_to t("helpers.submit.delete"), admin_destroyphase_dmptemplate_path(:phase_id => phase.id), - :confirm => t("org_admin.templates.phase_delete_message", :phase_title => phase.title ), :method => :delete, :class => "btn btn-primary"%> - <%end%> - <%if phase.dmptemplate.org_type == t("helpers.org_type.funder") && current_user.org_type != t("helpers.org_type.funder") then%> - <% b_label = t('org_admin.templates.view_phase_label')%> - <%else %> - <% b_label = t('org_admin.templates.edit_phase_label')%> - <%end%> - <%= link_to b_label, admin_phase_dmptemplate_path(phase), :class => "btn btn-primary" %> - -
- <% if version.sections.any? then %> - - - - - - - - - <% version.sections.order("number ASC").each do |section| %> - <%if (section.organisation_id == phase.dmptemplate.organisation_id ) || ( section.organisation_id == current_user.organisation_id) then%> - - - - - <%end%> - <%end%> - -
<%= t('helpers.sections_label')%><%= t('helpers.questions_label')%>
-

<%= section.title %>

- 		- <% if section.questions.any? %> - <% questions = section.questions.order("number ASC") %> -
    - <% questions.each do |ques|%> -
  • - - <%= ques.text %> -
    • - <%end%> -
- <%end%> -
- - <%end%> - -<%end%> - ->>>>>>> 5081913e85a4cd405917545a8559aaaba67db1c6
\ No newline at end of file diff --git a/app/views/dmptemplates/_show_question.html.erb b/app/views/dmptemplates/_show_question.html.erb index a809d2d..53d3f06 100644 --- a/app/views/dmptemplates/_show_question.html.erb +++ b/app/views/dmptemplates/_show_question.html.erb @@ -1,4 +1,3 @@ -<<<<<<< HEAD <%= render :partial => 'guidance_display', locals: {question: question}%> -======= - - -
- - - - - - - - - - - - - - <%if q_format.title == t("helpers.text_field") || q_format.title == t("helpers.text_area") then %> - <%if !question.default_value.nil? then %> - - - - - <%end%> - <% end %> - - - - - - - - <% if (question.section.version.phase.dmptemplate.org_type != t("helpers.org_type.funder") && question.section.organisation_id == current_user.organisation_id ) then%> - <% suggested_answer = question.get_suggested_answer(current_user.organisation.id) %> - <% if !suggested_answer.nil? && suggested_answer.text != "" then %> - - - - - <%end%> - <%end%> - - <%if !question.guidance.nil? then %> - - - - - <%end%> - - <% themes_q = question.themes %> - <%if !themes_q.nil? then%> - - - - - <%end%> -
<%= t('org_admin.questions.question_number_label')%><%= question.number%>
<%= t('org_admin.questions.question_text_label')%><%= raw question.text %> -
-
- <% q_format = question.question_format %> - <% if q_format.title == t("helpers.checkbox") || q_format.title == t("helpers.multi_select_box") || q_format.title == t("helpers.radio_buttons") || q_format.title == t("helpers.dropdown") then%> -
    - <% if question.options.is_a? Option then %> -
  • - <%= question.options.text %>
    • - <% else %> - <% if !question.options.to_a.nil? then %> - <% question.options.to_a.sort_by{|op| op['number']}.each do |o| %> -
  • - <%= o.text %>
    • - <%end%> - <% end %> - <% end %> -
- <% end %> -
-
<%= t('org_admin.questions.default_value_label')%><%= raw question.default_value %>
<%= t('org_admin.questions.answer_format_label')%><%= q_format.title %> -
- <% if q_format.title == t("helpers.checkbox") || q_format.title == t("helpers.multi_select_box") || q_format.title == t("helpers.radio_buttons") || q_format.title == t("helpers.dropdown") then%> - <% if question.option_comment_display == true then%> - <%= t("org_admin.questions.option_comment_display")%> - <%else%> - <%= t("org_admin.questions.option_comment_hide")%> - <%end%> - <%end%> -
-
- <% if suggested_answer.is_example? then %> - <%= t('org_admin.questions.example_answer_label')%> - <%else%> - <%= t('org_admin.questions.suggested_answer_label')%> - <%end%> - <%= raw suggested_answer.text %>
<%= t('org_admin.questions.guidance_label')%><%= raw question.guidance %>
<%= t('org_admin.questions.themes_label')%><% i = 1%> - <% themes_q.each do |t|%> - <%= t.title %> - <% if themes_q.count > i then%> - , - <% i +=1 %> - <% end %> - <%end%> -
-
- - <% if (question.section.version.phase.dmptemplate.org_type == t("helpers.org_type.funder") && question.section.organisation_id != current_user.organisation_id ) then%> - <% suggested_answer = question.get_suggested_answer(current_user.organisation.id) %> - <% if !suggested_answer.nil? && suggested_answer.text != "" then %> -
- <%= render :partial => 'show_suggested_answer', locals: {suggested_answer: suggested_answer, question: question} %> -
- - - <%end%> - - - - - - <%end%> - -
- - <%if (@edit == 'true'&& question.section.organisation_id == current_user.organisation_id) || (question.section.version.phase.dmptemplate.org_type == t("helpers.org_type.funder") && question.section.organisation_id == current_user.organisation_id && current_user.org_type != t("helpers.org_type.funder")) then%> -
- <%= hidden_field_tag :question_id, question.id, :class => "question_id" %> - <%= link_to t("org_admin.questions.question_edit_button"), '# ', :class => "btn btn-primary edit_question_button"%> - <% if !question.section.version.published? then%> - <%= link_to t("org_admin.questions.question_delete_button"), admin_destroyquestion_dmptemplate_path(:question_id => question.id), - :confirm => t("org_admin.questions.delete_message", :question_text => question.text ), :method => :delete, :class => "btn btn-primary"%> - <%end%> -
- <%elsif (@edit == 'false' && question.section.organisation_id != current_user.organisation_id )|| (question.section.version.phase.dmptemplate.org_type == t("helpers.org_type.funder") && question.section.organisation_id != current_user.organisation_id ) then%> - <% suggested_answer = question.get_suggested_answer(current_user.organisation.id) %> - <% if suggested_answer.nil? then %> -
-
- <%= hidden_field_tag :question_id, question.id, :class => "question_id" %> - <%= link_to t("org_admin.questions.suggested_or_example_answer_button"), '# ', :class => "btn btn-primary add_suggested_answer_button"%> -
-
- <%end%> - <%end%> -
-
- - - -<%= render :partial => 'guidance_display', locals: {question: question}%> ->>>>>>> 5081913e85a4cd405917545a8559aaaba67db1c6 diff --git a/app/views/dmptemplates/_show_template.html.erb b/app/views/dmptemplates/_show_template.html.erb index 2c23a85..7cfec9d 100644 --- a/app/views/dmptemplates/_show_template.html.erb +++ b/app/views/dmptemplates/_show_template.html.erb @@ -1,4 +1,3 @@ -<<<<<<< HEAD <% if @dmptemplate.org_type != constant("organisation_types.funder") || current_user.org_type == constant("organisation_types.funder") then %> @@ -42,49 +41,3 @@ <%= l dmptemplate.updated_at.to_date, :formats => :short %> -======= - - -<% if @dmptemplate.org_type != t("helpers.org_type.funder") || current_user.org_type == t("helpers.org_type.funder") then %> -

-
- <%= link_to t("org_admin.templates.edit_details"), '# ', :class => "btn btn-primary", :id => "edit_template_button"%> -
-

-<%end%> -
- - - - - - - - - - - - - - - - - - - - - - -
<%= t('org_admin.templates.title_label') %><%= dmptemplate.title %>
<%= t('org_admin.templates.desc_label') %><% if !dmptemplate.description.nil? && dmptemplate.description != "" then %> - <%= raw dmptemplate.description %> - <%else%> - - - <%end%> -
<%= t('org_admin.templates.published_label') %><%if dmptemplate.published || dmptemplate.has_published_versions? then%> - <%= dmptemplate.published %> - <%else%> - <%= t('org_admin.templates.cannot_publish')%> - <%end%> -
<%= t('org_admin.templates.created') %><%= l dmptemplate.created_at.to_date, :formats => :short %>
<%= t('org_admin.templates.last_updated') %><%= l dmptemplate.updated_at.to_date, :formats => :short %>
->>>>>>> 5081913e85a4cd405917545a8559aaaba67db1c6 -
\ No newline at end of file diff --git a/app/views/dmptemplates/admin_index.html.erb b/app/views/dmptemplates/admin_index.html.erb index 3228a3d..64a2097 100644 --- a/app/views/dmptemplates/admin_index.html.erb +++ b/app/views/dmptemplates/admin_index.html.erb @@ -1,4 +1,3 @@ -<<<<<<< HEAD <%= stylesheet_link_tag "admin" %>

@@ -152,158 +151,3 @@ <%end%> <%end%> -======= -<%= stylesheet_link_tag "admin" %> - -

- <%= t('org_admin.templates_label') %> -

-
-

- <%= t('org_admin.templates.own_temp') %> -

- -
- <%= raw t('org_admin.templates.create_own_template_text_html')%> -
-
- -
- <%= link_to t("org_admin.templates.create_template"), - admin_new_dmptemplate_path, - :class => 'btn btn-primary' %> -
-
-
- - -<% if @dmptemplates_own.count > 0 then %> - - - - - - - - - - - - <% @dmptemplates_own.each do |org_template| %> - - - - - - - - - <%end%> - -
<%= t('org_admin.templates.title_label') %><%= t('org_admin.templates.desc_label') %><%= t('org_admin.templates.published_label') %><%= t('org_admin.templates.last_updated') %><%= t('org_admin.templates.actions') %>
- <%= org_template.title%> - - <%= raw org_template.description.truncate(90, omission: t('helpers.truncate_continued')) %> - - <%= org_template.published %> - - <% last_temp_updated = org_template.updated_at %> - <% org_template.phases.each do |phase|%> - <% if phase.versions.any? then%> - <% phase.versions.each do |version| %> - <% if org_template.updated_at.to_date < version.updated_at.to_date then %> - <% last_temp_updated = version.updated_at %> - <%end%> - <%end%> - <%end%> - <%end%> - <%= l last_temp_updated.to_date, :formats => :short %> - - <%if current_user.is_org_admin? then%> - <% b_label = t('helpers.submit.edit')%> - <%else%> - <% b_label = t('helpers.view')%> - <%end%> - <%= link_to b_label, admin_template_dmptemplate_path(org_template), :class => "dmp_table_link"%> -
- -<%end%> - -
-
- - -<% if current_user.org_type != t("helpers.org_type.funder") then %> -

- <%= t("org_admin.templates.funders_temp") %> -

- - - <% if @dmptemplates_funders.count > 0 then %> - - - - - - - - - - - - - - <% @dmptemplates_funders.each do |org_template| %> - <% if org_template.published? ||org_template.has_customisations?(current_user.organisation_id, org_template) then %> - - - - - - - - <%end%> - <%end%> - -
<%= t('org_admin.templates.title_label') %><%= t('org_admin.templates.desc_label') %><%= t('org_admin.templates.published_label') %><%= t('org_admin.templates.last_updated') %><%= t('org_admin.templates.actions') %>
- <%= org_template.title%> - - <%= raw org_template.description.truncate(90, omission: t('helpers.truncate_continued')) %> - - <%if org_template.published? then %> - <%= org_template.published%> - <%else%> - <%= t("helpers.false_lowercase")%> - <%end%> - - <% last_updated = org_template.updated_at %> - <% org_template.phases.each do |phase|%> - <% if phase.versions.any? then%> - <% phase.versions.each do |version| %> - <% if org_template.updated_at.to_date < version.updated_at.to_date then %> - <% last_updated = version.updated_at %> - <%end%> - <%end%> - <%end%> - <%end%> - <%= l last_updated.to_date, :formats => :short %> - - - <%if current_user.is_org_admin? then%> - <% if org_template.org_type == t("helpers.org_type.funder") then %> - <%if org_template.has_customisations?(current_user.organisation_id, org_template) then%> - <% b_label = t("org_admin.templates.edit_customisation")%> - <%else%> - <% b_label = t("org_admin.templates.customise")%> - <%end%> - <%else%> - <% b_label = t("helpers.submit.edit")%> - <%end%> - <%else%> - <% b_label = t("helpers.view")%> - <%end%> - <%= link_to b_label, admin_template_dmptemplate_path(org_template), :class => "dmp_table_link"%> -
- <%end%> -<%end%> ->>>>>>> 5081913e85a4cd405917545a8559aaaba67db1c6 diff --git a/app/views/dmptemplates/admin_phase.html.erb b/app/views/dmptemplates/admin_phase.html.erb index 76f8953..18ee0a2 100644 --- a/app/views/dmptemplates/admin_phase.html.erb +++ b/app/views/dmptemplates/admin_phase.html.erb @@ -1,4 +1,3 @@ -<<<<<<< HEAD <%- model_class = Phase -%> <%= stylesheet_link_tag "admin" %> <% javascript 'admin.js' %> @@ -79,86 +78,3 @@ <%end%> -======= -<%- model_class = Phase -%> -<%= stylesheet_link_tag "admin" %> -<% javascript 'admin.js' %> - -

- <%= @phase.dmptemplate.title %> - -
- <%= link_to t("org_admin.templates.view_all_templates"), - admin_index_dmptemplate_path, - :class => 'btn btn-primary' %> -
-

- -
- - -<%= render :partial => "admin_nav_tabs", locals: {dmptemplate: @phase.dmptemplate, active: @phase.id} %> - - -
-
- - -
-
- - -
- <%= render :partial => "show_phase", locals: {phase: @phase}%> -
- <% if @phase.dmptemplate.org_type != t("helpers.org_type.funder") || current_user.org_type == t("helpers.org_type.funder") then %> - - - - <%= render :partial => "versions_table", locals: {phase: @phase}%> - <%end%> - - - <% if @edit == "false" || (@phase.dmptemplate.org_type == t("helpers.org_type.funder") && current_user.org_type != t("helpers.org_type.funder")) then%> - <%= render :partial => 'show_version', locals: {version: @version}%> - <%elsif @edit == "true" || current_user.org_type == t("helpers.org_type.funder") then %> - <%= render :partial => 'edit_version', locals: {version: @version, edit: @edit, phase: @phase} %> - <%end%> -
-
- - - <% @sections.order("number ASC").each do |section| %> - <%if (@edit == "true" && section.organisation_id == current_user.organisation_id) || - (@phase.dmptemplate.org_type == t("helpers.org_type.funder") && section.organisation_id == current_user.organisation_id && current_user.org_type != t("helpers.org_type.funder"))then%> - <%= render :partial => 'edit_section', locals: {section: section, edit: @edit, phase: @phase, version: @version} %> - <%elsif (section.organisation_id == @phase.dmptemplate.organisation_id ) || ( section.organisation_id == current_user.organisation_id) then%> - <%= render :partial => 'show_section', locals: {section: section}%> - <%end%> - <% end %> - -
-
- - - - <% if !@version.published? || (@phase.dmptemplate.org_type == t("helpers.org_type.funder") && current_user.org_type != t("helpers.org_type.funder"))then %> - - - - - -
-
- <%= link_to t('org_admin.add_section_label'),'#', :id => 'add_section_button', :class =>'btn btn-primary' %> -
-
- <%end%> - - ->>>>>>> 5081913e85a4cd405917545a8559aaaba67db1c6 -<%= tinymce :content_css => asset_path('application.css') %> \ No newline at end of file diff --git a/app/views/dmptemplates/admin_template.html.erb b/app/views/dmptemplates/admin_template.html.erb index 3fe01b9..642fb15 100644 --- a/app/views/dmptemplates/admin_template.html.erb +++ b/app/views/dmptemplates/admin_template.html.erb @@ -1,4 +1,3 @@ -<<<<<<< HEAD <%= stylesheet_link_tag "admin" %> <% javascript 'admin.js' %> @@ -60,66 +59,3 @@
<%= tinymce :content_css => asset_path('application.css') %> -======= -<%= stylesheet_link_tag "admin" %> -<% javascript 'admin.js' %> - -

- <%= @dmptemplate.title %> - -
- <%= link_to t("org_admin.templates.view_all_templates"), - admin_index_dmptemplate_path, - :class => 'btn btn-primary' %> -
-

- -
- - -<%= render :partial => "admin_nav_tabs", locals: {dmptemplate: @dmptemplate, active: "show_template"} %> - - -
-
- <% if @dmptemplate.org_type != t("helpers.org_type.funder") || current_user.org_type == t("helpers.org_type.funder") then %> - - <%end%> -
- <%= render :partial => "show_template", locals: {dmptemplate: @dmptemplate}%> -
-
- - <% if !@dmptemplate.phases.nil? then %> - <% if @dmptemplate.phases.count == 1 then %> - <% @dmptemplate.phases.each do |phase| %> - - <%= render :partial => 'show_phases_sections', locals: {phase: phase}%> - <%end%> - <%else%> - <% @dmptemplate.phases.order(:number).each do |phase| %> -
-
-
- -

<%= phase.title %> -

- -
-
-
- - <%= render :partial => 'show_phases_sections', locals: {phase: phase}%> -
-
-
-
- <%end%> - <%end%> - <%end%> -
- -<%= tinymce :content_css => asset_path('application.css') %> ->>>>>>> 5081913e85a4cd405917545a8559aaaba67db1c6 diff --git a/app/views/layouts/_dmponline_footer.html.erb b/app/views/layouts/_dmponline_footer.html.erb index cb9bef1..0e017bc 100644 --- a/app/views/layouts/_dmponline_footer.html.erb +++ b/app/views/layouts/_dmponline_footer.html.erb @@ -1,4 +1,3 @@ -<<<<<<< HEAD