diff --git a/.gitignore b/.gitignore index fe6fe65..b909155 100644 --- a/.gitignore +++ b/.gitignore @@ -32,6 +32,9 @@ # ignore IDE files .idea/* +<<<<<<< HEAD +======= # ignore yard doc files -.yardoc/* \ No newline at end of file +.yardoc/* +>>>>>>> 97cb77ae9aa380ac8352b49ae90b0c118aa9d2a2 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 7be2a89..dcc388e 100644 --- a/Gemfile +++ b/Gemfile @@ -2,18 +2,19 @@ # # RAILS # -gem 'rails', '4.0.0' +gem 'rails', '4.2.0' # additional gems for rails 4 -gem 'turbolinks' -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 @@ -27,7 +28,7 @@ # Use SCSS for stylesheets gem 'less-rails' gem 'twitter-bootstrap-rails', '2.2.8' -gem 'therubyracer', '0.11.4', platforms: :ruby +gem 'therubyracer', '>=0.11.4', platforms: :ruby #'0.11.4', platforms: :ruby gem 'libv8' @@ -40,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 # @@ -63,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 @@ -74,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' @@ -117,3 +122,7 @@ gem 'yard' gem 'redcarpet' +# +# API +# +gem 'swagger-docs' diff --git a/README.md b/README.md index eae0ba3..67fcb25 100644 --- a/README.md +++ b/README.md @@ -1,17 +1,103 @@ ## DMP Roadmap +DMP Roadmap is a Data Management Planning tool. It allows users to create data management plans for the projects using funder specific templates and institutional guidance. Once a plan has been completed it can be downloaded and inserted into your grant proposals. + +Management and development of the DMP Roadmap is jointly provided by the Digital Curation Centre (DCC), http://www.dcc.ac.uk/, and the University of California Curation Center (UC3), http://www.cdlib.org/services/uc3/ + +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. + #### Current Release v.0.1.0 +[![Build Status](https://travis-ci.org/DMPRoadmap/roadmap.svg)](https://travis-ci.org/DMPRoadmap/roadmap) #### Summary +#### Pre-requisites +Roadmap is a Ruby on Rails application and you will need to have: +1. Ruby >= 2.0.0p247 +2. Rails >= 4.0 +3. MySql >= 5.0 + +Further details on how to install Ruby on Rails applications are available from the Ruby on Rails site: http://rubyonrails.org + +Further details on how to install MySQL and create your first user and database. Be sure to follow the instructions for your particular environment. +* Install: http://dev.mysql.com/downloads/mysql/ +* +* Create a user: http://dev.mysql.com/doc/refman/5.7/en/create-user.html +* Create the database: http://dev.mysql.com/doc/refman/5.7/en/creating-database.html + +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/ + #### Installation -Clone the repository and build from the latest tag +* Create your mysql db. Select UTF-8 Unicode (utf8mb4) encoding. +* Fork the repository and then clone it onto your server + +> > git clone https://github.com/[your organization]/roadmap.git + +> > cd roadmap + +* Make copies of the yaml configuration files and update the values for your installation + +> > cp config/database_example.yml config/database.yml +> > cp config/secrets_example.yml config/secrets.yml + +* Create an environment variable for your instance's secret (as defined in config/secrets.yml). You should use the following command to generate secrets for each of your environments, storing the production one in the environment variable: + +> > rake secret + +* Run bundler and perform the DB migrations + +> > gem install bundler (if bundler is not yet installed) + +> > bundle install + +> > rake db:migrate + +> > rake db:seed + +* Setup the devise authentication gem + +> > rails generate devise:install (Is this really necessary?) + +* Start the application + +> > rails server + +* Verify that the site is running properly by going to http://localhost:3000 +* Login as the default administrator: 'super_admin@example.com' - 'password1' #### Troubleshooting +##### Installation - OSX: + +``` +An error occurred while installing libv8 (3.11.8.17), and Bundler cannot continue. + +Make sure that `gem install libv8 -v '3.11.8.17'` succeeds before bundling. +``` + +If you are installing on a system that already has v8 installed then you may need to install the libv8 gem manually using your system's current v8 engine. If you're using homebrew to manage your packages you should run 'brew update' and 'brew upgrade' to make sure you have the latest packages + +> > gem uninstall -a libv8 + +> > gem install libv8 -v '<>' -- --with-system-v8 + +> > bundle install + +#### Support +Issues should be reported here on Github https://github.com/DMPRoadmap/roadmap/issues +Please be advised though that we can only provide limited support for your local installations. #### Become a contributor -Fork the repository. +Fork this repository and make your modifications in a new branch. Then create a pull request to our 'development' branch. We will reject any pull request made against the 'master' branch. Once your pull request has been submitted the team will review your request and accept it if appropriate. + +Join the email listserv at roadmap-l (at) listserv.ucop (dot) edu. #### License The DMP Roadmap project uses to the MIT License. diff --git a/README.rdoc b/README.rdoc index 3ca4a88..9a680a0 100644 --- a/README.rdoc +++ b/README.rdoc @@ -1,10 +1,8 @@ -= DMPonline v4 += DMPRoadmap -DMPonline is the DCC's data management planning tool, available at https://dmponline.dcc.ac.uk +Roadmap is a data management planning tool, available at https://github.com/DMPRoadmap/roadmap -Development of the DMPonline by the Digital Curation Centre has been funded by JISC. JISC inspires UK colleges and universities in the innovative use of digital technologies, helping to maintain the UK's position as a global leader in education. www.jisc.ac.uk - -This is just the application code, the accompanying question data available at https://dmponline.dcc.ac.uk is not included. +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; @@ -14,15 +12,16 @@ == Documentation & Support -* You can contact us by email, dmponline@dcc.ac.uk, but we can only provide limited support for your installation +* 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/DigitalCurationCentre/DMPonline_v4/issues +* Bug Reports & Feature Requests: https://github.com/DMPRoadmap/roadmap/issues +* Please prefix your request with either: 'Bug:' or 'Feature:' == Prerequisites -DMPonline 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. +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 @@ -34,10 +33,4 @@ == Copyright -Copyright (c) 2013 Digital Curation Centre, University of Edinburgh. - -This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. - -You should have received a copy of the GNU Affero General Public License along with this program. If not, see http://www.gnu.org/licenses. +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 6a2a218..0d74091 --- a/Rakefile +++ b/Rakefile @@ -1,7 +1,7 @@ #!/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 @@ -18,3 +18,4 @@ rdoc.options << "--all" end +task default: :test diff --git a/app/admin/dmptemplate.rb b/app/admin/dmptemplate.rb index 73d8877..c172563 100644 --- a/app/admin/dmptemplate.rb +++ b/app/admin/dmptemplate.rb @@ -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/token_permission.rb b/app/admin/token_permission.rb new file mode 100644 index 0000000..ed1bd19 --- /dev/null +++ b/app/admin/token_permission.rb @@ -0,0 +1,31 @@ +ActiveAdmin.register TokenPermission do + permit_params :api_token, :token_permission_type_id, :user_id + + #TODO: make migration to add user_id to the model so we can have the relationship... + + menu priority:25, label: proc{ I18n.t('admin.token_permission')}, parent: "Api" + + index do + column I18n.t('admin.user') do |n| + link_to n.user.email, [: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 :user_id + row :token_permission_type_id + row :api_token + 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 67c5852..450472f 100644 --- a/app/admin/user.rb +++ b/app/admin/user.rb @@ -87,6 +87,7 @@ 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, @@ -103,8 +104,8 @@ :multiple => true, :include_blank => I18n.t('helpers.none'), :collection => Role.order('name').map{|ro| [ro.name, ro.id]} - f.input :api_token + f.input :api_token end f.actions diff --git a/app/assets/fonts/fontawesome-webfont.woff b/app/assets/fonts/fontawesome-webfont.woff new file mode 100644 index 0000000..6e7483c --- /dev/null +++ b/app/assets/fonts/fontawesome-webfont.woff Binary files differ diff --git a/app/assets/javascripts/admin.js b/app/assets/javascripts/admin.js index 35289e6..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(I18n.t("question_text_empty")); + 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(I18n.t("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(I18n.t("select_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(I18n.t("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(I18n.t("select_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(I18n.t("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(I18n.t("select_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(I18n.t("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(I18n.t("select_guidance_group")); + alert_message.push(I18n.t("js.select_guidance_group")); } if(alert_message.length == 0){ @@ -433,7 +437,7 @@ //Validate banner_text area for less than 165 character $("form#edit_org_details").submit(function(){ if (getStats('org_banner_text').chars > 165) { - alert(I18n.t("enter_up_to") + " " + getStats('org_banner_text').chars + ". " + I18n.t("if_using_url_try")); + alert(I18n.t("js.enter_up_to") + " " + getStats('org_banner_text').chars + ". " + I18n.t("js.if_using_url_try")); return false; } }); @@ -450,8 +454,6 @@ $(link).closest(".options_content").hide(); } - - function add_object(link, association, content) { var new_id = new Date().getTime(); var regexp = new RegExp("new_" + association, "g"); @@ -461,7 +463,6 @@ } } - // 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 464ff02..0a76459 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -12,16 +12,15 @@ // //= require jquery //= require jquery_ujs -//= require bootstrap +//= require twitter/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() { $(function(){ @@ -62,7 +61,9 @@ trigger: "focus" }); - $(".show-edit-toggle").click(function () { + $(".show-edit-toggle").click(function (e) { + e.preventDefault(); + $(".edit-project").toggle(); $(".view-project").toggle(); }); @@ -120,7 +121,6 @@ $("#user_organisation_id").change(); }); - //alert dialog for unlink Shibbileth account $("#unlink-institutional-credentials-dialog").on("show", function(){ $('.select2-choice').hide(); @@ -137,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 2f78c30..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(I18n.t("settings.plans.template_formatting")); + $("#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(I18n.t("settings.plans.custom_formatting")); + $("#settings-toggle > small").text(I18n.t("project.settings.plans.custom_formatting")); } else { - $("#settings-toggle > small").text(I18n.t("settings.plans.template_formatting")); + $("#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 8a461b5..43db140 100644 --- a/app/assets/javascripts/plans.js +++ b/app/assets/javascripts/plans.js @@ -482,12 +482,10 @@ 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("

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

    "); section.find(".section-lock-notice").show(); @@ -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 9f13514..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(); @@ -131,6 +136,8 @@ function update_guidance_options() { var institution = $("#project_institution_id").select2('val'); var template = $("#project_dmptemplate_id :selected").val(); + var options = null; + $.ajax({ type: 'GET', url: "possible_guidance.json?institution="+institution+"&template="+template, @@ -138,11 +145,15 @@ async: false, //Needs to be synchronous, otherwise end up mixing up answers success: function(data) { options = data; + }, + error: function(err){ + console.log(err); } }); options_container = $("#guidance-control-group"); options_container = options_container.find(".choices-group"); options_container.empty(); + var count = 0; for (var id in options) { options_container.append("
    • "); diff --git a/app/assets/javascripts/toolbar.js b/app/assets/javascripts/toolbar.js index 78ec4cd..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('

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

    '); + 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 = $('I18n.t("helpers.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 = $('I18n.t("helpers.project.filter.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/application.css b/app/assets/stylesheets/application.css index 55ee37e..db43a20 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -10,6 +10,7 @@ * * require jquery.ui.all *= require_self + *= require bootstrap_and_overrides *= require bootstrap.css *= require bootstrap_and_overrides.css.less *= require select2.css 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/api/v0/projects_controller.rb b/app/controllers/api/v0/projects_controller.rb index d9195e6..b824c3a 100644 --- a/app/controllers/api/v0/projects_controller.rb +++ b/app/controllers/api/v0/projects_controller.rb @@ -15,7 +15,6 @@ ## # 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 @@ -23,6 +22,7 @@ #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 @@ -89,6 +89,7 @@ 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 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 8718bb2..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| @@ -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/projects_controller.rb b/app/controllers/projects_controller.rb index a860980..6bb8bfc 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -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| 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/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/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 15d1d16..502a8b5 100644 --- a/app/models/dmptemplate.rb +++ b/app/models/dmptemplate.rb @@ -1,6 +1,6 @@ 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 diff --git a/app/models/exported_plan.rb b/app/models/exported_plan.rb index 7e38ec9..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: I18n.t('helpers.plan.export.not_valid_format', value: value) } + 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 diff --git a/app/models/guidance.rb b/app/models/guidance.rb index aa89dbb..183f771 100644 --- a/app/models/guidance.rb +++ b/app/models/guidance.rb @@ -10,6 +10,7 @@ class Guidance < ActiveRecord::Base #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] @@ -39,7 +40,6 @@ return false end - ## # returns all guidance that belongs to a specified organisation # @@ -89,6 +89,7 @@ # 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 diff --git a/app/models/guidance_group.rb b/app/models/guidance_group.rb index d7606fd..eb06b2a 100644 --- a/app/models/guidance_group.rb +++ b/app/models/guidance_group.rb @@ -61,67 +61,63 @@ # @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 + 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 + # 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 - # 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 + + ## + # 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 - # 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/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/organisation.rb b/app/models/organisation.rb index 0828218..a1eef16 100644 --- a/app/models/organisation.rb +++ b/app/models/organisation.rb @@ -1,5 +1,4 @@ class Organisation < ActiveRecord::Base - #associations between tables belongs_to :organisation_type has_many :guidance_groups @@ -13,136 +12,126 @@ 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 :dmptemplates - accepts_nested_attributes_for :token_permission_types + has_many :children, :class_name => 'Organisation', :foreign_key => 'parent_id' - 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 - ## - # returns the name of the current organisation - # - # @return [String] the name of the organisation - def to_s - name +# 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, + :token_permission_type_ids + + def to_s + name + end + + def short_name + if abbreviation.nil? then + return name + else + return abbreviation + end + end + + #retrieves info off a child org + def self.orgs_with_parent_of_type(org_type) + parents = OrganisationType.find_by_name(org_type).organisations + children = Array.new + parents.each do |parent| + children += parent.children + end + 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 = [] + org_types.each do |ot| + new_org_obejct = OrganisationType.find_by_name(ot) + + org_with_guidance = GuidanceGroup.joins(new_org_obejct.organisations) + + organisations_list = organisations_list + org_with_guidance + end + 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) + if secs.nil? then + secs = Array.new + end + return secs + else + return sections.where("version_id = ? ", version_id).all + parent.all_sections(version_id) + 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| + ggs = ggs + c.all_guidance_groups + end + return ggs + end + + ## + # returns the highest parent organisation in the tree + # + # @return [organisation] the root organisation + def root + if parent.nil? + return self + else + return parent.root + 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 + return parent.warning(option_id) + else + return warning + 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 - - ## - # returns the abbreviation for the organisation if it exists, name otherwise - # - # @return [String] abbreviation or name - def short_name - if abbreviation.nil? then - return name - else - return abbreviation - end - end - - ## - # returns all organisations who have parents of a given organisation type - # - # @params org_type [String] the name of an organisation type - # @return [Array] a list of organisations - def self.orgs_with_parent_of_type(org_type) - parents = OrganisationType.find_by(name: (org_type)).organisations - children = Array.new - parents.each do |parent| - children += parent.children - end - return children - end - - ## - # returns a list of all guidance groups belonging to other organisations - # - # @return [Array] - def self.other_organisations - #DISCUSS - What does this method do? - org_types = [I18n.t('helpers.org_type.organisation')] - organisations_list = [] - org_types.each do |ot| - new_org_obejct = OrganisationType.find_by(name: ot) - - org_with_guidance = GuidanceGroup.joins(new_org_obejct.organisations) - - organisations_list = organisations_list + org_with_guidance - end - 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) - if secs.nil? then - secs = Array.new - end - return secs - else - return sections.where("version_id = ? ", version_id).all + parent.all_sections(version_id) - 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| - ggs = ggs + c.all_guidance_groups - end - return ggs - end - - ## - # returns the highest parent organisation in the tree - # - # @return [organisation] the root organisation - def root - if parent.nil? - return self - else - return parent.root - 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 - return parent.warning(option_id) - else - return warning - 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 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 70510fa..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 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 f181719..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 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.rb b/app/models/token_permission.rb new file mode 100644 index 0000000..53d8567 --- /dev/null +++ b/app/models/token_permission.rb @@ -0,0 +1,10 @@ +class TokenPermission < ActiveRecord::Base + attr_accessible :token_permission_type_id, :token_permission_type, :api_token, :user_id, :user, :as => [:default, :admin] + + #associations between tables + belongs_to :token_permission_type + belongs_to :user + + + +end diff --git a/app/models/user.rb b/app/models/user.rb index 96114b4..79c4b8d 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -3,8 +3,8 @@ # Include default devise modules. Others available are: # :token_authenticatable, :confirmable, # :lockable, :timeoutable and :omniauthable - devise :invitable, :database_authenticatable, :registerable, - :recoverable, :rememberable, :trackable, :validatable, :confirmable, :omniauthable, :omniauth_providers => [:shibboleth] + devise :invitable, :database_authenticatable, :registerable, :recoverable, :rememberable, + :trackable, :validatable, :confirmable, :omniauthable, :omniauth_providers => [:shibboleth] #associations between tables belongs_to :user_type @@ -14,6 +14,8 @@ has_many :project_groups, :dependent => :destroy has_many :organisations , through: :user_org_roles has_many :user_role_types, through: :user_org_roles + has_many :token_permissions + has_many :projects, through: :project_groups do @@ -28,6 +30,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)) } @@ -35,13 +38,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 - attr_accessible :api_token + + 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, :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. 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/api/v0/guidance_groups/index.json.jbuilder b/app/views/api/v0/guidance_groups/index.json.jbuilder index 3f5aa68..b413f7b 100644 --- a/app/views/api/v0/guidance_groups/index.json.jbuilder +++ b/app/views/api/v0/guidance_groups/index.json.jbuilder @@ -14,10 +14,12 @@ 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 index bcffb41..4408430 100644 --- a/app/views/api/v0/guidance_groups/show.json.jbuilder +++ b/app/views/api/v0/guidance_groups/show.json.jbuilder @@ -14,6 +14,7 @@ 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 diff --git a/app/views/contact_us/contacts/new.html.erb b/app/views/contact_us/contacts/new.html.erb index 7829d7a..f2ae0c4 100644 --- a/app/views/contact_us/contacts/new.html.erb +++ b/app/views/contact_us/contacts/new.html.erb @@ -67,7 +67,7 @@ <%= 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 %> diff --git a/app/views/devise/confirmations/new.html.erb b/app/views/devise/confirmations/new.html.erb index bfb06f6..d5cc21d 100644 --- a/app/views/devise/confirmations/new.html.erb +++ b/app/views/devise/confirmations/new.html.erb @@ -1,4 +1,4 @@ -

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

    +

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

    <%= form_for(resource, :as => resource_name, :url => confirmation_path(resource_name), :html => { :method => :post }) do |f| %> <%= devise_error_messages! %> diff --git a/app/views/devise/mailer/confirmation_instructions.html.erb b/app/views/devise/mailer/confirmation_instructions.html.erb index 8411996..08c61ba 100644 --- a/app/views/devise/mailer/confirmation_instructions.html.erb +++ b/app/views/devise/mailer/confirmation_instructions.html.erb @@ -1,5 +1,5 @@ -

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

    +

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

    -

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

    +

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

    -

    <%= 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 +

    <%= 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 1215d1b..2828329 100644 --- a/app/views/devise/mailer/invitation_instructions.html.erb +++ b/app/views/devise/mailer/invitation_instructions.html.erb @@ -1,7 +1,7 @@ -

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

    +

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

    -

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

    +

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

    -

    <%= 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') %>

    +

    <%= 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') %>

    -<% t('custom_devise.ignore_wont_be_created') %> \ 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 23df47b..1638d2e 100644 --- a/app/views/devise/mailer/reset_password_instructions.html.erb +++ b/app/views/devise/mailer/reset_password_instructions.html.erb @@ -1,7 +1,7 @@ -

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

    +

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

    -

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

    +

    <%= 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) %>

    -<% t('custom_devise.1st_part_change_password') %> +<%= 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 8730474..955c0c7 100644 --- a/app/views/devise/mailer/unlock_instructions.html.erb +++ b/app/views/devise/mailer/unlock_instructions.html.erb @@ -1,7 +1,7 @@ -

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

    +

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

    -

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

    +

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

    -

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

    +

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

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

    \ No newline at end of file diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb index 7dc9e68..6b85dc8 100644 --- a/app/views/devise/registrations/edit.html.erb +++ b/app/views/devise/registrations/edit.html.erb @@ -90,7 +90,7 @@

    <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %> -
    <% t('custom_devise.waiting_for_confirmation') %><%= 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 d7c8019..b632e4f 100644 --- a/app/views/devise/unlocks/new.html.erb +++ b/app/views/devise/unlocks/new.html.erb @@ -1,4 +1,4 @@ -

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

    +

    <%= 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 0ba052d..2364908 100644 --- a/app/views/dmptemplates/_add_guidance.html.erb +++ b/app/views/dmptemplates/_add_guidance.html.erb @@ -27,7 +27,7 @@ + <% 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%>
    <%= t("helpers.current_password") %>
    - <%= 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,7 +153,7 @@ <%= 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 => t('helpers.none')}, {:multiple => true})%>
    diff --git a/app/views/dmptemplates/_edit_question.html.erb b/app/views/dmptemplates/_edit_question.html.erb index 3233d80..7ce3ef3 100644 --- a/app/views/dmptemplates/_edit_question.html.erb +++ b/app/views/dmptemplates/_edit_question.html.erb @@ -32,7 +32,7 @@
    <%= 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"%>
    @@ -64,15 +64,12 @@ <% options_q.number = i %> <%= render "option_fields", :f => op %> <%end%> - - <%end%> - - - - + <%end%> + - <%= link_to_add_object t("org_admin.add_option_label"), f, :options , "new_option_button", i %> + + <%= t("org_admin.add_option_label") %>
    @@ -149,7 +146,7 @@ <%= 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})%>
    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/_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/guidance_groups/admin_new.html.erb b/app/views/guidance_groups/admin_new.html.erb index b36abf9..20b3a04 100644 --- a/app/views/guidance_groups/admin_new.html.erb +++ b/app/views/guidance_groups/admin_new.html.erb @@ -62,8 +62,7 @@
    <%= f.submit t("helpers.submit.save"), :name => "draft", :class => "btn btn-primary" %> - <%= f.submit t('helpers.submit.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/guidances/admin_edit.html.erb b/app/views/guidances/admin_edit.html.erb index d7aa32d..0f2e0c8 100644 --- a/app/views/guidances/admin_edit.html.erb +++ b/app/views/guidances/admin_edit.html.erb @@ -55,7 +55,7 @@