diff --git a/Rakefile b/Rakefile index 0d74091..df102db 100755 --- a/Rakefile +++ b/Rakefile @@ -4,7 +4,7 @@ require 'rake/testtask' require File.expand_path('../config/application', __FILE__) -DMPonline4::Application.load_tasks +DMPRoadmap::Application.load_tasks # TODO: destroy rdoc rake task once finished with new documentation @@ -14,7 +14,7 @@ rdoc.rdoc_files.include("README.rdoc", "doc/*.rdoc", "app/**/*.rb", "lib/*.rb", "config/**/*.rb") #change above to fit needs - rdoc.title = "DMPonline4 Documentation" + rdoc.title = "DMPRoadmap Documentation" rdoc.options << "--all" end diff --git a/app/admin/dashboard.rb b/app/admin/dashboard.rb index 30e55c2..3aa2b89 100644 --- a/app/admin/dashboard.rb +++ b/app/admin/dashboard.rb @@ -1,7 +1,7 @@ -# [+Project:+] DMPonline +# [+Project:+] DMPRoadmap # [+Description:+] # -# [+Copyright:+] Digital Curation Centre +# [+Copyright:+] Digital Curation Centre and University of California Curation Center ActiveAdmin.register_page "Dashboard" do diff --git a/app/admin/dmptemplate.rb b/app/admin/dmptemplate.rb index b9d711e..e0cd394 100644 --- a/app/admin/dmptemplate.rb +++ b/app/admin/dmptemplate.rb @@ -1,8 +1,8 @@ -# [+Project:+] DMPonline +# [+Project:+] DMPRoadmap # [+Description:+] # # [+Created:+] 03/09/2014 -# [+Copyright:+] Digital Curation Centre +# [+Copyright:+] Digital Curation Centre and University of California Curation Center ActiveAdmin.register Dmptemplate do permit_params :title, :description, :organisation_id, :published, :is_default diff --git a/app/admin/guidance.rb b/app/admin/guidance.rb index 753fd07..f4400e9 100644 --- a/app/admin/guidance.rb +++ b/app/admin/guidance.rb @@ -1,8 +1,8 @@ -# [+Project:+] DMPonline +# [+Project:+] DMPRoadmap # [+Description:+] # # [+Created:+] 03/09/2014 -# [+Copyright:+] Digital Curation Centre +# [+Copyright:+] Digital Curation Centre and University of California Curation Center ActiveAdmin.register Guidance do permit_params :text, :guidance_group_id, :question_id diff --git a/app/admin/guidance_group.rb b/app/admin/guidance_group.rb index 5a54831..76667f7 100644 --- a/app/admin/guidance_group.rb +++ b/app/admin/guidance_group.rb @@ -1,8 +1,8 @@ -# [+Project:+] DMPonline +# [+Project:+] DMPRoadmap # [+Description:+] # # [+Created:+] 03/09/2014 -# [+Copyright:+] Digital Curation Centre +# [+Copyright:+] Digital Curation Centre and University of California Curation Center ActiveAdmin.register GuidanceGroup do permit_params :organisation_id, :name, :published, :optional_subset diff --git a/app/admin/option.rb b/app/admin/option.rb index c7553e8..ce44cfc 100644 --- a/app/admin/option.rb +++ b/app/admin/option.rb @@ -1,8 +1,8 @@ -# [+Project:+] DMPonline +# [+Project:+] DMPRoadmap # [+Description:+] # # [+Created:+] 03/09/2014 -# [+Copyright:+] Digital Curation Centre +# [+Copyright:+] Digital Curation Centre and University of California Curation Center ActiveAdmin.register Option do permit_params :question_id, :text, :number, :is_default diff --git a/app/admin/organisation.rb b/app/admin/organisation.rb index 2c88380..07f1bb8 100644 --- a/app/admin/organisation.rb +++ b/app/admin/organisation.rb @@ -1,8 +1,8 @@ -# [+Project:+] DMPonline +# [+Project:+] DMPRoadmap # [+Description:+] # # [+Created:+] 03/09/2014 -# [+Copyright:+] Digital Curation Centre +# [+Copyright:+] Digital Curation Centre and University of California Curation Center 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 diff --git a/app/admin/organisation_type.rb b/app/admin/organisation_type.rb index 2c9c4de..4575f54 100644 --- a/app/admin/organisation_type.rb +++ b/app/admin/organisation_type.rb @@ -1,8 +1,8 @@ -# [+Project:+] DMPonline +# [+Project:+] DMPRoadmap # [+Description:+] # # [+Created:+] 03/09/2014 -# [+Copyright:+] Digital Curation Centre +# [+Copyright:+] Digital Curation Centre and University of California Curation Center ActiveAdmin.register OrganisationType do permit_params :organisation_id, :name diff --git a/app/admin/phase.rb b/app/admin/phase.rb index 0da6ca1..d7d061e 100644 --- a/app/admin/phase.rb +++ b/app/admin/phase.rb @@ -1,8 +1,8 @@ -# [+Project:+] DMPonline +# [+Project:+] DMPRoadmap # [+Description:+] # # [+Created:+] 03/09/2014 -# [+Copyright:+] Digital Curation Centre +# [+Copyright:+] Digital Curation Centre and University of California Curation Center ActiveAdmin.register Phase do permit_params :description, :number, :title, :dmptemplate_id diff --git a/app/admin/project.rb b/app/admin/project.rb index b410c71..2028428 100644 --- a/app/admin/project.rb +++ b/app/admin/project.rb @@ -1,8 +1,8 @@ -# [+Project:+] DMPonline +# [+Project:+] DMPRoadmap # [+Description:+] # # [+Created:+] 03/09/2014 -# [+Copyright:+] Digital Curation Centre +# [+Copyright:+] Digital Curation Centre and University of California Curation Center ActiveAdmin.register Project do permit_params :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 diff --git a/app/admin/project_group.rb b/app/admin/project_group.rb index 2ec7a0c..67c681c 100644 --- a/app/admin/project_group.rb +++ b/app/admin/project_group.rb @@ -1,8 +1,8 @@ -# [+Project:+] DMPonline +# [+Project:+] DMPRoadmap # [+Description:+] # # [+Created:+] 03/09/2014 -# [+Copyright:+] Digital Curation Centre +# [+Copyright:+] Digital Curation Centre and University of California Curation Center ActiveAdmin.register ProjectGroup do menu false diff --git a/app/admin/question.rb b/app/admin/question.rb index f301e60..8d46df1 100644 --- a/app/admin/question.rb +++ b/app/admin/question.rb @@ -1,8 +1,8 @@ -# [+Project:+] DMPonline +# [+Project:+] DMPRoadmap # [+Description:+] # # [+Created:+] 03/09/2014 -# [+Copyright:+] Digital Curation Centre +# [+Copyright:+] Digital Curation Centre and University of California Curation Center ActiveAdmin.register Question do permit_params :default_value, :dependency_id, :dependency_text, :guidance, :number, :parent_id, :suggested_answer, :text, :question_type, :section_id diff --git a/app/admin/question_format.rb b/app/admin/question_format.rb index 14bb8eb..a5b9523 100644 --- a/app/admin/question_format.rb +++ b/app/admin/question_format.rb @@ -1,8 +1,8 @@ -# [+Project:+] DMPonline +# [+Project:+] DMPRoadmap # [+Description:+] # # [+Created:+] 03/09/2014 -# [+Copyright:+] Digital Curation Centre +# [+Copyright:+] Digital Curation Centre and University of California Curation Center ActiveAdmin.register QuestionFormat do permit_params :description, :title diff --git a/app/admin/role.rb b/app/admin/role.rb index 824eb47..dc386de 100644 --- a/app/admin/role.rb +++ b/app/admin/role.rb @@ -1,8 +1,8 @@ -# [+Project:+] DMPonline +# [+Project:+] DMPRoadmap # [+Description:+] # # [+Created:+] 03/09/2014 -# [+Copyright:+] Digital Curation Centre +# [+Copyright:+] Digital Curation Centre and University of California Curation Center ActiveAdmin.register Role do permit_params :name, :role_in_plans diff --git a/app/admin/section.rb b/app/admin/section.rb index 9252bf8..c8ceab8 100644 --- a/app/admin/section.rb +++ b/app/admin/section.rb @@ -1,8 +1,8 @@ -# [+Project:+] DMPonline +# [+Project:+] DMPRoadmap # [+Description:+] # # [+Created:+] 03/09/2014 -# [+Copyright:+] Digital Curation Centre +# [+Copyright:+] Digital Curation Centre and University of California Curation Center ActiveAdmin.register Section do permit_params :organisation_id, :description, :number, :title, :version_id diff --git a/app/admin/suggested_answer.rb b/app/admin/suggested_answer.rb index 555044b..ab957eb 100644 --- a/app/admin/suggested_answer.rb +++ b/app/admin/suggested_answer.rb @@ -1,8 +1,8 @@ -# [+Project:+] DMPonline +# [+Project:+] DMPRoadmap # [+Description:+] # # [+Created:+] 03/09/2014 -# [+Copyright:+] Digital Curation Centre +# [+Copyright:+] Digital Curation Centre and University of California Curation Center ActiveAdmin.register SuggestedAnswer do permit_params :question_id, :organisation_id diff --git a/app/admin/theme.rb b/app/admin/theme.rb index 5122921..913f32e 100644 --- a/app/admin/theme.rb +++ b/app/admin/theme.rb @@ -1,8 +1,8 @@ -# [+Project:+] DMPonline +# [+Project:+] DMPRoadmap # [+Description:+] # # [+Created:+] 03/09/2014 -# [+Copyright:+] Digital Curation Centre +# [+Copyright:+] Digital Curation Centre and University of California Curation Center ActiveAdmin.register Theme do permit_params :description, :title, :locale diff --git a/app/admin/user.rb b/app/admin/user.rb index 450472f..3e80251 100644 --- a/app/admin/user.rb +++ b/app/admin/user.rb @@ -1,8 +1,8 @@ -# [+Project:+] DMPonline +# [+Project:+] DMPRoadmap # [+Description:+] # # [+Created:+] 03/09/2014 -# [+Copyright:+] Digital Curation Centre +# [+Copyright:+] Digital Curation Centre and University of California Curation Center 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 diff --git a/app/admin/user_org_role.rb b/app/admin/user_org_role.rb index 9164eda..e5d9793 100644 --- a/app/admin/user_org_role.rb +++ b/app/admin/user_org_role.rb @@ -1,8 +1,8 @@ -# [+Project:+] DMPonline +# [+Project:+] DMPRoadmap # [+Description:+] # # [+Created:+] 03/09/2014 -# [+Copyright:+] Digital Curation Centre +# [+Copyright:+] Digital Curation Centre and University of California Curation Center ActiveAdmin.register UserOrgRole do permit_params :user_id, :organisation_id, :user_role_type_id diff --git a/app/admin/user_role_type.rb b/app/admin/user_role_type.rb index 4e02387..e40f5ee 100644 --- a/app/admin/user_role_type.rb +++ b/app/admin/user_role_type.rb @@ -1,8 +1,8 @@ -# [+Project:+] DMPonline +# [+Project:+] DMPRoadmap # [+Description:+] # # [+Created:+] 03/09/2014 -# [+Copyright:+] Digital Curation Centre +# [+Copyright:+] Digital Curation Centre and University of California Curation Center ActiveAdmin.register UserRoleType do permit_params :description, :name diff --git a/app/admin/user_status.rb b/app/admin/user_status.rb index 5cfeb45..856577c 100644 --- a/app/admin/user_status.rb +++ b/app/admin/user_status.rb @@ -1,8 +1,8 @@ -# [+Project:+] DMPonline +# [+Project:+] DMPRoadmap # [+Description:+] # # [+Created:+] 03/09/2014 -# [+Copyright:+] Digital Curation Centre +# [+Copyright:+] Digital Curation Centre and University of California Curation Center ActiveAdmin.register UserStatus do permit_params :description, :name diff --git a/app/admin/user_type.rb b/app/admin/user_type.rb index 9074f5e..7836401 100644 --- a/app/admin/user_type.rb +++ b/app/admin/user_type.rb @@ -1,8 +1,8 @@ -# [+Project:+] DMPonline +# [+Project:+] DMPRoadmap # [+Description:+] # # [+Created:+] 03/09/2014 -# [+Copyright:+] Digital Curation Centre +# [+Copyright:+] Digital Curation Centre and University of California Curation Center ActiveAdmin.register UserType do permit_params :description, :name diff --git a/app/admin/version.rb b/app/admin/version.rb index 2b6a1fd..7dbed51 100644 --- a/app/admin/version.rb +++ b/app/admin/version.rb @@ -1,8 +1,8 @@ -# [+Project:+] DMPonline +# [+Project:+] DMPRoadmap # [+Description:+] # # [+Created:+] 03/09/2014 -# [+Copyright:+] Digital Curation Centre +# [+Copyright:+] Digital Curation Centre and University of California Curation Center ActiveAdmin.register Version do permit_params :description, :number, :published, :title, :phase_id diff --git a/app/assets/javascripts/admin.js b/app/assets/javascripts/admin.js index 0b5dcdd..c0aac55 100644 --- a/app/assets/javascripts/admin.js +++ b/app/assets/javascripts/admin.js @@ -1,8 +1,8 @@ //= require tinymce /* -**Project: DMPonline v4 +**Project: DMPRoadmap **Description: This file include all javascript regarding admin interface -**Copyright: Digital Curation Centre +**Copyright: Digital Curation Centre and University of California Curation Center */ diff --git a/app/assets/stylesheets/admin.css.less b/app/assets/stylesheets/admin.css.less index 958bb3e..009ffa9 100644 --- a/app/assets/stylesheets/admin.css.less +++ b/app/assets/stylesheets/admin.css.less @@ -21,7 +21,7 @@ // Your custom LESS stylesheets goes here /******************************* - * DMPonline v4 stylesheet + * DMPRoadmap stylesheet * * * starting date: June 2013 diff --git a/app/assets/stylesheets/bootstrap_and_overrides.css.less b/app/assets/stylesheets/bootstrap_and_overrides.css.less index 8394971..0aac89f 100644 --- a/app/assets/stylesheets/bootstrap_and_overrides.css.less +++ b/app/assets/stylesheets/bootstrap_and_overrides.css.less @@ -21,7 +21,7 @@ // Your custom LESS stylesheets goes here /******************************* - * DMPonline v4 stylesheet + * DMPRoadmap stylesheet * * * starting date: June 2013 diff --git a/app/controllers/api/v0/projects_controller.rb b/app/controllers/api/v0/projects_controller.rb index b824c3a..c10730f 100644 --- a/app/controllers/api/v0/projects_controller.rb +++ b/app/controllers/api/v0/projects_controller.rb @@ -66,7 +66,7 @@ user = User.find_by email: params[:project][:email] # if user does not exist if user.nil? - # invite user to DMPonline + # invite user to DMPRoadmap User.invite!({email: params[:project][:email]}, ( @user)) # set project owner to user associated w/email user = (User.find_by email: params[:project][:email]) diff --git a/app/controllers/dmptemplates_controller.rb b/app/controllers/dmptemplates_controller.rb index 97980e3..f80d93f 100644 --- a/app/controllers/dmptemplates_controller.rb +++ b/app/controllers/dmptemplates_controller.rb @@ -1,6 +1,6 @@ -# [+Project:+] DMPonline v4 +# [+Project:+] DMPRoadmap # [+Description:+] This controller is responsible for all the actions in the admin interface under templates (e.g. phases, versions, sections, questions, suggested answer) (index; show; create; edit; delete) -# [+Copyright:+] Digital Curation Centre +# [+Copyright:+] Digital Curation Centre and University of California Curation Center class DmptemplatesController < ApplicationController diff --git a/app/models/guidance.rb b/app/models/guidance.rb index 183f771..f537433 100644 --- a/app/models/guidance.rb +++ b/app/models/guidance.rb @@ -1,9 +1,9 @@ -# [+Project:+] DMPonline v4 +# [+Project:+] DMPRoadmap # [+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 and University of California Curation Center diff --git a/app/models/phase.rb b/app/models/phase.rb index 6cb09ba..b053f36 100644 --- a/app/models/phase.rb +++ b/app/models/phase.rb @@ -1,8 +1,8 @@ -# [+Project:+] DMPonline v4 +# [+Project:+] DMPRoadmap # [+Description:+] This model describes informmation about the phase of a plan, it's title, order of display and which template it belongs to. # # [+Created:+] 03/09/2014 -# [+Copyright:+] Digital Curation Centre +# [+Copyright:+] Digital Curation Centre and University of California Curation Center class Phase < ActiveRecord::Base extend FriendlyId diff --git a/app/views/dmptemplates/_add_question.html.erb b/app/views/dmptemplates/_add_question.html.erb index 578a8aa..08d7450 100644 --- a/app/views/dmptemplates/_add_question.html.erb +++ b/app/views/dmptemplates/_add_question.html.erb @@ -1,9 +1,9 @@ <% @new_question = Question.new %> diff --git a/app/views/dmptemplates/_edit_question.html.erb b/app/views/dmptemplates/_edit_question.html.erb index 7ce3ef3..ab12c02 100644 --- a/app/views/dmptemplates/_edit_question.html.erb +++ b/app/views/dmptemplates/_edit_question.html.erb @@ -1,9 +1,9 @@ <%= form_for(question, :url => admin_updatequestion_dmptemplate_path(question), :html => { :method => :put}) do |f| %> diff --git a/app/views/dmptemplates/_edit_section.html.erb b/app/views/dmptemplates/_edit_section.html.erb index 1065b51..abc789e 100644 --- a/app/views/dmptemplates/_edit_section.html.erb +++ b/app/views/dmptemplates/_edit_section.html.erb @@ -1,8 +1,8 @@ diff --git a/app/views/dmptemplates/_show_question.html.erb b/app/views/dmptemplates/_show_question.html.erb index 8847f6f..da4d1fb 100644 --- a/app/views/dmptemplates/_show_question.html.erb +++ b/app/views/dmptemplates/_show_question.html.erb @@ -1,8 +1,8 @@
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 07aecff..7015dcd 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -56,8 +56,8 @@ - - + + <%= render "layouts/dmponline_header" %> diff --git a/app/views/plans/_answer_form.html.erb b/app/views/plans/_answer_form.html.erb index a092a8d..c6135bb 100644 --- a/app/views/plans/_answer_form.html.erb +++ b/app/views/plans/_answer_form.html.erb @@ -1,8 +1,8 @@ <% answer = @plan.answer(question.id) %> diff --git a/config/environments/development.rb b/config/environments/development.rb index b02c7a2..0a209de 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -52,14 +52,8 @@ config.action_mailer.perform_deliveries = false - config.web_console.whitelisted_ips = '192.168.33.1' - # Load Branded terminology (e.g. organization name, application name, etc.) config.branding = config_for(:branding).deep_symbolize_keys - #config.branding = YAML.load_file(Rails.root.join('config/branding.yml'))[Rails.env] - -puts "YAML: #{config_for(:branding)}" - end BetterErrors::Midleware.allow_ip! "10.0.2.2" if defined?(BetterErrors) && Rails.env == :development \ No newline at end of file diff --git a/config/initializers/active_admin.rb b/config/initializers/active_admin.rb index 48e6b49..e83172e 100644 --- a/config/initializers/active_admin.rb +++ b/config/initializers/active_admin.rb @@ -4,7 +4,7 @@ # Set the title that is displayed on the main layout # for each of the active admin pages. # - config.site_title = "DMPonline" + config.site_title = "DMPRoadmap" # Set the link url for the title. For example, to take # users to your main site. Defaults to no link.