diff --git a/.gitignore b/.gitignore index 11edcb0..74254e5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,16 +1,18 @@ + # Ignore bundler config /.bundle -# Ignore all logfiles, tempfiles, public assets, +# Ignore all logfiles, tempfiles, public assets, /log/*.log /tmp public/assets/* +public/apidocs/* # Ignore gemfile.lock Gemfile.lock # Ignore db schema.rb -#db/schema.rb +# db/schema.rb # Ignore database configuration and token secrets config/database.yml @@ -26,7 +28,14 @@ config/environments/production.rb config/environments/test.rb +config/initializers/contact_us.rb -# Ignore local licensing and readme information -README.rdoc +# ignore IDE files +.idea/* +# ignore yard doc files +.yardoc/* + +# ignore yard generated documents +/doc/* +!/doc/README_FOR_APP \ No newline at end of file diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..ff8c728 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,15 @@ +language: ruby +rvm: + - 2.1.10 + +services: + - mysql + +before_script: + - cp config/database_example.yml config/database.yml + - cp config/secrets_example.yml config/secrets.yml + - mysql -e 'create database IF NOT EXISTS roadmap_test;' -uroot + +script: + - bundle exec rake db:test:prepare + - bundle exec rake diff --git a/Gemfile b/Gemfile index 14abcde..e8bf467 100644 --- a/Gemfile +++ b/Gemfile @@ -2,17 +2,19 @@ # # RAILS # -gem 'rails', '4.0.0' +gem 'rails', '4.2.0' # additional gems for rails 4 -gem 'railties', '= 4.0.0' +gem 'railties'#, '= 4.2.0' +gem 'responders', '~> 2.0' # allows use of respond_with and respond_to in controllers + # add these gems to help with the transition: gem 'protected_attributes' gem 'rails-observers' gem 'actionpack-page_caching' gem 'actionpack-action_caching' -gem 'uglifier', '>= 1.3.0' +gem 'uglifier' #, '>= 1.3.0' # Gems used only for assets and not required in production environments by default. #group :assets do @@ -20,7 +22,7 @@ #end # Use SCSS for stylesheets gem 'sass-rails' -#gem 'sass' +#gem 'sass' # Use SCSS for stylesheets @@ -39,10 +41,14 @@ #to allow cloning of objects gem 'amoeba' +group :development, :test do + gem "byebug" +end + group :development do - gem 'web-console', '~>2.0' gem "better_errors" gem "binding_of_caller" + gem 'web-console', '~>2.0' end # @@ -62,7 +68,7 @@ # # DATABASE/SERVER # -gem 'mysql2', '~> 0.3.10' +gem 'mysql2', '~> 0.3.18' # Use unicorn as the app server # gem 'unicorn' #cancan for usergroups @@ -73,7 +79,7 @@ # gem 'jquery-rails' gem 'tinymce-rails' -gem 'friendly_id', '~> 5.0.1' +gem 'friendly_id' #, '~> 5.0.1' gem 'contact_us' gem 'recaptcha' gem 'turbolinks' @@ -91,4 +97,33 @@ gem 'caracal' gem 'caracal-rails' +# +# INTERNATIONALIZATION +# +gem "i18n-js", ">= 3.0.0.rc11" #damodar added TODO: explain + +# +# TESTING +# +group :test do + gem 'minitest-rails-capybara' + gem 'minitest-reporters' + gem 'rack-test' +end + +# +# API +# +gem 'swagger-docs' + +# +# CODE DOCUMENTATION +# +gem 'yard' +gem 'redcarpet' + +# +# API +# +gem 'swagger-docs' diff --git a/LICENSE.md b/LICENSE.md index 2898f15..ba4db2c 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2016 University of Edinburgh & The Regents of the University of California +Copyright (c) 2016 University of Edinburgh, University of Glasgow & The Regents of the University of California Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including diff --git a/README.md b/README.md index cebdc9a..67fcb25 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,7 @@ #### Current Release v.0.1.0 +[![Build Status](https://travis-ci.org/DMPRoadmap/roadmap.svg)](https://travis-ci.org/DMPRoadmap/roadmap) #### Summary diff --git a/README.rdoc b/README.rdoc new file mode 100644 index 0000000..9a680a0 --- /dev/null +++ b/README.rdoc @@ -0,0 +1,36 @@ += DMPRoadmap + +Roadmap is a data management planning tool, available at https://github.com/DMPRoadmap/roadmap + +Development of the Roadmap is provided by the Digital Curation Centre and the University of California Curation Center. + +The tool has four main functions +1. To help create and maintain different versions of Data Management Plans; +2. To provide useful guidance on data management issues and how to meet research funders' requirements; +3. To export attractive and useful plans in a variety of formats; +4. To allow collaborative work when creating Data Management Plans. + +== Documentation & Support + +* You can contact us by email, roadmap-l@listserv.ucop.edu, but we can only provide limited support for your installation + +== Bugs & Feature Requests + +* Bug Reports & Feature Requests: https://github.com/DMPRoadmap/roadmap/issues +* Please prefix your request with either: 'Bug:' or 'Feature:' + +== Prerequisites + +Roadmap is a Ruby on Rails application and you will need to have Ruby 2.0.0p247 or greater installed on your server and a MySQL server v5.0 or greater. + +Further details on how to install Ruby on Rails applications are available from the Ruby on Rails site, http://rubyonrails.org + +You may also find the following resources handy: + +* The Getting Started Guide: http://guides.rubyonrails.org/getting_started.html +* Ruby on Rails Tutorial Book: http://www.railstutorial.org/ + + +== Copyright + +The Roadmap project uses an MIT License. The full text of the license can be found at: https://github.com/DMPRoadmap/roadmap/blob/master/LICENSE.md diff --git a/Rakefile b/Rakefile old mode 100644 new mode 100755 index 04c8372..0d74091 --- a/Rakefile +++ b/Rakefile @@ -1,11 +1,13 @@ #!/usr/bin/env rake # Add your own tasks in files placed in lib/tasks ending in .rake, # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. - +require 'rake/testtask' require File.expand_path('../config/application', __FILE__) DMPonline4::Application.load_tasks +# TODO: destroy rdoc rake task once finished with new documentation + RDoc::Task.new :rdoc do |rdoc| rdoc.main = "README.rdoc" @@ -14,4 +16,6 @@ rdoc.title = "DMPonline4 Documentation" rdoc.options << "--all" -end \ No newline at end of file +end + +task default: :test diff --git a/app/admin/dmptemplate.rb b/app/admin/dmptemplate.rb index e3f39b0..c172563 100644 --- a/app/admin/dmptemplate.rb +++ b/app/admin/dmptemplate.rb @@ -30,7 +30,7 @@ end if settings.save - redirect_to(action: :show, flash: { notice: 'Settings updated successfully' }) + redirect_to(action: :show, flash: { notice: I18n.t('admin.settings_updated') }) else settings.formatting = nil @template = resource @@ -39,7 +39,8 @@ end end - action_item only: %i( show edit ) do + #action_item only: %i( show edit ) do + action_item(:edit) do link_to(I18n.t('helpers.settings.title'), settings_admin_dmptemplate_path(resource.id)) end diff --git a/app/admin/guidance.rb b/app/admin/guidance.rb index fbcc315..753fd07 100644 --- a/app/admin/guidance.rb +++ b/app/admin/guidance.rb @@ -61,12 +61,12 @@ end f.inputs "Themes" do - f.input :theme_ids, :label => "Selected themes", + f.input :theme_ids, :label => I18n.t('admin.selected_themes'), :as => :select, - :include_blank => "All themes", + :include_blank => I18n.t('admin.all_themes'), :multiple => true, :collection => Theme.order('title').map{|the| [the.title, the.id]}, - :hint => 'Choose all themes that apply.' + :hint => I18n.t('admin.choose_themes') end f.actions diff --git a/app/admin/guidance_group.rb b/app/admin/guidance_group.rb index 839be8a..5a54831 100644 --- a/app/admin/guidance_group.rb +++ b/app/admin/guidance_group.rb @@ -62,12 +62,12 @@ end f.inputs "Templates" do - f.input :dmptemplate_ids, :label => "Selected templates", + f.input :dmptemplate_ids, :label => I18n.t('admin.selected_templates'), :as => :select, - :include_blank => "All Templates", + :include_blank => I18n.t('admin.all_templates'), :multiple => true, :collection => Dmptemplate.order('title').map{|the| [the.title, the.id]}, - :hint => 'Choose all templates that apply.' + :hint => I18n.t('admin.choose_templates') end f.actions end diff --git a/app/admin/org_token_permission.rb b/app/admin/org_token_permission.rb new file mode 100644 index 0000000..e335d7f --- /dev/null +++ b/app/admin/org_token_permission.rb @@ -0,0 +1,31 @@ +ActiveAdmin.register OrgTokenPermission do + permit_params :organisation_id, :token_permission_type_id + + menu priority: 40, label: proc{ I18n.t('admin.org_token_permission')}, parent: "Api" + + index do + column I18n.t('admin.org') do |n| + link_to n.organisation, [:admin,n] + end + column I18n.t('admin.token_permission') do |n| + link_to n.token_permission_type, [:admin,n] + end + + actions + end + + show do + attributes_table do + row :organisation_id + row :token_permission_type_id + end + end + + controller do + def permitted_params + params.permit! + end + end + + +end diff --git a/app/admin/organisation.rb b/app/admin/organisation.rb index 8b4afbc..2c88380 100644 --- a/app/admin/organisation.rb +++ b/app/admin/organisation.rb @@ -1,15 +1,15 @@ # [+Project:+] DMPonline -# [+Description:+] -# +# [+Description:+] +# # [+Created:+] 03/09/2014 -# [+Copyright:+] Digital Curation Centre +# [+Copyright:+] Digital Curation Centre ActiveAdmin.register Organisation do permit_params :abbreviation, :banner_file_id, :description, :domain, :logo_file_id, :name, :stylesheet_file_id, :target_url, :organisation_type_id, :wayfless_entity, :parent_id - + menu :priority => 14, :label => proc{I18n.t('admin.org')}, :parent => "Organisations management" - index do + index do column I18n.t('admin.org_title'), :sortable => :name do |ggn| link_to ggn.name, [:admin, ggn] end @@ -23,15 +23,16 @@ column I18n.t('admin.org_type'), :sortable => :organisation_type_id do |org_type| if !org_type.organisation_type_id.nil? then link_to org_type.organisation_type.name, [:admin, org_type] - end + end end - + actions end - - + + #show details of an organisation - show do + show do + resource.check_api_credentials attributes_table do row I18n.t('admin.org_title'), :sortable => :name do |gn| if !gn.name.nil? then @@ -45,12 +46,12 @@ '-' end end - row :sort_name + row :sort_name row I18n.t('admin.org_type'), :organisation_type_id do |org_type| if !org_type.organisation_type_id.nil? then link_to org_type.organisation_type.name, [:admin, org_type] - end - end + end + end row :description do |descr| if !descr.description.nil? then descr.description.html_safe @@ -65,18 +66,21 @@ row :logo_file_name row :domain row :wayfless_entity + row I18n.t('admin.token_permission_type') do + (organisation.token_permission_types.map{|tpt| link_to tpt.token_type, [:admin, tpt]}).join(', ').html_safe + end # row I18n.t('admin.org_parent'), :parent_id do |org_parent| # if !org_parent.parent_id.nil? then # parent_org = Organisation.find(org_parent.parent_id) # link_to parent_org.name, [:admin, parent_org] - # end + # end # end # row :stylesheet_file_id row :created_at row :updated_at end - end - + end + #templates sidebar sidebar I18n.t('admin.templates'), :only => :show, :if => proc { organisation.dmptemplates.count >= 1} do table_for organisation.dmptemplates.order("title asc") do |temp| @@ -87,7 +91,7 @@ end end - #form + #form form do |f| f.inputs "Details" do f.input :name @@ -100,18 +104,22 @@ f.input :logo_file_name f.input :domain f.input :wayfless_entity + f.input :token_permission_types, label: I18n.t('admin.token_permission_type'), + as: :select, multiple: true, include_blank: I18n.t('helpers.none'), + collection: TokenPermissionType.order(:token_type).map{|token| [token.token_type, token.id]}, + hint: I18n.t('admin.choose_api_permissions') # f.input :parent_id, :label => I18n.t('admin.org_parent'), :as => :select, :collection => Organisation.find(:all, :order => 'name ASC').map{|orgp|[orgp.name, orgp.id]} # f.input :stylesheet_file_id end - f.actions - end + f.actions + end controller do def permitted_params params.permit! end - end - - + end + + end diff --git a/app/admin/question.rb b/app/admin/question.rb index 6d70ccd..f301e60 100644 --- a/app/admin/question.rb +++ b/app/admin/question.rb @@ -106,17 +106,17 @@ end f.inputs "Question Format" do - f.input :question_format_id, :label => "Select question format", + f.input :question_format_id, :label => I18n.t('admin.select_question_format'), :as => :select, - :collection => QuestionFormat.order('title').map{|format| [format.title, format.id]} + :collection => QuestionFormat.order('title').map{|format| [format.title, format.id]} end f.inputs "Themes" do - f.input :theme_ids, :label => "Selected themes", + f.input :theme_ids, :label => I18n.t('admin.selected_themes'), :as => :select, :multiple => true, - :include_blank => "None", + :include_blank => I18n.t('helpers.none'), :collection => Theme.order('title').map{|the| [the.title, the.id]} , - :hint => 'Choose all themes that apply.' + :hint => I18n.t('admin.choose_themes') end f.actions diff --git a/app/admin/theme.rb b/app/admin/theme.rb index de9b562..5122921 100644 --- a/app/admin/theme.rb +++ b/app/admin/theme.rb @@ -41,16 +41,16 @@ if !question.section.version.phase.dmptemplate.nil? then link_to question.section.version.phase.dmptemplate.title, [:admin, question.section.version.phase.dmptemplate] else - 'No template' + I18n.t('admin.no_template') end else - 'No phase' + I18n.t('admin.no_phase') end else - 'No version' + I18n.t('admin.no_version') end else - 'No section' + I18n.t('admin.no_section') end } end diff --git a/app/admin/token_permission_type.rb b/app/admin/token_permission_type.rb new file mode 100644 index 0000000..de4aa2d --- /dev/null +++ b/app/admin/token_permission_type.rb @@ -0,0 +1,33 @@ +ActiveAdmin.register TokenPermissionType do + permit_params :token_type, :text_desription + + menu priority: 40, label: proc{ I18n.t('admin.token_permission_type')}, parent: "Api" + + # TODO: Find better fix for the undefined method xxx_id_eq + remove_filter :org_token_permissions + + index do + column I18n.t('admin.token_permission_type'), sortable: :token_type do |n| + link_to n.token_type, [:admin, n] + end + column I18n.t('admin.permission_description') do |n| + link_to n.text_desription, [:admin, n] + end + + actions + end + + show do + attributes_table do + row :token_type + row :text_desription + end + end + + controller do + def permitted_params + params.permit! + end + end + +end diff --git a/app/admin/user.rb b/app/admin/user.rb index 8fd09cf..450472f 100644 --- a/app/admin/user.rb +++ b/app/admin/user.rb @@ -1,25 +1,25 @@ # [+Project:+] DMPonline -# [+Description:+] -# +# [+Description:+] +# # [+Created:+] 03/09/2014 -# [+Copyright:+] Digital Curation Centre +# [+Copyright:+] Digital Curation Centre -ActiveAdmin.register User do - permit_params :password_confirmation, :encrypted_password, :remember_me, :id, :email, :firstname, :orcid_id, :shibboleth_id, :user_status_id, :surname, :user_type_id, :organisation_id, :skip_invitation, :other_organisation, :accept_terms, :role_ids - +ActiveAdmin.register User do + permit_params :api_token, :password_confirmation, :encrypted_password, :remember_me, :id, :email, :firstname, :orcid_id, :shibboleth_id, :user_status_id, :surname, :user_type_id, :organisation_id, :skip_invitation, :other_organisation, :accept_terms, :role_ids + menu :priority => 15, :label => proc{ I18n.t('admin.user')}, :parent => "User management" - + filter :firstname filter :surname filter :email filter :organisations - filter :other_organisation + filter :other_organisation filter :created_at filter :updated_at - - - - index do + + + + index do column I18n.t('admin.user_name'), :sortable => :email do |user_email| link_to user_email.email, [:admin, user_email] @@ -30,21 +30,21 @@ column I18n.t('admin.surname'), :sortable => :surname do |user| link_to user.surname, [:admin, user] end - column I18n.t('admin.last_logged_in'), :last_sign_in_at + column I18n.t('admin.last_logged_in'), :last_sign_in_at column I18n.t('admin.org_title'), :sortable => 'organisations.name' do |org_title| if !org_title.organisation.nil? then if org_title.other_organisation.nil? || org_title.other_organisation == "" then link_to org_title.organisation.name, [:admin, org_title.organisation] else I18n.t('helpers.org_type.org_name') + ' - ' + org_title.other_organisation - - end + + end end end - + actions end - + show do attributes_table do row :firstname @@ -53,72 +53,75 @@ row :orcid_id row I18n.t('admin.org_title'), :organisation_id do |org_title| if !org_title.organisation_id.nil? then - link_to org_title.organisation.name, [:admin, org_title.organisation] - end + link_to org_title.organisation.name, [:admin, org_title.organisation] + end end - row :other_organisation + row :other_organisation # row I18n.t('admin.user_status'), :user_status_id do |us| # if !us.user_status.nil? then # link_to us.user_status.name, [:admin, us.user_status] - # end + # end # end # row I18n.t('admin.user_type'), :user_type_id do |ut| # if !ut.user_type.nil? then # link_to ut.user_type.name, [:admin, ut.user_type] # else # '-' - # end + # end # end - row I18n.t('admin.user_role') do + row I18n.t('admin.user_role') do (user.roles.map{|ro| link_to ro.name, [:admin, ro]}).join(', ').html_safe end # row :shibboleth_id row :last_sign_in_at - row :sign_in_count + row :sign_in_count + row :api_token end end - - + + form do |f| f.inputs "Details" do f.input :firstname f.input :surname f.input :email f.input :orcid_id + f.input :api_token # f.input :shibboleth_id - f.input :organisation_id ,:label => I18n.t('admin.org_title'), - :as => :select, + f.input :organisation_id ,:label => I18n.t('admin.org_title'), + :as => :select, :collection => Organisation.order('name').map{|orgp|[orgp.name, orgp.id]} - f.input :other_organisation - # f.input :user_status_id, :label => I18n.t('admin.user_status'), - # :as => :select, + f.input :other_organisation + # f.input :user_status_id, :label => I18n.t('admin.user_status'), + # :as => :select, # :collection => UserStatus.find(:all, :order => 'name ASC').map{|us|[us.name, us.id]} - # f.input :user_type_id, :label => I18n.t('admin.user_type'), - # :as => :select, - # :collection => UserType.find(:all, :order => 'name ASC').map{|ut|[ut.name, ut.id]} - f.input :role_ids, :label => "User role", - :as => :select, + # f.input :user_type_id, :label => I18n.t('admin.user_type'), + # :as => :select, + # :collection => UserType.find(:all, :order => 'name ASC').map{|ut|[ut.name, ut.id]} + f.input :role_ids, :label => I18n.t('admin.user_role'), + :as => :select, :multiple => true, - :include_blank => 'None', + :include_blank => I18n.t('helpers.none'), :collection => Role.order('name').map{|ro| [ro.name, ro.id]} - + + f.input :api_token end - - f.actions + + f.actions end - - - + + + controller do def scoped_collection resource_class.includes(:organisations) # prevents N+1 queries to your database end - + def permitted_params params.permit! end - + end - + end diff --git a/app/assets/images/bournemouth_logo.png b/app/assets/images/bournemouth_logo.png new file mode 100644 index 0000000..3a4ecc2 --- /dev/null +++ b/app/assets/images/bournemouth_logo.png Binary files differ diff --git a/app/assets/images/salford_logo.png b/app/assets/images/salford_logo.png new file mode 100644 index 0000000..e58c553 --- /dev/null +++ b/app/assets/images/salford_logo.png Binary files differ diff --git a/app/assets/javascripts/admin.js b/app/assets/javascripts/admin.js index 51ff7d2..0b5dcdd 100644 --- a/app/assets/javascripts/admin.js +++ b/app/assets/javascripts/admin.js @@ -179,20 +179,24 @@ //action for show or hide template editing display - $('#edit_template_button').click(function(){ + $('#edit_template_button').click(function(e){ + e.preventDefault(); + $('#edit_template_div').show(); $('#show_template_div').hide(); }); //action for show or hide phase display - $('#edit_phase_button').click(function(){ + $('#edit_phase_button').click(function(e){ + e.preventDefault(); $('#edit_phase_div').show(); $('#show_phase_div').hide(); }); //action to hide the alert to edit a version - $("#edit-version-confirmed").click(function (){ + $("#edit-version-confirmed").click(function (e){ + e.preventDefault(); $("#version_edit_alert").modal("hide"); }); @@ -230,7 +234,7 @@ $('.new_question_save_button').click(function(e){ var s_id = $(this).prev(".section_id").val(); if ($('#new_question_text_'+ s_id).val() == ''){ - alert('Question text is empty, please enter your question.'); + alert(I18n.t("js.question_text_empty")); return false; } }); @@ -323,24 +327,24 @@ //verify if text area is not nil var editorContent = tinyMCE.get('guidance-text').getContent(); if (editorContent == ''){ - alert_message.push("add guidance text"); + alert_message.push(I18n.t("js.add_guidance_text")); } //verify dropdown with questions has a selected option if guidance for a question being used if ($('#g_options').val() == '2') { if ($('#questions_select').val() == '' || isNaN($('#questions_select').val())){ - alert_message.push("select a question"); + alert_message.push(I18n.t("js.select_question")); } } //verify dropdown with questions has a selected option if guidance for a question being used if ($('#g_options').val() == '1' ){ if($('#guidance_theme_ids').val() == undefined || $('#guidance_theme_ids').val() == ''){ - alert_message.push("select at least one theme"); + alert_message.push(I18n.t("js.select_at_least_one_theme")); } } //verify if guidance group is selected if ( ($('#guidance_guidance_group_ids').val() == '') || $('#guidance_guidance_group_ids').val() == undefined ) { - alert_message.push("select a guidance group"); + alert_message.push(I18n.t("js.select_guidance_group")); } if(alert_message.length == 0){ //clear dropdowns before submission @@ -385,23 +389,23 @@ //verify if text area is not nil var editorContent = tinyMCE.get('guidance-text').getContent(); if (editorContent == ''){ - alert_message.push("add guidance text"); + alert_message.push(I18n.t("js.add_guidance_text")); } //verify dropdown with questions has a selected option if guidance for a question being used if ($('#g_options').val() == '2') { if ($('#questions_select').val() == '' || isNaN($('#questions_select').val())){ - alert_message.push("select a question"); + alert_message.push(I18n.t("js.select_question")); } } //verify dropdown with questions has a selected option if guidance for a question being used if ($('#g_options').val() == '1' ){ if($('#guidance_theme_ids').val() == undefined || $('#guidance_theme_ids').val() == ''){ - alert_message.push("select at least one theme"); + alert_message.push(I18n.t("js.select_at_least_one_theme")); } } //verify if guidance group is selected if ( ($('#guidance_guidance_group_ids').val() == '') || $('#guidance_guidance_group_ids').val() == undefined ) { - alert_message.push("select a guidance group"); + alert_message.push(I18n.t("js.select_guidance_group")); } if(alert_message.length == 0){ @@ -432,12 +436,10 @@ //Validate banner_text area for less than 165 character $("form#edit_org_details").submit(function(){ - if (getStats('org_banner_text').chars > 165) { - alert("Please only enter up to 165 characters, you have used "+getStats('org_banner_text').chars+". If you are entering an URL try to use something like http://tinyurl.com/ to make it smaller."); + alert(I18n.t("js.enter_up_to") + " " + getStats('org_banner_text').chars + ". " + I18n.t("js.if_using_url_try")); return false; } - }); @@ -452,18 +454,15 @@ $(link).closest(".options_content").hide(); } - - function add_object(link, association, content) { var new_id = new Date().getTime(); - var regexp = new RegExp("new_" + association, "g") + var regexp = new RegExp("new_" + association, "g"); if (association == 'options') { $(link).parent().children('.options_table').children('.options_tbody').children('.new_option_before').before(content.replace(regexp, new_id)); } } - // Returns text statistics for the specified editor by id function getStats(id) { var body = tinymce.get(id).getBody(), text = tinymce.trim(body.innerText || body.textContent); diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 9761535..0a76459 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -13,12 +13,12 @@ //= require jquery //= require jquery_ujs //= require twitter/bootstrap -//= require bootstrap //= require v1.js //= require select2.min.js //= require jquery.placeholder.js -//= require turbolinks - +//= require tinymce-jquery +//= require i18n +//= require i18n/translations $( document ).ready(function() { @@ -57,11 +57,13 @@ $(".help").popover(); $('.has-tooltip').tooltip({ - placement: "right", - trigger: "focus" + placement: "right", + trigger: "focus" }); - $(".show-edit-toggle").click(function () { + $(".show-edit-toggle").click(function (e) { + e.preventDefault(); + $(".edit-project").toggle(); $(".view-project").toggle(); }); @@ -135,6 +137,43 @@ }); + //Question Options + // ------------------------------------------------------------------------------------ + $(".options_table").on("click", ".remove-option", function(e){ + e.preventDefault(); + + // Mark the option for removal + $($(this).siblings()[0]).val(true); + + // Hide the entire table row and the associated hidden field for the item + $(this).parent().parent().addClass('hidden'); + }); + + $(".add-option").click(function(e){ + e.preventDefault(); + + var tbl = $(this).parent().find("table.options_table > tbody.options_tbody"), + last = tbl.find("tr:last"), + clone = last.clone(); + nbr = parseInt(last.find(".number_field").val()); + + // Update the input field names and ids + clone.find("input").each(function(index){ + $(this).prop("id", $(this).prop("id").replace(/_\d+_/g, "_" + nbr + "_")); + $(this).prop("name", $(this).prop("name").replace(/\[\d+\]/g, "[" + nbr + "]")); + }); + + // Remove the hidden class and make sure the new row is not marked for removal + clone.removeClass('hidden'); + clone.find("[id$=" + nbr + "__destroy]").val(false); + + // Default the other values + clone.find("[id$=" + nbr + "_number]").val("" + (nbr + 1)); + clone.find("[id$=" + nbr + "_text]").val(""); + clone.find("[id$=" + nbr + "_is_default]").prop("checked", false); + + last.after(clone); + }); /*$('#continue-to-new').click(function(e){ var destination = $(this).attr("href"); diff --git a/app/assets/javascripts/bootstrap.js b/app/assets/javascripts/bootstrap.js deleted file mode 100644 index 643e71c..0000000 --- a/app/assets/javascripts/bootstrap.js +++ /dev/null @@ -1,2280 +0,0 @@ -/* =================================================== - * bootstrap-transition.js v2.3.2 - * http://twitter.github.com/bootstrap/javascript.html#transitions - * =================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ========================================================== */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* CSS TRANSITION SUPPORT (http://www.modernizr.com/) - * ======================================================= */ - - $(function () { - - $.support.transition = (function () { - - var transitionEnd = (function () { - - var el = document.createElement('bootstrap') - , transEndEventNames = { - 'WebkitTransition' : 'webkitTransitionEnd' - , 'MozTransition' : 'transitionend' - , 'OTransition' : 'oTransitionEnd otransitionend' - , 'transition' : 'transitionend' - } - , name - - for (name in transEndEventNames){ - if (el.style[name] !== undefined) { - return transEndEventNames[name] - } - } - - }()) - - return transitionEnd && { - end: transitionEnd - } - - })() - - }) - -}(window.jQuery);/* ========================================================== - * bootstrap-alert.js v2.3.2 - * http://twitter.github.com/bootstrap/javascript.html#alerts - * ========================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ========================================================== */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* ALERT CLASS DEFINITION - * ====================== */ - - var dismiss = '[data-dismiss="alert"]' - , Alert = function (el) { - $(el).on('click', dismiss, this.close) - } - - Alert.prototype.close = function (e) { - var $this = $(this) - , selector = $this.attr('data-target') - , $parent - - if (!selector) { - selector = $this.attr('href') - selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 - } - - $parent = $(selector) - - e && e.preventDefault() - - $parent.length || ($parent = $this.hasClass('alert') ? $this : $this.parent()) - - $parent.trigger(e = $.Event('close')) - - if (e.isDefaultPrevented()) return - - $parent.removeClass('in') - - function removeElement() { - $parent - .trigger('closed') - .remove() - } - - $.support.transition && $parent.hasClass('fade') ? - $parent.on($.support.transition.end, removeElement) : - removeElement() - } - - - /* ALERT PLUGIN DEFINITION - * ======================= */ - - var old = $.fn.alert - - $.fn.alert = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('alert') - if (!data) $this.data('alert', (data = new Alert(this))) - if (typeof option == 'string') data[option].call($this) - }) - } - - $.fn.alert.Constructor = Alert - - - /* ALERT NO CONFLICT - * ================= */ - - $.fn.alert.noConflict = function () { - $.fn.alert = old - return this - } - - - /* ALERT DATA-API - * ============== */ - - $(document).on('click.alert.data-api', dismiss, Alert.prototype.close) - -}(window.jQuery);/* ============================================================ - * bootstrap-button.js v2.3.2 - * http://twitter.github.com/bootstrap/javascript.html#buttons - * ============================================================ - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============================================================ */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* BUTTON PUBLIC CLASS DEFINITION - * ============================== */ - - var Button = function (element, options) { - this.$element = $(element) - this.options = $.extend({}, $.fn.button.defaults, options) - } - - Button.prototype.setState = function (state) { - var d = 'disabled' - , $el = this.$element - , data = $el.data() - , val = $el.is('input') ? 'val' : 'html' - - state = state + 'Text' - data.resetText || $el.data('resetText', $el[val]()) - - $el[val](data[state] || this.options[state]) - - // push to event loop to allow forms to submit - setTimeout(function () { - state == 'loadingText' ? - $el.addClass(d).attr(d, d) : - $el.removeClass(d).removeAttr(d) - }, 0) - } - - Button.prototype.toggle = function () { - var $parent = this.$element.closest('[data-toggle="buttons-radio"]') - - $parent && $parent - .find('.active') - .removeClass('active') - - this.$element.toggleClass('active') - } - - - /* BUTTON PLUGIN DEFINITION - * ======================== */ - - var old = $.fn.button - - $.fn.button = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('button') - , options = typeof option == 'object' && option - if (!data) $this.data('button', (data = new Button(this, options))) - if (option == 'toggle') data.toggle() - else if (option) data.setState(option) - }) - } - - $.fn.button.defaults = { - loadingText: 'loading...' - } - - $.fn.button.Constructor = Button - - - /* BUTTON NO CONFLICT - * ================== */ - - $.fn.button.noConflict = function () { - $.fn.button = old - return this - } - - - /* BUTTON DATA-API - * =============== */ - - $(document).on('click.button.data-api', '[data-toggle^=button]', function (e) { - var $btn = $(e.target) - if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn') - $btn.button('toggle') - }) - -}(window.jQuery);/* ========================================================== - * bootstrap-carousel.js v2.3.2 - * http://twitter.github.com/bootstrap/javascript.html#carousel - * ========================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ========================================================== */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* CAROUSEL CLASS DEFINITION - * ========================= */ - - var Carousel = function (element, options) { - this.$element = $(element) - this.$indicators = this.$element.find('.carousel-indicators') - this.options = options - this.options.pause == 'hover' && this.$element - .on('mouseenter', $.proxy(this.pause, this)) - .on('mouseleave', $.proxy(this.cycle, this)) - } - - Carousel.prototype = { - - cycle: function (e) { - if (!e) this.paused = false - if (this.interval) clearInterval(this.interval); - this.options.interval - && !this.paused - && (this.interval = setInterval($.proxy(this.next, this), this.options.interval)) - return this - } - - , getActiveIndex: function () { - this.$active = this.$element.find('.item.active') - this.$items = this.$active.parent().children() - return this.$items.index(this.$active) - } - - , to: function (pos) { - var activeIndex = this.getActiveIndex() - , that = this - - if (pos > (this.$items.length - 1) || pos < 0) return - - if (this.sliding) { - return this.$element.one('slid', function () { - that.to(pos) - }) - } - - if (activeIndex == pos) { - return this.pause().cycle() - } - - return this.slide(pos > activeIndex ? 'next' : 'prev', $(this.$items[pos])) - } - - , pause: function (e) { - if (!e) this.paused = true - if (this.$element.find('.next, .prev').length && $.support.transition.end) { - this.$element.trigger($.support.transition.end) - this.cycle(true) - } - clearInterval(this.interval) - this.interval = null - return this - } - - , next: function () { - if (this.sliding) return - return this.slide('next') - } - - , prev: function () { - if (this.sliding) return - return this.slide('prev') - } - - , slide: function (type, next) { - var $active = this.$element.find('.item.active') - , $next = next || $active[type]() - , isCycling = this.interval - , direction = type == 'next' ? 'left' : 'right' - , fallback = type == 'next' ? 'first' : 'last' - , that = this - , e - - this.sliding = true - - isCycling && this.pause() - - $next = $next.length ? $next : this.$element.find('.item')[fallback]() - - e = $.Event('slide', { - relatedTarget: $next[0] - , direction: direction - }) - - if ($next.hasClass('active')) return - - if (this.$indicators.length) { - this.$indicators.find('.active').removeClass('active') - this.$element.one('slid', function () { - var $nextIndicator = $(that.$indicators.children()[that.getActiveIndex()]) - $nextIndicator && $nextIndicator.addClass('active') - }) - } - - if ($.support.transition && this.$element.hasClass('slide')) { - this.$element.trigger(e) - if (e.isDefaultPrevented()) return - $next.addClass(type) - $next[0].offsetWidth // force reflow - $active.addClass(direction) - $next.addClass(direction) - this.$element.one($.support.transition.end, function () { - $next.removeClass([type, direction].join(' ')).addClass('active') - $active.removeClass(['active', direction].join(' ')) - that.sliding = false - setTimeout(function () { that.$element.trigger('slid') }, 0) - }) - } else { - this.$element.trigger(e) - if (e.isDefaultPrevented()) return - $active.removeClass('active') - $next.addClass('active') - this.sliding = false - this.$element.trigger('slid') - } - - isCycling && this.cycle() - - return this - } - - } - - - /* CAROUSEL PLUGIN DEFINITION - * ========================== */ - - var old = $.fn.carousel - - $.fn.carousel = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('carousel') - , options = $.extend({}, $.fn.carousel.defaults, typeof option == 'object' && option) - , action = typeof option == 'string' ? option : options.slide - if (!data) $this.data('carousel', (data = new Carousel(this, options))) - if (typeof option == 'number') data.to(option) - else if (action) data[action]() - else if (options.interval) data.pause().cycle() - }) - } - - $.fn.carousel.defaults = { - interval: 5000 - , pause: 'hover' - } - - $.fn.carousel.Constructor = Carousel - - - /* CAROUSEL NO CONFLICT - * ==================== */ - - $.fn.carousel.noConflict = function () { - $.fn.carousel = old - return this - } - - /* CAROUSEL DATA-API - * ================= */ - - $(document).on('click.carousel.data-api', '[data-slide], [data-slide-to]', function (e) { - var $this = $(this), href - , $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 - , options = $.extend({}, $target.data(), $this.data()) - , slideIndex - - $target.carousel(options) - - if (slideIndex = $this.attr('data-slide-to')) { - $target.data('carousel').pause().to(slideIndex).cycle() - } - - e.preventDefault() - }) - -}(window.jQuery);/* ============================================================= - * bootstrap-collapse.js v2.3.2 - * http://twitter.github.com/bootstrap/javascript.html#collapse - * ============================================================= - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============================================================ */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* COLLAPSE PUBLIC CLASS DEFINITION - * ================================ */ - - var Collapse = function (element, options) { - this.$element = $(element) - this.options = $.extend({}, $.fn.collapse.defaults, options) - - if (this.options.parent) { - this.$parent = $(this.options.parent) - } - - this.options.toggle && this.toggle() - } - - Collapse.prototype = { - - constructor: Collapse - - , dimension: function () { - var hasWidth = this.$element.hasClass('width') - return hasWidth ? 'width' : 'height' - } - - , show: function () { - var dimension - , scroll - , actives - , hasData - - if (this.transitioning || this.$element.hasClass('in')) return - - dimension = this.dimension() - scroll = $.camelCase(['scroll', dimension].join('-')) - actives = this.$parent && this.$parent.find('> .accordion-group > .in') - - if (actives && actives.length) { - hasData = actives.data('collapse') - if (hasData && hasData.transitioning) return - actives.collapse('hide') - hasData || actives.data('collapse', null) - } - - this.$element[dimension](0) - this.transition('addClass', $.Event('show'), 'shown') - $.support.transition && this.$element[dimension](this.$element[0][scroll]) - } - - , hide: function () { - var dimension - if (this.transitioning || !this.$element.hasClass('in')) return - dimension = this.dimension() - this.reset(this.$element[dimension]()) - this.transition('removeClass', $.Event('hide'), 'hidden') - this.$element[dimension](0) - } - - , reset: function (size) { - var dimension = this.dimension() - - this.$element - .removeClass('collapse') - [dimension](size || 'auto') - [0].offsetWidth - - this.$element[size !== null ? 'addClass' : 'removeClass']('collapse') - - return this - } - - , transition: function (method, startEvent, completeEvent) { - var that = this - , complete = function () { - if (startEvent.type == 'show') that.reset() - that.transitioning = 0 - that.$element.trigger(completeEvent) - } - - this.$element.trigger(startEvent) - - if (startEvent.isDefaultPrevented()) return - - this.transitioning = 1 - - this.$element[method]('in') - - $.support.transition && this.$element.hasClass('collapse') ? - this.$element.one($.support.transition.end, complete) : - complete() - } - - , toggle: function () { - this[this.$element.hasClass('in') ? 'hide' : 'show']() - } - - } - - - /* COLLAPSE PLUGIN DEFINITION - * ========================== */ - - var old = $.fn.collapse - - $.fn.collapse = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('collapse') - , options = $.extend({}, $.fn.collapse.defaults, $this.data(), typeof option == 'object' && option) - if (!data) $this.data('collapse', (data = new Collapse(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.collapse.defaults = { - toggle: true - } - - $.fn.collapse.Constructor = Collapse - - - /* COLLAPSE NO CONFLICT - * ==================== */ - - $.fn.collapse.noConflict = function () { - $.fn.collapse = old - return this - } - - - /* COLLAPSE DATA-API - * ================= */ - - $(document).on('click.collapse.data-api', '[data-toggle=collapse]', function (e) { - var $this = $(this), href - , target = $this.attr('data-target') - || e.preventDefault() - || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7 - , option = $(target).data('collapse') ? 'toggle' : $this.data() - $this[$(target).hasClass('in') ? 'addClass' : 'removeClass']('collapsed') - $(target).collapse(option) - }) - -}(window.jQuery);/* ============================================================ - * bootstrap-dropdown.js v2.3.2 - * http://twitter.github.com/bootstrap/javascript.html#dropdowns - * ============================================================ - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============================================================ */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* DROPDOWN CLASS DEFINITION - * ========================= */ - - var toggle = '[data-toggle=dropdown]' - , Dropdown = function (element) { - var $el = $(element).on('click.dropdown.data-api', this.toggle) - $('html').on('click.dropdown.data-api', function () { - $el.parent().removeClass('open') - }) - } - - Dropdown.prototype = { - - constructor: Dropdown - - , toggle: function (e) { - var $this = $(this) - , $parent - , isActive - - if ($this.is('.disabled, :disabled')) return - - $parent = getParent($this) - - isActive = $parent.hasClass('open') - - clearMenus() - - if (!isActive) { - if ('ontouchstart' in document.documentElement) { - // if mobile we we use a backdrop because click events don't delegate - $('
').insertBefore($(this)).on('click', clearMenus) - } - $parent.toggleClass('open') - } - - $this.focus() - - return false - } - - , keydown: function (e) { - var $this - , $items - , $active - , $parent - , isActive - , index - - if (!/(38|40|27)/.test(e.keyCode)) return - - $this = $(this) - - e.preventDefault() - e.stopPropagation() - - if ($this.is('.disabled, :disabled')) return - - $parent = getParent($this) - - isActive = $parent.hasClass('open') - - if (!isActive || (isActive && e.keyCode == 27)) { - if (e.which == 27) $parent.find(toggle).focus() - return $this.click() - } - - $items = $('[role=menu] li:not(.divider):visible a', $parent) - - if (!$items.length) return - - index = $items.index($items.filter(':focus')) - - if (e.keyCode == 38 && index > 0) index-- // up - if (e.keyCode == 40 && index < $items.length - 1) index++ // down - if (!~index) index = 0 - - $items - .eq(index) - .focus() - } - - } - - function clearMenus() { - $('.dropdown-backdrop').remove() - $(toggle).each(function () { - getParent($(this)).removeClass('open') - }) - } - - function getParent($this) { - var selector = $this.attr('data-target') - , $parent - - if (!selector) { - selector = $this.attr('href') - selector = selector && /#/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 - } - - $parent = selector && $(selector) - - if (!$parent || !$parent.length) $parent = $this.parent() - - return $parent - } - - - /* DROPDOWN PLUGIN DEFINITION - * ========================== */ - - var old = $.fn.dropdown - - $.fn.dropdown = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('dropdown') - if (!data) $this.data('dropdown', (data = new Dropdown(this))) - if (typeof option == 'string') data[option].call($this) - }) - } - - $.fn.dropdown.Constructor = Dropdown - - - /* DROPDOWN NO CONFLICT - * ==================== */ - - $.fn.dropdown.noConflict = function () { - $.fn.dropdown = old - return this - } - - - /* APPLY TO STANDARD DROPDOWN ELEMENTS - * =================================== */ - - $(document) - .on('click.dropdown.data-api', clearMenus) - .on('click.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() }) - .on('click.dropdown.data-api' , toggle, Dropdown.prototype.toggle) - .on('keydown.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown) - -}(window.jQuery); -/* ========================================================= - * bootstrap-modal.js v2.3.2 - * http://twitter.github.com/bootstrap/javascript.html#modals - * ========================================================= - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ========================================================= */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* MODAL CLASS DEFINITION - * ====================== */ - - var Modal = function (element, options) { - this.options = options - this.$element = $(element) - .delegate('[data-dismiss="modal"]', 'click.dismiss.modal', $.proxy(this.hide, this)) - this.options.remote && this.$element.find('.modal-body').load(this.options.remote) - } - - Modal.prototype = { - - constructor: Modal - - , toggle: function () { - return this[!this.isShown ? 'show' : 'hide']() - } - - , show: function () { - var that = this - , e = $.Event('show') - - this.$element.trigger(e) - - if (this.isShown || e.isDefaultPrevented()) return - - this.isShown = true - - this.escape() - - this.backdrop(function () { - var transition = $.support.transition && that.$element.hasClass('fade') - - if (!that.$element.parent().length) { - that.$element.appendTo(document.body) //don't move modals dom position - } - - that.$element.show() - - if (transition) { - that.$element[0].offsetWidth // force reflow - } - - that.$element - .addClass('in') - .attr('aria-hidden', false) - - that.enforceFocus() - - transition ? - that.$element.one($.support.transition.end, function () { that.$element.focus().trigger('shown') }) : - that.$element.focus().trigger('shown') - - }) - } - - , hide: function (e) { - e && e.preventDefault() - - var that = this - - e = $.Event('hide') - - this.$element.trigger(e) - - if (!this.isShown || e.isDefaultPrevented()) return - - this.isShown = false - - this.escape() - - $(document).off('focusin.modal') - - this.$element - .removeClass('in') - .attr('aria-hidden', true) - - $.support.transition && this.$element.hasClass('fade') ? - this.hideWithTransition() : - this.hideModal() - } - - , enforceFocus: function () { - var that = this - $(document).on('focusin.modal', function (e) { - if (that.$element[0] !== e.target && !that.$element.has(e.target).length) { - that.$element.focus() - } - }) - } - - , escape: function () { - var that = this - if (this.isShown && this.options.keyboard) { - this.$element.on('keyup.dismiss.modal', function ( e ) { - e.which == 27 && that.hide() - }) - } else if (!this.isShown) { - this.$element.off('keyup.dismiss.modal') - } - } - - , hideWithTransition: function () { - var that = this - , timeout = setTimeout(function () { - that.$element.off($.support.transition.end) - that.hideModal() - }, 500) - - this.$element.one($.support.transition.end, function () { - clearTimeout(timeout) - that.hideModal() - }) - } - - , hideModal: function () { - var that = this - this.$element.hide() - this.backdrop(function () { - that.removeBackdrop() - that.$element.trigger('hidden') - }) - } - - , removeBackdrop: function () { - this.$backdrop && this.$backdrop.remove() - this.$backdrop = null - } - - , backdrop: function (callback) { - var that = this - , animate = this.$element.hasClass('fade') ? 'fade' : '' - - if (this.isShown && this.options.backdrop) { - var doAnimate = $.support.transition && animate - - this.$backdrop = $('
') - .appendTo(document.body) - - this.$backdrop.click( - this.options.backdrop == 'static' ? - $.proxy(this.$element[0].focus, this.$element[0]) - : $.proxy(this.hide, this) - ) - - if (doAnimate) this.$backdrop[0].offsetWidth // force reflow - - this.$backdrop.addClass('in') - - if (!callback) return - - doAnimate ? - this.$backdrop.one($.support.transition.end, callback) : - callback() - - } else if (!this.isShown && this.$backdrop) { - this.$backdrop.removeClass('in') - - $.support.transition && this.$element.hasClass('fade')? - this.$backdrop.one($.support.transition.end, callback) : - callback() - - } else if (callback) { - callback() - } - } - } - - - /* MODAL PLUGIN DEFINITION - * ======================= */ - - var old = $.fn.modal - - $.fn.modal = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('modal') - , options = $.extend({}, $.fn.modal.defaults, $this.data(), typeof option == 'object' && option) - if (!data) $this.data('modal', (data = new Modal(this, options))) - if (typeof option == 'string') data[option]() - else if (options.show) data.show() - }) - } - - $.fn.modal.defaults = { - backdrop: true - , keyboard: true - , show: true - } - - $.fn.modal.Constructor = Modal - - - /* MODAL NO CONFLICT - * ================= */ - - $.fn.modal.noConflict = function () { - $.fn.modal = old - return this - } - - - /* MODAL DATA-API - * ============== */ - - $(document).on('click.modal.data-api', '[data-toggle="modal"]', function (e) { - var $this = $(this) - , href = $this.attr('href') - , $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) //strip for ie7 - , option = $target.data('modal') ? 'toggle' : $.extend({ remote:!/#/.test(href) && href }, $target.data(), $this.data()) - - e.preventDefault() - - $target - .modal(option) - .one('hide', function () { - $this.focus() - }) - }) - -}(window.jQuery); -/* =========================================================== - * bootstrap-tooltip.js v2.3.2 - * http://twitter.github.com/bootstrap/javascript.html#tooltips - * Inspired by the original jQuery.tipsy by Jason Frame - * =========================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ========================================================== */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* TOOLTIP PUBLIC CLASS DEFINITION - * =============================== */ - - var Tooltip = function (element, options) { - this.init('tooltip', element, options) - } - - Tooltip.prototype = { - - constructor: Tooltip - - , init: function (type, element, options) { - var eventIn - , eventOut - , triggers - , trigger - , i - - this.type = type - this.$element = $(element) - this.options = this.getOptions(options) - this.enabled = true - - triggers = this.options.trigger.split(' ') - - for (i = triggers.length; i--;) { - trigger = triggers[i] - if (trigger == 'click') { - this.$element.on('click.' + this.type, this.options.selector, $.proxy(this.toggle, this)) - } else if (trigger != 'manual') { - eventIn = trigger == 'hover' ? 'mouseenter' : 'focus' - eventOut = trigger == 'hover' ? 'mouseleave' : 'blur' - this.$element.on(eventIn + '.' + this.type, this.options.selector, $.proxy(this.enter, this)) - this.$element.on(eventOut + '.' + this.type, this.options.selector, $.proxy(this.leave, this)) - } - } - - this.options.selector ? - (this._options = $.extend({}, this.options, { trigger: 'manual', selector: '' })) : - this.fixTitle() - } - - , getOptions: function (options) { - options = $.extend({}, $.fn[this.type].defaults, this.$element.data(), options) - - if (options.delay && typeof options.delay == 'number') { - options.delay = { - show: options.delay - , hide: options.delay - } - } - - return options - } - - , enter: function (e) { - var defaults = $.fn[this.type].defaults - , options = {} - , self - - this._options && $.each(this._options, function (key, value) { - if (defaults[key] != value) options[key] = value - }, this) - - self = $(e.currentTarget)[this.type](options).data(this.type) - - if (!self.options.delay || !self.options.delay.show) return self.show() - - clearTimeout(this.timeout) - self.hoverState = 'in' - this.timeout = setTimeout(function() { - if (self.hoverState == 'in') self.show() - }, self.options.delay.show) - } - - , leave: function (e) { - var self = $(e.currentTarget)[this.type](this._options).data(this.type) - - if (this.timeout) clearTimeout(this.timeout) - if (!self.options.delay || !self.options.delay.hide) return self.hide() - - self.hoverState = 'out' - this.timeout = setTimeout(function() { - if (self.hoverState == 'out') self.hide() - }, self.options.delay.hide) - } - - , show: function () { - var $tip - , pos - , actualWidth - , actualHeight - , placement - , tp - , e = $.Event('show') - - if (this.hasContent() && this.enabled) { - this.$element.trigger(e) - if (e.isDefaultPrevented()) return - $tip = this.tip() - this.setContent() - - if (this.options.animation) { - $tip.addClass('fade') - } - - placement = typeof this.options.placement == 'function' ? - this.options.placement.call(this, $tip[0], this.$element[0]) : - this.options.placement - - $tip - .detach() - .css({ top: 0, left: 0, display: 'block' }) - - this.options.container ? $tip.appendTo(this.options.container) : $tip.insertAfter(this.$element) - - pos = this.getPosition() - - actualWidth = $tip[0].offsetWidth - actualHeight = $tip[0].offsetHeight - - switch (placement) { - case 'bottom': - tp = {top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2} - break - case 'top': - tp = {top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2} - break - case 'left': - tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth} - break - case 'right': - tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width} - break - } - - this.applyPlacement(tp, placement) - this.$element.trigger('shown') - } - } - - , applyPlacement: function(offset, placement){ - var $tip = this.tip() - , width = $tip[0].offsetWidth - , height = $tip[0].offsetHeight - , actualWidth - , actualHeight - , delta - , replace - - $tip - .offset(offset) - .addClass(placement) - .addClass('in') - - actualWidth = $tip[0].offsetWidth - actualHeight = $tip[0].offsetHeight - - if (placement == 'top' && actualHeight != height) { - offset.top = offset.top + height - actualHeight - replace = true - } - - if (placement == 'bottom' || placement == 'top') { - delta = 0 - - if (offset.left < 0){ - delta = offset.left * -2 - offset.left = 0 - $tip.offset(offset) - actualWidth = $tip[0].offsetWidth - actualHeight = $tip[0].offsetHeight - } - - this.replaceArrow(delta - width + actualWidth, actualWidth, 'left') - } else { - this.replaceArrow(actualHeight - height, actualHeight, 'top') - } - - if (replace) $tip.offset(offset) - } - - , replaceArrow: function(delta, dimension, position){ - this - .arrow() - .css(position, delta ? (50 * (1 - delta / dimension) + "%") : '') - } - - , setContent: function () { - var $tip = this.tip() - , title = this.getTitle() - - $tip.find('.tooltip-inner')[this.options.html ? 'html' : 'text'](title) - $tip.removeClass('fade in top bottom left right') - } - - , hide: function () { - var that = this - , $tip = this.tip() - , e = $.Event('hide') - - this.$element.trigger(e) - if (e.isDefaultPrevented()) return - - $tip.removeClass('in') - - function removeWithAnimation() { - var timeout = setTimeout(function () { - $tip.off($.support.transition.end).detach() - }, 500) - - $tip.one($.support.transition.end, function () { - clearTimeout(timeout) - $tip.detach() - }) - } - - $.support.transition && this.$tip.hasClass('fade') ? - removeWithAnimation() : - $tip.detach() - - this.$element.trigger('hidden') - - return this - } - - , fixTitle: function () { - var $e = this.$element - if ($e.attr('title') || typeof($e.attr('data-original-title')) != 'string') { - $e.attr('data-original-title', $e.attr('title') || '').attr('title', '') - } - } - - , hasContent: function () { - return this.getTitle() - } - - , getPosition: function () { - var el = this.$element[0] - return $.extend({}, (typeof el.getBoundingClientRect == 'function') ? el.getBoundingClientRect() : { - width: el.offsetWidth - , height: el.offsetHeight - }, this.$element.offset()) - } - - , getTitle: function () { - var title - , $e = this.$element - , o = this.options - - title = $e.attr('data-original-title') - || (typeof o.title == 'function' ? o.title.call($e[0]) : o.title) - - return title - } - - , tip: function () { - return this.$tip = this.$tip || $(this.options.template) - } - - , arrow: function(){ - return this.$arrow = this.$arrow || this.tip().find(".tooltip-arrow") - } - - , validate: function () { - if (!this.$element[0].parentNode) { - this.hide() - this.$element = null - this.options = null - } - } - - , enable: function () { - this.enabled = true - } - - , disable: function () { - this.enabled = false - } - - , toggleEnabled: function () { - this.enabled = !this.enabled - } - - , toggle: function (e) { - var self = e ? $(e.currentTarget)[this.type](this._options).data(this.type) : this - self.tip().hasClass('in') ? self.hide() : self.show() - } - - , destroy: function () { - this.hide().$element.off('.' + this.type).removeData(this.type) - } - - } - - - /* TOOLTIP PLUGIN DEFINITION - * ========================= */ - - var old = $.fn.tooltip - - $.fn.tooltip = function ( option ) { - return this.each(function () { - var $this = $(this) - , data = $this.data('tooltip') - , options = typeof option == 'object' && option - if (!data) $this.data('tooltip', (data = new Tooltip(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.tooltip.Constructor = Tooltip - - $.fn.tooltip.defaults = { - animation: true - , placement: 'top' - , selector: false - , template: '
' - , trigger: 'hover focus' - , title: '' - , delay: 0 - , html: false - , container: false - } - - - /* TOOLTIP NO CONFLICT - * =================== */ - - $.fn.tooltip.noConflict = function () { - $.fn.tooltip = old - return this - } - -}(window.jQuery); -/* =========================================================== - * bootstrap-popover.js v2.3.2 - * http://twitter.github.com/bootstrap/javascript.html#popovers - * =========================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * =========================================================== */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* POPOVER PUBLIC CLASS DEFINITION - * =============================== */ - - var Popover = function (element, options) { - this.init('popover', element, options) - } - - - /* NOTE: POPOVER EXTENDS BOOTSTRAP-TOOLTIP.js - ========================================== */ - - Popover.prototype = $.extend({}, $.fn.tooltip.Constructor.prototype, { - - constructor: Popover - - , setContent: function () { - var $tip = this.tip() - , title = this.getTitle() - , content = this.getContent() - - $tip.find('.popover-title')[this.options.html ? 'html' : 'text'](title) - $tip.find('.popover-content')[this.options.html ? 'html' : 'text'](content) - - $tip.removeClass('fade top bottom left right in') - } - - , hasContent: function () { - return this.getTitle() || this.getContent() - } - - , getContent: function () { - var content - , $e = this.$element - , o = this.options - - content = (typeof o.content == 'function' ? o.content.call($e[0]) : o.content) - || $e.attr('data-content') - - return content - } - - , tip: function () { - if (!this.$tip) { - this.$tip = $(this.options.template) - } - return this.$tip - } - - , destroy: function () { - this.hide().$element.off('.' + this.type).removeData(this.type) - } - - }) - - - /* POPOVER PLUGIN DEFINITION - * ======================= */ - - var old = $.fn.popover - - $.fn.popover = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('popover') - , options = typeof option == 'object' && option - if (!data) $this.data('popover', (data = new Popover(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.popover.Constructor = Popover - - $.fn.popover.defaults = $.extend({} , $.fn.tooltip.defaults, { - placement: 'right' - , trigger: 'click' - , content: '' - , template: '

' - }) - - - /* POPOVER NO CONFLICT - * =================== */ - - $.fn.popover.noConflict = function () { - $.fn.popover = old - return this - } - -}(window.jQuery); -/* ============================================================= - * bootstrap-scrollspy.js v2.3.2 - * http://twitter.github.com/bootstrap/javascript.html#scrollspy - * ============================================================= - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============================================================== */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* SCROLLSPY CLASS DEFINITION - * ========================== */ - - function ScrollSpy(element, options) { - var process = $.proxy(this.process, this) - , $element = $(element).is('body') ? $(window) : $(element) - , href - this.options = $.extend({}, $.fn.scrollspy.defaults, options) - this.$scrollElement = $element.on('scroll.scroll-spy.data-api', process) - this.selector = (this.options.target - || ((href = $(element).attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 - || '') + ' .nav li > a' - this.$body = $('body') - this.refresh() - this.process() - } - - ScrollSpy.prototype = { - - constructor: ScrollSpy - - , refresh: function () { - var self = this - , $targets - - this.offsets = $([]) - this.targets = $([]) - - $targets = this.$body - .find(this.selector) - .map(function () { - var $el = $(this) - , href = $el.data('target') || $el.attr('href') - , $href = /^#\w/.test(href) && $(href) - return ( $href - && $href.length - && [[ $href.position().top + (!$.isWindow(self.$scrollElement.get(0)) && self.$scrollElement.scrollTop()), href ]] ) || null - }) - .sort(function (a, b) { return a[0] - b[0] }) - .each(function () { - self.offsets.push(this[0]) - self.targets.push(this[1]) - }) - } - - , process: function () { - var scrollTop = this.$scrollElement.scrollTop() + this.options.offset - , scrollHeight = this.$scrollElement[0].scrollHeight || this.$body[0].scrollHeight - , maxScroll = scrollHeight - this.$scrollElement.height() - , offsets = this.offsets - , targets = this.targets - , activeTarget = this.activeTarget - , i - - if (scrollTop >= maxScroll) { - return activeTarget != (i = targets.last()[0]) - && this.activate ( i ) - } - - for (i = offsets.length; i--;) { - activeTarget != targets[i] - && scrollTop >= offsets[i] - && (!offsets[i + 1] || scrollTop <= offsets[i + 1]) - && this.activate( targets[i] ) - } - } - - , activate: function (target) { - var active - , selector - - this.activeTarget = target - - $(this.selector) - .parent('.active') - .removeClass('active') - - selector = this.selector - + '[data-target="' + target + '"],' - + this.selector + '[href="' + target + '"]' - - active = $(selector) - .parent('li') - .addClass('active') - - if (active.parent('.dropdown-menu').length) { - active = active.closest('li.dropdown').addClass('active') - } - - active.trigger('activate') - } - - } - - - /* SCROLLSPY PLUGIN DEFINITION - * =========================== */ - - var old = $.fn.scrollspy - - $.fn.scrollspy = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('scrollspy') - , options = typeof option == 'object' && option - if (!data) $this.data('scrollspy', (data = new ScrollSpy(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.scrollspy.Constructor = ScrollSpy - - $.fn.scrollspy.defaults = { - offset: 10 - } - - - /* SCROLLSPY NO CONFLICT - * ===================== */ - - $.fn.scrollspy.noConflict = function () { - $.fn.scrollspy = old - return this - } - - - /* SCROLLSPY DATA-API - * ================== */ - - $(window).on('load', function () { - $('[data-spy="scroll"]').each(function () { - var $spy = $(this) - $spy.scrollspy($spy.data()) - }) - }) - -}(window.jQuery);/* ======================================================== - * bootstrap-tab.js v2.3.2 - * http://twitter.github.com/bootstrap/javascript.html#tabs - * ======================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ======================================================== */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* TAB CLASS DEFINITION - * ==================== */ - - var Tab = function (element) { - this.element = $(element) - } - - Tab.prototype = { - - constructor: Tab - - , show: function () { - var $this = this.element - , $ul = $this.closest('ul:not(.dropdown-menu)') - , selector = $this.attr('data-target') - , previous - , $target - , e - - if (!selector) { - selector = $this.attr('href') - selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 - } - - if ( $this.parent('li').hasClass('active') ) return - - previous = $ul.find('.active:last a')[0] - - e = $.Event('show', { - relatedTarget: previous - }) - - $this.trigger(e) - - if (e.isDefaultPrevented()) return - - $target = $(selector) - - this.activate($this.parent('li'), $ul) - this.activate($target, $target.parent(), function () { - $this.trigger({ - type: 'shown' - , relatedTarget: previous - }) - }) - } - - , activate: function ( element, container, callback) { - var $active = container.find('> .active') - , transition = callback - && $.support.transition - && $active.hasClass('fade') - - function next() { - $active - .removeClass('active') - .find('> .dropdown-menu > .active') - .removeClass('active') - - element.addClass('active') - - if (transition) { - element[0].offsetWidth // reflow for transition - element.addClass('in') - } else { - element.removeClass('fade') - } - - if ( element.parent('.dropdown-menu') ) { - element.closest('li.dropdown').addClass('active') - } - - callback && callback() - } - - transition ? - $active.one($.support.transition.end, next) : - next() - - $active.removeClass('in') - } - } - - - /* TAB PLUGIN DEFINITION - * ===================== */ - - var old = $.fn.tab - - $.fn.tab = function ( option ) { - return this.each(function () { - var $this = $(this) - , data = $this.data('tab') - if (!data) $this.data('tab', (data = new Tab(this))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.tab.Constructor = Tab - - - /* TAB NO CONFLICT - * =============== */ - - $.fn.tab.noConflict = function () { - $.fn.tab = old - return this - } - - - /* TAB DATA-API - * ============ */ - - $(document).on('click.tab.data-api', '[data-toggle="tab"], [data-toggle="pill"]', function (e) { - e.preventDefault() - $(this).tab('show') - }) - -}(window.jQuery);/* ============================================================= - * bootstrap-typeahead.js v2.3.2 - * http://twitter.github.com/bootstrap/javascript.html#typeahead - * ============================================================= - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============================================================ */ - - -!function($){ - - "use strict"; // jshint ;_; - - - /* TYPEAHEAD PUBLIC CLASS DEFINITION - * ================================= */ - - var Typeahead = function (element, options) { - this.$element = $(element) - this.options = $.extend({}, $.fn.typeahead.defaults, options) - this.matcher = this.options.matcher || this.matcher - this.sorter = this.options.sorter || this.sorter - this.highlighter = this.options.highlighter || this.highlighter - this.updater = this.options.updater || this.updater - this.source = this.options.source - this.$menu = $(this.options.menu) - this.shown = false - this.listen() - } - - Typeahead.prototype = { - - constructor: Typeahead - - , select: function () { - var val = this.$menu.find('.active').attr('data-value') - this.$element - .val(this.updater(val)) - .change() - return this.hide() - } - - , updater: function (item) { - return item - } - - , show: function () { - var pos = $.extend({}, this.$element.position(), { - height: this.$element[0].offsetHeight - }) - - this.$menu - .insertAfter(this.$element) - .css({ - top: pos.top + pos.height - , left: pos.left - }) - .show() - - this.shown = true - return this - } - - , hide: function () { - this.$menu.hide() - this.shown = false - return this - } - - , lookup: function (event) { - var items - - this.query = this.$element.val() - - if (!this.query || this.query.length < this.options.minLength) { - return this.shown ? this.hide() : this - } - - items = $.isFunction(this.source) ? this.source(this.query, $.proxy(this.process, this)) : this.source - - return items ? this.process(items) : this - } - - , process: function (items) { - var that = this - - items = $.grep(items, function (item) { - return that.matcher(item) - }) - - items = this.sorter(items) - - if (!items.length) { - return this.shown ? this.hide() : this - } - - return this.render(items.slice(0, this.options.items)).show() - } - - , matcher: function (item) { - return ~item.toLowerCase().indexOf(this.query.toLowerCase()) - } - - , sorter: function (items) { - var beginswith = [] - , caseSensitive = [] - , caseInsensitive = [] - , item - - while (item = items.shift()) { - if (!item.toLowerCase().indexOf(this.query.toLowerCase())) beginswith.push(item) - else if (~item.indexOf(this.query)) caseSensitive.push(item) - else caseInsensitive.push(item) - } - - return beginswith.concat(caseSensitive, caseInsensitive) - } - - , highlighter: function (item) { - var query = this.query.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g, '\\$&') - return item.replace(new RegExp('(' + query + ')', 'ig'), function ($1, match) { - return '' + match + '' - }) - } - - , render: function (items) { - var that = this - - items = $(items).map(function (i, item) { - i = $(that.options.item).attr('data-value', item) - i.find('a').html(that.highlighter(item)) - return i[0] - }) - - items.first().addClass('active') - this.$menu.html(items) - return this - } - - , next: function (event) { - var active = this.$menu.find('.active').removeClass('active') - , next = active.next() - - if (!next.length) { - next = $(this.$menu.find('li')[0]) - } - - next.addClass('active') - } - - , prev: function (event) { - var active = this.$menu.find('.active').removeClass('active') - , prev = active.prev() - - if (!prev.length) { - prev = this.$menu.find('li').last() - } - - prev.addClass('active') - } - - , listen: function () { - this.$element - .on('focus', $.proxy(this.focus, this)) - .on('blur', $.proxy(this.blur, this)) - .on('keypress', $.proxy(this.keypress, this)) - .on('keyup', $.proxy(this.keyup, this)) - - if (this.eventSupported('keydown')) { - this.$element.on('keydown', $.proxy(this.keydown, this)) - } - - this.$menu - .on('click', $.proxy(this.click, this)) - .on('mouseenter', 'li', $.proxy(this.mouseenter, this)) - .on('mouseleave', 'li', $.proxy(this.mouseleave, this)) - } - - , eventSupported: function(eventName) { - var isSupported = eventName in this.$element - if (!isSupported) { - this.$element.setAttribute(eventName, 'return;') - isSupported = typeof this.$element[eventName] === 'function' - } - return isSupported - } - - , move: function (e) { - if (!this.shown) return - - switch(e.keyCode) { - case 9: // tab - case 13: // enter - case 27: // escape - e.preventDefault() - break - - case 38: // up arrow - e.preventDefault() - this.prev() - break - - case 40: // down arrow - e.preventDefault() - this.next() - break - } - - e.stopPropagation() - } - - , keydown: function (e) { - this.suppressKeyPressRepeat = ~$.inArray(e.keyCode, [40,38,9,13,27]) - this.move(e) - } - - , keypress: function (e) { - if (this.suppressKeyPressRepeat) return - this.move(e) - } - - , keyup: function (e) { - switch(e.keyCode) { - case 40: // down arrow - case 38: // up arrow - case 16: // shift - case 17: // ctrl - case 18: // alt - break - - case 9: // tab - case 13: // enter - if (!this.shown) return - this.select() - break - - case 27: // escape - if (!this.shown) return - this.hide() - break - - default: - this.lookup() - } - - e.stopPropagation() - e.preventDefault() - } - - , focus: function (e) { - this.focused = true - } - - , blur: function (e) { - this.focused = false - if (!this.mousedover && this.shown) this.hide() - } - - , click: function (e) { - e.stopPropagation() - e.preventDefault() - this.select() - this.$element.focus() - } - - , mouseenter: function (e) { - this.mousedover = true - this.$menu.find('.active').removeClass('active') - $(e.currentTarget).addClass('active') - } - - , mouseleave: function (e) { - this.mousedover = false - if (!this.focused && this.shown) this.hide() - } - - } - - - /* TYPEAHEAD PLUGIN DEFINITION - * =========================== */ - - var old = $.fn.typeahead - - $.fn.typeahead = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('typeahead') - , options = typeof option == 'object' && option - if (!data) $this.data('typeahead', (data = new Typeahead(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.typeahead.defaults = { - source: [] - , items: 8 - , menu: '' - , item: '
    • ' - , minLength: 1 - } - - $.fn.typeahead.Constructor = Typeahead - - - /* TYPEAHEAD NO CONFLICT - * =================== */ - - $.fn.typeahead.noConflict = function () { - $.fn.typeahead = old - return this - } - - - /* TYPEAHEAD DATA-API - * ================== */ - - $(document).on('focus.typeahead.data-api', '[data-provide="typeahead"]', function (e) { - var $this = $(this) - if ($this.data('typeahead')) return - $this.typeahead($this.data()) - }) - -}(window.jQuery); -/* ========================================================== - * bootstrap-affix.js v2.3.2 - * http://twitter.github.com/bootstrap/javascript.html#affix - * ========================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ========================================================== */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* AFFIX CLASS DEFINITION - * ====================== */ - - var Affix = function (element, options) { - this.options = $.extend({}, $.fn.affix.defaults, options) - this.$window = $(window) - .on('scroll.affix.data-api', $.proxy(this.checkPosition, this)) - .on('click.affix.data-api', $.proxy(function () { setTimeout($.proxy(this.checkPosition, this), 1) }, this)) - this.$element = $(element) - this.checkPosition() - } - - Affix.prototype.checkPosition = function () { - if (!this.$element.is(':visible')) return - - var scrollHeight = $(document).height() - , scrollTop = this.$window.scrollTop() - , position = this.$element.offset() - , offset = this.options.offset - , offsetBottom = offset.bottom - , offsetTop = offset.top - , reset = 'affix affix-top affix-bottom' - , affix - - if (typeof offset != 'object') offsetBottom = offsetTop = offset - if (typeof offsetTop == 'function') offsetTop = offset.top() - if (typeof offsetBottom == 'function') offsetBottom = offset.bottom() - - affix = this.unpin != null && (scrollTop + this.unpin <= position.top) ? - false : offsetBottom != null && (position.top + this.$element.height() >= scrollHeight - offsetBottom) ? - 'bottom' : offsetTop != null && scrollTop <= offsetTop ? - 'top' : false - - if (this.affixed === affix) return - - this.affixed = affix - this.unpin = affix == 'bottom' ? position.top - scrollTop : null - - this.$element.removeClass(reset).addClass('affix' + (affix ? '-' + affix : '')) - } - - - /* AFFIX PLUGIN DEFINITION - * ======================= */ - - var old = $.fn.affix - - $.fn.affix = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('affix') - , options = typeof option == 'object' && option - if (!data) $this.data('affix', (data = new Affix(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.affix.Constructor = Affix - - $.fn.affix.defaults = { - offset: 0 - } - - - /* AFFIX NO CONFLICT - * ================= */ - - $.fn.affix.noConflict = function () { - $.fn.affix = old - return this - } - - - /* AFFIX DATA-API - * ============== */ - - $(window).on('load', function () { - $('[data-spy="affix"]').each(function () { - var $spy = $(this) - , data = $spy.data() - - data.offset = data.offset || {} - - data.offsetBottom && (data.offset.bottom = data.offsetBottom) - data.offsetTop && (data.offset.top = data.offsetTop) - - $spy.affix(data) - }) - }) - - -}(window.jQuery); \ No newline at end of file diff --git a/app/assets/javascripts/export_configure.js b/app/assets/javascripts/export_configure.js index b920020..d6ae5bb 100644 --- a/app/assets/javascripts/export_configure.js +++ b/app/assets/javascripts/export_configure.js @@ -38,7 +38,7 @@ $(this).val($(this).data("default")); }); $(".unsaved_changes_alert").hide(); - $("#settings-toggle > small").text("(Using template PDF formatting values)"); + $("#settings-toggle > small").text(I18n.t("project.settings.plans.template_formatting")); }); $('.btn-primary[value="Save"]').click(function(){ @@ -49,10 +49,10 @@ } }); if (custom) { - $("#settings-toggle > small").text("(Using custom PDF formatting values)"); + $("#settings-toggle > small").text(I18n.t("project.settings.plans.custom_formatting")); } else { - $("#settings-toggle > small").text("(Using template PDF formatting values)"); + $("#settings-toggle > small").text(I18n.t("project.settings.plans.template_formatting")); } $(".unsaved_changes_alert").hide(); }); diff --git a/app/assets/javascripts/plans.js b/app/assets/javascripts/plans.js index dcda669..43db140 100644 --- a/app/assets/javascripts/plans.js +++ b/app/assets/javascripts/plans.js @@ -35,7 +35,7 @@ var message = null; if ($.fn.is_dirty()) { var questions = $.fn.get_unsaved_questions(); - message = 'You have unsaved answers in the following sections:\n'; + message = I18n.t("you_have_unsaved_in_sections"); $.each(questions, function(section_text, question_texts){ message += "\n\u2022"+section_text; }); @@ -443,9 +443,9 @@ $.fn.update_plan_progress = function(data) { $("#questions-progress").css("width", (data.num_answers/data.num_questions*100)+"%"); - $("#questions-progress-title").text(data.num_answers+"/"+data.num_questions + ' questions answered'); + $("#questions-progress-title").text(data.num_answers+"/"+data.num_questions + " " + I18n.t("helpers.project.questions_answered")); $('#export-progress').css('width', data.space_used + '%'); - $("#export-progress-title").text('approx. ' + data.space_used + '% of available space used'); + $("#export-progress-title").text(I18n.t("helpers.plan.export.space_used_without_max", {space_used: data.space_used})); if (data.space_used >= 100) { $('#export-progress').removeClass("space"); $('#export-progress').addClass("full"); @@ -467,7 +467,7 @@ timestamp = new Date(Number(timestamp) * 1000); if (timestamp.getTime() != current_timestamp.getTime()) { q_status.text(""); - q_status.append("Answered by "+data.questions[question_id]["answered_by"]); + q_status.append(I18n.t("helpers.answered_by") + " " + I18n.t("helpers.answered_by_part2") + " " + data.questions[question_id]["answered_by"]); t = q_status.children("abbr:first"); // Update label to indicate successful submission q_status.removeClass("label-info label-warning"); @@ -482,14 +482,12 @@ return false; }; -// Checks section locks, applies lock if needed. Does not lift lock. -// If locked, display questions as read-only. Otherwise, apply lock and display as editable. $.fn.check_section_lock = function() { var section = $(this); var section_id = section.attr("id").split('-')[1]; - $.getJSON("locked.json?section_id="+section_id, function(data) { + $.getJSON("locked?section_id="+section_id, function(data) { if (data.locked) { - section.find(".section-lock-notice").html("

    This section is locked for editing by " + data.locked_by + ".

    "); + section.find(".section-lock-notice").html("

    " + I18n.t("helpers.project.share.locked_section_text") + data.locked_by + ".

    "); section.find(".section-lock-notice").show(); section.find("input").attr('disabled', 'disabled'); section.find(".question-form").hide(); @@ -500,7 +498,7 @@ // LIBDMP-137 // Changed post request 'lock_section' to 'lock_section.json'. 'lock_section' unnecessary returns a huge html response and takes a quite lot of time to process(3sec) lowering server // performance when there are large number of concurrent users. - $.post('lock_section.json', {section_id: section_id} ); + $.post('lock_section', {section_id: section_id} ); section.find(".section-lock-notice").html(""); section.find(".section-lock-notice").hide(); section.find("input").removeAttr('disabled'); diff --git a/app/assets/javascripts/projects.js b/app/assets/javascripts/projects.js index cbd434f..72bc364 100644 --- a/app/assets/javascripts/projects.js +++ b/app/assets/javascripts/projects.js @@ -1,5 +1,10 @@ $( document ).ready(function() { +/* + $("#project_funder_id").select2({ + placeholder: "Select a funder" + }); +*/ $("#project_funder_id").change(function () { update_template_options(); update_guidance_options(); @@ -23,7 +28,7 @@ $("#institution-control-group").show(); $("#create-plan-button").show(); $("#other-funder-name").show(); - $("#confirm-funder").text("None"); + $("#confirm-funder").text(I18n.t("helpers.none")); }); $("#project_funder_name").change(function(){ @@ -40,7 +45,7 @@ $("#project_institution_id").select2("val", ""); update_template_options(); update_guidance_options(); - $("#confirm-institution").text("None"); + $("#confirm-institution").text(I18n.t("helpers.none")); }); $("#project_dmptemplate_id").change(function (f) { @@ -50,10 +55,10 @@ $("#project-confirmation-dialog").on("show", function(){ if ($("#confirm-institution").text() == "") { - $("#confirm-institution").text("None"); + $("#confirm-institution").text(I18n.t("helpers.none")); } if ($("#confirm-funder").text() == "") { - $("#confirm-funder").text("None"); + $("#confirm-funder").text(I18n.t("helpers.none")); } if ($("#confirm-template").text() == "") { $("#confirm-template").closest("div").hide(); diff --git a/app/assets/javascripts/toolbar.js b/app/assets/javascripts/toolbar.js index f63de45..3bdf29b 100644 --- a/app/assets/javascripts/toolbar.js +++ b/app/assets/javascripts/toolbar.js @@ -29,11 +29,16 @@ tbody = $('').appendTo(table), tfoot = $('').appendTo(table), cols = data.all_columns, - selected = data.selected_columns; - + selected = []; + + // grab the keys from the data.selected_columns hash + $.each(data.selected_columns, function(k,v){ + selected.push(k); + }); + table.before(''); // PUT not POST table.before(''); // Auth token - table.after('

    The items you select here will be displayed in the table below. You can sort the data by each of these headings or filter by entering a text string in the search box.

    '); + table.after('

    ' + I18n.t("helpers.project.project_settings_text") + '

    '); // Default name column table.before(''); @@ -50,11 +55,11 @@ input.attr('checked', 'checked'); } - thead.append(''); + thead.append(''); tbody.append('') var submit = $('').appendTo(tfoot); - cancel = $('Cancel').appendTo(tfoot); + cancel = $('' + I18n.t("helpers.submit.cancel") + '').appendTo(tfoot); cancel.click(function(e) { e.preventDefault(); @@ -67,7 +72,7 @@ /* 'My plans' filtering */ - var no_matches_message = $('No matches').appendTo($('#dmp_table tbody')), + var no_matches_message = $('' + I18n.t("helpers.project.filter.no_matches") + '').appendTo($('#dmp_table tbody')), rows = $('#dmp_table tbody tr'), filter = $('#filter'); diff --git a/app/assets/stylesheets/admin.css.less b/app/assets/stylesheets/admin.css.less index d6854fd..958bb3e 100644 --- a/app/assets/stylesheets/admin.css.less +++ b/app/assets/stylesheets/admin.css.less @@ -89,6 +89,7 @@ min-width: 540px; padding:0 0 0 0; background:none; + text-align: left; } .main_header{ @@ -893,6 +894,11 @@ .question_options_popover{ padding-left: 12px; } + .remove-option { + color: @orange_colour; + text-decoration: underline; + cursor: pointer; + } } .border_bottom{ @@ -1120,7 +1126,7 @@ .dmp_details{ padding: 0 0 5px 0; - clear: both; + clear: both; } .edit-project ol{ diff --git a/app/assets/stylesheets/bootstrap_and_overrides.css.less b/app/assets/stylesheets/bootstrap_and_overrides.css.less index 3842cf6..8394971 100644 --- a/app/assets/stylesheets/bootstrap_and_overrides.css.less +++ b/app/assets/stylesheets/bootstrap_and_overrides.css.less @@ -837,7 +837,7 @@ font-size: 12px; } -div.select2-container { +.select2-container { float:right; min-width: 48%; } @@ -1595,9 +1595,6 @@ text-align: right; width: 50px; } - table.dmp_details_table input{ - width:60% - } } } @@ -1879,3 +1876,7 @@ .settings-accordion span.plus-laranja:before, .settings-accordion span.minus-laranja:before { line-height: inherit; } + +tr.new_option_before { + display: none; +} \ No newline at end of file diff --git a/app/controllers/answers_controller.rb b/app/controllers/answers_controller.rb index aafee54..15703bc 100644 --- a/app/controllers/answers_controller.rb +++ b/app/controllers/answers_controller.rb @@ -23,16 +23,16 @@ if proceed respond_to do |format| if @answer.save - format.html { redirect_to :back, status: :found, notice: 'Answer was successfully recorded.' } + format.html { redirect_to :back, status: :found, notice: I18n.t('helpers.project.answer_recorded') } format.json { render json: @answer, status: :created, location: @answer } else - format.html { redirect_to :back, notice: 'There was an error saving the answer.' } + format.html { redirect_to :back, notice: I18n.t('helpers.project.answer_error') } format.json { render json: @answer.errors, status: :unprocessable_entity } end end else respond_to do |format| - format.html { redirect_to :back, notice: 'No change in answer content - not saved.' } + format.html { redirect_to :back, notice: I18n.t('helpers.project.answer_no_change') } format.json { render json: @answer.errors, status: :unprocessable_entity } end end diff --git a/app/controllers/api/v0/base_controller.rb b/app/controllers/api/v0/base_controller.rb new file mode 100644 index 0000000..c3ed859 --- /dev/null +++ b/app/controllers/api/v0/base_controller.rb @@ -0,0 +1,145 @@ +module Api + module V0 + class BaseController < ApplicationController + protect_from_forgery with: :null_session + before_action :set_resource, only: [:destroy, :show, :update] + respond_to :json + + public + # POST /api/{plural_resource_name} + def create + set_resource(resource_class.new(resource_params)) + + if get_resource.save + render :show, status: :created + else + render json: get_resource.errors, status: :unprocessable_entity + end + end + + # DELETE /api/{plural_resource_name}/1 + def destroy + get_resource.destroy + head :no_content + end + + # GET /api/{plural_resource_name} + def index + plural_resource_name = "@#{resource_name.pluralize}" + resources = resource_class.where(query_params) + .page(page_params[:page]) + .per(page_params[:page_size]) + + instance_variable_set(plural_resource_name, resources) + respond_with instance_variable_get(plural_resource_name) + end + + # GET /api/{plural_resource_name}/1 + def show + respond_with get_resource + end + + # PATCH/PUT /api/{plural_resource_name}/1 + def update + if get_resource.update(resource_params) + render :show + else + render json: get_resource.errors, status: :unprocessable_entity + end + end + + private + # returns the resource from the created instance variable + # @return [Object] + def get_resource + instance_variable_get("@#{resource_name}") + end + + # Returns the allowed parameters for searching + # Override this method in each API controller + # to permit additional parameters to search on + # @return [Hash] + def query_params + {} + end + + # Returns the allowed parameters for pagination + # @return [Hash] + def page_params + params.permit(:page, :page_size) + end + + # The resource class based on the controller + # @return [Class] + def resource_class + @resource_class ||= resource_name.classify.constantize + end + + # The singular name for the resource class based on the controller + # @return [String] + def resource_name + @resource_name ||= self.controller_name.singularize + end + + # Only allow a trusted parameter "white list" through. + # If a single resource is loaded for #create or #update, + # then the controller for the resource must implement + # the method "#{resource_name}_params" to limit permitted + # parameters for the individual model. + def resource_params + @resource_params ||= self.send("#{resource_name}_params") + end + + # Use callbacks to share common setup or constraints between actions. + def set_resource(resource = nil) + resource ||= resource_class.find(params[:id]) + instance_variable_set("@#{resource_name}", resource) + end + + def authenticate + authenticate_token || render_bad_credentials + end + + def authenticate_token + authenticate_with_http_token do |token, options| + # reject the empty string as it is our base empty token + if token != "" + @token = token + @user = User.find_by(api_token: token) + # if no user found, return false, otherwise true + !@user.nil? + else + false + end + end + end + + + def render_bad_credentials + self.headers['WWW-Authenticate'] = "Token realm=\"\"" + render json: I18n.t("api.bad_credentials"), status: 401 + end + + def has_auth (auth_type) + auth = false + # not sure if initial if is necissary, but it works with it there... refactor later? + # if !TokenPermission.where(api_token: @token).nil? + # TokenPermission.where(api_token: @token).find_each do |permission| + # if permission.token_permission_type.token_type == auth_type + # auth = true + # logger.info "we have auth" + # end + # end + # end + OrgTokenPermission.where(organisation_id: @user.organisation_id).find_each do |org_token_permission| + logger.debug "#{org_token_permission.token_permission_type.token_type}" + if org_token_permission.token_permission_type.token_type == auth_type + auth= true + end + end + return auth + end + + end + end +end diff --git a/app/controllers/api/v0/guidance_groups_controller.rb b/app/controllers/api/v0/guidance_groups_controller.rb new file mode 100644 index 0000000..a506a0b --- /dev/null +++ b/app/controllers/api/v0/guidance_groups_controller.rb @@ -0,0 +1,64 @@ +module Api + module V0 + class GuidanceGroupsController < Api::V0::BaseController + before_action :authenticate + + swagger_controller :guidance_groupss, 'Guidance Groups' + + swagger_api :show do + summary 'Returns a single guidance group item' + notes 'Notes...' + param :path, :id, :integer, :required, "Guidance Group Id" + param :header, 'Authorization Token', :string, :required, 'Authorization-Token' + response :ok, "success", :Guidance + response :unauthorized + response :not_found + end + + # TODO: impliment auth on show/index + # for both, first validate that the user has the permission to use this api + # then for show, display iff they have permissions for that resource + # for index, compile the list of all groups they have permissions to view, then return + + def show + # check if the user has permission to use the guidances api + if has_auth("guidances") + # determine if they have authorization to view this guidance group + if GuidanceGroup.can_view?(@user, params[:id]) + respond_with get_resource + else + render json: I18n.t("api.bad_resource"), status: 401 + end + else + render json: I18n.t("api.no_auth_for_endpoint"), status: 401 + end + end + + swagger_api :index do + summary 'Returns a list of all viewable guidances' + notes 'Notes...' + param :header, 'Authentication-Token', :string, :required, 'Authentication-Token' + response :unauthorized + end + + + def index + + if has_auth("guidances") + @all_viewable_groups = GuidanceGroup.all_viewable(@user) + respond_with @all_viewable_groups + else + #render unauthorised + render json: I18n.t("api.no_auth_for_endpoint"), status: 401 + end + end + + + private + def query_params + params.permit(:id) + end + + end + end +end diff --git a/app/controllers/api/v0/guidances_controller.rb b/app/controllers/api/v0/guidances_controller.rb new file mode 100644 index 0000000..2803ea6 --- /dev/null +++ b/app/controllers/api/v0/guidances_controller.rb @@ -0,0 +1,59 @@ +module Api + module V0 + class GuidancesController < Api::V0::BaseController + before_action :authenticate + + swagger_controller :guidances, 'Guidances' + + swagger_api :show do + summary 'Returns a single guidance item' + notes 'Notes...' + param :path, :id, :integer, :required, "Guidance Id" + param :header, 'Authentication-Token', :string, :required, 'Authentication-Token' + response :ok, "success", :Guidance + response :unauthorized + response :not_found + end + + # TODO: impliment auth on show/index + # for both, first validate that the user has the permission to use this api + # then for show, display iff they have permissions for that resource + # for index, compile the list of all groups they have permissions to view, then return + + def show + # ensure use has auth for guidances api + if has_auth("guidance") + if Guidance.can_view?(@user, params[:id]) + respond_with get_resource + else + render json: I18n.t("api.bad_resource"), status: 401 + end + else + render I18n.t("api.no_auth_for_endpoint"), status: 401 + end + end + + swagger_api :index do + summary 'Returns a list of all viewable guidances' + notes 'Notes...' + param :header, 'Authentication-Token', :string, :required, 'Authentication-Token' + response :unauthorized + end + + def index + if has_auth("guidance") + @all_viewable_guidances = Guidance.all_viewable(@user) + respond_with @all_viewable_guidances + else + render json I18n.t("api.no_auth_for_endpoint"), status: 401 + end + end + + + private + def query_params + params.permit(:id) + end + end + end +end diff --git a/app/controllers/api/v0/projects_controller.rb b/app/controllers/api/v0/projects_controller.rb new file mode 100644 index 0000000..b824c3a --- /dev/null +++ b/app/controllers/api/v0/projects_controller.rb @@ -0,0 +1,104 @@ +module Api + module V0 + class ProjectsController < Api::V0::BaseController + before_action :authenticate + + swagger_controller :projects, 'Plans' + + swagger_api :create do |api| + summary 'Returns a single guidance group item' + notes 'Notes...' + param :header, 'Authentication-Token', :string, :required, 'Authentication-Token' + response :unauthorized + response :not_found + end + + ## + # Creates a new project based on the information passed in JSON to the API + def create + # find the user's api_token permissions + # then ensure that they have the permission associated with creating plans + if has_auth "plans" + #params[:organization_id] = Organisation.where(name: params[:template][:organization]) + # find_by returns nil if none found, find_by! raises an ActiveRecord error + organization = Organisation.find_by name: params[:template][:organisation] + + # if organization exists + if !organization.nil? + # if organization is funder + if organization.organisation_type == (OrganisationType.find_by name: "Funder") + # if organization has only 1 template + if organization.dmptemplates.length == 1 + # set template id + dmptemplate = organization.dmptemplates.first + # else if params.template.name specified && params.template.name == one of organization's tempates + elsif !organization.dmptemplates.find_by title: params[:template][:name].nil? + # set template id + dmptemplate = organization.templates.find_by title: params[:template][:name] + # else error: organization has more than one template and template name unspecified + else + render json: I18n.t("api.org_multiple_templates"), status: 400 and return + end + # else error: organization specified is not a funder + else + render json: I18n.t("api.org_not_funder"), status: 400 and return + end + # else error: organization does not exist + else + render json: I18n.t("api.org_dosent_exist"), status: 400 and return + end + + all_groups = [] + # Check to see if the user specified guidances + if !params[:guidance].nil? + # for each specified guidance, see if it exists + params[:guidance][:name].each do |guidance_name| + group = GuidanceGroup.find_by(name: guidance_name) + # if it exists, add it to the guidances for the new project + if !group.nil? + all_groups = all_groups + [group] + end + end + end + + # cant invite a user without having a current user because of devise :ivitable + # after we have auth, will be able to assign an :invited_by_id + user = User.find_by email: params[:project][:email] + # if user does not exist + if user.nil? + # invite user to DMPonline + User.invite!({email: params[:project][:email]}, ( @user)) + # set project owner to user associated w/email + user = (User.find_by email: params[:project][:email]) + end + + # create new project with specified parameters + @project = Project.new + @project.title = params[:project][:title] + @project.dmptemplate = dmptemplate + @project.slug = params[:project][:title] + @project.organisation = @user.organisations.first + @project.assign_creator(user.id) + @project.guidance_groups = all_groups + + # if save successful, render success, otherwise show error + if @project.save + #render json: @project ,status: :created + render :show, status: :created + else + render json: get_resource.errors, status: :unprocessable_entity + end + else + + render json: I18n.t("api.no_auth_for_endpoint"), status: 400 and return + end + end + + # private + # def project_params + # params.require(:template).permit(:organisation, :name) + # params.require(:project).permit(:title, :email) + # end + end + end +end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index f1eced4..cbc894d 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,50 +1,73 @@ class ApplicationController < ActionController::Base - protect_from_forgery with: :exception - - # Override build_footer method in ActiveAdmin::Views::Pages + protect_from_forgery with: :exception + + # Override build_footer method in ActiveAdmin::Views::Pages require 'active_admin_views_pages_base.rb' - - rescue_from CanCan::AccessDenied do |exception| - redirect_to root_url, :alert => exception.message - end - - after_filter :store_location - def store_location - # store last url - this is needed for post-login redirect to whatever the user last visited. - if (request.fullpath != "/users/sign_in" && \ - request.fullpath != "/users/sign_up" && \ - request.fullpath != "/users/password" && \ + rescue_from CanCan::AccessDenied do |exception| + redirect_to root_url, :alert => exception.message + end + + before_filter :set_locale + + after_filter :store_location + + def set_locale + # parameter from url takes precedence + if params[:locale] + # if locales data is present in the parameter from url use it + # TODO we need to error to the user that locale is missing, it can be THE CASE because there can be a missmatch between locales files and db + I18n.locale = params[:locale] + elsif false # TODO + # if user has set preferred language use it + elsif false # TODO + # use user's organization language, keep in mine the "OTHER ORG" edge case which should use english + else + # just use the default language, line can be commented out, included just for clarity + # I18n.locale = config.i18n.default_locale + end + end + + # Added setting for passing local params across pages + def default_url_options(options = {}) + { locale: I18n.locale }.merge options + end + + def store_location + # store last url - this is needed for post-login redirect to whatever the user last visited. + if (request.fullpath != "/users/sign_in" && \ + request.fullpath != "/users/sign_up" && \ + request.fullpath != "/users/password" && \ request.fullpath != "/users/sign_up?nosplash=true" && \ - !request.xhr?) # don't store ajax calls - session[:previous_url] = request.fullpath - end - end + !request.xhr?) # don't store ajax calls + session[:previous_url] = request.fullpath + end + end - def after_sign_in_path_for(resource) - session[:previous_url] || root_path - end + def after_sign_in_path_for(resource) + session[:previous_url] || root_path + end - def after_sign_up_path_for(resource) - session[:previous_url] || root_path - end - - def after_sign_in_error_path_for(resource) - session[:previous_url] || root_path - end - - def after_sign_up_error_path_for(resource) - session[:previous_url] || root_path - end - - def authenticate_admin! - redirect_to root_path unless user_signed_in? && current_user.is_admin? - end + def after_sign_up_path_for(resource) + session[:previous_url] || root_path + end - def get_plan_list_columns - if user_signed_in? - @selected_columns = current_user.settings(:plan_list).columns - @all_columns = Settings::PlanList::ALL_COLUMNS - end - end + def after_sign_in_error_path_for(resource) + session[:previous_url] || root_path + end + + def after_sign_up_error_path_for(resource) + session[:previous_url] || root_path + end + + def authenticate_admin! + redirect_to root_path unless user_signed_in? && current_user.is_admin? + end + + def get_plan_list_columns + if user_signed_in? + @selected_columns = current_user.settings(:plan_list).columns + @all_columns = Settings::PlanList::ALL_COLUMNS + end + end end diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb index b751683..6d1ce7c 100644 --- a/app/controllers/comments_controller.rb +++ b/app/controllers/comments_controller.rb @@ -43,7 +43,7 @@ respond_to do |format| if @comment.save session[:question_id_comments] = @comment.question_id - format.html { redirect_to edit_project_plan_path(@project, @plan), status: :found, notice: 'Comment was successfully created.' } + format.html { redirect_to edit_project_plan_path(@project, @plan), status: :found, notice: I18n.t("helpers.comments.comment_created") } format.json { head :no_content } end end @@ -62,7 +62,7 @@ respond_to do |format| if @comment.update_attributes(params[:comment]) session[:question_id_comments] = @comment.question_id - format.html { redirect_to edit_project_plan_path(@project, @plan), status: :found, notice: 'Comment was successfully updated.' } + format.html { redirect_to edit_project_plan_path(@project, @plan), status: :found, notice: I18n.t("helpers.comments.comment_updated") } format.json { head :no_content } end end @@ -81,7 +81,7 @@ respond_to do |format| if @comment.update_attributes(params[:comment]) session[:question_id_comments] = @comment.question_id - format.html { redirect_to edit_project_plan_path(@project, @plan), status: :found, notice: 'Comment has been removed.' } + format.html { redirect_to edit_project_plan_path(@project, @plan), status: :found, notice: I18n.t("helpers.comments.comment_removed") } end end end diff --git a/app/controllers/dmptemplates_controller.rb b/app/controllers/dmptemplates_controller.rb index 989ecba..97980e3 100644 --- a/app/controllers/dmptemplates_controller.rb +++ b/app/controllers/dmptemplates_controller.rb @@ -295,11 +295,12 @@ #clone a version of a template def admin_cloneversion if user_signed_in? && current_user.is_org_admin? then - @old_version = Version.find(params[:version_id]) + @old_version = Version.find(params[:version_id]) @version = @old_version.amoeba_dup @phase = @version.phase respond_to do |format| + if @version.save format.html { redirect_to admin_phase_dmptemplate_path(@phase, :version_id => @version.id, :edit => 'true'), notice: I18n.t('org_admin.templates.updated_message') } format.json { head :no_content } @@ -392,7 +393,6 @@ @question.guidance = params["new-question-guidance"] @question.default_value = params["new-question-default-value"] - respond_to do |format| if @question.save format.html { redirect_to admin_phase_dmptemplate_path(:id => @question.section.version.phase_id, :version_id => @question.section.version_id, :section_id => @question.section_id, :question_id => @question.id, :edit => 'true'), notice: I18n.t('org_admin.templates.created_message') } @@ -416,6 +416,10 @@ @phase = @version.phase respond_to do |format| + + +puts "PARAMS: #{params[:question]}" + if @question.update_attributes(params[:question]) format.html { redirect_to admin_phase_dmptemplate_path(:id => @phase.id, :version_id => @version.id, :section_id => @section.id, :question_id => @question.id, :edit => 'true'), notice: I18n.t('org_admin.templates.updated_message') } format.json { head :no_content } @@ -500,7 +504,67 @@ end end +# GUIDANCES + #create a guidance + def admin_createguidance + if user_signed_in? && current_user.is_org_admin? then + @question = Question.find(params[:question][:id]) + @guidance = Guidance.new(params[:guidance]) + @guidance.question_id = @question.id + #@question.guidance = params["new-question-guidance"] + #@question.default_value = params["new-question-default-value"] + + + respond_to do |format| + if @guidance.save + format.html { redirect_to admin_phase_dmptemplate_path(:id => @question.section.version.phase_id, :version_id => @question.section.version_id, :section_id => @question.section_id, :question_id => @question.id, :edit => 'true'), notice: I18n.t('org_admin.templates.created_message') } + format.json { head :no_content } + else + format.html { render action: "admin_phase" } + format.json { render json: @guidance.errors, status: :unprocessable_entity } + end + end + end + end + + #update a guidance of a template + def admin_updateguidance + if user_signed_in? && current_user.is_org_admin? then + @question = Question.find(params[:id]) + @question.guidance = params["question-guidance-#{params[:id]}"] + @question.default_value = params["question-default-value-#{params[:id]}"] + @section = @question.section + @version = @section.version + @phase = @version.phase + + respond_to do |format| + if @question.update_attributes(params[:question]) + format.html { redirect_to admin_phase_dmptemplate_path(:id => @phase.id, :version_id => @version.id, :section_id => @section.id, :question_id => @question.id, :edit => 'true'), notice: I18n.t('org_admin.templates.updated_message') } + format.json { head :no_content } + else + format.html { render action: "admin_phase" } + format.json { render json: @question.errors, status: :unprocessable_entity } + end + end + end + end + + #delete a version, sections and guidance + def admin_destroyguidance + if user_signed_in? && current_user.is_org_admin? then + @question = Question.find(params[:question_id]) + @section = @question.section + @version = @section.version + @phase = @version.phase + @question.destroy + + respond_to do |format| + format.html { redirect_to admin_phase_dmptemplate_path(:id => @phase.id, :version_id => @version.id, :section_id => @section.id, :edit => 'true'), notice: I18n.t('org_admin.templates.destroyed_message') } + format.json { head :no_content } + end + end + end end diff --git a/app/controllers/guidances_controller.rb b/app/controllers/guidances_controller.rb index a05db00..817c0d9 100644 --- a/app/controllers/guidances_controller.rb +++ b/app/controllers/guidances_controller.rb @@ -37,33 +37,33 @@ @phases = nil @dmptemplates.each do |template| if @phases.nil? then - @phases = template.phases.find(:all,:order => 'number ASC') + @phases = template.phases.all.order('number') else - @phases = @phases + template.phases.find(:all,:order => 'number ASC') + @phases = @phases + template.phases.all.order('number') end end @versions = nil @phases.each do |phase| if @versions.nil? then - @versions = phase.versions.find(:all,:order => 'title ASC') + @versions = phase.versions.all.order('title') else - @versions = @versions + phase.versions.find(:all,:order => 'title ASC') + @versions = @versions + phase.versions.all.order('title') end end @sections = nil @versions.each do |version| if @sections.nil? then - @sections = version.sections.find(:all,:order => 'number ASC') + @sections = version.sections.all.order('number') else - @sections = @sections + version.sections.find(:all,:order => 'number ASC') + @sections = @sections + version.sections.all.order('number') end end @questions = nil @sections.each do |section| if @questions.nil? then - @questions = section.questions.find(:all,:order => 'number ASC') + @questions = section.questions.all.order('number') else - @questions = @questions + section.questions.find(:all,:order => 'number ASC') + @questions = @questions + section.questions.all.order('number') end end respond_to do |format| @@ -77,10 +77,10 @@ # updates phases, versions, sections and questions based on template selected dmptemplate = Dmptemplate.find(params[:dmptemplate_id]) # map to title and id for use in our options_for_select - @phases = dmptemplate.phases.map{|a| [a.title, a.id]}.insert(0, "Select a phase") - @versions = dmptemplate.versions.map{|s| [s.title, s.id]}.insert(0, "Select a version") - @sections = dmptemplate.sections.map{|s| [s.title, s.id]}.insert(0, "Select a section") - @questions = dmptemplate.questions.map{|s| [s.text, s.id]}.insert(0, "Select a question") + @phases = dmptemplate.phases.map{|a| [a.title, a.id]}.insert(0, I18n.t('helpers.select_phase')) + @versions = dmptemplate.versions.map{|s| [s.title, s.id]}.insert(0, I18n.t('helpers.select_version')) + @sections = dmptemplate.sections.map{|s| [s.title, s.id]}.insert(0, I18n.t('helpers.select_section')) + @questions = dmptemplate.questions.map{|s| [s.text, s.id]}.insert(0, I18n.t('helpers.select_question')) end @@ -88,23 +88,23 @@ # updates versions, sections and questions based on phase selected phase = Phase.find(params[:phase_id]) # map to name and id for use in our options_for_select - @versions = phase.versions.map{|s| [s.title, s.id]}.insert(0, "Select a version") - @sections = phase.sections.map{|s| [s.title, s.id]}.insert(0, "Select a section") - @questions = phase.questions.map{|s| [s.text, s.id]}.insert(0, "Select a question") + @versions = phase.versions.map{|s| [s.title, s.id]}.insert(0, I18n.t('helpers.select_version')) + @sections = phase.sections.map{|s| [s.title, s.id]}.insert(0, I18n.t('helpers.select_section')) + @questions = phase.questions.map{|s| [s.text, s.id]}.insert(0, I18n.t('helpers.select_question')) end def update_sections # updates sections and questions based on version selected version = Version.find(params[:version_id]) # map to name and id for use in our options_for_select - @sections = version.sections.map{|s| [s.title, s.id]}.insert(0, "Select a section") - @questions = version.questions.map{|s| [s.text, s.id]}.insert(0, "Select a question") + @sections = version.sections.map{|s| [s.title, s.id]}.insert(0, I18n.t('helpers.select_section')) + @questions = version.questions.map{|s| [s.text, s.id]}.insert(0, I18n.t('helpers.select_question')) end def update_questions # updates songs based on artist selected section = Section.find(params[:section_id]) - @questions = section.questions.map{|s| [s.text, s.id]}.insert(0, "Select a question") + @questions = section.questions.map{|s| [s.text, s.id]}.insert(0, I18n.t('helpers.select_question')) end @@ -116,33 +116,33 @@ @phases = nil @dmptemplates.each do |template| if @phases.nil? then - @phases = template.phases.find(:all,:order => 'number ASC') + @phases = template.phases.all.order('number') else - @phases = @phases + template.phases.find(:all,:order => 'number ASC') + @phases = @phases + template.phases.all.order('number') end end @versions = nil @phases.each do |phase| if @versions.nil? then - @versions = phase.versions.find(:all,:order => 'title ASC') + @versions = phase.versions.all.order('title') else - @versions = @versions + phase.versions.find(:all,:order => 'title ASC') + @versions = @versions + phase.versions.all.order('title') end end @sections = nil @versions.each do |version| if @sections.nil? then - @sections = version.sections.find(:all,:order => 'number ASC') + @sections = version.sections.all.order('number') else - @sections = @sections + version.sections.find(:all,:order => 'number ASC') + @sections = @sections + version.sections.all.order('number') end end @questions = nil @sections.each do |section| if @questions.nil? then - @questions = section.questions.find(:all,:order => 'number ASC') + @questions = section.questions.all.order('number') else - @questions = @questions + section.questions.find(:all,:order => 'number ASC') + @questions = @questions + section.questions.all.order('number') end end else diff --git a/app/controllers/organisation_users_controller.rb b/app/controllers/organisation_users_controller.rb index 2ff63c3..4693650 100644 --- a/app/controllers/organisation_users_controller.rb +++ b/app/controllers/organisation_users_controller.rb @@ -1,19 +1,25 @@ class OrganisationUsersController < ApplicationController - - def admin_index - if user_signed_in? && current_user.is_org_admin? then - - respond_to do |format| - format.html # index.html.erb - format.json { render json: @organisation_users } - end - else - render(:file => File.join(Rails.root, 'public/403.html'), :status => 403, :layout => false) - end - end - - - - + def admin_index + if user_signed_in? && current_user.is_org_admin? then + # find excluded user_id's + excluded_ids = params[:user_ids] + excluded_ids.each do |user_id| + User.find(user_id).remove_token + end + # remove their api_tokens + # find included user id's + params[:user_ids].each do |user_id| + User.find(user_id).keep_or_generate_token + end + # keep_or_generate_token + respond_to do |format| + format.html # index.html.erb + format.json { render json: @organisation_users } + end + else + 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/controllers/plans_controller.rb b/app/controllers/plans_controller.rb index 6365f6f..4396be1 100644 --- a/app/controllers/plans_controller.rb +++ b/app/controllers/plans_controller.rb @@ -13,7 +13,7 @@ end elsif !@plan.readable_by(current_user.id) then respond_to do |format| - format.html { redirect_to projects_url, notice: "This account does not have access to that plan." } + format.html { redirect_to projects_url, notice: I18n.t('helpers.settings.plans.errors.no_access_account') } end end end @@ -25,11 +25,11 @@ if user_signed_in? && @plan.editable_by(current_user.id) then respond_to do |format| if @plan.update_attributes(params[:plan]) - format.html { redirect_to @plan, notice: 'Plan was successfully updated.' } + format.html { redirect_to @plan, notice: I18n.t('helpers.project.success_update') } format.json { head :no_content } else format.html { render action: "edit" } - format.json { render json: @plan.errors, status: :unprocessable_entity } + format.json { render json: @plan.errors, status: :unprocessablne_entity } end end else @@ -204,7 +204,7 @@ end elsif !@plan.editable_by(current_user.id) then respond_to do |format| - format.html { redirect_to projects_url, notice: "This account does not have access to that plan." } + format.html { redirect_to projects_url, notice: I18n.t('helpers.settings.plans.errors.no_access_account') } end end end diff --git a/app/controllers/project_groups_controller.rb b/app/controllers/project_groups_controller.rb index 2742852..776bad9 100644 --- a/app/controllers/project_groups_controller.rb +++ b/app/controllers/project_groups_controller.rb @@ -12,12 +12,12 @@ if (user_signed_in?) && @project_group.project.administerable_by(current_user.id) then respond_to do |format| if params[:project_group][:email].present? && params[:project_group][:email].length > 0 then - message = 'User added to project' + message = I18n.t('helpers.project.user_added') if @project_group.save if @project_group.user.nil? then if User.find_by_email(params[:project_group][:email]).nil? then User.invite!(:email => params[:project_group][:email]) - message = 'Invitation issued successfully.' + message = I18n.t('helpers.project.invitation_success') @project_group.user = User.find_by_email(params[:project_group][:email]) @project_group.save else @@ -38,7 +38,7 @@ format.json { render json: @project_group.errors, status: :unprocessable_entity } end else - flash[:notice] = "Please enter an email address" + flash[:notice] = I18n.t('helpers.project.enter_email') format.html { redirect_to :controller => 'projects', :action => 'share', :id => @project_group.project.slug } format.json { render json: @project_group, status: :created, location: @project_group } end @@ -65,7 +65,7 @@ if (user_signed_in?) && @project_group.project.administerable_by(current_user.id) then respond_to do |format| if @project_group.update_attributes(params[:project_group]) - flash[:notice] = 'Sharing details successfully updated.' + flash[:notice] = I18n.t('helpers.project.sharing_updated') UserMailer.permissions_change_notification(@project_group).deliver format.html { redirect_to :controller => 'projects', :action => 'share', :id => @project_group.project.slug } format.json { head :no_content } @@ -86,7 +86,7 @@ project = @project_group.project @project_group.destroy respond_to do |format| - flash[:notice] = 'Access removed' + flash[:notice] = I18n.t('helpers.project.access_removed') UserMailer.project_access_removed_notification(user, project).deliver format.html { redirect_to :controller => 'projects', :action => 'share', :id => @project_group.project.slug } format.json { head :no_content } diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 84a9d21..6bb8bfc 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -6,7 +6,7 @@ def index if user_signed_in? then if (current_user.shibboleth_id.nil? || current_user.shibboleth_id.length == 0) && !cookies[:show_shib_link].nil? && cookies[:show_shib_link] == "show_shib_link" then - flash.notice = "Would you like to #{view_context.link_to 'link your DMPonline account to your institutional credentials?', user_omniauth_shibboleth_path}".html_safe + flash.notice = "Would you like to #{view_context.link_to I18n.t('helpers.shibboleth_to_link_text'), user_omniauth_shibboleth_path}".html_safe end @projects = current_user.projects.filter(params[:filter]) @@ -38,7 +38,7 @@ end elsif user_signed_in? then respond_to do |format| - format.html { redirect_to projects_url, notice: "This account does not have access to that plan." } + format.html { redirect_to projects_url, notice: I18n.t('helpers.settings.plans.errors.no_access_account') } end else respond_to do |format| @@ -76,7 +76,7 @@ end elsif !@project.editable_by(current_user.id) then respond_to do |format| - format.html { redirect_to projects_url, notice: "This account does not have access to that plan." } + format.html { redirect_to projects_url, notice: I18n.t('helpers.settings.plans.errors.no_access_account') } end end end @@ -89,7 +89,7 @@ end elsif !@project.editable_by(current_user.id) then respond_to do |format| - format.html { redirect_to projects_url, notice: "This account does not have access to that plan." } + format.html { redirect_to projects_url, notice: I18n.t('helpers.settings.plans.errors.no_access_account') } end end end @@ -113,6 +113,7 @@ def create if user_signed_in? then @project = Project.new(params[:project]) + if @project.dmptemplate.nil? && params[:project][:funder_id] != "" then # this shouldn't be necessary - see setter for funder_id in project.rb funder = Organisation.find(params[:project][:funder_id]) if funder.dmptemplates.count == 1 then @@ -126,6 +127,7 @@ end end @project.principal_investigator = current_user.name(false) + @project.title = I18n.t('helpers.project.my_project_name')+' ('+@project.dmptemplate.title+')' @project.assign_creator(current_user.id) respond_to do |format| @@ -149,7 +151,7 @@ if user_signed_in? && @project.editable_by(current_user.id) then respond_to do |format| if @project.update_attributes(params[:project]) - format.html { redirect_to @project, notice: 'Project was successfully updated.' } + format.html { redirect_to @project, notice: I18n.t('helpers.project.success_update') } format.json { head :no_content } else format.html { render action: "edit" } diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb index 4075d5c4..9df7391 100644 --- a/app/controllers/registrations_controller.rb +++ b/app/controllers/registrations_controller.rb @@ -5,7 +5,7 @@ # POST /resource def create if sign_up_params[:accept_terms] != "1" then - redirect_to after_sign_up_error_path_for(resource), alert: 'You must accept the terms and conditions to register.' + redirect_to after_sign_up_error_path_for(resource), alert: I18n.t('helpers.you_must_accept') else existing_user = User.find_by_email(sign_up_params[:email]) if !existing_user.nil? then @@ -13,7 +13,7 @@ @user = existing_user do_update(false, true) else - redirect_to after_sign_up_error_path_for(resource), alert: 'That email address is already registered.' + redirect_to after_sign_up_error_path_for(resource), alert: I18n.t('helpers.email_already_registered') end else build_resource(sign_up_params) @@ -29,7 +29,7 @@ end else clean_up_passwords resource - redirect_to after_sign_up_error_path_for(resource), alert: 'Error processing registration. Please check that you have entered a valid email address and that your chosen password is at least 8 characters long.' + redirect_to after_sign_up_error_path_for(resource), alert: I18n.t('helpers.error_registration_check') end end end @@ -87,9 +87,9 @@ sign_in @user, :bypass => true if params[:unlink_flag] == 'true' then - redirect_to({:controller => "registrations", :action => "edit"}, {:notice => "Details successfully updated."}) + redirect_to({:controller => "registrations", :action => "edit"}, {:notice => I18n.t('helpers.project.details_update_success')}) else - redirect_to({:controller => "projects", :action => "index"}, {:notice => "Details successfully updated."}) + redirect_to({:controller => "projects", :action => "index"}, {:notice => I18n.t('helpers.project.details_update_success')}) end else diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index 45be231..a86c0fa 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -4,7 +4,7 @@ def create existing_user = User.find_by_email(params[:user][:email]) - if !existing_user.nil? && existing_user.dmponline3 && (existing_user.password == "" || existing_user.password.nil?) && existing_user.confirmed_at.nil? then + if !existing_user.nil? && (existing_user.password == "" || existing_user.password.nil?) && existing_user.confirmed_at.nil? then redirect_to :controller => :existing_users, :action => :index, :email => params[:user][:email] else #after authentication verify if session[:shibboleth] exists diff --git a/app/controllers/settings/projects_controller.rb b/app/controllers/settings/projects_controller.rb index 390d777..b0df35c 100644 --- a/app/controllers/settings/projects_controller.rb +++ b/app/controllers/settings/projects_controller.rb @@ -12,7 +12,7 @@ end def update - columns = (params[:columns] || {}).keys.map(&:intern) + columns = (params[:columns] || {}) if @settings.update_attributes(columns: columns) respond_to do |format| diff --git a/app/controllers/themes_controller.rb b/app/controllers/themes_controller.rb index 34059f3..549e6b5 100644 --- a/app/controllers/themes_controller.rb +++ b/app/controllers/themes_controller.rb @@ -44,7 +44,7 @@ respond_to do |format| if @theme.save - format.html { redirect_to @theme, notice: 'Theme was successfully created.' } + format.html { redirect_to @theme, notice: I18n.t('admin.theme_created') } format.json { render json: @theme, status: :created, location: @theme } else format.html { render action: "new" } @@ -60,7 +60,7 @@ respond_to do |format| if @theme.update_attributes(params[:theme]) - format.html { redirect_to @theme, notice: 'Theme was successfully updated.' } + format.html { redirect_to @theme, notice: I18n.t('admin.theme_updated') } format.json { head :no_content } else format.html { render action: "edit" } diff --git a/app/controllers/token_permission_types_controller.rb b/app/controllers/token_permission_types_controller.rb new file mode 100644 index 0000000..4e1b33a --- /dev/null +++ b/app/controllers/token_permission_types_controller.rb @@ -0,0 +1,15 @@ +class TokenPermissionTypesController < ApplicationController + + + def index + if user_signed_in? && current_user.organisation.token_permission_types.count > 0 + @user = current_user + respond_to do |format| + format.html + end + else + 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/controllers/user_org_roles_controller.rb b/app/controllers/user_org_roles_controller.rb index ebe3aac..c31867d 100644 --- a/app/controllers/user_org_roles_controller.rb +++ b/app/controllers/user_org_roles_controller.rb @@ -44,7 +44,7 @@ respond_to do |format| if @user_org_role.save - format.html { redirect_to @user_org_role, notice: 'User org role was successfully created.' } + format.html { redirect_to @user_org_role, notice: I18n.t('org_admin.user_org_created') } format.json { render json: @user_org_role, status: :created, location: @user_org_role } else format.html { render action: "new" } @@ -60,7 +60,7 @@ respond_to do |format| if @user_org_role.update_attributes(params[:user_org_role]) - format.html { redirect_to @user_org_role, notice: 'User org role was successfully updated.' } + format.html { redirect_to @user_org_role, notice: I18n.t('org_admin.user_org_updated') } format.json { head :no_content } else format.html { render action: "edit" } diff --git a/app/controllers/user_role_types_controller.rb b/app/controllers/user_role_types_controller.rb index 90d19eb..e45d86c 100644 --- a/app/controllers/user_role_types_controller.rb +++ b/app/controllers/user_role_types_controller.rb @@ -44,7 +44,7 @@ respond_to do |format| if @user_role_type.save - format.html { redirect_to @user_role_type, notice: 'User role type was successfully created.' } + format.html { redirect_to @user_role_type, notice: I18n.t('admin.user_role_type_created') } format.json { render json: @user_role_type, status: :created, location: @user_role_type } else format.html { render action: "new" } @@ -60,7 +60,7 @@ respond_to do |format| if @user_role_type.update_attributes(params[:user_role_type]) - format.html { redirect_to @user_role_type, notice: 'User role type was successfully updated.' } + format.html { redirect_to @user_role_type, notice: I18n.t('admin.user_role_type_updated') } format.json { head :no_content } else format.html { render action: "edit" } diff --git a/app/controllers/user_statuses_controller.rb b/app/controllers/user_statuses_controller.rb index 61448e6..0e19c5d 100644 --- a/app/controllers/user_statuses_controller.rb +++ b/app/controllers/user_statuses_controller.rb @@ -44,7 +44,7 @@ respond_to do |format| if @user_status.save - format.html { redirect_to @user_status, notice: 'User status was successfully created.' } + format.html { redirect_to @user_status, notice: I18n.t('admin.user_status_created') } format.json { render json: @user_status, status: :created, location: @user_status } else format.html { render action: "new" } @@ -60,7 +60,7 @@ respond_to do |format| if @user_status.update_attributes(params[:user_status]) - format.html { redirect_to @user_status, notice: 'User status was successfully updated.' } + format.html { redirect_to @user_status, notice: I18n.t('admin.user_status_updated') } format.json { head :no_content } else format.html { render action: "edit" } diff --git a/app/controllers/user_types_controller.rb b/app/controllers/user_types_controller.rb index 2c88234..565bdf2 100644 --- a/app/controllers/user_types_controller.rb +++ b/app/controllers/user_types_controller.rb @@ -44,7 +44,7 @@ respond_to do |format| if @user_type.save - format.html { redirect_to @user_type, notice: 'User type was successfully created.' } + format.html { redirect_to @user_type, notice: I18n.t('admin.user_type_updated') } format.json { render json: @user_type, status: :created, location: @user_type } else format.html { render action: "new" } @@ -60,7 +60,7 @@ respond_to do |format| if @user_type.update_attributes(params[:user_type]) - format.html { redirect_to @user_type, notice: 'User type was successfully updated.' } + format.html { redirect_to @user_type, notice: I18n.t('admin.user_type_updated') } format.json { head :no_content } else format.html { render action: "edit" } diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index ed871ef..8fad4df 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -33,7 +33,7 @@ respond_to do |format| if @user.save - format.html { redirect_to @user, notice: 'User was successfully created.' } + format.html { redirect_to @user, notice: I18n.t('admin.user_created') } format.json { render json: @user, status: :created, location: @user } else format.html { render action: "new" } @@ -49,7 +49,7 @@ respond_to do |format| if @user.update_attributes(params[:user]) - format.html { redirect_to({:controller=> "projects", :action => "new"}, {:notice => 'Project was successfully created.'}) } + format.html { redirect_to({:controller=> "projects", :action => "new"}, {:notice => I18n.t('helpers.project.create_success') }) } format.json { head :no_content } else format.html { render action: "edit" } @@ -57,9 +57,7 @@ end end end - - - + # DELETE /users/1 # DELETE /users/1.json @@ -72,4 +70,42 @@ format.json { head :no_content } end end + + def admin_index + if user_signed_in? && current_user.is_org_admin? then + respond_to do |format| + format.html # index.html.erb + format.json { render json: @organisation_users } + end + else + render(:file => File.join(Rails.root, 'public/403.html'), :status => 403, :layout => false) + end + end + + def admin_api_update + if user_signed_in? && current_user.is_org_admin? then + #iterate through all org users + current_user.organisation.users.each do |user| + if !params[:user_ids].nil? + user_ids = params[:user_ids].map(&:to_i) + # if user_id in passed params + if user_ids.include? user.id + # run generate_or_keep + user.keep_or_generate_token! + # if not in passed params + else + # remove the token + user.remove_token! + end + else + # no users selected so remove all tokens + user.remove_token! + end + end + #redirect_to admin_index + else + render(:file => File.join(Rails.root, 'public/403.html'), :status => 403, :layout => false) + end + end + end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 7ffcb0a..2f3bae1 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -14,17 +14,4 @@ def javascript(*files) content_for(:head) { javascript_include_tag(*files) } end - - - def link_to_add_object(name, f, association, css_class, i) - new_object = f.object.class.reflect_on_association(association).klass.new - fields = f.fields_for(association, new_object, :child_index => "new_#{association}") do |builder| - j = i + 1 - new_object.number = j - render(association.to_s.singularize + "_fields", :f => builder) - end - link_to_function(name, "add_object(this, \"#{association}\", \"#{escape_javascript(fields)}\")", :class => css_class) - end - - end diff --git a/app/helpers/plans_helper.rb b/app/helpers/plans_helper.rb index 9c627cf..f5cf56d 100644 --- a/app/helpers/plans_helper.rb +++ b/app/helpers/plans_helper.rb @@ -1,21 +1,23 @@ module PlansHelper def project_list_head(column) - klass = case column - when :name then :dmp_th_big - when :description then :dmp_th_big + klass = case column[0] + when 'name' then :dmp_th_big + when 'description' then :dmp_th_big else :dmp_th_small end - content_tag(:th, t("helpers.project.columns.#{column}"), class: klass) + content_tag(:th, t("helpers.project.columns.#{column[0]}"), class: klass) end def project_list_body(column, project) - klass, content = case column - when :name + klass, content = case column[0] + when 'name' [ "dmp_td_big", link_to(project.title, project_path(project), class: "dmp_table_link") ] - when :owner + + when 'owner' user = project.owner + text = if user.nil? "Unknown" elsif user == current_user @@ -25,16 +27,16 @@ end [ "tmp_td_small", text ] - when :shared + when 'shared' shared_num = project.project_groups.count - 1 text = shared_num > 0 ? (t("helpers.yes_label") + " (with #{shared_num} people) ") : t("helpers.no_label") [ "dmp_td_small", text ] - when :last_edited + when 'last_edited' [ "dmp_td_small", l(project.latest_update.to_date, formats: :short) ] - when :description - [ "dmp_td_medium", (project.try(column) || "Unknown") ] + when 'description' + [ "dmp_td_medium", (project.try(column[0]) || "Unknown") ] else - [ "dmp_td_small", (project.try(column) || "Unknown") ] + [ "dmp_td_small", (project.try(column[0]) || "Unknown") ] end content_tag(:td, content, class: klass) diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb index 4da5c9b..02c490e 100644 --- a/app/mailers/user_mailer.rb +++ b/app/mailers/user_mailer.rb @@ -1,19 +1,24 @@ class UserMailer < ActionMailer::Base - default from: 'info@dcc.ac.uk' + default from: I18n.t('helpers.main_email.from') def sharing_notification(project_group) @project_group = project_group - mail(to: @project_group.user.email, subject: "You have been given access to a Data Management Plan") + mail(to: @project_group.user.email, subject: I18n.t('helpers.main_email.access_given')) end def permissions_change_notification(project_group) @project_group = project_group - mail(to: @project_group.user.email, subject: "DMP permissions changed") + mail(to: @project_group.user.email, subject: I18n.t('helpers.main_email.permission_changed')) end def project_access_removed_notification(user, project) @user = user @project = project - mail(to: @user.email, subject: "DMP access removed") + mail(to: @user.email, subject: I18n.t('helpers.main_email.access_removed')) end + + def api_token_granted_notification(user) + @user = user + mail(to: @user.email, subject: I18n.t('helper.api_mail_subject')) + end end \ No newline at end of file diff --git a/app/models/admin_user.rb b/app/models/admin_user.rb new file mode 100644 index 0000000..28b7223 --- /dev/null +++ b/app/models/admin_user.rb @@ -0,0 +1,4 @@ +class AdminUser < ActiveRecord::Base + devise :database_authenticatable, :recoverable, :rememberable, :trackable, :validatable + attr_accessible :email, :password, :password_confirmation, :remember_me +end diff --git a/app/models/answer.rb b/app/models/answer.rb index 279f038..7c2e4dd 100644 --- a/app/models/answer.rb +++ b/app/models/answer.rb @@ -4,8 +4,9 @@ belongs_to :question belongs_to :user belongs_to :plan - accepts_nested_attributes_for :question - accepts_nested_attributes_for :plan + +# accepts_nested_attributes_for :question +# accepts_nested_attributes_for :plan has_and_belongs_to_many :options, join_table: "answers_options" diff --git a/app/models/dmptemplate.rb b/app/models/dmptemplate.rb index 0e2aac4..502a8b5 100644 --- a/app/models/dmptemplate.rb +++ b/app/models/dmptemplate.rb @@ -1,108 +1,156 @@ class Dmptemplate < ActiveRecord::Base - - attr_accessible :organisation_id, :description, :published, :title, :user_id, :locale, :is_default, :guidance_group_ids, :as => [:default, :admin] - + attr_accessible :id, :organisation_id, :description, :published, :title, :user_id, :locale, + :is_default, :guidance_group_ids, :as => [:default, :admin] + #associations between tables has_many :phases - has_many :versions, :through => :phases - has_many :sections, :through => :versions - has_many :questions, :through => :sections + has_many :versions, through: :phases + has_many :sections, through: :versions + has_many :questions, through: :sections has_many :projects - + #has_many :guidances needs to be removed and checked - + belongs_to :organisation - + has_and_belongs_to_many :guidance_groups, join_table: "dmptemplates_guidance_groups" - + accepts_nested_attributes_for :guidance_groups accepts_nested_attributes_for :phases accepts_nested_attributes_for :organisation accepts_nested_attributes_for :projects - + has_settings :export, class_name: 'Settings::Dmptemplate' do |s| s.key :export, defaults: Settings::Dmptemplate::DEFAULT_SETTINGS end - + + ## + # Converts a DMPtemplate object into a string containing it's title + # + # @return [String] the title of the DMPtemplate def to_s "#{title}" end - + + ## + # takes a type or organisation and returns all published templates from + # organisations of that type + # + # @param ot [String] name of an organisation type e.g. founder + # @return [Array] list of published dmptemplates def self.templates_org_type(ot) - new_org_obejcts = OrganisationType.find_by_name(ot).organisations - + # DISCUSS - This function other than the check for the template being published + # is a superclass for the below funders_templates + new_org_obejcts = OrganisationType.find_by( name: ot ).organisations + org_templates = Array.new new_org_obejcts.each do |neworg| org_templates += neworg.dmptemplates.where("published = ?", true) end - - return org_templates - end - #returns all funders templates + return org_templates + end + + ## + # returns all templates from all organisations of the Organisation_Type funder + # + # @return [Array] all templates from funder organisations def self.funders_templates - new_org_obejcts = OrganisationType.find_by_name(I18n.t("helpers.org_type.funder")).organisations + new_org_obejcts = OrganisationType.find_by(name: I18n.t("helpers.org_type.funder")).organisations org_templates = Array.new - + new_org_obejcts.each do |neworg| org_templates += neworg.dmptemplates end - - return org_templates + + return org_templates end - - - #returns all institutional templates bellowing to the current user's org + + ## + # returns all institutional templates bellowing to the given organisation + # + # @param org_id [integer] the integer id for an organisation + # @return [Array] all templates from a user's organisation def self.own_institutional_templates(org_id) + # DISCUSS - Why is this done by scanning organisation_id's from the templates + # yet all other calls are done by finding an organisation, and using the + # has_many relationship to find the dmptemplates? + # - A possible answer is that there may be deleted organisations which we are + # serching for templates for. + # - A standardised behavior on querries, wether through active reccord or the + # where, should maybe be thought of/decided upon new_templates = self.where("organisation_id = ?", org_id) return new_templates end - - #returns an array with all funders and own institutional templates + + ## + # returns an array with all funders and of the given organisations's + # institutional templates + # + # @param org_id [integer] the integer id for an organisation + # @return [Array] all templates from the template's organisation + # or from a funder organisation def self.funders_and_own_templates(org_id) funders_templates = self.funders_templates - - #verify if org type is not a funder - current_org = Organisation.find(org_id) - if current_org.organisation_type.name != I18n.t("helpers.org_type.funder") then - own_institutional_templates = self.own_institutional_templates(org_id) - else - own_institutional_templates = [] - end - + # DISCUSS - Here we internationalise the word funder. There is code in the + # api that just uses the english word funder. Why are we internationalising + # the database querry, and do I need to change things like this elsewhere? + + #verify if org type is not a funder + current_org = Organisation.find(org_id) + if current_org.organisation_type.name != I18n.t("helpers.org_type.funder") then + own_institutional_templates = self.own_institutional_templates(org_id) + else + own_institutional_templates = [] + end + templates_list = Array.new templates_list += own_institutional_templates templates_list += funders_templates templates_list = templates_list.sort_by { |f| f['title'].downcase } - + return templates_list end - + + ## + # Returns the string name of the organisation type of the organisation who + # owns this dmptemplate + # + # @return [string] the string name of an organisation type def org_type org_type = organisation.organisation_type.name return org_type end - - #verify if a template has customisation by current user's org + + ## + # Verify if a template has customisation by given organisation + # + # @param org_id [integer] the integer id for an organisation + # @param temp [dmptemplate] a template object + # @return [Boolean] true if temp has customisation by the given organisation def has_customisations?(org_id, temp) + # EXPLAIN - I dont Understand the data model here. If the template isnt + # owned by the organisation, how can it make changes to a section? + # Why cant the owner make customisations? if temp.organisation_id != org_id then temp.phases.each do |phase| phase.versions.each do |version| version.sections.each do |section| - return true if section.organisation_id == org_id - - end + return true if section.organisation_id == org_id + end end - return false + return false end else - return false - end + return false + end end - - + + ## # verify if there are any publish version for the template + # + # @return [Boolean] true if there is a published version for the template def has_published_versions? phases.each do |phase| return true if !phase.latest_published_version.nil? diff --git a/app/models/exported_plan.rb b/app/models/exported_plan.rb index 218041f..36dd019 100644 --- a/app/models/exported_plan.rb +++ b/app/models/exported_plan.rb @@ -5,10 +5,10 @@ #associations between tables belongs_to :plan belongs_to :user + + VALID_FORMATS = ['csv', 'html', 'json', 'pdf', 'text', 'xml', 'docx'] - VALID_FORMATS = %i( csv html json pdf text xml docx) - - validates :format, inclusion: { in: VALID_FORMATS, message: '%{value} is not a valid format' } + validates :format, inclusion: { in: VALID_FORMATS, message: I18n.t('helpers.plan.export.not_valid_format') } # Store settings with the exported plan so it can be recreated later # if necessary (otherwise the settings associated with the plan at a @@ -100,7 +100,7 @@ answer = self.plan.answer(question.id, false) if answer.nil? || answer.text.nil? then - output += "Question not answered.\n" + output += I18n.t('helpers.plan.export.pdf.question_not_answered')+ "\n" else output += answer.options.collect {|o| o.text}.join("\n") if question.option_comment_display == true then diff --git a/app/models/guidance.rb b/app/models/guidance.rb index 366222b..183f771 100644 --- a/app/models/guidance.rb +++ b/app/models/guidance.rb @@ -1,61 +1,144 @@ # [+Project:+] DMPonline v4 -# [+Description:+] -# This class keeps the information organisations enter to support users when answering questions. +# [+Description:+] +# This class keeps the information organisations enter to support users when answering questions. # It always belongs to a guidance group class and it can be linked directly to a question or through one or more themes # [+Created:+] 07/07/2014 -# [+Copyright:+] Digital Curation Centre +# [+Copyright:+] Digital Curation Centre class Guidance < ActiveRecord::Base - #associations between tables + #associations between tables attr_accessible :text, :question_id, :published, :as => [:default, :admin] - attr_accessible :guidance_group_ids, :as => [:default, :admin] - attr_accessible :theme_ids, :as => [:default, :admin] - - belongs_to :question - - #belongs_to :dmptemplate - #belongs_to :theme - - has_and_belongs_to_many :guidance_groups, join_table: "guidance_in_group" - has_and_belongs_to_many :themes, join_table: "themes_in_guidance" - - accepts_nested_attributes_for :themes - accepts_nested_attributes_for :guidance_groups - - - #verifies if one guidance belongs to a org + + attr_accessible :guidance_group_ids, :as => [:default, :admin] + attr_accessible :theme_ids, :as => [:default, :admin] + + belongs_to :question + + #belongs_to :dmptemplate + #belongs_to :theme + + has_and_belongs_to_many :guidance_groups, join_table: "guidance_in_group" + has_and_belongs_to_many :themes, join_table: "themes_in_guidance" + + accepts_nested_attributes_for :themes + accepts_nested_attributes_for :guidance_groups + + + ## + # Determine if a guidance is in a group which belongs to a specified organisation + # + # @param org_id [Integer] the integer id for an organisation + # @return [Boolean] true if this guidance is in a group belonging to the specified organisation, false otherwise def in_group_belonging_to?(organisation_id) guidance_groups.each do |guidance_group| - if guidance_group.organisation_id == organisation_id then + if guidance_group.organisation_id == organisation_id return true end end return false end - - - #all guidance that belong to an organisation + + ## + # returns all guidance that belongs to a specified organisation + # + # @param org_id [Integer] the integer id for an organisation + # @return [Array] list of guidance def self.by_organisation(org_id) - all_guidance = Guidance.all - org_guidance = Array.new - - all_guidance.each do |guidance| - if guidance.in_group_belonging_to?(org_id) then - org_guidance << guidance - end - end - + org_guidance = [] + Organisation.find_by(id: org_id).guidance_groups.each do |group| + org_guidance += group.guidances + end return org_guidance - end - - + + ## + # returns all templates belgonging to a specified guidance group + # + # @param guidance_group [Integer] the integer id for an guidance_group + # @return [Array] list of templates def get_guidance_group_templates? (guidance_group) - templates = guidancegroups.where("guidance_group_id (?)", guidance_group.id).template + # DISCUSS - here we have yet another way of finding a specific or group of + # an object. Would it make sense to standardise the project by only using + # either finders or where, or alteast the same syntax within the where statement. + # Also why is this a ? method... it dosent return a boolean + # Additionally, shouldnt this be a function of guidance group, not guidance? + # and finally, it should be a self.method, as it dosent care about the guidance it's acting on + templates = guidancegroups.where("guidance_group_id (?)", guidance_group.id).template return templates - end - - + end + + ## + # Returns whether or not a given user can view a given guidance + # we define guidances viewable to a user by those owned by a guidance group: + # owned by the DCC + # owned by a funder organisation + # owned by an organisation, of which the user is a member + # + # @param id [Integer] the integer id for a guidance + # @param user [User] a user object + # @return [Boolean] true if the specified user can view the specified guidance, false otherwise + def self.can_view?(user, id) + guidance = Guidance.find_by(id: id) + viewable = false + + # guidances may belong to many guidance groups, so we check the above case for each + guidance.guidance_groups.each do |guidance_group| + + # guidances are viewable if they are owned by any of the user's organisations + user.organisations.each do |organisation| + logger.debug "#{organisation.name}" + + if guidance_group.organisation.id == organisation.id + viewable = true + end + end + + # guidance groups are viewable if they are owned by the DCC + if guidance_group.organisation.id == Organisation.find_by( name: "Digital Curation Centre").id + viewable = true + end + + # guidance groups are viewable if they are owned by a funder + if guidance_group.organisation.organisation_type == OrganisationType.find_by( name: "Funder") + viewable = true + end + end + + return viewable + end + + ## + # Returns a list of all guidances which a specified user can view + # we define guidances viewable to a user by those owned by a guidance group: + # owned by the DCC + # owned by a funder organisation + # owned by an organisation, of which the user is a member + # + # @param user [User] a user object + # @return [Array] a list of all "viewable" guidances to a user + def self.all_viewable(user) + dcc_groups = (Organisation.find_by name: "Digital Curation Centre").guidance_groups + # find all groups owned by a Funder organisation + funder_groups = [] + funders = OrganisationType.find_by( name: "Funder") + funders.organisations.each do |funder| + funder_groups += funder.guidance_groups + end + # find all groups owned by any of the user's organisations + organisation_groups = [] + user.organisations.each do |organisation| + organisation_groups += organisation.guidance_groups + end + # find all guidances belonging to any of the viewable groups + all_viewable_guidances = [] + all_viewable_groups = dcc_groups + funder_groups + organisation_groups + all_viewable_groups.each do |group| + all_viewable_guidances += group.guidances + end + # pass the list of viewable guidances to the view + return all_viewable_guidances + end + end diff --git a/app/models/guidance_group.rb b/app/models/guidance_group.rb index b1d1e20..eb06b2a 100644 --- a/app/models/guidance_group.rb +++ b/app/models/guidance_group.rb @@ -1,22 +1,33 @@ class GuidanceGroup < ActiveRecord::Base - + #associations between tables belongs_to :organisation - + has_and_belongs_to_many :guidances, join_table: "guidance_in_group" - + has_and_belongs_to_many :projects, join_table: "project_guidance" has_and_belongs_to_many :dmptemplates, join_table: "dmptemplates_guidance_groups" accepts_nested_attributes_for :dmptemplates - + attr_accessible :organisation_id, :name, :optional_subset, :published, :as => [:default, :admin] attr_accessible :dmptemplate_ids, :as => [:default, :admin] - + + ## + # Converts a guidance group to a string containing the display name + # + # @return [String] the name of the organisation, with or without the name of the guidance group def to_s "#{display_name}" end - + + ## + # Converts the current guidance group to a string containing the display name. + # If it's organisation has no other guidance groups, then the name is simply + # the name of the parent organisation, otherwise it returns the name of the + # organisation followed by the name of the guidance group. + # + # @return [String] the display name for the guidance group def display_name if organisation.guidance_groups.count > 1 return "#{organisation.name}: #{name}" @@ -24,7 +35,12 @@ return organisation.name end end - + + ## + # Returns the list of all guidance groups not coming from the given organisations + # + # @params excluded_orgs [Array] a list of organisations to exclude in the result + # @return [Array] a list of guidance groups def self.guidance_groups_excluding(excluded_orgs) excluded_org_ids = Array.new excluded_orgs.each do |org| @@ -33,9 +49,75 @@ return_orgs = GuidanceGroup.where("organisation_id NOT IN (?)", excluded_org_ids) return return_orgs end - - - - - + + ## + # Returns whether or not a given user can view a given guidance group + # we define guidances viewable to a user by those owned by: + # the DCC + # a funder organisation + # an organisation, of which the user is a member + # + # @param id [Integer] the integer id for a guidance group + # @param user [User] a user object + # @return [Boolean] true if the specified user can view the specified guidance group, false otherwise + def self.can_view?(user, id) + guidance_group = GuidanceGroup.find_by(id: id) + viewable = false + + # groups are viewable if they are owned by any of the user's organisations + user.organisations.each do |organisation| + if guidance_group.organisation.id == organisation.id + viewable = true + end + end + # groups are viewable if they are owned by the DCC + Organisation.where( name: "Digital Curation Centre").find_each do |dcc| + if guidance_group.organisation.id == dcc.id + viewable = true + end + end + # groups are viewable if they are owned by a funder + if guidance_group.organisation.organisation_type == OrganisationType.find_by( name: "Funder") + viewable = true + end + + return viewable + end + + ## + # Returns a list of all guidance groups which a specified user can view + # we define guidance groups viewable to a user by those owned by: + # the DCC + # a funder organisation + # an organisation, of which the user is a member + # + # @param user [User] a user object + # @return [Array] a list of all "viewable" guidance groups to a user + def self.all_viewable(user) + # first find all groups owned by the DCC + dcc_groups = [] + Organisation.where( name: "Digital Curation Centre").find_each do |dcc| + dcc_groups = dcc_groups + dcc.guidance_groups + logger.info "another one" + end + + # find all groups owned by a Funder organisation + funder_groups = [] + funders = OrganisationType.find_by( name: "Funder") + logger.debug "found an org type? #{funders.organisations.first.name}" + funders.organisations.each do |funder| + funder_groups = funder_groups + funder.guidance_groups + logger.info "iterating through funders" + end + # find all groups owned by any of the user's organisations + organisation_groups = [] + user.organisations.each do |organisation| + organisation_groups = organisation_groups + organisation.guidance_groups + end + # pass this list to the view with respond_with @all_viewable_groups + all_viewable_groups = dcc_groups + funder_groups + organisation_groups + all_viewable_groups = all_viewable_groups.uniq{|x| x.id} + logger.debug "we finished it?" + return all_viewable_groups + end end diff --git a/app/models/language.rb b/app/models/language.rb new file mode 100644 index 0000000..a402b79 --- /dev/null +++ b/app/models/language.rb @@ -0,0 +1,3 @@ +class Language < ActiveRecord::Base + +end \ No newline at end of file diff --git a/app/models/option.rb b/app/models/option.rb index 442dbdf..09aedaa 100644 --- a/app/models/option.rb +++ b/app/models/option.rb @@ -3,11 +3,11 @@ #associations between tables belongs_to :question - has_many :option_warnings, :dependent => :destroy - has_and_belongs_to_many :answers, join_table: "answers_options" + has_many :option_warnings, :dependent => :destroy + + has_and_belongs_to_many :answers, join_table: "answers_options" attr_accessible :text, :question_id, :is_default, :number, :as => [:default, :admin] - def to_s "#{text}" diff --git a/app/models/org_token_permission.rb b/app/models/org_token_permission.rb new file mode 100644 index 0000000..fe49047 --- /dev/null +++ b/app/models/org_token_permission.rb @@ -0,0 +1,8 @@ +class OrgTokenPermission < ActiveRecord::Base + attr_accessible :organisation_id, :token_permission_type_id, :organisation, :token_permission_type, :as => [:default, :admin] + + #associations between tables + belongs_to :organisation + belongs_to :token_permission_type + +end diff --git a/app/models/organisation.rb b/app/models/organisation.rb index 0d7fe06..a1eef16 100644 --- a/app/models/organisation.rb +++ b/app/models/organisation.rb @@ -1,23 +1,28 @@ class Organisation < ActiveRecord::Base - - #associations between tables - belongs_to :organisation_type - has_many :guidance_groups + #associations between tables + belongs_to :organisation_type + has_many :guidance_groups has_many :dmptemplates - has_many :sections - has_many :users - has_many :option_warnings - has_many :suggested_answers - + has_many :sections + has_many :users, through: :user_org_roles + has_many :option_warnings + has_many :suggested_answers + has_and_belongs_to_many :token_permission_types, join_table: "org_token_permissions" + has_many :user_org_roles - + belongs_to :parent, :class_name => 'Organisation' + has_many :children, :class_name => 'Organisation', :foreign_key => 'parent_id' - accepts_nested_attributes_for :organisation_type +# accepts_nested_attributes_for :organisation_type accepts_nested_attributes_for :dmptemplates + accepts_nested_attributes_for :token_permission_types - #attr_accessible :abbreviation, :banner_text, :description, :domain, :logo_file_name, :name, :stylesheet_file_id, :target_url, :organisation_type_id, :wayfless_entity, :parent_id, :sort_name + attr_accessible :abbreviation, :banner_text, :description, :domain, + :logo_file_name, :name, :stylesheet_file_id, :target_url, + :organisation_type_id, :wayfless_entity, :parent_id, :sort_name, + :token_permission_type_ids def to_s name @@ -41,7 +46,10 @@ return children end - + ## + # returns a list of all guidance groups belonging to other organisations + # + # @return [Array] def self.other_organisations org_types = [I18n.t('helpers.org_type.organisation')] organisations_list = [] @@ -55,6 +63,11 @@ return organisations_list end + ## + # returns a list of all sections of a given version from this organisation and it's parents + # + # @params version_id [Integer] version number of the section + # @return [Array
    ] list of sections def all_sections(version_id) if parent.nil? secs = sections.where("version_id = ?", version_id) @@ -67,6 +80,10 @@ end end + ## + # returns the guidance groups of this organisation and all of it's children + # + # @return [Array] list of guidance groups def all_guidance_groups ggs = guidance_groups children.each do |c| @@ -75,6 +92,10 @@ return ggs end + ## + # returns the highest parent organisation in the tree + # + # @return [organisation] the root organisation def root if parent.nil? return self @@ -83,6 +104,11 @@ end end + ## + # takes in the id of, and returns an OptionWarning + # + # @params option_id [number] the id of the desired warning + # @return [OptionWarning] the specified warning def warning(option_id) warning = option_warnings.find_by_option_id(option_id) if warning.nil? && !parent.nil? then @@ -92,9 +118,20 @@ end end + ## + # returns all published templates belonging to the organisation + # + # @return [Array] published dmptemplates def published_templates return dmptemplates.where("published = ?", 1) end - + def check_api_credentials + if token_permission_types.count == 0 + users.each do |user| + user.api_token = "" + user.save! + end + end + end end diff --git a/app/models/phase.rb b/app/models/phase.rb index 4f18a8e..6cb09ba 100644 --- a/app/models/phase.rb +++ b/app/models/phase.rb @@ -12,11 +12,11 @@ has_many :versions, :dependent => :destroy has_many :sections, :through => :versions, :dependent => :destroy - has_many :questions, :through => :sections, :dependent => :destroy + has_many :questions, :through => :sections, :dependent => :destroy #Link the child's data accepts_nested_attributes_for :versions, :allow_destroy => true - accepts_nested_attributes_for :dmptemplate +# accepts_nested_attributes_for :dmptemplate attr_accessible :description, :number, :title, :dmptemplate_id, :as => [:default, :admin] diff --git a/app/models/plan.rb b/app/models/plan.rb index e2989a3..65cdf1c 100644 --- a/app/models/plan.rb +++ b/app/models/plan.rb @@ -13,9 +13,10 @@ belongs_to :version has_many :answers has_many :plan_sections - accepts_nested_attributes_for :project + +# accepts_nested_attributes_for :project accepts_nested_attributes_for :answers - accepts_nested_attributes_for :version +# accepts_nested_attributes_for :version has_settings :export, class_name: 'Settings::Dmptemplate' do |s| s.key :export, defaults: Settings::Dmptemplate::DEFAULT_SETTINGS @@ -43,7 +44,7 @@ if !self.version.nil? && !self.version.phase.nil? && !self.version.phase.title? then return self.version.phase.title else - return "DMP title" + return I18n.t('tool_title2') end else return self.settings(:export).title diff --git a/app/models/project.rb b/app/models/project.rb index aba6e86..14aa4ba 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -2,7 +2,10 @@ extend FriendlyId - attr_accessible :dmptemplate_id, :title, :organisation_id, :unit_id, :guidance_group_ids, :project_group_ids, :funder_id, :institution_id, :grant_number, :identifier, :description, :principal_investigator, :principal_investigator_identifier, :data_contact, :funder_name, :as => [:default, :admin] + attr_accessible :dmptemplate_id, :title, :organisation_id, :unit_id, :guidance_group_ids, + :project_group_ids, :funder_id, :institution_id, :grant_number, :identifier, + :description, :principal_investigator, :principal_investigator_identifier, + :data_contact, :funder_name, :as => [:default, :admin] #associations between tables belongs_to :dmptemplate @@ -22,17 +25,18 @@ def funder_id=(new_funder_id) if new_funder_id != "" then new_funder = Organisation.find(new_funder_id); - if new_funder.dmptemplates.count == 1 then - dmptemplate = new_funder.dmptemplates.first - end + + if new_funder.dmptemplates.count >= 1 && self.dmptemplate.nil? then + self.dmptemplate = new_funder.dmptemplates.first + end end end def funder_id - if dmptemplate.nil? then + if self.dmptemplate.nil? then return nil end - template_org = dmptemplate.organisation + template_org = self.dmptemplate.organisation if template_org.organisation_type.name == I18n.t('helpers.org_type.funder').downcase return template_org.id else @@ -41,10 +45,10 @@ end def funder - if dmptemplate.nil? then + if self.dmptemplate.nil? then return nil end - template_org = dmptemplate.organisation + template_org = self.dmptemplate.organisation if template_org.organisation_type.name == I18n.t('helpers.org_type.funder').downcase return template_org else diff --git a/app/models/question.rb b/app/models/question.rb index 234d750..6a46f07 100644 --- a/app/models/question.rb +++ b/app/models/question.rb @@ -14,23 +14,24 @@ belongs_to :question_format accepts_nested_attributes_for :answers, :reject_if => lambda {|a| a[:text].blank? }, :allow_destroy => true - accepts_nested_attributes_for :section - accepts_nested_attributes_for :question_format +# accepts_nested_attributes_for :section +# accepts_nested_attributes_for :question_format accepts_nested_attributes_for :options, :reject_if => lambda {|a| a[:text].blank? }, :allow_destroy => true accepts_nested_attributes_for :suggested_answers, :allow_destroy => true accepts_nested_attributes_for :themes - - attr_accessible :theme_ids, :as => [:default, :admin] - attr_accessible :default_value, :dependency_id, :dependency_text, :guidance,:number, :parent_id, :suggested_answer, :text, :section_id,:question_format_id,:options_attributes,:suggested_answers_attributes, :option_comment_display, :as => [:default, :admin] + attr_accessible :default_value, :dependency_id, :dependency_text, :guidance,:number, :parent_id, + :suggested_answer, :text, :section_id,:question_format_id,:options_attributes, + :suggested_answers_attributes, :option_comment_display, :theme_ids, + :as => [:default, :admin] def to_s "#{text}" end amoeba do - include_field :options - include_field :suggested_answers + include_association :options + include_association :suggested_answers clone [:themes] end @@ -72,7 +73,7 @@ GuidanceGroup.where("organisation_id = ?", org_admin.id).each do |group| group.guidances.each do |g| g.themes.where("id IN (?)", theme_ids).each do |gg| - guidances["#{group.name} guidance on #{gg.title}"] = g + guidances["#{group.name} " + I18n.t('admin.guidance_lowercase_on') + " #{gg.title}"] = g end end end @@ -81,7 +82,7 @@ question.guidances.each do |g_by_q| g_by_q.guidance_groups.each do |group| if group.organisation == org_admin - guidances["#{group.name} guidance for this question"] = g_by_q + guidances["#{group.name} " + I18n.t('admin.guidance_lowercase')] = g_by_q end end end diff --git a/app/models/section.rb b/app/models/section.rb index c4ed815..223e350 100644 --- a/app/models/section.rb +++ b/app/models/section.rb @@ -8,7 +8,7 @@ #Link the data accepts_nested_attributes_for :questions, :reject_if => lambda {|a| a[:text].blank? }, :allow_destroy => true - accepts_nested_attributes_for :version +# accepts_nested_attributes_for :version attr_accessible :organisation_id, :description, :number, :title, :version_id , :published, :questions_attributes, :as => [:default, :admin] @@ -17,7 +17,7 @@ end amoeba do - include_field :questions + include_association :questions end end diff --git a/app/models/settings/dmptemplate.rb b/app/models/settings/dmptemplate.rb index 04bc481..65cff2a 100644 --- a/app/models/settings/dmptemplate.rb +++ b/app/models/settings/dmptemplate.rb @@ -11,10 +11,8 @@ VALID_FONT_SIZE_RANGE = (8..14) VALID_MARGIN_RANGE = (5..25) - VALID_ADMIN_FIELDS = %i( - project_name project_identifier grant_title principal_investigator - project_data_contact project_description funder institution - ) + VALID_ADMIN_FIELDS = ['project_name', 'project_identifier', 'grant_title', 'principal_investigator', + 'project_data_contact', 'project_description', 'funder', 'institution'] DEFAULT_SETTINGS = { formatting: { diff --git a/app/models/settings/plan_list.rb b/app/models/settings/plan_list.rb index dc2fbe0..f046cfd 100644 --- a/app/models/settings/plan_list.rb +++ b/app/models/settings/plan_list.rb @@ -4,15 +4,17 @@ #attr_accessible :var, :target, :target_type, :target_id # TODO: can these be taken from somewhere else rather than hard-coded here? - DEFAULT_COLUMNS = %i( name owner shared last_edited ) - ALL_COLUMNS = DEFAULT_COLUMNS + %i( template_owner identifier grant_number principal_investigator data_contact description ) + DEFAULT_COLUMNS = ['name', 'owner', 'shared', 'last_edited'] + ALL_COLUMNS = DEFAULT_COLUMNS + ['template_owner', 'identifier', 'grant_number', + 'principal_investigator', 'data_contact', 'description'] validate do cols = value["columns"] + if cols.present? # columns can be empty, in which case they revert to defaults - errors.add(:columns, I18n.t("helpers.settings.projects.errors.no_name")) unless cols.member?(:name) - errors.add(:columns, I18n.t("helpers.settings.projects.errors.duplicate")) unless cols.uniq == cols - errors.add(:columns, I18n.t("helpers.settings.projects.errors.unknown")) unless (cols.uniq & ALL_COLUMNS) == cols.uniq + errors.add(:columns, I18n.t("helpers.settings.projects.errors.no_name")) unless cols.member?("name") + errors.add(:columns, I18n.t("helpers.settings.projects.errors.duplicate")) unless cols.keys.uniq == cols.keys + errors.add(:columns, I18n.t("helpers.settings.projects.errors.unknown")) unless (cols.keys.uniq & ALL_COLUMNS) == cols.keys.uniq end end end diff --git a/app/models/suggested_answer.rb b/app/models/suggested_answer.rb index 55f5448..01d233e 100644 --- a/app/models/suggested_answer.rb +++ b/app/models/suggested_answer.rb @@ -3,7 +3,7 @@ belongs_to :organisation belongs_to :question - accepts_nested_attributes_for :question +# accepts_nested_attributes_for :question attr_accessible :organisation_id, :question_id, :text, :is_example, :as => [:default, :admin] diff --git a/app/models/theme.rb b/app/models/theme.rb index 19a9daf..70b5b11 100644 --- a/app/models/theme.rb +++ b/app/models/theme.rb @@ -5,8 +5,8 @@ has_and_belongs_to_many :guidances, join_table: "themes_in_guidance" - accepts_nested_attributes_for :guidances - accepts_nested_attributes_for :questions +# accepts_nested_attributes_for :guidances +# accepts_nested_attributes_for :questions attr_accessible :guidance_ids , :as => [:default, :admin] attr_accessible :question_ids, :as => [:default, :admin] diff --git a/app/models/token_permission_type.rb b/app/models/token_permission_type.rb new file mode 100644 index 0000000..8c02ecb --- /dev/null +++ b/app/models/token_permission_type.rb @@ -0,0 +1,12 @@ +class TokenPermissionType < ActiveRecord::Base + + attr_accessible :token_type, :text_desription, :as => [:default, :admin] + + #associations between tables + has_and_belongs_to_many :org_token_permissions, join_table: "org_token_permissions" + + def to_s + self.token_type + end + +end diff --git a/app/models/user.rb b/app/models/user.rb index ac18380..2c0064b 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -15,6 +15,8 @@ has_many :organisations , through: :user_org_roles has_many :user_role_types, through: :user_org_roles + + has_many :projects, through: :project_groups do def filter(query) return self unless query.present? @@ -27,6 +29,7 @@ columns = %i( grant_number identifier description principal_investigator data_contact ) + columns = ['grant_number', 'identifier', 'description', 'principal_investigator', 'data_contact'] columns.each {|col| conditions = conditions.or(t[col].matches(q)) } @@ -34,16 +37,17 @@ end end - has_and_belongs_to_many :roles, :join_table => :users_roles + # Commented out due to warning in Rails 4. This line is redundant due to use of the rolify gem + #has_and_belongs_to_many :roles, :join_table => :users_roles + has_many :plan_sections accepts_nested_attributes_for :roles - #attr_accessible :role_ids - + attr_accessible :password_confirmation, :encrypted_password, :remember_me, :id, :email, :firstname, :last_login,:login_count, :orcid_id, :password, :shibboleth_id, :user_status_id, :surname, :user_type_id, :organisation_id, :skip_invitation, - :other_organisation, :accept_terms, :role_ids, :dmponline3 + :other_organisation, :accept_terms, :role_ids, :dmponline3, :api_token # FIXME: The duplication in the block is to set defaults. It might be better if # they could be set in Settings::PlanList itself, if possible. @@ -61,22 +65,33 @@ end def organisation_id=(new_organisation_id) - if !self.user_org_roles.pluck(:organisation_id).include?(new_organisation_id.to_i) then - if self.user_org_roles.count != 1 then - new_user_org_role = UserOrgRole.new - new_user_org_role.organisation_id = new_organisation_id - new_user_org_role.user_role_type = UserRoleType.find_by_name("user"); - self.user_org_roles << new_user_org_role - else - user_org_role = self.user_org_roles.first - user_org_role.organisation_id = new_organisation_id - user_org_role.save - org_admin_role = roles.find_by_name("org_admin") - unless org_admin_role.nil? then - roles.delete(org_admin_role) - end - end - end + # if the user is not part of the new organisation + if !self.user_org_roles.pluck(:organisation_id).include?(new_organisation_id.to_i) then + # if the user has more than one role + if self.user_org_roles.count != 1 then + new_user_org_role = UserOrgRole.new + new_user_org_role.organisation_id = new_organisation_id + new_user_org_role.user_role_type = UserRoleType.find_by_name("user"); + self.user_org_roles << new_user_org_role + # + # if the user has roles other than one(0/2/3?) + else + # set role to first role + user_org_role = self.user_org_roles.first + # change org_id to new org_id + user_org_role.organisation_id = new_organisation_id + # save modified role + user_org_role.save + # if user has an "org_admin" role + org_admin_role = roles.find_by_name("org_admin") + unless org_admin_role.nil? then + # delete it + roles.delete(org_admin_role) + end + end + end + # rip api_token from user + self.api_token = "" end def organisation_id @@ -116,11 +131,29 @@ org_admin = roles.find_by_name("org_admin") return !org_admin.nil? end - + def org_type org_type = organisation.organisation_type.name return org_type end + def remove_token! + unless api_token.empty? + self.api_token = "" + self.save! + end + end + + def keep_or_generate_token! + if api_token.empty? + self.api_token = loop do + random_token = SecureRandom.urlsafe_base64(nil, false) + break random_token unless User.exists?(api_token: random_token) + end + self.save! + # send an email to the user to notify them of their new api token + UserMailer.api_token_granted_notification(self) + end + end end diff --git a/app/models/version.rb b/app/models/version.rb index 52812ee..13e17c8 100644 --- a/app/models/version.rb +++ b/app/models/version.rb @@ -8,10 +8,11 @@ has_many :plans #Link the data - accepts_nested_attributes_for :phase +# accepts_nested_attributes_for :phase accepts_nested_attributes_for :sections, :allow_destroy => true - attr_accessible :description, :number, :published, :title, :phase_id, :as => [:default, :admin] + attr_accessible :id, :description, :number, :published, :title, :phase_id, + :sections_attributes, :as => [:default, :admin] def to_s "#{title}" @@ -24,8 +25,8 @@ end amoeba do - include_field :sections - include_field :questions + include_association :sections + include_association :questions set :published => 'false' prepend :title => "Copy of " end diff --git a/app/views/admin/dmptemplates/settings.html.erb b/app/views/admin/dmptemplates/settings.html.erb index cc2a3da..b387333 100644 --- a/app/views/admin/dmptemplates/settings.html.erb +++ b/app/views/admin/dmptemplates/settings.html.erb @@ -4,7 +4,7 @@ <%= form_for(@settings, url: update_settings_admin_dmptemplate_path(@template), method: :put, as: 'settings[export][formatting]', html: { class: 'formtastic' }) do |f| %>
    - Formatting + <%= t("admin.formatting")%>
    1. <%= f.label(:font_face, t('helpers.settings.plans.font_face')) %> @@ -22,7 +22,7 @@
    - Max Pages + <%= t("admin.max_pages")%>
    1. <%= label_tag('settings_export_max_pages', t('helpers.settings.plans.max_pages')) %> diff --git a/app/views/api/v0/guidance_groups/index.json.jbuilder b/app/views/api/v0/guidance_groups/index.json.jbuilder new file mode 100644 index 0000000..cae2288 --- /dev/null +++ b/app/views/api/v0/guidance_groups/index.json.jbuilder @@ -0,0 +1,25 @@ +# 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 diff --git a/app/views/api/v0/guidance_groups/show.json.jbuilder b/app/views/api/v0/guidance_groups/show.json.jbuilder new file mode 100644 index 0000000..4408430 --- /dev/null +++ b/app/views/api/v0/guidance_groups/show.json.jbuilder @@ -0,0 +1,24 @@ +# 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 diff --git a/app/views/api/v0/guidances/index.json.jbuilder b/app/views/api/v0/guidances/index.json.jbuilder new file mode 100644 index 0000000..82edd20 --- /dev/null +++ b/app/views/api/v0/guidances/index.json.jbuilder @@ -0,0 +1,29 @@ +# builds a json response to api querry for all guidances + +json.prettify! + +json.guidance @all_viewable_guidances do |guidance| + json.id guidance.id + json.text guidance.text + json.updated_at guidance.updated_at + + # each guidance may be associated with many guidance groups + @guidance_groups = guidance.guidance_groups + json.guidance_groups @guidance_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.optional guidance_group.optional_subset + json.updated guidance_group.updated_at + end + +end diff --git a/app/views/api/v0/guidances/show.json.jbuilder b/app/views/api/v0/guidances/show.json.jbuilder new file mode 100644 index 0000000..be04df7 --- /dev/null +++ b/app/views/api/v0/guidances/show.json.jbuilder @@ -0,0 +1,30 @@ +# builds a json response to api querry for a specific guidance + +json.prettify! + +json.guidance do + json.id @guidance.id + json.text @guidance.text + json.updated_at @guidance.updated_at + + # each guidance may be associated with many guidance groups + @guidance_groups = @guidance.guidance_groups + unless @guidance_groups.empty? + json.guidance_groups @guidance_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.optional guidance_group.optional_subset + json.updated guidance_group.updated_at + end + end +end \ No newline at end of file diff --git a/app/views/api/v0/projects/create.json.jbuilder b/app/views/api/v0/projects/create.json.jbuilder new file mode 100644 index 0000000..8ed26fb --- /dev/null +++ b/app/views/api/v0/projects/create.json.jbuilder @@ -0,0 +1,15 @@ +# builds a json response to a successful project createtion + +json.prettify! + +json.project do + json.title @project.title + # TODO add after decision on user creation/identification + #json.created_by @project.owner.email + json.id @project.id + json.created_at @project.created_at +end + +# json.location do +# json.link (url_for action: 'show', controller: 'project') +# end diff --git a/app/views/api/v0/projects/show.json.jbuilder b/app/views/api/v0/projects/show.json.jbuilder new file mode 100644 index 0000000..6e9d391 --- /dev/null +++ b/app/views/api/v0/projects/show.json.jbuilder @@ -0,0 +1,13 @@ +# builds a json response to a successful project createtion + +json.prettify! + +json.project do + json.title @project.title + # TODO add after decision on user creation/identification + json.created_by @project.owner.email + json.id @project.id + json.created_at @project.created_at + #json.template @project.dmptemplate + json.dmptemplate @project.dmptemplate.title +end diff --git a/app/views/contact_us/contacts/new.html.erb b/app/views/contact_us/contacts/new.html.erb index 0e77176..f2ae0c4 100644 --- a/app/views/contact_us/contacts/new.html.erb +++ b/app/views/contact_us/contacts/new.html.erb @@ -20,7 +20,7 @@ <% if ContactUs.require_name %> - <%= f.label :name, (t(".name") + content_tag(:abbr, "*", :class => "required")).html_safe %> + <%= f.label :name, (t('admin.name') + content_tag(:abbr, "*", :class => "required")).html_safe %> <% if user_signed_in? then %> @@ -36,7 +36,7 @@ <% end %> - <%= f.label :email, (t(".email") + content_tag(:abbr, "*", :class => "required")).html_safe %> + <%= f.label :email, (t('helpers.email') + content_tag(:abbr, "*", :class => "required")).html_safe %> <% if user_signed_in? then %> @@ -52,7 +52,7 @@ <% if ContactUs.require_subject %> - <%= f.label :subject, (t(".subject") + content_tag(:abbr, "*", :class => "required")).html_safe %> + <%= f.label :subject, (t('helpers.subject') + content_tag(:abbr, "*", :class => "required")).html_safe %> <%= f.text_field :subject %> @@ -64,10 +64,10 @@ <% end %> - <%= f.label :message, (t(".message") + content_tag(:abbr, "*", :class => "required")).html_safe %> + <%= f.label :message, (t('helpers.message') + content_tag(:abbr, "*", :class => "required")).html_safe %> - <%= f.text_area :message, :rows => 10, :style => "width:95%;"%> + <%= f.text_area :message, :rows => 10 %> <% if f.object.errors[:message].present? %>

      <%= f.object.errors[:message].join(" and ") %>

      <% end %> @@ -76,7 +76,7 @@ <% if !user_signed_in? then %> - Security check + <%= t('helpers.security_check') %> <%= recaptcha_tags %> diff --git a/app/views/devise/confirmations/new.html.erb b/app/views/devise/confirmations/new.html.erb index 9c27eb7..d5cc21d 100644 --- a/app/views/devise/confirmations/new.html.erb +++ b/app/views/devise/confirmations/new.html.erb @@ -1,4 +1,4 @@ -

      Resend confirmation instructions

      +

      <%= t('custom_devise.resend_confirmation') %>

      <%= form_for(resource, :as => resource_name, :url => confirmation_path(resource_name), :html => { :method => :post }) do |f| %> <%= devise_error_messages! %> @@ -6,7 +6,7 @@
      <%= f.label :email %>
      <%= f.email_field :email, :autofocus => true %>
      -
      <%= f.submit "Resend confirmation instructions" %>
      +
      <%= f.submit t('custom_devise.resend_confirmation') %>
      <% end %> <%= render "devise/shared/links" %> diff --git a/app/views/devise/mailer/confirmation_instructions.html.erb b/app/views/devise/mailer/confirmation_instructions.html.erb index 1769a1c..08c61ba 100644 --- a/app/views/devise/mailer/confirmation_instructions.html.erb +++ b/app/views/devise/mailer/confirmation_instructions.html.erb @@ -1,5 +1,5 @@ -

      Welcome to DMPonline, <%= @email %>!

      +

      <%= t('custom_devise.welcome_to_DMP') %>, <%= @email %>!

      -

      Thank you for registering at DMPonline. Please confirm your email address:

      +

      <%= t('custom_devise.thank_you_and_confirm') %>

      -

      <%= link_to 'Click here to confirm your account', confirmation_url(@resource, :confirmation_token => @token) %> (or copy <%= confirmation_url(@resource, :confirmation_token => @token) %> into your browser).

      \ No newline at end of file +

      <%= link_to t('custom_devise.click_to_confirm'), confirmation_url(@resource, :confirmation_token => @token) %> <%= t('custom_devise.1st_part_copy') %> <%= confirmation_url(@resource, :confirmation_token => @token) %> <%= t('custom_devise.2nd_part_copy') %>

      \ No newline at end of file diff --git a/app/views/devise/mailer/invitation_instructions.html.erb b/app/views/devise/mailer/invitation_instructions.html.erb index 741d130..2828329 100644 --- a/app/views/devise/mailer/invitation_instructions.html.erb +++ b/app/views/devise/mailer/invitation_instructions.html.erb @@ -1,8 +1,7 @@ -

      Hello <%= @resource.email %>!

      +

      <%= t('custom_devise.hello') %> <%= @resource.email %>!

      -

      A colleague has invited you to contribute to their Data Management Plan at <%= link_to 'DMPonline', root_url %>

      +

      <%= t('custom_devise.colleague_invited_you') %> <%= link_to t('tool_title'), root_url %>

      -

      <%= link_to 'Click here to accept the invitation', accept_invitation_url(@resource, :invitation_token => @token) %> (or copy <%= accept_invitation_url(@resource, :invitation_token => @token) %> into your browser).

      +

      <%= link_to t('custom_devise.click_to_accept'), accept_invitation_url(@resource, :invitation_token => @token) %> <%= t('custom_devise.1st_part_copy') %> <%= accept_invitation_url(@resource, :invitation_token => @token) %> <%= t('custom_devise.2nd_part_copy') %>

      -

      If you don't want to accept the invitation, please ignore this email.
      -Your account won't be created until you access the link above and set your password.

      \ No newline at end of file +<%= t('custom_devise.ignore_wont_be_created') %> \ No newline at end of file diff --git a/app/views/devise/mailer/reset_password_instructions.html.erb b/app/views/devise/mailer/reset_password_instructions.html.erb index 31f5a1f..1638d2e 100644 --- a/app/views/devise/mailer/reset_password_instructions.html.erb +++ b/app/views/devise/mailer/reset_password_instructions.html.erb @@ -1,8 +1,7 @@ -

      Hello <%= @resource.email %>!

      +

      <%= t('custom_devise.hello') %> <%= @resource.email %>!

      -

      Someone has requested a link to change your <%= link_to "DMPonline", root_url %> password. You can do this through the link below.

      +

      <%= t('custom_devise.1st_part_change_password') %> <%= link_to t('tool_title'), root_url %> <%= t('custom_devise.2nd_part_change_password') %>

      <%= link_to 'Change my password', edit_password_url(@resource, :reset_password_token => @token) %>

      -

      If you didn't request this, please ignore this email.

      -

      Your password won't change until you access the link above and create a new one.

      +<%= t('custom_devise.1st_part_change_password') %> diff --git a/app/views/devise/mailer/unlock_instructions.html.erb b/app/views/devise/mailer/unlock_instructions.html.erb index c1e0d78..955c0c7 100644 --- a/app/views/devise/mailer/unlock_instructions.html.erb +++ b/app/views/devise/mailer/unlock_instructions.html.erb @@ -1,7 +1,7 @@ -

      Hello <%= @resource.email %>!

      +

      <%= t('custom_devise.hello') %> <%= @resource.email %>!

      -

      Your <%= link_to "DMPonline", root_url %> account has been locked due to an excessive number of unsuccessful sign in attempts.

      +

      <%= t('custom_devise.1st_part_locked') %><%= link_to t('tool_title'), root_url %><%= t('custom_devise.2nd_part_locked') %>

      -

      Click the link below to unlock your account:

      +

      <%= t('custom_devise.click_to_unlock') %>

      -

      <%= link_to 'Unlock my account', unlock_url(@resource, :unlock_token => @token) %>

      \ No newline at end of file +

      <%= link_to t('custom_devise.unlock'), unlock_url(@resource, :unlock_token => @token) %>

      \ No newline at end of file diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb index 65d7702..33d9a27 100644 --- a/app/views/devise/passwords/new.html.erb +++ b/app/views/devise/passwords/new.html.erb @@ -1,4 +1,4 @@ -

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

      +

      <%= t('helpers.forgot_password') %>

      <%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post }) do |f| %> diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb index 3335d44..6b85dc8 100644 --- a/app/views/devise/registrations/edit.html.erb +++ b/app/views/devise/registrations/edit.html.erb @@ -58,6 +58,16 @@ :autocomplete => "off" , :class => "text_field has-tooltip", "data-toggle" => "tooltip", "data-html" => "true", "title" => t("helpers.orcid_html") %> + <% unless @user.api_token.nil? %> + + <%= t("helpers.api_token") %> + <%= @user.api_token %> + + + <%= t("helpers.api_info") %> + <%= link_to( t("helpers.api_use"), controller: "token_permission_types", action: "index")%> + + <% end %>

      @@ -80,7 +90,7 @@

      <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %> -
      Currently waiting confirmation for: <%= resource.unconfirmed_email %>
      +
      <%= t('custom_devise.waiting_for_confirmation') %><%= resource.unconfirmed_email %>
      <% end %> diff --git a/app/views/devise/unlocks/new.html.erb b/app/views/devise/unlocks/new.html.erb index 020787f..b632e4f 100644 --- a/app/views/devise/unlocks/new.html.erb +++ b/app/views/devise/unlocks/new.html.erb @@ -1,4 +1,4 @@ -

      Resend unlock instructions

      +

      <%= t('custom_devise.resend_unlock') %>

      <%= form_for(resource, :as => resource_name, :url => unlock_path(resource_name), :html => { :method => :post }) do |f| %> <%= devise_error_messages! %> diff --git a/app/views/dmptemplates/_add_guidance.html.erb b/app/views/dmptemplates/_add_guidance.html.erb index eae8cf7..2364908 100644 --- a/app/views/dmptemplates/_add_guidance.html.erb +++ b/app/views/dmptemplates/_add_guidance.html.erb @@ -16,32 +16,32 @@ - +
      <%= t("helpers.current_password") %>
      <%= t("org_admin.guidance.by_theme_or_by_question") %>
      - <%= select_tag "g_options", options_for_select([[t("org_admin.guidance.by_themes_label"), 1], + <%= 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%> + <%= f.check_box :published , :as => :check_boxes%>
      @@ -53,25 +53,25 @@
      <%= f.collection_select(:guidance_group_ids, GuidanceGroup.where("organisation_id = ?", current_user.organisation_id).order("name ASC"), - :id, :name, {:prompt => false, :include_blank => "None"}, {:multiple => false})%> + :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%> @@ -82,12 +82,12 @@ \ No newline at end of file diff --git a/app/views/dmptemplates/_add_question.html.erb b/app/views/dmptemplates/_add_question.html.erb index f108516..578a8aa 100644 --- a/app/views/dmptemplates/_add_question.html.erb +++ b/app/views/dmptemplates/_add_question.html.erb @@ -38,7 +38,7 @@
      <%= f.select :question_format_id, - options_from_collection_for_select(QuestionFormat.find(:all, :order => "title ASC"),:id, :title, QuestionFormat.find_by_title(t("helpers.text_area")).id), + options_from_collection_for_select(QuestionFormat.all.order("title"), :id, :title, QuestionFormat.find_by_title(t("helpers.text_area")).id), {}, :id => "new-select-format-#{section.id}"%>
      @@ -59,25 +59,25 @@ + <% i = 0 %> + <% 2.times {@new_question.options.build } %> - <% i = 0 %> - <% @new_question.options.each do |options_q|%> - <%= f.fields_for :options, options_q do |op|%> - <% i = i + 1%> - <% options_q.number = i %> - <%= render "option_fields", :f => op %> - <%end%> + <% @new_question.options.each do |options_q|%> + <%= f.fields_for :options, options_q do |op|%> + <% i = i + 1%> + <% options_q.number = i %> + <%= render "option_fields", :f => op %> + <%end%> - <%end%> - - - + <%end%> - <%= link_to_add_object t("org_admin.add_option_label"), f, :options , "", i %> - + + <%= t("org_admin.add_option_label") %> + +
      <%= f.check_box :option_comment_display, :as => :check_boxes%><%= f.label t("org_admin.questions.option_comment_display_checkbox"), :class => "checkbox inline"%> @@ -153,8 +153,8 @@ <%= t("org_admin.questions.themes_label")%>
      <%= f.collection_select(:theme_ids, - Theme.find(:all, :order => "title ASC"), - :id, :title, {:prompt => false, :include_blank => "None"}, {:multiple => true})%> + Theme.all.order("title"), + :id, :title, {:prompt => false, :include_blank => t('helpers.none')}, {:multiple => true})%>
      <%= link_to( image_tag("help_button.png"), "#", :class => "question_themes_popover", :rel => "popover", "data-html" => "true", "data-content" => t("org_admin.questions.question_themes_help_text_html"))%> diff --git a/app/views/dmptemplates/_edit_question.html.erb b/app/views/dmptemplates/_edit_question.html.erb index c02d104..7ce3ef3 100644 --- a/app/views/dmptemplates/_edit_question.html.erb +++ b/app/views/dmptemplates/_edit_question.html.erb @@ -1,8 +1,8 @@ - @@ -13,11 +13,10 @@ <%= t("org_admin.questions.question_number_label")%> <%= f.number_field :number, :in => 1..50, :class => "number_field has-tooltip", "data-toggle" => "tooltip", "title" => t("org_admin.questions.number_help_text") %> -
      - + <%= t("org_admin.questions.question_text_label")%> @@ -25,7 +24,7 @@
      - + <%= t("org_admin.questions.answer_format_label")%> @@ -33,15 +32,15 @@
      <%= f.hidden_field :id,{ :class => "quest_id" } %> <%= f.select :question_format_id, - options_from_collection_for_select(QuestionFormat.find(:all, :order => "title ASC"),:id, :title, question.question_format_id), + options_from_collection_for_select(QuestionFormat.all.order("title"), :id, :title, question.question_format_id), {}, :id => "#{question.id}-select-format"%>
      <%= link_to( image_tag("help_button.png"), "#", :class => "question_format_popover", :rel => "popover", "data-html" => "true", "data-content" => t("org_admin.questions.question_format_help_text_html"))%>
      - -
      - + +
      + -
      +
      -
      +
      -
      +
      -
      +
      - + - + <%= t("org_admin.questions.suggested_or_example_answer_label")%>
      <% suggested_answer = question.suggested_answers.find_by_organisation_id(current_user.organisation.id) %> - <% if question.suggested_answers == [] then %> + <% if suggested_answer.nil? then %> <% suggested_answer = question.suggested_answers.build %> <%end%> <%= f.fields_for :suggested_answers, suggested_answer do |s|%> @@ -129,11 +124,10 @@
      <%= link_to( image_tag("help_button.png"), "#", :class => "suggested_answer_popover", :rel => "popover", "data-html" => "true", "data-content" => t("org_admin.questions.suggested_answer_help_text_html"))%>
      -
      +
      - <%= t("org_admin.questions.guidance_label")%> @@ -143,29 +137,25 @@
      <%= link_to( image_tag("help_button.png"), "#", :class => "question_guidance_popover", :rel => "popover", "data-html" => "true", "data-content" => t("org_admin.questions.question_guidance_help_text_html"))%>
      -
      +
      - - <%= t("org_admin.questions.themes_label")%>
      <%= f.collection_select(:theme_ids, - Theme.find(:all, :order => "title ASC"), + Theme.all.order("title"), :id, :title, {:prompt => false, :include_blank => "None"}, {:multiple => true})%>
      <%= link_to( image_tag("help_button.png"), "#", :class => "question_themes_popover", :rel => "popover", "data-html" => "true", "data-content" => t("org_admin.questions.question_themes_help_text_html"))%>
      - - +
      -
      <%= f.submit t("helpers.submit.save"), :class => "btn btn-primary" %> @@ -182,4 +172,3 @@ <%= render :partial => "guidance_display", locals: {question: question}%> <%end%> - diff --git a/app/views/dmptemplates/_edit_section.html.erb b/app/views/dmptemplates/_edit_section.html.erb index 9e782bb..1065b51 100644 --- a/app/views/dmptemplates/_edit_section.html.erb +++ b/app/views/dmptemplates/_edit_section.html.erb @@ -92,6 +92,7 @@ <% if !section.version.published? || phase.dmptemplate.org_type == t("helpers.org_type.funder") then%> + <%if @questions.count != 0 %>
      <%end%> diff --git a/app/views/dmptemplates/_guidance_display.html.erb b/app/views/dmptemplates/_guidance_display.html.erb index 5e5ee3f..888f801 100644 --- a/app/views/dmptemplates/_guidance_display.html.erb +++ b/app/views/dmptemplates/_guidance_display.html.erb @@ -36,10 +36,10 @@
      <%= hidden_field_tag :question_id, question.id, :class => "question_id" %> - <%= link_to t("org_admin.questions.guidance_button"), "# ", :class => "btn btn-primary add_guidance_button"%> + <%= link_to t("org_admin.questions.quidance_button"), "# ", :class => "btn btn-primary add_guidance_button"%>
      - + diff --git a/app/views/dmptemplates/_option_fields.html.erb b/app/views/dmptemplates/_option_fields.html.erb index 54cea38..ac69280 100644 --- a/app/views/dmptemplates/_option_fields.html.erb +++ b/app/views/dmptemplates/_option_fields.html.erb @@ -3,5 +3,5 @@ <%= f.number_field :number,:in => 1..20, :class => "number_field option"%> <%= f.text_field :text, :as => :string, :class => "small_text_field" %> <%= f.check_box :is_default %> - <%= f.hidden_field :_destroy %><%= link_to_function t('org_admin.remove_option_label'), "remove_object(this)"%> + <%= f.hidden_field :_destroy %><%= t('org_admin.remove_option_label') %> diff --git a/app/views/dmptemplates/_show_section.html.erb b/app/views/dmptemplates/_show_section.html.erb index abf1fd1..7041cc0 100644 --- a/app/views/dmptemplates/_show_section.html.erb +++ b/app/views/dmptemplates/_show_section.html.erb @@ -9,7 +9,7 @@
      <% if section.title == '' then%> - <%= t('org_amin.templates.new_section')%> + <%= t('org_admin.templates.new_section')%> <%else%> <%= section.title %> <%end%> @@ -24,7 +24,7 @@
      <% section.questions.order("number").each do |question| %> - <% last_question_id = section.questions.order("number DESC").first.id%> + <% last_question_id = section.questions.order("number DESC").first.id %>
      diff --git a/app/views/dmptemplates/admin_index.html.erb b/app/views/dmptemplates/admin_index.html.erb index 6d76c23..5440687 100644 --- a/app/views/dmptemplates/admin_index.html.erb +++ b/app/views/dmptemplates/admin_index.html.erb @@ -15,9 +15,9 @@
      <%= link_to t("org_admin.templates.create_template"), - admin_new_dmptemplate_path(), + admin_new_dmptemplate_path, :class => 'btn btn-primary' %> -
      +
      @@ -41,7 +41,7 @@ <%= org_template.title%> - <%= raw org_template.description.truncate(90, omission: '... (continued)') %> + <%= raw org_template.description.truncate(90, omission: t('helpers.truncate_continued')) %> <%= org_template.published %> @@ -105,7 +105,7 @@ <%= org_template.title%> - <%= raw org_template.description.truncate(90, omission: '... (continued)') %> + <%= raw org_template.description.truncate(90, omission: t('helpers.truncate_continued')) %> <%if org_template.published? then %> diff --git a/app/views/guidance_groups/admin_edit.html.erb b/app/views/guidance_groups/admin_edit.html.erb index 61c3ccd..88303f2 100644 --- a/app/views/guidance_groups/admin_edit.html.erb +++ b/app/views/guidance_groups/admin_edit.html.erb @@ -2,92 +2,96 @@ <% javascript 'admin.js' %>

      - <%= t('org_admin.guidance.guidance_group_label') %> - -
      - <%= link_to t("org_admin.guidance.view_all_guidance"), - admin_index_guidance_path, - :class => 'btn btn-primary' %> -
      + <%= t('org_admin.guidance.guidance_group_label') %> + +
      + <%= link_to t("org_admin.guidance.view_all_guidance"), + admin_index_guidance_path, + :class => 'btn btn-primary' %> +

      - -
      - <%= form_for(@guidance_group, :url => admin_update_guidance_group_path(@guidance_group), :html => { :method => :put}) do |f| %> - - - - - - - - - - - - <% if @guidance_group.published == true then%> - - - - - <%end%> - - - - - - -
      <%= t('org_admin.guidance.name_label') %>
      - <%= f.text_field :name, - :as => :string, - :class => 'text_field'%> + +
      + <%= form_for(@guidance_group, :url => admin_update_guidance_group_path(@guidance_group), :html => {:method => :put}) do |f| %> -
      -
      - <%= link_to( image_tag('help_button.png'), '#', :class => 'guidance_group_title_popover', :rel => "popover", 'data-html' => "true", 'data-content' => t('org_admin.guidance_group.title_help_text_html'))%> -
      -
      <%= t('org_admin.guidance.template') %>
      - <% if @guidance_group.dmptemplate_ids == [] then %> - <% default_select = "" %> - <%else%> - <% default_select = @guidance_group.dmptemplate_ids %> - <%end%> - <%= f.select :dmptemplate_ids, options_for_select( - [['All templates', ""]].concat( Dmptemplate.funders_and_own_templates(current_user.organisation_id).collect{ |g| [g.title, g.id] }), :selected => default_select ),{} , - {:prompt => false , :multiple => true}%> -
      -
      - <%= link_to( image_tag('help_button.png'), '#', :class => 'guidance_group_template_popover', :rel => "popover", 'data-html' => "true", 'data-content' => t('org_admin.guidance_group.template_help_text_html'))%> -
      - -
      <%= t('org_admin.guidance_group.published') %>
      - <%= f.check_box :published %> -
      -
      - -
      -
      <%= t('org_admin.guidance_group.subset') %>
      - <%= f.check_box :optional_subset %> <%= t('org_admin.guidance_group.subset_eg') %> -
      -
      - <%= link_to( image_tag('help_button.png'), '#', :class => 'guidance_group_subset_popover', :rel => "popover", 'data-html' => "true", 'data-content' => t('org_admin.guidance_group.subset_option_help_text'))%> -
      -
      - - - -
      - <%= f.submit t('helpers.submit.save'), :class => 'btn btn-primary' %> - <% if @guidance_group.published == false then%> - <%= f.submit t("helpers.submit.save_publish"), :name => "save_publish", :class => "btn btn-primary" %> - <%end%> - <%= link_to t('helpers.submit.cancel'), :back, :class => 'btn cancel' %> -
      - -
      - <%end%> -
      + + + + + + + + + + + <% if @guidance_group.published == true then %> + + + + + <% end %> + + + + + + +
      <%= t('org_admin.guidance_group.name_label') %> +
      + <%= f.text_field :name, + :as => :string, + :class => 'text_field' %> + +
      +
      + <%= link_to(image_tag('help_button.png'), '#', :class => 'guidance_group_title_popover', :rel => "popover", 'data-html' => "true", 'data-content' => t('org_admin.guidance_group.title_help_text_html')) %> +
      +
      <%= t('org_admin.guidance.template') %> +
      + <% if @guidance_group.dmptemplate_ids == [] then %> + <% default_select = "" %> + <% else %> + <% default_select = @guidance_group.dmptemplate_ids %> + <% end %> + <%= f.select :dmptemplate_ids, options_for_select( + [['All templates', ""]].concat(Dmptemplate.funders_and_own_templates(current_user.organisation_id).collect { |g| [g.title, g.id] }), :selected => default_select), {}, + {:prompt => false, :multiple => true} %> +
      +
      + <%= link_to(image_tag('help_button.png'), '#', :class => 'guidance_group_template_popover', :rel => "popover", 'data-html' => "true", 'data-content' => t('org_admin.guidance_group.template_help_text_html')) %> +
      + +
      <%= t('org_admin.templates.published_label') %> +
      + <%= f.check_box :published %> +
      +
      + +
      +
      <%= t('org_admin.guidance_group.subset') %> +
      + <%= f.check_box :optional_subset %> <%= t('org_admin.guidance_group.subset_eg') %> +
      +
      + <%= link_to(image_tag('help_button.png'), '#', :class => 'guidance_group_subset_popover', :rel => "popover", 'data-html' => "true", 'data-content' => t('org_admin.guidance_group.subset_option_help_text')) %> +
      +
      + + + +
      + <%= f.submit t('helpers.submit.save'), :class => 'btn btn-primary' %> + <% if @guidance_group.published == false then %> + <%= f.submit t('helpers.submit.publish'), :name => "save_publish", :class => "btn btn-primary" %> + <% end %> + <%= link_to t('helpers.submit.cancel'), :back, :class => 'btn cancel' %> +
      + +
      + <% end %> +
      diff --git a/app/views/guidance_groups/admin_new.html.erb b/app/views/guidance_groups/admin_new.html.erb index 5317891..20b3a04 100644 --- a/app/views/guidance_groups/admin_new.html.erb +++ b/app/views/guidance_groups/admin_new.html.erb @@ -20,7 +20,7 @@ - + <%else%> <%end%> diff --git a/app/views/guidances/admin_new.html.erb b/app/views/guidances/admin_new.html.erb index dd503b0..94d90fe 100644 --- a/app/views/guidances/admin_new.html.erb +++ b/app/views/guidances/admin_new.html.erb @@ -42,7 +42,7 @@
      <%= t("org_admin.guidance.name_label") %><%= t('org_admin.guidance_group.name_label') %>
      <%= f.text_field :name, :as => :string, @@ -62,8 +62,7 @@
      <%= f.submit t("helpers.submit.save"), :name => "draft", :class => "btn btn-primary" %> - <%= f.submit t("helpers.submit.save_publish"), :name => "save_publish", :class => "btn btn-primary" %> - <%= link_to t("helpers.submit.cancel"), :back, :class => "btn cancel" %> + <%= link_to t("helpers.submit.cancel"), :back, :class => "btn cancel btn-secondary" %>

      diff --git a/app/views/guidance_groups/admin_show.html.erb b/app/views/guidance_groups/admin_show.html.erb index 729fc49..fe641ab 100644 --- a/app/views/guidance_groups/admin_show.html.erb +++ b/app/views/guidance_groups/admin_show.html.erb @@ -1,89 +1,92 @@ <%= stylesheet_link_tag "admin" %>

      - <%= t("org_admin.guidance.guidance_group_label") %> + <%= t("org_admin.guidance.guidance_group_label") %> - -
      - <%= link_to t("org_admin.guidance.view_all_guidance"), - admin_index_guidance_path, - :class => "btn btn-primary" %> -
      + +
      + <%= link_to t("org_admin.guidance.view_all_guidance"), + admin_index_guidance_path, + :class => "btn btn-primary" %> +

      - -
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      <%= t("org_admin.guidance_group.name_label") %><%= raw @guidance_group.name %>
      - <% if @guidance_group.dmptemplates.count == 1 then %> - <%= t("org_admin.guidance.template") %> - <%else%> - <%= t("org_admin.guidance.templates") %> - <%end%> - <% i = 1 %> - <% if @guidance_group.dmptemplates.count == 0 then %> - <% list = Dmptemplate.funders_and_own_templates(current_user.organisation_id)%> - <% list.each do |tem|%> - <%= tem.title %> - <% if list.count > i then%> - , - <% i +=1 %> - <% end %> - <%end%> - <%else%> - <% @guidance_group.dmptemplates.each do |tem|%> - <%= tem.title %> - <% if @guidance_group.dmptemplates.count > i then%> - , - <% i +=1 %> - <% end %> - <%end%> - <%end%> -
      <%= t("org_admin.guidance_group.published") %><%if @guidance_group.published.nil? || @guidance_group.published == false then%> - <%= t("helpers.no_label")%> - <%else%> - <%= t("helpers.yes_label")%> - <%end%> -
      <%= t("org_admin.guidance_group.subset") %><%if @guidance_group.optional_subset.nil? || @guidance_group.optional_subset == false then%> - <%= t("helpers.no")%> - <%else%> - <%= t("helpers.yes")%> - <%end%> -
      <%= t("org_admin.guidance.created") %><%= l @guidance_group.created_at.to_date, :formats => :short %>
      <%= t("org_admin.guidance.last_updated") %><%= l @guidance_group.updated_at.to_date, :formats => :short %>
      -
      - <%= link_to t("helpers.submit.edit"), admin_edit_guidance_group_path(@guidance_group.id), :class => "btn btn-primary"%> - <%= link_to t("helpers.submit.back"), :back, :class => "btn cancel" %> -
      -
      -
      + +
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      <%= t("org_admin.guidance_group.name_label") %><%= raw @guidance_group.name %>
      + <% if @guidance_group.dmptemplates.count == 1 then %> + <%= t("org_admin.guidance.template") %> + <% else %> + <%= t("org_admin.guidance.templates") %> + <% end %> + + <% i = 1 %> + <% if @guidance_group.dmptemplates.count == 0 then %> + <% list = Dmptemplate.funders_and_own_templates(current_user.organisation_id) %> + <% list.each do |tem| %> + <%= tem.title %> + <% if list.count > i then %> + , + <% i +=1 %> + <% end %> + <% end %> + <% else %> + <% @guidance_group.dmptemplates.each do |tem| %> + <%= tem.title %> + <% if @guidance_group.dmptemplates.count > i then %> + , + <% i +=1 %> + <% end %> + <% end %> + <% end %> +
      <%= t('org_admin.templates.published_label') %> + <% if @guidance_group.published.nil? || @guidance_group.published == false then %> + <%= t("helpers.no_label") %> + <% else %> + <%= t("helpers.yes_label") %> + <% end %> +
      <%= t("org_admin.guidance_group.subset") %> + <% if @guidance_group.optional_subset.nil? || @guidance_group.optional_subset == false then %> + <%= t('helpers.no_label') %> + <% else %> + <%= t('helpers.yes_label') %> + <% end %> +
      <%= t("org_admin.guidance.created") %><%= l @guidance_group.created_at.to_date, :formats => :short %>
      <%= t("org_admin.guidance.last_updated") %><%= l @guidance_group.updated_at.to_date, :formats => :short %>
      +
      + <%= link_to t("helpers.submit.edit"), admin_edit_guidance_group_path(@guidance_group.id), :class => "btn btn-primary" %> + <%= link_to t("helpers.submit.back"), :back, :class => "btn cancel" %> +
      +
      +
      \ No newline at end of file diff --git a/app/views/guidances/admin_edit.html.erb b/app/views/guidances/admin_edit.html.erb index fd8c295..0f2e0c8 100644 --- a/app/views/guidances/admin_edit.html.erb +++ b/app/views/guidances/admin_edit.html.erb @@ -6,7 +6,7 @@
      <%= link_to t("org_admin.guidance.add_guidance"), - admin_new_guidance_path(), + admin_new_guidance_path, :class => 'btn btn-primary' %> <%= link_to t("org_admin.guidance.view_all_guidance"), admin_index_guidance_path, @@ -55,7 +55,7 @@
      		- <%= raw guidance.question.text.truncate(70, omission: "... (continued)") %> + <%= raw guidance.question.text.truncate(70, omission: t('helpers.truncate_continued')) %> @@ -163,7 +163,7 @@ <%= link_to t("helpers.view"), admin_show_guidance_path(guidance), :class => "dmp_table_link"%>
      <%= link_to t("helpers.submit.edit"), admin_edit_guidance_path(guidance), :class => "dmp_table_link"%>
      <%= link_to t("helpers.submit.delete"), admin_destroy_guidance_path(guidance), - :confirm => t("org_admin.guidance.delete_message_html", :guidance_summary => truncate(sanitize(guidance.text,:tags => %w(br a)), :length => 20 , :omission => "...(continued)") ), :method => :delete, :class => "dmp_table_link"%> + :confirm => t("org_admin.guidance.delete_message_html", :guidance_summary => truncate(sanitize(guidance.text,:tags => %w(br a)), :length => 20 , :omission => t('helpers.truncate_continued')) ), :method => :delete, :class => "dmp_table_link"%>
      - - - - - - - - - - - <% @user_roles.each do |user_id| %> - <% if !user_id.user.nil? then%> - - - - - - - <%end%> - <% end %> - -
      <%= t('org_admin.user_full_name') %><%= t('org_admin.user_name') %><%= t('org_admin.last_logged_in') %><%= t('org_admin.how_many_plans') %>
      - <% if !user_id.user.name.nil? then%> - <%= user_id.user.name %> - <%end%> - - <%= user_id.user.email %> - - <% if !user_id.user.last_sign_in_at.nil? then%> - <%= l user_id.user.last_sign_in_at.to_date, :formats => :short %> - <%end%> - - <% if !user_id.user.project_groups.nil? then%> - <%= user_id.user.project_groups.count %> - <%end%> -
      + +<% @user_roles = @user_roles.uniq_by {|u| u.user_id } %> + + + + + + + + <% if current_user.organisation.token_permission_types.count > 0 %> + + <% end %> + + + <% form_tag admin_index_organisation_users_path, method: :put do %> + + <% @user_roles.each do |user_id| %> + <% if !user_id.user.nil? then%> + + + + + + <% if current_user.organisation.token_permission_types.count > 0 %> + + <% end %> + + <% end %> + <% end %> + + <%= submit_tag "Update API Privleges" %> + <% end %> +
      <%= t('org_admin.user_full_name') %><%= t('org_admin.user_name') %><%= t('org_admin.last_logged_in') %><%= t('org_admin.how_many_plans') %><%= t('org_admin.api_privleges') %>
      + <% if !user_id.user.name.nil? then%> + <%= user_id.user.name %> + <% end %> + + <%= user_id.user.email %> + + <% if !user_id.user.last_sign_in_at.nil? then%> + <%= l user_id.user.last_sign_in_at.to_date, :formats => :short %> + <% end %> + + <% if !user_id.user.project_groups.nil? then%> + <%= user_id.user.project_groups.count %> + <% end %> + + <%= check_box_tag "user_ids[]", user_id %> + +
      diff --git a/app/views/plans/_archive_comment.html.erb b/app/views/plans/_archive_comment.html.erb index 2498498..aacc94c 100644 --- a/app/views/plans/_archive_comment.html.erb +++ b/app/views/plans/_archive_comment.html.erb @@ -7,7 +7,7 @@ <%= render :partial => "view_comment", locals: {comment: comment} %> <% if current_user.id == comment.user_id then %> - <%= t("helpers.comments.archive_own_comment_question")%> + <%= t('helpers.comments.archive_own_comment_question')%> <% button_label = t("helpers.comments.archive_own_comment_button_label") %> <% else%> <%= t("helpers.comments.archive_comment_question")%> @@ -24,5 +24,5 @@ <%= hidden_field_tag :comment_id, comment.id, :class => "comment_id" %> <%= link_to t("helpers.submit.cancel"), "#", :class => "cancel_archive_comment btn cancel" %>
      -
      +
      <%end%> \ No newline at end of file diff --git a/app/views/plans/_edit_comment.html.erb b/app/views/plans/_edit_comment.html.erb index 3f7db92..cb8114e 100644 --- a/app/views/plans/_edit_comment.html.erb +++ b/app/views/plans/_edit_comment.html.erb @@ -14,5 +14,5 @@ <%= hidden_field_tag :section_id, question.section_id, :class => "section_id" %> <%= f.submit t("helpers.submit.save"), :class => "btn btn-primary edit_comment_submit_button" %>
      -
      +
      <%end%> \ No newline at end of file diff --git a/app/views/plans/_export.html.erb b/app/views/plans/_export.html.erb index 5565ae2..73425c0 100644 --- a/app/views/plans/_export.html.erb +++ b/app/views/plans/_export.html.erb @@ -1,7 +1,7 @@